Merge branch 'dev_lqs' into 'master'

优化

See merge request !107

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

@@ -18,6 +18,7 @@
       <van-datetime-picker
         v-model="currentDate"
         type="year-month"
+        :min-date="minDate"
         :max-date="maxDate"
         @cancel="onPickerCancle"
         @confirm="onPickerConfirm"
@@ -39,6 +40,7 @@ export default {
   name: "CashOutRecord",
   data() {
     return {
+      minDate: "",
       maxDate: "",
       show: false,
       options: [{ text: "2021年3月", value: 0 }],
@@ -48,9 +50,10 @@ export default {
     };
   },
   mounted() {
-    (this.maxDate = new Date()),
-      (this.selected = `${this.currentDate.getFullYear()}年${this.currentDate.getMonth() +
-        1}月`);
+    this.maxDate = new Date();
+    this.minDate = new Date(this.currentDate.getFullYear(), 0);
+    this.selected = `${this.currentDate.getFullYear()}年${this.currentDate.getMonth() +
+        1}月`;
     const time = this.currentDate.toLocaleDateString().replace(/\//g, "-");
     this.getRecordList(time);
   },

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

@@ -4,12 +4,14 @@
       <van-cell is-link title="所属银行" :value="bank" @click="jumpToBank" />
     </van-cell-group>
     <div class="detail">
-      <p style="font-size: 24px">提现金额</p>
+      <p class="cash-out-title">提现金额</p>
       <van-field
         v-model="money"
         type="number"
         label="￥"
         class="money"
+        maxlength="8"
+        center
         @blur="onFillMoneyBlur"
         @input="inputClick"
       />
@@ -149,6 +151,10 @@ export default {
     },
     // 点击提现
     onCashOut() {
+      if (this.money == 0) {
+        this.$toast.fail('请输入正确金额');
+        return;
+      }
       if (!this.money) {
         this.$toast.fail("未输入提现金额");
         return;
@@ -158,7 +164,7 @@ export default {
         return;
       }
       const params = {
-        userId: JSON.parse(localStorage.getItem("user")).userId
+        userIdww: JSON.parse(localStorage.getItem("user")).userId
       };
       sendSms(params).then();
       this.validCode = null;
@@ -235,6 +241,9 @@ export default {
     padding: 10px 16px;
     background-color: #ffffff;
 
+    .cash-out-title {
+      font-size: 24px;
+    }
     .money {
       box-sizing: border-box;
       margin: 0 0 10px;