Merge branch 'dev_wm' into 'master'

返回按钮

See merge request !80

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: "设置" }
   },
@@ -150,7 +150,7 @@ const routes = [
   },
   {
     path: "/aboutUs",
-    name: "AboutUs",
+    name: "aboutUs",
     component: () => import("@/views/aboutUs"),
     meta: { title: "公司简介", noNav: false }
   }

H5/src/views/invite.vue

 <template>
   <div class="invite-code">
+    <div class="nav">
+      <van-icon
+              name="arrow-left"
+              size="20"
+              class="nav-left"
+              @click="$router.go(-1)"
+      />
       <img :src="imgSrc" alt="" class="imgCode" />
     </div>
+  </div>
 </template>
 <script>
 import { inviteCode } from "@/api/invite";

H5/src/views/register.vue

@@ -129,7 +129,7 @@ export default {
       }
       _this.time = 60;
       _this.disabled = true;
-      // _this.handelSendSmsApi();
+       _this.handelSendSmsApi();
       _this.timer = setInterval(() => {
         if (_this.time === 0) {
           clearInterval(_this.timer);
@@ -142,7 +142,7 @@ export default {
       // 检验手机号
       const params = {
         codeType: 0,
-        phone: this.userId
+        phone: this.form.userId
       };
       smsCode(params).then(res => {
         console.log(res);
@@ -169,7 +169,8 @@ export default {
         this.$toast.clear();
         _this.registerBtnDisabled = false;
         if (res.code === 0) {
-          _this.$toast.sucess(res.msg);
+            this.$toast("注册成功");
+          //_this.$toast.sucess(res.msg);
         } else {
           _this.show = true;
           _this.tip = res.msg;