1 participants
-
Status changed to merged
-
mentioned in commit f39278cafdd24bcf540b5369dc6e03af73d40f91
Showing
5 changed files
pages/goods/categoryList/categoryList.js
| @@ -67,7 +67,7 @@ Page({ | @@ -67,7 +67,7 @@ Page({ | ||
| 67 | if (e.categoryset.indexOf("," + 1 + ",") != -1) { that.setData({ is_show_pl: 1 }); } | 67 | if (e.categoryset.indexOf("," + 1 + ",") != -1) { that.setData({ is_show_pl: 1 }); } |
| 68 | if (e.categoryset.indexOf("," + 3 + ",") != -1) { that.setData({ is_show_pp: 1 }); } | 68 | if (e.categoryset.indexOf("," + 3 + ",") != -1) { that.setData({ is_show_pp: 1 }); } |
| 69 | if (e.categoryset.indexOf("," + 2 + ",") != -1) { that.setData({ is_show_gb: 1 }); } | 69 | if (e.categoryset.indexOf("," + 2 + ",") != -1) { that.setData({ is_show_gb: 1 }); } |
| 70 | - that.setData({ store_config: e }); | 70 | + that.setData({ store_config: e,is_do:1 }); |
| 71 | 71 | ||
| 72 | if (that.data.is_show_pl) that.setData({ currentTab: 0 }); | 72 | if (that.data.is_show_pl) that.setData({ currentTab: 0 }); |
| 73 | else if (that.data.is_show_gb){ that.setData({ currentTab: 1 });that.get_nation(); } | 73 | else if (that.data.is_show_gb){ that.setData({ currentTab: 1 });that.get_nation(); } |
| @@ -113,7 +113,7 @@ Page({ | @@ -113,7 +113,7 @@ Page({ | ||
| 113 | continue; | 113 | continue; |
| 114 | } | 114 | } |
| 115 | } | 115 | } |
| 116 | - t.setData({ catelist: arr}); | 116 | + t.setData({ catelist: arr}); |
| 117 | } | 117 | } |
| 118 | }); | 118 | }); |
| 119 | }, | 119 | }, |
pages/goods/categoryList/categoryList.wxml
| @@ -90,7 +90,7 @@ | @@ -90,7 +90,7 @@ | ||
| 90 | </view> | 90 | </view> |
| 91 | </block> | 91 | </block> |
| 92 | 92 | ||
| 93 | -<block wx:else> | 93 | +<block wx:elif="{{is_do}}"> |
| 94 | <view class="no-data" > | 94 | <view class="no-data" > |
| 95 | <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image> | 95 | <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image> |
| 96 | <view class="no-data-title">商家暂未设置分类</view> | 96 | <view class="no-data-title">商家暂未设置分类</view> |
pages/goods/goodsList/goodsList.js
| @@ -67,6 +67,7 @@ Page({ | @@ -67,6 +67,7 @@ Page({ | ||
| 67 | t +="&page=" + e.data.currentPage, | 67 | t +="&page=" + e.data.currentPage, |
| 68 | a.request(t, | 68 | a.request(t, |
| 69 | function(t) { | 69 | function(t) { |
| 70 | + e.setData({is_go:1}); | ||
| 70 | e.data.currentPage++, null == e.data.allData && (e.data.allData = Object.assign({}, t.data.result)), | 71 | e.data.currentPage++, null == e.data.allData && (e.data.allData = Object.assign({}, t.data.result)), |
| 71 | wx.stopPullDownRefresh(); | 72 | wx.stopPullDownRefresh(); |
| 72 | }, | 73 | }, |
pages/goods/goodsList/goodsList.wxml
| @@ -42,7 +42,7 @@ | @@ -42,7 +42,7 @@ | ||
| 42 | </view> | 42 | </view> |
| 43 | </navigator> | 43 | </navigator> |
| 44 | </view> | 44 | </view> |
| 45 | - <view class="no-data" wx:if="{{!requestData||requestData.length==0}}"> | 45 | + <view class="no-data" wx:if="{{(!requestData||requestData.length==0) && is_go}}"> |
| 46 | <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image> | 46 | <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image> |
| 47 | <view class="no-data-title">没有相关的数据</view> | 47 | <view class="no-data-title">没有相关的数据</view> |
| 48 | <navigator class="lookat" openType="switchTab" url="/pages/index/index/index"> 去逛逛 </navigator> | 48 | <navigator class="lookat" openType="switchTab" url="/pages/index/index/index"> 去逛逛 </navigator> |
pages/team/team_success/team_success.js
| @@ -102,7 +102,10 @@ Page({ | @@ -102,7 +102,10 @@ Page({ | ||
| 102 | }, | 102 | }, |
| 103 | 103 | ||
| 104 | async init( order_sn) { | 104 | async init( order_sn) { |
| 105 | - var goods_id = 0,//商品ID, | 105 | + |
| 106 | + wx.showLoading(); | ||
| 107 | + | ||
| 108 | + var goods_id = 0,//商品ID, | ||
| 106 | pageteam=null,// | 109 | pageteam=null,// |
| 107 | original_img=null ,//商品图片 | 110 | original_img=null ,//商品图片 |
| 108 | order=null,//订单编号 | 111 | order=null,//订单编号 |
| @@ -260,6 +263,8 @@ Page({ | @@ -260,6 +263,8 @@ Page({ | ||
| 260 | ct_price: ct_price, p_status: p_status,sf_arr:sf_arr}); | 263 | ct_price: ct_price, p_status: p_status,sf_arr:sf_arr}); |
| 261 | } | 264 | } |
| 262 | 265 | ||
| 266 | + wx.hideLoading(); | ||
| 267 | + | ||
| 263 | wx.setNavigationBarTitle({ | 268 | wx.setNavigationBarTitle({ |
| 264 | title: "拼团详情", | 269 | title: "拼团详情", |
| 265 | }) | 270 | }) |