wxd / MShopWeApp

Commit 7a45bb185e5cc4fa275e41e2f9676db5d33243e1

Authored by taiyuan
2 parents 7796d4f3 f42d6a87

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

Inline Side-by-side
Showing 2 changed files with 8 additions and 8 deletions
pages/goods/goodsList/goodsList.js
  View file @7a45bb1
... ... @@ -137,7 +137,7 @@ Page({
137 137 arr[i].content=content;
138 138  
139 139 //--送礼包--
140   - if(content.is_libao) {
  140 + if(parseInt(content.is_libao)) {
141 141 //-- 获取 --
142 142 await getApp().request.promiseGet("/api/weshop/libao/libaoForm/page?id="+content.libao+"&store_id="+oo.stoid, {
143 143 }).then(res => {
... ... @@ -146,7 +146,7 @@ Page({
146 146 })
147 147 }
148 148 //--送赠品--
149   - if(content.is_gift) {
  149 + if(parseInt(content.is_gift)) {
150 150 //-- 获取 --
151 151 await getApp().request.promiseGet("/api/weshop/prom/gift/page?id="+content.gift+"&store_id="+oo.stoid, {
152 152 }).then(res => {
... ...
pages/goods/goodsList/goodsList.wxml
  View file @7a45bb1
... ... @@ -4,12 +4,12 @@
4 4 <block wx:for="{{prom_goods_list}}">
5 5 <view class="fs30 ellipsis-1" style="padding: 20rpx 30rpx">
6 6 满{{item.condition}}<text space="{{true}}" wx:if="{{item.prom_type==0}}">元 </text> <text space="{{true}}" wx:else>件 </text>
7   - <text space="{{true}}" wx:if="{{item.content.is_money}}">减{{item.content.money}}元 </text>
8   - <text space="{{true}}" wx:if="{{item.content.is_sale}}">打{{item.content.sale}}折 </text>
9   - <text space="{{true}}" wx:if="{{item.content.is_int}}">送{{item.content.int}}积分 </text>
10   - <text space="{{true}}" wx:if="{{item.content.is_coupon}}">送{{item.content.coupon}}元优惠券 </text>
11   - <text space="{{true}}" wx:if="{{item.content.is_gift}}">送{{item.content.gift_name}} </text>
12   - <text space="{{true}}" wx:if="{{item.content.is_libao}}">送{{item.content.lb_name}} </text>
  7 + <text space="{{true}}" wx:if="{{item.content.is_money && item.content.is_money!='0'}}">减{{item.content.money}}元 </text>
  8 + <text space="{{true}}" wx:if="{{item.content.is_sale && item.content.is_sale!='0'}}">打{{item.content.sale}}折 </text>
  9 + <text space="{{true}}" wx:if="{{item.content.is_int && item.content.is_int!='0'}}">送{{item.content.int}}积分 </text>
  10 + <text space="{{true}}" wx:if="{{item.content.is_coupon && item.content.is_coupon!='0'}}">送{{item.content.coupon}}元优惠券 </text>
  11 + <text space="{{true}}" wx:if="{{item.content.is_gift && item.content.is_gift!='0'}}">送{{item.content.gift_name}} </text>
  12 + <text space="{{true}}" wx:if="{{item.content.is_libao && item.content.is_libao!='0'}}">送{{item.content.lb_name}} </text>
13 13 </view>
14 14 </block>
15 15 </view>
... ...