Commit 804d4059f63fbe44523ed54cb9d1bd5664b2a19d
Merge branch 'dev' into 'test'
Dev See merge request !167
Showing
6 changed files
with
13 additions
and
12 deletions
pages/goods/goodsInfo/goodsInfo.js
| ... | ... | @@ -848,7 +848,7 @@ Page({ |
| 848 | 848 | newd.member_goods_price = th.data.prom_price, |
| 849 | 849 | newd.prom_type = th.data.prom_type; |
| 850 | 850 | newd.prom_id = th.data.prom_id; |
| 851 | - } else if (th.data.prom_type == 3) { | |
| 851 | + } else if (th.data.prom_type == 3 || th.data.prom_type == 2 || th.data.prom_type == 4 || th.data.prom_type == 5) { | |
| 852 | 852 | newd.prom_type = 0; |
| 853 | 853 | newd.prom_id = 0; |
| 854 | 854 | } |
| ... | ... | @@ -3032,6 +3032,7 @@ Page({ |
| 3032 | 3032 | }, |
| 3033 | 3033 | fail: function(res) { |
| 3034 | 3034 | //th.onShow(); |
| 3035 | + th.data.is_get_local_ok = 1; | |
| 3035 | 3036 | th.get_sto(); |
| 3036 | 3037 | if (res.errCode == 2) { |
| 3037 | 3038 | th.setData({ |
| ... | ... | @@ -3045,7 +3046,7 @@ Page({ |
| 3045 | 3046 | is_gps: "3" |
| 3046 | 3047 | }); |
| 3047 | 3048 | } |
| 3048 | - th.data.is_get_local_ok = 1; | |
| 3049 | + | |
| 3049 | 3050 | } |
| 3050 | 3051 | }) |
| 3051 | 3052 | }else{ | ... | ... |
pages/goods/goodsInfo/goodsInfo.wxml
| ... | ... | @@ -857,14 +857,14 @@ |
| 857 | 857 | <view class="spec-goods-info"> |
| 858 | 858 | <view class="spec-goods-name ellipsis-1">{{sele_g.goods_name}}</view> |
| 859 | 859 | <view class="flex ai_end xc-val-money"> |
| 860 | - <view class="spec-goods-price" wx:if="{{prom_price==null}}"> | |
| 860 | + <view class="spec-goods-price" wx:if="{{prom_price==null}}" > | |
| 861 | 861 | <text class="fs20">￥</text> |
| 862 | 862 | <!-- 如果是等级会员，且有等级价 --> |
| 863 | - <block wx:if="card_field && sele_g[card_field]>0"> | |
| 863 | + <block wx:if="{{card_field && sele_g[card_field]>0}}"> | |
| 864 | 864 | {{sele_g[card_field]}} |
| 865 | 865 | </block> |
| 866 | 866 | <block wx:else> |
| 867 | - {{sele_g.shop_price}} | |
| 867 | + {{sele_g.shop_price}} | |
| 868 | 868 | </block> |
| 869 | 869 | |
| 870 | 870 | </view> |
| ... | ... | @@ -981,10 +981,10 @@ |
| 981 | 981 | <image class="wh100 spec-img xc-distance-bottom" src="{{data.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image> |
| 982 | 982 | <view class="spec-goods-info"> |
| 983 | 983 | <view class="spec-goods-name ellipsis-1">{{sele_g.goods_name}}</view> |
| 984 | - <view class="flex ai_end xc-val-money"> | |
| 985 | - <view class="spec-goods-price" wx:if="{{is_normal==1}}"> | |
| 984 | + <view class="flex ai_end xc-val-money {{sele_g[card_field]}}" > | |
| 985 | + <view class="spec-goods-price" wx:if="{{is_normal==1}}" > | |
| 986 | 986 | <!-- 如果是等级会员，且有等级价 --> |
| 987 | - <block wx:if="card_field && sele_g[card_field]>0"> | |
| 987 | + <block wx:if="{{card_field && sele_g[card_field]>0}}"> | |
| 988 | 988 | ￥ {{sele_g[card_field]}} |
| 989 | 989 | </block> |
| 990 | 990 | <block wx:else> | ... | ... |
pages/goods/goodsList/goodsList.js
pages/goods/goodsList/goodsList.json
pages/goods/goodsList/goodsList.wxml
| ... | ... | @@ -82,7 +82,7 @@ |
| 82 | 82 | <block wx:else> |
| 83 | 83 | <view class="price">￥{{item.shop_price}}</view> |
| 84 | 84 | <view class="comment flex jc_sb"> |
| 85 | - <view class="word-line xc-ash">￥{{item.market_price}}</view> | |
| 85 | + <view class="word-line xc-ash">￥{{item.market_price}}</view> | |
| 86 | 86 | <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view> |
| 87 | 87 | </view> |
| 88 | 88 | </block> | ... | ... |