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-10-31 16:58:23
+ * @LastEditTime: 2019-11-08 15:16:00
  * @LastEditors: Please set LastEditors
  * @Description: 合同查询--记录
  * @FilePath:
@@ -30,7 +30,10 @@
     </div>
 
     <h-content v-if="data!==null" class="pay-content">
-      <scroll ref="scrollList">
+      <scroll ref="scroll"
+        :updateData="[lists]"
+        :pullUp="true"
+      >
 
         <div v-for="(item,index) in lists" :key="index" class="contract-item">
           <div class="header">
@@ -116,6 +119,9 @@ export default {
             vm.data = 1
           }
           vm.lists = res.lists
+          if (res.lists.length > 0 && res.lists.length < 10) {
+            vm.$refs.scroll.update(true)
+          }
         } else {
           hlsPopup.showLongCenter(res.message)
         }

src/pages/contractSigning/contract-signing.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-11-08 10:42:48
+ * @LastEditTime: 2019-11-08 14:49:14
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -26,7 +26,9 @@
 
     <h-content v-if="num === 1">
       <scroll
-        ref="scrollList"
+        ref="scroll"
+        :updateData="[submitLists]"
+        :pullUp="true"
       >
         <div class="wrap">
           <div v-for="(item,index) in submitLists" :key="index" class="contract-lists" >
@@ -51,6 +53,8 @@
     <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" >
