团购测试返回

antploy
1 parent 1e57a799
Showing 5 changed files with 64 additions and 18 deletions
components/diy_groupbuy/diy_groupbuy.js
components/diy_groupbuy/diy_groupbuy.wxml
components/diy_groupbuy/diy_groupbuy.wxss
packageC/pages/group_list/group_list.wxml
pages/goods/goodsInfo/goodsInfo.wxml
@@ -71,10 +71,10 @@ Component({
 		       var user_id=getApp().globalData.user_id;
 		       if(!user_id){ user_id=0;}
-		       //--调用接口,读取秒杀--
+		       //--调用接口,读取团购--
 		       app.request.promiseGet("/api/weshop/goods/groupBuy/getGoodsList?store_id="
 		         + os.stoid + "&aidlist=" + goodsidlist+"&user_id="+user_id, {}).then(res => {
-		           console.log(res);
+		           console.log(res,100);
 		           //如果秒杀的数组为空的时候    
 		           var goodslist = res.data.data;
 		           //就算是添加的活动已经过期，就要用最新的进行中活动
@@ -207,7 +207,7 @@ Component({
 		   this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
 		 },
-		 //跳转到秒杀列表
+		 //跳转到团购列表
 		 go_to_group: function () {
 		    var  url="/packageC/pages/group_list/group_list";
+<wxs module="filter" src="../../utils/filter.wxs" ></wxs>
 <block wx:if="{{goods_array.length>0}}">
 	<!--秒杀-->
 	<view class='top' bindtap="go_to_group">
@@ -20,13 +21,11 @@
 						class="s1_gk_a1">
 						<view class='one'>
 							<view class='sp_top'>
-							
 								<view class='s_img'>
 									<image src="{{imghost+aitem.original_img}}"
 										data-errorimg="goods_array[{{index}}][{{aind}}].original_img"
 										binderror="bind_bnerr3"></image>
 								</view>
-
 								<view class='s_foot_kill'>
 									<text>{{aitem.djs.day}}天</text>
 									<text>{{aitem.djs.hou}}时</text>
@@ -42,11 +41,14 @@
 								<view class='sp_jg'>￥{{aitem.price}}</view>
 								<view class='sp_jgx'>￥{{aitem.market_price}}</view>
 							</view>
-							<view class="gorup_count">
-								<text class="leftred">已抢0件</text>
-								<text class="rightwhite">0%</text>
+							<view class="progress_box">
+								<text class="on_sale_list">已买:{{aitem.buy_num + aitem.virtual_num}}件</text>
+								<progress class="progress_list" 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.goods_num)*100)}}%" />
 							</view>
-
+							<!-- <view class="gorup_count">
+								<text class="leftred">已抢{{}}件</text>
+								<text class="rightwhite">0%</text>
+							</view> -->
 						</view>
 					</navigator>
 				</block>
@@ -60,8 +62,6 @@
 				<navigator
 					url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&prom_type=2&prom_id={{aitem.prom_id}}"
 					class="s1_gk_a1">
-					
-					
 					<view class="flex jc_sb" style="padding: 0 20rpx; margin-top: 10rpx;">
 						<view>
 							距结束时间
@@ -75,7 +75,6 @@
 					</view>
 					<view class='one1'>
-					
 						<view class="o1_img">
 							<image src="{{imghost+aitem.original_img}}"
 								data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3">
@@ -85,15 +84,14 @@
 						<view class="o1_right">
 							<view class="sp_wzi">{{aitem.title}}</view>
 							<!-- 进度条 -->
-						    <view>
-								
+						  <view class="progress_box">
+								<text class="on_sale">已买:{{aitem.buy_num + aitem.virtual_num}}件</text>
+								<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)}}%"/>
 							</view>
 							<view>
 								<view class='sp_jg'>￥{{aitem.price}}</view>
 								<view class='sp_jgx'>￥{{aitem.market_price}}</view>
 							</view>
-							
-					
 						</view>
 					</view>
 				</navigator>
@@ -83,7 +83,45 @@ swiper {
   color: #fff;
   text-align: center;
 }
+/* .ellipsis-1 {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+} */
+.progress_box{
+  position: relative;
+}
+.progress::after{
+  content: attr(data-content);
+  position: absolute;
+  right: 20px;
+  font-size: 24rpx;
+  color: #fff;
+}
+.on_sale{
+  position: absolute;
+  font-size: 24rpx;
+  left: 40%;
+  top: 2rpx;
+  color: #fff;
+}
+.progress_list::after{
+  content: attr(data-content);
+  position: absolute;
+  right: 6rpx;
+  font-size: 22rpx;
+  color: #fff;
+}
+.on_sale_list{
+  position: absolute;
+  font-size: 22rpx;
+  left: 30%;
+  top: 4rpx;
+  color: #fff;
+}
+/* .on_sale : hover{
+} */
 .po {
   position: absolute;
 }
@@ -16,7 +16,7 @@
 				</view>
 				<view class="flex jc_sb ai-center c-7b">
 					<view class="fs24">
-						<view>已售{{item.buy_num}}件</view>
+						<view>已售{{item.buy_num+item.virtual_num}}件</view>
 						<view class=""><text class="iconfont icon-shizhong fs24"></text>{{goodlist[index].djs.day}}天{{goodlist[index].djs.hou}}时{{goodlist[index].djs.min}}分{{goodlist[index].djs.sec}}秒</view>
 					</view>
 					<view class="btn" >去团购</view>
@@ -1182,7 +1182,8 @@
               <block wx:if="{{card_field && sele_g[card_field]>0}}">{{sele_g[card_field]}}</block>
               <block wx:else>{{sele_g.shop_price}}</block>
             </view>
-            <view class="spec-goods-price" wx:elif="{{prom_type!=2}}"><text class="fs20">￥</text>{{prom_price}}</view>
+            <view class="spec-goods-price" wx:else><text class="fs20">￥</text>{{prom_price}}</view>
+            <!-- <view class="spec-goods-price" wx:elif="{{prom_type!=2}}"><text class="fs20">￥</text>{{prom_price}}</view> -->
             <!-- 显示线下价格 -->
             <view wx:if="{{sele_g.offline_price}}" class="quan_price flex ai-center jc-center">
               券后￥
@@ -1213,6 +1214,15 @@
               <view class="spec-goods-stock">可售：{{prom_act.goods_num-prom_act.buy_num}}</view>
             </view>
           </block>
+          <block wx:if="{{prom_type==2}}">
+            <view class="flex">
+              <view class="spec-goods-stock" wx:if="{{prom_st>0}}">
+                已售：{{prom_act.buy_num+prom_act.virtualNum}}
+              </view>
+              <view class="spec-goods-stock" wx:else>已售：{{prom_act.buy_num}}</view>
+              <view class="spec-goods-stock">可售：{{prom_act.goods_num-prom_act.buy_num}}</view>
+            </view>
+          </block>
         </view>
         <!-- 选择门店模块 -->
         <view class="flex-space-between address ai_end xc-width ">