Merge branch 'feature/import' of git.yoho.cn:fe/yoho-miniapp-eshop into feature/import

@@ -171,7 +171,9 @@ Page(Object.assign({
       page: 1,
       limit: 20
     };
-    this.data.productList = [];
+    this.setData({
+      productList: []
+    });
     params.resetScroll = true;
     this.productList(params);
   },

@@ -64,7 +64,9 @@ Page({
     this.data.addFilter = true;
 
     this._resetPage();
-    this.data.productList = [];
+    this.setData({
+      productList: []
+    });
     this._productList();
   },
 

@@ -63,7 +63,7 @@ Page({
     this.data.addFilter = true;
 
     this._resetPage();
-    this.data.productList = [];
+    this.setData({ productList: [] });
     this._productList();
   },
 
@@ -117,6 +117,7 @@ Page({
         this.data.page += 1;
         this.data.totalPage = res.data && res.data.page_total || 1;
 
+
         this.setData({
           showLoading: false,
           noResult: this.data.totalPage === 0,

@@ -9,8 +9,9 @@
         </view>
         <view wx:if="{{productList.length}}">
             <product-list list="{{productList}}"
-                          show-loading="{{showLoading}}"
-                          show-no-more="{{allLoaded}}"></product-list>
+              show-loading="{{showLoading}}"
+              show-no-more="{{allLoaded}}">
+            </product-list>
         </view>
     </view>
     <copyright class="copy-right"></copyright>

@@ -61,7 +61,9 @@ Page({
     this.data.gender = gender;
 
     this._resetPage();
-    this.data.productList = [];
+    this.setData({
+      productList: []
+    });
     this._productList();
   },