Merge branch 'liuxin' into develop

src/pages/contractCreate/creat-rent-info.vue

@@ -3,10 +3,27 @@
     <h-header :proportion="[5,1,1]" class="bar-custom">
       <div slot="left" class="h-header-btn">
         <img src="@/assets/userBind/arrow.png" @click="$routeGo()" >
-        <span>基本信息</span>
+        <span>租赁信息</span>
       </div>
     </h-header>
-    <h-content/>
+    <h-content>
+      <div class="top">
+        <div class="item">
+          <span>1</span>
+          <p>基本信息</p>
+        </div>
+        <span class="line" />
+        <div class="item">
+          <span>2</span>
+          <p>租赁信息</p>
+        </div>
+        <span class="line" />
+        <div class="item">
+          <span>3</span>
+          <p>附件信息</p>
+        </div>
+      </div>
+    </h-content>
   </h-view>
 </template>
 <script>
@@ -15,5 +32,52 @@ export default {
 }
 </script>
 <style lang="less" scoped>
-
+#create-rent-info{
+    .top {
+    width: 100%;
+    height: 81px;
+    background-color: #faf5e0;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    .line {
+      display: inline-block;
+      width: 78px;
+      border-top: 1px solid #a4a4a4;
+      margin-bottom: 18px;
+    }
+    .item {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      flex-flow: column wrap;
+      font-family: PingFangSC-Semibold;
+      font-size: 12px;
+      color: rgba(56, 63, 69, 0.5);
+      letter-spacing: 0.43px;
+      span {
+        display: block;
+        text-align: center;
+        line-height: 18px;
+        border-radius: 50%;
+        width: 18px;
+        height: 18px;
+        color: #fff;
+        background: #a4a4a4;
+      }
+      p {
+        margin-top: 10px;
+      }
+    }
+    .item:nth-of-type(1) {
+      font-family: PingFangSC-Semibold;
+      font-size: 12px;
+      color: #383f45;
+      letter-spacing: 0.43px;
+      span {
+        background-color: #ffa000;
+      }
+    }
+  }
+}
 </style>

src/pages/contractCreate/create-base-info.vue

@@ -222,6 +222,11 @@
       <tab-button class="before" @click.native="$routeGo()">上一步</tab-button>
       <tab-button class="next" @click.native="goRent">下一步</tab-button>
     </bottom-tab>
+    <bottom-tab class="add-box">
+      <!-- v-if="!isApproved || (isClear && isApproved)"-->
+      <tab-button class="add-card" @click.native="addBankInfo">添加</tab-button>
+    </bottom-tab>
+    </h-modal>
   </h-view>
 </template>
 <script>
@@ -231,17 +236,20 @@ export default {
       checked: false, // 农行代扣
       checkedApproved: false, // 是否特批
       bp_class: 'ORG',
+      showModalValue: false,
     }
   },
   methods: {
     addPerson () {
-      this.$router.push({
-        name: 'AddPerson',
-      })
+      // this.$router.push({
+      //   name:
+      // 'AddPerson',
+      // })
+      this.showModalValue = true
     },
     goRent () {
       this.$router.push({
-        name: 'createRentInfo',
+        name: 'CreateRentInfo',
       })
     },
     deleteFun () {},
@@ -389,4 +397,65 @@ export default {
     }
   }
 }
+#add-person{
+    .item{
+        width:359px;
+        margin:0 auto;
+    }
+     .search {
+    background-color: #fff;
+    padding: 8px 12px;
+    width: 100%;
+    height: 1.02rem;
+    z-index: 100;
+    margin-bottom: 8px;
+    input {
+      background: url("../../assets/contractStart/search1.png") 320px no-repeat;
+      background-size: 16px 16px;
+      background-color: rgba(239, 239, 239, 0.55);
+      padding-left: 12px;
+      height:36px;
+      line-height: 36px;
+      border-radius: 4px;
+      width: 100%;
+      font-family: PingFangSC-Regular;
+      font-size: 14px;
+      color: #888c8f;
+    }
+
+    input::placeholder {
+      font-family: PingFangSC-Regular;
+      font-size: 14px;
+      color: #888c8f;
+      letter-spacing: 0;
+    }
+
+    input:focus {
+      background: url("../../assets/contractStart/search2.png") 320px no-repeat;
+      background-size: 16px 16px;
+      background-color: rgba(239, 239, 239, 0.55);
+      border: 2px solid #bcc6ff;
+    }
+  }
+}
+@media (device-width: 414px) and (device-height: 896px) {
+  .platform-ios {
+    #add-person {
+      .search {
+        input {
+          background: url("../../assets/contractStart/search1.png") 320px
+            no-repeat;
+          background-size: 16px 16px;
+          background-color: rgba(239, 239, 239, 0.55);
+          padding: 8px 12px;
+          border-radius: 4px;
+          width: 100%;
+          font-family: PingFangSC-Regular;
+          font-size: 14px;
+          color: #888c8f;
+        }
+      }
+    }
+  }
+}
 </style>

