Commit 0f8ea5e97a1584752bea553c20dc88892fae0324

Authored by yvan.ni
1 parent 92656b37

团购, 客显屏

components/diy_goodsGroup/diy_goodsGroup.js
@@ -520,7 +520,12 @@ Component({ @@ -520,7 +520,12 @@ Component({
520 item.prom_price = res.data.data.price; 520 item.prom_price = res.data.data.price;
521 if(res.data.data.user_price) item.prom_price=res.data.data.user_price; 521 if(res.data.data.user_price) item.prom_price=res.data.data.user_price;
522 item.sales_sum=res.data.data.buy_num 522 item.sales_sum=res.data.data.buy_num
523 - } 523 + }else{
  524 + item.prom_type=0;
  525 + item.prom_id=0;
  526 + item.prom_price=null;
  527 + }
  528 +
524 th.data.requestData.push(item); 529 th.data.requestData.push(item);
525 }) 530 })
526 }else{ 531 }else{
components/diy_groupbuy/diy_groupbuy.wxml
@@ -86,7 +86,7 @@ @@ -86,7 +86,7 @@
86 <!-- 进度条 --> 86 <!-- 进度条 -->
87 <view class="progress_box"> 87 <view class="progress_box">
88 <text class="on_sale">已买:{{aitem.buy_num + aitem.virtual_num}}件</text> 88 <text class="on_sale">已买:{{aitem.buy_num + aitem.virtual_num}}件</text>
89 - <progress class="progress" percent="{{(aitem.buy_num/ aitem.goods_num)*100}}" border-radius="10" backgroundColor="#F1AAAB" activeColor="#E02E23" stroke-width="20" data-content="{{filter.toFix((aitem.buy_num / aitem.goods_num)*100)}}%"/> 89 + <progress class="progress" percent="{{((aitem.buy_num+aitem.virtual_num)/ (aitem.goods_num+aitem.virtual_num))*100}}" border-radius="10" backgroundColor="#F1AAAB" activeColor="#E02E23" stroke-width="20" data-content="{{filter.toFix(((aitem.buy_num+aitem.virtual_num) / (aitem.goods_num+aitem.virtual_num))*100)}}%"/>
90 </view> 90 </view>
91 <view> 91 <view>
92 <view class='sp_jg'>¥{{aitem.price}}</view> 92 <view class='sp_jg'>¥{{aitem.price}}</view>
packageA/pages/chongzhi/chongzhi.js
@@ -40,7 +40,7 @@ Page({ @@ -40,7 +40,7 @@ Page({
40 40
41 app.request.get('/api/weshop/ad/page', { 41 app.request.get('/api/weshop/ad/page', {
42 data: { 42 data: {
43 - pid: 601, 43 + pid: 611,
44 store_id: app.globalData.userInfo.store_id, 44 store_id: app.globalData.userInfo.store_id,
45 enabled: 1, 45 enabled: 1,
46 }, 46 },