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

src/pages/contractInquire/contract-records.vue

 <!--
  * @Author: your name
  * @Date: 2019-10-31 09:49:57
- * @LastEditTime: 2019-11-08 15:16:00
+ * @LastEditTime: 2019-11-11 16:58:14
  * @LastEditors: Please set LastEditors
  * @Description: 合同查询--记录
  * @FilePath:
@@ -29,18 +29,23 @@
       </div>
     </div>
 
-    <h-content v-if="data!==null" class="pay-content">
-      <scroll ref="scroll"
-        :updateData="[lists]"
-        :pullUp="true"
-      >
-
+    <!-- 全部合同记录 -->
+    <scroll
+      v-if="selected === 'all'"
+      ref="scroll"
+      :updateData="[lists]"
+      :pullUp="true"
+    >
+      <div class="pay-content">
         <div v-for="(item,index) in lists" :key="index" class="contract-item">
           <div class="header">
             <img src="@/assets/contractRepayment/contract.png" alt="">
             <h2>{{ item.project_number }}</h2>
-            <!-- 状态用类名控制  待还款orange,待签约blue,还款中green,已结清black -->
-            <p class="green">待还款</p>
+            <!-- 状态用类名控制  待还款orange,待签约green,还款中blue,已结清black -->
+            <p v-if="item.contract_status_n === '待首付'" class="green">待签约</p>
+            <p v-if="item.contract_status_n === '首付还款中'" class="orange">代还款</p>
+            <p v-if="item.contract_status_n === '还款中'" class="blue">还款中</p>
+            <p v-if="item.contract_status_n === '已结清'" class="black">已结清</p>
           </div>
           <div class="center">
             <div><span>承租人</span><p>{{ item.bp_name }}</p></div>
@@ -54,8 +59,125 @@
             </section>
           </div>
         </div>
-      </scroll>
-    </h-content>
+      </div>
+
+    </scroll>
+    <!-- 待签约 -->
+    <scroll
+      v-if="selected === 'one'"
+      ref="scroll"
+      :updateData="[unSignedLists]"
+      :pullUp="true"
+    >
+      <div class="pay-content">
+
+        <div v-for="(item,index) in unSignedLists" :key="index" class="contract-item">
+          <div class="header">
+            <img src="@/assets/contractRepayment/contract.png" alt="">
+            <h2>{{ item.project_number }}</h2>
+            <p class="green">待签约</p>
+          </div>
+          <div class="center">
+            <div><span>承租人</span><p>{{ item.bp_name }}</p></div>
+            <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>
+            <section @click="toRepayDetail(item.project_id)">
+              <img src="@/assets/contractRepayment/view.png" alt="">
+              <span>查看合同明细</span>
+            </section>
+          </div>
+        </div>
+      </div>
+    </scroll>
+    <!-- 待还款 -->
+    <scroll
+      v-if="selected === 'two'"
+      ref="scroll"
+      :updateData="[unRepayLists]"
+      :pullUp="true"
+    >
+      <div class="pay-content">
+
+        <div v-for="(item,index) in unRepayLists" :key="index" class="contract-item">
+          <div class="header">
+            <img src="@/assets/contractRepayment/contract.png" alt="">
+            <h2>{{ item.project_number }}</h2>
+            <p class="orange">待还款</p>
+          </div>
+          <div class="center">
+            <div><span>承租人</span><p>{{ item.bp_name }}</p></div>
+            <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>
+            <section @click="toRepayDetail(item.project_id)">
+              <img src="@/assets/contractRepayment/view.png" alt="">
+              <span>查看合同明细</span>
+            </section>
+          </div>
+        </div>
+      </div>
+    </scroll>
+    <!-- 还款中 -->
+    <scroll
+      v-if="selected === 'three'"
+      ref="scroll"
+      :updateData="[repayingLists]"
+      :pullUp="true"
+    >
+      <div class="pay-content">
+
+        <div v-for="(item,index) in repayingLists" :key="index" class="contract-item">
+          <div class="header">
+            <img src="@/assets/contractRepayment/contract.png" alt="">
+            <h2>{{ item.project_number }}</h2>
+            <p class="blue">还款中</p>
+          </div>
+          <div class="center">
+            <div><span>承租人</span><p>{{ item.bp_name }}</p></div>
+            <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>
+            <section @click="toRepayDetail(item.project_id)">
+              <img src="@/assets/contractRepayment/view.png" alt="">
+              <span>查看合同明细</span>
+            </section>
+          </div>
+        </div>
+      </div>
+    </scroll>
+    <!-- 已结清 -->
+    <scroll
+      v-if="selected === 'four'"
+      ref="scroll"
+      :updateData="[repayedLists]"
+      :pullUp="true"
+    >
+      <div class="pay-content">
+
+        <div v-for="(item,index) in repayedLists" :key="index" class="contract-item">
+          <div class="header">
+            <img src="@/assets/contractRepayment/contract.png" alt="">
+            <h2>{{ item.project_number }}</h2>
+            <p class="black">已结清</p>
+          </div>
+          <div class="center">
+            <div><span>承租人</span><p>{{ item.bp_name }}</p></div>
+            <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>
+            <section @click="toRepayDetail(item.project_id)">
+              <img src="@/assets/contractRepayment/view.png" alt="">
+              <span>查看合同明细</span>
+            </section>
+          </div>
+        </div>
+      </div>
+    </scroll>
     <h-content v-if="data===null" class="null">
       <div class="display">
         <img src="@/assets/contractRepayment/null.png" alt="">