src/pages/pay/payment/contract-record.vue

@@ -19,7 +19,7 @@
         </div>
       </div>
       <div class="search">
-        <input v-model="keyWords" type="text" placeholder="请输入合同号/车架号/承租人名称" >
+        <input v-model="keyWords" type="text" placeholder="请输入合同号/承租人名称" >
         <img src="@/assets/payment/search.png" alt >
       </div>
       <section class="pay-content">

src/pages/pwd-forgotten.vue

@@ -27,14 +27,14 @@
           <img slot="left-icon" src="../assets/login/passwordConfirm.png" class="left-icon">
           <div slot="name" class="required">设置密码</div>
           <input
-            slot="content" v-model="user_password" type="text" placeholder="请输入6~20位密码"
-            maxlength="20" oninput="value=value.replace(/[^\w\.\/\|\,\\_\-\+\=\[\]\{\}\'\^\%\$\@\!\~\`\*\《\》\<\>\/\;\:\,\，\。\【\】\？\?\、\；\：\‘\“\(\#)]/i,'')" @blur="passwordCheck">
+            slot="content" v-model="user_password" type="password" placeholder="请输入6~20位密码"
+            maxlength="20" @blur="passwordCheck">
         </item>
         <item :proportion="[2,2]">
           <img slot="left-icon" src="../assets/login/passwordConfirm.png" class="left-icon">
           <div slot="name" class="required">重新输入密码</div>
           <input
-            slot="content" v-model="confirm" oninput="value=value.replace(/[^\w\.\/\|\,\\_\-\+\=\[\]\{\}\'\^\%\$\@\!\~\`\*\《\》\<\>\/\;\:\,\，\。\【\】\？\?\、\；\：\‘\“\(\#)]/i,'')" type="text"
+            slot="content" v-model="confirm" type="password"
             placeholder="请重新输入密码"
             @blur="confirmCheck">
         </item>
@@ -188,7 +188,7 @@ export default {
     getVerifiedCode () {
       let vm = this
       hlsPopup.showLongCenter('测试验证码为123456')
-      /*let url = process.env.basePath + 'sms_verify_post'
+      /* let url = process.env.basePath + 'sms_verify_post'
       let signcode = ('000000' + Math.floor(Math.random() * 999999)).slice(-6)
       vm.captchaKey = signcode
       let param = {
@@ -203,7 +203,7 @@ export default {
         } else {
           vm.hlsPopup.showLongCenter(res.message)
         }
-      })*/
+      }) */
     },
   },
 }

src/pages/regiester2.vue

@@ -33,7 +33,7 @@
               :type="pwdType"
               placeholder="请输入6~20位密码"
               maxlength="20"
-              oninput="value=value.replace(/[^\w\.\/\|\,\\_\-\+\=\[\]\{\}\'\&\^\%\$\@\!\~\`\*\《\》\<\>\/\;\:\,\，\。\【\】\？\?\、\；\：\‘\“\(\#)]/i,'')"
+              oninput="value=value.replace(/[\u4E00-\u9FA5]/g,'')"
               @blur="passwordCheck"
             >
             <img v-if="user_password" :src="openEye" class="right-icon" @click="changeType" >
@@ -41,7 +41,7 @@
           <div class="reg-item">
             <img src="../assets/login/pass.png" class="left-icon" >
             <input
-              v-model="confirm" :type="pwdType" oninput="value=value.replace(/[^\w\.\&\/\|\,\\_\-\+\=\[\]\{\}\'\^\%\$\@\!\~\`\*\《\》\<\>\/\;\:\,\，\。\【\】\？\?\、\；\：\‘\“\(\#)]/i,'')" placeholder="请重新输入密码"
+              v-model="confirm" :type="pwdType" oninput="value=value.replace(/[\u4E00-\u9FA5]/g,'')" placeholder="请重新输入密码"
               @blur="confirmCheck" >
             <img v-if="confirm" :src="openEye" class="right-icon" @click="changeType" >
           </div>
@@ -220,8 +220,8 @@ export default {
     },
     getVerifiedCode () {
       let vm = this
-       hlsPopup.showLongCenter('测试验证码为123456')
-      /*let url = process.env.basePath + 'sms_verify_post'
+      hlsPopup.showLongCenter('测试验证码为123456')
+      /* let url = process.env.basePath + 'sms_verify_post'
       let signcode = ('000000' + Math.floor(Math.random() * 999999)).slice(-6)
       vm.captchaKey = signcode
       let param = {
@@ -236,7 +236,7 @@ export default {
         } else {
           vm.hlsPopup.showLongCenter(res.message)
         }
-      })*/
+      }) */
     },
   },
 }