wxd / MShopWeApp

Commit 86fca5e6d72417b0f5cb68a63af34415a7e4f162

Authored by 后端研发-苏明海
2 parents 2afcff94 7baf03f1

Merge branch 'dev' into 'qa' 

Dev

See merge request !3
Inline Side-by-side
Showing 8 changed files with 17 additions and 11 deletions
images/add2.png 0 → 100644
View file @86fca5e

22.9 KB
images/quanyi2.png 0 → 100644
View file @86fca5e

17.2 KB
pages/goods/categoryList/categoryList.js
  View file @86fca5e
... ... @@ -67,7 +67,7 @@ Page({
67 67 if (e.categoryset.indexOf("," + 1 + ",") != -1) { that.setData({ is_show_pl: 1 }); }
68 68 if (e.categoryset.indexOf("," + 3 + ",") != -1) { that.setData({ is_show_pp: 1 }); }
69 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 72 if (that.data.is_show_pl) that.setData({ currentTab: 0 });
73 73 else if (that.data.is_show_gb){ that.setData({ currentTab: 1 });that.get_nation(); }
... ... @@ -113,7 +113,7 @@ Page({
113 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
  View file @86fca5e
... ... @@ -90,7 +90,7 @@
90 90 </view>
91 91 </block>
92 92  
93   -<block wx:else>
  93 +<block wx:elif="{{is_do}}">
94 94 <view class="no-data" >
95 95 <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
96 96 <view class="no-data-title">商家暂未设置分类</view>
... ...
pages/goods/goodsList/goodsList.js
  View file @86fca5e
... ... @@ -67,6 +67,7 @@ Page({
67 67 t +="&page=" + e.data.currentPage,
68 68 a.request(t,
69 69 function(t) {
  70 + e.setData({is_go:1});
70 71 e.data.currentPage++, null == e.data.allData && (e.data.allData = Object.assign({}, t.data.result)),
71 72 wx.stopPullDownRefresh();
72 73 },
... ...
pages/goods/goodsList/goodsList.wxml
  View file @86fca5e
... ... @@ -42,7 +42,7 @@
42 42 </view>
43 43 </navigator>
44 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 46 <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
47 47 <view class="no-data-title">没有相关的数据</view>
48 48 <navigator class="lookat" openType="switchTab" url="/pages/index/index/index"> 去逛逛 </navigator>
... ...
pages/team/team_success/team_success.js
  View file @86fca5e
... ... @@ -102,7 +102,10 @@ Page({
102 102 },
103 103  
104 104 async init( order_sn) {
105   - var goods_id = 0,//商品ID,
  105 +
  106 + wx.showLoading();
  107 +
  108 + var goods_id = 0,//商品ID,
106 109 pageteam=null,//
107 110 original_img=null ,//商品图片
108 111 order=null,//订单编号
... ... @@ -260,6 +263,8 @@ Page({
260 263 ct_price: ct_price, p_status: p_status,sf_arr:sf_arr});
261 264 }
262 265  
  266 + wx.hideLoading();
  267 +
263 268 wx.setNavigationBarTitle({
264 269 title: "拼团详情",
265 270 })
... ...
pages/user/index/index.wxml
  View file @86fca5e
... ... @@ -167,7 +167,7 @@
167 167 <view class="fs26">秒杀活动</view>
168 168 </view>
169 169 <view class="item t-c" bindtap="go_qy" wx:if="{{qy_list!=null && is_init && gradeId}}">
170   - <image class="xc-center-img " src="{{iurl}}/miniapp/images/equity.png"></image>
  170 + <image class="xc-center-img " src="/images/quanyi2.png"></image>
171 171 <view class="fs26">我的权益</view>
172 172 </view>
173 173  
... ... @@ -182,16 +182,16 @@
182 182 <view class="fs26">收藏夹</view>
183 183 </view>
184 184  
185   - <!--<view class="item t-c">-->
186   - <!--<image class="xc-center-img " src="{{iurl}}/miniapp/images/fuwu.png"></image>-->
187   - <!--<view class="four-level-word">我的服务</view>-->
188   - <!--</view>-->
189   -
190 185 <view class="item t-c" data-url="/pages/user/comment/comment" bindtap="goto" >
191 186 <image class="xc-center-img " src="{{iurl}}/miniapp/images/evaluate.png"></image>
192 187 <view class="fs26">我的评价</view>
193 188 </view>
194 189  
  190 + <view class="item t-c" data-url="/pages/user/address_list/address_list" bindtap="goto" >
  191 + <image class="xc-center-img " src="/images/add2.png"></image>
  192 + <view class="four-level-word">我的地址</view>
  193 + </view>
  194 +
195 195 </view>
196 196  
197 197  
... ...