解决冲突

src/pages/carConfirm/confirm-detail.vue

@@ -28,11 +28,11 @@
               </item>
               <item>
                 <div slot="name">车辆型号 </div>
-                <input slot="content" v-model="rentInfo.type" readonly placeholder="自动识别车辆型号" >
+                <input slot="content" v-model="rentInfo.vehicle_model" readonly placeholder="自动识别车辆型号" >
               </item>
               <item>
                 <div slot="name">合格证编号 </div>
-                <input slot="content" v-model="rentInfo.number" readonly placeholder="自动识别合格证编号" >
+                <input slot="content" v-model="rentInfo.certificate_number" readonly placeholder="自动识别合格证编号" >
               </item>
               <!-- <item>
                 <div slot="name">厂商型号</div>

src/pages/contractRepayment/repay-details.vue

@@ -53,16 +53,16 @@
               <span>{{ item.lease_item_engine_num }}</span>
             </div>
             <div class="list">
-              <p>厂商型号</p>
-              <span>{{ item.lease_item_factory_num }}</span>
+              <p>车辆型号</p>
+              <span>{{ item.vehicle_model }}</span>
             </div>
             <div class="list">
-              <p>车牌号</p>
-              <span>{{ item.lease_item_car_num }}</span>
+              <p>合格证编号</p>
+              <span>{{ item.certificate_number }}</span>
             </div>
           </div>
           <div slot="content">
-            <span :class="['status','red']">{{ '逾期X期' }}</span>
+            <span v-if="item.overdue_times!=undefined" :class="['status','red']">逾期{{ item.overdue_times }}期</span>
             <div class="plan" @click="toRepayPlan(item.contract_id)">
               <img src="@/assets/contractRepayment/plan.png" alt="">
               <span>还款计划</span>
@@ -92,13 +92,7 @@ export default {
         product_plan_id_n: '',
         product_num: '',
       },
-      lists: [{
-        'lease_item_car_num': 'GH',
-        'product_code': 'GTC389',
-        'lease_item_factory_num': 'EF',
-        'lease_item_engine_num': 'CD',
-        'contract_id': '123',
-      }],
+      lists: [],
     }
   },
   computed: {},

src/pages/contractStart/add-car.vue

@@ -448,6 +448,11 @@ export default {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           vm.hlsPopup.showSuccess('申请成功')
+          setTimeout(() => {
+            vm.$router.push({
+              name: 'StartList',
+            })
+          }, 2000)
         } else {
           hlsPopup.showLongCenter(res.message)
         }

src/pages/contractStart/start-list.vue

@@ -70,9 +70,9 @@ export default {
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      if (from.name === 'MyInfo') {
-        vm.getList()
-      }
+      // if (from.name === 'MyInfo') {
+      vm.getList()
+      // }
     })
   },
   watch: {

src/pages/myInfo/my-info.vue

@@ -170,6 +170,7 @@ export default {
     watchBpStatus () {
       if (!this.bp_id && this.user_bp_status === 'NEW') {
         this.description = '用户绑定'
+        this.approveBtn = false
       } else if (this.bp_id && this.user_bp_status === 'NEW') {
         this.description = '待提交'
       } else if (this.bp_id && this.user_bp_status === 'APPROVED') {

src/pages/pay/payment/pay-entry.vue

@@ -93,10 +93,10 @@
               <span>¥{{ money |currency }}</span>
             </div>
             <div class="interest">
-              <span>本次交易收取{{ rate }}%服务费</span>
+              <span>本次交易收取{{ rate }}%手续费</span>
             </div>
             <div class="info-item">
-              <span>服务费</span>
+              <span>手续费</span>
               <span>+¥{{ serviceCharge |currency }}</span>
             </div>
             <div class="info-item" @click="show=true">

src/router/index.js

@@ -238,7 +238,7 @@ export default new Router({
     {path: '/add-car', component: AddCar, name: 'AddCar', meta: {keepAlive: false}},
     // 发车确认
     {path: '/confirm-detail', component: ConfirmDetail, name: 'ConfirmDetail', meta: {keepAlive: true}},
-    {path: '/confirm-list', component: ConfirmList, name: 'ConfirmList', meta: {keepAlive: true}},
+    {path: '/confirm-list', component: ConfirmList, name: 'ConfirmList', meta: {keepAlive: false}},
     // 合同查询
     {path: '/contract-records', component: ContractRecords, name: 'ContractRecords', meta: {keepAlive: true}},
     {path: '/repay-detail', component: RepayDetail, name: 'RepayDetail', meta: {keepAlive: true}},