Merge branch 'dev' into 'test'

Dev See merge request !1

Merge branch 'dev' into 'test'
Dev See merge request !1
后端研发-苏明海
2 parents 6341715b a3658657
Showing 5 changed files with 11 additions and 5 deletions
pages/goods/categoryList/categoryList.js
pages/goods/categoryList/categoryList.wxml
pages/goods/goodsList/goodsList.js
pages/goods/goodsList/goodsList.wxml
pages/team/team_success/team_success.js
@@ -67,7 +67,7 @@ Page({
         if (e.categoryset.indexOf("," + 1 + ",") != -1) { that.setData({ is_show_pl: 1 }); }
         if (e.categoryset.indexOf("," + 3 + ",") != -1) { that.setData({ is_show_pp: 1 }); }
         if (e.categoryset.indexOf("," + 2 + ",") != -1) { that.setData({ is_show_gb: 1 }); }
-        that.setData({ store_config: e });
+        that.setData({ store_config: e,is_do:1 });
         if (that.data.is_show_pl) that.setData({ currentTab: 0 });
         else if (that.data.is_show_gb){ that.setData({ currentTab: 1 });that.get_nation();  }
@@ -113,7 +113,7 @@ Page({
                      continue;
                   }
                 }
-                t.setData({ catelist: arr});              
+                t.setData({ catelist: arr});
             }
         });
     },
@@ -90,7 +90,7 @@
    </view>
 </block>
-<block wx:else>
+<block wx:elif="{{is_do}}">
     <view class="no-data" >
       <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
       <view class="no-data-title">商家暂未设置分类</view>
@@ -67,6 +67,7 @@ Page({
         t +="&page=" + e.data.currentPage, 
         a.request(t, 
           function(t) {
+            e.setData({is_go:1});
             e.data.currentPage++, null == e.data.allData && (e.data.allData = Object.assign({}, t.data.result)), 
             wx.stopPullDownRefresh();
          },
@@ -42,7 +42,7 @@
             </view>
         </navigator>
     </view>
-    <view class="no-data" wx:if="{{!requestData||requestData.length==0}}">
+    <view class="no-data" wx:if="{{(!requestData||requestData.length==0) && is_go}}">
         <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
         <view class="no-data-title">没有相关的数据</view>
         <navigator class="lookat" openType="switchTab" url="/pages/index/index/index"> 去逛逛 </navigator>
@@ -102,7 +102,10 @@ Page({
   },
   async init( order_sn) {
-       var goods_id = 0,//商品ID,
+     
+        wx.showLoading();
+
+        var goods_id = 0,//商品ID,
         pageteam=null,//
         original_img=null ,//商品图片
         order=null,//订单编号
@@ -260,6 +263,8 @@ Page({
            ct_price: ct_price, p_status: p_status,sf_arr:sf_arr});
     }
+    wx.hideLoading();
+
     wx.setNavigationBarTitle({
       title: "拼团详情",
     })