预售服务卡项的优化

yvan.ni
1 parent 819fb7ab
Showing 6 changed files with 434 additions and 543 deletions
packageA/pages/goodsInfo/goodsInfo.wxml
packageC/pages/presell/cardInfo/goodsInfo.js
packageC/pages/presell/cardInfo/goodsInfo.wxml
packageC/pages/presell/cardInfo/goodsInfo.wxss
packageC/pages/presell/cart/cart2.js
packageC/pages/presell/cart/cart2.wxml
@@ -34,7 +34,7 @@
 				        </view>
 				      </swiper-item>
 				      <swiper-item wx:for="{{gallery}}" wx:key="gallery" class="sty">
-				        <view class="wh100 g_img_box" style="background-image:url({{data.image_url?data.image_url:'miniapp/images/default_g_img.gif'}});"></view>
+				        <view class="wh100 g_img_box" style="background-image:url({{iurl +(data.image_url?data.image_url:'miniapp/images/default_g_img.gif')}});"></view>
 				      </swiper-item>
 				    </swiper>
  
@@ -715,26 +715,30 @@ Page({
                                 listServiceItem: t.data.data.listServiceItem,
                             });
                         };
+
+                        var data={
+                            'goods_name': t.data.data.serviceName,
+                            'shop_price': t.data.data.money,
+                            'show_price': t.data.data.show_price,
+                            'validDays': t.data.data.validDays,
+                            'serviceContent': t.data.data.serviceContent,
+                            'image_url': t.data.data.imgUrl,
+                            'goods_id': t.data.data.id,
+                            'id': t.data.data.id,
+                            'sales_sum': t.data.data.sales_sum,
+                            'storageId':t.data.data.storageId,
+                            'service_sn':t.data.data.serviceSn,
+                            'goods_sn':t.data.data.serviceSn,
+                            'listServiceVideos': t.data.data.listServiceVideos,
+                        }
+
                         that.setData({
-                            'data.goods_name': t.data.data.serviceName,
-                            'data.shop_price': t.data.data.money,
-                            'data.show_price': t.data.data.show_price,
-                            'data.validDays': t.data.data.validDays,
-                            'data.serviceContent': t.data.data.serviceContent,
-                            'data.image_url': t.data.data.imgUrl,
-                            'data.goods_id': t.data.data.id,
-                            'data.id': t.data.data.id,
-                            'data.sales_sum': t.data.data.sales_sum,
-                            'data.storageId':t.data.data.storageId,
-                            'data.service_sn':t.data.data.serviceSn,
-                            'data.listServiceVideos': t.data.data.listServiceVideos,
-                            // gallery: t.data.data.listServiceImages,
-                            // mapurl: t.data.data.listServiceVideos[0].video_url,
-                            // mapurl_f_img: t.data.data.listServiceVideos[0].video_img,
-                            //listServiceItem: t.data.data.listServiceItem,
+                           data:data,
+                           sele_g:data
                         });
  
                         that.getTaohe();
+                        that.get_sto();
                         // ----> 预售
                         let prom_type = th.data.options.prom_type;
  
@@ -840,360 +844,158 @@ Page({
       activeCategoryId: 1
     });
   },
-	
  
