Merge branch 'ren' into develop

ba8e1dbb · 786817560 · 8d98250c · acc42ddc · ba8e1dbb
Commit ba8e1dbb authored Nov 29, 2019 by 786817560
Show whitespace changes
Inline Side-by-side

Showing with 16 additions and 8 deletions

contract-list.vue src/pages/distributorSign/contract-list.vue +16 -8

No files found.
--- a/src/pages/distributorSign/contract-list.vue
+++ b/src/pages/distributorSign/contract-list.vue
@@ -97,16 +97,23 @@ export default {
    }
  },
  watch: {
-    'num': {
-      handler (newVal, oldVal) {
-        if (newVal === 2) {
+    // 'num': {
+    //   handler (newVal, oldVal) {
+    //     if (newVal === 2) {
+    //       if (!this.approvedFlag) {
+    //         this.getLists()
+    //       }
+    //     }
+    //   },
+    //   immediate: true,
+    // },
+    num () {
+      if (this.num === 2) {
        if (!this.approvedFlag) {
          this.getLists()
        }
      }
    },
-      immediate: true,
-    },
    searchInput () {
      let vm = this
      if (vm.timeout) {
@@ -199,6 +206,7 @@ export default {
      }
    },
    loadMore () {
+      console.log('lodeMore')
      let vm = this
      if (vm.num === 1) {
        vm.submitPagenum++