wxd / MShopWeApp

Commit 10b1249eb416cd3d23100de7c9e94d4a78d3917a

Authored by yvan.ni
1 parent 142e450c

~~ 秒杀和团购要分开 ~~

Inline Side-by-side
Showing 1 changed file with 67 additions and 7 deletions
pages/goods/goodsInfo/goodsInfo.wxml
  View file @10b1249
@@ -1118,15 +1118,15 @@ @@ -1118,15 +1118,15 @@
1118 </block> 1118 </block>
1119 </block> 1119 </block>
1120 <!-- -----秒杀------ --> 1120 <!-- -----秒杀------ -->
1121 - <block wx:if="{{prom_type==1 || prom_type==2}}">  
1122 - <block wx:if="{{f_prom_st==1 && !prom_r_null}}"> 1121 + <block wx:if="{{prom_type==1}}">
  1122 + <block wx:if="{{f_prom_st==1 && !f_prom_r_null}}">
1123 <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn">加入购物车</view> 1123 <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn">加入购物车</view>
1124 <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn">立即抢购</view> 1124 <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn">立即抢购</view>
1125 </block> 1125 </block>
1126 1126
1127 - <block wx:if="{{prom_st==0 && !prom_r_null}}"> 1127 + <block wx:if="{{f_prom_st==0 && !f_prom_r_null}}">
1128 <!-- 秒杀预热要单独购买 --> 1128 <!-- 秒杀预热要单独购买 -->
1129 - <block wx:if="{{prom_type==1 && prom_act.is_shop_buy}}"> 1129 + <block wx:if="{{prom_type==1 && f_prom_act.is_shop_buy}}">
1130 <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn">单独购买</view> 1130 <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn">单独购买</view>
1131 <view class="buy-btn cart-btn lanse">即将开始</view> 1131 <view class="buy-btn cart-btn lanse">即将开始</view>
1132 </block> 1132 </block>
@@ -1136,12 +1136,12 @@ @@ -1136,12 +1136,12 @@
1136 </block> 1136 </block>
1137 1137
1138 1138
1139 - <block wx:if="{{prom_r_null}}"> 1139 + <block wx:if="{{f_prom_r_null}}">
1140 <block wx:if="{{prom_type==1}}"> 1140 <block wx:if="{{prom_type==1}}">
1141 1141
1142 <!-- 多个秒杀的时候 --> 1142 <!-- 多个秒杀的时候 -->
1143 <block wx:if="{{is_more_flash}}"> 1143 <block wx:if="{{is_more_flash}}">
1144 - <block wx:if="{{prom_act.is_shop_buy}}"> 1144 + <block wx:if="{{f_prom_act.is_shop_buy}}">
1145 <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn">单独购买</view> 1145 <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn">单独购买</view>
1146 <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn">立即抢购</view> 1146 <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn">立即抢购</view>
1147 </block> 1147 </block>
@@ -1151,7 +1151,7 @@ @@ -1151,7 +1151,7 @@
1151 </block> 1151 </block>
1152 </block> 1152 </block>
1153 <block wx:else> 1153 <block wx:else>
1154 - <block wx:if="{{prom_act.is_shop_buy}}"> 1154 + <block wx:if="{{f_prom_act.is_shop_buy}}">
1155 <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn">单独购买</view> 1155 <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn">单独购买</view>
1156 <view class="buy-btn cart-btn huise">已抢光</view> 1156 <view class="buy-btn cart-btn huise">已抢光</view>
1157 </block> 1157 </block>
@@ -1166,6 +1166,65 @@ @@ -1166,6 +1166,65 @@
1166 <view wx:else class="buy-btn cart-btn cart-btn-lg huise set_width">已抢光</view> 1166 <view wx:else class="buy-btn cart-btn cart-btn-lg huise set_width">已抢光</view>
1167 1167
1168 </block> 1168 </block>
  1169 + <block wx:if="{{f_prom_st==3 && !f_prom_r_null}}">
  1170 + <block wx:if="{{prom_type==1 && f_prom_act.is_shop_buy}}">
  1171 + <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn">单独购买</view>
  1172 + <view class="buy-btn cart-btn huise">活动已经结束</view>
  1173 + </block>
  1174 + <view wx:else class="buy-btn cart-btn cart-btn-lg lanse set_width">活动已经结束</view>
  1175 + </block>
  1176 + </block>
  1177 +
  1178 +
  1179 + <!-- -----团购------ -->
  1180 + <block wx:if="{{prom_type==2}}">
  1181 + <block wx:if="{{prom_st==1 && !prom_r_null}}">
  1182 + <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn">加入购物车</view>
  1183 + <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn">立即抢购</view>
  1184 + </block>
  1185 +
  1186 + <block wx:if="{{prom_st==0 && !prom_r_null}}">
  1187 + <!-- 秒杀预热要单独购买 -->
  1188 + <block wx:if="{{prom_type==1 && prom_act.is_shop_buy}}">
  1189 + <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn">单独购买</view>
  1190 + <view class="buy-btn cart-btn lanse">即将开始</view>
  1191 + </block>
  1192 + <block wx:else>
  1193 + <view class="buy-btn cart-btn cart-btn-lg lanse set_width">即将开始</view>
  1194 + </block>
  1195 + </block>
  1196 +
  1197 +
  1198 + <block wx:if="{{prom_r_null}}">
  1199 + <block wx:if="{{prom_type==1}}">
  1200 +
  1201 + <!-- 多个秒杀的时候 -->
  1202 + <block wx:if="{{is_more_flash}}">
  1203 + <block wx:if="{{prom_act.is_shop_buy}}">
  1204 + <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn">单独购买</view>
  1205 + <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn">立即抢购</view>
  1206 + </block>
  1207 + <block wx:else>
  1208 + <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn">加入购物车</view>
  1209 + <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn">立即抢购</view>
  1210 + </block>
  1211 + </block>
  1212 + <block wx:else>
  1213 + <block wx:if="{{prom_act.is_shop_buy}}">
  1214 + <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn">单独购买</view>
  1215 + <view class="buy-btn cart-btn huise">已抢光</view>
  1216 + </block>
  1217 + <block wx:else>
  1218 + <view class="buy-btn cart-btn huise">已抢光</view>
  1219 + </block>
  1220 + </block>
  1221 +
  1222 +
  1223 + </block>
  1224 +
  1225 + <view wx:else class="buy-btn cart-btn cart-btn-lg huise set_width">已抢光</view>
  1226 +
  1227 + </block>
1169 <block wx:if="{{prom_st==3 && !prom_r_null}}"> 1228 <block wx:if="{{prom_st==3 && !prom_r_null}}">
1170 <block wx:if="{{prom_type==1 && prom_act.is_shop_buy}}"> 1229 <block wx:if="{{prom_type==1 && prom_act.is_shop_buy}}">
1171 <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn">单独购买</view> 1230 <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn">单独购买</view>
@@ -1174,6 +1233,7 @@ @@ -1174,6 +1233,7 @@
1174 <view wx:else class="buy-btn cart-btn cart-btn-lg lanse set_width">活动已经结束</view> 1233 <view wx:else class="buy-btn cart-btn cart-btn-lg lanse set_width">活动已经结束</view>
1175 </block> 1234 </block>
1176 </block> 1235 </block>
  1236 +
1177 <!-- -----拼单------ --> 1237 <!-- -----拼单------ -->
1178 <block wx:if="{{prom_type==6}}"> 1238 <block wx:if="{{prom_type==6}}">
1179 <view bindtap="openSpecModel_pt" data-it="1" data-ind="1" class="join-btn cart-btn line-h"> 1239 <view bindtap="openSpecModel_pt" data-it="1" data-ind="1" class="join-btn cart-btn line-h">