Merge remote-tracking branch 'origin/jd_dev' into jd_dev

src/views/ecw/customer/index.vue

@@ -999,7 +999,9 @@ export default {
   },
   watch: {
     showSearch() {
-      this.handleQuery()
+      this.$nextTick(() => {
+        this.getHeight()
+      })
     },
     selectCustomerList(val) {
       if (val.length === 0) {

src/views/ecw/myCustomerService/index.vue

@@ -990,7 +990,9 @@ export default {
   },
   watch: {
     showSearch() {
-      this.handleQuery()
+      this.$nextTick(() => {
+        this.getHeight()
+      })
     },
     selectCustomerList(val) {
       if (val.length === 0) {

src/views/ecw/oceanCustomer/index.vue

@@ -697,7 +697,9 @@ export default {
   },
   watch: {
     showSearch() {
-      this.handleQuery()
+      this.$nextTick(() => {
+        this.getHeight()
+      })
     }
   },
   computed: {

src/views/ecw/offer/logListCommon.vue

@@ -228,7 +228,9 @@ export default {
   },
   watch: {
     showSearch() {
-      this.handleQuery()
+      this.$nextTick(() => {
+        this.getHeight()
+      })
     },
     selectCustomerFollowList(val) {
       if (val.length === 0) {

src/views/ecw/order/index.vue

@@ -851,10 +851,12 @@ export default {
     isChinese() {
       this.getList()
     },
-    // provinceCode destCountryId
     showSearch() {
-      this.handleQuery()
+      this.$nextTick(() => {
+        this.getHeight()
+      })
     },
+    // provinceCode destCountryId
     destCountryId: {
       //监听当前地区值的变化，于与上方地区值进行了双向绑定
       deep: true, //深度监听