服务卡项的优化

yvan.ni
1 parent 6984e5ef
Showing 4 changed files with 23 additions and 9 deletions
packageA/pages/goodsInfo/goodsInfo.wxml
packageG/pages/group_buy/goodsInfo/goodsInfo.js
packageG/pages/group_buy/goodsInfo/goodsInfo.wxml
pages/cart/cart/cart.js
@@ -109,13 +109,24 @@
  
 						<view class="flex jc_sb">
 							<view>
-								<!-- 秒杀价 -->
-								<view class="co-red" wx:if="{{options.prom_type == 1}}"><text class="rel yuan fs28">￥</text>{{filters.toFix(prom_price,2)}}</view>
-								<!-- 手店价 -->
-								<view class="co-red" wx:else><text class="rel yuan fs28">￥</text>{{filters.toFix(data.shop_price,2)}}</view>
-								<!-- <view class="word-line fs20 xc-qtunit-price">
-								  零售价￥{{filters.toFix(data.market_price,2)}}
-								</view> -->
+								<view class="flex" style="align-items: baseline;">
+									<!-- 秒杀价 -->
+									<view class="co-red" wx:if="{{options.prom_type == 1}}"><text class="rel yuan fs28">￥</text>{{filters.toFix(prom_price,2)}}</view>
+									<!-- 手店价 -->
+									<view class="co-red" wx:else><text class="rel yuan fs28">￥</text>{{filters.toFix(data.shop_price,2)}}</view>
+									<view  wx:if="{{options.prom_type == 1}}" class="word-line no_line_x fs20 xc-qtunit-price">
+										<block wx:if="{{sys_switch.is_retail_price}}">
+											￥{{filters.toFix(data.show_price,2)}}
+										</block>
+										<block wx:else>
+											￥{{filters.toFix(data.shop_price,2)}}
+										</block>
+									</view>
+
+								</view>
+
+
+
 								<view class="goods-title">
 									<view class="goods-name elli">{{data.goods_name}}</view>
 								</view>
@@ -254,6 +254,7 @@ Page({
             var gid_str = decodeURIComponent(t.scene);
             gid_str = gid_str.split("_");
             gid = gid_str[0];
+            this.data.options.goods_id=gid;
             if (gid_str.length > 1 && gid_str[1] && parseInt(gid_str[1]) > 0) {
                 first_leader = gid_str[1];
             }
@@ -83,7 +83,7 @@
  
 					<view class="abs flex fs36" style="align-items:flex-end;color: #fff; margin-top: 34rpx; margin-left: 10rpx; height: 60rpx">￥{{prom_price}}
  
-						<view wx:if="{{is_retail_price}}" class="word-line fs24 no_line_c" style="margin-left: 10rpx;position: relative;top: -6rpx; color:#fff !important">零售价：￥{{filters.toFix(data.show_price,2)}}</view>
+						<view wx:if="{{sys_switch.is_retail_price}}" class="word-line fs24 no_line_c" style="margin-left: 10rpx;position: relative;top: -6rpx; color:#fff !important">零售价：￥{{filters.toFix(data.show_price,2)}}</view>
 						<view wx:else class="word-line no_line_x fs24" style="margin-left: 10rpx;position: relative;top: -6rpx;color:#fff !important">￥{{filters.toFix(data.shop_price,2)}}</view>
 					</view>
  
@@ -1075,10 +1075,12 @@ Page({
                   store_id: os.stoid,
                   user_id: user_id,
                   card_id: prom.goods_id,
+                  prom_type: item.prom_type,
+                  prom_id: item.prom_id
                 }
               }).then(res => {
                 if (res.data.code == 0) {
-                  msNum = res.data.data.cardbuynum
+                  msNum = res.data.data.promcardbuynum,
                   console.log('秒杀限购：' + msNum)
                 }
               })