-	
-  //------------加入购物车--------------
-  addCart: async function(t) {
-    var th = this;
-    var ind = t.currentTarget.dataset.openSpecModal_ind;
-    var action= t.currentTarget.dataset.action;
  
  
  
-      if(getApp().is_sp_hao() && action=='add'){
-          wx.showToast({
-              title: "视频号商品不允许加入购物车",
-              icon: 'none',
-              duration: 2000
-          });
-          return false;
-      }
+    //------------加入购物车--------------
+    addCart: function (t) {
+        var th = this;
+        var ind = t.currentTarget.dataset.openSpecModal_ind;
+        if (!ind) ind = t.currentTarget.dataset.openspecmodal_ind;
+        th.setData({
+            open_ind_store: ind
+        });
  
+        th.add_cart_func(t);
  
-      if(this.data.goodsInputNum==0){
-          getApp().my_warnning('请输入购买数量', 1, th, 450);
-          return false;
-      }
+    },
  
  
+    //-- 加入购物的函数 --
+    add_cart_func: function (t) {
+        var i = getApp().request;
+        if (oo.user_id == null) {
+            return s.my_warnning("还未登录！", 0, this);
+        }
  
-    if(!ind)  ind = t.currentTarget.dataset.openspecmodal_ind;
-    
-	th.setData({
-      open_ind_store: ind
-    });
+        if (!getApp().globalData.userInfo) {
+            return s.my_warnning("还未登录！", 0, this);
+        }
  
-		if(!th.data.sto_sele_name) {
-        getApp().my_warnning('请选择门店', 1, th, 450);
-        return false;
-    };
-		
-		// 库存
-		var redisNums = 0;
-		// 限购数
-		var limitNum = 0;
-		// 已购买数量
-		var boughtNum = 0;
-
-        var is_ok=1;
-		
-		// 秒杀活动
-		if(this.data.prom_type == 1) {
-			// 如果是秒杀活动下的单独购买，is_normal为1
-			if(this.data.openSpecModal_flash_normal) this.data.is_normal = 1;
-			
-			if(!this.data.is_normal) {// 秒杀购买
-			
-				// 获取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,
-						});
-						// wx.showModal({
-						// 	title: '超出活动库存',
-						// });
-						getApp().my_warnning('超出活动库存', 0, self);
-                        is_ok=0;
-						return false;
-					} else {
-						// 可购买数量>0
-						// 计算自己还可以购买的数量
-						// 自己还可购买的数量c = 每人活动限购数量a - 自己已经购买的数量b
-						// 如果限购数量a>redis可购买数量d，当增加数量t>d, 提示超出库存
-						// 如果限购数量a<=redis可购买数量d, 当增加数量t>a，提示超出限购
-						let actInfo = th.data.sele_g;
-						await th.get_buy_num2().then(function (data) {
-							let limited = actInfo.buy_limit==0?100000:actInfo.buy_limit; // 限购数量a
-							let promcardbuynum = data.data.data.promcardbuynum;
-							let buyedNum = promcardbuynum; // 自己已经购买的数量b
-							let canBuyNum = limited - buyedNum; // 自己还可购买的数量c
-							limitNum = limited;
-							boughtNum = buyedNum;
+        var e = this, th = e, o = this.data.sele_g, a = o.goods_id;
+        //----------添加到购物车时，要判断限购数量，--------
+        e.get_buy_num(o, function (ee) {
+            //---判断商品是否超出限购---
+            if (th.data.g_buy_num != null && th.data.sele_g.viplimited > 0) {
+                if (th.data.goodsInputNum + th.data.g_buy_num.get(th.data.sele_g.goods_id) > th.data.sele_g.viplimited) {
+                    wx.showModal({
+                        title: '提示',
+                        content: '超出商品限购'
+                    });
+                    return false;
+                }
+            }
+            //---判断商品是否超出活动限购---
+            if (th.data.prom_buy_num != -1 && th.data.prom_buy_limit > 0) {
+                if (th.data.goodsInputNum + th.data.prom_buy_num > th.data.prom_buy_limit) {
+                    wx.showModal({
+                        title: '提示',
+                        content: '超出商品活动限购'
+                    });
+                    return false;
+                }
+            }
  
-							if(canBuyNum <= 0) {
-								canBuyNum = 0;
-							};
-							
-							if(canBuyNum > res) {
-								if(curNum > res) { // t当前增减的数量
-									// wx.showModal({
-									// 	title: '超出活动库存',
-									// });
-									getApp().my_warnning('超出活动库存', 0, self);
-									th.setData({
-										goodsInputNum: res || 1
-									});
-                                    is_ok=0;
-									return false;
-								};
-							};
-							
-							if(canBuyNum <= res) {
-								if(curNum > canBuyNum) {
-									// wx.showModal({
-									// 	title: '超出限购数量',
-									// });
-									getApp().my_warnning('超出限购数量', 0, self);
-									th.setData({
-										goodsInputNum: canBuyNum || 1,
-									});
-                                    is_ok=0;
-									return false;
-								}
-							}
-						})
+            if (th.data.goodsInputNum <= 0) return s.my_warnning("商品数量不能为0", 0, th);
+            if (th.data.sto_sele_name == null || th.data.sto_sele_name == undefined)
+                th.setData({
+                    sto_sele_name: ""
+                });
+            if (th.data.sto_sele_name == "") return s.my_warnning("请选择门店", 0, th);
  
-					}
-				})
-				
-			}
-		}
-		
+            //--------------此时操作的数据------------
+            var newd = {
+                goods_id: o.id,
+                goods_num: th.data.goodsInputNum,
+                pick_id: th.data.sto_sele_id,
+                user_id: oo.user_id,
+                store_id: th.data.stoid,
+                goods_price: o.shop_price,
+                member_goods_price: o.shop_price,
+                goods_name: o.goods_name,
+                goods_sn: o.goods_sn,
+                presell_list_id: th.data.presellList.id,
+            };
+
+            //---是不是从收藏夹出来的---
+            if (th.data.c_guide_id) {
+                newd['guide_id'] = th.data.c_guide_id;
+                newd['guide_type'] = 2;
+                if ("add" == t.currentTarget.dataset.action) newd['guide_type'] = 3;
+            } else {
+                if (getApp().globalData.guide_id) {
+                    newd['guide_id'] = getApp().globalData.guide_id;
+                    newd['guide_type'] = 0;
+                    if ("add" == t.currentTarget.dataset.action) newd['guide_type'] = 1;
+                }
+            }
  
-        if(!is_ok) return false;
+            if(getApp().globalData.groupchat_id){
+                newd['groupchat_id'] = getApp().globalData.groupchat_id;
+            }
  
