wxd / MShopWeApp

Commit d3c4a193540af9ce5b97dadf31bfa686c4732655

Authored by 泉州测试
2 parents e1b0f673 42b27bb8

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

Inline Side-by-side
Showing 3 changed files with 7 additions and 4 deletions
packageA/pages/goodsInfo/buy_flash_normal.wxml
  View file @d3c4a19
... ... @@ -6,11 +6,13 @@
6 6 <image class="wh100 spec-img xc-distance-bottom" bindtap="previewImage" src="{{iurl + (data.image_url ? data.image_url:'miniapp/images/default_g_img.gif')}}" binderror="pop_err_img" data-errorimg="data.img_url"></image>
7 7 <view class="spec-goods-info">
8 8 <view class="spec-goods-name ellipsis-2">{{data.goods_name}}</view>
9   - <view class="flex ai_end xc-val-money">
  9 + <view class="flex ai_end xc-val-money">
  10 + <view class="spec-goods-price">
10 11 <text class="fs20">￥</text>{{data.shop_price}}
11 12 <!-- 如果是等级会员，且有等级价 -->
12 13 <!-- <block wx:if="{{card_field && sele_g[card_field]>0}}">{{sele_g[card_field]}} </block> -->
13   - <!-- <block wx:else>{{sele_g.shop_price}}</block> -->
  14 + <!-- <block wx:else>{{sele_g.shop_price}}</block> -->
  15 + </view>
14 16 </view>
15 17  
16 18 <!-- <view class="flex">
... ...
packageA/pages/goodsInfo/goodsInfo.js
  View file @d3c4a19
... ... @@ -929,7 +929,7 @@ Page({
929 929 newd['prom_price'] = this.data.prom_price;
930 930 };
931 931  
932   - if(this.data.prom_act.is_shop_buy&& this.data.prom_r_null == 1) {
  932 + if(this.data.prom_type == 1 && this.data.openSpecModal_flash_normal) {
933 933 newd['prom_type'] = 0;
934 934 newd['prom_price'] = this.data.data.shop_price;
935 935 };
... ...
packageA/pages/goodsInfo/goodsInfo.wxml
  View file @d3c4a19
... ... @@ -649,7 +649,8 @@
649 649 <view class="spec-goods-info">
650 650 <view class="spec-goods-name ellipsis-2">{{data.goods_name}}</view>
651 651 <view class="flex ai_end xc-val-money">
652   - <view class="spec-goods-price"><text class="fs20">￥</text>
  652 + <view class="spec-goods-price">
  653 + <text class="fs20">￥</text>
653 654 <block wx:if="{{options.prom_type == 1}}">{{prom_price}}</block>
654 655 <block wx:else>{{data.shop_price}}</block>
655 656 </view>
... ...