Merge branch 'ren' into develop

src/pages/contractInquire/contract-records.vue

 <!--
  * @Author: your name
  * @Date: 2019-10-31 09:49:57
- * @LastEditTime: 2019-11-28 10:44:00
+ * @LastEditTime: 2019-11-28 16:25:04
  * @LastEditors: Please set LastEditors
  * @Description: 合同查询--记录
  * @FilePath:
@@ -418,25 +418,25 @@ export default {
         }
       })
     },
-    searchs () {
+    async searchs () {
       // await this.search('全部',this.lists)
       // await this.search('待首付', this.unSignedLists = [])
       // await this.search('首付还款中', this.unRepayLists = [])
       // await this.search('还款中', this.repayingLists = [])
       // await this.search('已结清', this.repayedLists = [])
 
-      // this.search('待首付', this.unSignedLists = [])
-      // setTimeout(this.search('首付还款中', this.unRepayLists = []), 1000)
-      // setTimeout(this.search('还款中', this.repayingLists = []), 1000)
-      // setTimeout(this.search('已结清', this.repayedLists = []), 1000)
-
-      this.searchUnsign()
-      // this.searchUnrepay()
-      setTimeout(this.searchUnrepay, 500)
-      setTimeout(this.searchRepaying, 1000)
-      setTimeout(this.searchRepayed, 1500)
+      let res = await this.searchUnsign() // 待首付结果
+      if (res) {
+        let resUnrepay = await this.searchUnrepay() // 首付还款中结果
+        if (resUnrepay) {
+          let resRepaying = await this.searchRepaying() // 还款中结果
+          if (resRepaying) {
+            this.searchRepayed()
+          }
+        }
+      }
     },
-    searchUnsign () {
+    async searchUnsign () {
       let vm = this
       let url = $config.basePath + 'con_contract_list'
       let param = {
@@ -447,7 +447,8 @@ export default {
         pagesize: 10,
       }
       vm.hlsPopup.showLoading('请稍后')
-      vm.hlsHttp.post(url, param).then(function (res) {
+      let res = await vm.$post(url, param)
+      if (res.result === 'S') {
         vm.hlsPopup.hideLoading()
         vm.unSignedLists = res.lists
         if (res.lists.length >= 0 && res.lists.length < 10) {
@@ -455,10 +456,14 @@ export default {
         } else if (res.lists.length === 10) {
           vm.$refs.scrollOne.update(false)
         }
-      })
+        return true
+      } else {
+        hlsPopup.showLongCenter(res.message)
+        return false
+      }
     },
 
-    searchUnrepay () {
+    async searchUnrepay () {
       let vm = this
       let url = $config.basePath + 'con_contract_list'
       let param = {
@@ -469,18 +474,22 @@ export default {
         pagesize: 10,
       }
       // vm.hlsPopup.showLoading('数据加载中')
-      vm.hlsHttp.post(url, param).then(function (res) {
-        // vm.hlsPopup.hideLoading()
+      let res = await vm.$post(url, param)
+      if (res.result === 'S') {
         vm.unRepayLists = res.lists
         if (res.lists.length >= 0 && res.lists.length < 10) {
           vm.$refs.scrollTwo.update(true)
         } else if (res.lists.length === 10) {
           vm.$refs.scrollTwo.update(false)
         }
-      })
+        return true
+      } else {
+        hlsPopup.showLongCenter(res.message)
+        return false
+      }
     },
 
-    searchRepaying () {
+    async searchRepaying () {
       let vm = this
       let url = $config.basePath + 'con_contract_list'
       let param = {
@@ -491,15 +500,19 @@ export default {
         pagesize: 10,
       }
       // vm.hlsPopup.showLoading('数据加载中')
-      vm.hlsHttp.post(url, param).then(function (res) {
-        // vm.hlsPopup.hideLoading()
+      let res = await vm.$post(url, param)
+      if (res.result === 'S') {
         vm.repayingLists = res.lists
         if (res.lists.length >= 0 && res.lists.length < 10) {
           vm.$refs.scrollThree.update(true)
         } else if (res.lists.length === 10) {
           vm.$refs.scrollThree.update(false)
         }
-      })
+        return true
+      } else {
+        hlsPopup.showLongCenter(res.message)
+        return false
+      }
     },
 
     searchRepayed () {

src/pages/contractSigning/contract-detail.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-11-25 14:24:53
+ * @LastEditTime: 2019-11-28 17:43:13
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -733,7 +733,7 @@ export default {
     .approve {
       width: 358.6px;
       height: 44px;
-      background: #00469c;
+      background: @headerColor;
       border-radius: 4px;
       color: #fff;
       font-family: PingFangSC-Semibold;

src/pages/contractSigning/contract-signing.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-11-28 10:53:27
+ * @LastEditTime: 2019-11-28 16:51:10
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -37,7 +37,7 @@
               <span>合同号</span>
               <span>{{ item.project_number }}</span>
             </p>
-            <img src="@/assets/distributorSign/goDetails.png" alt="" class="arrow">
+            <img src="@/assets/constractSigning/righticon.png" alt="" class="arrow">
           </div>
           <div class="box">
             <div><p>承租人</p><p>{{ item.bp_name }}</p></div>
@@ -63,7 +63,7 @@
               <span>合同号</span>
               <span>{{ item.project_number }}</span>
             </p>
-            <img src="@/assets/distributorSign/goDetails.png" alt="" class="arrow">
+            <img src="@/assets/constractSigning/righticon.png" alt="" class="arrow">
           </div>
           <div class="box">
             <div><p>承租人</p><p>{{ item.bp_name }}</p></div>
@@ -283,7 +283,7 @@ export default {
         })
       }
     },
-    submitSearch () {
+    async submitSearch () {
       let vm = this
       vm.submitPagenum = 1
       let url = $config.basePath + 'prj_confirm_list_query'
@@ -294,17 +294,21 @@ export default {
         confirm_status: 'SUBMIT',
         searchInput: vm.searchInput,
       }
-      // vm.hlsPopup.showLoading('数据加载中')
-      vm.hlsHttp.post(url, param).then(function (res) {
-        // vm.hlsPopup.hideLoading()
-        // console.log(res.lists)
+      vm.hlsPopup.showLoading('数据加载中')
+      let res = await vm.$post(url, param)
+      if (res.result === 'S') {
+        vm.hlsPopup.hideLoading()
         vm.submitLists = res.lists
         if (res.lists.length >= 0 && res.lists.length < 10) {
           vm.$refs.scroll.update(true)
         } else if (res.lists.length === 10) {
           vm.$refs.scroll.update(false)
         }
-      })
+        return true
+      } else {
+        hlsPopup.showLongCenter(res.message)
+        return false
+      }
     },
     approvedearch () {
       let vm = this
@@ -328,9 +332,11 @@ export default {
         }
       })
     },
-    search () {
-      this.submitSearch()
-      setTimeout(this.approvedearch, 1000)
+    async search () {
+      let res = await this.submitSearch()
+      if (res) {
+        this.approvedearch()
+      }
     },
 
     goDetails (item) {

src/pages/distributorSign/contract-details.vue

@@ -2,7 +2,7 @@
  * @Description: 合同详情
  * @Author: your name
  * @Date: 2019-09-25 15:38:21
- * @LastEditTime: 2019-11-26 17:53:48
+ * @LastEditTime: 2019-11-28 17:42:24
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -757,7 +757,7 @@ export default {
     .approve {
       width: 358.6px;
       height: 44px;
-      background: #00469c;
+      background: @headerColor;
       border-radius: 4px;
       color: #fff;
       font-family: PingFangSC-Semibold;

src/pages/distributorSign/contract-list.vue

@@ -35,7 +35,7 @@
               <span>合同号</span>
               <span>{{ item.project_number }}</span>
             </p>
-            <img src="@/assets/distributorSign/goDetails.png" alt="" class="arrow">
+            <img src="@/assets/constractSigning/righticon.png" alt="" class="arrow">
           </div>
           <div class="box">
             <div><p>承租人</p><p>{{ item.bp_name }}</p></div>
@@ -60,7 +60,7 @@
               <span>合同号</span>
               <span>{{ item.project_number }}</span>
             </p>
-            <img src="@/assets/distributorSign/goDetails.png" alt="" class="arrow">
+            <img src="@/assets/constractSigning/righticon.png" alt="" class="arrow">
           </div>
           <div class="box">
             <div><p>承租人</p><p>{{ item.bp_name }}</p></div>
@@ -268,7 +268,7 @@ export default {
         })
       }
     },
-    submitSearch () {
+    async submitSearch () {
       let vm = this
       vm.submitPagenum = 1
       let url = $config.basePath + 'prj_confirm_list_query'
@@ -280,16 +280,20 @@ export default {
         searchInput: vm.searchInput,
       }
       vm.hlsPopup.showLoading('请稍后')
-      vm.hlsHttp.post(url, param).then(function (res) {
+      let res = await vm.$post(url, param)
+      if (res.result === 'S') {
         vm.hlsPopup.hideLoading()
-        // console.log(res.lists)
         vm.submitLists = res.lists
         if (res.lists.length >= 0 && res.lists.length < 10) {
           vm.$refs.scroll.update(true)
         } else if (res.lists.length === 10) {
           vm.$refs.scroll.update(false)
         }
-      })
+        return true
+      } else {
+        hlsPopup.showLongCenter(res.message)
+        return false
+      }
     },
     approvedearch () {
       let vm = this
@@ -314,9 +318,11 @@ export default {
         }
       })
     },
-    search () {
-      this.submitSearch()
-      setTimeout(this.approvedearch, 1000)
+    async search () {
+      let res = await this.submitSearch()
+      if (res) {
+        this.approvedearch()
+      }
     },
     goDetails (item) {
       this.$router.push({

src/pages/financingTrial/financing-details.vue

@@ -2,7 +2,7 @@
    * @Descrip""/>User Settings Edit
  * @Author: your name
  * @Date: 2019-09-29 20:31:00
- * @LastEditTime: 2019-11-21 12:39:19
+ * @LastEditTime: 2019-11-28 17:37:58
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -71,11 +71,10 @@
           <!-- 合计 = 首付款+保证金+手续费+GPS费用+保险押金  -->
           <span v-if="equip_price" slot="content">{{ parseFloat(equip_price*info.down_payment_ratio_n.replace("%","")/100 + equip_price*info.deposit_ratio_n.replace("%","")/100 + (equip_price - equip_price*info.down_payment_ratio_n.replace("%","")/100)*(info.lease_charge_ratio_n.replace("%","")/100) + Number(gps_fee) + Number(insurance_fee)).toFixed(2) | currency }}</span>
         </item>
-        <item>
+        <item @click.native="showTime('YYYY-MM-DD')">
           <div slot="name" class="font-color">预计付款日</div>
-          <!-- <input slot="content" placeholder="YYYY-MM-DD" readonly> -->
           <div slot="content" class="autoColor">{{ price_date_to }}</div>
-          <img src="@/assets/trial/date.png" alt="" class="date-pic" @click="showTime('YYYY-MM-DD')">
+          <img src="@/assets/trial/date.png" alt="" class="date-pic">
         </item>
         <item :show-arrow="true" @click.native="periodPull">
           <div slot="name" class="font-color">还款周期</div>
@@ -413,7 +412,7 @@ export default {
       .approve {
         width: 96%;
         height: 44px;
-        background: #00469c;
+        background: @headerColor;
         border-radius: 4px;
         color: #fff;
         font-family: PingFangSC-Semibold;

src/pages/myInfo/my-info.vue

 <!--
  * @Author: your name
  * @Date: 2019-11-07 17:48:53
- * @LastEditTime: 2019-11-15 15:56:28
+ * @LastEditTime: 2019-11-28 15:32:52
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -111,7 +111,7 @@
           <item>
             <img slot="left-icon" src="@/assets/myInfo/refresh.png" class="left-icon" >
             <div slot="name">当前版本</div>
-            <div slot="content">{{currentVersion}}</div>
+            <div slot="content">{{ currentVersion }}</div>
           </item>
           <item @click.native="logOut">
             <img slot="left-icon" src="@/assets/myInfo/exit.png" class="left-icon" >

src/pages/userBind/org/enterprise.vue

@@ -2,7 +2,7 @@
  * @Description: In User Settings Edit
  * @Author: your name
  * @Date: 2019-09-19 09:31:19
- * @LastEditTime: 2019-11-28 14:13:20
+ * @LastEditTime: 2019-11-28 15:13:32
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -187,7 +187,9 @@
           </item>
           <item>
             <div slot="name" class="font-color required">固定电话</div>
-            <input slot="content" v-model="baseInfo.phone" placeholder="请输入固定电话">
+            <input
+              slot="content" v-model="baseInfo.phone" placeholder="请输入固定电话"
+              @blur="fixedPhoneCheck(baseInfo.phone)">
           </item>
         </list-item>
         <!-- 法定代表人信息-->
@@ -931,6 +933,13 @@ export default {
         hlsPopup.showLongCenter('请输入正确的手机号')
       }
     },
+    // 校验固定电话
+    fixedPhoneCheck (phone) {
+      let reg = /^((0\d{2,3})-)(\d{7,8})(-(\d{3,}))?$/
+      if (!reg.test(phone)) {
+        hlsPopup.showLongCenter('请输入正确的固定电话')
+      }
+    },
 
     verified () {
       debugger