合并fu43

WXD-SEASON\season
2 parents 4a49c4ea 567644cf
Showing 15 changed files with 137 additions and 89 deletions
components/diy_goodsGroup/diy_goodsGroup.js
components/diy_serviceCard/diy_serviceCard.js
packageA/pages/cardList/cardList.js
packageA/pages/distribution/goods/goods.wxml
packageA/pages/distribution/shop/shop.js
packageA/pages/distribution/shop/shop.wxml
packageC/pages/group_list/group_list.js
packageC/pages/group_list/group_list.wxml
packageG/pages/goods/search/search.js
packageG/pages/group_buy/goodsInfo/goodsInfo.js
pages/goods/categoryList/categoryList.js
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsList/goodsList.js
pages/template/index.json
pages/template/index.wxml
@@ -444,8 +444,10 @@ Component({
 			for (var i in goods) {
 				var val = goods[i];
 				var item = {};
-				var prom_id = null;
-
+        var prom_id = null;
+        
+        item.prom_type = 0;
+				item.prom_id = 0;
 				var url = "/api/weshop/activitylist/getGoodActInfo";
 				var req_data = {
 					store_id: os.stoid, goodsidlist: val.goods_id, is_detail: 1, user_id: user_id
@@ -479,7 +481,6 @@ Component({
 				prom_id = item.prom_id;
 				var prom_type = item.prom_type; //0普通商品  1秒杀  6拼单 2团购 4积分购
-
 				var url = "";
 				switch (prom_type) {
@@ -489,7 +490,7 @@ Component({
 						url = "/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + prom_id;
 						break;
 					case 2:
-						url = "/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + val.goods_id + "/" + prom_id
+						url = "/api/weshop/goods/groupBuy/getNewActInfo/" + os.stoid + "/" + val.goods_id + "/" + prom_id+"/"+user_id;
 						break;
 					case 4:
 						url = "/api/weshop/integralbuy/get/" + os.stoid + "/" + prom_id;
@@ -541,6 +542,9 @@ Component({
 						th.data.requestData.push(item);
 					})
 				} else {
+          item.prom_type = 0;
+          item.prom_id = 0;
+          item.prom_price = null;
 					th.data.requestData.push(item);
 				}
       }
@@ -508,6 +508,9 @@ Component({
 						case 1:
 							url+="&prom_type=1&prom_id="+arr[0].act_id;
 							break;
+						case 2:
+							url="/packageG/pages/group_buy/goodsInfo/goodsInfo?goods_id="+gid+"&prom_id="+arr2[0].act_id;
+							break;
 						case 6:
 							url = `/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id=${gid}&prom_type=${arr2[0].prom_type}&prom_id=${arr[0].act_id}`;
 							break;
@@ -57,6 +57,9 @@ Page({
 		let url = '/api/weshop/serviceCard/page';
 		let currentQuery = this.data.currentQuery;
 		if(app.globalData.userInfo) {
+      
+      currentQuery.user_id=app.globalData.user_id || 0;
+
 			if(!this.data.isLogin) {
 				this.setData({
 					userInfo: app.globalData.userInfo,
@@ -223,7 +226,7 @@ Page({
 		var req_d = {
 			"store_id": app.globalData.setting.stoid,
 			"goods_id": gid,
-			"user_id": getApp().globalData.user_id,
+			"user_id": getApp().globalData.user_id || 0,
 			"goods_type":1
 		}
 		var res= await getApp().request.promiseGet(rurl, {data: req_d});
@@ -70,6 +70,7 @@
 	<view class="content {{(options.index == 1 && currentTabIndex ==1) ? 'pdb0':''}}">
 		<checkbox-group class="fs26" wx:if="{{isShowRow}}" bindchange="checkboxChange">
+   
 			<view class="item bg-white flex ai-center pd16" wx:for="{{list.pageData}}">
 				<!-- <label>
@@ -225,7 +226,7 @@
 						<checkbox value="{{item.goods_id}}" checked="{{item.checked}}" data-name="checkbox" wx:if="{{!(options.index == 1 && currentTabIndex ==1)}}" />
 						<view>
 							<!-- 判断是否有活动价 -->
-							<block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_type!=2 && item.prom_id>0 }}">
+							<block wx:if="{{(item.prom_price>0 || item.prom_integral>0)  &&  item.prom_id>0 && item.prom_type!=7 && item.prom_type!=10 }}">
 								<view class="flex xc-wc ai-center">
 									<text wx:if="{{item.prom_integral}}"><text class="fs30">{{item.prom_integral}}</text>积分</text>
 									<text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
@@ -134,6 +134,7 @@ Page({
           currentQuery: {
             store_id: app.globalData.setting.stoid,
             user_id: app.globalData.user_id,
+            isnewwhere:1
           },
         });
         !this.data.is_router&&this.initData();
@@ -235,7 +235,7 @@
 				<view class="pd20 fs26">
 					<view class="ellipsis-2 h68 mgb20">{{item.goods_name}}</view>
 					<!-- 判断是否有活动价 -->
-					<block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_type!=2 && item.prom_id>0}}">
+					<block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_id>0 && item.prom_type!=7 && item.prom_type!=10}}">
 						<view class="flex xc-wc">
 							<text wx:if="{{item.prom_integral}}">
 								<text class="fs30" style="font-weight: bold;">{{item.prom_integral}}</text>
@@ -73,13 +73,16 @@ Page({
 				isLogin: true,
 			});
+			let user_id=getApp().globalData.user_id || 0;
+
 			let typeVal = this.data.type;
 			let url = '/api/weshop/goods/groupBuy/page';
 			let data = {
 				store_id: app.globalData.setting.stoid,
 				is_show: 1,
 				is_end: 0,
-				timetype: typeVal
+				timetype: typeVal,
+				user_id:user_id
 			};
 			this.setData({
@@ -46,6 +46,6 @@
 	<view style="height:60rpx"></view>
 </view>
-<view class="no-more" hidden="{{!noMore}}" wx:if="{{list.length >= 0 && noMore }}">—— 已经到底啦 ——</view>
+<view class="no-more" hidden="{{!noMore}}" wx:if="{{list.length > 0 && noMore }}">—— 已经到底啦 ——</view>
 <nodata nodataContainer="t-c" wx:if="{{list.length == 0 && is_get}}"></nodata>
@@ -241,7 +241,7 @@ Page({
                             url = "/api/ms/flash_sale/getNew/" + oo.stoid + "/" + user_id + "/" + prom_id;
                             break;
                         case 2:
-                            url = "/api/weshop/goods/groupBuy/getActInfo/" + oo.stoid + "/" + item.goods_id + "/" + prom_id
+                            url = "/api/weshop/goods/groupBuy/getNewActInfo/" + oo.stoid + "/" + item.goods_id + "/" + prom_id+"/"+user_id;
                             break;
                         case 4:
                             url = "/api/weshop/integralbuy/get/" + oo.stoid + "/" + prom_id;
@@ -298,24 +298,24 @@ Page({
                             var prom = null;
                             if (res.data.code == 0 && res.data.data) {
                                 prom = res.data.data;
-
-                                if (prom != null && prom.is_end == 0 && prom.end_time > now && (prom.start_time < now || (prom_type!=2 && prom.show_time && prom.show_time < now))) {
-                                    item.prom_price = res.data.data.price;
-                                    if(prom_type==4){
-                                        item.prom_price= res.data.data.addmoney;
-                                    }
-
-                                    if (res.data.data.user_price) item.prom_price = res.data.data.user_price;
-                                    var vNum = prom.virtual_num ? prom.virtual_num : 0;
-                                    var vNum1 = prom.virtualNum ? prom.virtualNum : 0;
-                                    var vNum2 = prom.virtual ? prom.virtual : 0;
-                                    item.sales_sum = prom.buy_num + (vNum + vNum1 + vNum2);
-                                } else {
-                                    item.prom_type = 0;
-                                    item.prom_id = 0;
-                                    item.prom_price = null;
+                            }
+                            if (prom != null && prom.is_end == 0 && prom.end_time > now && (prom.start_time < now || (prom_type!=2 && prom.show_time && prom.show_time < now))) {
+                                item.prom_price = res.data.data.price;
+                                if(prom_type==4){
+                                    item.prom_price= res.data.data.addmoney;
                                 }
+
+                                if (res.data.data.user_price) item.prom_price = res.data.data.user_price;
+                                var vNum = prom.virtual_num ? prom.virtual_num : 0;
+                                var vNum1 = prom.virtualNum ? prom.virtualNum : 0;
+                                var vNum2 = prom.virtual ? prom.virtual : 0;
+                                item.sales_sum = prom.buy_num + (vNum + vNum1 + vNum2);
+                            } else {
+                                item.prom_type = 0;
+                                item.prom_id = 0;
+                                item.prom_price = null;
                             }
+                                                      
                         })
                     };
                     if (!th.data.requestData) th.data.requestData = [];
@@ -871,60 +871,63 @@ Page({
         var boughtNum = 0;
         var is_ok = 1;
-        // 获取redis当前可以购买的数量
-        // 如果数量为0，设置和显示已抢光
-        // 否则，进一步判断是否超出限购或超出库存
-        await this.getactLen().then(async function (res) {
-            redisNums = res;
-            let curNum = th.data.goodsInputNum;
-            // res: redis可购买数量
-            console.log('当前可以购买的数量:', res);
-            if (res <= 0) {
-                // 可购买数量<=0, 设置和显示已抢光
-                th.setData({
-                    prom_r_null: 1,
-                });
-                getApp().my_warnning('超出活动库存', 0, self);
-                is_ok = 0;
-                return false;
-            } else {
-
-                if(curNum>redisNums){
+        if(this.data.prom_type == 2) {
+
+            // 获取redis当前可以购买的数量
+            // 如果数量为0，设置和显示已抢光
+            // 否则，进一步判断是否超出限购或超出库存
+            await this.getactLen().then(async function (res) {
+                redisNums = res;
+                let curNum = th.data.goodsInputNum;
+                // res: redis可购买数量
+                console.log('当前可以购买的数量:', res);
+                if (res <= 0) {
+                    // 可购买数量<=0, 设置和显示已抢光
+                    th.setData({
+                        prom_r_null: 1,
+                    });
                     getApp().my_warnning('超出活动库存', 0, self);
                     is_ok = 0;
                     return false;
-                }
-                // 可购买数量>0
-                // 计算自己还可以购买的数量
-                // 自己还可购买的数量c = 每人活动限购数量a - 自己已经购买的数量b
-                // 如果限购数量a>redis可购买数量d，当增加数量t>d, 提示超出库存
-                // 如果限购数量a<=redis可购买数量d, 当增加数量t>a，提示超出限购
-                let actInfo = th.data.sele_g;
-                if(actInfo.buy_limit>0){
-                    await th.get_buy_num2().then(function (data) {
-                        let limited = actInfo.buy_limit; // 限购数量a
-                        let promcardbuynum = data.data.data.promcardbuynum;
-                        let canBuyNum = limited - promcardbuynum; // 自己还可购买的数量c
-
-                        limitNum = limited;
-                        boughtNum = promcardbuynum;
+                } else {
-                        if (canBuyNum <= 0) {
-                            canBuyNum = 0;
-                        }
+                    if (curNum > redisNums) {
+                        getApp().my_warnning('超出活动库存', 0, self);
+                        is_ok = 0;
+                        return false;
+                    }
+                    // 可购买数量>0
+                    // 计算自己还可以购买的数量
+                    // 自己还可购买的数量c = 每人活动限购数量a - 自己已经购买的数量b
+                    // 如果限购数量a>redis可购买数量d，当增加数量t>d, 提示超出库存
+                    // 如果限购数量a<=redis可购买数量d, 当增加数量t>a，提示超出限购
+                    let actInfo = th.data.sele_g;
+                    if (actInfo.buy_limit > 0) {
+                        await th.get_buy_num2().then(function (data) {
+                            let limited = actInfo.buy_limit; // 限购数量a
+                            let promcardbuynum = data.data.data.promcardbuynum;
+                            let canBuyNum = limited - promcardbuynum; // 自己还可购买的数量c
+
+                            limitNum = limited;
+                            boughtNum = promcardbuynum;
+
+                            if (canBuyNum <= 0) {
+                                canBuyNum = 0;
+                            }
-                        if (curNum > canBuyNum) {
-                            getApp().my_warnning('超出限购数量', 0, self);
-                            th.setData({
-                                goodsInputNum: canBuyNum || 1,
-                            });
-                            is_ok = 0;
-                            return false;
-                        }
-                    })
+                            if (curNum > canBuyNum) {
+                                getApp().my_warnning('超出限购数量', 0, self);
+                                th.setData({
+                                    goodsInputNum: canBuyNum || 1,
+                                });
+                                is_ok = 0;
+                                return false;
+                            }
+                        })
+                    }
                 }
-            }
-        })
+            })
+        }
         if (!is_ok) return false;
@@ -2929,7 +2932,7 @@ Page({
                     prom_r_null: 1
                 });
                 //拿取价格并且判断时间--
-                getApp().request.get("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + gid + "/" + prom_id, {
+                getApp().request.get("/api/weshop/goods/groupBuy/getNewActInfo/" + os.stoid + "/" + gid + "/" + prom_id+"/"+user_id, {
                     success: function (t) {
                         if (t.data.code != 0) {
                             ee.get_normal(gid);
@@ -1068,10 +1068,11 @@ Page({
   requestGoodsList: function (t) {
     var that = this;
+    var user=getApp().globalData.user_id || 0;
     that.data.requestUrl = t;
     console.error(666666);
-    e.get("/api/weshop/goods/page?1=1", {
-      data: { page: that.data.stylePage, cat_id: that.data.cat_id, parent_id: 0, orderField: 'sort', orderType: 'asc', is_mainshow: 1, isonsale: 1, store_id: oo.stoid, is_recommend: 1 },
+    e.get("/api/weshop/goods/page?1=1&isnewwhere=1", {
+      data: { page: that.data.stylePage, cat_id: that.data.cat_id, parent_id: 0, orderField: 'sort', orderType: 'asc', is_mainshow: 1, isonsale: 1, store_id: oo.stoid, is_recommend: 1,user_id:user_id },
       success: function (data) {
         console.log(data.data.data.pageData)
         that.setData({
@@ -1173,8 +1174,9 @@ Page({
     console.log("cid:=" + cid)
     console.log("cid:=" + this.data.cat_id);
     var s = this
-    e.get("/api/weshop/goods/page?1=1", {
-      data: { page: page, cat_id: cid, parent_id: 0, orderField: 'sort', orderType: 'asc', is_mainshow: 1, isonsale: 1, store_id: oo.stoid, is_recommend: 1 },
+    var user_id=getApp().globalData.user_id || 0;
+    e.get("/api/weshop/goods/page?1=1&isnewwhere=1", {
+      data: { page: page, cat_id: cid, parent_id: 0, orderField: 'sort', orderType: 'asc', is_mainshow: 1, isonsale: 1, store_id: oo.stoid, is_recommend: 1,user_id:user_id },
       success: function (e) {
         console.log('上拉加载。。。。。。。。。');
         console.log(e.data.data.pageData)
@@ -1314,8 +1314,9 @@ Page({
               setTimeout(() => {
                 console.log('cccc');
                 console.log(th.data.prom_type);
+                console.log(th.data.sele_g);
-              }, 500)
+              }, 1500)
@@ -3295,9 +3296,15 @@ Page({
                 var goodsinfo = arrdata[i],
                   prom = null;
+
+
                 if (goodsinfo.goods_id != g_id) {
+                  goodsinfo.prom_type=0;
+                  goodsinfo.prom_id=0;
+
+
                   //要判断一下商品的活动是不是多活动，确定一下商品的prom_type
                   var url = '/api/weshop/activitylist/listGoodActInfo2New';
                   var req_d = {
@@ -3355,6 +3362,9 @@ Page({
                 }else{
+                  goodsinfo.prom_type=tt.data.prom_type;
+                  goodsinfo.prom_id=tt.data.prom_id;
+
                   //只有是普通商品的时候，才要给商品赋值指定门店
                   if ([1, 2, 4, 6, 8, 9].indexOf(parseInt(this.data.prom_type)) <0 || is_normal) {
                        //如果商品有设置分组
@@ -4761,7 +4771,7 @@ Page({
                             prom_r_null: 1
                           });
                           //拿取价格并且判断时间--
-                          getApp().request.get("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + gid + "/" + prom_id, {
+                          getApp().request.get("/api/weshop/goods/groupBuy/getNewActInfo/" + os.stoid + "/" + gid + "/" + prom_id+"/"+user_id, {
                             success: function (t) {
                               if (t.data.code != 0) {
                                 ee.get_normal(gid);
@@ -9017,10 +9027,20 @@ Page({
                               },
                               get_normal(gid) {
-                                this.setData({
-                                  prom_type: 0,
-                                  isshow: 1,
-                                });
+
+                                var set_ob={};
+                                if (this.data.data.pick_up_lists && this.data.data.pick_up_lists.length) {
+                                  set_ob={
+                                    ['data.pickup_ids']:this.data.data.pick_up_lists,
+                                    ['sele_g.pickup_ids']:this.data.data.pick_up_lists,
+                                    ['front_g.pickup_ids']:this.data.data.pick_up_lists,
+                                  }
+                                }
+                                set_ob.prom_type= 0;
+                                set_ob.isshow=1;
+                                this.setData(set_ob);
+
+
                                 this.get_sku(os.stoid, this.data.data, gid);
                                 this.get_sto();
                                 if (!this.data.data.whsle_id)
@@ -420,14 +420,15 @@ Page({
                   var prom_id=item.prom_id;
                   var now=ut.gettimestamp();
                   var url = "";
+                  var user_id=getApp().globalData.user_id;
+                  if(!user_id) user_id=0;
+
                   switch (prom_type){
                       case 1:
-                          var user_id=getApp().globalData.user_id;
-                          if(!user_id) user_id=0;
                           url = "/api/ms/flash_sale/getNew/" +oo.stoid + "/" +user_id+"/"+ prom_id;
                           break;
                       case 2:
-                          url ="/api/weshop/goods/groupBuy/getActInfo/" +oo.stoid + "/" +item.goods_id+"/"+ prom_id
+                          url ="/api/weshop/goods/groupBuy/getNewActInfo/" +oo.stoid + "/" +item.goods_id+"/"+ prom_id+"/"+user_id;
                           break;
                       case 4:
                           url ="/api/weshop/integralbuy/get/"+oo.stoid +"/"+prom_id;
@@ -27,7 +27,8 @@
     "floatingWindow": "/components/diy_floatingWindow/diy_floatingWindow",
     "floatingBox": "/components/diy_floatingBox/diy_floatingBox",
     "div_tab_bar": "/custom-tab-bar/index",
-        "presell": "/components/diy_pregoods/diy_pregoods"
+        "presell": "/components/diy_pregoods/diy_pregoods",
+        "serviceCard": "/components/diy_serviceCard/diy_serviceCard"
     }, 
   "enablePullDownRefresh": false,
   "onReachBottomDistance":300,
@@ -177,6 +177,12 @@
         <!-- <luckyGo object="{{item.content}}"></luckyGo> -->
         <diy_public object="{{item.content}}" prom_type="9"></diy_public>
       </block>
+
+      <!-- 服务卡项 -->
+      <block wx:if="{{item.ename=='servicecategory'}}">
+        <serviceCard object="{{item.content}}" sticky="{{template_arr[0].content.is_top}}"></serviceCard>
+      </block>
+
     </view>
   </block>