Merge branch 'master' of http://111.203.232.171:8888/Song/xitiansenmall into dev_lqs

H5/src/views/bank.vue

@@ -23,6 +23,12 @@
         placeholder="请输入"
         size="large"
       />
+      <van-field
+              v-model="form.idCardNo"
+              label="身份证号"
+              placeholder="请输入"
+              size="large"
+      />
     </van-cell-group>
     <van-button
       type="primary"
@@ -63,7 +69,8 @@ export default {
         bankName: "",
         cardNumber: "",
         name: "",
-        id: ""
+        id: "",
+        idCardNo:'',
       }
     };
   },
@@ -93,6 +100,8 @@ export default {
       } else if (!this.form.name) {
         this.$toast.fail("请填写姓名");
         return;
+      }else  if(!this.form.idCardNo){
+          this.$toast.fail("请输入身份证号");
       }
       const params = this.form;
       if (this.form.id) {

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

@@ -24,11 +24,11 @@
       <div class="real">
         <p class="real-item">
           <span>实际到账</span>
-          <span>{{ account }}</span>
+          <span>{{ account.toFixed(2) }}</span>
         </p>
         <p class="real-item">
           <span>税款</span>
-          <span>{{ rate }}</span>
+          <span>{{ rate.toFixed(2) }}</span>
         </p>
         <p class="explain">
           <span>扣税说明</span>
@@ -70,6 +70,17 @@
             class="valid-code"
             src="@/assets/images/验证码.png"
           />
+          <van-button
+                  slot="button"
+                  size="small"
+                  type="primary"
+                  class="verify-code"
+                  :disabled="disabled"
+                  @click="sendSms"
+          >
+            <span v-if="!disabled">发送验证码</span>
+            <span v-else>{{ time }}秒后重新发送</span>
+          </van-button>
         </van-field>
       </div>
     </base-dialog>
@@ -109,9 +120,11 @@ export default {
       resultDialogTip: "",
       resultDialogImg: "",
       resultDialog: false,
+        disabled: false,
       textName: "",
       validCodeDialogShow: false,
-      validCode: null
+      validCode: null,
+        time: 60,
     };
   },
   created() {
@@ -125,6 +138,13 @@ export default {
         return false;
       }
     },
+
+      sendSms() {
+          const _this = this;
+          _this.time = 60;
+          _this.disabled = true;
+      },
+
     inputClick() {
       this.rate = this.money * 0.02;
       this.account = this.money - this.rate;
@@ -329,4 +349,9 @@ export default {
     height: 18px;
   }
 }
+.verify-code {
+  background-color: transparent;
+  border: none;
+  color: #88c677;
+}
 </style>

H5/src/views/my/myStatus.vue

@@ -22,6 +22,7 @@
         sticky
         color="#28b537"
         @click="changeTab"
+        @change="changeTabs"
       >
         <van-tab
           v-for="item in Tabs"
@@ -158,6 +159,10 @@ export default {
       console.log("tab", name);
       this.getRecommendDetail(name);
     },
+      changeTabs(name){
+          console.log("tab", name);
+          this.getRecommendDetail(name);
+      },
     onDownLoad(val) {
       console.log("下拉加载", val);
     },

H5/src/views/register.vue

@@ -112,9 +112,9 @@ export default {
     },
       sendSms() {
       const _this = this;
-      if (_this.timer) {
-        return false;
-      }
+      // if (_this.timer) {
+      //   return false;
+      // }
       // 校验手机号
       let phoneReg = /^(0|86|17951)?(13[0-9]|15[012356789]|17[0-9]|18[0-9]|14[57])[0-9]{8}$/;
       //如果手机号码输入为空
@@ -169,7 +169,7 @@ export default {
         this.$toast.clear();
         _this.registerBtnDisabled = false;
         if (res.code === 0) {
-          this.$toast("注册成功");
+            this.$toast.success("注册成功");
           //_this.$toast.sucess(res.msg);
         } else {
           _this.show = true;