diff --git a/app.json b/app.json
index c0d8e82..9adcee3 100644
--- a/app.json
+++ b/app.json
@@ -168,6 +168,7 @@
   "pages/goods/goodsList/goodsList",
   "pages/payForAnother/payForAnother",
 	"pages/luckyGo/luckyGo_cart/luckyGo_cart",
+	"pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct",
 	"pages/luckyGo/luckyGo_list/luckyGo_list",
 	"pages/luckyGo/luckyGo_order/luckyGo_order",
 	"pages/luckyGo/luckyGo_details/luckyGo_details",
diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxml b/components/diy_goodsGroup/diy_goodsGroup.wxml
index 849c7a7..53b91cc 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.wxml
+++ b/components/diy_goodsGroup/diy_goodsGroup.wxml
@@ -208,7 +208,7 @@
                     </view>
 
                     <view class='zs_center_2l'>
-                        <view class='zs_wz1_2l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
+                        <view class='zs_wz1_2l ellipsis-2' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
                         <view class='zs_wz2_2l' wx:if="{{object.goodsprice}}">
 
                             <block wx:if="{{item.prom_price || item.prom_integral}}">
@@ -498,9 +498,15 @@
                     </block>
 
                     <block wx:else>
-                        <image class="zs_t_img_x {{object.big_order_type==0?'zj':''}}{{object.big_order_type==1?'yj':''}}"
+											<!-- 原来的 -->
+											<!-- <image class="zs_t_img_x {{object.big_order_type==0?'zj':''}}{{object.big_order_type==1?'yj':''}}"
+											       src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"  lazy-load="true"
+											       binderror="bind_bnerr3" mode="widthFix" style='max-height:290rpx'></image> -->
+												
+												<!-- 2021.11.27修改		 -->
+                        <image class="block zs_t_img_x {{object.big_order_type==0?'zj':''}}{{object.big_order_type==1?'yj':''}}"
                                src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"  lazy-load="true"
-                               binderror="bind_bnerr3" mode="widthFix" style='max-height:290rpx'></image>
+                               binderror="bind_bnerr3" mode="widthFix"></image>
                     </block>
 
                     <block wx:if="{{object.goodicon==3}}">
@@ -523,7 +529,7 @@
                 </view>
 
                 <view class='zs_center_x'>
-                    <view class='zs_wz1_x' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
+                    <view class='zs_wz1_x ellipsis-2' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
                     <view class='zs_wz2_x' wx:if="{{object.goodsprice}}">
 						
 						<block wx:if="{{item.prom_price || item.prom_integral}}">
diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxss b/components/diy_goodsGroup/diy_goodsGroup.wxss
index 0895c9f..40ef592 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.wxss
+++ b/components/diy_goodsGroup/diy_goodsGroup.wxss
@@ -123,12 +123,15 @@
 }
 
 .zs_goods_xiao_bottom {
-  width: 100%;
-  min-height: 300rpx;
+  /* width: 100%; */
+  /* min-height: 300rpx; */
   display: flex;
   border-bottom: 2rpx #eee solid;
-  padding: 10rpx;
+  /* padding: 10rpx; */
   background-color: white;
+	padding: 20rpx;
+	/* background-color: pink; */
+	box-sizing: border-box;
 }
 
 .zs_goods_xiao {
@@ -141,17 +144,17 @@
 }
 
 .zs_top_x {
-  width: 400rpx;
-  height: 318rpx;
-  margin-top: 20rpx;
-  display: flex;
+  /* width: 400rpx;
+  height: 318rpx; */
+  /* margin-top: 20rpx; */
+  /* display: flex; */
   position: relative;
 }
 
 .zs_t_img_x {
   width: 290rpx;
   height: 290rpx;
-  margin-left: 20rpx;
+  /* margin-left: 20rpx; */
 }
 
 .zs_t_img_x.zj{ border: 1rpx solid #eee;} 
@@ -159,22 +162,24 @@
 
 
 .zs_center_x {
-  width: 100%;
-  min-height: 200rpx;
+  /* width: 100%;
+  min-height: 200rpx; */
   font-size: 28rpx;
   color: #333;
-  text-align: left;
-  margin-top: 30rpx;
-  padding: 0 10rpx;
+	padding-left: 20rpx;
+  /* text-align: left; */
+  /* margin-top: 30rpx;
+  padding: 0 10rpx; */
 }
 
 .zs_wz1_x {
-  overflow: hidden;
-  text-overflow: ellipsis;
+  /* overflow: hidden;
+  text-overflow: ellipsis; */
+	height: 90rpx;
   margin-bottom: 10rpx;
   font-size: 28rpx;
-  white-space: nowrap;
-  width: 80%;
+  /* white-space: nowrap;
+  width: 80%; */
 }
 
 .zs_wz2_x {
@@ -229,11 +234,12 @@
 }
 
 .zs_t1_x1 {
+	position: absolute;
   width: 56rpx;
   height: 56rpx;
-  position: relative;
-  right: 285rpx;
-  top: 6rpx;
+  /* position: relative; */
+  left: 10rpx;
+  top: 10rpx;
 }
 
 .zs_t1_x2 {
@@ -302,16 +308,16 @@
   font-size: 28rpx;
   color: #333;
   text-align: left;
-  padding: 0 10rpx;
+  /* padding: 0 10rpx; */
 }
 
 .zs_wz1_2l {
-  overflow: hidden;
-  text-overflow: ellipsis;
+  /* overflow: hidden;
+  text-overflow: ellipsis; */
   font-size: 28rpx;
-  white-space: nowrap;
-  height: 40rpx;
-  line-height: 40rpx;
+  /* white-space: nowrap; */
+  height: 90rpx;
+  /* line-height: 40rpx; */
   margin-top: 10rpx;
 }
 
@@ -825,4 +831,16 @@ top: 10rpx;
 	bottom: 10rpx;
 }
 
-.n_box{ position: absolute !important;z-index: 10}
\ No newline at end of file
+.n_box{ position: absolute !important;z-index: 10}
+
+.block {
+	display: block;
+}
+
+.ellipsis-2 {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+}
\ No newline at end of file
diff --git a/components/diy_seckill/diy_seckill.wxml b/components/diy_seckill/diy_seckill.wxml
index 3892d1b..ceafe44 100644
--- a/components/diy_seckill/diy_seckill.wxml
+++ b/components/diy_seckill/diy_seckill.wxml
@@ -62,7 +62,7 @@
               </view>
 
               <view class='sp_wz'>
-                <view class='sp_wzi'>{{aitem.goods_name}}</view>
+                <view class='sp_wzi ellipsis-2'>{{aitem.goods_name}}</view>
                 <view class='sp_jg'>￥{{aitem.price}}</view>
                 <view class='sp_jgx'>￥{{aitem.market_price}}</view>
               </view>
@@ -85,7 +85,7 @@
             </view>
 
             <view class="o1_right">
-              <view class="sp_wzi">{{aitem.title}}</view>
+              <view class="sp_wzi ellipsis-2">{{aitem.title}}</view>
               <view class="o1_sj_kill">
                 <text>{{aitem.djs.day}}</text> 天
                 <text>{{aitem.djs.hou}}</text> :
