Merge branch 'dev_wm' into 'master'

Dev wm

See merge request !68

.gitignore

+.DS_Store
+node_modules
+/dist
+.idea
+
+
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?

H5/src/router/index.js

@@ -6,9 +6,9 @@ Vue.use(VueRouter);
 const routes = [
   {
     path: "/my-status",
-    name: "MyStatus",
+    name: "myStatus",
     component: () => import("../views/my/myStatus.vue"),
-    meta: { title: "我的直推" }
+    meta: { title: "我的直推", noNav: false}
   },
   {
     path: "/publish",
@@ -20,7 +20,7 @@ const routes = [
     path: "/moments",
     name: "Moments",
     component: () => import("@/views/moments/moments"),
-    meta: { title: "资讯", noNav: true }
+    meta: { title: "资讯", noNav: false }
   },
   {
     path: "/cash-out",

H5/src/views/aboutUs.vue

 <template>
   <div class="instructions">
     <div class="content">
-      <p class="title">公司简介</p>
       <p class="paragraph">
         <span
           >请您仔细阅读以下条款，并确认您已完全理解本协议之规定，尤其是免除及限制责任的条款、知识产权条款、法律适用及争议解决条款。请您仔细阅读以下条款，并确认您已完全理解本协议之规定，尤其是免除及限制责任的条款、知识产权条款、法律适用及争议解决条款。

H5/src/views/canCashOut.vue

@@ -24,6 +24,11 @@
     <div class="cash-rules">
       <div class="cash-rule-content">
         <p>{{ rules }}</p>
+        <p>{{ rulesMent }}</p>
+        <p>{{ rulesWith }}</p>
+        <p>{{ rulesPoundage }}</p>
+        <p>{{ rulesTax }}</p>
+        <p>{{ rulesAttribution }}</p>
       </div>
     </div>
   </div>
@@ -39,7 +44,12 @@ export default {
       preNum: "125",
       currentNum: "325",
       rules:
-        "提现规则：这是一条规则，这是一条规则，这是一条规则，这是一条规则这是一条规则这是一条规则这是一条规则。"
+        "提现规则：" ,
+        rulesMent:'1、结算：所有购买及推广产生的佣金实时结算，月度肥料及进步奖每月1号结算上个月收益，在APP我的收益页面可随时查询收益情况。',
+        rulesWith:'2、提现：可提现部分为结算后已通过平台审核的佣金，佣金审核周期为1-15个工作日，审核通过后可实时提现。',
+        rulesPoundage:'3、手续费：提现无需手续费。',
+        rulesTax:'4、税费：提现时系统自动扣除2%个人所得税，剩余税费由平台替缴。',
+        rulesAttribution:'此规则最终解释权归西田森市场运营部所有',
     };
   },
   mounted() {
@@ -156,7 +166,7 @@ $white: #ffffff;
       font-stretch: normal;
       line-height: 21px;
       letter-spacing: 0px;
-      color: #666666;
+      color: #999999;
       text-indent: 2em;
     }
   }

H5/src/views/cashOut/cash-out.vue

@@ -48,6 +48,7 @@
       :base-dialog-show="validCodeDialogShow"
       :base-dialog-show-close="true"
       @onClick="onSubmit"
+      @onClose="onCloseDialog"
     >
       <div slot="content">
         <p class="content-text">请输入手机号{{ userPhone }}的动态验证码</p>
@@ -165,6 +166,9 @@ export default {
         }
       });
     },
+      onCloseDialog(){
+          this.validCodeDialogShow = false;
+      },
     onSubmit() {
       this.validCodeDialogShow = false;
       const params = {