Merge branch 'liuxin' into develop

src/pages/contractRepayment/refund.vue

@@ -25,7 +25,7 @@
               <td>代扣;在线支付</td>
             </tr>
             <tr>
-              <td>本金</td>
+              <td>利息</td>
               <td>5,000.00</td>
               <td>5,000.00</td>
               <td>代扣;在线支付</td>
@@ -51,7 +51,7 @@
         v-for="(item,index) in lists"
         :key="index"
         :class="{'plan-list':true,'or':statu==='orange','bl':statu==='blue','gr':statu==='green'}"
-        @click="showModel"
+        @click="showModel(item)"
       >
         <div
           :class="{'period':true,'orange':statu==='orange','blue':statu==='blue','green':statu==='green'}"
@@ -66,8 +66,8 @@
         </div>
         <div class="message">
           <p class="top">
-            现金流项目
-            <span>{{ item.cf_item_name }}</span>&nbsp; &nbsp; 支付
+            款项
+            <span>{{ item.cf_item_name }}</span>&nbsp; &nbsp; 付款方式
             <span>{{ item.pay_method }}</span>
           </p>
           <div class="name">
@@ -109,8 +109,10 @@ export default {
     })
   },
   methods: {
-    showModel () {
+    showModel (e) {
+      if (e.cf_item_name === '租金') {
         this.show = true
+      }
     },
     selectMonth (e) {
       return e.substring(5, 10)
@@ -174,7 +176,7 @@ export default {
           font-size: 14px;
           color: #1d3fff;
           font-weight: 600;
-          border-bottom: 1px solid #D9DBDF;
+          border-bottom: 1px solid #d9dbdf;
         }
         tr {
           width: 100%;
@@ -182,10 +184,10 @@ export default {
           line-height: 36px;
           text-align: center;
         }
-        td{
+        td {
           font-family: PingFangSC-Regular;
-font-size: 13px;
-color: #4B4A4B;
+          font-size: 13px;
+          color: #4b4a4b;
         }
       }
     }
@@ -233,18 +235,19 @@ color: #4B4A4B;
   .plan-content {
     background-color: #fff;
     padding: 0px 11px;
-
     .plan-list {
       position: relative;
       background-color: #f7f7f7;
-      height: 106px;
+      height: 126px;
       display: flex;
       padding-right: 20px;
       padding-left: 10px;
       padding-top: 16px;
       margin-bottom: 10px;
+      padding-bottom: 20px;
       .message {
         flex: 12;
+        height: 85%;
       }
       .left {
         height: 30px;
@@ -304,7 +307,7 @@ color: #4B4A4B;
       }
       .time {
         flex: 3;
-
+        height: 85%;
         p {
           font-family: DIN-Regular;
           font-size: 12px;

src/pages/contractRepayment/repay-details.vue

@@ -36,7 +36,7 @@
         </item>
         <item>
           <div slot="name">租赁物数量</div>
-          <div slot="content">{{ detailInfo.lease_num }}</div>
+          <div slot="content">{{ detailInfo.product_num }}</div>
         </item>
 
       </list-item>
@@ -88,7 +88,7 @@ export default {
         division_n: '',
         total_price: '',
         product_plan_id_n: '',
-        lease_num: '',
+        product_num: '',
       },
       lists: [{
         'lease_item_car_num': 'GH',

src/pages/contractStart/add-car.vue

@@ -128,18 +128,18 @@
           <div slot="name">商务政策</div>
           <input
             slot="content"
-            v-model="detail.product_plan_name"
+            v-model="detail.product_plan_id_n"
             placeholder="请选择合同政策"
             @click="selectProductPlan"
           >
         </item>
         <item v-if="read">
           <div slot="name">商务政策</div>
-          <input slot="content" v-model="detail.product_plan_name" readonly placeholder="暂无数据" >
+          <input slot="content" v-model="detail.product_plan_id_n" readonly placeholder="暂无数据" >
         </item>
         <item>
           <div slot="name">租赁物数量</div>
-          <input slot="content" v-model="detail.lease_num" readonly="read" placeholder="请输入租赁物数量" >
+          <input slot="content" v-model="detail.product_num " readonly="read" placeholder="请输入租赁物数量" >
         </item>
       </list-item>
       <div class="userInfo">设备清单</div>
@@ -292,7 +292,7 @@ export default {
         departure_date: '',
       },
       detail: {
-        lease_num: '',
+        product_num: '',
         first_pay: '',
         gps_fee: '',
         bp_name: '',
@@ -302,7 +302,6 @@ export default {
         division: '',
         division_n: '',
         product_plan_id: '',
-        product_plan_name: '',
         project_id: '',
         bp_id: '',
       },
@@ -612,7 +611,7 @@ export default {
         object: {},
         returnItem: function (index, obj) {
           vm.detail.product_plan_id = obj.bp_type
-          vm.detail.product_plan_name = obj.bp_type_n
+          vm.detail.product_plan_id_n = obj.bp_type_n
         },
       })
     },

src/pages/help/feedback.vue

@@ -24,7 +24,7 @@
               :key="index"
               class="file"
             >
-              <img :src="item.picture" @click="showBigPicture(item.picture)" >
+              <img :src="item.picture" class="file-img" @click="showBigPicture(item.picture)" >
               <div class="close" @click="remove_pic(item.attachment_id,index)">
                 <img src="@/assets/userBind/deleteIcon.png" >
               </div>
@@ -46,6 +46,8 @@
   </h-view>
 </template>
 <script>
+import ps from '../../assets/constractSigning/bank.png'
+
 export default {
   data () {
     return {
@@ -333,7 +335,7 @@ export default {
         align-items: center;
         justify-content: center;
         margin-left: 20px;
-        img {
+        .file-img {
           width: 80px;
           height: 80px;
         }

src/pages/videoSign/tab.vue

@@ -14,10 +14,10 @@
   </div>
 </template>
 <script>
-import signed from '@/assets/distributorSign/icon-signed.png'
-import finished from '@/assets/distributorSign/icon-finished.png'
-import sign from '@/assets/distributorSign/icon-sign.png'
-import finish from '@/assets/distributorSign/icon-finish.png'
+import signed from '@/assets/contractStart/noY.png'
+import finished from '@/assets/contractStart/confirmY.png'
+import sign from '@/assets/contractStart/noN.png'
+import finish from '@/assets/contractStart/confirmN.png'
 
 export default {
   props: {