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-11 15:59:08
+ * @LastEditTime: 2019-11-11 16:58:14
  * @LastEditors: Please set LastEditors
  * @Description: 合同查询--记录
  * @FilePath:
@@ -29,23 +29,23 @@
       </div>
     </div>
 
-<!-- 全部合同记录 -->
+    <!-- 全部合同记录 -->
     <scroll
       v-if="selected === 'all'"
       ref="scroll"
       :updateData="[lists]"
       :pullUp="true"
     >
-<div class="pay-content">
+      <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" v-if="item.contract_status_n === '待首付'">待签约</p>
-            <p class="orange" v-if="item.contract_status_n === '首付还款中'">代还款</p>
-            <p class="blue" v-if="item.contract_status_n === '还款中'">还款中</p>
-            <p class="black" v-if="item.contract_status_n === '已结清'">已结清</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>
@@ -59,23 +59,22 @@
             </section>
           </div>
         </div>
-</div>
+      </div>
 
     </scroll>
-<!-- 待签约 -->
+    <!-- 待签约 -->
     <scroll
       v-if="selected === 'one'"
       ref="scroll"
       :updateData="[unSignedLists]"
       :pullUp="true"
     >
-<div class="pay-content">
+      <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>
-            <!-- 状态用类名控制  待还款orange,待签约blue,还款中green,已结清black -->
             <p class="green">待签约</p>
           </div>
           <div class="center">
@@ -90,9 +89,9 @@
             </section>
           </div>
         </div>
-</div>
+      </div>
     </scroll>
-<!-- 待还款 -->
+    <!-- 待还款 -->
     <scroll
       v-if="selected === 'two'"
       ref="scroll"
@@ -105,7 +104,6 @@
           <div class="header">
             <img src="@/assets/contractRepayment/contract.png" alt="">
             <h2>{{ item.project_number }}</h2>
-            <!-- 状态用类名控制  待还款orange,待签约blue,还款中green,已结清black -->
             <p class="orange">待还款</p>
           </div>
           <div class="center">
@@ -122,7 +120,7 @@
         </div>
       </div>
     </scroll>
-<!-- 还款中 -->
+    <!-- 还款中 -->
     <scroll
       v-if="selected === 'three'"
       ref="scroll"
@@ -135,7 +133,6 @@
           <div class="header">
             <img src="@/assets/contractRepayment/contract.png" alt="">
             <h2>{{ item.project_number }}</h2>
-            <!-- 状态用类名控制  待还款orange,待签约blue,还款中green,已结清black -->
             <p class="blue">还款中</p>
           </div>
           <div class="center">
@@ -152,7 +149,7 @@
         </div>
       </div>
     </scroll>
-<!-- 已结清 -->
+    <!-- 已结清 -->
     <scroll
       v-if="selected === 'four'"
       ref="scroll"
@@ -165,7 +162,6 @@
           <div class="header">
             <img src="@/assets/contractRepayment/contract.png" alt="">
             <h2>{{ item.project_number }}</h2>
-            <!-- 状态用类名控制  待还款orange,待签约blue,还款中green,已结清black -->
             <p class="black">已结清</p>
           </div>
           <div class="center">

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>

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/financingTrial/financing-details.vue

@@ -44,7 +44,8 @@
         <item>
           <div slot="name" class="font-color">保证金</div>
           <span v-if="!equip_price" slot="content" class="autoColor">保证金额自动填充</span>
-          <span v-if="equip_price"
+          <span
+            v-if="equip_price"
             slot="content">{{ equip_price*info.deposit_ratio_n.replace("%","")/100 | currency }}</span>
         </item>
         <item>
@@ -76,9 +77,9 @@
           <div slot="content" class="autoColor">{{ price_date_to }}</div>
           <img src="@/assets/trial/date.png" alt="" class="date-pic" @click="showTime('YYYY-MM-DD')">
         </item>
-        <item @click.native="periodPull" :show-arrow="true">
+        <item :show-arrow="true" @click.native="periodPull">
           <div slot="name" class="font-color">还款周期</div>
-          <span slot="content">{{info.annual_pay_times_n}}</span>
+          <span slot="content">{{ info.annual_pay_times_n }}</span>
           <!-- <input slot="content" v-model="info.annual_pay_times_n" placeholder="月"> -->
         </item>
         <item>
@@ -161,7 +162,7 @@ export default {
   methods:
     {
     // 还款计划
-     goRepay() {
+      goRepay () {
         if (this.trial_flag) {
           this.$router.push({
             name: 'TrialRepayPlan',
@@ -220,7 +221,6 @@ export default {
             vm.annual_pay_times = obj.bp_type
           },
         })
-
       },
 
       // 试算明细查询
@@ -247,9 +247,9 @@ export default {
           hlsPopup.showLongCenter('请输入设备总价')
         } else if (!this.price_date_to) {
           hlsPopup.showLongCenter('请选择时间')
-     } else if(!this.gps_fee){
+        } else if (!this.gps_fee) {
           hlsPopup.showLongCenter('请输入GPS费用')
-     } else if(!this.insurance_fee){
+        } else if (!this.insurance_fee) {
           hlsPopup.showLongCenter('请输入保险押金费用')
         } else {
           let vm = this
@@ -260,12 +260,12 @@ export default {
               'equip_price': vm.equip_price,
               'down_payment': vm.equip_price * (vm.info.down_payment_ratio_n.replace('%', '') / 100),
               'deposit': vm.equip_price * (vm.info.deposit_ratio_n.replace('%', '') / 100),
-           'lease_charge': (vm.equip_price - vm.equip_price*vm.info.down_payment_ratio_n.replace("%","")/100)*(vm.info.lease_charge_ratio_n.replace("%","")/100),
+              'lease_charge': (vm.equip_price - vm.equip_price * vm.info.down_payment_ratio_n.replace('%', '') / 100) * (vm.info.lease_charge_ratio_n.replace('%', '') / 100),
               'due_date': (vm.price_date_to).substr(0, 10),
-           "lease_times": vm.info.lease_times,
-            "insurance_fee": vm.insurance_fee,
-            "gps_fee": vm.gps_fee,
-            "annual_pay_times": vm.annual_pay_times,
+              'lease_times': vm.info.lease_times,
+              'insurance_fee': vm.insurance_fee,
+              'gps_fee': vm.gps_fee,
+              'annual_pay_times': vm.annual_pay_times,
             },
           }
           vm.hlsPopup.showLoading('试算中，请稍后')
@@ -287,7 +287,7 @@ export default {
           })
         }
       },
-},
+    },
 }
 </script>
 <style lang='less' scoped>

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>
@@ -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/productQuery/product-detailed.vue

@@ -15,15 +15,15 @@
         <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">
+    <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">
@@ -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
           }
         },