Merge branch 'ren' into develop

src/pages/contractInquire/contract-records.vue

 <!--
  * @Author: your name
  * @Date: 2019-10-31 09:49:57
- * @LastEditTime: 2019-11-13 10:07:57
+ * @LastEditTime: 2019-11-14 16:32:55
  * @LastEditors: Please set LastEditors
  * @Description: 合同查询--记录
  * @FilePath:
@@ -58,8 +58,8 @@
             <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">逾期{{ item.due_times }}期</span>
+            <div><span>融资金额</span><p class="bold">{{ parseFloat(item.finance_amount).toFixed(2) | currency }}</p></div>
+            <span class="red">已逾期</span>
             <section @click="toRepayDetail(item.project_id)">
               <img src="@/assets/contractRepayment/view.png" alt="">
               <span>查看合同明细</span>
@@ -88,8 +88,8 @@
             <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">逾期{{ item.due_times }}期</span>
+            <div><span>融资金额</span><p class="bold">{{ parseFloat(item.finance_amount).toFixed(2) | currency }}</p></div>
+            <span class="red">已逾期</span>
             <section @click="toRepayDetail(item.project_id)">
               <img src="@/assets/contractRepayment/view.png" alt="">
               <span>查看合同明细</span>
@@ -117,8 +117,8 @@
             <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">逾期{{ item.due_times }}期</span>
+            <div><span>融资金额</span><p class="bold">{{ parseFloat(item.finance_amount).toFixed(2) | currency }}</p></div>
+            <span class="red">已逾期</span>
             <section @click="toRepayDetail(item.project_id)">
               <img src="@/assets/contractRepayment/view.png" alt="">
               <span>查看合同明细</span>
@@ -146,8 +146,8 @@
             <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">逾期{{ item.due_times }}期</span>
+            <div><span>融资金额</span><p class="bold">{{ parseFloat(item.finance_amount).toFixed(2) | currency }}</p></div>
+            <span class="red">已逾期</span>
             <section @click="toRepayDetail(item.project_id)">
               <img src="@/assets/contractRepayment/view.png" alt="">
               <span>查看合同明细</span>
@@ -175,8 +175,8 @@
             <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">逾期{{ item.due_times }}期</span>
+            <div><span>融资金额</span><p class="bold">{{ parseFloat(item.finance_amount).toFixed(2) | currency }}</p></div>
+            <span class="red">已逾期</span>
             <section @click="toRepayDetail(item.project_id)">
               <img src="@/assets/contractRepayment/view.png" alt="">
               <span>查看合同明细</span>

src/pages/contractInquire/repay-detail.vue

 <!--
  * @Author: your name
  * @Date: 2019-10-31 09:49:57
- * @LastEditTime: 2019-11-08 09:23:51
+ * @LastEditTime: 2019-11-14 16:51:26
  * @LastEditors: Please set LastEditors
  * @Description: 合同查询--明细
  * @FilePath:
@@ -73,6 +73,7 @@
             </div>
           </div>
           <div slot="content">
+            <span :class="['status','red']">{{ '逾期X期' }}</span>
             <div class="plan" @click="toRepayPlans(item.contract_id)">
               <img src="@/assets/contractRepayment/plan.png" alt="">
               <span>还款计划</span>
@@ -157,25 +158,14 @@ export default {
 </script>
 <style lang='less' >
 #repay-detail {
-  .h-header {
-    background-color: #1D3FFF;
-    .h-header-btn {
-      img {
-        width: 16px;
-        height: 16px;
-        margin-left: 4px;
-      }
-
-      span {
-        font-family: PingFangSC-Semibold;
-        margin-left: 16px;
-        font-size: 17px;
-        letter-spacing: 0.61px;
-        line-height: 24px;
-      }
-    }
+   .status{
+    margin-bottom:20px;
+    display: inline-block;
   }
-
+    .red{
+      color: red;
+      border-bottom: 1px solid red;
+    }
   .repay-content {
     .header {
       position: relative;

src/pages/distributorSign/contract-details.vue

@@ -2,7 +2,7 @@
  * @Description: 合同详情
  * @Author: your name
  * @Date: 2019-09-25 15:38:21
- * @LastEditTime: 2019-11-13 18:38:45
+ * @LastEditTime: 2019-11-14 09:08:44
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -190,16 +190,7 @@
           <div slot="content" class="in-detail"><img src="@/assets/constractSigning/detail.png" alt=""></div>
         </item>
       </list-item>
-      <!-- <list-item :item-height="56">
-        <item :proportion="[4,1]">
-          <div slot="name" class="aguremrnt-list">
-            <img src="@/assets/distributorSign/gray.png" alt="" class="pics">
-            <p class="second">经销商担保协议</p>
-            <img src="@/assets/distributorSign/unread.png" alt="" class="read">
-          </div>
-          <img slot="content" src="@/assets/distributorSign/into.png" alt="">
-        </item>
-      </list-item> -->
+
     </h-content>
     <bottom-tab v-if="confirm_status!=='APPROVED'" class="footer-button">
       <tab-button class="approve" @click.native="contractConfirm('APPROVED')">

src/pages/home/home-page.vue

@@ -2,7 +2,7 @@
    * @Descrip: 主页
  * @Author: your name
  * @Date: 2019-10-10 14:25:15
- * @LastEditTime: 2019-11-13 11:04:08
+ * @LastEditTime: 2019-11-14 09:56:22
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -106,6 +106,7 @@ export default {
                 vm.province = window.localStorage.getItem('province')
               } else {
                 // 没有就定位当前位置
+                console.log(res)
                 vm.city = res.address.city
                 vm.province = res.address.province
               }

src/pages/productQuery/product-detailed.vue

@@ -2,7 +2,7 @@
  * @Descrip: 产品明细
  * @Author: your name
  * @Date: 2019-10-15 14:30:00
- * @LastEditTime: 2019-11-13 14:44:06
+ * @LastEditTime: 2019-11-14 15:19:39
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -178,7 +178,6 @@ export default {
         vueTouch: function (s, e) {
           let clientHeight = document.body.clientHeight // 屏幕可视高度
           let procnfGather = document.getElementsByClassName('procnf')[0].getBoundingClientRect() // 配置信息元素集合
-          console.log(procnfGather)
           let detailGather = document.getElementsByClassName('prodetail')[0].getBoundingClientRect() // 详情信息元素集合
           let baseGather = document.getElementsByClassName('base')[0].getBoundingClientRect() // 基本信息元素集合
           if (clientHeight - procnfGather.top >= procnfGather.height) {