Merge branch 'develop' of https://hel.hand-china.com/xugong/hls-xcmg-vue-app into develop

src/pages/carConfirm/confirm-detail.vue

@@ -207,7 +207,7 @@ export default {
       let url = process.env.basePath + 'do_car_confirm'
       let param = {
         master: {
-          contract_id: '123',
+          project_id: this.$route.params.project_id,
           confirm_status: 'APPROVED',
         },
       }

src/pages/carConfirm/confirm-list.vue

@@ -16,7 +16,7 @@
         :updateData="[showList]"
         :pullUp="true"
       >
-        <div v-for="(item,index) in showList" :key="index" class="item" @click="changePage(item.project_id)">
+        <div v-for="(item,index) in showList" :key="index" class="item" @click="changePage(item)">
           <div class="left">
             <span>
               <img src="@/assets/contractStart/icon.png" >
@@ -107,7 +107,7 @@ export default {
       this.$router.push({
         name: 'ConfirmDetail',
         params: {
-          project_id: e,
+          project_id: e.project_id,
         },
       })
     },

src/pages/contractInquire/contract-records.vue

@@ -52,7 +52,7 @@
             <div><span>年利率</span><p>{{ item.int_rate_n }}</p></div>
             <div><span>期限</span><p>{{ item.lease_times }}期</p></div>
             <div><span>融资金额</span><p class="bold">{{ item.finance_amount | currency }}</p></div>
-            <span class="red">逾期一周</span>
+            <span class="red">逾期{{ item.due_times }}期</span>
             <section @click="toRepayDetail(item.project_id)">
               <img src="@/assets/contractRepayment/view.png" alt="">
               <span>查看合同明细</span>
@@ -82,7 +82,7 @@
             <div><span>年利率</span><p>{{ item.int_rate_n }}</p></div>
             <div><span>期限</span><p>{{ item.lease_times }}期</p></div>
             <div><span>融资金额</span><p class="bold">{{ item.finance_amount | currency }}</p></div>
-            <span class="red">逾期一周</span>
+            <span class="red">逾期{{ item.due_times }}期</span>
             <section @click="toRepayDetail(item.project_id)">
               <img src="@/assets/contractRepayment/view.png" alt="">
               <span>查看合同明细</span>
@@ -111,7 +111,7 @@
             <div><span>年利率</span><p>{{ item.int_rate_n }}</p></div>
             <div><span>期限</span><p>{{ item.lease_times }}期</p></div>
             <div><span>融资金额</span><p class="bold">{{ item.finance_amount | currency }}</p></div>
-            <span class="red">逾期一周</span>
+            <span class="red">逾期{{ item.due_times }}期</span>
             <section @click="toRepayDetail(item.project_id)">
               <img src="@/assets/contractRepayment/view.png" alt="">
               <span>查看合同明细</span>
@@ -140,7 +140,7 @@
             <div><span>年利率</span><p>{{ item.int_rate_n }}</p></div>
             <div><span>期限</span><p>{{ item.lease_times }}期</p></div>
             <div><span>融资金额</span><p class="bold">{{ item.finance_amount | currency }}</p></div>
-            <span class="red">逾期一周</span>
+            <span class="red">逾期{{ item.due_times }}期</span>
             <section @click="toRepayDetail(item.project_id)">
               <img src="@/assets/contractRepayment/view.png" alt="">
               <span>查看合同明细</span>
@@ -169,7 +169,7 @@
             <div><span>年利率</span><p>{{ item.int_rate_n }}</p></div>
             <div><span>期限</span><p>{{ item.lease_times }}期</p></div>
             <div><span>融资金额</span><p class="bold">{{ item.finance_amount | currency }}</p></div>
-            <span class="red">逾期一周</span>
+            <span class="red">逾期{{ item.due_times }}期</span>
             <section @click="toRepayDetail(item.project_id)">
               <img src="@/assets/contractRepayment/view.png" alt="">
               <span>查看合同明细</span>

src/pages/contractRepayment/contract-repayment.vue

@@ -19,7 +19,7 @@
           <div class="center">
             <div><span>合同金额</span><p>{{ item.total_price|currency }}</p></div>
             <div><span>已还金额</span><p class="bold">{{ item.recivied_amount|currency }}</p></div>
-            <span class="red">逾期{{ item.overdue_days }}天</span>
+            <span class="red">逾期{{ item.overdue_times }}期</span>
             <section @click="toRepayDetails(item.project_id)">
               <img src="@/assets/contractRepayment/view.png" alt="">
               <span>查看合同明细</span>

src/pages/contractRepayment/repay-details.vue

@@ -16,7 +16,7 @@
         </item>
         <item>
           <div slot="name">经销商</div>
-          <div slot="content">{{ detailInfo.agent_bp_name }}代理商</div>
+          <div slot="content">{{ detailInfo.bp_agent_name }}代理商</div>
         </item>
         <item>
           <div slot="name">承租人</div>

src/pages/myInfo/my-info.vue

@@ -14,7 +14,7 @@
 
     <div class="top" style="margin-top:-1px;">
       <div class="card-top">
-        <img src="@/assets/myInfo/1.png" @click="changePageHead" >
+        <img src="@/assets/myInfo/1.png" @click="checkType" >
         <div class="sign">
           <span>{{ user_phone }}</span>
           <div>
@@ -195,8 +195,8 @@ export default {
           this.$router.push({
             name: 'ContractSigning',
             params: {
-            user_bp_type: this.user_bp_type,
-          },
+              user_bp_type: this.user_bp_type,
+            },
           })
         }
       } else {
@@ -326,14 +326,6 @@ export default {
         },
       })
     },
