Merge branch 'mall_dev_7.10.0' into 'mall_dev_7.10.0-demolition-order'

商品列表tab切换时pageNo不变 导致数据为空

See merge request !187

src/subPackage/page/pages/categoryPro/categoryPro.js

@@ -122,6 +122,8 @@ wxService.page({
         })
       }
     }
+    this.data.pageNo = 1;
+    
     this.getProList();
   },