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,22 +90,33 @@ export default {
     }
   },
   created () {
-    let vm = this
-    let url = $config.basePath + 'prj_confirm_list_query'
-    let param = {
+    this.getLists()
+  },
+  methods: {
+    // 查询签约列表
+    getLists () {
+      let vm = this
+      let url = $config.basePath + 'prj_confirm_list_query'
+      let param = {
       user_phone: window.localStorage.user_phone,
     }
-    vm.hlsPopup.showLoading('数据加载中')
-    vm.hlsHttp.post(url, param).then(function (res) {
+      vm.hlsPopup.showLoading('数据加载中')
+      vm.hlsHttp.post(url, param).then(function (res) {
       vm.hlsPopup.hideLoading()
       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{
-        display: block;
-        width:112px;
-        height: 32px;
-        border-radius:16px;
+    box-shadow: 0 2px 3px 0 rgba(220, 220, 221, 0.50);
+
+    .tab-content {
+      display: block;
+      width: 45.9%;
+      height: 32px;
+      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;
+      }
+
+      .colored {
+        color: @headerColor
+      }
     }
-    img{
-        width:112px;
-        height: 32px;
-        margin-right:5.7px;
+    .tab-content-bg{
+      background: rgba(0,70,156,0.10);
     }
-    span:nth-of-type(2){
-        margin:0 10px;
+
+    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,58 +145,71 @@ export default {
       }
     }
   }
-  .arrow {
-    width: 16px;
-    height: 16px;
-    // margin-left: 30px;
-    margin-top: 16px;
-  }
-  .item-pic {
-    width: 100px;
-    //height: 110px;
-    img {
-      width: 100%;
-      height: 100%;
-    }
-  }
-  .item-content {
-    // height: 102px;
-    width: 100%;
-    margin-left: 20px;
-    .centers:nth-of-type(1) {
-      margin-top: 16px;
+ .division-box {
+      padding: 8px;
     }
-    .centers:nth-of-type(2) {
-      margin-top: 6px;
+    .hls-list-item {
+      border-radius: 4px;
     }
-    .centers:nth-of-type(3) {
-      margin-top: 6px;
+    .item-pic {
+          width: 100px;
+          //height: 110px;
+          img {
+              width: 100%;
+              height: 100%;
+          }
     }
-    .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;
-      .firsts1 {
-        width: 60px;
-        height: 17px;
-        font-family: PingFangSC-Regular;
-        font-size: 13px;
-        color: rgba(56,63,69,0.60);
-      }
-      .seconds1 {
-        width: 70%;
-        margin-left: 16px;
-        height: auto;
-        font-family: PingFangSC-Regular;
-        font-size: 13px;
-        color: #383F45;
-      }
+    .item-content {
+          width: 100%;
+          margin-left: 20px;
+          .pro-name {
+            height: 42px;
+            width: 100%;
+            position: relative;
+            border-bottom: 1px solid #F3F3F7;
+            .arrow {
+              position: absolute;
+              width: 16px;
+              height: 16px;
+              right: 0;
+              top: 13px;
+            }
+            p {
+              height: 42px;
+              line-height: 42px;
+            font-family: PingFangSC-Semibold;
+            font-size: 15px;
+            color: #4B4A4B;
+            letter-spacing: 0;
+            font-weight: 600;
+            }
+          }
+
+          .centers {
+              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;
+                  font-family: PingFangSC-Regular;
+                  font-size: 13px;
+                  color: rgba(56,63,69,0.60);
+              }
+              .seconds1 {
+                  width: 70%;
+                  margin-left: 16px;
+                  height: auto;
+                  font-family: PingFangSC-Regular;
+                  font-size: 13px;
+                  color: #4B4A4B;
+              }
+          }
+
     }
-  }
+
 </style>

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 {