Merge branch 'master' into my_loan

htmldev/loan/src/views/loan/apply/index.vue

@@ -29,7 +29,7 @@
                  @input="funLimitLength">
         </div>
       </li>
-      <li>
+      <li v-if="false">
         <label>
           <span v-for="(str, index) in '图形验证：'" :key="index">{{ str }}</span>
         </label>
@@ -257,10 +257,10 @@
           return
         }
 
-        if (!capture) {
-          Toast('请输入图片验证码')
-          return
-        }
+        // if (!capture) {
+        //   Toast('请输入图片验证码')
+        //   return
+        // }
         this.funCutDown()
         sendSMS(orderUserPhone, 0, capture).then(res => {
           if (res.status) {

htmldev/loan/src/views/loan/register/index.vue

@@ -21,7 +21,7 @@
       <img class="title" src="./image/title@2x.png" alt="">
       <ul class="form-wrap">
         <li>
-          <label>
+          <label class="required">
             <span v-for="(str, index) in '手机号码：'" :key="index">{{ str }}</span>
           </label>
           <div class="value-wrap">
@@ -29,8 +29,8 @@
                    @input="funLimitLength">
           </div>
         </li>
-        <li>
-          <label>
+        <li v-if="false">
+          <label class="required">
             <span v-for="(str, index) in '图形验证：'" :key="index">{{ str }}</span>
           </label>
           <div class="value-wrap">
@@ -39,7 +39,7 @@
           <img class="capture-img" :src="strCapture" alt="" @click="funUpdateCapture">
         </li>
         <li>
-          <label>
+          <label class="required">
             <span class="label-code" v-for="(str, index) in '验证码：码'" :key="index">{{ str }}</span>
           </label>
           <div class="value-wrap">
@@ -48,7 +48,7 @@
           <button class="get-code" @click="funGetCode">{{[0, 60].includes(numCount) ? '获取': numCount + '秒'}}</button>
         </li>
         <li>
-          <label>
+          <label class="required">
             <span class="label-name" v-for="(str, index) in '姓名：姓名'" :key="index">{{ str }}</span>
           </label>
           <div class="value-wrap">
@@ -58,7 +58,7 @@
           </div>
         </li>
         <li>
-          <label>
+          <label class="required">
             <span class="label-city" v-for="(str, index) in '城市：城市'" :key="index">{{ str }}</span>
           </label>
           <div class="value-wrap" @click="showPicker0 = true">
@@ -70,7 +70,7 @@
           </div>
         </li>
         <li>
-          <label>
+          <label class="required">
             <span class="label-community" v-for="(str, index) in '小区：小区'" :key="index">{{ str }}</span>
           </label>
           <div class="value-wrap" @click="showPicker1 = true">
@@ -80,7 +80,7 @@
           </div>
         </li>
         <li>
-          <label>
+          <label class="required">
             <span class="label-buildingy" v-for="(str, index) in '楼号：楼号'" :key="index">{{ str }}</span>
           </label>
           <div class="value-wrap" @click="showPicker2 = true">
@@ -311,10 +311,10 @@
           return
         }
 
-        if (!capture) {
-          Toast('请输入图片验证码')
-          return
-        }
+        // if (!capture) {
+        //   Toast('请输入图片验证码')
+        //   return
+        // }
         this.funCutDown()
         sendSMS(orderUserPhone, 3, capture).then(res => {
           if (res.status) {
@@ -333,7 +333,7 @@
         })
       },
       verifyData () {
-        const { orderUserName, orderUserPhone, code, orderUserProvince, orderUserCity, orderUserDistrict, orderCommunity, orderBuilding, orderRoom } = this.postData
+        const { orderUserName, orderUserPhone, code, orderUserProvince, orderUserCity, orderUserDistrict, orderCommunity, orderBuilding } = this.postData
         this.arrErrorList = []
         if (!/^1[2|3|4|5|6|7|8|9]\d{9}$/.test(orderUserPhone)) {
           this.arrErrorList.push('请输入手机号码')
@@ -353,9 +353,6 @@
         if (!orderBuilding) {
           this.arrErrorList.push('请选择所在楼号')
         }
-        if (!orderRoom) {
-          this.arrErrorList.push('请输入房号')
-        }
         return this.arrErrorList.length <= 0
       },
       funUpdateCapture () {
@@ -560,6 +557,24 @@
     label {
       display: flex;
 
+      &.required {
+        position: relative;
+        left: 0;
+        top: 0;
+
+        &:before {
+          position: absolute;
+          left: -12px;
+          top: -4px;
+          z-index: 1;
+          content: '*';
+          line-height: 33px;
+          font-size: 24px;
+          font-weight: 500;
+          color: #FF3B30;
+        }
+      }
+
       span {
         line-height: 22px;
         font-size: 16px;