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

yvan.ni
2 parents cfa7c23a fd5c9683
Showing 4 changed files with 153 additions and 25 deletions
pages/cart/cart2/cart2.js
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
pages/goods/goodsInfo/goodsInfo.wxss
@@ -124,6 +124,7 @@ Page({
         in_zhact_gdmap:{}, //不同门店参与同一活动的限购
         hid_inp:1,
         user_note:{},
+        zuhe_map_good:{},
     },
     onLoad: function (t) {
         wx.setNavigationBarTitle({title: "填写订单",})
@@ -453,6 +454,7 @@ Page({
                     //要把组合购的东西拿出来算一下
                     if (item1.prom_type == 7) {
                         var isok = 1;
+                        var is_flag=1;
                         //如果有组合购
                         var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + item1.prom_id+'/'+getApp().globalData.userInfo.user_id;
                         await getApp().request.promiseGet(url, {}).then(res => {
@@ -464,25 +466,45 @@ Page({
                                 if (ut.gettimestamp() > res.data.data.end_time) {
                                     isok = 0;
                                 }
+                                item1.act = res.data.data;
                             } else {
                                 //未找到商品的活动
-                                isok = 0;
+                                is_flag = 0;
                             }
-                            item1.act = res.data.data;
                         })
-
                         if (!isok) {
                             getApp().my_warnning("组合购的活动已经过期", 0, th);
                             return false;
                         }
-
+                        var url1 = "/api/weshop/prom/zhbuyGoods/page";
+                        var req_data = {
+                            page: 1,
+                            pageSize: 2000,
+                            store_id: os.stoid,
+                            zh_id: item1.prom_id,
+                        }
+                        await getApp().request.promiseGet(url1, {
+                            data: req_data
+                        }).then(res => {
+                            if (ut.ajax_ok(res)) {
+                               var gdlist = res.data.data.pageData;
+                                gdlist.forEach(i=>{
+                                    if(item1.goods_id==i.goods_id&&!is_flag){
+                                        item1.prom_type=0;
+                                        item1.prom_type1=0;
+                                        item1.prom_id=0;
+                                        item1.prom_id1=0
+                                    }
+                                })
+                                th.data.zuhe_map_good[item1.prom_id]=gdlist; 
+                            }
+                        })
                     }
                 }
                 //在分组的时候，就不要再调用接口，await
                 for (var i = 0; i < carr.length; i++) {
                     var item = carr[i];
-
                     //-- 如果是等级会员注册返回 --
                     if (is_card_back) {
                         th.data.card_name = th.data.userinfo.card_field;
@@ -666,22 +688,26 @@ Page({
                     //存储不同活动的商品列表
                     u_item.zh_prom_goods = {};
                     for (let var1 in obj) {
-                        var h_item = obj[var1];
-                        var gdlist = null;
-                        var url1 = "/api/weshop/prom/zhbuyGoods/page";
-                        var req_data = {
-                            page: 1,
-                            pageSize: 2000,
-                            store_id: os.stoid,
-                            zh_id: h_item.prom_id,
-                        }
-                        await getApp().request.promiseGet(url1, {
-                            data: req_data
-                        }).then(res => {
-                            if (ut.ajax_ok(res)) {
-                                gdlist = res.data.data.pageData;
-                            }
-                        })
+                        var h_item=obj[var1];
+				   	    var gdlist= th.data.zuhe_map_good[h_item.prom_id];
+						//获取活动需要的商品列表
+						// u_item.zh_prom_goods[h_item.prom_id]=gdlist;
+                        // var h_item = obj[var1];
+                        // var gdlist = null;
+                        // var url1 = "/api/weshop/prom/zhbuyGoods/page";
+                        // var req_data = {
+                        //     page: 1,
+                        //     pageSize: 2000,
+                        //     store_id: os.stoid,
+                        //     zh_id: h_item.prom_id,
+                        // }
+                        // await getApp().request.promiseGet(url1, {
+                        //     data: req_data
+                        // }).then(res => {
+                        //     if (ut.ajax_ok(res)) {
+                        //         gdlist = res.data.data.pageData;
+                        //     }
+                        // })
                         //获取活动需要的商品列表
                         u_item.zh_prom_goods[h_item.prom_id] = {gdlist: gdlist, act: h_item.act};
                     }
@@ -4261,9 +4261,12 @@ Page({
 			context.setTextAlign('left');
 			context.fillText('强烈推荐', 64*unit, 672*unit);
 			// 7.商品价格
+			let price = '￥' + this.data.data.shop_price;
+			// if (th.data.prom_act)
+			//   pri0 = th.data.prom_act.price;
 			context.setFontSize(32*unit);
 			context.setFillStyle('#DE1117');
-			context.fillText('￥59.00', 54*unit, 730*unit);
+			context.fillText(price, 54*unit, 730*unit);
 			// 8.商品标题
 			context.setFontSize(20*unit);
 			context.setFillStyle('#898989');
@@ -87,7 +87,8 @@
                 零售价￥{{filters.toFix(data.market_price,2)}}
               </view>
             </view>
-            <view class="abs white xc-nanber">
+						
+            <!-- <view class="abs white xc-nanber">
               <text class="fs22">已拼{{prom_act.buy_num}}件</text>
               <view class="flex" style='margin-top:-34rpx'>
                 <view class="xc-people-img">
@@ -95,7 +96,19 @@
                 </view>
                 <view class="t-s fs20 xc-people-val">{{prom_act.ct_num}}人拼</view>
               </view>
-            </view>
+            </view> -->
+						
+						<!-- 幸运购 -->
+						<view class="abs white xc-nanber" wx:if="{{false}}">
+						  <text class="fs22">已成团{{prom_act.buy_num}}期</text>
+						  <view class="flex" style='margin-top:-34rpx'>
+						    <view class="xc-people-img">
+						      <image class="imgs" src="{{prom_st==1? iurl+'/miniapp/images/r_logo_red.png':iurl+'/miniapp/images/r_logo.png'}}"></image>
+						    </view>
+						    <view class="t-s fs20 xc-people-val">{{prom_act.ct_num}}人团</view>
+						  </view>
+						</view>
+						
             <view class="hy-stop word-color fs26 abs" wx:if="{{prom_st==1}}">距活动结束还有</view>
             <view class="hy-stop word-color-lan fs26  abs" wx:if="{{prom_st==0}}">距活动开始还有</view>
             <view class="secview  flex abs fs24 " style="color: black;right: 3px; top:46rpx;">
@@ -204,6 +217,72 @@
               </view>
             </view>
           </view>
+					
+					<!-- 幸运购 -->
+					<view class="pt_fir se2 bdt16" wx:if="{{teamgroup}}" hidden="{{true}}">
+					  <view class="xc-partner-frame">
+					    <view class="zzk-1 flex jc_sb" bindtap="go_t_more">
+					      <view class="pdl10">已参团4人，还差<text class="c-red">1</text>人成团</view>
+					      <view class="ckgd flex ai_c">
+					        查看奖励
+					        <view class="bg_right arrow-one"></view>
+					      </view>
+					    </view>
+					  </view>
+					  <view class='group'>
+					    <view class='group-list luck' bindtap="go_cj_team" data-ind="{{t_ind}}">
+					      <!-- <view class="flex ai_c"> -->
+					      <!-- //选项框头像 -->
+					      <view class='gtou'  wx:for="{{teamgroup}}" wx:for-index="t_ind" wx:key="teamgroup">
+					        <image src='{{item.user.head_pic}}'></image>
+					      </view>
+								<view class='gtou more'>
+								  <text class="iconfont icon-sandian"></text>
+								</view>
+								<!-- <view class='gtou'>
+								  <image src='{{item.user.head_pic}}'></image>
+								</view> -->
+					      <!-- //等你来拼 -->
+					      <!-- <view class='gdn ellipsis-1'>{{item.user.nickname}}</view> -->
+					      <!-- </view> -->
+					      <!-- //还差几人，剩余时间 -->
+					      <!-- <view class="rel">
+					        <view class='ghaicha ellipsis-2'>
+					          <text class='gred' wx:if="{{prom_act.max_ct_num >0}}">
+					            <text class="flex" wx:if="{{prom_act.max_ct_num - item.open_num>0}}">
+					              还差
+					              <text class="word-color">{{prom_act.max_ct_num - item.open_num}}</text>
+					              人享最低优惠
+					            </text>
+					            <text wx:else>您已经享最低优惠</text>
+					          </text>
+					          <text class='gred' wx:else>
+					            还差
+					            <text style='color:#ff2753'>{{prom_act.ct_num - item.open_num}}</text>
+					            人成团
+					          </text>
+					          <view class="t_show">
+					            剩余
+					            <text wx:if="{{timer[t_ind].day}}">{{timer[t_ind].day}}天:</text>
+					            <text>{{timer[t_ind].hou}}</text>
+					            :
+					            <text>{{timer[t_ind].min}}</text>
+					            :
+					            <text>{{timer[t_ind].sec}}</text>
+					          </view>
+					        </view>
+					      </view> -->
+					      <!-- //参加团 -->
+					      <!-- <view class='cjt t-c'>去参团</view> -->
+					      <!-- <view class="clear"></view> -->
+					    </view>
+							
+							<view class="fs24 pdh20 pdt20">*<text class="c-red">5</text>人成团，<text class="c-red">5</text>人得商品，<text class="c-red">5</text>人全额退款并获得<text class="c-red">惊喜礼品</text>！</view>
+					  </view>
+					</view>
+					
+					
+					
         </view>
         <!-- 积分购 -->
         <view wx:if="{{prom_type==4}}">
@@ -491,6 +570,9 @@
             </view>
           </view>
         </block>
+				
+				
+				
         <!-- 要判断是不是有订单优惠 -->
         <block wx:if="{{order_prom}}">
           <view class="cx-frame flex" style="position: relative; height: auto">
@@ -2858,4 +2858,21 @@ button.custom-service::after{
     color: #fff;
 }
-.mt20{ margin-top: 20rpx}
 \ No newline at end of file
+.mt20{ margin-top: 20rpx}
+
+.group .group-list.luck {
+	padding: 0 20rpx;
+	justify-content: flex-start;
+}
+
+.group-list.luck .gtou ~ .gtou {
+	margin-left: -16rpx;
+}
+
+.gtou.more {
+	background-color: #ddd;
+	text-align: center;
+	line-height: 70rpx;
+	border-radius: 50%;
+	color: #aaa;
+}
 \ No newline at end of file