@@ -76,8 +198,13 @@ export default {
     return {
       // data: null, // 无记录时
       data: 1,
-      lists: [],
+      lists: [], // 全部记录
       selected: 'all',
+      unSignedLists: [], // 待签约
+      unRepayLists: [], // 待还款
+      repayingLists: [], // 还款中
+      repayedLists: [], // 已结清
+
     }
   },
   computed: {},
@@ -119,6 +246,10 @@ export default {
             vm.data = 1
           }
           vm.lists = res.lists
+          vm.unSignedLists = res.lists.filter(item => item.contract_status_n === '待首付') // 待签约
+          vm.unRepayLists = res.lists.filter(item => item.contract_status_n === '首付还款中') // 待还款
+          vm.repayingLists = res.lists.filter(item => item.contract_status_n === '还款中') // 还款中
+          vm.repayedLists = res.lists.filter(item => item.contract_status_n === '已结清') // 已结清
           if (res.lists.length > 0 && res.lists.length < 10) {
             vm.$refs.scroll.update(true)
           }
@@ -210,6 +341,7 @@ export default {
 
   .pay-content {
     padding: 8px 8px;
+    padding-bottom: 104px;
 
     .contract-item {
       height: 208px;

src/pages/contractInquire/repay-detail.vue

@@ -43,7 +43,7 @@
         </item>
         <item>
           <div slot="name">商务政策</div>
-          <div slot="content">{{detailInfo.product_plan_id_n}}</div>
+          <div slot="content">{{ detailInfo.product_plan_id_n }}</div>
         </item>
         <item>
           <div slot="name">租赁物数量</div>

src/pages/contractInquire/repay-plans.vue

@@ -19,7 +19,7 @@
       <div class="total">
         <div class="sum">
           <div>融资额</div>
-          <p>{{info.total_rental_sum | currency}}</p>
+          <p>{{ info.total_rental_sum | currency }}</p>
           <img src="@/assets/contractInquire/num.png" alt="">
           <h3><span>{{ info.lease_times }}</span>期</h3>
         </div>
@@ -148,7 +148,7 @@ export default {
 </script>
 <style lang='less'>
 #repay-plans {
- 
+
   .total {
     position: relative;
     background-color: #1D3FFF;

src/pages/contractRepayment/refund.vue

@@ -107,6 +107,7 @@ export default {
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
+      vm.show = false
       vm.getRefund()
     })
   },

src/pages/contractRepayment/repay-details.vue

@@ -28,7 +28,7 @@
         </item>
         <item>
           <div slot="name">合同金额</div>
-          <div slot="content">{{ detailInfo.total_price }}</div>
+          <div slot="content">{{ detailInfo.total_price|currency }}</div>
         </item>
         <item>
           <div slot="name">商务政策</div>

src/pages/contractRepayment/repay-plan.vue

@@ -27,7 +27,6 @@
         </div>
       </div>
     </h-content>
-
   </h-view>
 </template>
 

src/pages/contractSigning/contract-detail.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-11-08 10:41:41
+ * @LastEditTime: 2019-11-11 13:58:43
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->

src/pages/contractSigning/contract-signing.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-11-08 14:49:14
+ * @LastEditTime: 2019-11-11 14:52:00
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -19,62 +19,64 @@
     </div>
     <div class="hinput">
       <div class="search-box">
-        <input type="text" placeholder="请输入进件号/承租人名称">
+        <input type="text" placeholder="请输入合同号/承租人名称">
         <img src="@/assets/constractSigning/search.png" alt="" style="width:18px">
       </div>
     </div>
 
-    <h-content v-if="num === 1">
-      <scroll
-        ref="scroll"
-        :updateData="[submitLists]"
-        :pullUp="true"
-      >
-        <div class="wrap">
-          <div v-for="(item,index) in submitLists" :key="index" class="contract-lists" >
-            <div class="pro-code" @click="goDetails(item)">
-              <img src="@/assets/distributorSign/fileIcon.png" alt="" class="file-icon">
-              <p>
-                <span>进件号</span>
-                <span>{{ item.project_number }}</span>
-              </p>
-              <img src="@/assets/distributorSign/goDetails.png" alt="" class="arrow">
-            </div>
-            <div class="box">
-              <div><p>承租人</p><p>{{ item.bp_name }}</p></div>
-              <div><p>合同租金</p><p class="money">{{ item.total_price|currency }}</p></div>
-              <div><p>申请时间</p><p>{{ dateConverse(item.confirm_start_date) }}</p></div>
-            </div>
+    <!-- <h-content > -->
+    <scroll
+      v-if="num === 1"
+      ref="scroll"
+      :updateData="[submitLists]"
+      :pullUp="true"
+    >
+      <div class="wrap">
+        <div v-for="(item,index) in submitLists" :key="index" class="contract-lists" >
+          <div class="pro-code" @click="goDetails(item)">
+            <img src="@/assets/distributorSign/fileIcon.png" alt="" class="file-icon">
+            <p>
+              <span>合同号</span>
+              <span>{{ item.project_number }}</span>
+            </p>
+            <img src="@/assets/distributorSign/goDetails.png" alt="" class="arrow">
+          </div>
+          <div class="box">
+            <div><p>承租人</p><p>{{ item.bp_name }}</p></div>
+            <div><p>合同租金</p><p class="money">{{ item.total_price|currency }}</p></div>
+            <div><p>申请时间</p><p>{{ dateConverse(item.confirm_start_date) }}</p></div>
           </div>
         </div>
-      </scroll>
-    </h-content>
+      </div>
+    </scroll>
+    <!-- </h-content> -->
 
-    <h-content v-if="num === 2">
-      <scroll
-        ref="scrollList"
-        :updateData="[approvedLists]"
-        :pullUp="true"
-      >
-        <div class="wrap">
-          <div v-for="(item,index) in approvedLists" :key="index" class="contract-lists" >
-            <div class="pro-code" @click="goDetails(item)">
-              <img src="@/assets/distributorSign/fileIcon.png" alt="" class="file-icon">
-              <p>
-                <span>进件号</span>
-                <span>{{ item.project_number }}</span>
-              </p>
-              <img src="@/assets/distributorSign/goDetails.png" alt="" class="arrow">
-            </div>
-            <div class="box">
-              <div><p>承租人</p><p>{{ item.bp_name }}</p></div>
-              <div><p>合同租金</p><p class="money">{{ item.total_price|currency }}</p></div>
-              <div><p>申请时间</p><p>{{ dateConverse(item.confirm_start_date) }}</p></div>
-            </div>
+    <!-- <h-content > -->
+    <scroll
+      v-if="num === 2"
+      ref="scrollList"
+      :updateData="[approvedLists]"
+      :pullUp="true"
+    >
+      <div class="wrap">
+        <div v-for="(item,index) in approvedLists" :key="index" class="contract-lists" >
+          <div class="pro-code" @click="goDetails(item)">
+            <img src="@/assets/distributorSign/fileIcon.png" alt="" class="file-icon">
+            <p>
+              <span>合同号</span>
+              <span>{{ item.project_number }}</span>
+            </p>
+            <img src="@/assets/distributorSign/goDetails.png" alt="" class="arrow">
+          </div>
+          <div class="box">
+            <div><p>承租人</p><p>{{ item.bp_name }}</p></div>
+            <div><p>合同租金</p><p class="money">{{ item.total_price|currency }}</p></div>
+            <div><p>申请时间</p><p>{{ dateConverse(item.confirm_start_date) }}</p></div>
           </div>
         </div>
-      </scroll>
-    </h-content>
+      </div>
+    </scroll>
+    <!-- </h-content> -->
   </h-view>
 </template>
 
@@ -105,9 +107,9 @@ export default {
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-       if (from.name === 'MyInfo') {
-         vm.user_bp_type = vm.$route.params.user_bp_type
-       }
+      if (from.name === 'MyInfo') {
+        vm.user_bp_type = vm.$route.params.user_bp_type
+      }
       vm.contractList()
     })
     // next()
@@ -234,6 +236,9 @@ export default {
         }
     }
   }