@@ -125,6 +129,12 @@ export default {
         if (res.result === 'S') {
           vm.submitLists = res.lists.filter(item => item.confirm_status === 'SUBMIT')
           vm.approvedLists = res.lists.filter(item => item.confirm_status === 'APPROVED')
+          if (vm.submitLists.length > 0 && vm.submitLists.length < 10) {
+            vm.$refs.scroll.update(true)
+          }
+          if (vm.approvedLists.length > 0 && vm.approvedLists.length < 10) {
+            vm.$refs.scrollList.update(true)
+          }
         } else {
           hlsPopup.showLongCenter(res.message)
         }

src/pages/distributorSign/contract-list.vue

@@ -21,7 +21,9 @@
     </div>
     <h-content v-if="tabNum === 0">
       <scroll
-        ref="scrollList"
+        ref="scroll"
+        :updateData="[submitLists]"
+        :pullUp="true"
       >
         <div class="wrap">
           <div v-for="(item,index) in submitLists" :key="index" class="contract-lists" >
@@ -46,6 +48,8 @@
     <h-content v-if="tabNum === 1">
       <scroll
         ref="scrollList"
+        :updateData="[approvedLists]"
+        :pullUp="true"
       >
         <div class="wrap">
           <div v-for="(item,index) in approvedLists" :key="index" class="contract-lists" >
@@ -86,6 +90,11 @@ export default {
     }
   },
   created () {
+    this.getLists()
+  },
+  methods: {
+    // 查询签约列表
+    getLists () {
       let vm = this
       let url = $config.basePath + 'prj_confirm_list_query'
       let param = {
@@ -97,11 +106,17 @@ export default {
       if (res.result === 'S') {
         vm.submitLists = res.lists.filter(item => item.confirm_status === 'SUBMIT')
         vm.approvedLists = res.lists.filter(item => item.confirm_status === 'APPROVED')
-        // vm.lists = res.lists
+        if (vm.submitLists.length > 0 && vm.submitLists.length < 10) {
+            vm.$refs.scroll.update(true)
+          }
+          if (vm.approvedLists.length > 0 && vm.approvedLists.length < 10) {
+            vm.$refs.scrollList.update(true)
+          }
+      }else {
+        hlsPopup.showLongCenter(res.message)
       }
     })
     },
-  methods: {
     goDetails (item) {
       window.sessionStorage.setItem('bp_class', item.bp_class)
       window.sessionStorage.setItem('project_id', item.project_id)

src/pages/distributorSign/details-tab.vue

-<!--
- * @Description: 详情tab
- * @Author: your name
- * @Date: 2019-09-25 19:47:59
- * @LastEditTime: 2019-09-27 13:33:08
- * @LastEditors: Please set LastEditors
- -->
 <template>
   <div class="tab-style">
-    <span @click="tabNum = 0;sendTabNum()"><img :src="tabNum == 0?check1:uncheck1"></span>
-    <span @click="tabNum = 1;sendTabNum()"><img :src="tabNum == 1?check2:uncheck2" ></span>
-    <span @click="tabNum = 2;sendTabNum()"><img :src="tabNum == 2?check3:uncheck3"></span>
+    <div :class="{'tab-content-bg':tabNum == 0}" class="tab-content" @click="tabNum = 0;sendTabNum()"><img :src="tabNum == 0?base:unbase"><span
+      :class="{'colored':tabNum == 0}">基本信息</span></div>
+    <div :class="{'tab-content-bg':tabNum == 1}" class="tab-content" @click="tabNum = 1;sendTabNum()"><img :src="tabNum == 1?trial:untrial"><span
+      :class="{'colored':tabNum == 1}">租赁信息</span></div>
+    <div :class="{'tab-content-bg':tabNum == 2}" class="tab-content" @click="tabNum = 2;sendTabNum()"><img :src="tabNum == 2?sign:unsigned"><span
+      :class="{'colored':tabNum == 2}">担保协议</span></div>
   </div>
 </template>
 <script>
-import check1 from '@/assets/distributorSign/check1.png'
-import check2 from '@/assets/distributorSign/check2.png'
-import check3 from '@/assets/distributorSign/guaranteed.png'
-import uncheck1 from '@/assets/distributorSign/uncheck1.png'
-import uncheck2 from '@/assets/distributorSign/uncheck2.png'
-import uncheck3 from '@/assets/distributorSign/guarantee.png'
+import base from '@/assets/distributorSign/base.png'
+import sign from '@/assets/distributorSign/sign.png'
+import trial from '@/assets/distributorSign/trial.png'
+import unbase from '@/assets/distributorSign/unbase.png'
+import unsigned from '@/assets/distributorSign/unsigned.png'
+import untrial from '@/assets/distributorSign/untrial.png'
 export default {
   data () {
     return {
       tabNum: 0,
-      check1: check1,
-      check2: check2,
-      check3: check3,
-      uncheck1: uncheck1,
-      uncheck2: uncheck2,
-      uncheck3: uncheck3,
+      base: base,
+      unbase: unbase,
+      sign: sign,
+      unsigned: unsigned,
+      trial: trial,
+      untrial: untrial,
     }
   },
   methods: {
@@ -39,29 +35,56 @@ export default {
 }
 </script>
 <style lang="less" scoped>
-.tab-style{
+.tab-style {
     position: relative;
     z-index: 50;
     background-color: #fff;
-    display:flex;
+    display: flex;
     justify-content: center;
-    padding-top:12px;
+    padding-top: 12px;
     padding-bottom: 8px;
     align-items: center;
-    box-shadow:0 2px 3px 0  rgba(220,220,221,0.50);
-    span{
+    box-shadow: 0 2px 3px 0 rgba(220, 220, 221, 0.50);
+
+    .tab-content {
       display: block;
-        width:112px;
+      width: 45.9%;
       height: 32px;
-        border-radius:16px;
+      background: rgba(220, 220, 221, 0.26);
+      border-radius: 16px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      span {
+        margin-left: 2%;
+        font-size: 14px;
+        color: #383F45;
+        font-weight: 600;
+        font-family: PingFangSC-Semibold;
       }
-    img{
-        width:112px;
-        height: 32px;
-        margin-right:5.7px;
+
+      .colored {
+        color: @headerColor
       }
-    span:nth-of-type(2){
-        margin:0 10px;
     }
-}
+    .tab-content-bg{
+      background: rgba(0,70,156,0.10);
+    }
+
+    img {
+      height: 16px;
+      // margin-right:5.7px;
+    }
+
+    .tab-content:nth-of-type(2) {
+      margin: 0 8px;
+    }
+    .tab-content:nth-of-type(1) {
+      margin-left: 10px
+    }
+    .tab-content:nth-of-type(3) {
+      margin-right: 10px
+    }
+  }
+
 </style>

src/pages/financingTrial/financing-trial.vue

@@ -2,7 +2,7 @@
  * @Descrip 融资试算
  * @Author: your name
  * @Date: 2019-09-29 17:09:49
- * @LastEditTime: 2019-11-07 17:02:01
+ * @LastEditTime: 2019-11-08 14:42:12
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -20,9 +20,10 @@
       <input type="text" placeholder="请输入产品名称">
     </div>
       <scroll
-        ref="scrollList"
+        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="">
@@ -114,6 +115,9 @@ export default {
          vm.hlsPopup.hideLoading()
          if (res.result === 'S') {
            vm.lists = res.lists
+           if (res.lists.length > 0 && res.lists.length < 10) {
+            vm.$refs.scroll.update(true)
+          }
          } else {
            hlsPopup.showLongCenter(res.message)
          }
@@ -126,6 +130,9 @@ export default {
          vm.hlsPopup.hideLoading()
          if (res.result === 'S') {
            vm.lists = res.lists
+           if (res.lists.length > 0 && res.lists.length < 10) {
+            vm.$refs.scroll.update(true)
+          }
          } else {
            hlsPopup.showLongCenter(res.message)
          }

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

-<!--
- * @Author: your name
- * @Date: 2019-10-22 20:26:28
- * @LastEditTime: 2019-10-29 10:08:31
- * @LastEditors: Please set LastEditors
- * @Description: In User Settings Edit
- * @FilePath: \hls-xcmg-vue-app\src\pages\myProductCollection\my-product-list.Vue
- -->
 
 /**
 * @Author Sean
@@ -26,30 +18,36 @@
           <img src="@/assets/distributorSign/search.png" alt="">
         </div>
       </div>
-      <list-item v-for="item in productList" :key="item.product_id">
+      <scroll
+        ref="scroll"
+        :updateData="[productList]"
+        :pullUp="true"
+      >
+      <div class="division-box">
+
+      <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>
           <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">经销商</p>
+              <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 class="centers">
-              <p class="firsts1">产品名称</p>
-              <p class="seconds1">{{ item.product_name }}</p>
-            </div>
-          </div>
-          <div slot="right-icon">
-            <img class="arrow" src="@/assets/productQuery/getIn.png" alt="" >
           </div>
         </item>
       </list-item>
+      </div>
+      </scroll>
     </h-content>
   </h-view>
 </template>
@@ -89,6 +87,9 @@ export default {
         hlsPopup.hideLoading()
         if (res.result === 'S') {
           vm.productList = res.lists
+          if (res.lists.length > 0 && res.lists.length < 10) {
+            vm.$refs.scroll.update(true)
+          }
         } else {
           hlsPopup.showLongCenter(res.message)
         }
@@ -144,11 +145,11 @@ export default {
       }
     }
   }
-  .arrow {
-    width: 16px;
-    height: 16px;
-    // margin-left: 30px;
-    margin-top: 16px;
+ .division-box {
+      padding: 8px;
+    }
+    .hls-list-item {
+      border-radius: 4px;
     }
     .item-pic {
           width: 100px;
@@ -159,28 +160,39 @@ export default {
           }
     }
     .item-content {
-    // height: 102px;
           width: 100%;
           margin-left: 20px;
-    .centers:nth-of-type(1) {
-      margin-top: 16px;
+          .pro-name {
+            height: 42px;
+            width: 100%;
+            position: relative;
+            border-bottom: 1px solid #F3F3F7;
+            .arrow {
+              position: absolute;
+              width: 16px;
+              height: 16px;
+              right: 0;
+              top: 13px;
             }
-    .centers:nth-of-type(2) {
-      margin-top: 6px;
+            p {
+              height: 42px;
+              line-height: 42px;
+            font-family: PingFangSC-Semibold;
+            font-size: 15px;
+            color: #4B4A4B;
+            letter-spacing: 0;
+            font-weight: 600;
             }
-    .centers:nth-of-type(3) {
-      margin-top: 6px;
           }
+
           .centers {
-      //   margin-top: 6px;
-      // white-space: nowrap;
-      // width: 100%;
               font-family: PingFangSC-Semibold;
               font-size: 13px;
               color: rgba(56,63,69,0.60);
               letter-spacing: 0.5px;
               display: flex;
               flex-direction: row;
+              margin-top: 8px;
               .firsts1 {
                   width: 60px;
                   height: 17px;
@@ -194,8 +206,10 @@ export default {
                   height: auto;
                   font-family: PingFangSC-Regular;
                   font-size: 13px;
-        color: #383F45;
+                  color: #4B4A4B;
               }
           }
+
     }
+
 </style>

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

@@ -9,24 +9,14 @@
         </div>
       </div>
     </transition>
-    <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>
-      </div>
-    </h-header>
-    <h-content class="entry-content">
-      <div class="amount">
-        <p>{{ userName }}</p>
-        <div>￥{{ money |currency }}</div>
-      </div>
-      <div class="info">
-        <div class="info-item">
-          <span>还款金额</span>
-          <span>¥50600.00</span>
-        </div>
+    <transition name="trans">
+      <div v-show="show" class="modal-show-bank">
+        <div class="down">
+          <div class="top">
+            <img src="@/assets/payment/back.png" @click="show=false" >
+            <span>支付方式</span>
           </div>
-      <!-- <list-item :item-height="56" class="pay-way">
+          <list-item :item-height="56" class="pay-way">
             <item
               v-for="(item,index) in nongBank"
               :proportion="[7,1,1]"
@@ -85,10 +75,76 @@
                 <img v-show="select !== `three${index}`" src="@/assets/payment/unselect.png" alt >
               </section>
             </item>
-      </list-item>-->
+          </list-item>
+        </div>
+    </div></transition>
+    <transition name="trans">
+      <div v-show="confirm" class="modal-show-bank">
+        <div class="down">
+          <div class="top">
+            <img src="@/assets/payment/back.png" @click="show=false" >
+            <span>确认付款</span>
+          </div>
+          <div class="info">
+            <div class="info-item">
+              <span>还款金额</span>
+              <span>¥50600.00</span>
+            </div>
+            <div class="interest">
+              <span>本次交易收取0.03%服务费</span>
+            </div>
+            <div class="info-item">
+              <span>服务费</span>
+              <span>+¥15.00</span>
+            </div>
+            <div class="info-item">
+              <span>合同编号</span>
+              <span>EF12345678</span>
+            </div>
+            <div class="info-item" @click="show=true">
+              <span>付款方式</span>
+              <span v-if="flag"><img src="@/assets/payment/ly.png"><span>农业银行</span><img class="arrow" src="@/assets/payment/go.png"></span>
+              <span v-if="!flag"><img src="@/assets/payment/alipay.png"><span>支付宝</span><img class="arrow" src="@/assets/payment/go.png"></span>
+            </div>
+          </div>
+        </div>
+    </div></transition>
+    <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>
+      </div>
+    </h-header>
+    <h-content class="entry-content">
+      <div class="amount">
+        <p>{{ userName }}</p>
+        <div>￥{{ money |currency }}</div>
+      </div>
+      <div class="info">
+        <div class="info-item">
+          <span>还款金额</span>
+          <span>¥50600.00</span>
+        </div>
+        <div class="interest">
+          <span>本次交易收取0.03%服务费</span>
+        </div>
+        <div class="info-item">
+          <span>服务费</span>
+          <span>+¥15.00</span>
+        </div>
+        <div class="info-item">
+          <span>合同编号</span>
+          <span>EF12345678</span>
+        </div>
+        <div class="info-item" @click="show=true">
+          <span>付款方式</span>
+          <span v-if="flag"><img src="@/assets/payment/ly.png"><span>农业银行</span><img class="arrow" src="@/assets/payment/go.png"></span>
+          <span v-if="!flag"><img src="@/assets/payment/alipay.png"><span>支付宝</span><img class="arrow" src="@/assets/payment/go.png"></span>
+        </div>
+      </div>
     </h-content>
     <bottom-tab>
-      <tab-button class="foot" @click.native="pay">立即付款</tab-button>
+      <tab-button class="foot" @click.native="pay">确认支付</tab-button>
     </bottom-tab>
   </h-view>
 </template>
@@ -117,6 +173,9 @@ export default {
       money: '',
       select: 'three0',
       name: '',
+      checkType: {},
+      confirm: false,
+      show: false,
       downNum: false,
       recommand: false,
       userName: window.sessionStorage.getItem('bp_name'),
@@ -143,8 +202,12 @@ export default {
       } else {
         vm.select = 'one'
       }
+      if (vm.nongBank.length !== 0) {
+        vm.checkType = {...vm.nongBank[0]}
+      }
       return notNong
     },
+
   },
   watch: {},
   beforeRouteEnter (to, from, next) {
@@ -250,19 +313,111 @@ export default {
   .trans-enter,
   .trans-leave-active {
     opacity: 0;
+  }
+   .modal-show-bank {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    display: flex;
+    z-index: 900;
+    background-color: rgba(56, 63, 69, 0.3);
+    justify-content: center;
+    align-items: center;
+    .down {
+     height:466px;
+     width: 100%;
+     position: absolute;
+     bottom: 0px;
+     background-color: #fff;
+     border-radius: 12px 12px 0 0;
+     overflow: scroll;
+     .top{
+       position: fixed;
+       left:24px;
+       width:330px;
+       height:54px;
+      display: flex;
+      z-index: 999;
+      align-items: center;
+      background-color: #fff;
+      img{
+        width:20px;
+      }
+      span{
+        margin-left:38%;
+        font-family: PingFangSC-Semibold;
+font-size: 16px;
+color: #656464;
+letter-spacing: 0.49px;
+text-align: center;
+      }
+     }
+       .pay-way {
+         width:350px;
+      margin:0 auto;
+         margin-top:54px;
+         background-color: #fff;
+      .hls-item {
+        padding-left: 12px;
+        .add-name {
+          flex: 3;
+          line-height: 56px;
+          font-family: PingFangSC-Regular;
+          font-size: 14px;
+          color: #656464;
+
+          .icon1 {
+            width: 34px;
+            height: 34px;
+            display: block;
+            float: left;
+            margin-top: 10px;
+            margin-right: 5px;
+          }
+          .icon2 {
+            width: 32px;
+            display: block;
+            float: left;
+            margin-top: 12px;
+            margin-right: 8px;
+          }
+          .icon {
+            width: 30px;
+            display: block;
+            float: left;
+            position: relative;
+            margin: 12px 8px 0 3px;
+          }
+        }
+
+        .add-content {
+          img {
+            width: 21px;
+          }
+        }
+      }
+    }
+    }
   }
   .info {
     width: 100%;
     height: 226px;
     background-color: #fff;
     .info-item {
-      border: 1px solid #d9dbdf;
       height: 46px;
       width: 335px;
       margin: 0 auto;
+      position: relative;
       display: flex;
       justify-content: space-between;
       align-items: center;
+      .arrow{
+        margin-right:-10px;
+      }
+      img{
+        width:17px;
+        margin-right:10px;
+      }
       span:first-child {
         font-family: PingFangSC-Regular;
         font-size: 14px;
@@ -276,17 +431,35 @@ export default {
         color: #383f45;
         letter-spacing: 0;
         line-height: 18px;
+        display: flex;
+        align-items: center;
       }
     }
     .info-item:nth-of-type(1)::after{
       content:"";
       display:block;
-      width: 16px;
-      height: 16px;
-      border: 16px solid #fff;
-      border-left:transparent;
-      border-right:transparent;
-      border-top:transparent;
+      position: absolute;
+      right:20px;
+      top:25px;
+      border: 10px solid #fff;
+      border-left-color:transparent;
+      border-right-color:transparent;
+      border-top-color:transparent;
+      border-bottom-color:rgba(75,74,75,0.10);
+    }
+    .info-item:nth-of-type(1){
+      border-top: 1px solid #d9dbdf;
+    }
+    .interest{
+      width:100%;
+      height:37px;
+      line-height: 37px;
+font-family: PingFangSC-Medium;
+font-size: 11px;
+color: #4B4A4B;
+letter-spacing: 0;
+text-indent:215px;
+      background-color:rgba(75,74,75,0.10);
     }
   }
   .modal-show {
@@ -369,47 +542,6 @@ export default {
       }
     }
 
-    .pay-way {
-      .hls-item {
-        padding-left: 12px;
-        .add-name {
-          flex: 3;
-          line-height: 56px;
-          font-family: PingFangSC-Regular;
-          font-size: 14px;
-          color: #656464;
-
-          .icon1 {
-            width: 34px;
-            height: 34px;
-            display: block;
-            float: left;
-            margin-top: 10px;
-            margin-right: 5px;
-          }
-          .icon2 {
-            width: 32px;
-            display: block;
-            float: left;
-            margin-top: 12px;
-            margin-right: 8px;
-          }
-          .icon {
-            width: 30px;
-            display: block;
-            float: left;
-            position: relative;
-            margin: 12px 8px 0 3px;
-          }
-        }
-
-        .add-content {
-          img {
-            width: 21px;
-          }
-        }
-      }
-    }
   }
   .foot {
     background-color: @headerColor;

src/pages/productQuery/product-list.vue

@@ -18,6 +18,12 @@
           <img src="@/assets/distributorSign/search.png" alt="">
         </div>
       </div>
+      <scroll 
+       ref="scroll"
+       :updateData="[lists]"
+       :pullUp="true"
+      >
+      
       <div class="division-box">
 
         <list-item v-for="(item,index) in lists" :key="index">
@@ -39,10 +45,10 @@
                 <p class="seconds1">{{ item.product_code }}</p>
               </div>
             </div>
-            <div slot="right-icon"/>
           </item>
         </list-item>
       </div>
+      </scroll>
     </h-content>
   </h-view>
 </template>
@@ -78,6 +84,9 @@ export default {
          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)
        } else {
@@ -137,8 +146,7 @@ export default {
     .division-box {
       padding: 8px;
     }
-    .hls-list-item 
-    {
+    .hls-list-item {
       border-radius: 4px;
     }
     .item-pic {