+            //让商品带上房间号
+            if (th.data.sys_switch.is_skuroom_id == 1) {
+                if (th.data.data.goods_id == getApp().globalData.room_goods_id) {
+                    newd.room_id = getApp().globalData.room_id;
+                }
+            } else {
+                if (newd.goods_id == getApp().globalData.room_goods_id) newd.room_id = getApp().globalData.room_id;
+            }
  
  
-	if(action=="buy"){
-		//--------------此时操作的数据------------
-		var newd = {
-		  id: th.data.data.id,
-		  goods_num: th.data.goodsInputNum,
-		  pick_id: th.data.sto_sele_id,		
-		  keyid: th.data.sto_sele_keyid,		
-		};	  
-		newd['pick_name'] = th.data.sto_sele_name;		
-		newd['guide_id'] = getApp().globalData.guide_id;
-    newd['guide_type']=0;
-    
-    if(getApp().globalData.groupchat_id){
-      newd['groupchat_id'] = getApp().globalData.groupchat_id;
-    }
-		if(this.data.prom_type && this.data.prom_type == 1) {
-			newd['prom_type'] = this.data.prom_type;
-			newd['prom_id'] = this.data.prom_id;
-			newd['prom_price'] = this.data.prom_price;
-		};
-		
-		if(this.data.prom_type == 1 && this.data.openSpecModal_flash_normal) {
-			newd['prom_type'] = 0;
-			newd['prom_price'] = this.data.data.shop_price;
-		};
-		
-		console.log('newd++++++++', newd);
-		th.buyNow(newd);
-	} else {
-				
-        var newd = {
-            service_id: th.data.data.id,
-            service_sn:th.data.data.service_sn,
-            service_name:th.data.data.goods_name,
-            goods_num: th.data.goodsInputNum,
-            pick_id: th.data.sto_sele_id,
-            user_id:oo.user_id,
-            store_id:os.stoid,
-            money:th.data.data.shop_price,
-        };
-        if(getApp().globalData.guide_id) {
-            newd['guide_id'] = getApp().globalData.guide_id;
-            newd['guide_type']=0;
-        };
-        if(getApp().globalData.groupchat_id){
-          newd['groupchat_id'] = getApp().globalData.groupchat_id;
+            //如果有线下取价
+            if (o.offline_price) {
+                newd.offline_price = o.offline_price;
+                newd.pricing_type = o.pricing_type;
+            }
+
+            newd.goods_price = th.data.prom_price;
+            newd.member_goods_price = th.data.prom_price,
+            newd.prom_type = 8;
+            newd.prom_id = th.data.presell_id;
+
+            if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th);
+            if (o.store_count < e.data.goodsInputNum) return s.my_warnning("库存不足！", 0, th);
+            th.add_cart_next(e, t, a, o, newd);  //加入购物车下一步
+
+
+        })
+    },
+
+    //---加入购物车的最后一步---
+    add_cart_next(e, t, a, o, newd, CanOutQty) {
+       var th = this, i = getApp().request;
+       newd['pick_name'] = th.data.sto_sele_name;
+       newd['pick_dis'] = th.data.sto_sele_distr;
+       th.buyNow(newd);
+
+    },
+
+    //----------立即购买-----------
+    buyNow: function (e) {
+
+        this.setData({
+            openSpecModal: 0,
+            openSpecModal_inte: 0,
+            openSpecModal_inte_normal: 0,
+            openSpecModal_pt: 0,
+        })
+
+        getApp().set_b_now(e);
+
+        //如果是全额付款的话
+        if (this.data.presellForm.presell_type == 1) {
+            getApp().goto("/packageC/pages/presell/cart/cart2")
+        } else {
+            getApp().goto("/packageC/pages/presell/cart/cart2_pre");
         }
-				// 秒杀：单独购买的情况下，加入购物车显示的是零售价，否则显示秒杀活动价
-				if(th.data.options.prom_type == 1) {
-					newd['prom_type'] = th.data.options.prom_type;
-					newd['prom_id'] = th.data.options.prom_id;
-					if(th.data.openSpecModal_flash_normal) {
-						newd['money'] = th.data.data.shop_price;
-						newd['is_pd_normal'] = 1;
-					} else {
-						newd['money'] = th.data.prom_price;
-					};
-				};
-				
+    },
+
+
  
-        //----先看会员在购物车中是否加入了该商品-----
-        getApp().request.get("/api/weshop/cartService/page", {
-            data: {
-                store_id: os.stoid,
-                user_id: oo.user_id,
-                service_id: th.data.data.id,
-            },
-            success: function(re) {
-								//-------如果购物车中有相关的数据---------
-                if (re.data.data.total > 0) {
-									var item = null;
-									// 多门店问题
-									var cartGoodsNum = 0;
-									const tmpObj = re.data.data.pageData;
-									for (let i = 0; i < tmpObj.length; i++) {
-										if (th.data.sto_sele_id != tmpObj[i].pick_id) {
-												cartGoodsNum += parseInt(tmpObj[i].goods_num);
-										} else {
-											item = tmpObj[i];
-										}
-									}
-									// 当前门店同类商品还没加入到购物车 但是有其他门店的同类商品
-									if (th.data.prom_type == 1 && !th.data.is_normal && !item) {
-
-											// 秒杀购物车购买 修正数量
-											var snum = limitNum - boughtNum;
-											if (snum <= 0) {
-												// wx.showModal({
-												// 	title: '超出限购数量',
-												// });
-												getApp().my_warnning('超出限购数量', 0, self);
-												return false;
-											}
-
-											var cSnum = snum- cartGoodsNum <= 0 ? 0 : snum- cartGoodsNum;
-											var cRedisNums = redisNums- cartGoodsNum <= 0 ? 0 : redisNums- cartGoodsNum;
-
-											if (newd['goods_num'] >= redisNums){
-												if (redisNums > snum) {
-													newd['goods_num'] = cSnum;
-												} else {
-													newd['goods_num'] = cRedisNums;
-												}
-											} else {
-												if (newd['goods_num'] > snum) newd['goods_num'] = cSnum;
-											}
-
-											if (newd['goods_num'] <= 0) {
-												getApp().my_warnning('加入购物车成功', 1, th, 450);
-												th.closeSpecModal();
-												return false;
-											}
-											getApp().request.post("/api/weshop/cartService/save", {
-												data: newd,
-												success: function(t) {
-														getApp().my_warnning('加入购物车成功', 1, th, 450);
-														var c_num = th.data.cartGoodsNum + th.data.goodsInputNum;
-														th.setData({
-																cartGoodsNum: c_num
-														});
-														th.closeSpecModal();
-												}
-										});
-										return false;
-									} 
-									
-									// 以下为当前门店同类商品已经加入到购物车
-										var totalNum = th.data.goodsInputNum + item.goods_num;
-
-										// 秒杀购物车购买 修正数量
-										if (th.data.prom_type == 1 && !th.data.is_normal) {
-											var snum = limitNum - boughtNum;
-											if (snum <= 0) {
-												// wx.showModal({
-												// 	title: '超出限购数量',
-												// });
-												getApp().my_warnning('超出限购数量', 0, self);
-												return false;
-											}
-											if (totalNum >= redisNums){
-												if (redisNums > snum) {
-													totalNum = snum- cartGoodsNum;
-												} else {
-													totalNum = redisNums- cartGoodsNum;
-												}
-											} else {
-												if (totalNum > snum)
-														totalNum = snum- cartGoodsNum;
-												}
-										}
-
-                    var updata = {
-                        id: item.id,
-                        goods_num: totalNum,
-                        money: th.data.data.shop_price,
-                        store_id: os.stoid,
-                    };
-										
-										// 秒杀：单独购买的情况下，加入购物车显示的是零售价，否则显示秒杀活动价
-										if(th.data.options.prom_type == 1) {
-											// updata['prom_type'] = th.data.options.prom_type;
-											// updata['prom_id'] = th.data.options.prom_id;
-											if(th.data.openSpecModal_flash_normal) {
-												updata['money'] = th.data.data.shop_price;
-												updata['is_pd_normal'] = 1;
-											} else {
-												updata['money'] = th.data.prom_price;
-											};
-										};
-
-                    if (getApp().globalData.guide_id) {
-                        updata['guide_id'] = getApp().globalData.guide_id;
-                        updata['guide_type'] = 1;
-                    }
-                    if(getApp().globalData.groupchat_id){
-                      updata['groupchat_id'] = getApp().globalData.groupchat_id;
-                    }
-                    getApp().request.put("/api/weshop/cartService/update", {
-                        data: updata,
-                        success: function(t) {
-                            getApp().my_warnning('加入购物车成功', 1, th, 450);
-                            var c_num = th.data.cartGoodsNum + th.data.goodsInputNum;
-                            th.setData({
-                                cartGoodsNum: c_num
-                            });
-                            th.closeSpecModal();
-                        }
-                    });
-                } else {
-                    getApp().request.post("/api/weshop/cartService/save", {
-                        data: newd,
-                        success: function(t) {
-                            getApp().my_warnning('加入购物车成功', 1, th, 450);
-                            var c_num = th.data.cartGoodsNum + th.data.goodsInputNum;
-                            th.setData({
-                                cartGoodsNum: c_num
-                            });
-                            th.closeSpecModal();
-                        }
-                    });
-                }
-            }
-        });
  
