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

src/pages/contractInquire/contract-records.vue

@@ -98,7 +98,7 @@ export default {
       repayedLists: [], // 已结清
       pagenum: 1,
       searchInput: '',
-
+      contract_status_n: '全部', // 全部/待首付/首付还款中/还款中/已结清
     }
   },
   computed: {},
@@ -132,6 +132,7 @@ export default {
         vm.selected = 'all'
         vm.pagenum = 1
         vm.searchInput = ''
+        vm.contract_status_n = '全部'
         vm.recordQuery()
       }
     })
@@ -158,6 +159,7 @@ export default {
         searchInput: vm.searchInput,
         pagenum: vm.pagenum,
         pagesize: 10,
+        contract_status_n: vm.contract_status_n,
       }
       vm.hlsPopup.showLoading('数据加载中')
       vm.hlsHttp.post(url, param).then(function (res) {

src/pages/contractInquire/repay-detail.vue

 <!--
  * @Author: your name
  * @Date: 2019-10-31 09:49:57
- * @LastEditTime: 2019-11-22 10:28:20
+ * @LastEditTime: 2019-11-22 16:17:31
  * @LastEditors: Please set LastEditors
  * @Description: 合同查询--明细
  * @FilePath:
@@ -52,6 +52,11 @@
 
       </list-item>
       <div class="header">设备清单</div>
+      <scroll
+        ref="scroll"
+        :updateData="[lists]"
+        :pullUp="true"
+        @pullingUp="loadMore">
         <list-item :item-height="104" class="equipment-list">
           <item v-for="(item,index) in lists" :proportion="[2,1]" :key="index">
             <div slot="name" class="parameters">
@@ -81,6 +86,8 @@
             </div>
           </item>
         </list-item>
+      </scroll>
+
     </h-content>
 
   </h-view>
@@ -95,6 +102,7 @@ export default {
   data () {
     return {
       lists: [],
+      pagenum: 1,
       detailInfo: {},
     }
   },
@@ -105,6 +113,7 @@ export default {
   beforeRouteEnter (to, from, next) {
     next(vm => {
       if (from.name === 'ContractRecords') {
+        vm.pagenum = 1
         vm.detailQuery()
         vm.equipQuery()
       }
@@ -143,6 +152,8 @@ export default {
       let vm = this
       let url = $config.basePath + 'con_equip_list'
       let param = {
+        pagesize: 10,
+        pagenum: vm.pagenum,
         project_id: vm.$route.params.project_id,
       }
       vm.hlsPopup.showLoading('数据加载中')
@@ -150,6 +161,44 @@ 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 if (res.lists.length === 10) {
+            vm.$refs.scroll.update(false)
+          }
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
+    loadMore () {
+      let vm = this
+      let url = $config.basePath + 'con_equip_list'
+      vm.pagenum++
+      let param = {
+        pagesize: 10,
+        pagenum: vm.pagenum,
+        project_id: vm.$route.params.project_id,
+      }
+      vm.hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          let returnData = []
+          returnData = res.lists
+          if (returnData.length === 0) {
+            vm.$refs.scroll.update(true)
+          } else if (returnData.length > 0 && returnData.length < 10) {
+            vum.forEach(returnData, function (data, index, array) {
+              vm.lists.push(array[index])
+            })
+            vm.$refs.scroll.update(true)
+          } else if (returnData.length === 10) {
+            vum.forEach(returnData, function (data, index, array) {
+              vm.lists.push(array[index])
+            })
+            vm.$refs.scroll.update(false)
+          }
         } else {
           hlsPopup.showLongCenter(res.message)
         }

src/pages/contractSigning/contract-detail.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-11-19 09:07:15
+ * @LastEditTime: 2019-11-25 11:32:38
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -496,6 +496,9 @@ export default {
           vm.hlsPopup.showSuccess('审批成功')
           vm.$router.push({
             name: 'ContractSigning',
+            param: {
+              backFlag: true,
+            },
           })
         } else {
           vm.hlsPopup.showSuccess(res.message)

src/pages/contractSigning/contract-signing.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-11-22 15:39:10
+ * @LastEditTime: 2019-11-25 11:40:05
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -85,7 +85,7 @@ import unCheck2 from '@/assets/constractSigning/yes-undone.png'
 export default {
   data () {
     return {
-      num: null,
+      num: 1,
       pagenum: 1,
       submitPagenum: 1,
       approvedPagenum: 1,
@@ -106,11 +106,7 @@ export default {
   watch: {
     'num': {
       handler (newVal, oldVal) {
-        if (newVal === 1) {
-          if (!this.submitFlag) {
-            this.contractList()
-          }
-        } else if (newVal === 2) {
+        if (newVal === 2) {
           if (!this.approvedFlag) {
             this.contractList()
           }
@@ -143,10 +139,17 @@ export default {
         vm.approvedPagenum = 1
         vm.searchInput = ''
         vm.user_bp_type = vm.$route.params.user_bp_type
+        vm.contractList()
+      } else if (from.name === 'ContractDetail') {
+        if (vm.$route.params.backFlag) {
+          vm.searchInput = ''
+          vm.submitPagenum = 1
+          vm.approvedPagenum = 1
+          vm.approvedFlag = false
+          vm.contractList()
+        }
       }
-      // vm.contractList()
     })
-    // next()
   },
   methods: {
     dateConverse (date) {

src/pages/distributorSign/contract-list.vue

@@ -18,7 +18,7 @@
       <input v-model="searchInput" type="text" placeholder="请输入合同号/承租人名称">
     </div>
     <scroll
-      v-if="tabNum === 0"
+      v-show="tabNum === 0"
       ref="scroll"
       :updateData="[submitLists]"
       :pullUp="true"
@@ -43,7 +43,7 @@
       </div>
     </scroll>
     <scroll
-      v-if="tabNum === 1"
+      v-show="tabNum === 1"
       ref="scrolls"
       :updateData="[approvedLists]"
       :pullUp="true"

src/pages/home/location.vue

@@ -2,7 +2,7 @@
    * @Descrip""/>User Settings Edit
  * @Author: your name
  * @Date: 2019-10-11 09:39:51
- * @LastEditTime: 2019-10-30 17:07:26
+ * @LastEditTime: 2019-11-25 10:01:44
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -17,7 +17,7 @@
       <section class="location-wrap">
         <div class="current-location">
           <div class="img-box">
-            <img src="@/assets/homePage/location.png" alt="">
+            <img src="@/assets/homePage/locationImage.png" alt="">
 
           </div>
           <p>当前位置</p>
@@ -219,7 +219,6 @@ export default {
         width: 16px;
         height: 16px;
         margin-left: 17px;
-        background: rgba(0, 70, 156, 0.1);
         img {
           width: 100%;
           height: 100%;