diff --git a/components/diy_seckill/diy_seckill.wxss b/components/diy_seckill/diy_seckill.wxss
index 6ebabda..a770d0a 100644
--- a/components/diy_seckill/diy_seckill.wxss
+++ b/components/diy_seckill/diy_seckill.wxss
@@ -112,13 +112,13 @@ swiper {
   font-size: 30rpx;
   border-bottom: 2rpx solid #dcdcdc;
   width: 100%;
-  text-align: left;
+  /* text-align: left; */
   padding: 4rpx 0;
-  overflow: hidden;
-  height: 48rpx;
-  text-overflow: ellipsis;
+  /* overflow: hidden; */
+  height: 90rpx;
+  /* text-overflow: ellipsis;
   white-space: nowrap;
-  line-height: 48rpx;
+  line-height: 48rpx; */
 }
 
 .sp_wz .sp_jg {
@@ -222,12 +222,12 @@ swiper {
 .o1_right .sp_wzi {
   font-size: 30rpx;
   margin-bottom: 6rpx;
-  text-align: left;
+  /* text-align: left; */
   padding: 4rpx 0;
-  height: 48rpx;
-  overflow: hidden;
+  height: 90rpx;
+  /* overflow: hidden;
   white-space: nowrap;
-  text-overflow: ellipsis;
+  text-overflow: ellipsis; */
 }
 
 .o1_right .o1_sj_kill {
@@ -287,4 +287,13 @@ swiper {
    align-items: center;
 }
 
-.sp .sp_top .s_top_kill.gray{background-color:#bdbdc1;color: #fff;font-weight: normal}
\ No newline at end of file
+.sp .sp_top .s_top_kill.gray{background-color:#bdbdc1;color: #fff;font-weight: normal}
+
+
+.ellipsis-2 {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+}
\ No newline at end of file
diff --git a/components/qr_code/qr_code.js b/components/qr_code/qr_code.js
index c46b356..812d7c8 100644
--- a/components/qr_code/qr_code.js
+++ b/components/qr_code/qr_code.js
@@ -24,6 +24,7 @@ Component({
     //关闭
     close: function (e) {
         this.setData({q_show: 0,barcode_canvas:null,qrcode_canvas:null });
+        this.triggerEvent('close',{},{bubbles: true});
     },
 
     //打开
diff --git a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js
index 3fda55e..c311c38 100644
--- a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js
+++ b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js
@@ -139,10 +139,7 @@ Page({
             success: function (s) {
             }
         });
-				
-				// console.log('t=======================>', t);
-			
-			
+
 
     },
     onUnload: function () {
@@ -808,13 +805,12 @@ Page({
                         }
                     }
 
-                  
+
                         gd.prom_type=gg.prom_type;
                         gd.prom_id=gg.prom_id;
-                   
+
                     switch (gd.prom_type) {
                         case 0:
-                        case 2:
                         case 3:
                         case 4:
                         case 5:
@@ -987,6 +983,7 @@ Page({
                                         //t.data.data.shop_price = tt.data.data.prom_price;
                                         t.data.data.shop_price = tt.data.data.prom_user_price;
                                         th.data.ckeck_quan_price=0;
+                                        gd.is_xz_yh=1;
                                     } else {
                                         t.data.data.prom_id = 0;
                                         t.data.data.prom_type = 0;
@@ -1013,6 +1010,45 @@ Page({
                             });
 
                             break;
+
+                        case 2: //--- 团购 ---
+                            var quanlist = null;
+                            getApp().request.get("/api/weshop/goods/groupBuy/getActInfo/" +os.stoid + "/" +gd.goods_id+"/"+ gd.prom_id, {
+                                success: async function (tt) {
+                                    if (tt.data.code == 0) {
+                                        //t.data.data.shop_price = tt.data.data.prom_price;
+                                        t.data.data.shop_price = tt.data.data.price;
+                                    } else {
+                                        t.data.data.prom_id = 0;
+                                        t.data.data.prom_type = 0;
+                                    }
+
+                                    if(tt.data.data.isQuan){
+                                        th.data.ckeck_quan_price = t.data.data.shop_price * gg.goods_num;
+                                        th.data.check_quan_price_list = t.data.data.shop_price * gg.goods_num + "";
+                                        th.data.check_quan_ware_list = t.data.data.erpwareid + "";
+                                    }else{
+                                        gd.is_xz_yh=1;
+                                    }
+
+                                    th.setData({
+                                        bn_goods: gd,
+                                        bn_pickname: gg.pick_name,
+                                        bn_exp_type: et,
+                                        index: m_wind,
+                                        bn_pick: gg.pick_id,
+                                        bn_t_exp_t: distr_t,
+                                        bn_exp_type: et
+                                    });
+
+                                    //-- 计算价格 --
+                                    th.calculatePrice2();
+                                    //获取优惠券,如果有券的钱，就调用
+                                    if(th.data.ckeck_quan_price>0)  th.get_buy_now_quan();
+                                }
+                            });
+
+                            break;
                     }
                 },
             });
@@ -1389,7 +1425,7 @@ Page({
                     }
 
                     //--如果是物流，且选择了地址，就要开始显示包邮券，且包邮券也已经优惠了优惠活动的金额--
-                    if (cart_item.exp_type == 0 && th.data.user_addr != null) {
+                    if (cart_item.exp_type == 0 && th.data.user_addr != null && !cart_item.is_xz_yh) {
                         //看是不是有调用过包邮券
                         if (!th.data.isget_by_quan[pickid]) {
                             //--判断要不要显示包邮券,调用接口，因为有for循环---
@@ -1397,7 +1433,8 @@ Page({
                                 data: {
                                     store_id: os.stoid,
                                     isuse: 0,
-                                    condition: q_conditin,
+                                    //condition: q_conditin,
+                                    condition:cart_item.ckeck_quan_price,
                                     user_id: getApp().globalData.user_id,
                                     pageSize: 2000
                                 }
@@ -1422,10 +1459,10 @@ Page({
                                     }
                                     if (arr) {
                                         th.data.get_by_quan_list_cart[pickid] = arr;
-                                        //th.setData({get_by_quan_list_cart:th.data.get_by_quan_list_cart});
-                                        if (th.data.is_b_now) {
-                                            th.setData({get_by_quan_list: arr});
-                                        }
+                                        th.setData({get_by_quan_list_cart:th.data.get_by_quan_list_cart});
+                                        //if (th.data.is_b_now) {
+                                        //    th.setData({get_by_quan_list: arr});
+                                        //}
                                     }
                                     th.data.isget_by_quan[pickid] = 1;
                                 }
@@ -2030,29 +2067,9 @@ Page({
             });
         });
     },
-		
-		
-		submitConfirm(e) {
-			var th = this;
-			wx.showModal({
-			  title: '温馨提示',
-			  content: this.data.param.alert,
-			  success (res) {
-			    if (res.confirm) {
-			      console.log('用户点击确定');
-						th.submitForm(e);
-			    } else if (res.cancel) {
-			      console.log('用户点击取消')
-			    }
-			  }
-			})
-		},
 
     //--------------------提交订单-----------------------
-    async submitForm(t) {
-			
-			
-				
+    async submitForm(t){
         var sub_value = t;
 
         if (this.data.is_summit_ing == 1) return false; //--提交中退出--
@@ -2178,10 +2195,8 @@ Page({
                 'goods_price': th.data.bn_goods.shop_price,
                 'member_goods_price': th.data.bn_goods.shop_price,
                 'store_id': oo.stoid,
-                //'prom_type': th.data.bn_goods.prom_type,  //促销活动类型
-								'prom_type': 9,  //促销活动类型
-                'prom_id': th.data.param.group_id,     //促销活动id
-								// 'prom_id': 118, 
+                'prom_type': th.data.bn_goods.prom_type,  //促销活动类型
+                'prom_id': th.data.bn_goods.prom_id,     //促销活动id
             };
 
             //-- 把导购的信息填入--
@@ -2445,6 +2460,7 @@ Page({
                     //--判断活动的类型--
                     switch (g_item.prom_type) {
                         case 1:
+						case 2:
                             goods.prom_type = g_item.prom_type;
                             goods.prom_id = g_item.prom_id;
                             break;
@@ -2583,42 +2599,19 @@ Page({
                             var dd = {
                                 parent_sn: data.data,
                                 store_id: oo.stoid,
-                                type: 1,
+                                type: 2,
                             };
-														wx.showLoading({
-															title: '支付中',
-															mask: true,
-														});
                             a.post("/api/weshop/order/pay/createOrder", {
                                 data: dd,
-																isShowLoading: false,
                                 success: function (t) {
                                     //console.log(t);
-																		wx.hideLoading();
                                     if (t.data.code == 0) {
                                         //app.my_warnning("支付成功",1,th);
                                         //setTimeout(function () {
                                         th.setData({isclose: 0});
-																				
-																				wx.showToast({
-																				  title: '支付成功',
-																				  icon: 'success',
-																				  duration: 2000,
-																					success: function() {
-																						// 幸运购
-																						setTimeout(function() {
-																							wx.redirectTo({
-																							    url: "/packageC/pages/luckyGo/luckyGo_details/luckyGo_details?type=1&ordersn=" + data.data + "&group_id=" + th.data.param.group_id + "&goods_id=" + th.data.param.goods_id + "&goods_name=" + th.data.bn_goods.goods_name,
-																							});
-																						}, 0);
-																						
-																					},
-																				})
-																				
-                                        // wx.redirectTo({
-                                        //     url: "/pages/payment/pay_success/pay_success?type=1&order_sn=" + data.data,
-                                        // })
-																				
+                                        wx.redirectTo({
+                                            url: "/pages/payment/pay_success/pay_success?type=2&order_sn=" + data.data,
+                                        })
                                         //}, 1000)
                                     }
                                 },
@@ -3441,6 +3434,19 @@ Page({
                 if (gd.prom_type == 1 || gd.is_gift || gd.prom_type == 7) {
                     continue;
                 }
+
+                //--如果是团购，要判断有没有限制使用优惠券
+                if(gd.prom_type == 2){
+                    var prom1=null;
+                    await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + gd.goods_id + "/" + gd.prom_id, {
+                    }).then(res => {
+                        if (res.data.code == 0) prom1 = res.data.data;
+                    })
+                    if(!prom1.isQuan){
+                        continue;
+                    }
+                }
+
                 //如果有限制使用优惠券，就要返回
                 if (gd.prom_type == 3) {
                     if (th.data.prom_goods_map[pickup_id][gd.prom_id].is_xz_yh) continue;
@@ -3479,6 +3485,7 @@ Page({
             arr[ind].ckeck_quan_price = ckeck_quan_price - cut_price;
             arr[ind].check_quan_ware_list = check_quan_ware_list;
             arr[ind].check_quan_price_list = check_quan_price_list;
+            arr[ind].is_xz_yh = is_xz_yh;
 
             //是否关闭使用优惠券
             if (th.data.is_close_quan != 1 && !is_xz_yh) {
@@ -3488,7 +3495,7 @@ Page({
                     data: {
                         storeId: oo.stoid,
                         userId: app.globalData.user_id,
-                        BuySum: ckeck_quan_price,
+                        BuySum: arr[ind].ckeck_quan_price,
                         WareIds: check_quan_ware_list,
                         pageSize: 100
                     }
@@ -3843,7 +3850,6 @@ Page({
         }
     },
 
-
     //取消使用线下取价
     cancle_offline: function () {
         //判断是不是立即购买
diff --git a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.json b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.json
index 0cfb931..c78ad85 100644
--- a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.json
+++ b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.json
@@ -1,5 +1,5 @@
 {
-    "navigationBarTitleText": "填写订单",
+    "navigationBarTitleText": "提交订单",
     "enablePullDownRefresh": false,
     "usingComponents": {
         "warn": "/components/long_warn/long_warn"
diff --git a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.wxml b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.wxml
index 6c3b5dd..1350caf 100644
--- a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.wxml
+++ b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.wxml
@@ -2,7 +2,7 @@
 <wxs src="filter.wxs" module="util"></wxs>
 <wxs module="filters" src="../../../../utils/filter.wxs"></wxs>
 
-<form bindsubmit="submitConfirm">
+<form bindsubmit="submitForm">
 	<view class="container">
 		
 		<!-- 立即购买的时候 -->
@@ -268,6 +268,7 @@
 					</view>
 
 					<!-- ---商品名称规格---- -->
+					<!-- 幸运购 -->
 					<view class="order-num  flex-space-between">
 						<view class="co-red">￥<text class="fs36">{{filters.toFix(bn_goods.shop_price,2)}}</text></view>
 						<view class="goods-num">x{{bn_goods.buynum}}</view>
@@ -426,6 +427,7 @@
 				<view>优惠活动</view>
 				<view class="co-red">- ￥ {{filters.toFix(formData.cut_price,2)}}元</view>
 			</view>
+			
 			<!-- 组合购优惠金额 -->
 			<view class="item" wx:if="{{formData.zh_cut_price>0 || formData.zh_cut_price<0}}">
 				<view>组合购优惠</view>
diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
new file mode 100644
index 0000000..35637e2
--- /dev/null
+++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
@@ -0,0 +1,1232 @@
+var t = getApp(),
+	app = t,
+	a = t.request,
+	e = require("../../../../utils/common.js"),
+	s = require("../../../../utils/util.js"),
+	o = require("../../../../utils/md5.js"),
+	to = getApp();
+var oo = t.globalData.setting,
+	os = oo;
+var regeneratorRuntime = require('../../../../utils/runtime.js');
+var util_pay = require("../../../../utils/pay.js");
+let self = null;
+
+Page({
+	data: {
+		prom_type: 9,
+
+		url: t.globalData.setting.url,
+		resourceUrl: t.globalData.setting.resourceUrl,
+		imgUrl: t.globalData.setting.imghost,
+		goods: null,
+		order: null,
+		orderPrices: null,
+		coupons: null,
+		coupon: null,
+		invoiceToggle: !0,
+		payWithUserMoney: !0,
+		payWithPoints: !0,
+		maxWord: 0,
+		enterAddressPage: !1,
+		firstEnter: !0,
+		//页面获取的参数
+		param: null,
+		postdata: null,
+		//提交订单的格式
+		formData: {
+			order_amount: 0, //支付金额
+			total_amount: 0, //总价
+			all_price: 0, //商品卖的总价
+			pay_points: 0, //使用积分
+			user_money: 0, //使用余额
+			couponCode: "", //使用优惠券(多单就用逗号隔开)
+			shipping_price: 0, //物流费用
+		},
+
+		/*----------------立即购买---------------------*/
+		is_b_now: 0, //0是购物车结算  1立即购买
+		bn_goods: null, //立即购买时候的调用商品
+		bn_use_money: 0, //是否使用余额
+		bn_exp_type: 1, //0是物流 1自提
+		bn_pick: 0, //选择的门店
+		bn_pickname: "", //选择的门店名称
+		bn_t_exp_t: 0, //判断商品和门店一起决定的物流自提的方式0 都可以 1自提 2物流
+		/*------------------------*/
+		user_addr: null, //物流
+		userinfo: null, //获取会员
+		/*----------物流选择--------*/
+		wu_arr: null,
+		index: 0,
+
+		//判断页面是返回回来的还是 首次进入的
+		isclose: 1,
+		kt_type: 0, //开团类型
+		is_pt_tz: 0, //是否开团团长
+		qh: '', //期号
+		pt_listno: '', //期号
+		is_normal: 0,
+		is_express: 0, //选择物流的控制器
+		yuer: 0,
+
+		rank_switch: 0, //是不是开同等级卡
+		show_card: null, //显示的等级卡
+		card_name: '', //显示的卡的名称
+		card_cut_price: null, //减价多少钱  
+	},
+	
+	onLoad: function(t) {
+		self = this;
+		this.setData({
+			is_b_now: t.is_bnow == undefined ? 0 : t.is_bnow,
+			param: t,
+		});
+		
+		var appD = getApp().get_b_now();
+
+		this.data.postdata = appD;
+		
+		//如果期号有值01
+		// if (appD.qh) {
+		// 	th.data.qh = appD.qh;
+		// 	th.data.pt_listno = appD.qh;
+		// }
+		
+		
+
+		this.setData({//01
+			// kt_type: appD.kt_type
+		});
+		
+		// 01
+		// if (appD.is_pt_tz) th.data.is_pt_tz = appD.is_pt_tz;
+		
+
+		//先获取物流，再获取用户信息，再展示页面
+		//th.get_wuliu(th.get_info(th.show_page));
+	},
+	
+	onUnload: function() {
+		this.setData({
+			isclose: 1
+		})
+	},
+
+	//------获取会员信息-----先获取用户信息，在进行下一步---
+	get_info: function(func) {
+		var user_id = t.globalData.user_id;
+		to.auth.get_u(func);
+	},
+
+	//-------------------获取物流---------------
+	get_wuliu(func) {
+		var th = this;
+		// console.log("getwuliu4545");
+		to.getwuliu(function(e) {
+			if (th.data.is_default_logistics) {
+				//如果第一个不是开启默认，说明要让用户自己选
+				if (!e[0].is_default) {
+					th.setData({
+						is_default_logistics: 0
+					});
+				}
+			}
+			th.setData({
+				wu_arr: e
+			})
+			typeof func == "function" && func();
+		})
+	},
+
+	//------获取会员收货地址-----
+	getuser_addr: function(func) {
+		if (to.globalData.baddr != null) {
+			var user_addr = to.globalData.baddr;
+			to.globalData.baddr = null;
+			func(user_addr);
+		} else {
+			a.get("/api/weshop/useraddress/page", {
+				data: {
+					user_id: to.globalData.user_id,
+					store_id: oo.stoid,
+					pageSize: 600
+				},
+				success: function(su) {
+
+					var user_addr = su.data.data.pageData;
+					var item = null;
+					var def_item = null;
+					for (var i = 0; i < user_addr.length; i++) {
+						if (user_addr[i]['is_default'] == 1) {
+							def_item = user_addr[i];
+						}
+						if (user_addr[i]['is_pickup'] == 1) {
+							item = user_addr[i];
+						}
+					}
+					if (item == null) item = def_item;
+					if (item == null) item = user_addr[0];
+					if (item == undefined) item = null;
+					func(item);
+				}
+			});
+		}
+	},
+	//----------------展示页面,是再获取用户信息之后--------------
+	show_page: function() {
+		var th = this;
+		//th.setData({ userinfo: to.globalData.userInfo});  会员信息要时时获取		  
+		var user = getApp().globalData.userInfo;
+		getApp().request.get("/api/weshop/users/get/" + oo.stoid + "/" + user.user_id, {
+			data: {
+				r: Math.random()
+			},
+			success: function(e) {
+
+				getApp().globalData.userInfo = e.data.data;
+				th.setData({
+					userinfo: e.data.data
+				});
+				//获取立即购买的商品信息
+				th.get_buy_goods();
+
+				//获取提现金额
+				getApp().request.get("/api/weshop/withdrawals/summoney", {
+					data: {
+						user_id: to.globalData.user_id,
+						store_id: oo.stoid,
+						status: 0
+					},
+					success: function(su) {
+						if (su.data.code == 0) {
+							var yuer = parseFloat(th.data.userinfo.user_money -
+								(th.data.userinfo.frozen_money > 0 ? th.data.userinfo.frozen_money : 0) - su.data.data.summoney).toFixed(
+								2);
+							if (yuer < 0) yuer = 0;
+							th.setData({
+								txmon: su.data.data.summoney,
+								yuer: yuer
+							});
+						}
+					}
+				});
+			}
+		});
+	},
+
+	//-----获取立即购买的商品信息----
+	get_buy_goods: function() {
+		var th = this,
+			a = getApp().request;
+		var gg = th.data.postdata;
+		//调用商品
+		a.get("/api/weshop/goods/get/" + oo.stoid + "/" + gg.goods_id, {
+			success: function(t) {
+				var gd = t.data.data;
+				if (!gd) return false;
+
+				t.data.data.original_img = oo.imghost + t.data.data.original_img;
+				t.data.data['buynum'] = gg.goods_num;
+				// console.log(t.data.data);
+				var distr_t = 0,
+					et = 0
+				if (t.data.data.distr_type == 0) {
+					distr_t = gg.pick_dis;
+				} else {
+					//distr_type配送方式 0=用户自选 1=自提 2=物流 
+					distr_t = t.data.data.distr_type;
+				}
+				switch (distr_t) {
+					case 0:
+						et = 1;
+						//-- 系统后台有设置要默认的 --
+						if (th.data.json_d.pickupway && th.data.json_d.pickupway == 1) et = 0;
+						break;
+					case 1:
+						et = 1;
+						break;
+					case 2:
+						et = 0;
+						break;
+				}
+
+				t.data.data.shop_price = gg.goods_price;
+				//--如果是普通购买的时候--
+				if (gg.is_normal == 1) {
+					t.data.data.prom_id = 0;
+					t.data.data.prom_type = 0;
+					t.data.data.is_normal = 0;
+
+					var gd = t.data.data;
+					//-- 用商品的手店价来显示 --
+					gg.goods_price = gd.shop_price;
+					//---是不是购买等级卡成功的返回---等级卡显示的判断---
+					var is_card_back = getApp().globalData.is_card_back;
+					if (is_card_back) {
+						gg.goods_price = gd[th.data.card_name];
+						t.data.data.shop_price = gg.goods_price;
+						getApp().globalData.is_card_back = 0;
+						th.setData({
+							card_cut_price: 0
+						});
+					} else {
+						//--- 商品不能是搭配购，商家等级卡开通的情况下,  会员不是等级会员的情况， 商品有设置等级卡价格，同时等级卡价格小于商品的价格
+						if (th.data.card_name && gd[th.data.card_name] > 0 && gg.goods_price > gd[th.data.card_name] && !th.data.userinfo
+							.card_field) {
+							var cut_p = gg.goods_price - gd[th.data.card_name];
+							th.setData({
+								card_cut_price: cut_p
+							});
+						}
+					}
+
+					if (th.data.bn_goods) {
+						et = th.data.bn_exp_type;
+					}
+
+
+					th.setData({
+						bn_goods: t.data.data,
+						bn_pickname: gg.pick_name,
+						bn_pick: gg.pick_id,
+						bn_t_exp_t: distr_t,
+						is_normal: 1,
+						bn_exp_type: et
+					});
+
+
+
+					th.calculatePrice2();
+				}
+				
+				else { //01
+
+					//--阶梯团很特殊，不能用总表来拿价格--
+					getApp().request.get("/api/weshop/teamlist/get/" + oo.stoid + "/" + gd.prom_id, {
+						success: function(tt) {
+
+							if (tt.data.code == 0) {
+								var pt_data = tt.data.data;
+								var now = s.gettimestamp();
+
+								if (pt_data.is_end == 1) {
+									t.data.data.prom_id = 0;
+									t.data.data.prom_type = 0;
+									// t.data.data.is_normal=1;
+								} else if (now > pt_data.end_time) {
+									t.data.data.prom_id = 0;
+									t.data.data.prom_type = 0;
+									// t.data.data.is_normal=1;
+								} else {
+									t.data.data.shop_price = tt.data.data.price; //活动价格
+									t.data.data.is_normal = 0;
+									if (pt_data.kttype == 3) {
+										t.data.data.shop_price = tt.data.data.yf_price; //用定金来购买
+									}
+								}
+							} else {
+								t.data.data.prom_id = 0;
+								t.data.data.prom_type = 0;
+								// t.data.data.is_normal=1;
+							}
+
+							if (th.data.bn_goods) {
+								et = th.data.bn_exp_type;
+							}
+
+							th.setData({
+								bn_goods: t.data.data,
+								bn_pickname: gg.pick_name,
+								bn_pick: gg.pick_id,
+								bn_t_exp_t: distr_t,
+								bn_exp_type: et
+							});
+
+
+							//计算价格
+							th.calculatePrice2();
+						}
+					});
+				}
+				
+			}
+		});
+	},
+
+	//----------子页返回父页触发----------
+	onShow: function() {
+		var th = this;
+
+		if (th.data.isclose == 0) {
+			wx.navigateTo({
+				url: "/pages/index/index/index"
+			})
+		} else {
+			this.getuser_addr(function(ie) {
+				//更换地址回来要重新调用计算价钱的接口
+				th.setData({
+					user_addr: ie
+				});
+				if (!th.data.user_addr || th.data.user_addr.address_id != ie.address_id) {
+					th.setData({
+						add_back: 1
+					});
+					if (this.data.bn_goods) th.calculatePrice2();
+				}
+			})
+			//--更新默认地址--,看一下是不是跳到地址页面
+			if (!getApp().globalData.is_cart_old) {
+				this.update_code();
+			} else {
+				getApp().globalData.is_cart_old = 0;
+			}
+		}
+
+
+		//先获取是否有关闭使用优惠券
+		getApp().getConfig2(function(ee) {
+			var json_d = JSON.parse(ee.switch_list);
+			th.data.json_d = json_d;
+			th.data.ispt_goods = json_d.ispt_goods; //是不是平摊到单品的控制参数赋值
+			var is_default_logistics = json_d.is_default_logistics;
+
+			th.setData({
+				is_close_quan: json_d.is_close_quan,
+				sales_rules: ee.sales_rules,
+				rank_switch: json_d.rank_switch,
+				is_default_logistics: is_default_logistics
+			});
+
+			var rank_switch = json_d.rank_switch;
+			var max_price = -1;
+			var show_card = null;
+			var name = "";
+			//如果有开等级卡的时候,
+			//因为都是调接口，要返回在计算
+			if (rank_switch == 2) {
+				//-- 获取所有的等级卡, --
+				getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?storeId=" + os.stoid, {}).then(res => {
+					if (res.data.code == 0) {
+						var plusCard = res.data.data;
+						//-- 循环判断，拿到最贵的那张卡 --
+						for (var ih in plusCard) {
+							if (plusCard[ih].IsStopBuy == true) {
+								continue;
+							}
+							if (max_price < 0) {
+								max_price = plusCard[ih].CardFee;
+								name = 'card' + plusCard[ih]['CorrPrice'];
+								show_card = plusCard[ih];
+							} else {
+								if (max_price < plusCard[ih].CardFee) {
+									max_price = plusCard[ih].CardFee;
+									name = 'card' + plusCard[ih]['CorrPrice'];
+									show_card = plusCard[ih];
+								}
+							}
+						}
+
+						if (show_card) {
+							name = name.toLowerCase();
+							th.setData({
+								card_name: name,
+								show_card: show_card
+							})
+						}
+					}
+					//-----先获取物流，再获取用户信息，再展示页面-----
+					th.get_wuliu(th.get_info(th.show_page));
+				})
+			} else {
+				//-----先获取物流，再获取用户信息，再展示页面-----
+				th.get_wuliu(th.get_info(th.show_page));
+			}
+		}, 1)
+
+	},
+	//---------------检查是否有收货地址-------------------
+	checkAddressList: function() {
+		var t = this;
+		return !(!this.data.order || null == this.data.order.userAddress) || (wx.showModal({
+			title: "请先填写或选择收货地址~",
+			success: function(a) {
+				a.confirm ? t.enterAddressPage() : wx.navigateBack();
+			},
+			fail: function() {
+				wx.navigateBack();
+			}
+		}), !1);
+	},
+	showInvoice: function() {
+		this.setData({
+			invoiceToggle: !this.data.invoiceToggle
+		});
+	},
+	keyUpChangePay1: function(t) {
+		this.setData({
+			payWithUserMoney: !(t.detail.value.length > 0)
+		});
+	},
+	keyUpChangePay2: function(t) {
+		this.setData({
+			payWithPoints: !(t.detail.value.length > 0)
+		});
+	},
+	keyUpChangeNum: function(t) {
+		this.setData({
+			maxWord: t.detail.value.length
+		});
+	},
+	//---------计算立即购买----------
+	calculatePrice2: function() {
+		console.log('calculatePrice2');
+		var th = this,
+			good = this.data.bn_goods;
+		//-----------计算商品总价--------------
+		var allpice = good.shop_price * good.buynum;
+		allpice = parseFloat(allpice).toFixed(2);
+		var txt = "formData.all_price";
+		th.setData({
+			[txt]: allpice,
+		});
+		console.log(th.data.formData);
+
+		to.getConfig2(function(ee) {
+			to.getwuliuprice(function(rs) {
+				console.log('calculatePrice2222');
+				console.log(rs);
+				var o_shipping_price = 0,
+					goods_weight = -1,
+					goods_piece = -1;
+				//-----------当地址不为空，且是物流时，计算物流费用,同时阶梯团不计算拼团价格----------
+				if (th.data.user_addr != null && th.data.bn_exp_type == 0 && good.is_free_shipping == 0 && (th.data.kt_type !=
+						3 || th.data.bn_goods.is_normal == 1)) {
+					switch (good['exp_sum_type']) {
+						case 1:
+							//统一运费
+							o_shipping_price += good['uniform_exp_sum'];
+							break;
+						case 2:
+							if (goods_weight < 0) goods_weight = 0;
+							//累积商品重量 每种商品的重量 * 数量
+							goods_weight += good['weight'] * good['buynum'];
+							break;
+						case 3:
+							if (goods_piece < 0) goods_piece = 0;
+							//累积商品数量
+							goods_piece += good['buynum'];
+							break;
+					}
+
+					console.log(o_shipping_price + ":" + goods_weight + ":" + goods_piece);
+					console.log(th.data.wu_arr);
+					var code = th.data.wu_arr[th.data.index].code;
+					var freight_free = ee.freight_free; //全场满多少包邮
+					var shipping_price =
+						th.calculatewuliu(code, o_shipping_price, goods_weight,
+							goods_piece, th.data.user_addr, freight_free, allpice, rs);
+
+					shipping_price = parseFloat(shipping_price).toFixed(2);
+					var wl_txt = "formData.shipping_price";
+					th.setData({
+						[wl_txt]: shipping_price,
+					})
+
+				} else {
+					var wl_txt = "formData.shipping_price";
+					th.setData({
+						[wl_txt]: 0,
+					})
+				}
+				//-----------------总价-----------------
+				// 幸运购 01
+				// var total_m = parseFloat(allpice) + parseFloat( th.data.formData.shipping_price);
+				var total_m = parseFloat(th.data.param.goods_price) + parseFloat(th.data.formData.shipping_price);
+				total_m = parseFloat(total_m).toFixed(2);
+
+				var atxt = "formData.total_amount";
+				th.setData({
+					[atxt]: total_m,
+				})
+				var order_m = total_m;
+
+				var txt = "formData.user_money";
+				var txt2 = "formData.order_amount";
+				//--------------如果使用余额---------------------
+				if (th.data.bn_use_money == 1 && th.data.yuer > 0) {
+					if (parseFloat(th.data.yuer) > total_m) {
+						th.setData({
+							[txt]: total_m,
+							[txt2]: 0
+						})
+					} else {
+						order_m = parseFloat(order_m) - parseFloat(th.data.yuer);
+						order_m = order_m.toFixed(2);
+						th.setData({
+							[txt]: th.data.yuer,
+							[txt2]: order_m
+						})
+					}
+				} else {
+					th.setData({
+						[txt]: 0,
+						[txt2]: order_m
+					})
+				}
+
+			});
+		});
+	},
+
+
+	// 提交订单前弹出确认对话框
+	submitConfirm(e) {
+		wx.showModal({
+			title: '温馨提示',
+			content: this.data.param.alert,
+			success(res) {
+				if (res.confirm) {
+					console.log('用户点击确定');
+					self.submitForm(e);
+				} else if (res.cancel) {
+					console.log('用户点击取消');
+				}
+			}
+		})
+	},
+
+
+	//--------------------提交订单-----------------------
+	submitForm: async function(t) {
+		if (this.data.is_summit_ing == 1) return false; //--提交中退出--
+		this.data.is_summit_ing = 1;
+
+		var th = this,
+			pdata = new Array();
+		var ff = true;
+		//------------立即购买-------------
+		console.log("buy_new");
+
+		//如果不是阶梯团，或者是普通购买，商家选择了物流，以及地址为空的时候
+		if (th.data.bn_exp_type == 0 && th.data.user_addr == null && (th.data.kt_type != 3 || th.data.bn_goods.is_normal ==
+				1)) {
+			ff = false;
+			getApp().my_warnning("请选择收货地址", 0, this);
+			this.data.is_summit_ing = 0;
+		}
+		if (!ff) return false;
+		var addr = th.data.user_addr;
+		if (th.data.bn_exp_type == 1) addr = null;
+
+		console.log(th.data.formData);
+		console.log(th.data.wu_arr);
+		console.log(th.data.bn_exp_type);
+
+		if (th.data.bn_exp_type == 0 && (th.data.kt_type != 3 || th.data.bn_goods.is_normal == 1)) {
+			if (th.data.wu_arr == null || th.data.wu_arr.length <= 0) {
+				getApp().my_warnning("读取物流失败", 0, this);
+				this.data.is_summit_ing = 0;
+				return false;
+			}
+		}
+
+		//阶梯团强制带1，自提~~~01
+		// if (th.data.kt_type == 3) {
+		// 	th.data.bn_exp_type = 1;
+		// }
+
+		var item = {
+			'user_id': to.globalData.user_id,
+			'consignee': addr == null ? "" : addr.consignee,
+			'province': addr == null ? 0 : addr.province,
+			'city': addr == null ? 0 : addr.city,
+			'district': addr == null ? 0 : addr.district,
+			'twon': addr == null ? 0 : addr.twon,
+			'address': addr == null ? "" : addr.address,
+			'more_address': addr == null ? "" : addr.more_address,
+			'mobile': addr == null ? th.data.userinfo.mobile : addr.mobile,
+			'email': '',
+			'invoice_title': '',
+			'goods_price': th.data.param.goods_price, //商品总价
+			//'goods_price': th.data.formData.all_price,           //商品总价
+			'shipping_price': th.data.formData.shipping_price, //物流金额
+			'user_money': th.data.formData.user_money, //使用余额
+			'total_amount': th.data.formData.total_amount, //订单总价
+			'order_amount': th.data.formData.order_amount, //应付
+			'user_note': t.detail.value.user_note, //用户备注
+			'store_id': oo.stoid, //商家
+			'pickup_id': th.data.bn_pick, //门店
+			'exp_type': th.data.bn_exp_type, //配送方式
+			'is_normal': th.data.bn_goods.is_normal, //是否是普通购买
+			//'pt_prom_id': th.data.bn_goods.prom_id, //拼单ID 01
+			//'is_pt_tz': th.data.is_pt_tz, //开团类型 01
+			'order_goods': new Array(),
+		};
+
+		//如果不是阶梯团，或者是普通购买，01
+		// if ((th.data.kt_type != 3 || th.data.bn_goods.is_normal == 1)) {
+		if (th.data.bn_goods.is_normal == 1) {
+			item['shipping_code'] = th.data.bn_exp_type == 1 ? 0 : th.data.wu_arr[th.data.index].code;
+			item['shipping_name'] = th.data.bn_exp_type == 1 ? '' : th.data.wu_arr[th.data.index].name;
+		}
+
+		// if (!th.data.bn_goods.is_normal) {
+		// 	item.is_zsorder = th.data.kt_type + 1; //开团类型 01
+		// }
+		
+		
+		//老会员成为分销下线需要的参数
+		if (getApp().globalData.first_leader && !getApp().globalData.userInfo.first_leader) {
+			//判断一下分享人是不是分享商
+			await app.request.promiseGet("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.first_leader, {}).then(
+				res => {
+					if (res.data.code == 0) {
+						var user = res.data.data;
+						if (user.is_distribut == 1) {
+							item.first_leader = parseInt(getApp().globalData.first_leader);
+						}
+					}
+				})
+		}
+
+		if (th.data.qh != '') {
+			item.team_qh = th.data.qh;
+			item.pt_listno = th.data.qh;
+		}
+		
+
+		var gg = to.get_b_now();
+		var goods = {
+			'goods_id': gg.goods_id,
+			'goods_name': gg.goods_name,
+			'goods_sn': gg.goods_sn,
+			'goods_num': gg.goods_num,
+			'market_price': th.data.bn_goods.market_price,
+			'goods_price': th.data.param.goods_price,
+			// 'goods_price': th.data.bn_goods.shop_price,
+			'member_goods_price': th.data.bn_goods.shop_price,
+			'store_id': oo.stoid,
+			// 'prom_type':th.data.bn_goods.prom_type,  //促销活动类型 01
+			// 'prom_id': th.data.bn_goods.prom_id,     //促销活动id 01
+
+			'prom_type': 9, //促销活动类型
+			'prom_id': th.data.param.group_id, //促销活动id
+		};
+
+		//--导购分享过来的id--
+		if (gg.guide_id) {
+			goods.guide_id = gg.guide_id;
+			goods.guide_type = gg.guide_type;
+			//调用接口判断是不是会员
+			await getApp().request.promiseGet("/api/weshop/shoppingGuide/getId/" + oo.stoid + "/" + gg.guide_id, {}).then(res => {
+				if (res.data.code == 0) {
+					goods.guide_name = res.data.data.salesman;
+					goods.guide_sn = res.data.data.salesman_no;
+				}
+			})
+		}
+
+		//--商品的房间号--
+		if (gg.room_id && gg.room_id > 0) {
+			item.room_ids = gg.room_id;
+			goods.room_id = gg.room_id;
+		}
+
+		// if (th.data.bn_goods.is_normal) {
+		// 	goods.is_pd_normal = 0;
+		// }
+
+		item.order_goods.push(goods);
+		pdata.push(item);
+
+		if (pdata.length == 0) return;
+		var str = JSON.stringify(pdata);
+		console.log("支付数据");
+		console.log(str);
+		//return false;
+		wx.showLoading({
+			title: "加载中"
+		});
+		wx.request({
+			url: oo.url + '/api/weshop/order/createWxdOrder',
+			data: str,
+			method: 'POST',
+			header: {
+				'content-type': 'application/json'
+			}, // 设置请求的 header
+			success: function(res) {
+
+				wx.hideLoading();
+				if (res.statusCode == 200) {
+					var data = res.data;
+					if (data.code == 0) {
+						console.log(th.data.is_b_now);
+						//如果是购物车结算，还要删除购物车
+						if (th.data.is_b_now == 0) {
+							console.log(th.data.cartlist_y);
+							var list = th.data.cartlist_y;
+							for (var i = 0; i < list.length; i++) {
+								//删除购物车
+								getApp().request.delete("/api/weshop/cart/del/" + oo.stoid + "/" + list[i].id, {});
+							}
+						}
+						var order_amount = 0;
+						pdata.forEach(function(em, ind) {
+							order_amount += em.order_amount;
+						})
+						//要进行判断，如果是用微信支付，就要跳转到支付界面
+						if (order_amount > 0) {
+							th.setData({
+								isclose: 0
+							});
+							//void e.jumpToCart4({
+							//  order_sn: data.data,
+							//  type:1,
+							// }, 1);
+							util_pay.pay(data.data, function() {
+								setTimeout(function() {
+									wx.reLaunch({
+										//url: "/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data,
+										url: "/pages/team/team_success/team_success?ordersn=" + data.data,
+									})
+								}, 1000)
+							}, function() {
+								//支付失败
+								setTimeout(function() {
+									//wx.navigateBack({ delta: 1 })
+									wx.reLaunch({
+										url: "/pages/user/order_list/order_list",
+									})
+								}, 1000)
+
+							}, oo.stoid, 1);
+
+						} else {
+							var dd = {
+								parent_sn: data.data,
+								store_id: oo.stoid,
+								type: 1,
+							};
+							wx.showLoading({
+								title: '支付中',
+								mask: true,
+							});
+							//return false;
+							getApp().request.post("/api/weshop/order/pay/createOrder", {
+								data: dd,
+								success: function(t) {
+									// console.log(t);
+									// app.my_warnning("支付成功",1,th);
+									wx.hideLoading();
+									if (t.data.code == 0) {
+
+										// setTimeout(function () {
+										th.setData({
+											isclose: 0
+										});
+
+										wx.showToast({
+											title: '支付成功',
+											icon: 'success',
+											duration: 2000,
+											success: function() {
+												// 幸运购
+												setTimeout(function() {
+													wx.redirectTo({
+														url: "/packageC/pages/luckyGo/luckyGo_details/luckyGo_details?type=1&ordersn=" + data.data +
+															"&group_id=" + th.data.param.group_id + "&goods_id=" + th.data.param.goods_id +
+															"&goods_name=" + th.data.bn_goods.goods_name,
+													});
+												}, 0);
+
+											},
+										})
+
+
+										//                  if(th.data.is_normal==1){
+										//                      /*--
+										//                      wx.navigateTo({
+										//                        url: "/pages/user/order_list/order_list",
+										//                      })--*/
+
+										// //                      var url="/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data;
+										// //                      wx.reLaunch({
+										// // 	url: url  
+										// // })
+
+										//                  }else{
+										//                      // wx.reLaunch({
+										//                      //   url: "/pages/team/team_success/team_success?ordersn=" + data.data,
+										//                      // })
+										//                  }
+
+
+										// }, 1000)
+
+									} else {
+										wx.showToast({
+											title: t.data.msg,
+											icon: 'none',
+											duration: 2000,
+											success: function() {
+
+												// wx.reLaunch({
+												// 	url: "/pages/user/order_list/order_list",
+												// })
+												
+											},
+										})
+									};
+
+
+								}
+							});
+						}
+					} else {
+						th.data.is_summit_ing = 0; //是否提交中
+						getApp().confirmBox(data.msg);
+					}
+				} else {
+					th.data.is_summit_ing = 0; //是否提交中
+					console.log("index.js wx.request CheckCallUser statusCode" + res.statusCode);
+				}
+			},
+			fail: function() {
+				th.data.is_summit_ing = 0; //是否提交中	
+				wx.hideLoading();
+				console.log("index.js wx.request CheckCallUser fail");
+			},
+			complete: function() {}
+		})
+	},
+	
+	
+	
+	
+	
+	useCoupon: function() {
+		if (this.data.order.couponNum <= 0) {
+			//return t.showWarning("无可用优惠券");
+			getApp().my_warnning("无可用优惠券", 0, this);
+			return;
+		}
+		var a = {
+			lid: this.data.coupon ? this.data.coupon.id : "0"
+		};
+		wx.navigateTo({
+			url: "/pages/user/checkcoupon/checkcoupon?" + s.Obj2Str(a)
+		});
+	},
+	
+	
+	
+	
+	enterAddressPage: function() {
+		getApp().globalData.is_cart_old = 1;
+		this.data.enterAddressPage = !0, wx.navigateTo({
+			url: "/pages/user/address_list/address_list"
+		});
+	},
+
+
+
+
+	//--------立即购买时，选择自提和物流-----------
+	setexptype_w: function(t) {
+		var th = this;
+		var ty = t.currentTarget.dataset.t,
+			txt = t.currentTarget.dataset.txt;
+		th.setData({
+			[txt]: ty
+		});
+		var iszt = 1;
+		if (ty == 0) {
+			th.setData({
+				is_all_zt: 0
+			});
+		} else {
+			for (var i = 0; i < th.data.cartlist.length; i++) {
+				var item = th.data.cartlist[i];
+				if (item.exp_type == 0) {
+					iszt = 0;
+					break;
+				}
+			}
+			th.setData({
+				is_all_zt: iszt
+			});
+		}
+		//----计算此时购物车的价格----
+		th.calculatePrice();
+	},
+
+
+
+
+	//--------立即购买时，选择自提和物流----------
+	setexptype: function(t) {
+		var th = this;
+		var ty = t.currentTarget.dataset.t;
+		th.setData({
+			bn_exp_type: ty
+		});
+		//当物流为空的时候。
+		if (ty == 0 && th.data.wu_arr == null) {
+			return th.get_wuliu(th.calculatePrice2());
+		}
+		th.calculatePrice2()
+		console.log('setexptype');
+	},
+
+
+
+
+	//--------立即购买时，使用余额--------
+	set_bn_useyuer: function() {
+		var th = this;
+		th.setData({
+			bn_use_money: !th.data.bn_use_money
+		});
+		th.calculatePrice2();
+	},
+	
+	
+	
+	
+	
+	set_js_useyuer: function() {
+		var th = this;
+		th.setData({
+			js_use_money: !th.data.js_use_money
+		});
+		th.calculatePrice();
+	},
+
+
+
+
+	//-------------------计算物流---------------
+	calculatewuliu: function(code, o_shipping_price, goods_weight,
+		goods_piece, user_addr, freight_free, o_price, rs) {
+		var price = 0,
+			th = this;
+		price += parseFloat(o_shipping_price);
+		//如果是包邮
+		if (freight_free > 0 && o_price > freight_free) {
+			return 0;
+		}
+		if (user_addr == null) {
+			return 0;
+		}
+		//计算物流的config  item;
+		var item = null;
+		//先根据 镇 县 区找计算的config
+		item = th.get_wuliu_config(user_addr.district, code, rs);
+		if (item == null) item = th.get_wuliu_config(user_addr.city, code, rs);
+		if (item == null) item = th.get_wuliu_config(user_addr.province, code, rs);
+		if (item == null) item = th.get_wuliu_default(code, rs);
+		if (item == null) return o_shipping_price;
+		var fw_price = 0,
+			fp_price = 0;
+		item = item.config;
+		if (item == null) return o_shipping_price;
+		//------按重量----------
+		if (goods_weight > 0) {
+			fw_price = parseFloat(item['money']);
+			if (goods_weight > item['first_weight']) {
+				var fw = goods_weight - item['first_weight'];
+				var n = Math.ceil(fw / item['second_weight'])
+				fw_price = fw_price + n * parseFloat(item['add_money']);
+			}
+		}
+		//------按件数----------
+		if (goods_piece > 0) {
+			fp_price = parseFloat(item['piecemoney']);
+			if (goods_piece > item['first_piece']) {
+				var fp = goods_piece - item['first_piece'];
+				var m = Math.ceil(fp / item['second_piece'])
+				fp_price = fp_price + m * parseFloat(item['add_piecemoney']);
+			}
+		}
+		var rspice = parseFloat(price + fw_price + fp_price);
+		return rspice;
+	},
+
+
+
+	//------------循环获取config-----------
+	get_wuliu_config: function(region_id, code, rs) {
+		var item = null,
+			rslist = rs.pageData;
+		for (var i = 0; i < rslist.length; i++) {
+			if (rslist[i].code == code && rslist[i].region_id == region_id) {
+				item = rslist[i];
+			}
+		}
+		return item;
+	},
+	
+	
+	
+	
+	//-------循环获取config,code default-------
+	get_wuliu_default: function(code, rs) {
+		var item = null,
+			rslist = rs.pageData;
+		for (var i = 0; i < rslist.length; i++) {
+			if (rslist[i].shipping_code == code && rslist[i].is_default == 1) {
+				item = rslist[i];
+			}
+		}
+		return item;
+	},
+
+
+
+
+
+
+	//----------立即购买，选择物流-------------
+	bindPickerChange: function(e) {
+		var ind = e.detail.value
+		this.setData({
+			index: ind
+		});
+		this.calculatePrice2();
+	},
+
+
+
+
+
+	//----------购物车结算，选择物流------------- 01
+	// bindPickerChange_w: function(e) {
+	// 	var ind = e.detail.value,
+	// 		txt = e.currentTarget.dataset.txt;
+	// 	this.setData({
+	// 		[txt]: ind
+	// 	});
+	// 	this.calculatePrice();
+	// },
+
+
+
+
+	cart_set_err: function(e) {
+		var txt = e.currentTarget.dataset.err;
+		var ob = {};
+		ob[txt] = this.data.imgUrl + "/miniapp/images/default_g_img.gif";
+		this.setData(ob);
+	},
+	
+	
+	
+
+	// 开启物流的弹窗
+	show_wu_arr: function(e) {
+		this.setData({
+			open_express: 1
+		});
+	},
+	
+	
+
+	//更新下默认，在onshow里面
+	update_code() {
+		var th = this,
+			m_wind = 0,
+			def_exp_code = getApp().globalData.userInfo.def_exp_code;
+
+		var uii = setInterval(function() {
+			if (th.data.wu_arr) {
+				clearInterval(uii);
+				for (var k = 0; k < th.data.wu_arr.length; k++) {
+					var item = th.data.wu_arr[k];
+					if (def_exp_code == item.code) {
+						m_wind = k;
+					}
+				}
+				//--如果是立即购买--
+				th.setData({
+					index: m_wind,
+					is_express: m_wind
+				});
+			}
+		}, 500)
+	},
+	
+	
+
+	// 关闭物流的弹窗
+	close_express: function() {
+		this.setData({
+			open_express: 0
+		});
+	},
+	
+	
+	
+	
+	// 选择物流
+	click_express_name: function(e) {
+		var express_name = e.currentTarget.dataset.name,
+			shippingcode = e.currentTarget.dataset.shippingcode;
+		var index = e.currentTarget.dataset.idxe;
+		var ob = {
+			is_express: index,
+			is_shipping_code: shippingcode,
+			index: index
+		};
+		this.setData(ob);
+	},
+
+
+
+
+	//点击确定物流
+	determine_expres: function(e) {
+		this.setData({
+			open_express: 0
+		});
+		this.calculatePrice2();
+	},
+	
+	
+	
+	
+	//设置默认物流
+	select_default_logistics: function() {
+		var th = this;
+		var is_shipping_code = this.data.is_shipping_code
+		getApp().request.put("/api/weshop/users/update", {
+			data: {
+				user_id: getApp().globalData.user_id,
+				store_id: oo.stoid,
+				def_exp_code: is_shipping_code
+			},
+			success: function(rse) {
+				if (rse.data.code == 0) {
+					getApp().globalData.userInfo.def_exp_code = is_shipping_code;
+					th.setData({
+						open_express: 0
+					});
+					//----计算此时购物车的价格，这个页面没有calculatePrice(),2021.7.19----
+					//if(th.data.is_b_now==1) th.calculatePrice2();
+					//else th.calculatePrice();
+					th.calculatePrice2();
+				}
+			}
+		})
+	},
+
+
+
+
+	//跳转到购买卡
+	buycard: function() {
+		getApp().goto("/pages/user/plus/plus");
+		getApp().globalData.plus_buy_back = 1;
+	},
+	
+	
+	
+});
diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.json b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.json
new file mode 100644
index 0000000..0cfb931
--- /dev/null
+++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.json
@@ -0,0 +1,7 @@
+{
+    "navigationBarTitleText": "填写订单",
+    "enablePullDownRefresh": false,
+    "usingComponents": {
+        "warn": "/components/long_warn/long_warn"
+    }
+}
\ No newline at end of file
diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml
new file mode 100644
index 0000000..d8ac4ac
--- /dev/null
+++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml
@@ -0,0 +1,211 @@
+<wxs module="filters" src="../../../../utils/filter.wxs"></wxs>
+<form bindsubmit="submitConfirm">
+    <view class="container">
+		
+		<view class="tab-container" wx:if="{{kt_type!=3 || is_normal==1}}">
+			<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>
+					
+					<view hidden="{{bn_t_exp_t==1}}" bindtap='setexptype' data-t='0' class="tab {{bn_exp_type== 0 ? 'active':''}}" 
+					data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}" >快递邮寄</view>
+				
+			</view>
+		</view>
+		
+		
+        <!--要进行判断地址是否显示---->
+        <view bindtap="enterAddressPage" class="user-mes mgt20" hidden='{{bn_exp_type==1 || kt_type==3}}'>
+            <!---默认地址显示------>
+            <block wx:if="{{user_addr!=null}}">
+                <view class="user-contact">收货人：{{user_addr.consignee}}{{'　　'}}{{user_addr.mobile}}</view>
+                <view class="location">
+                    <view class="address">{{user_addr.more_address}}{{'  '}}{{user_addr.address}}</view>
+                    <view class="pos-icon">
+                        <image class="wh100 bdr14" src="{{imgUrl}}/miniapp/images/goodscategory/new_position.png"></image>
+                    </view>
+                </view>
+                <view class="update-logistics">
+                    <image class="arrow-rigth" src="{{imgUrl}}/miniapp/images/icon-arrowdown.png"></image>
+                </view>
+            </block>
+            <!---先增地址------>
+            <block wx:else>
+                <view class="add_new">
+                    <image class="addr_jia" src="{{imgUrl}}/miniapp/images/jia.png"></image>添加地址
+                </view>
+            </block>
+            <!-- <view class="border-img"><image class="wh100 bdr14" src="{{imgUrl}}/miniapp/images/tt.png"></image></view> -->
+        </view>
+
+
+        <!------立即购买-------->
+        <block>
+         <!-- <view class="xc-border main-top"></view> -->
+                <view class="use-item bfff bdr_t-14 mgt20">
+                      <image class="dp" src='{{imgUrl}}/miniapp/images/goodscategory/new_store.png'> </image> <view>{{bn_pickname}}</view></view>
+                <view class="order-detail">
+                      <view class="goods-img">
+                          <image class="wh100 bdr14" src="{{bn_goods.original_img}}" 
+                            binderror='cart_set_err' data-err="bn_goods.original_img"></image>
+                      </view>
+                      <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{bn_goods.goods_id}}">
+                          <view class="goods-name ellipsis-2">{{bn_goods.goods_name}}</view>
+                               <!-- 商品属性 -->
+                          <view class="flex-vertical fs28 color-gray n_guige">
+                                 <view class="goods-color"><text>{{filters.show_gui_ge(bn_goods.goods_spec,bn_goods.goods_color)}}</text>
+                          </view></view>
+
+                             <!-----商品名称规格------>
+                    <view class="order-num flex-space-between">
+                        <view class="co-red">￥<text class="fs36">{{filters.toFix(param.goods_price,2)}}</text></view>
+                        <view class="goods-num">x{{bn_goods.buynum}}</view>
+                    </view>
+                      </navigator>
+                      <!-- <view class="order-num">
+                          <view class="co-red">￥{{bn_goods.shop_price}}</view>
+                          <view class="goods-num">x{{bn_goods.buynum}}</view>
+                      </view> -->
+                </view>
+				
+				<!-- 如果是等级卡的商品，会员没有注册，要提醒注册 -->
+				<view class="plus_buy fs28" wx:if="{{card_cut_price>0}}">
+					<view class="flex">
+						<view class="card_bg ellipsis-1" style="margin-right: 10rpx;">
+							<image  src="{{imgUrl}}/miniapp/images/plus/dj_icon.png"></ image>
+							<text class="card_name">{{show_card.CardName}}</text>
+						</view>            						
+						<view>立减 <text style="color:#f23030;">{{filters.toFix(card_cut_price,2) }}</text> 元</view>
+					</view>
+					<view>
+						<text style="color: #999;margin-left: 4rpx;">vip超级会员仅需{{show_card.CardFee}}元</text>
+					</view>				
+					<!-- 三角形 -->
+					<view class="car_tri_up"></view>
+					<!-- 立即开通跳转 -->
+					<view bindtap="buycard" class="card_op">立即开通</view>				
+				</view>	
+				
+				
+                <view class="set-mes bdr_b-14">
+                    <view wx:if="{{order.store_prom}}"><icon color="#f23030" size="16" type="info"></icon>{{order.store_prom}}
+                    </view>
+
+                    <!--阶梯团是不显示的-->
+					<block wx:if="{{bn_exp_type==0 && !is_default_logistics}}">
+						<view class="use-item flex-space-between" wx:if="{{kt_type!=3 || is_normal==1}}">							
+						   <view>选择物流</view>
+						   <view class="flex-vertical"  bindtap="show_wu_arr"  data-txt='index' style="margin-right: 8rpx;">
+							   <view class="logistics-name">{{wu_arr[index].name}}</view><view class="xc-right"></view>
+						   </view>						
+						</view>
+					</block>
+
+                    <!--阶梯团是不显示的
+                    <block wx:if="{{kt_type!=3 || is_normal==1 }}">
+                        <view class="use-item" hidden='{{bn_exp_type==1}}'>
+                              <view>使用物流：</view>
+                              <picker bindchange="bindPickerChange" value="{{index}}" range="{{wu_arr}}" range-key="name">
+                                    <view >{{wu_arr[index].name}}</view>
+                              </picker>
+                        </view>
+                    </block>-->
+
+                </view>
+
+                
+                <view class="coupon-mes flex-vertical">
+                    <view>留言</view>
+                    <view class="leave-word">
+                        <input placeholder-class="fs28" placeholder='给商家留言，最多100字'bindinput="keyUpChangeNum" disabled="{{disabled}}" class="word-box" maxlength="100" name="user_note"></input>
+                     
+                    </view>
+                </view>
+         </block>
+
+         <view class="information bdr14">
+						 <!-----使用余额------>
+						 <view class="set-mes" wx:if="{{userinfo.user_money>0 && yuer>0}}">
+							 <view class="use-item" bindtap='set_bn_useyuer' style="padding-left:0;padding-right:0;">
+								<icon  color="{{bn_use_money?'red':'gray'}}" size="16" type="success"></icon>
+								<view class="yu_er">使用余额 :￥{{yuer}} </view>
+							 </view>
+						 </view>
+            <view class="item" wx:if="{{kt_type<3 || is_normal==1}}">
+                <view>商品金额</view>
+                <!-- <view class="co-red">￥ {{formData.all_price}}元</view> -->
+								<view class="co-red">￥ {{param.goods_price}}元</view>
+            </view>
+
+            <view class="item" wx:else>
+                <view>定金金额</view>
+                <view class="co-red">￥ {{formData.all_price}}元</view>
+            </view>
+
+            <view class="item" wx:if="{{formData.shipping_price>0}}">
+                <view>配送费用</view>
+                <view class="co-red">￥ {{formData.shipping_price}}元</view>
+            </view>
+            <view class="item" wx:if="{{formData.user_money>0}}">
+                <view>使用余额</view>
+                <view class="co-red">- ￥ {{formData.user_money}}元</view>
+            </view>
+
+        </view>
+    </view>
+
+     <view class="btn-wrap">
+			<view class="pay-amount">
+					<view class="payable">应付金额：<text class="co-red">￥{{formData.order_amount}}</text></view>
+					<!-- <view class="co-red big"></view> -->
+			</view>
+			<button class="tips-btn" formType="submit" id="submitOrder">提交订单</button>
+     </view>
+</form>
+
+<!----弹起选择物流名的列表---->
+<view wx:if='{{open_express==1}}' >
+    <view class="cover-layer flex-center "  bindtap='close_express'>
+    </view>
+
+    <view class="cx-popup radius {{open_express==1?'up' : 'down'}}" >
+        <view class="tops flex">
+            <view class="top-content fs32">
+                <view>
+                    选择物流名字
+                </view>
+            </view>
+            <view class="close-frame"  bindtap='close_express' >
+                <view class="xc-close-express">×</view>
+            </view>
+        </view>
+        <view class="express_list">
+            <view  wx:for="{{wu_arr}}" wx:for-item="express_list" wx:for-index="idx">
+                <view class="express_list_frame" bindtap="click_express_name"
+                      data-shippingcode="{{express_list.shipping_code}}"
+                      data-name="{{express_list.name}}" data-idxe="{{idx}}">
+
+                    <block wx:if="{{is_express==idx}}">
+                        <view class="circle white xc-hook fs20 red-b"><text>Γ</text></view>
+                    </block>
+                    <block wx:else>
+                        <view class="circle  xc-hooks"></view>
+                    </block>
+                    <view class="fs30">{{express_list.name}}</view>
+
+                </view>
+            </view>
+        </view>
+        <view class="flex click-buttem" >
+            <view class="xc-determine flex-center" bindtap="determine_expres">
+                <view class="flex-vertical  t-c">确定</view>
+            </view>
+            <view class="xc-confirms flex-center" bindtap="select_default_logistics">
+                <view class="flex-vertical  t-c">设为默认</view>
+            </view>
+        </view>
+
+    </view >
+</view>
+
+<warn id="warn"></warn>
diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxss b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxss
new file mode 100644
index 0000000..686099e
--- /dev/null
+++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxss
@@ -0,0 +1,983 @@
+.bdr_t-14 {
+	border-top-left-radius: 14rpx;
+	border-top-right-radius: 14rpx;
+}
+.bdr_b-14 {
+	border-bottom-left-radius: 14rpx;
+	border-bottom-right-radius: 14rpx;
+}
+.bdr14 {
+	border-radius: 14rpx;
+}
+.mgt20 {
+	margin-top: 20rpx;
+}
+.shadow {
+	box-shadow: 0 4rpx 12px #e7e9eb;
+}
+.shadow-1 {
+	box-shadow: 16rpx 0px 12px #e7e9eb;
+}
+
+
+page {
+	/* background-color: #FAFAFA; */
+	background-color: #F0F0F0;
+	padding: 0 22rpx;
+	box-sizing: border-box;
+}
+.container {
+	background-color: #F0F0F0;
+	/* padding-top: 28rpx; */
+	padding-bottom: 120rpx;
+}
+.user-mes {
+    position: relative;
+    background-color: #fff;
+    font-size: 32rpx;
+    color: #444;
+		/* margin-top: 28rpx; */
+		border-radius: 14rpx;
+}
+.user-contact {
+    padding: 24rpx 26rpx;
+    font-weight: 600; 
+}
+ 
+.location {
+    position: relative;
+    padding: 0 70rpx 24rpx;
+}
+
+.pos-icon {
+    position: absolute;
+    left: 28rpx;
+    top: 6rpx;
+    width: 30rpx;
+    height: 36rpx;
+}
+
+.border-img {
+    width: 100%;
+    height: 12rpx;
+}
+
+.update-logistics {
+    position: absolute;
+    right: 0;
+    top: 0;
+    width: 80rpx;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.arrow-rigth {
+    width: 32rpx;
+    height: 32rpx;
+}
+
+.order-meg {
+    margin-bottom: 20rpx;
+    font-size: 28rpx;
+    
+}
+
+.order-detail {
+    padding: 30rpx 0;
+    border-bottom: 2rpx solid #eee;
+    color: #777;
+    min-height: 190rpx;
+    background-color: #fff;
+  
+}
+
+.goods-img {
+    float: left;
+    width: 200rpx;
+    height: 200rpx;
+    margin: 0 20rpx;
+}
+
+.order-cont {
+    float: left;
+    width: 438rpx;
+}
+
+.goods-name {
+    height: 74rpx;
+    line-height: 40rpx;
+    overflow: hidden;
+    margin-bottom: 16rpx;
+    font-size: 28rpx;
+    color: #333;
+
+}
+
+.goods-color {
+    font-size: 24rpx;
+}
+
+.order-num {
+    margin-top: 25rpx;
+    font-size: 24rpx;
+    line-height: 42rpx;
+}
+
+.set-mes{
+	background-color: #fff;
+	/* margin-top: 20rpx; */
+}
+.use-item{
+    display: flex;
+    align-items: center;
+    height: 80rpx;
+    /* border-bottom: 1px solid #ddd; */
+    font-size: 30rpx;
+  /* width:95%;
+margin:auto; */
+	padding: 0 26rpx;
+}
+.use-item>view{
+   display: flex;
+	 /* margin-right: 12rpx; */
+}
+.use-item.bfff{
+	background-color: #fff;
+}
+.use-item .dp{
+	display: block;
+	width: 50rpx;
+	height: 50rpx; 
+	margin-left: -6rpx;
+}
+
+.set-item {
+    justify-content: space-between;
+    background-color: #fff;
+}
+
+.set-btn {
+    display: flex;
+    font-size: 24rpx;
+}
+
+.set-mes input {
+    width: 380rpx;
+    height: 50rpx;
+    line-height: 50rpx;
+    border: 1px solid #ddd;
+}
+
+.use-btn {
+    width: 100rpx;
+    height: 50rpx;
+    margin-left: 20rpx;
+    line-height: 50rpx;
+    text-align: center;
+    background-color: #f23030;
+    color: #fff;
+}
+
+.coupon-mes {
+	/* box-sizing: border-box; */
+    height:95rpx;
+    padding: 0 26rpx;
+    background-color: #fff;
+    font-size: 30rpx;
+    color: #444;
+    /* width: 100%; */
+		border-radius: 14rpx;
+		margin-top: 20rpx;
+		margin-bottom: 20rpx;
+}
+
+.coupon-title {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    height: 92rpx;
+}
+
+.coupon-title>view {
+    display: flex;
+}
+
+.coupon-num {
+    height: 36rpx;
+    margin-left: 20rpx;
+    padding: 0 16rpx;
+    line-height: 36rpx;
+    text-align: center;
+    background-color: #f23030;
+    color: #fff;
+    font-size: 24rpx;
+}
+
+.leave-word {
+    position: relative;
+    font-size: 24rpx;
+    margin-left: 20rpx;
+		flex-grow: 1;
+}
+
+.word-box {
+    font-size: 26rpx;
+    /* width: 600rpx; */
+    padding: 10rpx;
+    height: 28rpx;
+    line-height: 40rpx;
+}
+
+.max-word {
+    position: absolute;
+    right: 0;
+    bottom: 0;
+}
+
+.information {
+    padding: 0 26rpx;
+    background-color: #fff;
+    /* margin-bottom: 120rpx; */
+}
+
+.information .item {
+    display: flex;
+    justify-content: space-between;
+    height: 60rpx;
+    line-height: 60rpx;
+    font-size: 26rpx;
+    color: #777;
+}
+
+.btn-wrap {
+	height: 94rpx;
+	box-sizing: border-box;
+	display: flex;
+	justify-content: space-between;
+	background-color: white;
+	align-items: center;
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	padding: 0 30rpx;
+}
+
+.tips-btn {
+    /* float: right;
+    width: 200rpx;
+    height: 100rpx;
+    line-height: 100rpx;
+    text-align: center;
+    font-size: 30rpx;
+    color: #fff;
+    background-color: #f23030; */
+		color: white;
+		background-color: #FE4445;
+		height: 72rpx;
+		line-height: 72rpx;
+		padding: 0 42rpx;
+		border-radius: 36rpx;
+		margin-left: 0;
+		margin-right: 0;
+}
+
+.pay-amount {
+    /* float: right;
+    display: flex;
+    align-items: center;
+    height: 100rpx;
+    font-size: 26rpx;
+    margin-right: 40rpx; */
+}
+
+.payable {
+    color: #444;
+    /* margin-right: 20rpx; */
+}
+
+.shipping-modal {
+    z-index: 20;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    overflow-y: hidden;
+    color: #666666;
+    background-color: white;
+}
+
+.shipping-nav {
+    text-align: center;
+    font-size: 35rpx;
+    padding-top: 30rpx;
+}
+
+.shipping-list {
+    padding: 20rpx 30rpx 40rpx;
+    font-size: 28rpx;
+}
+
+.shipping-item {
+    display: block;
+    padding: 20rpx 0;
+}
+
+.shipping-btn {
+    width: 100%;
+    color: white;
+    background-color: #f23030;
+    line-height: 90rpx;
+    text-align: center;
+    font-size: 40rpx;
+}
+
+/*----------nyf新增，地址---------*/
+.add_new{
+	height: 90rpx;
+	display: flex;
+	align-items: center;
+	padding: 0 26rpx;
+}
+.addr_jia{width: 45rpx; height: 45rpx; border: 1rpx solid #ddd; 
+   margin-right: 15rpx;vertical-align: middle;}
+.yu_er{
+	margin-left: 10rpx;
+	/* margin-right: 60rpx; */
+}
+.wuliu{margin-left: 20rpx;}
+
+
+/*---- 优惠券列表 -----*/
+.xc-coupon-frame{
+    width: 100%;
+    height: 92rpx;
+  
+}
+.xc-coupon-frame .work-frame{
+    width: 100%;
+    height: 100%;
+    border-bottom:3rpx solid #eee;
+		padding: 0 26rpx;
+		background-color: white;
+}
+.xc-right{
+    width:20rpx;
+    height:20rpx;
+    border-top:2rpx solid #000;
+    border-right:2rpx solid #000;
+    transform:rotate(45deg);
+    display:inline-block;
+}
+
+.xc-coupon-frame .work-frame .work{ font-size: 30rpx; line-height: 92rpx; }
+.xc-right-frame{font-size: 30rpx;line-height: 92rpx; margin-right: 10rpx }
+
+/* 自定义弹出窗口 */
+.cx-popup{
+    width:100%;
+    height:880rpx;
+    background: #fff;
+    z-index: 35;
+    border-top-left-radius: 20rpx;
+    border-top-right-radius: 20rpx;
+    position:fixed;
+    bottom:0;
+		left: 0;
+    /* padding-bottom: 25rpx; */
+}
+
+.cx-popup .top{
+    width:95%;
+    height:100rpx;
+    border-bottom:3rpx solid #ddd;
+    margin: auto;
+ margin-top: 30rpx;
+
+}
+.xc-top-content{
+    width: 93%;
+    height:85rpx;
+    padding-top: 30rpx;
+    font-size: 34rpx;
+    font-weight: 600;
+
+}
+
+
+.xc-valid-coupon{
+    width: 90%;
+    height:40rpx;
+    padding-top: 24rpx;
+    overflow: hidden;
+}
+.xc-frame{
+    width: 100%;
+    height:60%;
+}
+
+.xc-frame .list-frame{
+    width: 95%;
+    height: 100%;
+    overflow-y:scroll;
+
+}
+.xc-close-frame{
+    margin-top:-10rpx;
+ 
+}
+
+.xc-close{
+   width: 37rpx;
+height: 37rpx;
+border-radius: 50%;
+border: 3rpx solid #333;
+text-align: center;
+line-height: 34rpx;
+font-size: 29rpx;
+color: #333;
+
+}
+.xc-money{
+    color: #af2346;
+    font-size: 35rpx;
+}
+
+.xc-money-frame{
+    margin-left:35rpx;
+
+}
+.xc-coupon-effect{
+    width: 99%;
+    min-height: 100rpx;
+    border-bottom:3rpx solid #ddd;
+
+
+}
+.xc-goods-coupon{
+    width: 85%;
+    height:100%;
+
+}
+.xc-title{
+    width:50%;
+    margin-left:222rpx;
+
+}
+.xc-coupon-money0{
+    color: #c91e31;
+    font-size: 35rpx;
+    line-height: 40rpx;
+
+}
+.xc-coupon-money{
+    color: #c91e31;
+    font-size: 35rpx;
+    line-height: 40rpx;
+    padding-top: 10px;
+
+}
+.xc-coupon-money1{
+    color: #444;
+    font-size: 28rpx;
+  line-height: 60rpx;
+
+
+}
+.xc-coupon-time{
+    height: 50rpx;
+    font-size: 27rpx;
+    color: #a4a4a4;
+}
+.xc-coupon-time .time{
+    margin-left: 15rpx;
+    font-size: 27rpx;
+}
+.xc-coupon-selection{
+    height:100%;
+}
+
+.xc-confirm {
+   width: 50%;
+   border-radius: 50rpx;
+   height: 80rpx;
+    margin:0 auto;
+    background:#d60021;
+    color:#fff;
+    font-size:28rpx;
+    margin-top: 28rpx;
+}
+
+.up{ animation: up .7s; }
+.down{ animation: down 1s; }
+@keyframes up { 0% { transform: translateY(550rpx); } 100% { transform: translateY(0); } }
+@keyframes down { 0% { transform: translateY(0); } 100% { transform: translateY(550rpx); } }
+
+.xc-not-Selection{
+   width: 40rpx;
+height: 40rpx;
+    background: #eeeeee;
+}
+
+
+.xc-close-express{
+   width: 40rpx;
+height: 40rpx;
+border-radius: 50%;
+border: 3rpx solid #333;
+text-align: center;
+font-size:32rpx;
+line-height: 38rpx;
+color: #333;
+margin-top: 5rpx;
+}
+.cx-popup .tops{
+  width: 100%;
+height: 145rpx;
+border-bottom: 3rpx solid #eee;
+
+}
+.top-content {
+  width: 82%;
+padding-top: 33px;
+height: 100%;
+padding-left: 40rpx;
+}
+.close-frame{
+  margin-top: 30rpx;
+
+}
+
+.xc-hook {
+width: 33rpx;
+height: 33rpx;
+transform: rotate(-135deg);
+line-height: 35rpx;
+text-align: center;
+margin-right: 20rpx
+
+
+}
+.xc-hooks {
+width: 30rpx;
+height: 30rpx;
+border: 1rpx solid #999;
+margin-right: 20rpx;
+}
+.express_list_frame{
+  display: flex;
+height: 80rpx;
+align-items: center;
+padding-left: 40rpx;
+border-bottom: 1rpx solid #eee;
+
+}
+.express_list{
+  width: 100%;
+  height: 65%;
+  overflow-y: auto;
+  margin-bottom: 40rpx;
+  
+}
+.xc-confirms {
+	box-sizing: border-box;
+  width: 40%;
+  border-radius: 50rpx;
+  height: 80rpx;
+  margin:0 auto;
+  font-size:28rpx;
+  background: #fff;
+  color: #333;
+  border: 2rpx solid #333;
+}
+
+
+/* 优惠券的改版样式 */
+.xc-coupon-frame{
+  /* width: 710rpx; */
+	width: 100%;
+  height:auto; 
+  margin: 0 auto;
+
+}
+.xc-coupon-frame .coupon-frame{
+  width: 100%;
+  height: 200rpx;
+  margin-top:10rpx;
+  border-bottom: 1rpx solid #eee;
+
+}
+.xc-coupon-frame .coupon-frame .coupon-left{
+  width: 215rpx;
+  height:100%;
+  overflow: hidden;
+}
+.xc-money-frames{
+    width:96%;
+    margin-top: -10px;
+}
+
+.xc-rmb-symbol{
+  font-size:40rpx;
+
+}
+
+.xc-rmb-val{
+ font-size:60rpx;
+ 
+}
+.coupon-explain{
+ font-size:25rpx;
+width:100%;
+
+
+}
+.xc-valuer{
+    margin-top:39rpx;
+    margin-left:28rpx;
+   font-size:25rpx;
+}
+.coupon-frame .oval{
+   width:155rpx;
+   height:83rpx;
+   border-radius: 50%;
+   right:-78rpx;
+   top:-37rpx;
+} 
+.coupon-right{
+  /* width:490rpx; */
+  height: 99%;
+  border-top: 1rpx solid #eaeaea;
+  /* //border-bottom: 1rpx solid #eaeaea; */
+  border-right: 1rpx solid #eaeaea;
+	flex-grow: 1;
+}
+.coupon-annotation{
+  width: 95%;
+  height: 100%;
+  
+}
+.xc-brand{
+  width:100rpx;
+  height:35rpx; 
+  line-height: 35rpx;
+  font-size:21rpx;
+  border-radius:10rpx; position: relative; top:-1px;
+  margin-right: 8rpx
+}
+.top-frame{
+  width:82%;
+  height: 75rpx;
+  margin-top:10rpx;
+}
+.top-frame .coupon-wode{
+  font-size: 25rpx;
+  margin-left:10rpx;
+  width:340rpx;
+  height:88rpx;  
+}
+.coupon-code{
+ width:60rpx;
+ height:60rpx;
+ margin-top:5rpx;
+
+}
+.frame{
+  width: 100%
+}
+.coupon-time{
+  font-size: 23rpx;
+  line-height:33rpx;
+  color: #333;
+}
+
+.clik-get{
+ width:125rpx;
+ height:45rpx;
+  border-radius: 25rpx;
+  line-height: 45rpx;
+  font-size:25rpx;
+  bottom:67rpx;
+  right:6px;
+}
+
+.code-img{
+  margin-left:20rpx;
+}
+.bottmo-explain{
+top:145rpx;
+width:94%;
+border-top:1rpx dashed #eee;
+padding-top:8rpx;
+height:38rpx;
+line-height: 51rpx;
+
+}
+.font-word{
+  font-size: 22rpx;
+}
+.circle-size{
+  background: #a0a0a0;
+  width: 27rpx;
+  height: 27rpx;
+  margin-top:13rpx;
+margin-left:8rpx;
+display: flex;
+
+align-items: center;
+}
+.xc-jiantou{
+      /* width: 9rpx;
+      height: 9rpx; */
+      /* border-top: 2rpx solid #fff;
+      border-right: 2rpx solid #fff; */
+      transform: rotate(-90deg);
+      color: #fff;
+      font-size: 15rpx;
+      /* display:inline-block;
+      margin-top: 6.5rpx; */
+      text-align: center;
+width: 24rpx;
+}
+.xc-buttom{
+	box-sizing: border-box;
+	width:100%;
+	min-height:76rpx;
+	height:auto;
+	line-height:40rpx;
+	border-left:1rpx solid #eee;
+	border-right:1rpx solid #eee;
+	border-bottom:1rpx solid #eee;
+/* margin-left: 6rpx; */
+}
+
+.goods-num{
+  font-size: 28rpx;
+  color: #333;
+}
+
+.explain-coupon{
+  font-size:25rpx;
+  padding: 10rpx 10rpx
+}
+.circle-frame{ 
+  width: 20rpx;
+  height: auto;
+  z-index:1;
+  left:210rpx;
+  
+}
+.circle-sawtooth{
+  width: 11rpx;
+  height: 11rpx;
+  background: #fff;
+}
+
+.red{background-color: #fe7496;}
+.green{ background-color: #22c7c1;}
+.blue{background-color:#5e82e3;}
+.g_gray{background-color: #aaaaaa}
+
+.f_text{text-align: center; height:96rpx; }
+.xc-hook.sn {
+  margin-top:12%;
+width:45rpx;
+height:45rpx;
+font-size:28rpx;
+line-height:44rpx;
+
+
+}
+.xc-hooks.on{
+  margin-top:12%;
+width:42rpx;
+height:42rpx;
+}
+.may_use_coupon{
+  /* width: 95%; */
+  /* height: 68rpx; */
+  line-height:78rpx;
+	padding: 0 26rpx;
+	justify-content: space-between;
+	align-items: center;
+}
+.determine-frame{
+  width: 100%;
+  height: 130rpx;
+  
+}
+.xc-determine{
+  height: 80rpx;
+  width: 40%;
+  border-radius: 50rpx;
+background: #d60021;
+color: #fff;
+font-size: 28rpx;
+margin: 0 auto;
+
+}
+.click-buttem{
+width: 90%;
+margin: auto;
+}
+.logistics-name{
+  margin-right:20rpx;
+}
+.xc-border{
+  border-top:8rpx solid #eee;
+width: 100%
+}
+.main-top{
+margin-top: 20rpx;
+
+}
+.xc-hookts{
+border: 1rpx solid #999;
+
+}
+.xc-hookts.on{
+  width:30rpx;
+height:30rpx;
+
+}
+.xc-hookt.sn{
+  width: 32rpx;
+height: 32rpx;
+font-size: 28rpx;
+line-height: 34rpx;
+}
+.xc-hookt{
+  transform: rotate(-135deg);
+text-align: center;
+
+}
+.main-bottom{
+  margin-bottom: 20rpx;
+
+}
+.xc-hookst{
+  border: 1rpx solid #999;
+
+}
+.xc-hookst.ons{
+  width: 42rpx;
+height: 42rpx;
+margin-left: 20rpx;
+
+}
+.is_use_coupon{
+  width: 65%;
+justify-content: flex-end;
+padding-top: 10rpx;
+
+
+}
+.xc-hooka{
+  transform: rotate(-135deg);
+text-align: center;
+
+} 
+.xc-hooka.sn{
+  width: 45rpx;
+height: 45rpx;
+font-size: 28rpx;
+line-height: 44rpx;
+margin-left: 20rpx;
+
+}
+.color-gray{
+  color: #808080;
+}
+.n_guige{ display: inline-block; background:rgb(236, 236, 236); color: rgb(63,63,63); padding: 3rpx 10rpx; border-radius: 3rpx }
+.gift_image{ width: 60rpx; height: 60rpx; position: absolute; top: 0; left: 0}
+
+.quan_num_show{ padding: 4rpx 6rpx; background-color:#ea5551; color:#fff; border-radius: 6rpx;margin-left:10rpx;font-size:24rpx;}
+
+.navigator-hover {
+	background: none;
+	opacity: 1;
+}
+
+.plus_buy{
+	background-color: #fff;
+	margin:15rpx 0;
+	padding: 20rpx 10rpx;
+	position: relative;
+}
+
+
+.card_bg {
+  box-sizing: border-box;
+  padding: 2rpx 10rpx;
+  height: 28rpx;
+  border-radius: 26rpx;
+  font-size: 18rpx;
+  line-height: 28rpx;
+	max-width: 210rpx;
+  background: #333;
+  color: #fff;
+  margin-left: 8rpx;
+  position:relative;
+  top:7rpx;
+}
+
+.card_bg image {
+  width: 19rpx;
+  height: 19rpx;
+  margin-right: 8rpx;
+}
+
+/* .card_bg .card_name {
+  max-width: 76rpx;
+  width: auto;
+  overflow: hidden;
+  white-space: nowrap;
+} */
+
+.card_name {
+	position: relative;
+	top: -4rpx;
+	margin-left: 6px;
+}
+
+.car_tri_up {
+    width: 0;height: 0;
+    border-left: 20rpx solid transparent;
+    border-right: 20rpx solid transparent;
+    border-bottom: 20rpx solid #fff;
+    position: absolute;
+    right: 20rpx;
+    top:-10rpx
+}
+.card_op{
+  position: absolute;
+  right: 20rpx;
+  top:36rpx
+}
+
+
+.tab-container {
+	font-size: 28rpx;
+	margin-top: 20rpx;
+	display: flex;
+}
+
+.tab-wrapper {
+	background-color: #ccc;
+	display: flex;
+	border-radius: 40rpx;
+	overflow: hidden;
+}
+
+.tab {
+	padding: 20rpx 30rpx;
+	
+}
+
+
+.tab.active {
+	background-color: white;
+	border-radius: 40rpx;
+}
diff --git a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js
index 1ee2e18..d668d04 100644
--- a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js
+++ b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js
@@ -343,9 +343,9 @@ Page({
 
     wx.hideLoading();
 
-    wx.setNavigationBarTitle({
-      title: "拼团详情",
-    });
+    // wx.setNavigationBarTitle({
+    //   title: "拼团详情",
+    // });
   
     // ee.countDown2();
 
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml
index 80bc77c..c283a6e 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml
@@ -195,7 +195,7 @@
 		  								  <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>	
 		  							 </block>
 		  							 <block wx:else>								 
-		  								 <view bindtap="addCart" class="spec-cart-btn spec-buy" data-action="buy">立即购买</view> 
+		  								 <view bindtap="addCart_pt" class="spec-cart-btn spec-buy" data-action="buy">立即购买</view> 
 		  							 </block>
 		  						 					 
 		  					 </block>									 
@@ -212,7 +212,7 @@
 		  	  <view class="spec-cart-btn spec-buy w100"  style="background-color: #dcdcdc;color: #999;">配送不匹配</view>		   
 		  </block>		 
 		  <block wx:else>
-		      <view bindtap="addCart" class="spec-cart-btn spec-buy w100" data-action="buy">确定</view>
+		      <view bindtap="addCart_pt" class="spec-cart-btn spec-buy w100" data-action="buy">确定</view>
 		  </block> 
 	  </block>
 		
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
index c8b4439..8a4c614 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
@@ -303,7 +303,7 @@ Page({
 					prom_id,
 				});
       }
-			console.log('type********>>',this.data.prom_type);
+			// console.log('type********>>',this.data.prom_type);
     //-- 自定义海报 --
     // getApp().request.promiseGet("/api/weshop/goods/poster/page", {
     //   data: { store_id: os.stoid, type: 1, is_use: 1 }
@@ -448,7 +448,6 @@ Page({
             var user = getApp().globalData.userInfo;
             if (!user) return false;
             clearInterval(ti);
-
             if (user.card_field && user['card_expiredate']) {
               var str = user['card_expiredate'].replace(/-/g, '/');
               var end = new Date(str);
@@ -1198,18 +1197,20 @@ Page({
       open_ind_store: ind
     });
     //如果是秒杀的话，要看redis够不够
-    if (this.data.prom_type == 1) {
-      this.getactLen(function (num) {
-        if (num < th.data.goodsInputNum) {
-          getApp().my_warnning("秒杀库存不足!", 0, th);
-          return false;
-        } else {
-          th.add_cart_func(t);
-        }
-      });
-    } else {
-      th.add_cart_func(t);
-    }
+    // if (this.data.prom_type == 1) {
+    //   this.getactLen(function (num) {
+    //     if (num < th.data.goodsInputNum) {
+    //       getApp().my_warnning("秒杀库存不足!", 0, th);
+    //       return false;
+    //     } else {
+    //       th.add_cart_func(t);
+    //     }
+    //   });
+    // } else {
+    //   th.add_cart_func(t);
+    // }
+		
+		th.add_cart_func(t);
   },
 
 
@@ -1662,13 +1663,13 @@ Page({
           switch (condition_t) {
             case 0: //按钱
               if (newd.goods_price >= condition_t) {
-                newd.prom_type = 3;
+                newd.prom_type = 9;
                 newd.prom_id = prom_d[i].prom_id;
               }
               break
             case 1://按购买数量
               if (newd.goods_num >= condition_t) {
-                newd.prom_type = 3;
+                newd.prom_type = 9;
                 newd.prom_id = prom_d[i].prom_id;
               }
               break;
@@ -1707,6 +1708,7 @@ Page({
     // this.data.shippingCost < 0 || this.data.select.stock <= 0 || (Object.assign(e, {
     //     action: "buy_now"
     // }),
+		var th = this;
     this.setData({
       openSpecModal: 0,
       openSpecModal_inte: 0,
@@ -1714,34 +1716,42 @@ Page({
       openSpecModal_pt: 0,
     })
 
-    if (e.prom_type == 9) {
-      s.set_b_now(e);
-      var url = "/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart?is_bnow=1&goods_id=" + e.goods_id;
-      getApp().goto(url);
-    } else {
+   //  if (e.prom_type == 9) {
+   //    s.set_b_now(e);
+			// // var url = '';
+   //    var url = "/pages/cart/cart2/cart2?is_bnow=1&goods_id=" + e.goods_id;
+   //    getApp().goto(url);
+   //  } else 
+	 
+		// if(e.prom_type == 9){
+			if(true){
       //要判断积分购的普通购买有没有参加优惠活动
-      if (e.is_integral_normal == 1) {
+      if (e.is_normal == 1) {
         this.check_nor_promgood(e.goods_id, function (res) {
           if (res && res.cat_id) {
-            e.prom_type = 3;
-            e.prom_id = res.cat_id
+            e.prom_type = 0;
+            e.prom_id = res.cat_id;
           }
           s.set_b_now(e);
           /*--
           wx.redirectTo({
             url: "/pages/cart/cart2/cart2?is_bnow=1&goods_id=" + e.goods_id,
           });--*/
-          getApp().goto("/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart?is_bnow=1&goods_id=" + e.goods_id)
+					
+					console.log('11111111111111111111111111======》');
+          getApp().goto("/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart?is_bnow=1&goods_id=" + e.goods_id);
+					// getApp().goto("/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart?is_bnow=1&group_id=" + th.data.group_id +"&goods_id=" + e.goods_id + "&alert=" + th.data.luckGoInfo.lc_alert);
 
         })
       } else {
-				// console.log('xxxxxxxxxxxxx======》', this.data.prom_id);
-        s.set_b_now(e);
+				//console.log('222222222222222222222222222222======》');
+        //s.set_b_now(e);
         /*--
         wx.redirectTo({
           url: "/pages/cart/cart2/cart2?is_bnow=1&goods_id=" + e.goods_id,
         });--*/
-        getApp().goto("/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart?is_bnow=1&group_id=" + this.data.group_id +"&goods_id=" + e.goods_id + "&alert=" + this.data.luckGoInfo.lc_alert);
+				//getApp().goto("/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct?is_bnow=1&goods_id=" + e.goods_id)
+        // getApp().goto("/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct?is_bnow=1&group_id=" + this.data.group_id +"&goods_id=" + e.goods_id + "&alert=" + this.data.luckGoInfo.lc_alert);
       }
 
     }
@@ -3756,6 +3766,9 @@ Page({
 
     var th = this;
     var ind = parseInt(e.currentTarget.dataset.ind);
+		
+		console.log('当前ind========>>>>', ind);
+		
     //ind == 1是普通购买
     if (ind == 1) {
       //如果拼单的sku data是空的，就要先获取一下
@@ -3845,18 +3858,17 @@ Page({
 
   //-----------------拼单生成方法---------------------
   addCart_pt: function () {
-    var th = this;
     if (this.data.is_normal == 0) {
       //看一下有没有起购数，如果有起购数，要计算起购数
-      var qnum = parseFloat(th.data.prom_act.minbuynum);
-      if (qnum > 0 && th.data.goodsInputNum < qnum) {
-        getApp().confirmBox("拼团商品至少要买" + qnum + "件!");
-        return false;
-      }
+      // var qnum = parseFloat(th.data.prom_act.minbuynum);
+      // if (qnum > 0 && th.data.goodsInputNum < qnum) {
+      //   getApp().confirmBox("拼团商品至少要买" + qnum + "件!");
+      //   return false;
+      // }
 
-      th.addcart_pt_func();
+      this.addcart_pt_func();
     } else {
-      th.addcart_pt_func();
+      this.addcart_pt_func();
     }
   },
 
@@ -3868,73 +3880,75 @@ Page({
     var e = this,
       th = e,
       o = this.data.sele_g;
-    if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th);
+    // if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th);
 
     //----------添加到购物车时，要判断限购数量，--------
     e.get_buy_num(o, async 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: '超出商品限购'
-          });
-
-          var num = th.data.prom_buy_limit - th.data.prom_buy_num;
-          if (num < 0) num = 0;
-          th.setData({ goodsInputNum: num })
-          return false;
-        }
-      }
+      // 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: '超出商品限购'
+      //     });
+
+      //     var num = th.data.prom_buy_limit - th.data.prom_buy_num;
+      //     if (num < 0) num = 0;
+      //     th.setData({ goodsInputNum: num })
+      //     return false;
+      //   }
+      // }
+			
       //---判断商品是否超出活动限购,拼团的普通购买不计算活动的限购---
-      if (th.data.prom_buy_num != -1 && th.data.prom_buy_limit > 0 && th.data.is_normal != 1) {
-        if (th.data.goodsInputNum + th.data.prom_buy_num > th.data.prom_buy_limit) {
-          wx.showModal({
-            title: '提示',
-            content: '超出商品活动限购'
-          });
-
-          var num = th.data.prom_buy_limit - th.data.prom_buy_num;
-          if (num < 0) num = 0;
-          th.setData({ goodsInputNum: num })
-          return false;
-        }
-      }
+      // if (th.data.prom_buy_num != -1 && th.data.prom_buy_limit > 0 && th.data.is_normal != 1) {
+      //   if (th.data.goodsInputNum + th.data.prom_buy_num > th.data.prom_buy_limit) {
+      //     wx.showModal({
+      //       title: '提示',
+      //       content: '超出商品活动限购'
+      //     });
+
+      //     var num = th.data.prom_buy_limit - th.data.prom_buy_num;
+      //     if (num < 0) num = 0;
+      //     th.setData({ goodsInputNum: num })
+      //     return false;
+      //   }
+      // }
 
       var redis_num = 0
       //不是普通购买的时候
-      if (th.data.is_normal != 1) {
-        //-------判断活动是否抢光---------
-        await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/6/" + th.data.sele_g.prom_id, {
-          1: 1
-        }).then(res => {
-          redis_num = res.data.data;
-        })
-
-        if (th.data.goodsInputNum > redis_num) {
-          wx.showModal({
-            title: '提示',
-            content: '超出商品活动库存'
-          });
+      // if (th.data.is_normal != 1) {
+      //   //-------判断活动是否抢光---------
+      //   await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/6/" + th.data.sele_g.prom_id, {
+      //     1: 1
+      //   }).then(res => {
+      //     redis_num = res.data.data;
+      //   })
+
+      //   if (th.data.goodsInputNum > redis_num) {
+      //     wx.showModal({
+      //       title: '提示',
+      //       content: '超出商品活动库存'
+      //     });
+
+      //     th.setData({ goodsInputNum: redis_num })
+
+      //     return false;
+      //   }
+      // }
 
-          th.setData({ goodsInputNum: redis_num })
-
-          return false;
-        }
-      }
-
-      if (th.data.goodsInputNum <= 0) return s.my_warnning("商品数量不能为0", 0, th);
-      if (th.data.goodsInputNum > o.store_count) {
-        th.setData({ goodsInputNum: o.store_count })
-        return s.my_warnning("超出商品库存", 0, th);
-      }
+      // if (th.data.goodsInputNum <= 0) return s.my_warnning("商品数量不能为0", 0, th);
+      // if (th.data.goodsInputNum > o.store_count) {
+      //   th.setData({ goodsInputNum: o.store_count })
+      //   return s.my_warnning("超出商品库存", 0, th);
+      // }
 
       if (th.data.sto_sele_name == null || th.data.sto_sele_name == undefined)
         this.setData({
           sto_sele_name: ""
         });
       if (th.data.sto_sele_name == "") return s.my_warnning("请选择门店", 0, th);
+			
       //--------------此时操作的数据------------
       var newd = {
         goods_id: o.goods_id,
@@ -4006,10 +4020,12 @@ Page({
           th.data.sto_sele_distr = 1;
         }
 
-      } else if (th.data.prom_type == 3) {
-        newd.prom_type = 0;
-        newd.prom_id = 0;
       }
+			 
+			// else if (th.data.prom_type == 3) {
+   //      newd.prom_type = 0;
+   //      newd.prom_id = 0;
+   //    }
 
       newd['pick_name'] = th.data.sto_sele_name;
       newd['pick_dis'] = th.data.sto_sele_distr;
@@ -4020,21 +4036,27 @@ Page({
         //判断一下有没有全局优惠活动
         th.check_nor_promgood(newd.goods_id, function (e) {
           if (e && e.act_id) {
-            newd['prom_type'] = 3;
+            newd['prom_type'] = 0;
             newd['prom_id'] = e.act_id;
           }
-          th.buyNow(newd)
-        })
+					console.log('aaaaa');
+          th.buyNow(newd);
+        });
       }
-      else th.buyNow_pt(newd);
+      else {
+				console.log('bbbb');
+				th.buyNow_pt(newd);
+			};
     })
   },
   //----------立即购买_pt-----------
   buyNow_pt: function (e) {
     s.set_b_now(e);
     wx.navigateTo({
-      url: "/packageC/pages/luckyGo_cart/luckyGo_cart/luckyGo_cart?is_bnow=1&goods_id=" + e.goods_id,
+      url: "/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct?is_bnow=1&group_id=" + this.data.group_id +"&goods_id=" + e.goods_id + "&alert=" + this.data.luckGoInfo.lc_alert + '&goods_price=' + this.data.luckGoInfo.group_price/100,
     });
+		
+		// getApp().goto("/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart?is_bnow=1&group_id=" + th.data.group_id +"&goods_id=" + e.goods_id + "&alert=" + th.data.luckGoInfo.lc_alert);
   },
 
   //-------跳转pt商品-------
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
index acd66d0..fa99c85 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
@@ -5,7 +5,7 @@
 
 
 <!-- 商品内容区域,普通商品,秒杀,拼团 -->
-<block>
+<block wx:if="{{isshow}}">
   <view class="container">
 		<!-- 幸运购规则 -->
 		<view class="rules" bindtap="showRules">规则</view>
@@ -71,7 +71,35 @@
             </block>
           </view>
         </view>
-        <!-- --显示秒杀价,团购，积分购-- -->
+				
+				<!-- --显示秒杀价 -->
+				<view class="prom_show rel" wx:if="{{prom_type==1}}">
+				  <image class="secondkill-img" src='{{prom_st==1? iurl+"/miniapp/images/red_jx.png":iurl+"/miniapp/images/blue_ks.png"}}'></image>
+				  <image class="abs spike-img" src="{{iurl}}/miniapp/images/xsmiaosha.png"></image>
+				  <view class="stop fs26 abs" wx:if="{{prom_st==1}}">距活动结束还有</view>
+				  <view class="start fs26  abs" wx:if="{{prom_st==2}}">距活动开始还有</view>
+				  <view class="secview  flex abs fs24 xc-miaosha-time">
+				    <block wx:if="djs.day">
+				      <view class='day-val' style="color:{{prom_st==1?'#d40022':'#0097e0'}}">
+				        {{djs.day}}
+				      </view>
+				      <view class="day white" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">天</view>
+				    </block>
+				    <view class='time-val white t-c' style=" background:{{prom_st==1?'#d40022':'#0097e0'}}">
+				      {{djs.hou}}
+				    </view>
+				    <view class="time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">时</view>
+				    <view class='time-val white t-c' style=" background:{{prom_st==1?'#d40022':'#0097e0'}}">
+				      {{djs.min}}
+				    </view>
+				    <view class="time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">分</view>
+				    <view class='time-val white t-c' style=";background:{{prom_st==1?'#d40022':'#0097e0'}}">
+				      {{djs.sec}}
+				    </view>
+				    <view class="time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">秒</view>
+				  </view>
+				</view>
+
 
 
         <!-- --拼单-- -->
@@ -82,22 +110,15 @@
             <view class="abs xc-qt-price">
               <view class="flex" style='height:40rpx; margin-top:5rpx'>
                 <view class="flex fs35 xc-qtsign">￥</view>
-                <view class="fs50 val">{{filters.toFix(data.shop_price,2)}}</view>
+                <!-- <view class="fs50 val">{{filters.toFix(data.shop_price,2)}}</view> -->
+								<view class="fs50 val">{{filters.toFix(luckGoInfo.group_price/100,2)}}</view>
               </view>
               <view class="word-line fs20 xc-qtunit-price">
-                零售价￥{{filters.toFix(data.market_price,2)}}
+                手店价￥{{filters.toFix(data.shop_price,2)}}
               </view>
             </view>
 						
-            <!-- <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">
-                  <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="abs white xc-nanber">
@@ -883,13 +904,13 @@
       <!-- 线上销售的时候，要判断库存量，  线下库存的时候不用判断 -->
       <block wx:if="{{(sele_g.store_count>0 && sales_rules==1) || sales_rules==2 }}">
 			<view class="btn-container f1">
-				<view bindtap="openSpecModel_pt" data-ind="1" class="btn-yellow flex f1 fdc jc-center">
-					<view class="lh1"><text class="rmb lh1">{{filters.toFix(data.market_price,2)}}</text></view>
+				<view bindtap="openSpecModel_pt" data-ind="1" data-it="1" class="btn-yellow flex f1 fdc jc-center">
+					<view class="lh1"><text class="rmb lh1">{{filters.toFix(data.shop_price,2)}}</text></view>
 					<view class="lh1 fs pdt4">单独购买</view>
 				</view>
 				<!-- data-ind="2" -->
 				<!-- openSpecModel_pt -->
-				<view class="btn-red f1 flex ai-center jc-center" bindtap="openSpecModel_pt" data-openSpecModal_ind="{{openSpecModal_ind}}" data-action="buy" data-ind="0">立即参团</view>
+				<view class="btn-red f1 flex ai-center jc-center" bindtap="openSpecModel_pt"data-it="0">立即参团</view>
 				<!-- <view class="btn-red f1 flex ai-center jc-center" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" data-action="buy">立即参团</view> -->
 			</view>
         <!-- <view bindtap="openSpecModel" data-ind="1" class="btn-buy flex fdc jc-center">
@@ -919,27 +940,26 @@
       </block>
     </block> -->
     <!-- -----拼单------ -->
-    <block wx:if="{{prom_type == 6}}">
+    <!-- <block wx:if="{{prom_type == 6}}">
       <view bindtap="openSpecModel_pt" data-it="1" data-ind="1" class="join-btn cart-btn line-h">
         <view class="fir-v">
-          <!-- ￥{{data.shop_price,2)}} -->
           <block wx:if="{{card_field && sele_g[card_field]>0}}">
             {{filters.toFix(sele_g[card_field],2)}}
           </block>
           <block wx:else>{{filters.toFix(sele_g.shop_price,2)}}</block>
         </view>
         <view>单独购买</view>
-      </view>
-      <block wx:if="{{user_order_pt_state==0}}">
+      </view> -->
+      <!-- <block wx:if="{{user_order_pt_state==0}}"> -->
         <!-- --商家团-- -->
-        <view bindtap="openSpecModel_pt" data-it="0" wx:if="{{prom_st==1 && !prom_r_null && prom_act.kttype==1}}" class="buy-btn cart-btn line-h">
+        <!-- <view bindtap="openSpecModel_pt" data-it="0" wx:if="{{prom_st==1 && !prom_r_null && prom_act.kttype==1}}" class="buy-btn cart-btn line-h">
           <view class="fir-v">￥{{prom_act.price}}</view>
           <view>去参团</view>
-        </view>
+        </view> -->
         <!-- --会员团-- -->
-        <view bindtap="openSpecModel_pt" data-it="0" wx:if="{{prom_st==1 && !prom_r_null && prom_act.kttype==2}}" class="buy-btn cart-btn line-h">
+        <!-- <view bindtap="openSpecModel_pt" data-it="0" wx:if="{{prom_st==1 && !prom_r_null && prom_act.kttype==2}}" class="buy-btn cart-btn line-h"> -->
           <!-- <view class="fir-v">￥{{prom_act.price}}</view> -->
-          <view class="pd_top1" wx:if="{{prom_act.tz_yhjgtype>1}}">
+          <!-- <view class="pd_top1" wx:if="{{prom_act.tz_yhjgtype>1}}">
             <view>一键开团</view>
             <view wx:if="{{prom_act.tz_yhjgtype==3}}">
               佣金
@@ -952,17 +972,17 @@
             <view class="fir-v">￥{{ filters.toFix(prom_act.price,2)}}</view>
             <view>一键开团</view>
           </view>
-        </view>
+        </view> -->
         <!-- -阶梯团-- -->
-        <view bindtap="openSpecModel_pt" data-it="0" wx:if="{{prom_st==1 && !prom_r_null && prom_act.kttype==3 && user_order_pt_state!=3 }}" class="buy-btn cart-btn line-h">
+        <!-- <view bindtap="openSpecModel_pt" data-it="0" wx:if="{{prom_st==1 && !prom_r_null && prom_act.kttype==3 && user_order_pt_state!=3 }}" class="buy-btn cart-btn line-h">
           <view class="fir-v">￥{{filters.toFix(prom_act.yf_price,2)}}</view>
           <view>支付定金</view>
         </view>
         <view wx:if="{{prom_st==0}}" class="buy-btn cart-btn lanse">即将开始</view>
         <view wx:if="{{prom_r_null}}" class="buy-btn cart-btn huise">已抢光</view>
-        <view wx:if="{{prom_st==3 && !prom_r_null}}" class="buy-btn cart-btn lanse">活动已经结束</view>
-      </block>
-      <block wx:else>
+        <view wx:if="{{prom_st==3 && !prom_r_null}}" class="buy-btn cart-btn lanse">活动已经结束</view> -->
+      <!-- </block> -->
+      <!-- <block wx:else>
         <view bindtap="go_to_nopay" wx:if="{{user_order_pt_state==1}}" class="buy-btn cart-btn huise">
           您还未支付
         </view>
@@ -972,10 +992,10 @@
         <view wx:if="{{user_order_pt_state==3}}" bindtap="go_pay_wk" class="buy-btn cart-btn">
           支付尾款
         </view>
-      </block>
-    </block>
+      </block> -->
+    <!-- </block> -->
     <!-- -----积分购------ -->
-    <block wx:if="{{prom_type == 4}}">
+    <!-- <block wx:if="{{prom_type == 4}}">
       <block wx:if="{{is_shopbuy}}">
         <view bindtap="go_pay_integral_normal" class="join-btn cart-btn line-h">
           <view class="fir-v">
@@ -999,7 +1019,7 @@
           积分不足
         </view>
       </block>
-    </block>
+    </block> -->
     <!-- -<view bindtap="openSpecModel" class="buy-btn cart-btn cart-btn-lg" wx:else>立即兑换</view> -->
   </view>
   <!-- 制作一个圆球导航 -->
diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js
index 56341a8..680b6cf 100644
--- a/pages/cart/cart2_pt/cart2_pt.js
+++ b/pages/cart/cart2_pt/cart2_pt.js
@@ -793,7 +793,7 @@ Page({
     item=item.config;
 	if (item == null) return o_shipping_price;
     //------按重量----------
-    if (goods_weight>0) {
+    if (goods_weight>=0) {
         fw_price =parseFloat(item['money']);
          if (goods_weight > item['first_weight']){
             var fw = goods_weight - item['first_weight'];
diff --git a/pages/giftpack/buygiftpack/giftpackbuy.js b/pages/giftpack/buygiftpack/giftpackbuy.js
index 2e90b3a..e223d8f 100644
--- a/pages/giftpack/buygiftpack/giftpackbuy.js
+++ b/pages/giftpack/buygiftpack/giftpackbuy.js
@@ -25,7 +25,8 @@ Page({
     curpage: 1, //当前分页数
     pageSize: 10, //页大小
     total: 0, //总数量
-	ad_data:null,
+    ad_data:null,
+    first_leader: e.globalData.first_leader || 0, // 推荐人ID
   },
   onLoad: function(options) {
 
@@ -91,7 +92,8 @@ Page({
           "giftBagId": id, //礼包Id
           "storeId": that.getStorageID, //商家Id
           "userId": that.getUserID, //用户ID
-          "buyFrom": 2
+          "buyFrom": 2,
+          "first_leader": that.first_leader
         };
 		
 		//-- 分享导购要记录 --
@@ -141,11 +143,13 @@ Page({
 
 
   },
+  // 积分兑换
   GetBuyIntegral: function(e) {
     var that = this.data;
     var th = this;
     var id = e.currentTarget.dataset.id; //活动id
     var my_confirm = th.selectComponent("#my_confirm"); //组件的id
+    
     my_confirm.open(
       "是否确定兑换该礼包",
       "取消",
@@ -162,9 +166,11 @@ Page({
           "giftBagId": id, //礼包Id
           "storeId": that.getStorageID, //商家Id
           "userId": that.getUserID, //用户ID
-          "buyFrom": 2
+          "buyFrom": 2,
+          "first_leader": that.first_leader
         };
-		
+    
+        
 		//-- 分享导购要记录 --
 		if(getApp().globalData.guide_id){
 			json.guide_id=getApp().globalData.guide_id;
@@ -309,7 +315,8 @@ Page({
 	    path:pagePath,
 	  }
 	},
-	
+
+  // 分享朋友圈
 		onShareTimeline() {
 			var curPage=this;
 			var pagePath = curPage.route; //当前页面url
diff --git a/pages/user/index/index.js b/pages/user/index/index.js
index 7b79d40..f16b45b 100644
--- a/pages/user/index/index.js
+++ b/pages/user/index/index.js
@@ -652,7 +652,8 @@ Page({
         getApp().goto("/pages/user/user_fw/user_fw?gradeId=" + th.data.gradeId + "&FormId=" + item.Id);
         break;
       case "03":
-        getApp().goto("/pages/user/user_spsy/user_spsy");
+        getApp().goto("/pages/user/user_spsy/user_spsy?img=" +
+        url + "&gradeId=" + th.data.gradeId + "&FormId=" + item.Id);
         break;
       case "10":
         getApp().request.get("/api/weshop/users/grade/vipprivilegelist/other/get", {
diff --git a/pages/user/plus/plus.js b/pages/user/plus/plus.js
index 92502be..48eff7b 100644
--- a/pages/user/plus/plus.js
+++ b/pages/user/plus/plus.js
@@ -1,12 +1,13 @@
 var t = getApp(),
   a = t.request,
-  o = t.globalData.setting, 
+  o = t.globalData.setting,
   os = o,
   i = require("../../../utils/util.js"),
   ut = i,
   s = require("../../../utils/common.js"),
-  w = require("../../../utils/wxParse/wxParse.js"),t_pay = require("../../../utils/pay2.js");
-  var regeneratorRuntime = require('../../../utils/runtime.js');
+  w = require("../../../utils/wxParse/wxParse.js"),
+  t_pay = require("../../../utils/pay2.js");
+var regeneratorRuntime = require('../../../utils/runtime.js');
 
 Page({
   /**
@@ -19,24 +20,24 @@ Page({
     screenheight: 0,
     canvasHidden: true,
     shareImgPath: null,
-    is_plusCard: "",//卡的列表
+    is_plusCard: "", //卡的列表
     imagePath: "",
-    is_pulscardname: "",//plus会员的名字
-    is_card: 0,//用于判断是否是续费页和购买页面 0不是PLUS会员
-    content: "",//等级卡规则
-    is_card_rule: "",//等级卡规则判断用
-    is_show: 0,       //页面要加载完才能显示
-    open_yq: 0,       //显示打开邀请码的弹窗
-    by_index:null,    //购买卡的下班
+    is_pulscardname: "", //plus会员的名字
+    is_card: 0, //用于判断是否是续费页和购买页面 0不是PLUS会员
+    content: "", //等级卡规则
+    is_card_rule: "", //等级卡规则判断用
+    is_show: 0, //页面要加载完才能显示
+    open_yq: 0, //显示打开邀请码的弹窗
+    by_index: null, //购买卡的下班
 
-    isyaoqingma:0,   //是否邀请码
-    is_salesman:0,   //是否营业员
-    inp_recommon: null,   //输入的邀请码
+    isyaoqingma: 0, //是否邀请码
+    is_salesman: 0, //是否营业员
+    inp_recommon: null, //输入的邀请码
     inp_serviceman: null, //输入的营业员
-    is_fengxiang: 0,      //是不是分享过来的
-    def_recommon: null,    //分享人的手机号
-    def_serviceman: null,  //分享人的营业员
-  	fir_leader:0,          //分享人的ID	
+    is_fengxiang: 0, //是不是分享过来的
+    def_recommon: null, //分享人的手机号
+    def_serviceman: null, //分享人的营业员
+    fir_leader: 0, //分享人的ID	
   },
   swiperChange: function (e) {
     var currentId = e.detail.current;
@@ -48,34 +49,41 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    var that = this,th=that;
-  	var store_id=getApp().globalData.setting.stoid;
+    var that = this,
+      th = that;
+    var store_id = getApp().globalData.setting.stoid;
     //获取用户设备信息，屏幕宽度
     wx.getSystemInfo({
       success: res => {
-        that.setData({screenWidth: res.screenWidth})
+        that.setData({
+          screenWidth: res.screenWidth
+        })
       }
     })
     var fir_leader = options.scene;
-    if (fir_leader)	that.setData({fir_leader:fir_leader})
+    if (fir_leader) that.setData({
+      fir_leader: fir_leader
+    })
     //--先判断会员状态--
     var user_info = getApp().globalData.userInfo;
     if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-       wx.navigateTo({ url: '/pages/togoin/togoin?first_leader=' + fir_leader, })
-       return false;
-    }		 
+      wx.navigateTo({
+        url: '/pages/togoin/togoin?first_leader=' + fir_leader,
+      })
+      return false;
+    }
     //-----------商家配置信息----- 等级卡规则，是否又开邀请码，营业员------------
     getApp().request.get("/api/weshop/storeconfig/get/" + store_id, {
       success: function (res) {
         var is_cardrule = res.data.data.cardrules;
-        var switch_list= res.data.data.switch_list;
-        var swi_arr=JSON.parse(switch_list);
+        var switch_list = res.data.data.switch_list;
+        var swi_arr = JSON.parse(switch_list);
 
         w.wxParse("content", "html", is_cardrule, that, 6);
         that.setData({
-           is_card_rule: is_cardrule,
-           isyaoqingma:parseInt(swi_arr.isyaoqingma),
-           is_salesman:parseInt(swi_arr.is_staffno)
+          is_card_rule: is_cardrule,
+          isyaoqingma: parseInt(swi_arr.isyaoqingma),
+          is_salesman: parseInt(swi_arr.is_staffno)
         });
       }
     });
@@ -85,12 +93,14 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-	var user_info = getApp().globalData.userInfo;  
-	if(!user_info) return false;
-	  
-    var th=this,that=th,app_d=getApp().globalData;
-  	var store_id=os.stoid;
-    var fir_leader=this.data.fir_leader;
+    var user_info = getApp().globalData.userInfo;
+    if (!user_info) return false;
+
+    var th = this,
+      that = th,
+      app_d = getApp().globalData;
+    var store_id = os.stoid;
+    var fir_leader = this.data.fir_leader;
 
     if (fir_leader != null && fir_leader != undefined && fir_leader != "") {
       var r_url = "/api/weshop/plus/vip/mem/list?storeId=" + store_id + "&userId=" + fir_leader
@@ -126,8 +136,12 @@ Page({
           }
           if (is_ok == 1) {
             //--保存或者更新会员信息--
-            that.setData({ def_recommon: user_information.MobileTel, def_serviceman: user_information.StaffNo, is_fengxiang: 1 })
-			th.save_th_plus_user();
+            that.setData({
+              def_recommon: user_information.MobileTel,
+              def_serviceman: user_information.StaffNo,
+              is_fengxiang: 1
+            })
+            th.save_th_plus_user();
           }
         }
       });
@@ -138,14 +152,16 @@ Page({
     getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + app_d.user_id, {
       success: function (e) {
         var userInfo = e.data.data;
-        if(userInfo['card_field'] && !getApp().globalData.is_card_back){   
-              var u_url = "/pages/user/cardinfo/cardinfo";
-              wx.reLaunch({url: u_url})        
+        if (userInfo['card_field'] && !getApp().globalData.is_card_back) {
+          var u_url = "/pages/user/cardinfo/cardinfo";
+          wx.reLaunch({
+            url: u_url
+          })
         }
       },
     });
 
-    this.getPlusCardType();     
+    this.getPlusCardType();
   },
 
   /**
@@ -170,18 +186,23 @@ Page({
       var plusCard = res.data.data;
       var arr = [1219, 2089, 3031];
       var new_arr = new Array();
-      var parr=[];
+      var parr = [];
       for (var i = 0; i < plusCard.length; i++) {
-           //plusCard[i].free=arr[i];
-            if(plusCard[i].IsStopBuy) {  continue; }
-            if (plusCard[i].CardImg == "") plusCard[i].CardImg =  th.data.url + "/miniapp/images/plus/bg"+(i + 1)+ ".jpg?v=1";
-            var item = {"fee": plusCard[i].CardFee, 'index': i}
-            new_arr.push(item);
-            parr.push(plusCard[i]);
+        //plusCard[i].free=arr[i];
+        if (plusCard[i].IsStopBuy) {
+          continue;
+        }
+        if (plusCard[i].CardImg == "") plusCard[i].CardImg = th.data.url + "/miniapp/images/plus/bg" + (i + 1) + ".jpg?v=1";
+        var item = {
+          "fee": plusCard[i].CardFee,
+          'index': i
+        }
+        new_arr.push(item);
+        parr.push(plusCard[i]);
       }
 
       //看是不是还有卡项是可以购买的
-      if(new_arr && new_arr.length>0){
+      if (new_arr && new_arr.length > 0) {
         //根據距離遠近排序，越近在前面，升序
         new_arr.sort(function (a, b) {
           if (a.fee < b.fee) {
@@ -195,39 +216,48 @@ Page({
 
         //里面和外面要显示统一
         switch (new_arr.length) {
-          case 1:arr=[3031]; break;
-          case 2: arr = [2089, 3031]; break;
-          case 3: arr = [1219, 2089, 3031];break;
+          case 1:
+            arr = [3031];
+            break;
+          case 2:
+            arr = [2089, 3031];
+            break;
+          case 3:
+            arr = [1219, 2089, 3031];
+            break;
         }
 
         //---给数组添加立省多少钱---
         for (i = 0; i < parr.length; i++) {
-            //判断是否停用
-            for (var j = 0; j < new_arr.length; j++) {
-              if (i == new_arr[j].index) {
-                parr[i].free = arr[j];
-                break;
-              }
+          //判断是否停用
+          for (var j = 0; j < new_arr.length; j++) {
+            if (i == new_arr[j].index) {
+              parr[i].free = arr[j];
+              break;
+            }
           }
         }
         th.setData({
-          is_plusCard: parr, is_show: 1
+          is_plusCard: parr,
+          is_show: 1
         })
 
-     }else{
-          th.setData({is_show: 1});
-          wx.showToast({
-             title: "暂无可购买的等级卡项",
-             icon: 'none',
-             duration: 4000
-          })
+      } else {
+        th.setData({
+          is_show: 1
+        });
+        wx.showToast({
+          title: "暂无可购买的等级卡项",
+          icon: 'none',
+          duration: 4000
+        })
 
-     }
-     setTimeout(function(){
-         var goods_list = th.selectComponent("#goods_list"); //组件的id
-         goods_list.init();
-         goods_list.get_list();
-     },1000)
+      }
+      setTimeout(function () {
+        var goods_list = th.selectComponent("#goods_list"); //组件的id
+        goods_list.init();
+        goods_list.get_list();
+      }, 1000)
 
     })
   },
@@ -241,33 +271,57 @@ Page({
       th.buy_card();
     } else {
       //--如果后台都没有勾邀请码，营业员，立即购买--
-      if (!th.data.isyaoqingma && !th.data.is_salesman) {th.buy_card(); return false;}
-      th.setData({open_yq: 1})
+      if (!th.data.isyaoqingma && !th.data.is_salesman) {
+        th.buy_card();
+        return false;
+      }
+      th.setData({
+        open_yq: 1
+      })
     }
   },
-
+  //--绑定邀请码的输入--
+  b_input: function (e) {
+    var value = e.detail.value.trim();
+    // let { isyaoqingma, is_salesman }=this.data;
+    var name = e.currentTarget.dataset.name;
+    // if((name=="isyaoqingma" && isyaoqingma) || (name=="is_salesman" && is_salesman) ){
+    //   if(!value){
+    //     wx.showToast({
+    //       title: '不能为空',
+    //     })
+    //     return false;
+    //   }
+    // }
+    var ob = {};
+    ob[name] = value;
+    this.setData(ob);
+  },
   //--立即购买卡--
   buy_card: async function () {
     var th = this;
     var is_card = 0;
     //--商家是不是有等级卡功能，开通的人数是不是够用，开通是时间是不是到期--
-    await getApp().request.promiseGet("/api/weshop/plus/plus/card/register",
-        {data: {storeId: os.stoid}}).then(res => {
+    await getApp().request.promiseGet("/api/weshop/plus/plus/card/register", {
+      data: {
+        storeId: os.stoid
+      }
+    }).then(res => {
       if (res.data.code == 0) is_card = 1;
     })
     if (is_card == 0) {
-		 getApp().my_warnning("请联系商家升级plus功能", 0, th);
-		 return false;
-	}
-	 
+      getApp().my_warnning("请联系商家升级plus功能", 0, th);
+      return false;
+    }
+
     var item = th.data.is_plusCard[th.data.by_index];
     var req = {};
     req.cardId = item.CardId;
     req.rechargeType = 3;
     //如果不是你导购，也不是等级会员分享
     if (th.data.is_fengxiang == 1) {
-       if (th.data.def_recommon) req.recommon = th.data.def_recommon
-       if (th.data.def_serviceman) req.serviceman = th.data.def_serviceman
+      if (th.data.def_recommon) req.recommon = th.data.def_recommon
+      if (th.data.def_serviceman) req.serviceman = th.data.def_serviceman
     } else {
       //---后台要求要输入邀请码---
       if (th.data.isyaoqingma) {
@@ -275,13 +329,12 @@ Page({
           getApp().my_warnning("请输入邀请码", 0, th);
           return false;
         }
-		
-		//--邀请人不能是自己的手机号--
-		if(th.data.inp_recommon==getApp().globalData.userInfo.mobile){
-			getApp().my_warnning("邀请人不能填自已", 0, th);
-			return false;
-		}
-		
+
+        //--邀请人不能是自己的手机号--
+        if (th.data.inp_recommon == getApp().globalData.userInfo.mobile) {
+          getApp().my_warnning("邀请人不能填自已", 0, th);
+          return false;
+        }
         req.recommon = th.data.inp_recommon
       }
       //--后台要求要输入营业员--
@@ -296,137 +349,166 @@ Page({
     req.storeId = os.stoid;
     req.userId = getApp().globalData.user_id;
     //--如果有邀请码，和营业员的情况下--
-    if(req.recommon ||  req.serviceman ) {
-      var req_data = {storeId: os.stoid, userId: req.userId};
-	  if(req.recommon) req_data.inviteCode=req.recommon;
-	  if(req.serviceman) req_data.staffNo=req.serviceman;
+    if (req.recommon || req.serviceman) {
+      var req_data = {
+        storeId: os.stoid,
+        userId: req.userId
+      };
+      if (req.recommon) req_data.inviteCode = req.recommon;
+      if (req.serviceman) req_data.staffNo = req.serviceman;
       getApp().request.get("/api/weshop/plus/vip/mem/referee/code/check", {
-        data:req_data,
-        success:function(res){
-            if(res.data.code==0) {
-              t_pay.pay(req, th.success, function () {
-                getApp().my_warnning("支付失败", 0, th);
-              });
-            }else{
-			  getApp().my_warnning(res.data.msg, 0, th);
-			}
-         }
+        data: req_data,
+        success: function (res) {
+          if (res.data.code == 0) {
+            t_pay.pay(req, th.success, function () {
+              getApp().my_warnning("支付失败", 0, th);
+            });
+          } else {
+            getApp().my_warnning(res.data.msg, 0, th);
+          }
+        }
       })
-    }else{
+    } else {
       t_pay.pay(req, th.success, function () {
         getApp().my_warnning("支付失败", 0, th);
       });
     }
   },
   //返回会员页面
-  OpeningClose: function() {
-     this.setData({open_yq:0});
+  OpeningClose: function () {
+    this.setData({
+      open_yq: 0
+    });
   },
 
   //返回会员中心
-  back_user:function () {
+  back_user: function () {
     setTimeout(function () {
-      wx.reLaunch({url:"/pages/user/index/index"});
-    },1000)
+      wx.reLaunch({
+        url: "/pages/user/index/index"
+      });
+    }, 1000)
   },
-  
+
   //--支付成功，跳转到等级卡续费页面--
-  success:function () {	
-	//调一次就不再调用了  
-	if(getApp().globalData.is_card_back) return false;	  
-	if(getApp().globalData.plus_buy_back){
-		//值在这里换
-		getApp().globalData.is_card_back=1;		
-		getApp().globalData.plus_buy_back=0; 
-		//返回购物车购买
-		wx.navigateBack({ delta: 1,});	
-		return false;	
-	}else{
-		var u_url = "/pages/user/cardinfo/cardinfo";
-		wx.reLaunch({url: u_url})
-	}
-	     
-  },
+  success: function () {
+    //调一次就不再调用了  
+    if (getApp().globalData.is_card_back) return false;
+    if (getApp().globalData.plus_buy_back) {
+      //值在这里换
+      getApp().globalData.is_card_back = 1;
+      getApp().globalData.plus_buy_back = 0;
+      //返回购物车购买
+      wx.navigateBack({
+        delta: 1,
+      });
+      return false;
+    } else {
+      var u_url = "/pages/user/cardinfo/cardinfo";
+      wx.reLaunch({
+        url: u_url
+      })
+    }
 
-  //--绑定邀请码的输入--
-  b_input:function (e) {
-      var value=e.detail.value;
-      var name=e.currentTarget.dataset.name;
-      var ob={};
-      ob[name]=value
-      this.setData(ob);
   },
 
-  get_user_plus:async function(){
-      var user_id=getApp().globalData.user_id;
-      var fuser=null;
-      var user_information =null;
-      var store_id = os.stoid;
-      var that=this;
-      //--获取登记卡邀请信息--
-      await getApp().request.promiseGet("/api/weshop/usersPlus/get/" + os.stoid + "/" + user_id,{1:1}).then(res=>{
-        if (res.data.code==0){
-          fuser=res.data.data;
-        }
-      })    
-      if (!fuser) return false;
-      var r_url = "/api/weshop/plus/vip/mem/list?storeId=" + store_id + "&userId=" + fuser.plus_user_id;	
-      //--获取等级卡信息--
-      await getApp().request.promiseGet(r_url,{1:1}).then(res=>{
-         if (res.data.code == 0) {
-           user_information = res.data.data[0];
-         }
-      })
-      if (user_information){
-        var now = ut.gettimestamp();
-        var is_ok = 1;
-        if (user_information['ExpiryDate']) {
-          var str = user_information['ExpiryDate'].replace(/-/g, '/');
-          var end = new Date(str);
-          end = Date.parse(end) / 1000;
-          if (end < now) { is_ok = 0;}
-        } else {
+
+
+  get_user_plus: async function () {
+    var user_id = getApp().globalData.user_id;
+    var fuser = null;
+    var user_information = null;
+    var store_id = os.stoid;
+    var that = this;
+    //--获取登记卡邀请信息--
+    await getApp().request.promiseGet("/api/weshop/usersPlus/get/" + os.stoid + "/" + user_id, {
+      1: 1
+    }).then(res => {
+      if (res.data.code == 0) {
+        fuser = res.data.data;
+      }
+    })
+    if (!fuser) return false;
+    var r_url = "/api/weshop/plus/vip/mem/list?storeId=" + store_id + "&userId=" + fuser.plus_user_id;
+    //--获取等级卡信息--
+    await getApp().request.promiseGet(r_url, {
+      1: 1
+    }).then(res => {
+      if (res.data.code == 0) {
+        user_information = res.data.data[0];
+      }
+    })
+    if (user_information) {
+      var now = ut.gettimestamp();
+      var is_ok = 1;
+      if (user_information['ExpiryDate']) {
+        var str = user_information['ExpiryDate'].replace(/-/g, '/');
+        var end = new Date(str);
+        end = Date.parse(end) / 1000;
+        if (end < now) {
           is_ok = 0;
         }
+      } else {
+        is_ok = 0;
+      }
 
-        if (is_ok == 1) {
-           var fir_leader=fuser.plus_user_id
-           that.setData({ def_recommon: user_information.MobileTel, def_serviceman: user_information.StaffNo, is_fengxiang: 1,fir_leader:fir_leader })
-           //--先判断会员状态--
-           var user_info = getApp().globalData.userInfo;
-           if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-              wx.navigateTo({ url: '/pages/togoin/togoin?first_leader=' + fir_leader, })
-              return false;
-          }		   
+      if (is_ok == 1) {
+        var fir_leader = fuser.plus_user_id
+        that.setData({
+          def_recommon: user_information.MobileTel,
+          def_serviceman: user_information.StaffNo,
+          is_fengxiang: 1,
+          fir_leader: fir_leader
+        })
+        //--先判断会员状态--
+        var user_info = getApp().globalData.userInfo;
+        if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+          wx.navigateTo({
+            url: '/pages/togoin/togoin?first_leader=' + fir_leader,
+          })
+          return false;
+        }
       }
-     }
+    }
   },
-  
-  save_th_plus_user:async function(){
-    var f_user_id=this.data.fir_leader;
-    if (f_user_id){
+
+  save_th_plus_user: async function () {
+    var f_user_id = this.data.fir_leader;
+    if (f_user_id) {
       var user_id = getApp().globalData.user_id;
       var user_plus = null;
-      var now=ut.gettimestamp();
+      var now = ut.gettimestamp();
       //--获取登记卡邀请信息--
-      await getApp().request.promiseGet("/api/weshop/usersPlus/get/" + os.stoid + "/" + user_id, { 1: 1 }).then(res => {
+      await getApp().request.promiseGet("/api/weshop/usersPlus/get/" + os.stoid + "/" + user_id, {
+        1: 1
+      }).then(res => {
         if (res.data.code == 0) {
           user_plus = res.data.data;
         }
-      }) 
-      
+      })
+
       //--如果有值，要更新--
-      if (!user_plus){
-          getApp().request.post("/api/weshop/usersPlus/save", {
-            data: { store_id: os.stoid, user_id: user_id, plus_user_id: f_user_id, addtime: now },
-             success: function (res) { }
-          })
-      }else{
-          getApp().request.put("/api/weshop/usersPlus/update",{
-            data: { store_id: os.stoid, user_id: user_id, plus_user_id: f_user_id, edittime: now},
-               success:function(res){ }
-          })
+      if (!user_plus) {
+        getApp().request.post("/api/weshop/usersPlus/save", {
+          data: {
+            store_id: os.stoid,
+            user_id: user_id,
+            plus_user_id: f_user_id,
+            addtime: now
+          },
+          success: function (res) {}
+        })
+      } else {
+        getApp().request.put("/api/weshop/usersPlus/update", {
+          data: {
+            store_id: os.stoid,
+            user_id: user_id,
+            plus_user_id: f_user_id,
+            edittime: now
+          },
+          success: function (res) {}
+        })
       }
-    }  
+    }
   }
 })
\ No newline at end of file
diff --git a/pages/user/user_spsy/user_spsy.js b/pages/user/user_spsy/user_spsy.js
index e43903d..b94b66f 100644
--- a/pages/user/user_spsy/user_spsy.js
+++ b/pages/user/user_spsy/user_spsy.js
@@ -1,6 +1,7 @@
 // pages/user/usersy/usersy.js
-var e = getApp(),os = e.globalData.setting;
-var utils = require('../../../utils/util.js');
+var e = getApp(),
+  os = e.globalData.setting;
+var ut = require('../../../utils/util');
 var regeneratorRuntime = require('../../../utils/runtime.js');
 
 Page({
@@ -8,27 +9,100 @@ Page({
    * 页面的初始数据
    */
   data: {
-    qr_code_object:{val:"12121",content:"请将二维码展示给核销员，取货更快捷！"},
-    xp_list:null,
-    iurl:os.imghost,
+    qr_code_object: {},
+    xp_list: null,
+    iurl: os.imghost,
+    page: 1,
+    isLoading: 0,
+    no_more: 0,
+    is_use:0 //领取状态
   },
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function (options) { },
+  onLoad: function (options) {
+    var h_pic = options.img;
+    if (h_pic.indexOf("http") == -1) {
+      h_pic = os.imghost + h_pic;
+    }
+    var FormId = options.FormId;
+    var GradeId = options.gradeId;
+    var now = ut.gettimestamp();
+    this.setData({
+      h_pic,
+      GradeId,
+      FormId,
+      now,
+    });
+    this.requestData()
+    this.getQrCode(FormId)
+  },
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow:async function () {
-    var th = this;
-    var xp_list=null;
-    //--获取列表--
-    await getApp().request.promiseGet("http://172.20.3.102:8080/api/user_qy/xp_list", {
-      1: 1
-    }).then(res => {
-      xp_list = res.data;
-    })
-    th.setData({xp_list:xp_list});
+  onShow: function () {
+
+
+  },
+ async getQrCode(id) {
+    const res = await getApp().request.promiseGet("/api/weshop/users/grade/wares/code/get", {
+      data: {
+        privilegeId: id,
+        storeId: os.stoid,
+        userId: getApp().globalData.user_id,
+      },
+    });
+    if (res.data.code == 0 && res.data.data) {
+      if(res.data.data.VerifyDate || res.data.data.VerifyNo){
+        this.setData({
+          is_use:1
+        })
+      }else{
+        this.setData({
+          qr_code_object: res.data.data,
+        })
+      }
+    }
+  },
+  async requestData() {
+    if (this.data.no_more) return false;
+    if (this.data.isLoading) return false;
+    this.data.isLoading = 1;
+    let {
+      GradeId,
+      FormId,
+      page,
+      xp_list
+    } = this.data;
+    let req_data = {
+      page,
+      GradeId,
+      FormId,
+      storeId: os.stoid,
+      userId: getApp().globalData.user_id,
+    }
+    const res = await getApp().request.promiseGet("/api/weshop/users/grade/wechat/wares/page", {
+      data: req_data
+    });
+
+    if (ut.ajax_ok(res)) {
+      if (res.data.data.page > 1) {
+        xp_list = xp_list.concat(res.data.data.pageData);
+      } else {
+        xp_list = res.data.data.pageData;
+      }
+      this.setData({
+        xp_list,
+        isLoading: 0,
+        no_more: 0,
+      })
+    } else {
+      this.setData({
+        xp_list: [],
+        isLoading: 0,
+        no_more: 0,
+      })
+    }
   },
   /**
    * 页面上拉触底事件的处理函数
@@ -46,26 +120,36 @@ Page({
 
 
   /*-- 打开服务项目 --*/
-  open_xp:function (e) {
-    var th=this;
+  open_xp: function (e) {
+    var th = this;
     var qc_com = this.selectComponent("#qc_com"); //组件的id
     qc_com.open(th.data.qr_code_object)
   },
 
   //--领取商品--
-  get_xp:function (e) {
-      var th=this,index=e.currentTarget.dataset.ind;
-      getApp().request.post("http://172.20.3.102:8080/api/user_qy/get_gd",{
-          data:{},
-          success:function (e) {
-              if(e.data.code==0){
-                    var txt="xp_list["+index+"].is_get"
-                    var obj={};obj[txt]=1;
-                    th.setData(obj);
-              }
-          }
+  async show_hxm(e) {
+    let qr_code_object = this.data.qr_code_object;
+    if (qr_code_object !== {}) {
+      let { Number: val, BeginDate, EndDate} = qr_code_object;
+      let qr_code = this.selectComponent("#qc_com");
+      let obj = {
+        val,
+        content: "请将二维码展示给核销员，抵券更快捷",
+        now: BeginDate,
+        validay: EndDate,
+        is_quan: 1,
+      };
+      qr_code.open(obj)
+    }else{
+      wx.showToast({
+        title: "获取失败",
+        icon: 'none',
+        duration: 1000
       })
-  }
-
+    }
+  },
 
+  close:function (){
+    this.getQrCode(this.data.FormId)
+  }
 })
\ No newline at end of file
diff --git a/pages/user/user_spsy/user_spsy.json b/pages/user/user_spsy/user_spsy.json
index 468dc50..678c7b1 100644
--- a/pages/user/user_spsy/user_spsy.json
+++ b/pages/user/user_spsy/user_spsy.json
@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "新品试用",
+  "navigationBarTitleText": "免费领取",
   "usingComponents": {
     "qr_code": "/components/qr_code/qr_code"
   }
diff --git a/pages/user/user_spsy/user_spsy.wxml b/pages/user/user_spsy/user_spsy.wxml
index 1fb85c4..a785fb0 100644
--- a/pages/user/user_spsy/user_spsy.wxml
+++ b/pages/user/user_spsy/user_spsy.wxml
@@ -1,28 +1,22 @@
-<view class="xc-page" >
-   <view class="items"  wx:for="{{xp_list}}">
-        <view class="rel">
-              <image class="new-product" src="{{iurl+item.img}}"></image>
-              <image  wx:if="{{item.is_get}}" class="abs zimg" src="{{iurl}}/miniapp//images/userqy/isgeted.png"></image>
-          </view>
-
-       <view class="product-explain three-level-word">{{item.goods_name}}</view>
-         <view class="xc-bottom flex">
-            <view class="xc-goods-money three-level-word ">￥
-           </view>
-            <view class="xc-money">
-            {{item.goods_price}}
-            </view>
-            <view class="xc-clike-get  t-c white"  data-ind="{{index}}"  bindtap="open_xp"  wx:if="{{item.is_get}}">立即使用</view>
-            <view class="xc-clike-get  t-c white"  data-ind="{{index}}"  bindtap="get_xp"  wx:else>免费领取</view>
-         </view>
-</view>
+<view>
+  <image class="xc-coupon-img" src="{{h_pic}}"></image>
+  <view class="flex pd20 jc_sb fs28">
+    <view>单品名称</view>
+    <view>数量</view>
+  </view>
+  <view class="flex pd20 jc_sb fs26" wx:for="{{xp_list}}" wx:key="id">
+    <view>{{item.PrivilegeName}}</view>
+    <view class="c-a4">x{{item.SecondNo}}</view>
+  </view>
+  <view class="btn-container">
+    <!-- <view wx:if="{{details.isget}}" data-type="1" class="btn" style="background-color:#aaa;color: #fff">
+      已使用{{list[0].freebh}}
+   </view> -->
+    <view wx:if="{{is_use}}" class="btn">已使用</view>
+    <view wx:else bindtap="show_hxm" data-type="1" class="btn">立即使用</view>
+    <!-- <view bindtap="right_use" class="btn">立即使用</view></view> -->
+  </view>
 </view>
 
 <!-- 弹出框扫描 -->
-<qr_code id="qc_com"></qr_code>
-
-
-
-
-
-
+<qr_code id="qc_com" bindclose="close"></qr_code>
\ No newline at end of file
diff --git a/pages/user/user_spsy/user_spsy.wxss b/pages/user/user_spsy/user_spsy.wxss
index ec604ef..c53c4af 100644
--- a/pages/user/user_spsy/user_spsy.wxss
+++ b/pages/user/user_spsy/user_spsy.wxss
@@ -3,66 +3,28 @@ page{
   height: 100%;
   background:#f4f5fa;
 }
-.xc-page{
-  width: 100%;
-  height: 100%;
-  background: #f4f5fa;
-}
-.xc-page .items{
-  display: inline-block;
-  width: 345rpx;
-  height:450rpx;
-  margin-left:20rpx;
-  margin-top: 25rpx;
-  border-radius: 15rpx;
-  background:#fff;
-}
-
-.xc-page .items  .zimg{
-  width: 120rpx;
-  height: 120rpx;
-  left:50%; top:50%;
-  margin-left: -60rpx; margin-top: -60rpx;
-}
-
 
-.new-product{
-  width:345rpx;
-  height:325rpx;
-  border-radius:15rpx 15rpx 0 0;
-}
-.product-explain{
-  width: 90%;
-  word-break:break-all;
-  height: 40rpx;
-  margin-left:15rpx;
- 
-}
-.xc-bottom{
-  margin-top: 13rpx;
+.xc-coupon-img{
   width: 100%;
-  margin-left: 15rpx;
-}
-
-.xc-bottom .xc-goods-money{
-color: #ca4e59;
-  padding-top: 12rpx;
-}
-.xc-bottom .xc-money{
- color: #ca4e59;
-  font-size: 40rpx;
-  height: 100%;
-  line-height:50rpx
+  height: 330rpx;
+}
+.btn-container {
+	position: fixed;
+	left: 0;
+	bottom: 0;
+	width: 100%;
+	/* padding: 20rpx 30rpx; */
+	box-sizing: border-box;
+	background-color: white;
+	border-top: 2rpx solid #f2f2f2;
+	z-index: 1;
 }
 
-.xc-clike-get{
-  width: 120rpx;
-  height: 36rpx;
-  border-radius: 20rpx;
-  background: #ca4e59;
-  line-height:28rpx;
-  font-size:27rpx;
-  margin-left: 120rpx;
-padding-top: 10rpx
+.btn {
+  background-color: #FF6768;
+	color: white;
+	padding: 26rpx;
+	text-align: center;
+	/* border-radius: 8rpx; */
 }
 
diff --git a/pages/user/userqy/userqy.js b/pages/user/userqy/userqy.js
index 9a244d0..f1654ab 100644
--- a/pages/user/userqy/userqy.js
+++ b/pages/user/userqy/userqy.js
@@ -197,7 +197,7 @@ Page({
               getApp().goto("/pages/user/user_fw/user_fw?gradeId="+th.data.gradeId+"&FormId="+item.Id);
               break;
           case "03":
-              getApp().goto("/pages/user/user_spsy/user_spsy");
+              getApp().goto("/pages/user/user_spsy/user_spsy?img="+url+"&gradeId="+th.data.gradeId+"&FormId="+item.Id);
               break;
           case "10":
               getApp().request.get("/api/weshop/users/grade/vipprivilegelist/other/get",{