-    };
-		
-		
-		
-	
-	
-		
-	
-  },
- 
-  //----------立即购买-----------
-  buyNow: function(e) {   
-		getApp().globalData.service_now=e;	
-		wx.redirectTo({
-			 url: "/packageA/pages/cart2_ser/cart2_ser",
-		});	
-  },
   //----------增加购买数量-----------
   addCartNum: function(t) {
     this.checkCartNum(this.data.goodsInputNum + 1);
@@ -1663,12 +1465,11 @@ Page({
 						  e.data.data.pageData.splice(k--, 1);
 					   }
 					 }
-
 			  }
  
               //如果有秒杀的指定门店
-              if(th.data.prom_type==1 && th.data.prom_act && th.data.prom_act.pick_up_lists && e.data.data.pageData.length && !is_normal){
-                  var pick_up_lists=th.data.prom_act.pick_up_lists;
+              if(th.data.presellForm && th.data.presellForm.pick_up_lists && e.data.data.pageData.length && !is_normal){
+                  var pick_up_lists=th.data.presellForm.pick_up_lists;
                   for (var kq = 0; kq < e.data.data.pageData.length; kq++) {
                       var it0=e.data.data.pageData[kq];
                       var idx0=pick_up_lists.findIndex(function (e){
@@ -4036,6 +3837,7 @@ Page({
                 pre_arr = e.data.data.pageData[idx];
                 th.setData({ pre_arr: pre_arr, show: 1 })
                 th.data.prom_buy_limit = pre_arr.vip_butyqty;
+                th.data.prom_price=pre_arr.presell_price;  //定义一下活动的价格
             }
         })
         if (!pre_arr) {
@@ -53,7 +53,7 @@
             </swiper-item>
             <swiper-item wx:for="{{gallery}}" wx:key="gallery">
               <!-- <image class="wh100" src="{{item.image_url}}" mode="aspectFit" binderror="bind_bnerr" lazy-load="true" data-errorimg="gallery[{{index}}].image_url"></image> -->
-              <view class="wh100 g_img_box" style="background-image:url({{item.image_url}});"></view>
+              <view class="wh100 g_img_box" style="background-image:url({{iurl +(item.image_url?item.image_url:'miniapp/images/default_g_img.gif')}});"></view>
             </swiper-item>
           </swiper>
           <block wx:if="{{mapurl}}">
@@ -208,6 +208,8 @@
           </view>
         </view>
       </view>
+
+
       <!-- - 宝贝评价 -- -->
       <view class="bdt16">
         <view class="bb_view">
@@ -262,89 +264,82 @@
           </view>
         </scroll-view>
       </view>
+
+
       <!-- 图文详情 -->
-      <view class="bdt16">
-        <view class="t_g_info">
-          <view class="red_shu"></view>
-          <view class="fs30 bold">商品详情</view>
-        </view>
-        <view class="pd20">
-          <view class="table_s">
-            <view class="tb_item tb-l">
-              <view class="item_left">
-                <text>商品名称</text>
-              </view>
-              <view class="item_right">
-                <text>{{data.goods_name}}</text>
+      <view class="t_g_info bdt16">
+        <view class="red_shu"></view>
+        <view class="fs30 bold">卡项详情</view>
+      </view>
+      <view class="pdh20">
+
+        <block wx:if="{{listServiceItem && listServiceItem.length > 0}}">
+          <view class="card fs28" wx:for="{{listServiceItem}}">
+            <view class="flex ai_c jc_sb" style="height: 88rpx;">
+              <view class="ellipsis-2 f1" wx:if="{{item.displayqty==1}}" >{{item.projectName}}（无限次）</view>
+              <view class="ellipsis-2 f1" wx:else>{{item.projectName}}（{{item.frequency}}次）</view>
+              <view class="pdl30 t-r">
+                <view class="rmb fs36 bold c-red">{{item.vipprice}}</view>
+                <view class="fs22 c-9 del" wx:if="{{item.showPrice}}">零售价：￥{{item.showPrice}}</view>
               </view>
             </view>
-            <view class="tb_item tb-l">
-              <view class="item_left">
-                <text>商品编号</text>
-              </view>
-              <view class="item_right">
-                <text>{{data.goods_sn}}</text>
-              </view>
+            <view class="flex ai_c jc_sb fs24 c-6">
+              <view class="ellipsis-1">备注：{{filters.show_default(item.remark, '无')}}</view>
+              <!-- 指定开始日期和结束日期 -->
+              <view class="pdl30 shrink0">有效期：{{filters.showStartAndEndDate(item, data.validDays)}}</view>
             </view>
-            <view class="tb_item tb-l">
-              <view class="item_left">
-                <text>商品条码</text>
-              </view>
-              <view class="item_right">
-                <text>{{data.sku}}</text>
-              </view>
-            </view>
-            <view class="tb_item tb-l" wx:if="{{cat_name && is_show_pl}}">
-              <view class="item_left">
-                <text>品类</text>
+          </view>
+        </block>
+
+        <block wx:if="{{enableMeiye}}">
+          <block wx:if="{{taoheList && taoheList.length > 0}}">
+            <view class="taohe fs28" wx:for="{{taoheList}}">
+              <view class="flex ai_c jc_sb" style="height: 88rpx;">
+                <view class="ellipsis-2 f1">{{item.goods_name}} ({{item.goods_sn}}) ({{item.frequency}}个)</view>
+                <view class="pdl30 t-r">
+                  <view class="rmb fs36 bold c-red">{{item.vipprice}}</view>
+                  <view class="fs22 c-9 del">零售价：￥{{item.show_price}}</view>
+                </view>
               </view>
-              <view class="item_right">
-                <text>{{cat_name}}</text>
+              <view class="flex ai_c jc_sb fs24 c-6 pdt10">
+                <view class="ellipsis-1">备注：{{filters.show_default(item.remark, '无')}}</view>
+                <view class="pdl30 shrink0">有效期：{{filters.showStartAndEndDate(item,data.validDays)}}</view>
               </view>
             </view>
-            <view class="tb_item tb-l" wx:if="{{brand_name && is_show_pp}}">
-              <view class="item_left">
-                <text>品牌</text>
-              </view>
-              <view class="item_right">
-                <text>{{brand_name}}</text>
-              </view>
+          </block>
+        </block>
+
+        <!-- <view class="table_s" wx:if="{{service_list}}">
+<view class="tb_item tb-l">
+<view class="item_left f1">
+  <text>项目名称</text>
+</view>
+            <view class="item_left f1">
+              <text>耗时(分)</text>
             </view>
-            <view class="tb_item tb-l" wx:if="{{nation_name && is_show_gb}}">
-              <view class="item_left">
-                <text>国别</text>
-              </view>
-              <view class="item_right">
-                <text>{{nation_name}}</text>
-              </view>
+            <view class="item_left f1">
+              <text>次数</text>
             </view>
-            <view class="tb_item tb-l">
-              <view class="item_left">
-                <text>规格</text>
-              </view>
-              <view class="item_right">
-                <text>{{filters.show_gui_ge(data.goods_spec,data.goods_color)}}</text>
-              </view>
+</view>
+<view class="tb_item tb-l" wx:for="{{service_list}}">
+<view class="item_right f1">
+  <text>{{item.projectName}}</text>
+</view>
+            <view class="item_right f1">
+              <text>{{item.timeConsuming}}</text>
             </view>
-            <view class="tb_item tb-l">
-              <view class="item_left">
-                <text>上架时间</text>
-              </view>
-              <view class="item_right">
-                <text>{{data.on_time}}</text>
-              </view>
+            <view class="item_right f1">
+              <text>{{item.frequency}}</text>
             </view>
-          </view>
-        </view>
-        <!-- 详情图片 -->
+</view>
+</view> -->
+
         <view class="wxParse">
           <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
         </view>
-        <!-- 详情广告 -->
-        <view class="wxParse">
-          <template is="wxParse" data="{{wxParseData:goodInfo_ad.nodes}}"></template>
-        </view>
+
       </view>
+
       <!-- 推荐商品 -->
       <view class="flex-center rel xc-linellae-frame">
         <view class="xc-linellae"></view>
@@ -362,83 +357,76 @@
         </view>
       </view>
     </view>
-    <!-- ----------商品详情图片页面-------------- -->
+
     <view class="goods-norms" hidden="{{activeCategoryId==1?false:true}}">
-      <view class="table_s">
-        <view class="tb_item tb-l">
-          <view class="item_left">
-            <text>商品名称</text>
-          </view>
-          <view class="item_right">
-            <text>{{data.goods_name}}</text>
-          </view>
+      <view class="pd20">
+        <!-- <view class="table_s" wx:if="{{service_list}}">
+      <view class="tb_item tb-l">
+        <view class="item_left f1">
+          <text>项目名称</text>
         </view>
-        <view class="tb_item tb-l">
-          <view class="item_left">
-            <text>商品编号</text>
-          </view>
-          <view class="item_right">
-            <text>{{data.goods_sn}}</text>
-          </view>
-        </view>
-        <view class="tb_item tb-l">
-          <view class="item_left">
-            <text>商品条码</text>
-          </view>
-          <view class="item_right">
-            <text>{{data.sku}}</text>
-          </view>
-        </view>
-        <view class="tb_item tb-l" wx:if="{{cat_name && is_show_pl}}">
-          <view class="item_left">
-            <text>品类</text>
-          </view>
-          <view class="item_right">
-            <text>{{cat_name}}</text>
-          </view>
-        </view>
-        <view class="tb_item tb-l" wx:if="{{brand_name && is_show_pp}}">
-          <view class="item_left">
-            <text>品牌</text>
-          </view>
-          <view class="item_right">
-            <text>{{brand_name}}</text>
-          </view>
-        </view>
-        <view class="tb_item tb-l" wx:if="{{nation_name && is_show_gb}}">
-          <view class="item_left">
-            <text>国别</text>
-          </view>
-          <view class="item_right">
-            <text>{{nation_name}}</text>
-          </view>
-        </view>
-        <view class="tb_item tb-l">
-          <view class="item_left">
-            <text>规格</text>
-          </view>
-          <view class="item_right">
-            <text>{{data.goods_spec==""?"规格1":data.goods_spec}}</text>
-          </view>
+            <view class="item_left f1">
+              <text>耗时(分)</text>
+            </view>
+            <view class="item_left f1">
+              <text>次数</text>
+            </view>
+      </view>
+      <view class="tb_item tb-l" wx:for="{{service_list}}">
+        <view class="item_right f1">
+          <text>{{item.projectName}}</text>
         </view>
-        <view class="tb_item tb-l">
-          <view class="item_left">
-            <text>上架时间</text>
-          </view>
-          <view class="item_right">
-            <text>{{data.on_time}}</text>
+            <view class="item_right f1">
+              <text>{{item.timeConsuming}}</text>
+            </view>
+            <view class="item_right f1">
+              <text>{{item.frequency}}</text>
+            </view>
+      </view>
+    </view> -->
+
+        <block wx:if="{{listServiceItem && listServiceItem.length > 0}}">
+          <view class="card fs28" wx:for="{{listServiceItem}}">
+            <view class="flex ai_c jc_sb" style="height: 88rpx;">
+              <view class="ellipsis-2 f1">{{item.projectName}}（{{item.frequency}}次）</view>
+              <view class="pdl30 t-r">
+                <view class="rmb fs36 bold c-red">{{item.vipprice}}</view>
+                <view class="fs22 c-9 del" wx:if="{{item.showPrice}}">零售价：￥{{item.showPrice}}</view>
+              </view>
+            </view>
+            <view class="flex ai_c jc_sb fs24 c-6">
+              <view class="ellipsis-1">备注：{{filters.show_default(item.remark, '无')}}</view>
+              <!-- 指定开始日期和结束日期 -->
+              <view class="pdl30 shrink0">有效期：{{filters.showStartAndEndDate(item, data.validDays)}}</view>
+            </view>
           </view>
+        </block>
+
+        <block wx:if="{{enableMeiye}}">
+          <block wx:if="{{taoheList && taoheList.length > 0}}">
+            <view class="taohe fs28" wx:for="{{taoheList}}">
+              <view class="flex ai_c jc_sb" style="height: 88rpx;">
+                <view class="ellipsis-2 f1">{{item.goods_name}} ({{item.goods_sn}}) ({{item.frequency}}个)</view>
+                <view class="pdl30 t-r">
+                  <view class="rmb fs36 bold c-red">{{item.vipprice}}</view>
+                  <view class="fs22 c-9 del">零售价：￥{{item.show_price}}</view>
+                </view>
+              </view>
+              <view class="flex ai_c jc_sb fs24 c-6 pdt10">
+                <view class="ellipsis-1">备注：{{filters.show_default(item.remark, '无')}}</view>
+                <view class="pdl30 shrink0">有效期：{{filters.showStartAndEndDate(item,data.validDays)}}</view>
+              </view>
+            </view>
+          </block>
+        </block>
+
+        <view class="wxParse">
+          <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
         </view>
+
       </view>
-      <view class="wxParse">
-        <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
-      </view>
-              <!-- 详情广告 -->
-      <view class="wxParse">
-          <template is="wxParse" data="{{wxParseData:goodInfo_ad.nodes}}"></template>
-        </view>
     </view>
-    <!-- -------------评价页面------------ -->
+
     <view class="goods-comment" hidden="{{activeCategoryId==2?false:true}}">
       <view class="topframe">
         <view class="topframe-top">
@@ -457,7 +445,7 @@
           </view>
         </view>
       </view>
-      <block wx:for="{{comments}}" wx:for-index="cIdx" wx:key="cIdx">
+      <block wx:for="{{comments}}" wx:for-index="cIdx" wx:key="{{cIdx}}">
         <view style='border-bottom:4rpx solid #eee;'>
           <view class="middle">
             <view class="middle-img-frame">
@@ -466,11 +454,11 @@
                 <view class="middle-user">
                   {{item.username==''||item.is_anonymous==1 ?'匿名用户':item.username}}
                 </view>
-                <image class="star" src="{{iurl}}/miniapp/images/star-red.png" wx:for="{{item.sum_rank}}" wx:key="index"></image>
+                <image class="star" src="{{iurl}}/miniapp/images/star-red.png" wx:for="{{item.sum_rank}}" wx:key="{{index}}"></image>
               </view>
             </view>
             <view class="xc-pirces">
-              <view class="middle-font {{item.seeMore==true?'ellipsis-3':''}}">
+              <view class="middle-font {{item.seeMore==true?'ellipsis-3':''}}" style="word-break: break-all;">
                 {{item.content?item.content:'此用户没有填写评价。'}}
               </view>
             </view>
@@ -482,12 +470,12 @@
             </view>
             <view class="img-ul">
               <block wx:if="{{item.source_type==0}}">
-                <view class="img-li" wx:for="{{item.img}}" wx:key="index">
+                <view class="img-li" wx:for="{{item.img}}" wx:key="{{index}}">
                   <image bindtap="previewCommentImgs" class="wh100" data-cidx="{{cIdx}}" data-img="{{iurl}}{{item}}" data-id="{{index}}" src="{{iurl}}{{item}}"></image>
                 </view>
               </block>
               <block wx:if="{{item.source_type==1}}">
-                <view class="img-li" wx:for="{{item.weapp_img}}" wx:if="{{aitem.length>10}}" wx:key="index" wx:for-item="aitem">
+                <view class="img-li" wx:for="{{item.weapp_img}}" wx:if="{{aitem.length>10}}" wx:key="{{index}}" wx:for-item="aitem">
                   <image bindtap="previewCommentImgs_w" class="wh100" data-cidx="{{cIdx}}" data-img="{{aitem}}" data-id="{{index}}" src="{{aitem}}"></image>
                 </view>
               </block>
@@ -506,7 +494,7 @@
           <view class="reply rel" wx:if="{{item.replay_list}}">
             <view class="line_bulge"></view>
             <view class="shop-reply">店家回复:</view>
-            <view class="shop-font" wx:for="{{item.replay_list}}" wx:for-item="r_item" wx:key="index">
+            <view class="shop-font" wx:for="{{item.replay_list}}" wx:for-item="r_item" wx:key="{{index}}">
               {{r_item.content}}
             </view>
           </view>
@@ -519,6 +507,7 @@
         <text class="no_pj_list">已经加载到底部</text>
       </block>
     </view>
+
   </view>
 </view>
 <!-- -滚动到顶部-- -->
@@ -600,7 +589,7 @@
     <view class="pding">
       <icon bindtap="closeSpecModal" class="modal-close" color="black" size="22" type="cancel"></icon>
       <view class="spec-goods">
-        <image class="wh100 spec-img xc-distance-bottom" bindtap="previewImage" src="{{sele_g.original_img}}" binderror="pop_err_img" data-errorimg="sele_g.original_img"></image>
+        <image class="wh100 spec-img xc-distance-bottom" bindtap="previewImage" src="{{iurl+sele_g.image_url}}" binderror="pop_err_img" data-errorimg="sele_g.image_url"></image>
         <view class="spec-goods-info">
           <view class="spec-goods-name ellipsis-2">{{sele_g.goods_name}}</view>
           <view class="flex ai_end xc-val-money">
@@ -831,6 +820,7 @@
     </view>
   </view>
 </view>
+
 <!-- 选择门店的弹框，1.1版最新的 -->
 <block wx:if="{{store==1}}">
   <view class="mongolia-layer" bindtap="close_popup"></view>
@@ -3019,3 +3019,48 @@ button.custom-service::after{
 .c-red22{
   color: #d60021
 }
+
+
+
+.card,
+.taohe {
+    position: relative;
+    padding: 20rpx;
+    margin-bottom: 20rpx;
+    border-radius: 8rpx;
+    background: #ffdcdc;
+    overflow: hidden;
+    /* background: #ffdcdc url(https://mshopimg.yolipai.net/miniapp/images/fwk/crown_bg.png) no-repeat left top;
+    background-position: 10rpx 10rpx;
+    background-size: 206rpx 136rpx; */
+}
+
+.card::before {
+    position: absolute;
+    font-family: iconfont;
+    content: '\e62a';
+    color: rgba(255,0,0,.1);
+    font-size: 260rpx;
+    /* transform: rotateZ(45deg); */
+    top: -110rpx;
+    left: -70rpx;
+}
+
+.taohe::before {
+    position: absolute;
+    font-family: iconfont;
+    content: '\e64e';
+    color: rgba(255,0,0,.1);
+    font-size: 260rpx;
+    top: -20rpx;
+    left: -30rpx;
+}
+
+.rmb::before {
+    content: '￥';
+    font-size: 24rpx;
+}
+
+.c-red {
+    color: #f23030;
+}
 \ No newline at end of file
@@ -467,11 +467,58 @@ Page({
     },
  
     //-----获取立即购买的商品信息，入口----
-    get_buy_goods: function (e) {
+    get_buy_goods:async function (e) {
         var th = this;
         th.data.gg = to.get_b_now();
+
+        //定义变量
+        var gg = th.data.gg, act = null, prelist = null;
+        var url = "/api/weshop/marketing/marketingPresellForm/get/" + os.stoid + "/" + gg.prom_id;
+        await getApp().request.promiseGet(url, {}).then(res => {
+            if (res.data.code == 0) {
+                act = res.data.data;
+            }
+        })
+        if (!act) {
+            wx.showToast({ title: "未找到活动", icon: 'none', duration: 3000 });
+            return false;
+        }
+        if (act.is_end == 1) {
+            wx.showToast({ title: '活动已经结束', icon: 'none', duration: 3000 });
+            return false;
+        }
+        if (ut.gettimestamp() > act.end_time) {
+            wx.showToast({ title: "活动定金支付时间已过期", icon: 'none', duration: 3000 });
+            return false;
+        }
+
+        var url = "/api/weshop/marketing/marketingPresellList/get/" + os.stoid + "/" + gg.presell_list_id;
+        await getApp().request.promiseGet(url, {}).then(res => {
+            if (res.data.code == 0) {
+                prelist = res.data.data;
+            }
+        })
+        if (!prelist) {
+            wx.showToast({ title: "未找到商品", icon: 'none', duration: 3000 });
+            return false;
+        }
+
+        //如果是服务卡是时候
+        if(act.goods_type==1){
+           th.get_card_detail(act, prelist,gg);
+        }
+        //如果是商品的时候
+        else{
+             th.get_goods_detail(act, prelist,gg);
+        }
+    },
+
+    //-- 获取到服务卡项的详情 --
+    get_card_detail(act, prelist,gg){
+        var th = this;
         //--------如果goods_id一样，就是要立即购买-----
-        getApp().request.get("/api/weshop/goods/get/" + oo.stoid + "/" + th.data.gg.goods_id, {
+        var cd_url="/api/weshop/serviceCard/get/" + oo.stoid + "/" + th.data.gg.goods_id
+        getApp().request.get(cd_url, {
             success: async function (t) {
                 var gd = t.data.data;
                 if (!gd) return false;
@@ -486,9 +533,51 @@ Page({
                                 th.setData({show_same_city:1})
                             }
                         }
-
                     })
+                }
+
+                t.data.data.original_img = oo.imghost + t.data.data.imgUrl;
+                t.data.data['buynum'] = th.data.gg.goods_num;
+                t.data.data.prom_id=th.data.gg.prom_id;
+                t.data.data.prom_type=8;
+
+                
+                //这个位置要拿活动的预售价
+                t.data.data.shop_price = prelist.presell_money;
+                th.setData({
+                    bn_goods: t.data.data,
+                    bn_pickname: gg.pick_name,
+                    bn_pick: gg.pick_id,
+                    act: act
+                });
+
+                //计算价格
+                th.calculatePrice2();
+
+            },
+        });
+    },
+
+    //-- 获取到服务卡项的详情 --
+    get_goods_detail(act, prelist,gg){
+        var th = this;
+        //--------如果goods_id一样，就是要立即购买-----
+        getApp().request.get("/api/weshop/goods/get/" + oo.stoid + "/" + th.data.gg.goods_id, {
+            success: async function (t) {
+                var gd = t.data.data;
+                if (!gd) return false;
+
+                //-- 如果商品有同城配送的参数的时候,一件代发商品不能显示同城配送按钮 --
+                if(gd.is_same_city && th.data.is_same_city && gd.whsle_id<=0){
  
+                    await getApp().request.promiseGet("/api/weshop/pickup/get/"+os.stoid+"/"+th.data.gg.pick_id, {}).then(res=>{
+                        if(res.data.code==0){
+                            var pk=res.data.data;
+                            if(pk && pk.is_same_city){
+                                th.setData({show_same_city:1})
+                            }
+                        }
+                    })
                 }
  
                 t.data.data.original_img = oo.imghost + t.data.data.original_img;
@@ -578,38 +667,6 @@ Page({
                     }
                 }
  
-                //定义变量
-                var gg = th.data.gg, act = null, prelist = null;
-                var url = "/api/weshop/marketing/marketingPresellForm/get/" + os.stoid + "/" + gg.prom_id;
-                await getApp().request.promiseGet(url, {}).then(res => {
-                    if (res.data.code == 0) {
-                        act = res.data.data;
-                    }
-                })
-                if (!act) {
-                    wx.showToast({ title: "未找到活动", icon: 'none', duration: 3000 });
-                    return false;
-                }
-                if (act.is_end == 1) {
-                    wx.showToast({ title: '活动已经结束', icon: 'none', duration: 3000 });
-                    return false;
-                }
-                if (ut.gettimestamp() > act.end_time) {
-                    wx.showToast({ title: "活动定金支付时间已过期", icon: 'none', duration: 3000 });
-                    return false;
-                }
-
-                var url = "/api/weshop/marketing/marketingPresellList/get/" + os.stoid + "/" + gg.presell_list_id;
-                await getApp().request.promiseGet(url, {}).then(res => {
-                    if (res.data.code == 0) {
-                        prelist = res.data.data;
-                    }
-                })
-                if (!prelist) {
-                    wx.showToast({ title: "未找到商品", icon: 'none', duration: 3000 });
-                    return false;
-                }
-
  
                 //如果有开启佣金抵扣，同时会员是分销商的时候
                 if(getApp().globalData.userInfo.is_distribut
@@ -652,16 +709,13 @@ Page({
                     th.data.check_quan_ware_list = t.data.data.erpwareid + "";
                 }
  
-
                 //计算价格
                 th.calculatePrice2();
                 //获取优惠券,如果有券的钱，就调用
                 if (th.data.ckeck_quan_price > 0) th.get_buy_now_quan();
  
-
             },
         });
-
     },
  
     //---------------检查是否有收货地址-------------------
@@ -820,8 +874,8 @@ Page({
                     })
                 }
  
-                //-----------当地址不为空，且是物流时，计算物流费用,并同时商品不是优惠活动的包邮----------
-                if (th.data.user_addr != null && th.data.bn_exp_type == 0 && good.is_past != 1) {
+                //-----------当地址不为空，且是物流时，计算物流费用,并同时商品不是优惠活动的包邮,同时商品购买时候，服务卡项购买不计算运费----------
+                if (th.data.user_addr != null && th.data.bn_exp_type == 0 && good.is_past != 1 &&  act.goods_type==0) {
                     //看是不是有调用过包邮券
                     if (!th.data.isget_by_quan[th.data.bn_pick] && good.is_xz_yh != 1) {
                         var condition = allpice - cut_price - quan_price;
@@ -6,7 +6,7 @@
 	<view class="container">
  
 	    	<!-- 立即购买的时候 -->
-			<view class="tab-container" wx:if="{{show_submit}}">
+			<view class="tab-container" wx:if="{{show_submit && act.goods_type==0}}">
 				<view class="tab-wrapper">			
 						<view hidden="{{bn_t_exp_t==2}}" bindtap='setexptype' data-t='1' class="tab {{bn_exp_type == 1? 'active':''}}"  
 						data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}" >门店自提</view>
@@ -22,7 +22,7 @@
 			</view>
  
 		<!--要进行判断地址是否显示---->	
-		<view bindtap="enterAddressPage" class="user-mes mgt20" hidden='{{bn_exp_type==1 && is_b_now==1}}'>
+		<view bindtap="enterAddressPage" class="user-mes mgt20" hidden='{{bn_exp_type==1 && is_b_now==1 &&  act.goods_type==0}}'>
 			<!---默认地址显示------>
 			<block wx:if="{{user_addr!=null}}">
 				<view class="user-contact">