Merge branch 'dev_lqs' into 'master'

修改

See merge request !84

H5/src/components/BaseNavBar.vue

@@ -45,7 +45,6 @@ export default {
       } else {
         this.$router.go(-1);
       }
-      // this.$router.go(-1);
     },
     onClickRight() {
       console.log("right");

H5/src/router/index.js

@@ -6,13 +6,13 @@ Vue.use(VueRouter);
 const routes = [
   {
     path: "/my-status",
-    name: "myStatus",
+    name: "MyStatus",
     component: () => import("../views/my/myStatus.vue"),
     meta: { title: "我的直推", noNav: false }
   },
   {
     path: "/publish",
-    name: "publish",
+    name: "Publish",
     component: () => import("@/views/moments/publish"),
     meta: { title: "发布资讯" }
   },
@@ -52,7 +52,7 @@ const routes = [
       },
       {
         path: "wallet",
-        name: "wallet",
+        name: "Wallet",
         component: () => import("@/views/income/wallet"),
         meta: { title: "钱包" }
       },
@@ -84,13 +84,13 @@ const routes = [
   },
   {
     path: "/instructions",
-    name: "instructions",
+    name: "Instructions",
     component: () => import("@/views/instructions"),
     meta: { title: "用户协议" }
   },
   {
     path: "/settings",
-    name: "settings",
+    name: "Settings",
     component: () => import("@/views/settings"),
     meta: { title: "设置" }
   },
@@ -138,7 +138,7 @@ const routes = [
   },
   {
     path: "/customer",
-    name: "customerService",
+    name: "CustomerService",
     component: () => import("@/views/customer-service"),
     meta: { title: "专属客服", noNav: true }
   },
@@ -150,7 +150,7 @@ const routes = [
   },
   {
     path: "/aboutUs",
-    name: "aboutUs",
+    name: "AboutUs",
     component: () => import("@/views/aboutUs"),
     meta: { title: "公司简介", noNav: false }
   }

H5/src/views/modefyAvatar.vue

@@ -3,6 +3,7 @@
     <img class="avatar" :src="avatar" alt />
     <div class="btn">
       <van-uploader
+        accept="image/*"
         :max-count="1"
         :before-delete="onDeleteAvatar"
         :after-read="onRead"