-    showActionSheet () {
-      this.hlsPopup.showActionSheet({
-        buttonArray: ['查看头像', '选择头像'],
-        callback: (index) => {
-          console.log(index)
-        },
-      })
-    },
     unBind () {
       let vm = this
       hlsPopup.showConfirm({
@@ -373,6 +365,20 @@ export default {
         },
       })
     },
+    checkType () {
+      this.hlsPopup.showActionSheet({
+        buttonArray: this.bp_id === undefined ? ['修改头像'] : ['修改头像', '用户信息', '角色切换'],
+        callback: (index) => {
+          if (index === 0) {
+            hlsPopup.showLongCenter('修改头像功能敬请期待!')
+          } else if (index === 1) {
+            this.changePageHead()
+          } else if (index === 2) {
+            hlsPopup.showLongCenter('角色切换功能敬请期待!')
+          }
+        },
+      })
+    },
     changePageHead () {
       let vm = this
       if (vm.bp_id) {

src/pages/regiester.vue

@@ -46,7 +46,7 @@
 </template>
 
 <script>
-  var CryptoJS = require('crypto-js')
+var CryptoJS = require('crypto-js')
 export default {
   data () {
     return {
@@ -167,7 +167,7 @@ export default {
         let md5passwprd = CryptoJS.MD5(vm.user_password).toString().toUpperCase()
         let params = {
           phone: vm.phone_number,
-          password: md5passwprd
+          password: md5passwprd,
         }
         hlsHttp.post(url, params).then(function (res) {
           if (res.result === 'S') {

src/pages/userBind/np/bankInfo.vue

@@ -30,7 +30,7 @@
               >
                 <div class="card-info">
                   <span class="name">{{ item.bank_full_name }}</span>
-                  <span class="card-type">{{ item.bank_card_type }}</span>
+                  <span class="card-type">{{ selectType(item.bank_card_type) }}</span>
                   <span class="number">卡号</span>
                   <span class="card-number">**** **** **** {{ selectLast (item) }}</span>
                 </div>
@@ -66,6 +66,15 @@ export default {
     }
   },
   methods: {
+    selectType (e) {
+      if (e === '0') {
+        return '未知类型'
+      } else if (e === '1') {
+        return '信用卡'
+      } else if (e === '2') {
+        return '储蓄卡'
+      }
+    },
     sendFlag (isClear) {
       this.showModalValue = true
       this.$emit('getInfo', this.showModalValue, isClear)

src/pages/userBind/org/bankInfo.vue

@@ -37,7 +37,7 @@
               >
                 <div class="card-info" >
                   <span class="name">{{ item.bank_full_name }}</span>
-                  <span class="card-type">{{ item.bank_card_type }}</span>
+                  <span class="card-type">{{ selectType(item.bank_card_type) }}</span>
                   <span class="number">卡号</span>
                   <span class="card-number">**** **** **** {{ selectLast (item) }}</span>
                 </div>
@@ -73,6 +73,15 @@ export default {
     }
   },
   methods: {
+    selectType (e) {
+      if (e === '0') {
+        return '未知类型'
+      } else if (e === '1') {
+        return '信用卡'
+      } else if (e === '2') {
+        return '储蓄卡'
+      }
+    },
     sendFlag (isClear) {
       this.showModalValue = true
       this.$emit('getInfo', this.showModalValue, isClear)