+  .scrollContent{
+      padding-bottom: 90px;
+    }
   .wrap {
       width: 100%;
       padding: 8px;

src/pages/contractSigning/entry-info.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-11-08 10:49:33
+ * @LastEditTime: 2019-11-11 16:38:59
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -47,8 +47,14 @@
           </item>
           <item>
             <div slot="name" >支行名称</div>
-            <input v-if="user_bp_type !== 'GUTA' && confirm_status !== 'APPROVED'" slot="content" v-model="bank_lists[0].bank_branch_name" type="text" placeholder="请输入支行名称">
-            <input v-if="user_bp_type === 'GUTA' || confirm_status === 'APPROVED'" slot="content" v-model="bank_lists[0].bank_branch_name" readonly type="text" placeholder="请输入支行名称">
+            <input
+              v-if="user_bp_type !== 'GUTA' && confirm_status !== 'APPROVED'" slot="content" v-model="bank_lists[0].bank_branch_name" type="text"
+              placeholder="请输入支行名称"
+            >
+            <input
+              v-if="user_bp_type === 'GUTA' || confirm_status === 'APPROVED'" slot="content" v-model="bank_lists[0].bank_branch_name" readonly
+              type="text" placeholder="请输入支行名称"
+            >
           </item>
 
         </list-item>
@@ -101,7 +107,7 @@ export default {
   computed: {},
   watch: {},
   activated () {
-    console.log('................',this.$route.params.user_bp_type)
+    console.log('................', this.$route.params.user_bp_type)
     this.user_bp_type = this.$route.params.user_bp_type
     this.name = this.$route.params.name
     this.confirm_status = this.$route.params.confirm_status

src/pages/distributorSign/contract-list.vue

@@ -5,7 +5,7 @@
    -->
 
 <template>
-  <h-view id="sign" class="public-style" title="经销商签约">
+  <h-view class="distribute-sign" title="经销商签约">
     <h-header :proportion="[5,1,1]" class="bar-custom">
       <div slot="left" class="h-header-btn">
         <img src="@/assets/userBind/arrow.png" @click="$routeGo()">
@@ -15,12 +15,12 @@
     <Tab @getTabNum="getTabNum"/>
     <div class="hinput">
       <div class="search-box">
-        <input type="text" placeholder="请输入进件号/承租人名称">
+        <input type="text" placeholder="请输入合同号/承租人名称">
         <img src="@/assets/distributorSign/search.png" alt="">
       </div>
     </div>
-    <h-content v-if="tabNum === 0">
       <scroll
+        v-if="tabNum === 0"
         ref="scroll"
         :updateData="[submitLists]"
         :pullUp="true"
@@ -30,7 +30,7 @@
             <div class="pro-code" @click="goDetails(item)">
               <img src="@/assets/distributorSign/fileIcon.png" alt="" class="file-icon">
               <p>
-                <span>进件号</span>
+                <span>合同号</span>
                 <span>{{ item.project_number }}</span>
               </p>
               <img src="@/assets/distributorSign/goDetails.png" alt="" class="arrow">
@@ -43,10 +43,9 @@
           </div>
         </div>
       </scroll>
-    </h-content>
 
-    <h-content v-if="tabNum === 1">
       <scroll
+        v-if="tabNum === 1"
         ref="scrollList"
         :updateData="[approvedLists]"
         :pullUp="true"
@@ -56,7 +55,7 @@
             <div class="pro-code" @click="goDetails(item)">
               <img src="@/assets/distributorSign/fileIcon.png" alt="" class="file-icon">
               <p>
-                <span>进件号</span>
+                <span>合同号</span>
                 <span>{{ item.project_number }}</span>
               </p>
               <img src="@/assets/distributorSign/goDetails.png" alt="" class="arrow">
@@ -69,7 +68,6 @@
           </div>
         </div>
       </scroll>
-    </h-content>
 
   </h-view>
 </template>
@@ -139,10 +137,48 @@ export default {
 }
 </script>
 <style lang="less" scoped>
-  #sign {
-    .wrap {
+.distribute-sign {
+  .hinput {
+    width: 100%;
+    height: 68px;
+    border-bottom:1px solid #ccc;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-top: 3px;
+    background: #fff;
+
+    .search-box {
+      position: relative;
+      z-index: 50;
+      width: 93.6%;
+      height: 36px;
+      font-size: 14px;
+      color: #B4B4B5;
+      letter-spacing: 0;
+      font-family: PingFangSC-Regular;
+      border: 1px solid rgba(56,63,69,0.60);
+      border-radius: 4px;
+      display: flex;
+      flex-direction: row;
+      justify-content: center;
+      align-items: center;
+
+      input {
+          width: 90%;height: 100%;
+          opacity: 0.4;
+            border: none;
+        line-height: 34px;
+        }
+    }
+  }
+  // .scrollContent{
+  //     padding-bottom: 90px;
+  //   }
+  .wrap {
       width: 100%;
       padding: 8px;
+      padding-bottom: 104px;
       .contract-lists {
         width: 100%;
         background: #fff;
@@ -211,45 +247,7 @@ export default {
           }
         }
       }
-    }
-
-    .hinput {
-      position: relative;
-      z-index: 50;
-      width: 100%;
-      height: 68px;
-      border-bottom: 1px solid #cccccc70;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      margin-top: 3px;
-      background: #fff;
-      margin-bottom: 9px;
-
-      .search-box {
-        width: 93.6%;
-        height: 36px;
-        font-size: 14px;
-        color: #B4B4B5;
-        letter-spacing: 0;
-        font-family: PingFangSC-Regular;
-        border: 1px solid rgba(56, 63, 69, 0.60);
-        border-radius: 4px;
-        display: flex;
-        flex-direction: row;
-        justify-content: center;
-        align-items: center;
-
-        input {
-          width: 90%;
-          height: 100%;
-          opacity: 0.4;
-          border: none;
-          line-height: 34px;
-        }
-      }
-    }
-
   }
+}
 
 </style>

src/pages/distributorSign/legal-person.vue

@@ -2,7 +2,7 @@
  * @Description: 法人信息
  * @Author: your name
  * @Date: 2019-09-26 15:09:24
- * @LastEditTime: 2019-10-09 20:38:52
+ * @LastEditTime: 2019-11-11 14:00:00
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -48,7 +48,7 @@
         <input slot="content" v-model="baseInfo.auth_flag" readonly>
       </item>
     </list-item>
-    <div class="equipment-list">{{ baseInfo.auth_flag === '是' ? '法定授权人': '法定代表人' }}</div>
+    <div class="equipment-list" v-if="baseInfo.auth_flag === '是'">{{ '法定授权人' }}</div>
 
     <!-- 授权人 -->
     <list-item v-show="baseInfo.auth_flag === '是'" :item-height="44" class="second-part">
@@ -56,6 +56,10 @@
         <div slot="name" class="font-color">姓名</div>
         <input slot="content" v-model="baseInfo.auth_person_name" readonly>
       </item>
+      <item>
+        <div slot="name" class="font-color">手机号</div>
+        <input slot="content" v-model="baseInfo.auth_cell_phone" readonly>
+      </item>
       <item>
         <div slot="name" class="font-color">证件号</div>
         <input slot="content" v-model="baseInfo.auth_person_id_card" readonly>
@@ -71,7 +75,8 @@
     </list-item>
 
     <!-- 法定代表人 -->
-    <list-item v-show="baseInfo.auth_flag === '否'" :item-height="44" class="second-part">
+    <div class="equipment-list">法定代表人</div>
+    <list-item :item-height="44" class="second-part">
       <item>
         <div slot="name" class="font-color">姓名</div>
         <input slot="content" v-model="baseInfo.legal_person" readonly>

src/pages/financingTrial/financing-trial.vue

@@ -19,42 +19,42 @@
       <img src="@/assets/contractInquire/search.png" alt="">
       <input type="text" placeholder="请输入产品名称">
     </div>
-      <scroll
-        ref="scroll"
-        :updateData="[lists]"
-        :pullUp="true"
-      >
-        <section v-for="(item,index) in lists" :key="index">
-          <div class="descript" @click="goDetails(item.product_plan_id)">
-            <img src="@/assets/trial/product.png" alt="">
-            <p class="produc">{{ item.product_plan_id_n }}</p>
-            <img class="linkPic" src="@/assets/distributorSign/righticon.png" alt="">
-          </div>
+    <scroll
+      ref="scroll"
+      :updateData="[lists]"
+      :pullUp="true"
+    >
+      <section v-for="(item,index) in lists" :key="index">
+        <div class="descript" @click="goDetails(item.product_plan_id)">
+          <img src="@/assets/trial/product.png" alt="">
+          <p class="produc">{{ item.product_plan_id_n }}</p>
+          <img class="linkPic" src="@/assets/distributorSign/righticon.png" alt="">
+        </div>
 
-          <div class="tario">
-            <div class="wrap">
-              <p class="ratio">
-                <span>保证金比例</span>
-                <span>{{ item.deposit_ratio_n }}</span>
-              </p>
-              <p>
-                <span>手续费比例</span>
-                <span>{{ item.lease_charge_ratio_n }}</span>
-              </p>
-            </div>
-            <div class="wrap">
-              <p>
-                <span>年利率</span>
-                <span>{{ item.int_rate_n }}</span>
-              </p>
-              <p>
-                <span>期&nbsp;&nbsp;&nbsp;限</span>
-                <span>{{ item.lease_times }}期</span>
-              </p>
-            </div>
+        <div class="tario">
+          <div class="wrap">
+            <p class="ratio">
+              <span>保证金比例</span>
+              <span>{{ item.deposit_ratio_n }}</span>
+            </p>
+            <p>
+              <span>手续费比例</span>
+              <span>{{ item.lease_charge_ratio_n }}</span>
+            </p>
+          </div>
+          <div class="wrap">
+            <p>
+              <span>年利率</span>
+              <span>{{ item.int_rate_n }}</span>
+            </p>
+            <p>
+              <span>期&nbsp;&nbsp;&nbsp;限</span>
+              <span>{{ item.lease_times }}期</span>
+            </p>
           </div>
-        </section>
-      </scroll>
+        </div>
+      </section>
+    </scroll>
   </h-view>
 </template>
 
@@ -116,8 +116,8 @@ export default {
          if (res.result === 'S') {
            vm.lists = res.lists
            if (res.lists.length > 0 && res.lists.length < 10) {
-            vm.$refs.scroll.update(true)
-          }
+             vm.$refs.scroll.update(true)
+           }
          } else {
            hlsPopup.showLongCenter(res.message)
          }
@@ -131,8 +131,8 @@ export default {
          if (res.result === 'S') {
            vm.lists = res.lists
            if (res.lists.length > 0 && res.lists.length < 10) {
-            vm.$refs.scroll.update(true)
-          }
+             vm.$refs.scroll.update(true)
+           }
          } else {
            hlsPopup.showLongCenter(res.message)
          }

src/pages/financingTrial/trial-repay-plan.vue

@@ -18,7 +18,7 @@
       <div class="total">
         <div class="sum">
           <div>融资额</div>
-          <p>{{info.finance_amount | currency}}</p>
+          <p>{{ info.finance_amount | currency }}</p>
           <img src="@/assets/contractInquire/num.png" alt="">
           <h3><span>{{ info.lease_times }}期</span></h3>
         </div>
@@ -43,7 +43,7 @@
         <img v-if="statu === 'green'" src="@/assets/contractInquire/green.png" alt="" class="left">
         <div class="time">
           <p>{{ item.due_date.substr(0,4) }}</p>
-            <span>{{ dateConverse(item.due_date).substr(5,10) }}</span>
+          <span>{{ dateConverse(item.due_date).substr(5,10) }}</span>
         </div>
         <div class="name">
           <p>款项</p>
@@ -137,7 +137,6 @@ export default {
         if (res.result === 'S') {
           vm.info = res.info
           vm.repayLists = res.lists.sort(vm.arrSort('times')) // 根据还款期排序
-          
         } else {
           hlsPopup.showLongCenter(res.message)
         }

src/pages/myProductCollection/my-product-list.Vue

@@ -28,8 +28,8 @@
       <list-item v-for="(item,index) in productList" :key="index">
         <item :proportion="[1,4]" @click.native="goDetailed(item.product_id,item.collect_status,item.bp_id)">
           <div slot="name" class="item-pic">
-            <img src="@/assets/homePage/WechatIMG2 Copy@2x.png" alt="">
-          </div>
+              <img :src="item.url" alt="">
+            </div>
           <div slot="content" class="item-content">
             <div class="pro-name">
               <p>{{ item.product_name }}</p>
@@ -87,6 +87,9 @@ export default {
         hlsPopup.hideLoading()
         if (res.result === 'S') {
           vm.productList = res.lists
+          res.lists.forEach(item => {
+                item['url'] = process.env.filePath + 'attachment_id=' + item.product_attachment_id + '&access_token=' + window.localStorage.access_token
+              })
           if (res.lists.length > 0 && res.lists.length < 10) {
             vm.$refs.scroll.update(true)
           }

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

@@ -34,7 +34,7 @@
                 <p>本次还款</p>
               </div>
               <div class="item-right">
-                <p>{{ e.due_amount|currency }}</p>
+                <p>{{ parseFloat(e.due_amount).toFixed(2)|currency }}</p>
                 <p>{{ e.received_amount|currency }}</p>
                 <input v-model="e.amount" type="text" placeholder="请输入还款金额" >
               </div>
@@ -102,7 +102,7 @@ export default {
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      // vm.getDetail()
+      vm.getDetail()
     })
   },
 
@@ -312,7 +312,8 @@ export default {
               border: none;
               border-bottom: 1px solid #1d3fff;
               font-size: 13px;
-              text-align: center;
+              text-align: right;
+              float: right;
             }
             input::placeholder {
               font-family: PingFangSC-Regular;

src/pages/pay/firstPay/first-pay.vue

@@ -13,7 +13,7 @@
             <div class="title">当前应付</div>
             <div class="data">
               <span>￥</span>
-              {{ money |currency }}
+              {{ moneyToFix |currency }}
             </div>
           </div>
         </div>
@@ -27,7 +27,7 @@
             </div>
             <div class="pay-input">
               <span>应还首付款</span>
-              <input v-model="money" type="text" placeholder="请输入支付金额" >
+              <input v-model="moneyToFix" type="text" placeholder="请输入支付金额" >
               <div @click="createOrder">
                 <img src="@/assets/payment/into.png" >
               </div>
@@ -73,7 +73,11 @@ export default {
       }
     })
   },
-  computed: {},
+  computed: {
+    moneyToFix () {
+      return parseFloat(this.money).toFixed(2)
+    },
+  },
   watch: {},
   methods: {
     getDownPayment () {

src/pages/pay/payment/new-list.vue

@@ -39,7 +39,7 @@
               <img src="@/assets/payment/first-pay.png" >逾期利息
             </div>
             <div class="pay-input">
-              <span>应还利息</span>
+              <span>逾期利息</span>
               <input v-model="liquidated_damages" readonly type="text" placeholder="请输入支付金额" >
             </div>
           </div>
@@ -86,7 +86,7 @@ export default {
   },
   computed: {},
   watch: {
-    'pay_rent': {
+    'liquidated_damages': {
       handler () {
         this.money = parseFloat(parseFloat(this.pay_rent) + parseFloat(this.liquidated_damages))
       },

src/pages/productQuery/product-detailed.vue

@@ -15,67 +15,67 @@
         <span>产品明细</span>
       </div>
     </h-header>
-       <div class="tab-style" v-if="slide">
+    <div v-if="slide" class="tab-style">
       <div :class="{'done':num === 0,'undone':num !== 0}" @click="tabCheck(0)"><img :src="num === 0?baseInfoImg:unBaseInfo"><span>基本信息</span></div>
       <div :class="{'done':num === 1,'undone':num !== 1}" @click="tabCheck(1)"><img :src="num === 1?detail:unDetail"><span>商品详情</span></div>
       <div :class="{'done':num === 2,'undone':num !== 2}" @click="tabCheck(2)"><img :src="num === 2?config:unConfig"><span>产品配置</span></div>
     </div>
 
     <!-- 基本信息 -->
-    <h-content class="hcontent" v-swipeup="(e)=>vueTouch('上滑',e)" v-swipedown="(e)=>vueTouch('下滑',e)">
-      <scroll class="scrolls" ref="scrolls" :listenScroll="true" @scroll="startScroll">
-      <!-- 基本信息 -->
-       <div id="baseInfo" class="base">
-        <swipe :interval="5000" class="hls-swipe">
-        <swipe-item v-for="(item,index) in picLists" :key="index" class="hls-swipe">
-          <img :src="item.url" alt="">
-        </swipe-item>
-      </swipe>
-        <div class="base-content">
-          <div class="top-code">
-            <div>参数项 &nbsp;{{ baseInfo.product_code }}</div>
-            <div>{{ baseInfo.division_n }}</div>
-          </div>
-          <div class="pro-name">{{ baseInfo.product_name }}</div>
-          <div class="pro-price">
-            <p>参考价 <span class="prices">￥{{ baseInfo.plan_price | currency }}</span></p>
-            <p class="dates">价格有效期 &nbsp;{{ baseInfo.price_date_to | dateFormat }}</p>
-          </div>
-          <div class="agent">
-            <div class="items">
-              <img src="@/assets/productQuery/agent.png" alt="">
-              <p>{{ baseInfo.agent_bp_name }}</p>
+    <h-content v-swipeup="(e)=>vueTouch('上滑',e)" v-swipedown="(e)=>vueTouch('下滑',e)" class="hcontent">
+      <scroll ref="scrolls" :listenScroll="true" class="scrolls" @scroll="startScroll">
+        <!-- 基本信息 -->
+        <div id="baseInfo" class="base">
+          <swipe :interval="5000" class="hls-swipe">
+            <swipe-item v-for="(item,index) in picLists" :key="index" class="hls-swipe">
+              <img :src="item.url" alt="">
+            </swipe-item>
+          </swipe>
+          <div class="base-content">
+            <div class="top-code">
+              <div>参数项 &nbsp;{{ baseInfo.product_code }}</div>
+              <div>{{ baseInfo.division_n }}</div>
             </div>
-            <div class="items">
-              <img src="@/assets/productQuery/address.png" alt="">
-              <p>{{ baseInfo.business_address }} .{{ baseInfo.province_name }}</p>
+            <div class="pro-name">{{ baseInfo.product_name }}</div>
+            <div class="pro-price">
+              <p>参考价 <span class="prices">￥{{ baseInfo.plan_price | currency }}</span></p>
+              <p class="dates">价格有效期 &nbsp;{{ baseInfo.price_date_to | dateFormat }}</p>
             </div>
-            <div class="items">
-              <img src="@/assets/productQuery/call.png" alt="">
-              <p>{{ baseInfo.phone }}</p>
-            </div>
-            <div class="items">
-              <img src="@/assets/productQuery/house.png" alt="">
-              <p>{{ baseInfo.factory_bp_name }}</p>
+            <div class="agent">
+              <div class="items">
+                <img src="@/assets/productQuery/agent.png" alt="">
+                <p>{{ baseInfo.agent_bp_name }}</p>
+              </div>
+              <div class="items">
+                <img src="@/assets/productQuery/address.png" alt="">
+                <p>{{ baseInfo.business_address }} .{{ baseInfo.province_name }}</p>
+              </div>
+              <div class="items">
+                <img src="@/assets/productQuery/call.png" alt="">
+                <p>{{ baseInfo.phone }}</p>
+              </div>
+              <div class="items">
+                <img src="@/assets/productQuery/house.png" alt="">
+                <p>{{ baseInfo.factory_bp_name }}</p>
+              </div>
             </div>
           </div>
         </div>
-      </div>
 
-      <!-- 商品详情 -->
-      <div id="prodetail" ref="detail" class="pro-details prodetail">
-        <div class="equipment-list">商品详情</div>
+        <!-- 商品详情 -->
+        <div id="prodetail" ref="detail" class="pro-details prodetail">
+          <div class="equipment-list">商品详情</div>
 
-        <div v-for="item in picLists" :key="item.product_attachment_id" class="proPic">
-          <img :src="item.url" alt="">
-        </div>
+          <div v-for="item in picLists" :key="item.product_attachment_id" class="proPic">
+            <img :src="item.url" alt="">
+          </div>
 
-      </div>
-      <!-- 产品配置 -->
-      <div id="procfg" class="pro-details procnf">
-        <div class="equipment-list">产品配置</div>
-        <div class="table-wrap" v-html="confgInfo.product_properties"/>
-      </div>
+        </div>
+        <!-- 产品配置 -->
+        <div id="procfg" class="pro-details procnf">
+          <div class="equipment-list">产品配置</div>
+          <div class="table-wrap" v-html="confgInfo.product_properties"/>
+        </div>
       </scroll>
     </h-content>
     <bottom-tab class="footer-button">
@@ -163,23 +163,19 @@ export default {
         // tab切换
         tabCheck (num) {
           let scrollContent = document.getElementsByClassName('scrollContent')[0]
-          if(num === 0){
+          if (num === 0) {
             this.num = 0
             this.$refs.scrolls.scrollToElement(document.getElementsByClassName('base')[0])
-
-          }else if(num === 1){
+          } else if (num === 1) {
             this.num = 1
             this.$refs.scrolls.scrollToElement(document.getElementsByClassName('prodetail')[0])
-
-          }else{
+          } else {
             this.num = 2
             this.$refs.scrolls.scrollToElement(document.getElementsByClassName('procnf')[0])
-
           }
         },
 
         vueTouch: function (s, e) {
-
           let clientHeight = document.body.clientHeight // 屏幕可视高度
           let procnfGather = document.getElementsByClassName('procnf')[0].getBoundingClientRect() // 配置信息元素集合
           let detailGather = document.getElementsByClassName('prodetail')[0].getBoundingClientRect() // 详情信息元素集合
@@ -188,7 +184,7 @@ export default {
             this.num = 2
           } else if (clientHeight - detailGather.top >= detailGather.height) {
             this.num = 1
-          } else if ( -(baseGather.top) <= baseGather.height/2) {
+          } else if (-(baseGather.top) <= baseGather.height / 2) {
             this.num = 0
           }
         },
@@ -497,7 +493,7 @@ export default {
       .butt {
         width: 48%;
         margin-left: 3px;
-        
+
         border-radius: 4px;
       }
       .butt:nth-of-type(2) {

src/pages/productQuery/product-list.vue

@@ -8,7 +8,7 @@
     <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>
@@ -18,36 +18,36 @@
           <img src="@/assets/distributorSign/search.png" alt="">
         </div>
       </div>
-      <scroll 
-       ref="scroll"
-       :updateData="[lists]"
-       :pullUp="true"
+      <scroll
+        ref="scroll"
+        :updateData="[lists]"
+        :pullUp="true"
       >
-      
-      <div class="division-box">
 
-        <list-item v-for="(item,index) in lists" :key="index">
-          <item :proportion="[1,4]" @click.native="goDetailed(item.product_id,item.collect_status,item.bp_id)">
-            <div slot="name" class="item-pic">
-              <img :src="item.url" alt="">
-            </div>
-            <div slot="content" class="item-content">
-              <div class="pro-name">
-                <p>{{ item.product_name }}</p>
-                <img class="arrow" src="@/assets/productQuery/getIn.png" alt="" >
-              </div>
-              <div class="centers">
-                <p class="firsts1">{{ item.bp_type_n }}</p>
-                <p class="seconds1">{{ item.bp_name }}</p>
+        <div class="division-box">
+
+          <list-item v-for="(item,index) in lists" :key="index">
+            <item :proportion="[1,4]" @click.native="goDetailed(item.product_id,item.collect_status,item.bp_id)">
+              <div slot="name" class="item-pic">
+                <img :src="item.url" alt="">
               </div>
-              <div class="centers">
-                <p class="firsts1">参数项</p>
-                <p class="seconds1">{{ item.product_code }}</p>
+              <div slot="content" class="item-content">
+                <div class="pro-name">
+                  <p>{{ item.product_name }}</p>
+                  <img class="arrow" src="@/assets/productQuery/getIn.png" alt="" >
+                </div>
+                <div class="centers">
+                  <p class="firsts1">{{ item.bp_type_n }}</p>
+                  <p class="seconds1">{{ item.bp_name }}</p>
+                </div>
+                <div class="centers">
+                  <p class="firsts1">参数项</p>
+                  <p class="seconds1">{{ item.product_code }}</p>
+                </div>
               </div>
-            </div>
-          </item>
-        </list-item>
-      </div>
+            </item>
+          </list-item>
+        </div>
       </scroll>
     </h-content>
   </h-view>
@@ -82,13 +82,13 @@ export default {
        if (res.result === 'S') {
          vm.lists = res.lists
          res.lists.forEach(item => {
-                item['url'] = process.env.filePath + 'attachment_id=' + item.product_attachment_id + '&access_token=' + window.localStorage.access_token
-              })
-              if (res.lists.length > 0 && res.lists.length < 10) {
-            vm.$refs.scroll.update(true)
-          }
-              // vm.picLists = res.lists
-              // console.log('........',vm.picLists)
+           item['url'] = process.env.filePath + 'attachment_id=' + item.product_attachment_id + '&access_token=' + window.localStorage.access_token
+         })
+         if (res.lists.length > 0 && res.lists.length < 10) {
+           vm.$refs.scroll.update(true)
+         }
+         // vm.picLists = res.lists
+         // console.log('........',vm.picLists)
        } else {
          hlsPopup.showLongCenter(res.message)
        }

src/pages/productQuery/query-home.vue

@@ -10,7 +10,7 @@
     <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>

src/pages/videoSign/video-list.vue

@@ -20,7 +20,7 @@
           </div>
           <div class="right">
             <div class="right-top">
-              <span>进件号</span>
+              <span>合同号</span>
               <span>{{ item.project_number }}</span>
             </div>
             <div class="right-bottom">
@@ -30,7 +30,7 @@
                   <span>{{ item.bp_name }}</span>
                 </li>
                 <li>
-                  已还租金
+                  产品线
                   <span>{{ item.division_n }}</span>
                 </li>
                 <li>