Merge branch 'ren' into develop

src/pages/contractSigning/contract-signing.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-11-22 15:02:02
+ * @LastEditTime: 2019-11-22 15:39:10
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -23,7 +23,7 @@
     </div>
 
     <scroll
-      v-if="num === 1"
+      v-show="num === 1"
       ref="scroll"
       :updateData="[submitLists]"
       :pullUp="true"
@@ -49,7 +49,7 @@
     </scroll>
 
     <scroll
-      v-if="num === 2"
+      v-show="num === 2"
       ref="scrolls"
       :updateData="[approvedLists]"
       :pullUp="true"
@@ -144,7 +144,7 @@ export default {
         vm.searchInput = ''
         vm.user_bp_type = vm.$route.params.user_bp_type
       }
-      vm.contractList()
+      // vm.contractList()
     })
     // next()
   },
@@ -160,7 +160,7 @@ export default {
         let param = {
           user_phone: window.localStorage.user_phone,
           pagesize: 10,
-          pagenum: vm.pagenum,
+          pagenum: vm.submitPagenum,
           confirm_status: 'SUBMIT',
           searchInput: vm.searchInput,
         }
@@ -168,7 +168,7 @@ export default {
         vm.hlsHttp.post(url, param).then(function (res) {
           vm.hlsPopup.hideLoading()
           if (res.result === 'S') {
-            vm.showLists = res.lists
+            vm.submitLists = res.lists
             vm.submitFlag = true
             if (res.lists.length > 0 && res.lists.length < 10) {
               vm.$refs.scroll.update(true)
@@ -288,9 +288,9 @@ export default {
         confirm_status: 'SUBMIT',
         searchInput: vm.searchInput,
       }
-      vm.hlsPopup.showLoading('数据加载中')
+      // vm.hlsPopup.showLoading('数据加载中')
       vm.hlsHttp.post(url, param).then(function (res) {
-        vm.hlsPopup.hideLoading()
+        // vm.hlsPopup.hideLoading()
         // console.log(res.lists)
         vm.submitLists = res.lists
         if (res.lists.length >= 0 && res.lists.length < 10) {
@@ -311,8 +311,9 @@ export default {
         confirm_status: 'APPROVED',
         searchInput: vm.searchInput,
       }
-      // vm.hlsPopup.showLoading('数据加载中')
+      vm.hlsPopup.showLoading('数据加载中')
       vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
         vm.approvedLists = res.lists
         if (res.lists.length >= 0 && res.lists.length < 10) {
           vm.$refs.scrolls.update(true)

src/pages/distributorSign/contract-list.vue

@@ -259,9 +259,9 @@ export default {
         confirm_status: 'SUBMIT',
         searchInput: vm.searchInput,
       }
-      vm.hlsPopup.showLoading('数据加载中')
+      // vm.hlsPopup.showLoading('数据加载中')
       vm.hlsHttp.post(url, param).then(function (res) {
-        vm.hlsPopup.hideLoading()
+        // vm.hlsPopup.hideLoading()
         // console.log(res.lists)
         vm.submitLists = res.lists
         if (res.lists.length >= 0 && res.lists.length < 10) {
@@ -282,9 +282,9 @@ export default {
         confirm_status: 'APPROVED',
         searchInput: vm.searchInput,
       }
-      // vm.hlsPopup.showLoading('数据加载中')
+      vm.hlsPopup.showLoading('数据加载中')
       vm.hlsHttp.post(url, param).then(function (res) {
-        // vm.hlsPopup.hideLoading()
+        vm.hlsPopup.hideLoading()
         // console.log(res.lists)
         vm.approvedLists = res.lists
         if (res.lists.length >= 0 && res.lists.length < 10) {