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

@@ -18,7 +18,6 @@ Page({
     limit: 20,
     limit: 20,
     totalPage: 1,
     totalPage: 1,
     allLoaded: false,
     allLoaded: false,
-    showNoMore: false,
     productList: [],
     productList: [],
     totalZero: false,
     totalZero: false,
     windowHeight
     windowHeight
@@ -83,7 +82,7 @@ Page({
     }
     }
 
 
     this.setData({
     this.setData({
-      showLoading: true
+      loading: true
     });
     });
 
 
     Object.assign(params, this.data.orgOps, {
     Object.assign(params, this.data.orgOps, {
@@ -121,7 +120,7 @@ Page({
         this.data.totalPage = res.data && res.data.page_total || 1;
         this.data.totalPage = res.data && res.data.page_total || 1;
 
 
         this.setData({
         this.setData({
-          showLoading: false,
+          loading: false,
           allLoaded: this.data.page > this.data.totalPage,
           allLoaded: this.data.page > this.data.totalPage,
           productList: this.data.productList.concat(list),
           productList: this.data.productList.concat(list),
           totalZero: this.data.productList.concat(list).length
           totalZero: this.data.productList.concat(list).length

 {
 {
     "navigationBarTitleText": "",
     "navigationBarTitleText": "",
     "usingComponents": {
     "usingComponents": {
-        "copyright": "/components/layout/copyright/copyright",
         "product-list": "/components/product/list",
         "product-list": "/components/product/list",
+        "copyright": "/components/layout/copyright/copyright",
         "product-list-filter": "/components/product/list-filter",
         "product-list-filter": "/components/product/list-filter",
         "quick-navigation": "/components/layout/quick-navigation/quick-navigation"
         "quick-navigation": "/components/layout/quick-navigation/quick-navigation"
     }
     }

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

@@ -18,6 +18,7 @@ Page({
     limit: 20,
     limit: 20,
     totalPage: 1,
     totalPage: 1,
     allLoaded: false,
     allLoaded: false,
+    showLoading: false,
     productList: [],
     productList: [],
     totalZero: false,
     totalZero: false,
     windowHeight
     windowHeight