Merge branch 'qa' into 'master'

Qa See merge request !902

Merge branch 'qa' into 'master'
Qa See merge request !902
后端研发-苏明海
2 parents ff8274a3 72ae1bbf
Showing 77 changed files with 5982 additions and 2331 deletions
app.js
app.json
components/diy_goodsGroup/diy_goodsGroup.wxml
components/diy_goodsGroup/diy_goodsGroup.wxss
components/diy_goodsGroup/g_filter.wxs
components/diy_luckyGo/diy_luckyGo.js
components/diy_luckyGo/diy_luckyGo.json
components/diy_luckyGo/diy_luckyGo.wxml
components/diy_luckyGo/diy_luckyGo.wxss
components/diy_seckill/diy_seckill.js
components/diy_seckill/diy_seckill.wxml
components/diy_seckill/diy_seckill.wxss
components/goods_list/goods_list.wxml
components/qr_code/qr_code.js
packageA/pages/goodsInfo/goodsInfo.js
packageA/pages/goodsInfo/goodsInfo.wxml
packageA/pages/goodsInfo/goodsInfo.wxss
packageA/pages/jfbuy/jfbuy.js
packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js
packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxml
@@ -275,8 +275,8 @@ App({
   getwuliu: function (t, o){
 	this.globalData.wuliu=null;  
     var th = this, st = this.globalData.setting;
-    this.globalData.wuliu && !o ?
-      "function" == typeof t && t(this.globalData.wuliu) : a.get("/api/weshop/storeshipping/list", {
+    //获取物流不缓存
+    a.get("/api/weshop/storeshipping/list", {
         data: { store_id: st.stoid, status: 1, pageSize:600 },
         success: function (o) {
           console.log('getwuliu');
@@ -296,8 +296,8 @@ App({
   //----------------获取物流价格表--------------------
   getwuliuprice: function (t, o) {
     var e = this,th=e, st = this.globalData.setting;
-    this.globalData.wuliuprice && !o ?
-      "function" == typeof t && t(this.globalData.wuliuprice) : a.get("/api/weshop/shippingarea/list",{
+    //获取物流不缓存
+    a.get("/api/weshop/shippingarea/list",{
         data: { store_id: st.stoid,pageSize: 600 },
         success: function (o) {
           console.log('getwuliuprice');
@@ -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",
@@ -15,7 +15,8 @@
 <view class="zs_goods_wai" wx:if='{{object.column==1}}'>
        <block wx:for="{{goods_array}}" >
             <view class='zs_goods {{g_filter.get_border_type(object.big_order_type)}}'>
-                <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_id={{item.prom_id}}&&prom_type={{item.prom_type}}" class="s1_gk_a1">
+							<navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1">
+                <!-- <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_id={{item.prom_id}}&&prom_type={{item.prom_type}}" class="s1_gk_a1"> -->
                     <view class='zs_top rel'>
                         <block wx:if="{{object.big_order_type==3}}">
@@ -169,7 +170,7 @@
 <!--2个一列-->
 <block  wx:if="{{object.column==2}}">
   <block wx:for="{{goods_array}}" >
-    <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_id={{item.prom_id}}&&prom_type={{item.prom_type}}" class="s1_gk_a1">
+    <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1">
         <view class="zs_goods_wai_ban {{g_filter.get_border_type(object.big_order_type)}}">
             <view class="zs_goods_ban">
                 <view class='zs_goods_2l'>
@@ -208,7 +209,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}}">
@@ -328,7 +329,7 @@
 <block wx:if='{{object.column==3}}'>
    <view class="zwp_3">
     <block wx:for="{{goods_array}}" >
-        <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_id={{item.prom_id}}&&prom_type={{item.prom_type}}" class="s1_gk_a1">
+        <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1">
             <view class="zs_goods_wai_san" >
                 <view class="zs_goods_san">
                     <view class='zs_goods_3l {{g_filter.get_border_type(object.big_order_type)}}'>
@@ -485,7 +486,7 @@
 <!-- 列表显示 -->
 <view class="zs_goods_xiao_wai" wx:if='{{object.column==4}}'>
     <block wx:for="{{goods_array}}" >
-        <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_id={{item.prom_id}}&&prom_type={{item.prom_type}}" class="s1_gk_a1">
+        <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1">
             <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}" >
                 <view class='zs_top_x'>
                     <block wx:if="{{object.big_order_type==3}}">
@@ -498,9 +499,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 +530,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}}">
@@ -662,7 +669,7 @@
     <view class="sp">
       <swiper-item class="s_it" wx:for="{{goods_array}}">
         <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
-          <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&prom_id={{aitem.prom_id}}&&prom_type={{aitem.prom_type}}" style="width: 32%" >
+          <navigator url="{{g_filter.get_url_by_type(item)}}" style="width: 32%" >
             <view class="one {{object.big_order_type==0?'zj':''}}{{object.big_order_type==1?'yj':''}} " style="margin-left: 10rpx">
               <view class='sp_top'>
                 <view class='s_img' style="position: relative; width: 100%">
@@ -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,25 @@
 .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%;
+	/* word-break: break-all; */
+  /* white-space: nowrap;
+  width: 80%; */
 }
 .zs_wz2_x {
@@ -229,11 +235,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,17 +309,18 @@
   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;
+	/* word-break: break-all; */
 }
 .zs_wz2_2l {
@@ -825,4 +833,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
@@ -88,6 +88,16 @@ var g_filters = {
 			     return min_name;
 		},
+	
+		get_url_by_type: function(item) {
+			var url = '';
+			if(item.prom_type == 9) {
+				url = '/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + item.goods_id + '&group_id=' + item.prom_id;
+			} else {
+				url = '/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id + '&prom_id=' + item.prom_id + '&prom_type=' + item.prom_type;
+			};
+			return url;
+		},
 }
@@ -97,4 +107,5 @@ module.exports = {
    is_has_rank:g_filters.is_has_rank,
    get_card_price:g_filters.get_card_price,
    get_border_type:g_filters.get_border_type,
+	 get_url_by_type: g_filters.get_url_by_type,
 }
+// var e = function(e) {
+//       return e && e.__esModule ? e : {
+//         default: e
+//       };
+//     }(require("../../utils/LoadMore3.js")),
+//     n = new e.default(),
+var t = getApp(),
+  a = t.request,
+  o = t.globalData.setting,
+  os = o,
+  i = require("../../utils/util.js"),
+  ut = i,
+  s = require("../../utils/common.js");
+var regeneratorRuntime = require('../../utils/runtime.js');
+Component({
+  properties: {
+    // 这里定义了innerText属性，属性值可以在组件使用时指定
+    object: {
+      type: Object,
+      value: null,
+    },
+    goods_array: {
+      type: Array,
+      value: []
+    },
+    newTime: {
+      type: Number,
+      value: 0
+    },
+  },
+  data: {
+    // 这里是一些组件内部数据
+    yc: false,
+    someData: null,
+    ylp_img: "https://mshopimg.yolipai.net/",
+    imghost: os.imghost,
+    timer: null,
+  },
+
+  pageLifetimes: {
+    //要处理一下，游客登录后的界面的变化,主要还该是改变会员
+    show: function () {
+        //会员身份变化
+        var th = this;
+        var g_id = this.data.object;
+        this.init(g_id);
+        setTimeout(function () {
+            if (th.data.goods_array && th.data.goods_array.length > 0) {
+                th.data.timer = setInterval(function () {
+                    th.countDown2(th);
+                }, 1000);
+            }
+        },600)
+    }
+  },
+
+  ready: function () {
+    var g_id = this.data.object;
+    this.init(g_id);
+  },
+  detached() {
+    // 页面被被销毁的时候，清除定时器
+    clearInterval(this.data.timer);
+  },
+  methods: {
+    // 这里是一个自定义方法
+    customMethod: function () { },
+    init: function (g_id) {
+      var th = this, app = getApp(), goodsidlist = "";
+      if (g_id.data_type == 2) {
+        if (g_id.data && g_id.data.length > 0) {
+          //--先把商品ID串起来--
+          g_id.data.forEach(function (val, ind) {
+            var item = {};
+            goodsidlist += val.goodsid + ",";
+          })
+          goodsidlist = ut.sub_last(goodsidlist);
+
+          var user_id=getApp().globalData.user_id;
+          if(!user_id){ user_id=0;}
+
+          //--调用接口,读取秒杀--
+          app.request.promiseGet("/api/weshop/prom/luckyActivity/getGoodsList?store_id="
+            + os.stoid + "&goodsidlist=" + goodsidlist + "&type=1&timetype=1&is_end=0", {}).then(res => {
+              console.log(res);
+              //如果秒杀的数组为空的时候    
+              var goodslist = res.data.data;
+              //就算是添加的活动已经过期，就要用最新的进行中活动
+              if (goodslist && goodslist.length > 0) {
+                th.set_goods_list(g_id.data, goodslist);
+              }
+            });
+        }
+      } else {
+        th.no_gid_set();
+      }
+    },
+
+    //当是默认的情况
+    no_gid_set() {
+      var user_id=getApp().globalData.user_id;
+      if(!user_id){ user_id=0;}
+      // var req={ store_id: os.stoid, is_end: 0, is_show: 1, timetype: 2,user_id:user_id}; 原来的
+			var req={ store_id: os.stoid, is_end: 0, timetype: 1};
+      getApp().request.promiseGet("/api/weshop/prom/luckyActivity/page",
+        { isShowLoading: 1, data:req  }
+      ).then(res => {
+        if (res.data.code == 0 && res.data.data.pageData && res.data.data.pageData.length > 0) {
+          var goodsidlist = res.data.data.pageData;
+          this.set_goods_list(null, goodsidlist);
+					// console.log('goodsidlist', goodsidlist);
+        }
+      });
+    },
+
+    //就算是添加的活动已经过期，就要用最新的活动
+    set_goods_list(g_id, goodslist) {
+      // 判断火热，预热
+      var newTime = ut.gettimestamp(), all_array = [], th = this;
+      th.setData({ newTime: newTime });
+      if (g_id) {
+        /*--商品队列按照添加的顺序排列--*/
+        g_id.forEach(function (val, ind) {
+          goodslist.forEach(function (vy, indy) {
+            if (val.goodsid == vy.goods_id) {
+              if(!vy.id) vy.id=vy.prom_id;
+              all_array.push(vy);
+            }
+          })
+        })
+      } else {
+        all_array = goodslist;
+      }
+
+
+      if (all_array.length == 0) {
+        all_array = goodslist;
+      }
+
+      for(let i in all_array){
+      	let item=all_array[i];
+      	if(item.user_price) item.price=item.user_price;
+      }
+
+      var arr = new Array();
+      //--三个三个一组---
+      for (var i = 0; i < all_array.length; i += 3) {
+        arr.push(all_array.slice(i, i + 3));
+      }
+      /*--熏染到前台--*/
+
+      th.setData({ goods_array: arr });
+			console.log('goods_array', arr);
+
+      th.data.timer = setInterval(function () {
+        th.countDown2(th);
+      }, 1000);
+    },
+
+
+
+    //---小于10的格式化函数----
+    timeFormat: function (param) {
+      return param < 10 ? '0' + param : param;
+    },
+    //----秒杀倒计时函数-----
+    countDown2: function (ob) {
+      if (ob == undefined) return false;
+      var ee = ob;
+      // 获取当前时间，同时得到活动结束时间数组
+      var newTime = ut.gettimestamp();
+      this.setData({ newTime: newTime });
+
+      var List = ee.data.goods_array;
+      if (List.length == 0) return false;
+      for (var j = 0; j < List.length; j++) {
+        // 对结束时间进行处理渲染到页面
+        var endTimeList = List[j];
+        for (var i = 0; i < endTimeList.length; i++) {
+          var o = endTimeList[i];
+          var endTime = o.end_time;
+          if (newTime < o.start_time) endTime = o.start_time;
+          let obj = null;
+          // 如果活动未结束，对时间进行处理
+          if (endTime - newTime > 0) {
+            let time = (endTime - newTime);
+            // 获取天、时、分、秒
+            let day = parseInt(time / (60 * 60 * 24));
+            let hou = parseInt(time % (60 * 60 * 24) / 3600);
+            let min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
+            let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60);
+            obj = {
+              day: this.timeFormat(day),
+              hou: this.timeFormat(hou),
+              min: this.timeFormat(min),
+              sec: this.timeFormat(sec)
+            }
+          } else {
+            //活动已结束，全部设置为'00'
+            obj = {
+              day: '00',
+              hou: '00',
+              min: '00',
+              sec: '00'
+            }
+          }
+          var txt = "goods_array[" + j + "][" + i + "].djs";
+          ee.setData({
+            [txt]: obj
+          });
+        }
+      }
+    },
+		
+		
+    //图片失败，默认图片
+    bind_bnerr3: function (e) {
+      var _errImg = e.target.dataset.errorimg;
+      var _errObj = {};
+      _errObj[_errImg] = "/public/images/default_goods_image_240.gif";
+      this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+    },
+
+    go: function (e) {
+      let url = e.currentTarget.dataset.url;
+			getApp().goto(url);
+    },
+		
+		alert: function() {
+			wx.showToast({
+				title: '本活动商品已抢光！',
+				icon: 'none',
+			})
+		},
+  },
+
+
+})
 \ No newline at end of file
+{
+  "component": true,
+  "usingComponents": {}
+}
 \ No newline at end of file
+<wxs module="filters" src="../../utils/filter.wxs"></wxs>
+<block wx:if="{{goods_array.length>0}}">
+	<!-- 幸运购 -->
+	<view class="pdh20 flex jc_sb ai-center bg-white" bindtap="go" data-url="/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList">
+		<view><text class="iconfont icon-luck"></text>幸运购</view>
+		<view class="arrow-r">
+			<image src="{{imghost}}/miniapp/images/icon-arrowdown.png" lazy-load="true" class="img-block"></image>
+		</view>
+	</view>
+
+	<!-- 单行滑动显示 -->
+	<block wx:if="{{object.style==1}}">
+		<!--商品展示-->
+		<swiper indicator-active-color="#ED6064" indicator-dots="false" wx:if="{{object.style==1}}">
+			<view wx:if="{{object.style==1}}">
+				<swiper-item class="s_it" wx:for="{{goods_array}}">
+					<block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
+						<navigator url="{{aitem.actLen == 0 ? '':('/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + aitem.goods_id + '&prom_type=9&group_id=' + aitem.id)}}"
+						 class="pd20 nav" hover-class="none" bindtap="{{aitem.actLen == 0 ? 'alert':''}}">
+							<view class="">
+								<view class="img-container row {{aitem.actLen == 0 ? 'active':''}}" data-content="{{aitem.group_num}}人团">
+									<image class="img-block" src="{{imghost + aitem.original_img}}" data-val="{{aitem.original_img}}"
+									 data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3" lazy-load="true"
+									 lazy-load="true"></image>
+								</view>
+								<view class="flex fdc jc_sb f1 pdt20">
+
+									<view class="ellipsis-2 name fs28 clearbadge">{{aitem.title}}</view>
+									<view>
+										<view class="flex ai-center">
+											<text class="rmb c-red">{{filters.price(aitem.group_price)}}</text>
+											<view class="del fs22 c-a pdl10"><text class="rmb">{{aitem.market_price}}</text></view>
+										</view>
+									</view>
+
+								</view>
+							</view>
+
+						</navigator>
+					</block>
+				</swiper-item>
+			</view>
+		</swiper>
+	</block>
+
+	<!-- 单列显示 -->
+	<block class="sp2" wx:if="{{object.style==2}}">
+		<view class="list">
+			<block wx:for="{{goods_array}}">
+				<!-- goods_array的数据是这样子的： [Array(3), Array(3), Array(3), Array(1)] -->
+				<!-- 3个成一组，这里我们默认让它显示goods_array[0],控制显示数量在3个以内 -->
+				<block wx:if="{{index == 0}}">
+					<block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
+						<view class="list-item" data-url="/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id={{aitem.goods_id}}&prom_type=9&group_id={{aitem.id}}" bindtap="{{aitem.actLen == 0 ? '':'go'}}">
+							<view class="flex ai-center">
+								<view class="img-container">
+									<image class="img-block" src="{{imghost + aitem.original_img}}" data-val="{{aitem.original_img}}"
+									 data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3" lazy-load="true"></image>
+								</view>
+								<view class="pdl20 flex fdc jc_sb f1">
+
+									<view class="ellipsis-2 name fs28" data-content="{{aitem.group_num}}人团">{{aitem.title}}</view>
+									<view>
+										<view class="flex ai-center">
+											<text class="rmb c-red">{{filters.price(aitem.group_price)}}</text>
+											<view class="del fs22 c-a pdl10">零售价:<text class="rmb">{{aitem.market_price}}</text></view>
+										</view>
+										<view class="flex jc_sb">
+											<progress class="pdr20 f1 progress" percent="{{filters.percent(aitem.num, aitem.group_num)}}" activeColor="#FF6768"
+											 backgroundColor="#d0d0d0" border-radius="12" stroke-width="12" data-content="{{aitem.num}}人已参团"></progress>
+											<view class="btn fs26 {{aitem.actLen == 0 ? 'gray':''}}" wx:if="{{aitem.actLen == 0}}">已抢光</view>
+											<view class="btn fs26" wx:else>去参团</view>
+										</view>
+									</view>
+								</view>
+							</view>
+							<view class="fs24 pdt10 c-7b">*<text class="c-red">{{aitem.group_num}}</text>人成团，<text class="c-red">{{aitem.group_win}}</text>人得商品，<text
+								 class="c-red">{{aitem.group_num - aitem.group_win}}</text>人全额退款并得<text class="c-red">惊喜礼品</text>！</view>
+						</view>
+					</block>
+				</block>
+			</block>
+		</view>
+	</block>
+</block>
+@import '../../app.wxss';
+
+
+
+.s_it {
+  width: 100%;
+  display: flex;
+  background-color: white;
+}
+
+
+
+
+
+
+swiper {
+	height: 450rpx;
+}
+
+.nav {
+	width: calc(100% / 3);
+	box-sizing: border-box;
+}
+
+.arrow-r {
+	width: 30rpx;
+	height: 30rpx;
+}
+
+.icon-luck {
+	color: #ED6064;
+	margin-right: 4rpx;
+}
+
+
+
+
+.list-item {
+	background-color: white;
+	padding: 20rpx;
+}
+
+.img-container {
+	width: 220rpx;
+	height: 220rpx;
+	border-radius: 14rpx;
+	overflow: hidden;
+	flex-shrink: 0;
+	position: relative;
+}
+
+.img-container::before {
+	content: '幸运购';
+	position: absolute;
+	left: 0;
+	top: 0;
+	padding: 4rpx;
+	background-color: rgba(255,103,103,.7);
+	color: white;
+	font-size: 22rpx;
+	border-radius: 0 0 14rpx 0;
+}
+
+
+
+.img-container.row::before {
+	content: attr(data-content);
+	position: absolute;
+	left: 0;
+	top: 0;
+	padding: 4rpx;
+	background-color: rgba(255,103,103,.7);
+	color: white;
+	font-size: 22rpx;
+	border-radius: 0 0 14rpx 0;
+}
+
+.name::before {
+	content: attr(data-content);
+	background-color: #FF6768;
+	color: white;
+	font-size: 24rpx;
+	padding-left: 10rpx;
+	padding-right: 10rpx;
+	border-radius: 20rpx;
+	margin-right: 10rpx;
+}
+
+.name.clearbadge::before {
+	content: none;
+}
+
+.rmb::before {
+	content: '￥';
+	font-size: 24rpx;
+}
+
+.del {
+	text-decoration: line-through;
+}
+
+.btn {
+	background-color: #FF6768;
+	border-radius: 20rpx;
+	padding-left:20rpx;
+	padding-right: 20rpx;
+	color: white;
+}
+
+.name {
+	height: 88rpx;
+}
+
+.no-more {
+	font-size: 24rpx;
+	line-height: 2;
+	text-align: center;
+	padding-top: 20rpx;
+	padding-bottom: 20rpx;
+	color: #ccc;
+}
+
+.progress {
+	position: relative;
+}
+.progress::before {
+	position: absolute;
+	width: 100%;
+	content: attr(data-content);
+	font-size: 20rpx;
+	color: white;
+	text-align: center;
+}
+
+.btn.gray {
+	background-color: #ccc;
+}
+
+.img-container.active::after {
+	content: '已抢光';
+	position: absolute;
+	font-size: 24rpx;
+	color: white;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	text-align: center;
+	background-color: rgba(0,0,0,.4);
+}
 \ No newline at end of file
@@ -81,7 +81,7 @@ Component({
           //--调用接口,读取秒杀--
           app.request.promiseGet("/api/ms/flash_sale/getGoodsList?store_id="
-            + os.stoid + "&goodsidlist=" + goodsidlist+"&user_id="+user_id, {}).then(res => {
+            + os.stoid + "&goodsidlist=" + goodsidlist+"&user_id="+user_id+"&type=1", {}).then(res => {
               console.log(res);
               //如果秒杀的数组为空的时候    
               var goodslist = res.data.data;
@@ -113,6 +113,11 @@ Component({
     //就算是添加的活动已经过期，就要用最新的活动
     set_goods_list(g_id, goodslist) {
+
+      goodslist.forEach(function (vy, indy) {
+          if(!vy.id) vy.id=vy.prom_id;
+      })
+
       // 判断火热，预热
       var newTime = ut.gettimestamp(), all_array = [], th = this;
       th.setData({ newTime: newTime });
@@ -121,16 +126,14 @@ Component({
         g_id.forEach(function (val, ind) {
           goodslist.forEach(function (vy, indy) {
             if (val.goodsid == vy.goods_id) {
-              if(!vy.id) vy.id=vy.prom_id;
               all_array.push(vy);
             }
           })
         })
       } else {
-        all_array = goodslist;
+         all_array = goodslist;
       }
-
       if (all_array.length == 0) {
         all_array = goodslist;
       }
@@ -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> :
@@ -112,13 +112,14 @@ 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;
+	word-break: break-all;
+  /* text-overflow: ellipsis;
   white-space: nowrap;
-  line-height: 48rpx;
+  line-height: 48rpx; */
 }
 .sp_wz .sp_jg {
@@ -222,12 +223,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 +288,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
@@ -4,15 +4,16 @@
 <view class="collects">
   <view class="hang ">
     <!-- 商品详情 -->
-    <view class="collect ib" wx:for="{{recommend}}" bindtap="go_url" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&title={{item.goods_name}}&prom_type={{item.prom_type}}&prom_id={{item.prom_id}}">
-      <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&title={{item.goods_name}}&prom_type={{item.prom_type}}&prom_id={{item.prom_id}}" hover-class="none">
+    <view class="collect ib" wx:for="{{recommend}}" bindtap="go_url" data-url="{{item.prom_type == 9 ? ('/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + item.goods_id + '&group_id=' + item.prom_id):('/pages/goods/goodsInfo/goodsInfo?goods_id='+item.goods_id+'&title='+item.goods_name+'&prom_type='+item.prom_type+'&prom_id='+item.prom_id)}}">
+      <!-- <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&title={{item.goods_name}}&prom_type={{item.prom_type}}&prom_id={{item.prom_id}}" hover-class="none"> -->
+			<navigator url="{{item.prom_type == 9 ? ('/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + item.goods_id + '&group_id=' + item.prom_id):('/pages/goods/goodsInfo/goodsInfo?goods_id='+item.goods_id+'&title='+item.goods_name+'&prom_type='+item.prom_type+'&prom_id='+item.prom_id)}}" hover-class="none">
         <!-- 商品图⽚ -->
         <image class="sp" src="{{url+item.original_img}}" mode="aspectFill" binderror="bind_bnerr_xc" data-url="{{url+item.original_img}}" data-errorimg="recommend[{{index}}].original_img"></image>
         <view class="bottom">
           <!-- 商品名称 -->
           <view class="goods_name ellipsis-2 fs28">{{item.goods_name}}</view>
           <!-- 判断是否有活动价 -->
-          <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_id>0}}">
+          <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_id>0 && item.prom_type!=7}}">
 						<view class="pdt10">
 							<view class="money flex xc-wc" >
 							<text wx:if="{{item.prom_integral}}"><text class="fs35" style="font-weight: bold;">{{item.prom_integral}}</text>积分</text>	
@@ -24,6 +24,7 @@ Component({
     //关闭
     close: function (e) {
         this.setData({q_show: 0,barcode_canvas:null,qrcode_canvas:null });
+        this.triggerEvent('close',{},{bubbles: true});
     },
     //打开
@@ -59,9 +59,6 @@ Page({
     }, {
       name: "详情",
       id: 1
-    }, {
-      name: "评论",
-      id: 2
     }],
     activeCategoryId2: 0,
     categories2: [{
@@ -4,468 +4,502 @@
 <wxs module="tool" src="filter.wxs"></wxs>
 <!-- 商品内容区域,普通商品,秒杀,拼团 -->
-<!-- <block wx:if="{{isshow}}"> -->
-<block>  
-  <view class="container">
-    <!-- <view class="type-navbar">
-      <view class="type-box" wx:for="{{categories}}" wx:key="categories">
-        <view bindtap="tabClick" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}" id="{{item.id}}">
-          {{item.name}}
-        </view> 
-      </view>
-    </view> -->
-    <view class="goods-detail">
-      <view class="goods-info" hidden="{{activeCategoryId==0?false:true}}">    
-        <view id="id" bindtouchstart="handletouchtart" bindtouchmove="handletouchmove">
-          <view class="xc-videos-picture rel">
-            <swiper autoplay="{{false}}" current="{{swiperCurrent}}" class="swiper_box  swiperContainer rel" duration="{{1000}}" indicatorDots="{{mapurl?false:true}}" interval="{{3000}}" vertical="{{false}}" bindchange="swiperChange">					
-                <swiper-item>
-                  <image class="wh100" src="{{iurl}}{{data.image_url?data.image_url:'miniapp/images/default_g_img.gif'}}"  binderror="bind_bnerr"
-                         mode="aspectFit"  lazy-load="true" data-errorimg="gallery[{{index}}].image_url"></image>
-                </swiper-item>
-            </swiper>  
-          </view>
-        </view>
-
-		<block>
- 
-          <view class="goods-price rel">
-            <view class="co-red" style="overflow: hidden">
-                <view class="market-price" style="overflow: hidden"></view>
-            </view>
-				  
-            <view>
-				<view class="co-red"><text class="rel yuan">￥</text>{{filters.toFix(data.shop_price,2)}}</view>
-                <view class="goods-title"> <view class="goods-name elli">{{data.goods_name}}</view></view>
-            </view>
-			
-			<view class="goods-num">
-			  <view class="sales">销量：{{data.sales_sum}}</view>
-			  <view class="sales">有效天数：{{data.validDays?data.validDays:'不限'}}</view>
+<block>
+	<view class="container">
+		<view class="type-navbar">
+			<view class="type-box" wx:for="{{categories}}" wx:key="categories">
+				<view bindtap="tabClick" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}" id="{{item.id}}">
+					{{item.name}}
+				</view>
 			</view>
-				 
-          </view>
-        </block>
-
-            <!-- 门店收货地址 -->
-            <view class="xc-address_frame bdt16 flex-vertical xc-ash {{def_pick_store!=null?'sn_height':'on_height'}}" >
-                 <view class="address_frame" bindtap="choice_store"  data-ind="0">
-                  <view class="flex-vertical-between "> 
-                    <view class="flex-vertical select_store_height">
-                      <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
-                      <view class="fs30" style="color:black;">选择门店</view>
-                    </view>
-                    <view class="red_bb fs26">更多门店<text class="bg_jj"></text></view>
-                  </view>
-
-                  <view wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
-                  <view  class="flex-space-between address ai_end  ">
-                     <view>
-                       <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
-                     </view>
-                     <view class="distance fs24"wx:if="{{def_pick_store.distance!=null}}">
-                      距离：{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
-                     
-                     </view>
-                  </view>	
-												
-				  <view class="no_store" wx:if="{{only_pk && !only_pk.length}}">(未找到门店)</view>
-				  <block wx:else>					
-							 <view class="no_store" wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(未找到门店)</view>
-							 <block wx:else>
-								  <view class="no_store" wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">(配送不匹配)</view>
-							 </block>							
-				  </block>
-				  
-                  <view class="fs24 xc-ash-9f">地址:{{def_pick_store.fulladdress}}</view>
-                  </view>
-                 </view>   
-
-            </view> 
-
-            <view class="bz_view flex bdt16" wx:if="{{store_config}}">
-							<image class="bzfu_img" src="{{iurl}}/miniapp/images/bzfu_w.png"></image>
-							<view class="flex f1 ai_c rel">
-								<view class="bz-content {{flag ? '':'ellipsis-1'}} f1">{{store_config.service_bz}}</view>
-								<view bindtap="clickCollapse" class="cx-obtain-coupon wsize arrow">
-									<text class="bg_jj {{flag?'down1':''}}"></text>
+		</view>
+		<view class="goods-detail">
+			<view class="goods-info" hidden="{{activeCategoryId==0?false:true}}">
+				<view id="id" bindtouchstart="handletouchtart" bindtouchmove="handletouchmove">
+					<view class="xc-videos-picture rel">
+						<swiper autoplay="{{false}}" current="{{swiperCurrent}}" class="swiper_box  swiperContainer rel" duration="{{1000}}"
+						 indicatorDots="{{mapurl?false:true}}" interval="{{3000}}" vertical="{{false}}" bindchange="swiperChange">
+							<swiper-item>
+								<image class="wh100" src="{{iurl}}{{data.image_url?data.image_url:'miniapp/images/default_g_img.gif'}}"
+								 binderror="bind_bnerr" mode="aspectFit" lazy-load="true" data-errorimg="gallery[{{index}}].image_url"></image>
+							</swiper-item>
+						</swiper>
+					</view>
+				</view>
+
+				<block>
+
+					<view class="goods-price rel">
+						<view class="co-red" style="overflow: hidden">
+							<view class="market-price" style="overflow: hidden"></view>
+						</view>
+
+						<view>
+							<view class="co-red"><text class="rel yuan">￥</text>{{filters.toFix(data.shop_price,2)}}</view>
+							<view class="goods-title">
+								<view class="goods-name elli">{{data.goods_name}}</view>
+							</view>
+						</view>
+
+						<view class="goods-num">
+							<view class="sales">销量：{{data.sales_sum}}</view>
+							<view class="sales">有效天数：{{data.validDays?data.validDays:'不限'}}</view>
+						</view>
+
+					</view>
+				</block>
+
+
+
+				<!-- 门店收货地址 -->
+				<view class="xc-address_frame bdt16 flex-vertical xc-ash {{def_pick_store!=null?'sn_height':'on_height'}}">
+					<view class="address_frame" bindtap="choice_store" data-ind="0">
+						<view class="flex-vertical-between ">
+							<view class="flex-vertical select_store_height">
+								<image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
+								<view class="fs30" style="color:black;">选择门店</view>
+							</view>
+							<view class="red_bb fs26">更多门店<text class="bg_jj"></text></view>
+						</view>
+
+						<view wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
+							<view class="flex-space-between address ai_end  ">
+								<view>
+									<text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
+								</view>
+								<view class="distance fs24" wx:if="{{def_pick_store.distance!=null}}">
+									距离：{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
+
 								</view>
-								<!-- <text class="bg_jj" bindtap="clickCollapse"></text> -->
-								<!-- <text class="iconfont icon-shuangjiantouxia c-db"></text> -->
 							</view>
+
+							<view class="no_store" wx:if="{{only_pk && !only_pk.length}}">(未找到门店)</view>
+							<block wx:else>
+								<view class="no_store" wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(未找到门店)</view>
+								<block wx:else>
+									<view class="no_store" wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">(配送不匹配)</view>
+								</block>
+							</block>
+
+							<view class="fs24 xc-ash-9f">地址:{{def_pick_store.fulladdress}}</view>
 						</view>
-				
-				
-				
-				
-				
-				
-				
-        <!-- 图文详情 -->
-        <view class="pd20">
-           <!-- <view class="tuwen_title">
-            <view class="g_line"></view>
-            <view class="center_s">
-              <image src="{{iurl}}/miniapp/images/tuwen_c.png"></image><text>详情</text>
-            </view>
-           </view> --> 
-		   	   
-		   <view  wx:if="{{service_list}}">
-		       <view class="goods-num pdv20 t-c" style="font-size: 26rpx; background-color: #f6f5f4;">
-		   	    <view class="stock">项目名称</view>
-		   	    <view class="stock">耗时(分)</view>					
-		   	    <!-- <view class="stock">手工费</view>	 -->				
-		   	    <view class="stock">次数</view>
-		   	</view>					
-		   	<block wx:for="{{service_list}}">
-		   	   <view class="goods-num pdv20 t-c" style="margin-bottom: 10rpx;font-size: 22rpx;">
-		   		   <view class="stock">{{item.projectName}}</view>
-		   		   <view class="stock">{{item.timeConsuming}}</view>					
-		   		   <!-- <view class="stock">{{item.money}}</view> -->					
-		   		   <view class="stock">{{item.frequency}}</view>
-		   	   </view>
-		       </block>							
-		   </view>
-		   
-		   <view class="wxParse">
-		     <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
-		   </view>
-          
-        </view>
+					</view>
+
+				</view>
+
+				<view class="bz_view flex bdt16" wx:if="{{store_config}}">
+					<image class="bzfu_img" src="{{iurl}}/miniapp/images/bzfu_w.png"></image>
+					<view class="flex f1 ai_c rel">
+						<view class="bz-content {{flag ? '':'ellipsis-1'}} f1">{{store_config.service_bz}}</view>
+						<view bindtap="clickCollapse" class="cx-obtain-coupon wsize arrow">
+							<text class="bg_jj {{flag?'down1':''}}"></text>
+						</view>
+						<!-- <text class="bg_jj" bindtap="clickCollapse"></text> -->
+						<!-- <text class="iconfont icon-shuangjiantouxia c-db"></text> -->
+					</view>
+				</view>
+
+
-        <!-- 推荐商品 -->
-        <!-- <view class="flex-center rel xc-linellae-frame">
-          <view class="xc-linellae"></view>
-          <view class="abs flex-center xc-recommend-frame ">
-            <image class=" xc-recommend" src="{{iurl}}/miniapp/images/diamond.png">
-            </image>
-            <view class="xc-recommend-word">推荐</view>
+
+
+
+
+				<!-- 图文详情 -->
+				<view class="t_g_info bdt16">
+				  <view class="red_shu"></view>
+				  <view class="fs30 bold">商品详情</view>
+				</view>
+				<view class="pd20"> 
+					<view class="table_s" wx:if="{{service_list}}">
+          <view class="tb_item tb-l">
+            <view class="item_left f1">
+              <text>项目名称</text>
+            </view>
+						<view class="item_left f1">
+						  <text>耗时(分)</text>
+						</view>
+						<view class="item_left f1">
+						  <text>次数</text>
+						</view>
           </view>
-        </view>     
-         <goods_recommend id="goods_list"></goods_recommend> -->
+          <view class="tb_item tb-l" wx:for="{{service_list}}">
+            <view class="item_right f1">
+              <text>{{item.projectName}}</text>
+            </view>
+						<view class="item_right f1">
+						  <text>{{item.timeConsuming}}</text>
+						</view>
+						<view class="item_right f1">
+						  <text>{{item.frequency}}</text>
+						</view>
+          </view>
+        </view>
-      </view>
+					<view class="wxParse">
+						<template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
+					</view>
-	</view>
-  </view>
-  <!---滚动到顶部---->
-  <view bindtap="doScrollTop" class="toTop" wx:if="{{supportPageScroll}}">
-    <image class="wh100" src="{{iurl}}/miniapp/images/topup.png"></image>
-  </view>
-
-  <!-- 底部按钮 -->
-  <view class="join-cart jc_sb">
-
-			<view class="flex">
-				<button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split f1"  open-type="contact"  session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}" style="text-align: center">
-				    <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
-				    <view>客服</view>
-				</button>
-
-                <view wx:elif="{{sys_switch.weapp_customertype==2}}" class="custom-service cart-ico new_split f1" bindtap="con_weixin" style="text-align: center">
-                    <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
-                    <view>客服</view>
-                </view>
-
-				<view wx:else class="custom-service cart-ico new_split f1" bindtap="contactService" style="text-align: center">
-					<image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
-					<view>客服</view>
 				</view>
-				
-				  <view class="shopping-cart cart-ico new_split f1">
-				    <navigator open-type="switchTab" url="/pages/cart/cart/cart" style="text-align: center">
-				      <image class="sc-img" src="{{iurl}}/miniapp/images/shopping-cart.png"></image>
-				      <view class="cart-num ellipsis-1"> {{cartGoodsNum}} </view>
-				      <view>购物车</view>
-				    </navigator>
-				  </view>
 			</view>
-    
- 
-    <view class="flex f1 pdh20">
-      <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn f1">加入购物车</view>
-      <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn f1">立即购买</view>
-    </view>
- 
-  </view>
-
-  <!--  制作一个圆球导航  -->
-  <nav_box></nav_box>
+			<view class="goods-norms" hidden="{{activeCategoryId==1?false:true}}">
+				<view class="pd20">
+					<view class="table_s" wx:if="{{service_list}}">
+				  <view class="tb_item tb-l">
+				    <view class="item_left f1">
+				      <text>项目名称</text>
+				    </view>
+						<view class="item_left f1">
+						  <text>耗时(分)</text>
+						</view>
+						<view class="item_left f1">
+						  <text>次数</text>
+						</view>
+				  </view>
+				  <view class="tb_item tb-l" wx:for="{{service_list}}">
+				    <view class="item_right f1">
+				      <text>{{item.projectName}}</text>
+				    </view>
+						<view class="item_right f1">
+						  <text>{{item.timeConsuming}}</text>
+						</view>
+						<view class="item_right f1">
+						  <text>{{item.frequency}}</text>
+						</view>
+				  </view>
+				</view>
+				
+					<view class="wxParse">
+						<template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
+					</view>
+				
+				</view>
+			</view>
+
+		</view>
+	</view>
+	<!---滚动到顶部---->
+	<view bindtap="doScrollTop" class="toTop" wx:if="{{supportPageScroll}}">
+		<image class="wh100" src="{{iurl}}/miniapp/images/topup.png"></image>
+	</view>
+
+	<!-- 底部按钮 -->
+	<view class="join-cart jc_sb">
+
+		<view class="flex">
+			<button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split f1" open-type="contact"
+			 session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}" style="text-align: center">
+				<image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
+				<view>客服</view>
+			</button>
+
+			<view wx:elif="{{sys_switch.weapp_customertype==2}}" class="custom-service cart-ico new_split f1" bindtap="con_weixin"
+			 style="text-align: center">
+				<image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
+				<view>客服</view>
+			</view>
+
+			<view wx:else class="custom-service cart-ico new_split f1" bindtap="contactService" style="text-align: center">
+				<image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
+				<view>客服</view>
+			</view>
+
+			<view class="shopping-cart cart-ico new_split f1">
+				<navigator open-type="switchTab" url="/pages/cart/cart/cart" style="text-align: center">
+					<image class="sc-img" src="{{iurl}}/miniapp/images/shopping-cart.png"></image>
+					<view class="cart-num ellipsis-1"> {{cartGoodsNum}} </view>
+					<view>购物车</view>
+				</navigator>
+			</view>
+		</view>
+
+
+		<view class="flex f1 pdh20">
+
+			<view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn f1">加入购物车</view>
+			<view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn f1">立即购买</view>
+		</view>
+
+	</view>
+
+	<!--  制作一个圆球导航  -->
+	<nav_box></nav_box>
 </block>
 <!-- 弹起来,选择规格数量,普通商品购买和秒杀 -->
 <view hidden="{{!openSpecModal}}">
-  <view bindtap="closeSpecModal" class="cover-layer"></view> 
-  <view class="spec-model">
-    <view class="pding"> 
-      <icon bindtap="closeSpecModal" class="modal-close" color="black" size="22" type="cancel"></icon>
-      <view class="spec-goods">
-        <image class="wh100 spec-img" src="{{iurl}}{{data.image_url?data.image_url:'miniapp/images/default_g_img.gif'}}" binderror="pop_err_img" data-errorimg="data.image_url"/>
-        <view class="spec-goods-info">
-			<view class="spec-goods-name ellipsis-2">{{data.goods_name}}</view>      
-            <view class="flex ai_end xc-val-money" >
-                <view class="spec-goods-price"><text class="fs20">￥</text><block wx>{{data.shop_price}}</block></view>
-            </view>
-        </view> 
-       </view>
-	   
-	   <!-- 选择门店模块 -->
-	   <view  class="flex-space-between address ai_end xc-width" style="padding-top: 30rpx;">
-	                <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
-	                  <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
-	                    <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}">
-	                     距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
-	                    
-	                     </view>
-	                </view>
-	   			 
-	                <!-- 没有门店的时候 -->
-	                <view  class="flex" bindtap="choice_store" wx:else>
-	                      <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
-	                      <view class="fs30" style="color:black;">选择门店</view>						  
-	                 </view>
-	   
-	                 <view class="red-co fs28" bindtap="choice_store" >更多门店<text class="right-arrow"></text></view>
-	              </view>
-	   		   <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
-	   		   <block wx:else>
-	   		         <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
-	   				 <block wx:else>
-	   					  <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
-	   			     	  <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">(库存不足)</view>
-	   				 </block>				       
-	   		   </block>
-	   		   	   
-	           <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store && def_pick_store.fulladdress}}">地址:{{def_pick_store.fulladdress}}</view>
-	    </view>
-
-    
-
-       <view class="b_num">
-          <view>购买数量</view>
-          <view class="count">
-             <view bindtap="subCartNum" class="sub {{goodsInputNum <= 1 ? 'active':''}}">-</view>
-             <input bindblur="inputCartNum" type="number" value="{{goodsInputNum}}"></input>
-             <view bindtap="addCartNum" class="add">+</view>
-          </view>
-       </view>
-      
-	  
-
-	  <view class="spec-cart-btns">	
-	           <view wx:if="{{def_pick_store && def_pick_store.is_no_dis}}" class="spec-cart-btn fs32" data-action="add" 
-			          style="background-color: #dcdcdc;color: #999;">配送不匹配</view>
-	  		   <block wx:else>
-	  
-	  			   <!-- 根本就找不到门店 -->
-	  			   <block wx:if="{{!only_pk && !def_pickpu_list}}">
-	  				   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view>		   
-	  			   </block>		 
-	  			   <block wx:else>
-	  			   
-	  						  
-	  				  <block wx:if="{{only_pk.length && !only_pk.length}}">
-	  					   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view>
-	  				  </block>  	  
-	  				  <block wx:else>
-	  					  <block wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">
-	  						   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>
-	  					 </block>
-	  					 <block wx:else>
-	  						 <block wx:if="{{!def_pick_store}}">
-	  							 <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">请先选择门店</view>
-	  						 </block>					 
-	  						 <block wx:else>	 						 						  
-	  							 <!-- 如果是线下库存购买的时候,且是普通商品购买的时候 -->
-	  							 <block wx:if="{{sales_rules==2 && prom_type==0}}">
-	  								 <block wx:if="{{!def_pick_store.CanOutQty}}">
-	  									   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>						 
-	  								 </block>
-	  								 <block wx:else>
-	  									  <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}"  
-	  										   class="spec-cart-btn yellow fs32" data-action="add">加入购物车</view>
-	  									  <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}" 
-	  										   class="spec-cart-btn spec-buy" data-action="buy">
-	  										   {{sele_g.offline_price?"券后购买":"立即购买"}}										   
-	  									  </view> 
-	  								 </block>			 
-	  							 </block>
-	  							 <!-- 线上销售 -->
-	  							 <block wx:else>
-	  								 <block wx:if="{{sele_g.store_count<=0}}">
-	  									  <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>	
-	  								 </block>
-	  								 <block wx:else>
-	  									 <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}"  
-	  										 class="spec-cart-btn yellow fs32 {{!sto_sele_name?'gray':''}}" data-action="add">加入购物车</view>
-	  									 <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}"
-	  										 class="spec-cart-btn spec-buy {{!sto_sele_name?'gray':''}}" data-action="buy">
-	  										 {{sele_g.offline_price?"券后购买":"立即购买"}}
-	  									</view> 
-	  								 </block>
-	  							 </block>
-	  						 </block>									 
-	  					 </block>
-	  			  </block>  			
-	  			   </block>				   
-	      
-	        </block>
-	  </view>
-	  
-       
-
-      <view class="clear"></view>
-      
-    </view>   
+	<view bindtap="closeSpecModal" class="cover-layer"></view>
+	<view class="spec-model">
+		<view class="pding">
+			<icon bindtap="closeSpecModal" class="modal-close" color="black" size="22" type="cancel"></icon>
+			<view class="spec-goods">
+				<image class="wh100 spec-img" src="{{iurl}}{{data.image_url?data.image_url:'miniapp/images/default_g_img.gif'}}"
+				 binderror="pop_err_img" data-errorimg="data.image_url" />
+				<view class="spec-goods-info">
+					<view class="spec-goods-name ellipsis-2">{{data.goods_name}}</view>
+					<view class="flex ai_end xc-val-money">
+						<view class="spec-goods-price"><text class="fs20">￥</text>
+							<block wx>{{data.shop_price}}</block>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- 选择门店模块 -->
+			<view class="flex-space-between address ai_end xc-width" style="padding-top: 30rpx;">
+				<view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
+					<text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
+					<view class="distance fs24 xc-ash" wx:if="{{def_pick_store.distance!=null}}">
+						距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
+
+					</view>
+				</view>
+
+				<!-- 没有门店的时候 -->
+				<view class="flex" bindtap="choice_store" wx:else>
+					<image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
+					<view class="fs30" style="color:black;">选择门店</view>
+				</view>
+
+				<view class="red-co fs28" bindtap="choice_store">更多门店<text class="right-arrow"></text></view>
+			</view>
+			<view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
+			<block wx:else>
+				<view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
+				<block wx:else>
+					<view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
+					<view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">(库存不足)</view>
+				</block>
+			</block>
+
+			<view class="fs24 xc-ash-9f xc-distance-top " wx:if="{{def_pick_store && def_pick_store.fulladdress}}">地址:{{def_pick_store.fulladdress}}</view>
+		</view>
+
+
+
+		<view class="b_num">
+			<view>购买数量</view>
+			<view class="count">
+				<view bindtap="subCartNum" class="sub {{goodsInputNum <= 1 ? 'active':''}}">-</view>
+				<input bindblur="inputCartNum" type="number" value="{{goodsInputNum}}"></input>
+				<view bindtap="addCartNum" class="add">+</view>
+			</view>
+		</view>
+
+
+
+		<view class="spec-cart-btns">
+			<view wx:if="{{def_pick_store && def_pick_store.is_no_dis}}" class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">配送不匹配</view>
+			<block wx:else>
+
+				<!-- 根本就找不到门店 -->
+				<block wx:if="{{!only_pk && !def_pickpu_list}}">
+					<view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view>
+				</block>
+				<block wx:else>
+
+
+					<block wx:if="{{only_pk.length && !only_pk.length}}">
+						<view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view>
+					</block>
+					<block wx:else>
+						<block wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">
+							<view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>
+						</block>
+						<block wx:else>
+							<block wx:if="{{!def_pick_store}}">
+								<view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">请先选择门店</view>
+							</block>
+							<block wx:else>
+								<!-- 如果是线下库存购买的时候,且是普通商品购买的时候 -->
+								<block wx:if="{{sales_rules==2 && prom_type==0}}">
+									<block wx:if="{{!def_pick_store.CanOutQty}}">
+										<view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>
+									</block>
+									<block wx:else>
+										<view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn yellow fs32"
+										 data-action="add">加入购物车</view>
+										<view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn spec-buy"
+										 data-action="buy">
+											{{sele_g.offline_price?"券后购买":"立即购买"}}
+										</view>
+									</block>
+								</block>
+								<!-- 线上销售 -->
+								<block wx:else>
+									<block wx:if="{{sele_g.store_count<=0}}">
+										<view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>
+									</block>
+									<block wx:else>
+										<view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn yellow fs32 {{!sto_sele_name?'gray':''}}"
+										 data-action="add">加入购物车</view>
+										<view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn spec-buy {{!sto_sele_name?'gray':''}}"
+										 data-action="buy">
+											{{sele_g.offline_price?"券后购买":"立即购买"}}
+										</view>
+									</block>
+								</block>
+							</block>
+						</block>
+					</block>
+				</block>
+
+			</block>
+		</view>
+
+
+
+		<view class="clear"></view>
+
+	</view>
 </view>
 <!-- 选择门店的弹框，1.1版最新的 -->
 <block wx:if="{{store==1}}">
-  <view class="mongolia-layer" bindtap="close_popup"></view>
-  <view class="popup-frame">
-  <block  wx:if="{{sort_store==0}}">
-  <!-- 头部 标题 -->
-     <view class="popup-top flex-space-between">
-       <text class="fs32 nearby_store">{{choice_sort_store==0?'附近的门店':region_name}}</text>
-        <view>
-           <view>
-              <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon>
-           </view>
-           <view class="felx choose_more" bindtap="more_store" wx:if="{{is_show_sto_cat>0}}" >
-              <text class="fs26 red-co">{{choice_sort_store==0?'更多门店':'返回'}}</text>
-              <view class="bg_rights"></view>
-           </view>
-          </view>
-       </view>
-          <!-- 门店列表，最外层的门店列表，一开始 -->
-          <view class="store-list">
-              <!--如果还没有点击更多门店的时候  -->
-              <block wx:if="{{choice_sort_store==0}}">
-                  <!-- 需要for循环 -->
-                  <block wx:if="{{is_show_sto_cat==1}}">
-                      <view class="store_choose flex" wx:for="{{def_pickpu_list}}" bindtap="choose_for_store_fir" data-ind="{{index}}">
-                  <view class="store flex-vertical">
-                <!-- 需要点击事件 -->
-                <block wx:if="{{index==fir_pick_index}}">
-               <view class="circle white xc-hook fs20 red-b">Г</view>
-             </block>
-                <block wx:else>
-               <view class="circle  xc-hooks"></view>
-             </block>
-                <view class="address-frame xc-ash">
-              <view class="flex-vertical-between butttem5">
-                  <view class="flex xc-ash">
-                       <view class="fs30 xc-black3 address_name">{{item.pickup_name}}</view>
-                   </view>
-                  <view>
-                    <view class="distance fs24 address-val"wx:if="{{item.distance!=null}}">
-                    距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+'km':filters.toFix(item.distance,0)+"m"}}</view>
-                  </view>
-              </view>
-              <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
-            </view>
-            </view>
-                 </view>
-                  </block>
-                  <block wx:else>
-                           <view class="store_choose flex" wx:for="{{only_pk}}" bindtap="choose_for_store_fir" data-ind="{{index}}">
-               <view class="store flex-vertical">
-                 <!-- 需要点击事件 -->
-                 <block wx:if="{{index==fir_pick_index}}" >
-                   <view  class="circle white xc-hook fs20 red-b">Г</view>
-                 </block>
-                 <block wx:else>
-                   <view  class="circle  xc-hooks"></view>
-                 </block>
-
-                 <view class="address-frame xc-ash">
-                   <view class="flex-vertical-between ">
-                     <view class="flex xc-ash">
-                       <view class="fs30 xc-black3 address_name">{{item.pickup_name}}</view>
-                     </view>
-                     <view>
-                       <view class="distance fs24 address-val"
-                       wx:if="{{item.distance!=null}}">距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}}
-                     </view>
-                     </view>
-                   </view>
-                   <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
-                 </view>
-               </view>
-             </view>
-                   </block>
-              </block>
-              <block wx:else> <!-- 如果是点击选择门店分类后显示分类下的门店  -->
-                   <view class="store_choose flex" wx:for="{{sec_sto.s_arr}}" data-ind="{{index}}"  bindtap="choose_for_store">
-                  <view class="store flex-vertical">
-                    <!-- 需要点击事件 -->
-                    <block wx:if="{{index==sec_pick_index}}">
-                      <view  class="circle white xc-hook fs20 red-b">Г</view>
-                    </block>
-                    <block wx:else>
-                      <view class="circle  xc-hooks"></view>
-                    </block>
-
-                    <view class="address-frame xc-ash">
-                      <view class="flex-vertical-between ">
-                        <view class="flex xc-ash">
-                          <view class="fs28 xc-black3 address_name">{{item.pickup_name}}</view>
-                        </view>
-                        <view>
-                          <view class="distance fs24 address-val"wx:if="{{item.distance!=null}}">
-							  距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}}</view>
-                        </view>
-                      </view>
-                      <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
-                    </view>
-                  </view>
-                </view>
-              </block>
-
-           </view>
-
-           <!-- 门店列表底部 -->
-           <view class="store-bottom-frame">
-              <view class="store-bottom flex-vertical-between">
-                <view class="determine red-b fs28 white t-c" bindtap="sure_pick" 
-                data-openindstore="{{open_ind_store}}">确定</view>
-                <view class="default  t-c fs28" bindtap="set_def_pick"data-openindstore="{{open_ind_store}}">设为默认</view>
-             </view>
-          </view>
-       
-     </block>
-
-
-       <block wx:else>
-         <view class="popup-top flex-space-between">
-       <text class="fs32 nearby_store">门店分类选择</text>
-        <view>
-           <view>
-              <icon bindtap="close_popup" class="modal-closes" color="black" size="22"       type="cancel"></icon>
-           </view>
-           <view class="felx choose_mores" bindtap="returns">
-              <text class="fs26 red-co">返回</text>
-           </view>
-          </view>
-       </view>
-       <view class="sort_store_list"> 
-
-          <view class="sort-store-frame" wx:for="{{all_sto}}" data-index="{{index}}" bindtap="choice_sort_store" data-region="{{item.name}}">
-              <view class="sort-store flex-vertical-between" >
-                  <view class="fs30" di>{{item.name}}</view>
-                  <view class="black_rights-frame">
-                      <view class="black_rights"></view>
-                </view>
-             </view>
-          </view>
+	<view class="mongolia-layer" bindtap="close_popup"></view>
+	<view class="popup-frame">
+		<block wx:if="{{sort_store==0}}">
+			<!-- 头部 标题 -->
+			<view class="popup-top flex-space-between">
+				<text class="fs32 nearby_store">{{choice_sort_store==0?'附近的门店':region_name}}</text>
+				<view>
+					<view>
+						<icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon>
+					</view>
+					<view class="felx choose_more" bindtap="more_store" wx:if="{{is_show_sto_cat>0}}">
+						<text class="fs26 red-co">{{choice_sort_store==0?'更多门店':'返回'}}</text>
+						<view class="bg_rights"></view>
+					</view>
+				</view>
+			</view>
+			<!-- 门店列表，最外层的门店列表，一开始 -->
+			<view class="store-list">
+				<!--如果还没有点击更多门店的时候  -->
+				<block wx:if="{{choice_sort_store==0}}">
+					<!-- 需要for循环 -->
+					<block wx:if="{{is_show_sto_cat==1}}">
+						<view class="store_choose flex" wx:for="{{def_pickpu_list}}" bindtap="choose_for_store_fir" data-ind="{{index}}">
+							<view class="store flex-vertical">
+								<!-- 需要点击事件 -->
+								<block wx:if="{{index==fir_pick_index}}">
+									<view class="circle white xc-hook fs20 red-b">Г</view>
+								</block>
+								<block wx:else>
+									<view class="circle  xc-hooks"></view>
+								</block>
+								<view class="address-frame xc-ash">
+									<view class="flex-vertical-between butttem5">
+										<view class="flex xc-ash">
+											<view class="fs30 xc-black3 address_name">{{item.pickup_name}}</view>
+										</view>
+										<view>
+											<view class="distance fs24 address-val" wx:if="{{item.distance!=null}}">
+												距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+'km':filters.toFix(item.distance,0)+"m"}}</view>
+										</view>
+									</view>
+									<view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
+								</view>
+							</view>
+						</view>
+					</block>
+					<block wx:else>
+						<view class="store_choose flex" wx:for="{{only_pk}}" bindtap="choose_for_store_fir" data-ind="{{index}}">
+							<view class="store flex-vertical">
+								<!-- 需要点击事件 -->
+								<block wx:if="{{index==fir_pick_index}}">
+									<view class="circle white xc-hook fs20 red-b">Г</view>
+								</block>
+								<block wx:else>
+									<view class="circle  xc-hooks"></view>
+								</block>
+
+								<view class="address-frame xc-ash">
+									<view class="flex-vertical-between ">
+										<view class="flex xc-ash">
+											<view class="fs30 xc-black3 address_name">{{item.pickup_name}}</view>
+										</view>
+										<view>
+											<view class="distance fs24 address-val" wx:if="{{item.distance!=null}}">距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}}
+											</view>
+										</view>
+									</view>
+									<view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
+								</view>
+							</view>
+						</view>
+					</block>
+				</block>
+				<block wx:else>
+					<!-- 如果是点击选择门店分类后显示分类下的门店  -->
+					<view class="store_choose flex" wx:for="{{sec_sto.s_arr}}" data-ind="{{index}}" bindtap="choose_for_store">
+						<view class="store flex-vertical">
+							<!-- 需要点击事件 -->
+							<block wx:if="{{index==sec_pick_index}}">
+								<view class="circle white xc-hook fs20 red-b">Г</view>
+							</block>
+							<block wx:else>
+								<view class="circle  xc-hooks"></view>
+							</block>
+
+							<view class="address-frame xc-ash">
+								<view class="flex-vertical-between ">
+									<view class="flex xc-ash">
+										<view class="fs28 xc-black3 address_name">{{item.pickup_name}}</view>
+									</view>
+									<view>
+										<view class="distance fs24 address-val" wx:if="{{item.distance!=null}}">
+											距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}}</view>
+									</view>
+								</view>
+								<view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
+							</view>
+						</view>
+					</view>
+				</block>
+
+			</view>
-       </view>
-       </block>
-  </view>
-</block>  
+			<!-- 门店列表底部 -->
+			<view class="store-bottom-frame">
+				<view class="store-bottom flex-vertical-between">
+					<view class="determine red-b fs28 white t-c" bindtap="sure_pick" data-openindstore="{{open_ind_store}}">确定</view>
+					<view class="default  t-c fs28" bindtap="set_def_pick" data-openindstore="{{open_ind_store}}">设为默认</view>
+				</view>
+			</view>
+
+		</block>
+
+
+		<block wx:else>
+			<view class="popup-top flex-space-between">
+				<text class="fs32 nearby_store">门店分类选择</text>
+				<view>
+					<view>
+						<icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon>
+					</view>
+					<view class="felx choose_mores" bindtap="returns">
+						<text class="fs26 red-co">返回</text>
+					</view>
+				</view>
+			</view>
+			<view class="sort_store_list">
+
+				<view class="sort-store-frame" wx:for="{{all_sto}}" data-index="{{index}}" bindtap="choice_sort_store" data-region="{{item.name}}">
+					<view class="sort-store flex-vertical-between">
+						<view class="fs30" di>{{item.name}}</view>
+						<view class="black_rights-frame">
+							<view class="black_rights"></view>
+						</view>
+					</view>
+				</view>
+
+			</view>
+		</block>
+	</view>
+</block>
 <!--  ---------------分享弹窗--------------- -->
 <!--二维码显示页面-->
 <canvas canvas-id='share' style='width:750rpx;height:1217rpx;background-color:white;' wx:if='{{!canvasHidden}}'></canvas>
@@ -473,14 +507,13 @@
 <view wx:if="{{showPoster}}">
- <view class="mask" catchtap="closePoster"></view>
- <view class="poster-container">
-  <view class="poster-wrapper">
-   <view class="poster">
-        <image src="{{shareImgPath}}" class="poster-img" show-menu-by-longpress></image>
-        <view class="btn-close" catchtap="closePoster"><text class="iconfont icon-close"></text></view>
-   </view>  
-  </view>
- </view>
+	<view class="mask" catchtap="closePoster"></view>
+	<view class="poster-container">
+		<view class="poster-wrapper">
+			<view class="poster">
+				<image src="{{shareImgPath}}" class="poster-img" show-menu-by-longpress></image>
+				<view class="btn-close" catchtap="closePoster"><text class="iconfont icon-close"></text></view>
+			</view>
+		</view>
+	</view>
 </view>
-
@@ -3,7 +3,10 @@
 image {
     vertical-align: top;
 }
-.goods-detail{overflow: hidden}
+.goods-detail{
+	/* overflow: hidden */
+	padding-top: 78rpx;
+}
 .type-navbar {
     display: flex;
@@ -56,6 +59,7 @@ image {
 .swiper_box {
     width: 100%;
     height: 750rpx;
+		background-color: #f2f2f2;
 }
 .goods-title {
     display: flex;
@@ -1006,10 +1010,10 @@ left:31rpx;}
 .red_shu{ width: 10rpx; height: 36rpx; background-color:#da0035; margin-right: 8rpx; }
 .tb-l{ /* line-height: 96rpx; */}
-.table_s{ border:#e4e4e4 1rpx solid; box-sizing: border-box;font-size: 26rpx;}
+.table_s{ border:#e4e4e4 1rpx solid; box-sizing: border-box;font-size: 26rpx;border-right: none;}
 .tb_item{display: flex; /* height: 96rpx; */ border-bottom: 1rpx solid #e4e4e4 }
 .item_left{width: 210rpx; height: 100%; box-sizing:border-box; text-align: center;padding: 20rpx; background: #f9f9f9 ;border-right:2rpx solid #e4e4e4} .item_left text{ /* margin-left: 44rpx; */}
-.item_right{flex:1; height: 100%; overflow : hidden;white-space:nowrap;text-overflow: ellipsis; padding: 20rpx;}
+.item_right{flex:1; height: 100%; overflow : hidden;white-space:nowrap;text-overflow: ellipsis; padding: 20rpx;border-right:2rpx solid #e4e4e4;text-align: center;}
 .item_right text{ /* margin-left: 66rpx; */}
 .table_s .tb-l:last-child {border-bottom: none;}
@@ -187,64 +187,102 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  // onShareAppMessage: function () {
-	 //  var th = this;	  
-	 //  //礼包的转发
-	 //  if(th.data.currentIndex==3){
-		//   var lbid=th.data.hui_active.lbId;
-		//   var url="pages/giftpack/giftpacklist/giftpacklist?lbId="+lbid+"&isBuy=1";
-		//   if(getApp().globalData.user_id){
-		//       url+="&first_leader="+getApp().globalData.user_id;
-		//   }	 		  
-		//   var img=this.data.share_img;	
-		//   var title=th.data.hui_active.giftTitle;
+  onShareAppMessage: function () {
+		
+		var store_name = getApp().globalData.config ? getApp().globalData.config.store_name:'';
+		
+		var pagePath = this.route; //当前页面url
+		
+		if(!store_name) store_name = getApp().globalData.setting.appName;
+		
+		if(pagePath.indexOf('/') != 0) {
+		   pagePath = '/' + pagePath;
+		}
+		
+		if(getApp().globalData.user_id){
+			if(pagePath.indexOf('?')>0){
+				pagePath += '&first_leader=' + getApp().globalData.user_id;
+			}else{
+				pagePath += '?first_leader=' + getApp().globalData.user_id;
+			}
+		}
+		return {
+		  title: store_name + '-积分购',
+		  path: pagePath,
+		}
+	  // var th = this;	  
+	  // //礼包的转发
+	  // if(th.data.currentIndex==3){
+		 //  var lbid=th.data.hui_active.lbId;
+		 //  var url="pages/giftpack/giftpacklist/giftpacklist?lbId="+lbid+"&isBuy=1";
+		 //  if(getApp().globalData.user_id){
+		 //      url+="&first_leader="+getApp().globalData.user_id;
+		 //  }	 		  
+		 //  var img=this.data.share_img;	
+		 //  var title=th.data.hui_active.giftTitle;
-		//   var ob={
-		//     title:title,
-		//     path:url,
-		//     imageUrl: img,
-		//   };	
-		//   th.setData({share_hidden:1});	  			 
-		//   return ob;		  
+		 //  var ob={
+		 //    title:title,
+		 //    path:url,
+		 //    imageUrl: img,
+		 //  };	
+		 //  th.setData({share_hidden:1});	  			 
+		 //  return ob;		  
-	 //  }else{
-		//   //---秒杀，拼团，促销---  
-		//   var item=this.data.share_good;
-		//   if(item){
-		// 	  var price = item.shop_price;
-		// 	  var title= item.goods_name;		
-		// 	  var img=this.data.url+item.original_img;		  
-		// 	  var url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + th.data.gid;
-		// 	  if(getApp().globalData.user_id){
-		// 	    url+="&first_leader="+getApp().globalData.user_id;
-		// 	  }	  
-		// 	  var ob={
-		// 	    title: price + "元  " +title,
-		// 	    path:url,
-		// 	    imageUrl: img,
-		// 	  };	
-		// 	  th.setData({share_hidden:1,share_good:null});	  			 
-		// 	  return ob;
-		//   }else{
-		// 	  var url="/pages/index/index/index";
-		// 	  if(getApp().globalData.user_id){
-		// 	      url+="?first_leader="+getApp().globalData.user_id;
-		// 	  }	  
-		// 	  var hui_active=this.data.hui_active;		  
-		// 	  var title=hui_active.name;
-		// 	  if(!title) title=hui_active.main_goods_name;
-		// 	  if(!title) title=hui_active.giftTitle;
+	  // }else{
+		 //  //---秒杀，拼团，促销---  
+		 //  var item=this.data.share_good;
+		 //  if(item){
+			//   var price = item.shop_price;
+			//   var title= item.goods_name;		
+			//   var img=this.data.url+item.original_img;		  
+			//   var url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + th.data.gid;
+			//   if(getApp().globalData.user_id){
+			//     url+="&first_leader="+getApp().globalData.user_id;
+			//   }	  
+			//   var ob={
+			//     title: price + "元  " +title,
+			//     path:url,
+			//     imageUrl: img,
+			//   };	
+			//   th.setData({share_hidden:1,share_good:null});	  			 
+			//   return ob;
+		 //  }else{
+			//   var url="/pages/index/index/index";
+			//   if(getApp().globalData.user_id){
+			//       url+="?first_leader="+getApp().globalData.user_id;
+			//   }	  
+			//   var hui_active=this.data.hui_active;		  
+			//   var title=hui_active.name;
+			//   if(!title) title=hui_active.main_goods_name;
+			//   if(!title) title=hui_active.giftTitle;
-		// 	  var ob={
-		// 	    title: title,
-		// 	    path:url,
-		// 	  };	
-		// 	  th.setData({share_hidden:1,share_good:null});	  			 
-		// 	  return ob;				
-		//   }		
-	 //  }
+			//   var ob={
+			//     title: title,
+			//     path:url,
+			//   };	
+			//   th.setData({share_hidden:1,share_good:null});	  			 
+			//   return ob;				
+		 //  }		
+	  // }
-  // },
+  },
+	
+	
+	onShareTimeline() {
+		var store_name = getApp().globalData.config ? getApp().globalData.config.store_name:'';
+		
+		var pagePath = this.route; //当前页面url
+		
+		if(!store_name) store_name = getApp().globalData.setting.appName;
+		if(pagePath.indexOf('/') != 0) {
+		  pagePath = '/' + pagePath;
+		}
+		return {
+		  title: store_name + '-积分购',
+		  path: pagePath,
+		}
+	},
 	//-- 点击tab --
@@ -10,10 +10,23 @@ Page({
 		isLoading: false, // 检测是否已经发送请求,防止重复发送请求
 		noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据
 		pageNum: 1, // 当前页数
+		max_sw_height: 0,
   },
-  onLoad: function () {
+  onLoad: function (options) {
 		self = this;
+		
+		var first_leader = options.first_leader;
+		if(first_leader) {
+			app.globalData.first_leader = first_leader;
+			//调用接口判断是不是会员
+		// 	app.request.promiseGet("/api/weshop/shoppingGuide/get/" + app.globalData.setting.stoid + "/" + first_leader, {}).then(res => {
+		// 			if (res.data.code == 0) {
+		// 					getApp().globalData.guide_id = res.data.data.id;
+		// 			}
+		// 	})
+		};
+		
 		app.isLogin().then(function(data) {
 			self.setData({
 				userInfo: data,
@@ -173,5 +186,54 @@ Page({
 		};
 	},
+	
+	/**
+	 * 用户点击右上角分享
+	 */
+	onShareAppMessage: function (e) {
+	    var pagePath = this.route; //当前页面url
+	    if (pagePath.indexOf('/') != 0) {
+	        pagePath = '/' + pagePath;
+	    }
+	    if(getApp().globalData.user_id){
+	
+	        if(pagePath.indexOf("?")>0){
+	            pagePath+="&first_leader="+getApp().globalData.user_id;
+	        }else{
+	            pagePath+="?first_leader="+getApp().globalData.user_id;
+	        }
+	    }
+	    return {
+	        title: "幸运购活动列表",
+	        path: pagePath,
+	    }
+	},
+	
+	// onShareTimeline() {
+	// 	var store_name = getApp().globalData.config ? getApp().globalData.config.store_name:'';
+	// 	var pagePath = this.route; //当前页面url
+		
+	// 	if(!store_name) store_name = getApp().globalData.setting.appName;
+	// 	if (pagePath.indexOf('/') != 0) {
+	// 	  pagePath = '/' + pagePath;
+	// 	}
+	// 	return {
+	// 	  title: store_name + '-幸运购活动列表',
+	// 	  path: pagePath,
+	// 	}
+	// },
+	
+	imageLoad: function (e) {
+	  var imgwidth = e.detail.width;
+	  var imgheight = e.detail.height;
+	  //宽高比
+	  var ratio = imgwidth / imgheight;
+	  //计算的高度值
+	  var viewHeight = 715 / ratio;
+	  if (this.data.max_sw_height < viewHeight) this.setData({
+	    max_sw_height: viewHeight
+	  });
+	},
+	
 })
 <wxs module="filters" src="../../../../utils/filter.wxs"></wxs>
 <view>
 	<!-- 广告图 -->
-	<swiper class="ad-container" circular="true" autoplay="true" indicator-dots="true" interval="2500" indicator-active-color="rgba(255,255,255,.5)" wx:if="{{adList && adList.length != 0}}">
+	<swiper class="ad-container" circular="true" autoplay="true" indicator-dots="true" interval="2500" indicator-active-color="rgba(255,255,255,.5)" wx:if="{{adList && adList.length != 0}}" style="height:{{max_sw_height}}rpx">
 		<swiper-item wx:for="{{adList}}">
 			<navigator url="{{item.ad_weapplink}}" style="height: 100%;" hover-class="none" open-type="reLaunch">
-				<image src="{{imghost + item.ad_code}}" class="img-block" bindload="imageLoad" data-index="{{index}}" mode="scaleToFill" lazy-load="true"/>
+				<image src="{{imghost + item.ad_code}}" class="img-block" bindload="imageLoad" data-index="{{index}}" lazy-load="true" mode="widthFix"/>
 			</navigator>
 		</swiper-item>
 	</swiper>
 	<view class="list">	
 		<block wx:for="{{list.pageData}}">
-			<view class="list-item" wx:if="{{item.status == 1}}" bindtap="go" data-url="/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id={{item.goods_id}}&prom_type=9&group_id={{item.id}}">
+			<view class="list-item" wx:if="{{item.status == 1}}" bindtap="{{item.actLen == 0 ? '':'go'}}" data-url="/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id={{item.goods_id}}&prom_type=9&group_id={{item.id}}">
 				<view class="flex ai-center">
 					<view class="img-container">
 						<image class="img-block" src="{{imghost + item.original_img}}" data-val="{{item.original_img}}"
@@ -26,7 +26,8 @@
 							</view>
 							<view class="flex jc_sb">
 								<progress class="pdr20 f1 progress" percent="{{filters.percent(item.num, item.group_num)}}" activeColor="#FF6768" backgroundColor="#d0d0d0" border-radius="12" stroke-width="12" data-content="{{item.num}}人已参团"></progress>
-								<view class="btn fs26">去参团</view>
+								<view class="btn fs26 {{item.actLen == 0 ? 'gray':''}}" wx:if="{{item.actLen == 0}}">已抢光</view>
+								<view class="btn fs26" wx:else>去参团</view>
 							</view>
 						</view>
@@ -4,7 +4,7 @@ page {
 .ad-container {
 	background-color: #f2f2f2;
-	height: 400rpx;
+	/* height: 400rpx; */
 }
 .list {
@@ -20,8 +20,8 @@ page {
 }
 .img-container {
-	width: 200rpx;
-	height: 200rpx;
+	width: 220rpx;
+	height: 220rpx;
 	border-radius: 14rpx;
 	overflow: hidden;
 	flex-shrink: 0;
@@ -70,6 +70,7 @@ page {
 .name {
 	height: 88rpx;
+	word-break: break-all;
 }
 .no-more {
@@ -92,3 +93,7 @@ page {
 	color: white;
 	text-align: center;
 }
+
+.btn.gray {
+	background-color: #ccc;
+}
@@ -126,6 +126,7 @@ Page({
         user_note:{},
         zuhe_map_good:{},
     },
+		
     onLoad: function (t) {
         wx.setNavigationBarTitle({title: "填写订单",})
         var th = this;
@@ -139,10 +140,7 @@ Page({
             success: function (s) {
             }
         });
-				
-				// console.log('t=======================>', t);
-			
-			
+
     },
     onUnload: function () {
@@ -808,13 +806,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 +984,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 +1011,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 +1426,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 +1434,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 +1460,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 +2068,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 +2196,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 +2461,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 +2600,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 +3435,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 +3486,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 +3496,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 +3851,6 @@ Page({
         }
     },
-
     //取消使用线下取价
     cancle_offline: function () {
         //判断是不是立即购买
@@ -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>
+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) {
+		
+		// console.log('收到的传参', t);
+		wx.setNavigationBarTitle({
+		  title: '填写订单',
+		});
+		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;
+		
+		
+		// 获取幸运购活动团team_id
+		this.get_teamId({
+			store_id: oo.stoid,
+			user_id: getApp().globalData.user_id,
+			aid: t.group_id,
+		});
+		
+		
+		
+		
+		//如果期号有值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;
+		
+
+		//先获取物流，再获取用户信息，再展示页面
+		// this.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) {
+		// is_show为0不显示温馨提示，为1显示温馨提示
+		if(this.data.param.is_show == 1) {
+			wx.showModal({
+				title: '温馨提示',
+				content: this.data.param.alert,
+				success(res) {
+					if (res.confirm) {
+						console.log('用户点击确定');
+						self.submitForm(e);
+					} else if (res.cancel) {
+						console.log('用户点击取消');
+					}
+				}
+			});
+		} else {
+			this.submitForm(e);
+		};
+		
+	},
+
+
+	//--------------------提交订单-----------------------
+	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, //物流金额
+			'shipping_code': th.data.bn_exp_type == 1 ? 0 : th.data.wu_arr[th.data.index].code,
+			'shipping_name': th.data.bn_exp_type == 1 ? '' : th.data.wu_arr[th.data.index].name,
+			'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,
+									// })
+									
+									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,
+									});
+									
+								}, 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;
+	},
+	
+	
+	// 获取team_id
+	get_teamId(options) {
+		let aid = options.aid;
+		let store_id = options.store_id;
+		let user_id = options.user_id;
+		let url = `/api/weshop/prom/luckyActivity/page?store_id=${store_id}&is_end=0&timetype=1&id=${aid}`;
+		getApp().request.get(url, {
+			success: function(res) {
+				if(res.data.code == 0) {
+					let team_id = res.data.data.pageData[0]['team_id'];
+					wx.setStorage({
+						key: 'team_id',
+						data: team_id,
+					});
+				};
+			}
+		});
+	},
+	
+	
+	
+	
+	
+	
+});
+{
+    "navigationBarTitleText": "填写订单",
+    "enablePullDownRefresh": false,
+    "usingComponents": {
+        "warn": "/components/long_warn/long_warn"
+    }
+}
 \ No newline at end of file
+<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>
+.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;
+}
@@ -9,6 +9,8 @@ var t = require(&quot;../../../../utils/util.js&quot;),
   o = s.globalData.setting,
   os = o;
   var regeneratorRuntime = require('../../../../utils/runtime.js');
+	
+let self = null;
 Page({
   data: {
@@ -48,8 +50,13 @@ Page({
 		showRules: false,
 		isSuccess: false,
 		showPoster: false,
+		
+		luckyGoMembers: [],
+		// team_id: 0,
   },
+	
   onLoad: function (t) {
+		self = this;
 			if(t.team_id != null && t.team_id !=undefined) {
 				this.setData({
 					team_id: t.team_id,
@@ -71,7 +78,7 @@ Page({
       this.init(order_sn);
 	  //-- 自定义海报 --
-	  getApp().request.promiseGet("/api/weshop/goods/poster/page",{	
+	  getApp().request.promiseGet("/api/weshop/goods/poster/page", {	
 	  	data:{store_id:os.stoid, type:1, is_use:1 }
 	  }).then(res=>{
 	  	if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0] ){
@@ -107,9 +114,16 @@ Page({
 	onUnload: function () {
 		// 开团成功后,清除storage里的team_id
-		if(this.data.luckyGoInfo.num && this.data.luckyGoInfo.num == 0) {
-			wx.removeStorageSync('team_id');
-		};
+		// if(this.data.luckyGoInfo && this.data.luckyGoInfo.num == 0) {
+		// 	wx.removeStorageSync('team_id');
+		// };
+		// // 如果是从会员中心的幸运购列表点击进来的,退出时清除storage里的team_id
+		// if(this.data.param.from == 1) {
+		// 	let team_id = wx.getStorageSync('team_id');
+		// 	if(team_id != null && team_id != undefined) wx.removeStorageSync('team_id');
+		// };
+		
+		wx.removeStorageSync('team_id');
 	},
   //关闭展开列表
@@ -169,7 +183,7 @@ Page({
         pt_listno = "",//团编号
         pt_prom_id = 0, //活动id
         ee = this,
-        team_id = 0,//活动id
+        //team_id = 0,//活动id
         ordertx=[],//头像图片
         share_img=null,//分享图片
         teamlist=null,//活动表
@@ -306,16 +320,18 @@ Page({
     //     if(ct_price==0)  ct_price=min_price;
     // }
+
     //获取大家都在团信息
-    getApp().request.promiseGet("/api/weshop/teamlist/pageteam/1?store_id="+ os.stoid +"&is_end=0&is_show=1" , {
-      data:{page:1,pageSize:2}
-    }).then(res => {
-		if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
-			pageteam = res.data.data.pageData;
-			ee.setData({pageteam: pageteam,})  
-		}
+  //   getApp().request.promiseGet("/api/weshop/teamlist/pageteam/1?store_id="+ os.stoid +"&is_end=0&is_show=1" , {
+  //     data:{page:1,pageSize:2}
+  //   }).then(res => {
+		// if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
+		// 	pageteam = res.data.data.pageData;
+		// 	ee.setData({pageteam: pageteam,})  
+		// }
-    })
+  //   })
+
     //--当是成团的时候的操作--
     // if(order.pt_status==2 || order.pt_status==4 || order.pt_status==5){
@@ -343,9 +359,9 @@ Page({
     wx.hideLoading();
-    wx.setNavigationBarTitle({
-      title: "拼团详情",
-    });
+    // wx.setNavigationBarTitle({
+    //   title: "拼团详情",
+    // });
     // ee.countDown2();
@@ -467,8 +483,10 @@ Page({
       scene += "_" + getApp().globalData.room_id;
     };
     ///二微码
-    var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
-      os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo";
+    // var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
+    //   os.stoid + "?sceneValue=" + scene + "&pageValue=packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo";
+			var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
+			  os.stoid + "?sceneValue=" + scene + "&pageValue=packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo";
     // 读取文件成功则OK--
@@ -954,32 +972,41 @@ Page({
     //------ 分享配置 --------
     onShareAppMessage: function (e) {
-        var th=this;
-        var scene=this.data.teamgroup.id;
-        var url="/pages/team/team_show/team_show?tg_id="+scene;
-        //--分享图片--
-        var img=th.data.iurl+th.data.teamlist.share_imgurl;
-        //--把会员分享出去--
-        if(getApp().globalData.user_id){
-            if(url.indexOf("?")>0)
-                url+="&first_leader="+getApp().globalData.user_id;
-            else
-                url+="?first_leader="+getApp().globalData.user_id;
-        }
-        // console.log('url+++++>>>>>', url, th.data.teamlist.title);
-
-        var share_title=th.data.teamlist.title;
-        if(th.data.teamlist.share_title){
-            share_title=th.data.teamlist.share_title;
+        var pagePath = `packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=${this.data.param.goods_id}&prom_type=9&group_id=${this.data.param.group_id}`; //当前页面url
+				// console.log('pagePath=====xxxxxx>', pagePath);
+				var imgPath = this.data.iurl + this.data.luckyGoInfo.original_img;
+        if (pagePath.indexOf('/') != 0) {
+            pagePath = '/' + pagePath;
         }
-
+        // if(getApp().globalData.user_id){
+        	
+        //     if(pagePath.indexOf("?")>0){
+        //         pagePath+="&first_leader="+getApp().globalData.user_id;
+        //     }else{
+        //         pagePath+="?first_leader="+getApp().globalData.user_id;
+        //     }
+        // }
         return {
-            path:url,
-            title: share_title,
-            imageUrl: img,
+            title: "邀您一起参加幸运购",
+            path: pagePath,
+						imageUrl: imgPath,
         }
     },
+		// onShareTimeline() {
+		// 	// var store_name = getApp().globalData.config ? getApp().globalData.config.store_name:'';
+		// 	// var pagePath = this.route; //当前页面url
+			
+		// 	// if(!store_name) store_name = getApp().globalData.setting.appName;
+		// 	// if (pagePath.indexOf('/') != 0) {
+		// 	//   pagePath = '/' + pagePath;
+		// 	// }
+		// 	// return {
+		// 	//   title: store_name + '-幸运购活动列表',
+		// 	//   path: pagePath,
+		// 	// }
+		// },
+		
 		clickShare() {
 			this.setData({
 				share_hidden: true,
@@ -1123,55 +1150,153 @@ Page({
 		// 获取幸运购参团情况
 		async get_team_info () {
-			var th = this;
-			// 幸运购成团信息
-			await getApp().request.promiseGet("/api/weshop/prom/luckyActivity/page", {
-			  data: {
-					store_id: o.stoid,
-					is_end: 0,
-					timetype: 1,
-					id: this.data.param.group_id,
-				}
-			}).then(res => {
-			  var luckyGoInfo = res.data.data.pageData[0];
-				var team_id = luckyGoInfo.team_id;
+      var th = this;
+      var team_id;
+      var luckyGoInfo;
+      var user_id = getApp().globalData.user_id;
-				th.setData({
-					luckyGoInfo,
-					team_id,
+
+			
+      // 邀请链接待完善
+
+      getApp().request.promiseGet("/api/weshop/prom/luckyActivity/page", {
+        data: {
+              store_id: o.stoid,
+              is_end: 0,
+              timetype: 1,
+              id: th.data.param.group_id,
+          }
+      }).then(res => {
+          if(res.data.code == 0) {
+    
+              luckyGoInfo = res.data.data.pageData[0];
+              
+							
+    
+    // else {
+    //   team_id = luckyGoInfo.team_id;
+      
+    //   // 待完善
+              // 	if(luckyGoInfo.team_id == 0) {
+              // 		team_id = wx.getStorageSync('team_id');
+              // 	};
+    
+              // };
+              
+              th.setData({
+                  luckyGoInfo,
+              });
+              
+              //参团成功后,检查team_id
+              //如果team_id为0, 表示当前已开启新的一期，文字提示应改为’参团成功，本期幸运购已开团，中奖结果可点击下方查看参团列表‘
+              //如果team_id为0，取出之前保存的team_id替换掉，请求上一期已成团的幸运购活动
+              //如果从会员中心的幸运购列表邀请好友点击进来，不执行storage操作
+              if(th.data.param.from == 1) return false;
+              // if(team_id > 0) {
+              // 	wx.setStorage({
+              // 	  key: 'team_id',
+              // 	  data: team_id,
+              // 	});
+              // 	console.log('存储team_id', team_id);
+              // } else {
+              // 	let team_id2 = wx.getStorageSync('team_id');
+              // 	console.log('获取team_id', team_id2);
+              // 	th.setData({
+              // 		team_id: team_id2,
+              // 		// isSuccess: true,
+              // 	});
+              // };
+              
+              // th.setData({
+              // 	luckyGoInfo,
+              // 	team_id,
+              // });
+              
+          };
+          
+      });
+
+			if(th.data.param.from == 1) {
+			  team_id = th.data.param.team_id;
+			 } else {
+				
+				// 单独获取最新的team_id;
+				await getApp().request.promiseGet("/api/weshop/prom/luckyOrder/getUserOrderLastInfo/" + o.stoid + "/" + user_id + "/" + th.data.param.group_id, {
+				  data: {
+					}
+				}).then(res => {
+				
+					if(res.data.code == 0) {
+				    
+						// if(th.data.param.from == 1) {
+						//   team_id = luckyGoInfo.team_id;
+						//  } else {
+						// 	team_id = res.data.data.team_id;
+						// };
+						
+						team_id = res.data.data.team_id;
+						
+						
+						th.setData({
+							team_id,
+						});
+						
+					};
+					
 				});
-				//参团成功后,检查team_id
-				//如果team_id为0, 表示当前已开启新的一期，文字提示应改为’参团成功，本期幸运购已开团，中奖结果可点击下方查看参团列表‘
-				//如果team_id为0，取出之前保存的team_id替换掉，请求上一期已成团的幸运购活动
-				if(team_id != 0) {
-					wx.setStorage({
-					  key: 'team_id',
-					  data: team_id,
-					});
-				} else {
-					let team_id = wx.getStorageSync('team_id');
-					th.setData({
-						team_id: team_id,
-						isSuccess: true,
-					});
-				};
-
-			});
+			};
+			// wx.removeStorageSync('team_id');
+			
+      
 			// 幸运购成团成员
 			await getApp().request.promiseGet("/api/weshop/prom/luckyOrder/page", {
 			  data: {
 					store_id: o.stoid,
-					team_id: this.data.team_id,
+					team_id: team_id,
 				}
 			}).then(res => {
-				th.setData({
-					luckyGoMembers: res.data.data.pageData,
-				});
-			});
+				if(res.data.code == 0) {
+					console.log('当前参团成员', res, team_id);
+					let myId = getApp().globalData.userInfo.user_id;
+					let luckyGoMembers = res.data.data.pageData;
+					th.setData({
+						luckyGoMembers,
+					});
+					
+					self.isMe(myId, luckyGoMembers);
+				};
+				
+      });
+      
+      
+
 		},
+		
+		// 判断自己是否中奖
+		isMe(myId, list) {
+			list.some((item, index) => {
+				if(item.team_status == 2) {
+					if(item.user_id == myId) {
+						self.setData({
+							iWin: true
+						});
+						return true;
+					};
+				}
+			});
+		},
+		
+		
+		//-----图片失败，默认图片-----
+		bind_bnerr: function (e) {
+		  var _errImg = e.target.dataset.errorimg;
+		  var _errObj = {};
+		  _errObj[_errImg] = '/miniapp/images/default_g_img.gif';
+		  this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+		},
@@ -2,6 +2,7 @@
 	"navigationBarTitleText": "参团详情",
 	"enablePullDownRefresh": false,
 	"usingComponents": {
-			"share": "/components/share/share"
+			"share": "/components/share/share",
+			"nav_box": "/components/nav_box/nav_box"
 	}
 }
 \ No newline at end of file
@@ -4,9 +4,9 @@
   <view class="flex pd20 bg-white">
-    <view class="img-container shrink0" data-content="已团{{luckyGoInfo.group_joined}}件">
-      <image class="img-block" src="{{iurl + luckyGoInfo.original_img}}" data-val="{{luckyGoInfo.original_img}}"
-      	data-errorimg="luckyGoInfo.original_img" binderror="bind_bnerr" lazy-load="true"></image>
+		<!-- <view class="img-container shrink0" data-content="已团{{luckyGoInfo.group_joined}}件"> -->
+    <view class="img-container shrink0" data-content="">
+      <image class="img-block" src="{{iurl + luckyGoInfo.original_img}}" data-errorimg="luckyGoInfo.original_img" binderror="bind_bnerr" lazy-load="true"></image>
     </view>
     <view class="mgl20 flex fdc jc_sb f1 pdv10">
       <!----//图片区域---->
@@ -16,12 +16,17 @@
       <view class="flex-vertical-between">
         <view>
           <view class="fs40 xc-wc rmb">{{filters.price(luckyGoInfo.group_price)}}</view>
-          <view class="fs22 word-line c-7b">零售价<text class="rmb">{{luckyGoInfo.market_price}}</text></view>
+          <view class="fs22 word-line c-7b">
+						<!-- 手店价<text class="rmb">{{luckyGoInfo.shop_price}}</text> -->
+						<!-- <block wx:if="{{card_field && sele_g[card_field]>0}}"><text class="rmb lh1">{{sele_g[card_field]}}</text></block>
+						<block wx:else><text class="rmb lh1">{{sele_g.shop_price}}</text></block> -->
+					</view>
         </view>
         <view class="xc-wc fs24">
           <view>
-            <!-- <view class="">已拼{{teamlist.buy_num}}DDD件</view> -->
-						<view class="t-c">待成团</view>
+            <!-- luckyGoMembers.create_time 为0，表示还没开团 -->
+						<view class="t-c" wx:if="{{luckyGoMembers[0].create_time > 0}}">已成团</view>
+						<view class="t-c" wx:else>待成团</view>
             <view class="flex xc-valframe t-c">
               <view class="xc-frame-img">
                 <image class="picture" src="{{iurl}}/miniapp/images/bai-ren.png"></image>
@@ -39,7 +44,7 @@
   <view class="mgt20 bg-white pr">
 		<view class="rules fs24" bindtap="showRules">规则 <text class="iconfont icon-arrow_right fs24"></text></view>
     <!-- 阶梯团 -->
-    <view class='bodytop' wx:if="{{teamlist.kttype==3&& p_status==1}}">
+    <!-- <view class='bodytop' wx:if="{{teamlist.kttype==3&& p_status==1}}">
       当前价格
       <text class="xc-wc">¥{{ct_price}}</text>, 
       <block  wx:if="{{max_num-ordertx.length>0}}">
@@ -48,11 +53,11 @@
       <block wx:else>
         该团已经拼购到最低价了哦~
       </block>
-    </view>
+    </view> -->
     <!-- 拼团成功 -->
-    <view class="xc-ptcomplete-ladder flex-level fs28" wx:if="{{teamlist.kttype==3&&p_status==2}}">
+    <!-- <view class="xc-ptcomplete-ladder flex-level fs28" wx:if="{{teamlist.kttype==3&&p_status==2}}">
       <view class="xc-wc">拼团成功</view>,当前价格
       <text class="xc-wc">￥{{ct_price}}</text>
       <view class="xc-img-frame oh">
@@ -60,20 +65,26 @@
       </view>
     </view>
-    <view style="height: 20rpx" wx:if="{{teamlist.kttype==3&&p_status==4}}"></view>
+    <view style="height: 20rpx" wx:if="{{teamlist.kttype==3&&p_status==4}}"></view> -->
     <!-- 阶梯团失败 -->
 		<!-- <view class="pdt50 pdb30 pdh20" wx:if="{{pay_f==1 || order.pt_status==3}}"> -->
     <view class="pdt50 pdb30 pdh20">
 			<block wx:if="{{team_id != 0}}">
-				<view class="fs28 t-c" wx:if="{{!isSuccess}}">参团成功，还差{{filters.show_default(luckyGoInfo.group_num, '0') - filters.show_default(luckyGoInfo.num, '0')}}人即可成团，请留意成员开奖通知！</view>
-				<view class="fs28 t-c" wx:else>参团成功，本期幸运购已开团！</view>
+				<view class="fs28 t-c" wx:if="{{luckyGoMembers[0].create_time > 0}}">
+					<view>参团成功，本期幸运购已开团！</view>
+					<view class="fs26 t-c c-red">{{iWin ? '恭喜您团中该商品，请等待商家发货~':'很遗憾您未团中，可获得一份帮团奖励，再接再厉噢~'}}</view>
+				</view>
+				<view class="fs28 t-c" wx:else>您已参团成功，还差{{filters.show_default(luckyGoInfo.group_num, '0') - filters.show_default(luckyGoInfo.num, '0')}}人参与即可成团！</view>
 			</block>
+			
       <block wx:if="{{team_id == 0 && param.from}}">
 				<view class="fs28 t-c">组团中，还差{{filters.show_default(luckyGoInfo.group_num, '0') - filters.show_default(luckyGoInfo.num, '0')}}人即可成团！</view>
 			</block>
-			<view class="fs24 t-c c-red">未团中可获得帮团奖励</view>
+			
+			<!-- <view class="fs26 t-c c-red">快去邀请小伙伴一起参与吧~</view> -->
+			
       <!-- <view class="xc-img-frame oh" >
         <image class="img" src="{{iurl}}/miniapp/images/xc-qtshibai.png"></image>
       </view> -->
@@ -81,16 +92,16 @@
     <!-- 拼团成功 -->
-    <view class="xc-ptcomplete flex-level fs28" wx:if="{{p_status==2 && (teamlist.kttype==2||teamlist.kttype==1)}}">
+    <!-- <view class="xc-ptcomplete flex-level fs28" wx:if="{{p_status==2 && (teamlist.kttype==2||teamlist.kttype==1)}}">
       <view class="xc-wc">拼团成功</view>,为您节省
       <text class="xc-wc">{{filters.toFix(goods.market_price-teamlist.price,2)}}</text>元
       <view class="xc-img-frame oh">
         <image class="img" src="{{iurl}}/miniapp/images/xc_qtcg.png"></image>
       </view>
     </view>
-		<view></view>
+		<view></view> -->
     <!----//// //头像---->
-    <view class="flex_tou pdv30">
+    <view class="flex_tou pdv20">
       <view class="flex jc-center">
 				<view class="d" wx:if="{{team_id == 0 && param.from}}">
 				  <image  class="img-block" src='{{iurl}}/miniapp/images/shafa.png'></image>
@@ -162,7 +173,7 @@
     <view class='fs30 xc-green' wx:if='{{teamlist.kttype==3&&p_status==2}}'>
       拼团成功, 规定时间内支付尾款即发货
     </view>
-    <view class="xc-wc fs30 t-c xc-onclik" wx:if="{{p_status==1}}">
+    <view class="xc-wc fs30 t-c xc-onclik" wx:if="{{!(luckyGoMembers[0].create_time > 0)}}">
       点击下方按钮分享给小伙伴,可快速成团！
     </view>
@@ -188,11 +199,11 @@
       <!-- </view> -->
     <!-- </block> -->
     <view class="flex jc-center ai-center fs26" hidden="{{hiddenName}}" bindtap="click">
-			查看拼团列表<text class="down-arrow1"></text>
+			查看参团成员<text class="down-arrow1"></text>
 		</view>
 		<view class='bodyfoot'>
-		  <view class="fs26" wx:if="{{zk}}" bindtap="czk">查看拼团列表<view class='down-arrow'></view></view>
+		  <view class="fs26" wx:if="{{zk}}" bindtap="czk">查看参团成员<view class='down-arrow'></view></view>
 			<!-- {{ordertx}} -->
 		  <view class="flex ai-center jc_sb pdh30 pdv20 fs26" hidden="{{hiddenName}}" wx:for="{{luckyGoMembers}}" wx:for-index="ky">
@@ -202,7 +213,7 @@
 					</view>
 					<view class="mgl20 t-l">
 						<view>{{item.nickname}}</view>
-						<view class="c-7b">参团编号：<text class="c-red">{{item.team_sn}}</text></view>
+						<!-- <view class="c-7b">参团编号：<text class="c-red">{{item.team_sn}}</text></view> -->
 					</view>
 				</view>
@@ -229,7 +240,7 @@
 			<view class="pdh20 f1">
 				<button class="btn-red pdh20 fs24" bindtap="gohome">返回首页</button>
 			</view>
-			<view class="pdh20 f1">
+			<view class="pdh20 f1" wx:if="{{!(luckyGoMembers[0].create_time > 0)}}">
 				<button class="btn-yellow pdh20 fs24" bindtap="clickShare">邀请好友参团</button>
 			</view>
 		 <!-- <button class="btn-red pdh20 fs24" bindtap="gohome">返回首页</button>
@@ -320,7 +331,7 @@
 </block>
 <!-- 分享控件，底部弹出 -->
-<share id="share_button" bind:send="send" bind:cancel="cancel" bind:share_img="saveImageToPhotosAlbum"  wx:if="{{share_hidden}}"></share>
+<share id="share_button" bind:send="onShareAppMessage" bind:cancel="cancel" bind:share_img="saveImageToPhotosAlbum"  wx:if="{{share_hidden}}"></share>
 <view wx:if="{{showPoster}}">
@@ -346,7 +357,6 @@
 <!-- 遮罩层 -->
    <view class="mask"  bindtap="close_all" catchtouchmove="true" wx:if="{{showRules}}"></view>
 <!-- 规则详情和提示信息弹窗 -->
-		<!-- <view class="rule-pop-container" wx:if="{{showRule}}"> -->
     <view class="rule-pop-container" wx:if="{{showRules}}">
         <view class="pop-title">规则详情
             <text class="iconfont icon-guan" bindtap="closeRules"></text>
@@ -365,9 +375,13 @@
         <view class="pdv20">
-            <view class="btn" bindtap="closeRule">我知道了</view>
+            <view class="btn" bindtap="closeRules">我知道了</view>
         </view>
-    </view>
+    </view>.
+		
+		
+	<!-- 制作一个圆球导航 -->
+	<nav_box></nav_box>
@@ -145,7 +145,7 @@ margin-top: 30rpx;
   height:100rpx;
 	border-radius: 50%;
 	overflow: hidden;
-	background-color: white;
+	background-color: #f2f2f2;
 }
 .d ~ .d {
@@ -979,6 +979,7 @@ height:40rpx;
 	height: 60rpx;
 	border-radius: 50%;
 	overflow: hidden;
+	background-color: #f2f2f2;
 }
@@ -18,7 +18,8 @@
 			     			    ￥ {{sele_g.shop_price}} 
 			     			  </block>	 
 			</view>
-            <view class="spec-goods-price" wx:else>￥ {{prom_price || filters.div100(luckGoInfo.group_price)}}</view>
+			<view class="spec-goods-price" wx:else>￥ {{filters.div100(luckGoInfo.group_price)}}</view>
+            <!-- <view class="spec-goods-price" wx:else>￥ bbb{{prom_price || filters.div100(luckGoInfo.group_price)}}</view> -->
           </view>
           <block wx:if="{{is_normal==1}}">
@@ -28,7 +29,7 @@
                  <view class="spec-goods-stock" wx:if="{{def_pick_store && def_pick_store.CanOutQty}}">可售：{{def_pick_store.CanOutQty}}</view>
               	 <view class="spec-goods-stock" wx:else>可售:0</view>
               </block>
-              <block wx:else><view class="spec-goods-stock">可售：{{sele_g.store_count}}</view></block>    
+              <block wx:else><view class="spec-goods-stock">可售：{{sele_g.store_count}}</view></block>   
             </view>
           </block>
           <!-- <block wx:if="{{is_normal==0}}">
@@ -195,7 +196,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 +213,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>
@@ -273,16 +273,24 @@ Page({
 		}],
+		luckGoInfo: {},
+		showDetails: false,
+		num_success: 0, //成团已中商品数量
+		isTimeUp: false,
+		
+		surplus: 0,
+		canBuy: false,
+		btnHidden: false,
   },
   //------初始化加载----------
   onLoad: function (t) {
-		
-		if(t.group_id) {
+    
+    		
+		if(t && t.group_id) {
 			this.data.group_id = t.group_id;
 		};
-
-		
+	
     var ee = this,
@@ -303,35 +311,8 @@ Page({
 					prom_id,
 				});
       }
-			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 }
-    // }).then(res => {
-    //   if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0]) {
-
-    //     var poster_data = res.data.data.pageData[0];
-    //     var json_str = poster_data.jsonStr;
-
-    //     if (json_str) {
-    //       var json_data = JSON.parse(json_str);
-    //       if (json_data.bg_img) {
-
-    //         //-- 把图片那到本地 --
-    //         wx.getImageInfo({
-    //           src: json_data.bg_img,
-    //           success: function (res) {
-    //             var path = res.path;
-    //             th.setData({ share_b_img: path })
-    //           },
-    //           fail: function (res) { }
-    //         });
-    //       }
-    //       th.setData({ poster: json_data })
-
-    //     }
-    //   }
-    // })
+					
+			
     //---获取手机地址坐标--
@@ -448,7 +429,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);
@@ -540,6 +520,16 @@ Page({
     getApp().request.put("/api/weshop/goods/updateClick", {
       data: { store_id: os.stoid, goods_id: gid }
     });
+
+
+    //--先判断会员登陆状态--
+    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',
+        })
+        return false;
+    }
   },
@@ -762,6 +752,63 @@ Page({
       return false;
     }
+    // 判断活动是否暂停
+    //获取单个活动成团信息
+		await getApp().request.promiseGet('/api/weshop/prom/luckyActivity/page', {
+			data: {
+				store_id: o.stoid,
+				is_end: 0,
+				timetype: 1,
+				id: this.data.group_id,
+			}
+		}).then(res => {
+		  if (res.data.code == 0) {
+		    console.log('成团信息=======》', res.data.data);
+				if(res.data.data.pageData && res.data.data.pageData.length == 0) {
+					let obj = {
+					  day: '00',
+					  hou: '00',
+					  min: '00',
+					  sec: '00'
+					};
+					
+					th.setData({
+						djs: obj,
+						isTimeUp: true,
+					});
+				} else {
+					th.setData({
+						luckGoInfo: res.data.data.pageData[0],
+						team_id: res.data.data.pageData[0].team_id,
+						luckGoMembers: [],
+					});
+					
+					th.countDown(th.data.luckGoInfo.end_time, 0);
+				};
+				
+		  } else {
+        this.data.isTimeUp = true;
+				th.setData({
+					isTimeUp: true,
+        });
+        
+			};
+			
+			
+    });
+    // 活动暂停显示空白
+    if (this.data.isTimeUp) {
+      wx.showModal({
+        title: '提示',
+        content: '活动已经暂停',
+        showCancel: false,
+        success: function(){
+          wx.navigateBack();
+        }
+      })
+      return false;
+    }
+
     //优惠券要实时更新
     getApp().getConfig2(function (e) {
       var json_d = JSON.parse(e.switch_list);
@@ -830,26 +877,7 @@ Page({
             title: t.data.data.goods_name,
           });
-          //-- 判断是不是组合购活动,必须要登录后才能判断 --
-          // if (getApp().globalData.userInfo && t.data.data.prom_type == 7) {
-          //   //获取活动信息
-          //   var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" +
-          //     t.data.data.prom_id + "/" + getApp().globalData.user_id;
-          //   getApp().request.get(url, {
-          //     success: function (e) {
-          //       if (e.data.code == 0 && e.data.data) {
-          //         if (ut.gettimestamp() < e.data.data.start_time) {
-          //           return false;
-          //         }
-          //         if (e.data.data.is_end == 0 && ut.gettimestamp() < e.data.data.end_time) {
-          //           //-- 获取商品列表 --
-          //           th.setData({ zh_act: e.data.data });
-          //         }
-
-          //       }
-          //     }
-          //   });
-          // }
+          
           //-- 把商品的赋值 --
           ee.data.fir_goods = JSON.parse(JSON.stringify(t.data.data));
@@ -982,8 +1010,8 @@ Page({
       }
     });
     this.data.enterAddressPage && (this.data.enterAddressPage = !1);
-		
-		
+
+
 		//获取单个活动已成团数量
 		getApp().request.get(`/api/weshop/prom/luckyTeam/getCtNum/${o.stoid}/${this.data.group_id}`, {
 		  success: function (res) {
@@ -994,8 +1022,8 @@ Page({
 				}
 		  }
 		});
-		
-		
+  
+    		
 		//获取单个活动中奖记录
 		getApp().request.promiseGet('/api/weshop/prom/luckyOrder/page', {
 			data: {
@@ -1013,26 +1041,42 @@ Page({
 		});
-		//获取单个活动成团信息
-		await getApp().request.promiseGet('/api/weshop/prom/luckyActivity/page', {
-			data: {
-				store_id: o.stoid,
-				is_end: 0,
-				timetype: 1,
-				id: this.data.group_id,
+		//获取单个活动成团已中商品数量
+		let url_num_success = `/api/weshop/prom/luckyOrder/countActNum/${os.stoid}/${this.data.group_id}`;
+		getApp().request.get(url_num_success, {
+		  success: function (res) {
+				if (res.data.code == 0) {
+					console.log('成团已中商品数量汇总',res.data.data);
+					th.setData({
+						num_success: res.data.data,
+					});
+				}
 			}
-		}).then(res => {
-		  if (res.data.code == 0) {
-		    // console.log('成团信息=======》', res.data.data);
-				th.setData({
-					luckGoInfo: res.data.data.pageData[0],
-					team_id: res.data.data.pageData[0].team_id,
-					luckGoMembers: [],
-				});
-				th.countDown(th.data.luckGoInfo.end_time, 0);
-		  };
-			
-			
+		});
+						
+		
+		
+		
+		
+		// 获取购买次数，判断是否已经超出限购
+		// {store_id}/{user_id}/{aid}
+		let get_aid = this.data.prom_id || this.data.luckGoInfo.id;
+		await	getApp().request.get('/api/weshop/prom/luckyOrder/countActNum/' + os.stoid + '/' + oo.user_id + '/' + get_aid, {
+			success: function (res) {
+				if(res.data.code == 0) {
+					console.log(oo.user_id, '判断是否超出限购，获取购买次数', res, );
+					// th.setData({
+					// 	num_joined: res.data.data,
+					// });
+					let num_joined = res.data.data;
+					let group_join_num = th.data.luckGoInfo.group_join_num;
+					let canBuy = num_joined >= group_join_num ? false : true;
+					th.setData({
+						canBuy,
+					});
+					// console.log('canBuy', th.data.canBuy);
+				};
+			},
 		});
@@ -1051,23 +1095,54 @@ Page({
 		  }
 		});
+		var p1 = new Promise((resolve, reject) => {
+      // 检查幸运购活动商品库存
+      getApp().request.get("/api/weshop/activitylist/getActLen/" + o.stoid + "/9/" + this.data.group_id, {
+        success: function(res) {
+          //console.log('当前幸运购活动的剩余库存', res.data.data);
+          if(res.data.code == 0) {
+            th.setData({
+              // 剩余库存量
+              surplus: res.data.data,
+            });
+          }; 
+          resolve();
+        }
+      });
+      
+    });
+  
+    var p2 = new Promise((resolve, reject) => {
+      // 检查是否已经参团购买
+      getApp().request.get("/api/weshop/prom/luckyOrder/getUserOrderInfo/" + o.stoid + "/" + oo.user_id + "/" + this.data.group_id, {
+        success: function(res) {
+          console.log('当前幸运购活动是否已经参团', res.data.code);
+          if(res.data.code == 0) {
+            th.setData({
+              showDetails: true,
+              buyInfo: res.data.data,
+            });
+          } else {
+            th.setData({
+              showDetails: false,
+            });
+          };
+          resolve();
+        }
+      });
+          
+    });
+    
+    Promise.all([p1, p2]).then(res => {
+      th.setData({
+        btnHidden: true,
+      });
+    });
-		
-		
-		
-		
-		
-		
-
   },
-	// 暂时无用
-  // enterAddress: function () {
-  //   this.data.enterAddressPage = !0, wx.navigateTo({
-  //     url: "/pages/user/address_list/address_list?operate=selectAddress"
-  //   });
-  // },
+
 	// 页面卸载
@@ -1094,11 +1169,7 @@ Page({
 		1 == e ? this.tabGoodsContent() : 2 == e && this.tabComment();
   },
-  // tabClick2: function (t) {
-  //   this.setData({
-  //     activeCategoryId2: t.currentTarget.id
-  //   });
-  // },
+  
 	// 点击评价选项卡下的各评价按钮
@@ -1197,19 +1268,9 @@ Page({
     th.setData({
       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);
-    }
+    
+		
+		th.add_cart_func(t);
   },
@@ -1662,13 +1723,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 +1768,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 +1776,45 @@ 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_id = res.cat_id;
+          } else {
+						e.prom_type = 0;
+						// e.prom_id = 0;
+					}
           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);
       }
     }
@@ -2264,67 +2337,105 @@ Page({
   //--点击分享事件---
   onShareAppMessage: function (t) {
-    var th = this;
-    var price = th.data.sele_g.shop_price;
-    if (th.data.prom_act) {
-      price = th.data.prom_act.price;
+    // var th = this;
+    // var price = th.data.sele_g.shop_price;
+    // if (th.data.prom_act) {
+    //   price = th.data.prom_act.price;
-    }
-    var title = th.data.sele_g.goods_name;
-    var img = th.data.sele_g.original_img;
-    if (th.data.prom_type == 6 || th.data.prom_type == 1 || th.data.prom_type == 4) {
-      title = th.data.prom_act.share_title;
-      if (!title) title = th.data.prom_act.title;
-      if (th.data.prom_type == 4) title = th.data.prom_act.name;
-
-      if (th.data.prom_act.share_imgurl)
-        img = th.data.iurl + th.data.prom_act.share_imgurl;
-    }
+    // }
+    // var title = th.data.sele_g.goods_name;
+    // var img = th.data.sele_g.original_img;
+    // if (th.data.prom_type == 6 || th.data.prom_type == 1 || th.data.prom_type == 4) {
+    //   title = th.data.prom_act.share_title;
+    //   if (!title) title = th.data.prom_act.title;
+    //   if (th.data.prom_type == 4) title = th.data.prom_act.name;
+
+    //   if (th.data.prom_act.share_imgurl)
+    //     img = th.data.iurl + th.data.prom_act.share_imgurl;
+    // }
-    var url = "/pages/goods/goodsInfo/goodsInfo?goods_id="
-        + th.data.sele_g.goods_id+"&prom_type="+th.data.sele_g.prom_type+"&prom_id="+th.data.sele_g.prom_id;
-    if (getApp().globalData.user_id) {
-      url += "&first_leader=" + getApp().globalData.user_id;
-    }
-    //-- 如果房间分享，且不是会员分享的 --	 
-    if (getApp().globalData.room_id &&
-      th.data.sele_g.goods_id == getApp().globalData.room_goods_id &&
-      !getApp().globalData.room_user_share
-    ) {
-      url += "&room_id=" + getApp().globalData.room_id + "&room_user_share=1";
-    }
+    // var url = "/pages/goods/goodsInfo/goodsInfo?goods_id="
+    //     + th.data.sele_g.goods_id+"&prom_type="+th.data.sele_g.prom_type+"&prom_id="+th.data.sele_g.prom_id;
+    // if (getApp().globalData.user_id) {
+    //   url += "&first_leader=" + getApp().globalData.user_id;
+    // }
-    var ob = {
-      title: price + "元  " + title,
-      path: url,
-      imageUrl: img,
-    };
-    if (th.data.prom_type == 6) {
-      title += '\n' + th.data.prom_act.share_remark;
-      ob.title = title;
-      ob.desc = th.data.prom_act.share_remark;
-    }
+    // //-- 如果房间分享，且不是会员分享的 --	 
+    // if (getApp().globalData.room_id &&
+    //   th.data.sele_g.goods_id == getApp().globalData.room_goods_id &&
+    //   !getApp().globalData.room_user_share
+    // ) {
+    //   url += "&room_id=" + getApp().globalData.room_id + "&room_user_share=1";
+    // }
-    //如果是积分购的时候
-    if (th.data.prom_type == 4) {
-      var name = th.data.prom_act.name;
-      //-- 积分购的 --
-      var pri0 = th.data.prom_act.addmoney;
-      var integral = th.data.prom_act.integral;
-      var text = "";
-      if (integral) { text = integral + "积分"; }
-      if (pri0 && integral) { text += "+"; }
-      if (pri0) { text += "￥" + pri0; }
-
-      ob.title = text + " " + name;
-    }
+    // var ob = {
+    //   title: price + "元  " + title,
+    //   path: url,
+    //   imageUrl: img,
+    // };
+    // if (th.data.prom_type == 6) {
+    //   title += '\n' + th.data.prom_act.share_remark;
+    //   ob.title = title;
+    //   ob.desc = th.data.prom_act.share_remark;
+    // }
-    //-- 页面不能刷新 --
-    this.data.show_prew_img=1;
-    return ob;
+    // //如果是积分购的时候
+    // if (th.data.prom_type == 4) {
+    //   var name = th.data.prom_act.name;
+    //   //-- 积分购的 --
+    //   var pri0 = th.data.prom_act.addmoney;
+    //   var integral = th.data.prom_act.integral;
+    //   var text = "";
+    //   if (integral) { text = integral + "积分"; }
+    //   if (pri0 && integral) { text += "+"; }
+    //   if (pri0) { text += "￥" + pri0; }
+
+    //   ob.title = text + " " + name;
+    // }
+
+  //   var title = th.data.sele_g.goods_name;
+  //   var img = th.data.sele_g.original_img;
+
+  //   var url = `packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=${th.data.sele_g.goods_id}&prom_type=9&group_id=${th.data.group_id}`; //当前页面url
+  //   if (getApp().globalData.user_id) {
+  //     url += "&first_leader=" + getApp().globalData.user_id;
+  //   }
+
+  //   console.log(url)
+
+  //   var ob = {
+  //     title: price + "元  " + title,
+  //     path: url,
+  //     imageUrl: img,
+  //   };
+		// return ob;
+		
+		
+		var pagePath = `packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=${this.data.sele_g.goods_id}&prom_type=9&group_id=${this.data.group_id}`; //当前页面url
+		// console.log('pagePath=====xxxxxx>', pagePath);
+		var imgPath = this.data.iurl + this.data.luckGoInfo.original_img;
+		if (pagePath.indexOf('/') != 0) {
+		    pagePath = '/' + pagePath;
+		}
+		// if(getApp().globalData.user_id){
+			
+		//     if(pagePath.indexOf("?")>0){
+		//         pagePath+="&first_leader="+getApp().globalData.user_id;
+		//     }else{
+		//         pagePath+="?first_leader="+getApp().globalData.user_id;
+		//     }
+		// }
+		return {
+		    title: "邀您一起参加幸运购",
+		    path: pagePath,
+				imageUrl: imgPath,
+		}
+		
+		
+		
   },
   //-----图片失败，默认图片-----
@@ -3610,41 +3721,35 @@ Page({
         min: this.timeFormat(min),
         sec: this.timeFormat(sec)
       }
+			// console.log('cd');
     } else {
-      if (th.data.prom_st == 0) {
-        //var endTime2 = new Date(th.data.prom_end_time).getTime();
-        var endTime2 = th.data.prom_act.end_time;
-        th.setData({
-          prom_time_text: '距结束还剩:',
-          prom_st: 1
-        })
-        setTimeout(function () {
-          th.countDown(endTime2)
-        }, 1000);
-        return false;
-
-      } else {
-        //活动已结束，全部设置为'00'
-        obj = {
-          day: '00',
-          hou: '00',
-          min: '00',
-          sec: '00'
-        }
-        th.setData({
-          prom_time_text: '活动已经结束:',
-          prom_st: 3
-        })
-        th.setData({
-          djs: obj
-        });
-        return false;
-      }
+      
+			
+			
+			obj = {
+			  day: '00',
+			  hou: '00',
+			  min: '00',
+			  sec: '00'
+			}
+			
+			th.setData({
+			  djs: obj,
+				isTimeUp: true,
+			});
+			console.log('i am here');
+			return false;
     }
-
-    th.setData({
-      djs: obj
-    });
+		
+		// ----
+		
+		
+		
+		
+		th.setData({
+		  djs: obj
+		});
+		// ----
     setTimeout(function () {
       th.countDown(endTime)
     }, 1000);
@@ -3741,122 +3846,164 @@ Page({
   },
   //--点击弹起拼单--
+	// ind == 1 为普通购买
   openSpecModel_pt: function (e) {
     this.setData({ open_ind_store: 9, goodsInputNum: 1 });
+    // 判断是否有待支付订单
+    var aid = this.data.group_id;
+    var switOn = true;
+    s.request.promiseGet('/api/weshop/prom/luckyOrder/page', {
+      data: {
+        store_id: os.stoid,
+        user_id: oo.user_id,
+        aid: aid,
+        pay_status: 0, // 未支付
+        order_status: 0, // 待支付
+        pageSize: 1,
+        page: 1
+      }
+    }).then(res => {
+        if(res.data.code == 0){
+          if (res.data.data.total > 0) {
+            // 待支付订单页面
+            wx.showModal({
+              title: "您已经购买了该商品待支付中",
+              success: function (a) {
+                if (a.confirm) {
+                  switOn = false;
+                  wx.navigateTo({
+                    url: "/packageC/pages/luckyGo/luckyGo_order/luckyGo_order?order_id=" + res.data.data.pageData[0]['order_id']
+                  });
+                }
+              }
+            });
+          } else {
+            //--先判断会员状态--
+            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',
+              })
+              return false;
+            };
+
+            var th = this;
+            var ind = parseInt(e.currentTarget.dataset.ind);
+            
+            console.log('当前ind========>>>>', ind);
+            
+            //ind == 1是普通购买
+            if (ind == 1) {
+              //如果拼单的sku data是空的，就要先获取一下
+              if (th.data.sku_g_pt) {
+                th.get_sto(1);
+                th.setData({
+                  is_normal: ind,
+                  openSpecModal_pt: 1
+                });
+              } else {
+                th.get_sto(1);
+                th.get_sku(o.stoid, th.data.data, th.data.gid, 1, function () {
+                  th.setData({
+                    is_normal: ind,
+                    openSpecModal_pt: 1
+                  });
+                });
+                
+                th.setData({
+                  is_normal: ind,
+                  openSpecModal_pt: 1
+                });
+              };
+              th.check_is_youhui(th.data.gid, 1);
+            } else {
+
+              // //拼单商品从这里进，先判断有没有买过商品，
+              // getApp().request.get("/api/weshop/order/page", {
+              //   data: {
+              //     // pt_prom_id: th.data.prom_act.id,
+              //     user_id: oo.user_id,
+              //     store_id: os.stoid,
+              //     pageSize: 1,
+              //     page: 1
+              //   },
+              //   success: function (e) {
+              //     //--跳转到已经购买的情况--
+              //     if (e.data.data.pageData.length > 0) {
+              //       var odr = e.data.data.pageData[0];
+              //       //还未支付
+              //       if (odr.pt_status == 0 && (odr.order_status == 1 || odr.order_status == 0)) {
+              //         wx.showModal({
+              //           title: "您已经购买了该商品待支付中",
+              //           success: function (a) {
+              //             if (a.confirm) {
+              //               wx.navigateTo({
+              //                 url: "/pages/user/order_detail/order_detail?order_id=" + odr.order_id,
+              //               });
+              //             }
+              //           }
+              //         });
+              //       } else if (odr.pt_status == 1 && odr.order_status == 1) {
+
+              //         if (this.data.is_go_to_team_show) return false;
+              //         this.data.is_go_to_team_show = 1;
+              //         wx.showLoading();
+
+              //         /*---
+              //               wx.redirectTo({
+              //                 url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn,
+              //               });--*/
+              //         getApp().goto("/pages/team/team_success/team_success?ordersn=" + odr.order_sn);
+
+              //       } else {
+              //         th.setData({
+              //           is_normal: ind,
+              //           openSpecModal_pt: 1
+              //         });
+              //       }
+
+              //     } else {
+              //       th.setData({
+              //         is_normal: ind,
+              //         openSpecModal_pt: 1
+              //       });
+              //     }
+              //   }
+              // });
+              th.get_sto(1);
+              th.setData({
+                is_normal: 0,
+                openSpecModal_pt: 1
+              });
+              
+            }
+          }
+            
+        }
+    });
+    
-    //--先判断会员状态--
-    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',
-      })
-      return false;
-    };
-    var th = this;
-    var ind = parseInt(e.currentTarget.dataset.ind);
-    //ind == 1是普通购买
-    if (ind == 1) {
-      //如果拼单的sku data是空的，就要先获取一下
-      if (th.data.sku_g_pt) {
-        th.get_sto(1);
-        th.setData({
-          is_normal: ind,
-          openSpecModal_pt: 1
-        });
-      } else {
-        th.get_sto(1);
-        th.get_sku(o.stoid, th.data.data, th.data.gid, 1, function () {
-          th.setData({
-            is_normal: ind,
-            openSpecModal_pt: 1
-          });
-        });
-				
-				th.setData({
-				  is_normal: ind,
-				  openSpecModal_pt: 1
-				});
-      };
-      th.check_is_youhui(th.data.gid, 1);
-    } else {
-      // //拼单商品从这里进，先判断有没有买过商品，
-      // getApp().request.get("/api/weshop/order/page", {
-      //   data: {
-      //     // pt_prom_id: th.data.prom_act.id,
-      //     user_id: oo.user_id,
-      //     store_id: os.stoid,
-      //     pageSize: 1,
-      //     page: 1
-      //   },
-      //   success: function (e) {
-      //     //--跳转到已经购买的情况--
-      //     if (e.data.data.pageData.length > 0) {
-      //       var odr = e.data.data.pageData[0];
-      //       //还未支付
-      //       if (odr.pt_status == 0 && (odr.order_status == 1 || odr.order_status == 0)) {
-      //         wx.showModal({
-      //           title: "您已经购买了该商品待支付中",
-      //           success: function (a) {
-      //             if (a.confirm) {
-      //               wx.navigateTo({
-      //                 url: "/pages/user/order_detail/order_detail?order_id=" + odr.order_id,
-      //               });
-      //             }
-      //           }
-      //         });
-      //       } else if (odr.pt_status == 1 && odr.order_status == 1) {
-
-      //         if (this.data.is_go_to_team_show) return false;
-      //         this.data.is_go_to_team_show = 1;
-      //         wx.showLoading();
-
-      //         /*---
-      //               wx.redirectTo({
-      //                 url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn,
-      //               });--*/
-      //         getApp().goto("/pages/team/team_success/team_success?ordersn=" + odr.order_sn);
-
-      //       } else {
-      //         th.setData({
-      //           is_normal: ind,
-      //           openSpecModal_pt: 1
-      //         });
-      //       }
-
-      //     } else {
-      //       th.setData({
-      //         is_normal: ind,
-      //         openSpecModal_pt: 1
-      //       });
-      //     }
-      //   }
-      // });
-			th.get_sto(1);
-			th.setData({
-			  is_normal: 0,
-			  openSpecModal_pt: 1
-			});
-			
-    }
   },
   //-----------------拼单生成方法---------------------
   addCart_pt: function () {
-    var th = this;
+		this.setData({
+			openSpecModal_pt: 0,
+		});
     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 +4015,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: '超出商品活动库存'
-          });
-
-          th.setData({ goodsInputNum: redis_num })
+      // 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;
+      //   }
+      // }
-          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 +4155,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 +4171,28 @@ 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');
+					newd['prom_type'] = 0;
+          th.buyNow(newd);
+        });
       }
-      else th.buyNow_pt(newd);
+      else {
+				// 点击立即参团
+				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 + '&is_show=' + this.data.luckGoInfo.is_show,
     });
+		
+		// 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商品-------
@@ -4490,8 +4648,10 @@ Page({
       scene += "_" + getApp().globalData.room_id;
     }
     ///二微码
-    var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
-      os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo";
+		var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
+		  os.stoid + "?sceneValue=" + scene + "&pageValue=packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo";
+    // var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
+    //   os.stoid + "?sceneValue=" + scene + "&pageValue=packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo";
     console.log(path3);
@@ -4608,9 +4768,10 @@ Page({
             context.setFillStyle("red")
-            var pri0 = th.data.data.shop_price;
-            if (th.data.prom_act)
-              pri0 = th.data.prom_act.price;
+            var pri0 = th.data.luckGoInfo.group_price/100;
+						// console.log('pri0========>>>>>', pri0);
+            // if (th.data.prom_act)
+            //   pri0 = th.data.prom_act.price;
             pri0 = parseFloat(pri0).toFixed(2);
             var wd1 = th.data.screenWidth - ut.measureText(pri0, 31 * unit) - 25;
             context.fillText("￥", wd1 - 15, 185 * unit);
@@ -5180,7 +5341,7 @@ Page({
         tt();
       },
       fail: function (res) {
-        ee.data.share_goods_img = "../../../images/share/default_g_img.gif"; //分享的图片不能用网络的
+        ee.data.share_goods_img = "../../../../images/share/default_g_img.gif"; //分享的图片不能用网络的
         tt();
       }
     });
@@ -6297,5 +6458,14 @@ Page({
 			return newTypeArr;
 		},
+		
+		//弹出活动已经结束
+		timeUp() {
+			wx.showToast({
+				title: '本商品活动已经结束！',
+				icon: 'none',
+			});
+		},
+		
 });
 {
-    "navigationBarTitleText": "商品详情2",
+    "navigationBarTitleText": "",
     "enablePullDownRefresh": false,
     "usingComponents": {
         "nav_box": "/components/nav_box/nav_box",
@@ -5,7 +5,7 @@
 <!-- 商品内容区域,普通商品,秒杀,拼团 -->
-<block>
+<block wx:if="{{isshow}}">
   <view class="container">
 		<!-- 幸运购规则 -->
 		<view class="rules" bindtap="showRules">规则</view>
@@ -29,8 +29,8 @@
 									<image src="{{item.head_pic}}" class="img-block"></image>
 								</view>
 								<view class="flex ai_c pd10">
-									<view class="nickname ellipsis-1x">恭喜{{item.nickname}}</view>
-									<view style="flex-shrink: 0;">获得了"{{item.goods_name}}"</view>
+									<view class="nickname ellipsis-1x">恭喜{{item.nickname}}获得了{{item.goods_name}}</view>
+									<!-- <view style="flex-shrink: 0;"></view> -->
 								</view>
 							</view>
 						</swiper-item>
@@ -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,18 @@
             <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)}} -->
+								<block wx:if="{{card_field && sele_g[card_field]>0}}"><text class="rmb lh1">{{sele_g[card_field]}}</text></block>
+								<block wx:else><text class="rmb lh1">{{sele_g.shop_price}}</text></block>
               </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">
@@ -174,7 +198,7 @@
               <!-- 这个是分享按钮 -->
               <!-- <view class="xc-share-frame {{prom_type==1?'s_ms_bth':''}} t-c"  bindtap="saveImageToPhotosAlbum"> -->
-             <view class="xc-share-frame t-c" bindtap="clickShare">
+             <view class="xc-share-frame t-c" bindtap="{{isTimeUp ? 'timeUp':'clickShare'}}">
                 <view class="iconfont icon-share"></view>
                 <!-- <view class="fs22 c-7b">分享</view> -->
               </view>
@@ -248,9 +272,10 @@
-            <view class="goods-num">
-              <view class="sales">销量：{{data.sales_sum}}件</view>
-              <view class="stock">折扣：{{data.disc}}折</view>
+            <view class="goods-num pdt20">
+							<view class="sales">已售：{{num_success}}件</view>
+              <!-- <view class="sales">销量：{{data.sales_sum}}件</view> -->
+              <!-- <view class="stock">折扣：{{data.disc}}折</view> -->
               <view class="stock">{{categories3[0].num}}人评价</view>
             </view>
             <view wx:if="{{prom_type==1}}">
@@ -310,7 +335,7 @@
 					  <view class="xc-partner-frame">
 					    <view class="zzk-1 flex jc_sb">
 					      <view class="pdl10">已参团{{filters.show_default(luckGoInfo.num, '0')}}人，还差<text class="c-red">{{filters.show_default(luckGoInfo.group_num, '0')- filters.show_default(luckGoInfo.num, '0')}}</text>人成团</view>
-					      <view class="ckgd flex ai_c" bindtap="showReward">
+					      <view class="ckgd flex ai_c" bindtap="{{isTimeUp ? 'timeUp':'showReward'}}">
 					        查看奖励
 					        <view class="bg_right arrow-one"></view>
 					      </view>
@@ -367,7 +392,7 @@
 					      <!-- <view class="clear"></view> -->
 					    </view>
-							<view class="fs24 pdh20 pdt20">*<text class="c-red">{{luckGoInfo.group_num}}</text>人成团，<text class="c-red">{{luckGoInfo.group_win}}</text>人得商品，<text class="c-red">{{luckGoInfo.group_num - luckGoInfo.group_win}}</text>人全额退款并获得<text class="c-red">惊喜礼品</text>！</view>
+							<view class="fs24 pdh20">*<text class="c-red">{{filters.show_default(luckGoInfo.group_num, '0')}}</text>人成团，<text class="c-red">{{filters.show_default(luckGoInfo.group_win, '0')}}</text>人得商品，<text class="c-red">{{filters.show_default(luckGoInfo.group_num - luckGoInfo.group_win, '0')}}</text>人全额退款并获得<text class="c-red">惊喜礼品</text>！</view>
 					  </view>
 					</view>
@@ -883,13 +908,27 @@
       <!-- 线上销售的时候，要判断库存量，  线下库存的时候不用判断 -->
       <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> -->
+						<block wx:if="{{card_field && sele_g[card_field]>0}}"><text class="rmb lh1">{{sele_g[card_field]}}</text></block>
+						<block wx:else><text class="rmb lh1">{{sele_g.shop_price}}</text></block>
+					</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="xc-ash-b f1 flex ai-center jc-center white fs26" wx:if="{{btnHidden && isTimeUp}}">活动已经结束</view>
+				<block wx:else>
+					<view class="btn-red f1 flex ai-center jc-center" bindtap="go" data-it="0" data-url="/packageC/pages/luckyGo/luckyGo_details/luckyGo_details?group_id={{luckGoInfo.id}}&goods_id={{luckGoInfo.goods_id}}&goods_name={{data.goods_name}}&team_id={{buyInfo.team_id}}" wx:if="{{btnHidden && showDetails}}">查看详情</view>
+					<view class="f1 flex ai-center jc-center xc-ash-b fs26 white" wx:if="{{btnHidden && !showDetails && surplus == 0}}">已经抢光了</view>
+					<view class="f1 flex ai-center jc-center xc-ash-b fs26 white" wx:if="{{btnHidden && !showDetails && surplus != 0 && !canBuy}}">已超限购次数</view>
+					<view class="btn-red f1 flex ai-center jc-center" bindtap="openSpecModel_pt" data-it="0" wx:if="{{btnHidden && !showDetails && surplus != 0 && canBuy}}">立即参团</view>
+				</block>
+				
+				<!-- <view class="btn-red f1 flex ai-center jc-center" wx:else>已经抢光</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 +958,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 +990,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 +1010,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 +1037,7 @@
           积分不足
         </view>
       </block>
-    </block>
+    </block> -->
     <!-- -<view bindtap="openSpecModel" class="buy-btn cart-btn cart-btn-lg" wx:else>立即兑换</view> -->
   </view>
   <!-- 制作一个圆球导航 -->
@@ -1221,9 +1259,10 @@
   </view>
 </view>
 <!-- 弹起来,购买积分购 -->
-<view hidden="{{!openSpecModal_inte}}">
+<!-- <view hidden="{{!openSpecModal_inte}}">
   <include src="buy_integral.wxml" />
-</view>
+</view> -->
+
 <!-- 弹起来,购买积分购的普通购买 -->
 <!-- <view hidden="{{!openSpecModal_inte_normal}}">
   <include src="buy_integral_normal.wxml" />
@@ -1232,6 +1271,8 @@
 <view hidden="{{!openSpecModal_pt}}">
   <include src="buy_pt.wxml" />
 </view>
+
+
 <!-- --弹起来优惠信息---- -->
 <!-- <view hidden="{{!openPromModal}}">
   <view bindtap="closePromModal" class="cover-layer"></view>
@@ -1468,7 +1509,7 @@
 <canvas canvas-id='share' style='width:750rpx;height:1217rpx;background-color:white;' wx:if='{{!canvasHidden}}'></canvas>
 <warn id="warn"></warn>
 <!-- 分享控件，底部弹出 -->
-<share id="share_button" bind:send="send" bind:cancel="cancel" bind:share_img="saveImageToPhotosAlbum" wx:if="{{share_hidden}}"></share>
+<share id="share_button" bind:send="onShareAppMessage" bind:cancel="cancel" bind:share_img="saveImageToPhotosAlbum" wx:if="{{share_hidden}}"></share>
 <view wx:if="{{showPoster}}">
   <view class="mask" catchtap="closePoster"></view>
   <view class="poster-container">
@@ -1558,7 +1599,7 @@
 							<view class="img-container"><image class="img-block" src="{{iurl + 'miniapp/images/luckDraw/yhq.png'}}"></image></view>
 							<view class="f1 pdl20">
 								<view class="ellipsis-2 popup-title">优惠券-{{i.name}}</view>
-								<view class="fs24 t-r pdt16 c-7b">数量：<text class="c-red">{{i.num}}</text></view>
+								<view class="fs26 t-r pdt16 c-7b">数量：<text class="c-red">{{i.num}}</text></view>
 							</view>
 						</view>
 					</block>
@@ -1568,7 +1609,7 @@
 							<view class="img-container"><image class="img-block" src="{{iurl + 'miniapp/images/luckDraw/fw.png'}}"></image></view>
 							<view class="f1 pdl20">
 								<view class="ellipsis-2 popup-title">服务项目-{{i.name}}</view>
-								<view class="fs24 t-r pdt16 c-7b">数量：<text class="c-red">{{i.num}}</text></view>
+								<view class="fs26 t-r pdt16 c-7b">数量：<text class="c-red">{{i.num}}</text></view>
 							</view>
 						</view>
 					</block>
@@ -1578,7 +1619,7 @@
 							<view class="img-container"><image class="img-block" src="{{iurl + 'miniapp/images/luckDraw/jf.png'}}"></image></view>
 							<view class="f1 pdl20">
 								<view class="ellipsis-2 popup-title">{{luckGoInfo[item.name]}}</view>
-								<view class="fs24 t-r pdt16 c-7b">金额：<text class="c-red">{{filters.div100(luckGoInfo[item.num])}}</text></view>
+								<view class="fs26 t-r pdt16 c-7b">金额：<text class="c-red">{{filters.div100(luckGoInfo[item.num])}}</text></view>
 							</view>
 						</view>
 					</block>
@@ -1591,7 +1632,7 @@
 							</view>
 							<view class="f1 pdl20">
 								<view class="ellipsis-2 popup-title">{{item.name}}</view>
-								<view class="fs24 t-r pdt16 c-7b">数量：<text class="c-red">{{luckGoInfo[item.num]}}</text></view>
+								<view class="fs26 t-r pdt16 c-7b">数量：<text class="c-red">{{luckGoInfo[item.num]}}</text></view>
 							</view>
 						</view>
 					</block>
@@ -1603,3 +1644,6 @@
 	</view>
 </view>
+	<!-- 制作一个圆球导航 -->
+	<nav_box></nav_box>
+
@@ -2889,7 +2889,7 @@ button.custom-service::after{
 .mt20{ margin-top: 20rpx}
 .group .group-list.luck {
-	padding: 0 20rpx;
+	padding: 0 20rpx 20rpx 20rpx;
 	justify-content: flex-start;
 }
@@ -253,7 +253,7 @@ Page({
 					case 3: { //优惠券
 						app.request.promiseGet('/api/weshop/prom/luckyCoupon/page', {
 							data: {
-								store_id: os.stoid,
+								store_id: app.globalData.setting.stoid,
 								aid: self.data.currentItemAid,
 							}
 						}).then(res => {
@@ -268,7 +268,7 @@ Page({
 					case 4: { //服务项目
 						app.request.promiseGet('/api/weshop/prom/luckyService/page', {
 							data: {
-								store_id: os.stoid,
+								store_id: app.globalData.setting.stoid,
 								aid: self.data.currentItemAid,
 							}
 						}).then(res => {
@@ -8,7 +8,8 @@
 	<view class="list">
 		<view class="list-item" wx:for="{{list.pageData}}">
 		<!-- <view class="list-item" wx:for="{{list.pageData}}"> -->
-			<view class="pd20" bindtap="go" data-url="/packageC/pages/luckyGo/luckyGo_order/luckyGo_order?order_id={{item.order_id}}">
+			<view class="pd20" bindtap="go" data-url="/packageC/pages/luckyGo/luckyGo_order/luckyGo_order?order_id={{item.order_id}}&team_status={{item.team_status}}&group_id={{item.aid}}">
+				<!-- <view class="fs28">{{item.act_name}} (第{{item.team_sn}}期) </view> -->
 				<view class="pdr40 arrow" wx:if="{{item.team_status == 0}}">参团中，还差<text class="c-red">{{filters.difference(item.num, item.group_num)}}</text>人</view>
 				<view class="pdr40 arrow" wx:elif="{{item.team_status == 2}}">已团中，{{item.shipping_status == 0 ? '待发货':'已发货'}}</view>
 				<view class="pdr40 arrow" wx:elif="{{item.team_status == 1}}">未团中，已退款</view>
@@ -28,10 +29,10 @@
 				</view>
 			</view>
 			<view class="flex ai-center pd20 bdt fs24 jc_sb">
-				<view>共1件，实付金额：<text class="rmb">{{item.user_money}}</text></view>
+				<view>共1件，实付金额：<text class="rmb">{{filters.toFix(item.order_amount+item.user_money,2)}}</text></view>
 				<view class="flex">
-					<view class="btn gray" bindtap="go" data-url="/packageC/pages/luckyGo/luckyGo_order/luckyGo_order?order_id={{item.order_id}}&team_status={{item.team_status}}">查看订单</view>
-					<view class="btn c-red mgl20" wx:if="{{item.team_status == 0}}" bindtap="go" data-url="/packageC/pages/luckyGo/luckyGo_details/luckyGo_details?group_id={{item.aid}}&goods_id={{item.goods_id}}&goods_name={{item.goods_name}}&team_id={{item.team_id}}&&from=list">邀请好友</view>
+					<view class="btn gray" bindtap="go" data-url="/packageC/pages/luckyGo/luckyGo_order/luckyGo_order?order_id={{item.order_id}}&team_status={{item.team_status}}&group_id={{item.aid}}">查看订单</view>
+					<view class="btn c-red mgl20" wx:if="{{item.team_status == 0}}" bindtap="go" data-url="/packageC/pages/luckyGo/luckyGo_details/luckyGo_details?group_id={{item.aid}}&goods_id={{item.goods_id}}&goods_name={{item.goods_name}}&team_id={{item.team_id}}&&from=1">邀请好友</view>
 					<view class="btn c-red mgl20" wx:if="{{item.team_status == 1}}" bindtap="showReward" data-index="{{index}}" data-aid="{{item.aid}}">查看奖励</view>
 				</view>
 			</view>
@@ -74,7 +75,7 @@
 						<view class="img-container"><image class="img-block" src="{{imghost + 'miniapp/images/luckDraw/jf.png'}}"></image></view>
 						<view class="f1">
 							<view class="ellipsis-2 popup-title">{{list.pageData[currentItemIndex][item.name]}}</view>
-							<view class="fs24 t-r pdt16 c-7b">金额：<text class="c-red">{{filters.div100(list.pageData[currentItemIndex][item.num])}}</text></view>
+							<view class="fs24 t-r pdt16 c-7b">金额：<text class="c-red">{{filters.div100((list.pageData[currentItemIndex][item.num]))}}</text></view>
 						</view>
 					</view>
 				</block>
@@ -49,7 +49,7 @@ page {
 }
 .title {
-	height: 88rpx;
+	/* max-height: 88rpx; */
 }
 .tab-bd {
@@ -47,6 +47,7 @@ Page({
 				self.getData(true, '/api/weshop/prom/luckyOrder/page', {
 					store_id: app.globalData.setting.stoid,
 					team_id: self.data.team_id,
+					pageSize: 20,
 				});
@@ -84,6 +85,7 @@ Page({
   	this.scrollToLower('/api/weshop/prom/luckyOrder/page', {
   		store_id: app.globalData.setting.stoid,
   		team_id: self.data.team_id,
+			pageSize: 20,
   	});
   },
 {
-	"navigationBarTitleText": "参团成员",
+	"navigationBarTitleText": "本期参团成员",
 	"enablePullDownRefresh": false,
   "usingComponents": {}
 }
 \ No newline at end of file
@@ -4,12 +4,12 @@
 		<view class="flex ai-center pdr20">
 			<view class="img-container"><image class="img-block" src="{{item.head_pic}}"></image></view>
 			<view>
-				<text class="ellipsis-1x wbba">{{item.nickname}}</text>
-				<view class="c-8f pdt10">参团编号：{{item.team_sn}}</view>
+				<text class="ellipsis-1x wbba fs30">{{item.nickname}}</text>
+				<!-- <view class="c-8f pdt10">参团编号：{{item.team_sn}}</view> -->
 			</view>
 		</view>
 		<view class="pdt6 shrink0">
-			<view class="c-9">{{filters.format_time(item.create_time, 1)}}</view>
+			<view class="c-9">{{filters.format_time(item.add_time, 1)}}</view>
 			<view class="t-r pdt10 c-red bold" wx:if="{{item.team_status == 0}}">待成团</view>
 			<view class="t-r pdt10 c-8f bold" wx:elif="{{item.team_status == 1}}">未团中</view>
 			<view class="t-r pdt10 c-red bold" wx:else="{{item.team_status == 2}}">已团中</view>
+page {
+	background-color: #f2f2f2;
+}
 .list {
 	padding-left: 20rpx;
 	padding-right: 20rpx;
+	background-color: white;
 }
 .list-item {
 	display: flex;
@@ -17,7 +17,8 @@ Page({
     onLoad: function(e) {
         var th=this;
         var r = void 0 !== e.isGoup && e.isGoup;
-
+				// console.log('e*************>>>>>>', e);
+				this.data.group_id = e.group_id;
         getApp().getConfig2(function (e) {
             th.setData({conf: e,sales_rules:e.sales_rules, userInfo: getApp().globalData.userInfo});
@@ -317,429 +318,40 @@ Page({
     //--------立即支付----------
     async jumpToCart4(e) {
-		var th=this;	
-        if(this.data.optionIsGoup) 
-		     wx.navigateTo({
-                 url: "/pages/team/team_confirm/team_confirm?orderSn=" + this.data.order.order_sn + "&orderPay=true"
-             }) 		   
-		var order=this.data.order;
-		var order_goods=order.order_goods;
-		var user_id=order.user_id;
-		
-		var wlist="";	
-		for(var i in order_goods){		
-			var good=order_goods[i];			
-			//线下取价功能已经关闭或者过期
-			if(!th.data.is_open_offline && good.offline_cut>0){
-				 wx.showModal({
-				   title: '提示',
-				   content: '线下取价功能已经关闭或者过期！'
-				 });
-				 return false;
-		}	
-		
-			//要每件每件的商品进行检查，看有么有超出库存，超出限购
-			var good= order_goods[i],goodsbuynum=0,promgoodsbuynum=0,gg=null;
-			//获取单品的现在的活动状态
-			await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + good.goods_id, {		
-			}).then(res=>{
-				gg=res.data.data;
-			})		
-			var limit = gg.viplimited;
-			var store_count = gg.store_count;
-			good.erpwareid=gg.erpwareid;
-			
-			//---要获得商品，该用户买了多少件,同步应用---
-			await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
-			  data: {
-			    store_id: os.stoid,
-			    user_id: getApp().globalData.user_id,
-			    goods_id: good.goods_id,
-			    prom_type: good.prom_type,
-			    prom_id: good.prom_id
-			  },
-			}).then(res => {
-			   var buy_num_data = res.data.data;
-			   if (buy_num_data.promgoodsbuynum) promgoodsbuynum = buy_num_data.promgoodsbuynum;
-			   goodsbuynum = buy_num_data.goodsbuynum;
-			})
-			
-			var buyed_mum2=goodsbuynum+good.goods_num;		
-			if (buyed_mum2 > limit && limit > 0) {
-			 
-			  var content=gg.goods_name+'购买数量超出商品限购,请取消订单';
-			  th.toast(content);
-			  return false;
-			}
-
-            //当是组合优惠的时候
-            if(good.prom_type==7){
-                //如果有组合购
-                var isok = 1;
-                var url="/api/weshop/prom/zhbuy/get/"+os.stoid+"/"+good.prom_id+"/"+getApp().globalData.userInfo.user_id;
-                await getApp().request.promiseGet(url, {}).then(res => {
-                    if(res.data.code==0 && res.data.data){
-                        if(res.data.data.is_show!=1){
-                            isok=0;
-                        }
-                        //如果活动已经结束
-                        if(res.data.data.is_end==1){
-                            isok=0;
-                        }
-                        //已经结束
-                        if(ut.gettimestamp()>res.data.data.end_time){
-                            isok=0;
-                        }
-                        //还未开始
-                        if(ut.gettimestamp()<res.data.data.start_time){
-                            isok=0;
-                        }
-
-                    }else{
-                        //未找到商品的活动
-                        isok = 0;
-                    }
-
-                })
-                if (!isok){
-                    var  content=gg.goods_name+'活动已经结束,请取消订单';
-                    th.toast(content);
-                    return false;
-                }
-
-                var url1 = "/api/weshop/prom/zhbuyGoods/page";
-                var req_data = {
-                    page: 1,
-                    pageSize: 1,
-                    store_id: os.stoid,
-                    zh_id: good.prom_id,
-                    goods_id:good.goods_id
-                }
-                await getApp().request.promiseGet(url1, {
-                    data: req_data
-                }).then(res => {
-                    if (ut.ajax_ok(res)) {
-                        var gdlist = res.data.data.pageData[0];
-                        good.buyqty=gdlist.buyqty;
-                    }
-                })
-                var num=good['buyqty'];
-                console.log(1111);
-                console.log(num);
-                //---- 要计算商品的限购 -----
-                if(good['buyqty']>0){
-                    if(good.goods_num+promgoodsbuynum>good['buyqty']){
+			// 幸运购检查库存量 api/weshop/activitylist/getActLen/{store_id}/{prom_type}/{prom_id}
+			if (parseInt(this.data.order.order_goods['0']['prom_type']) == 9) {
+				var aid = this.data.order.order_goods['0']['prom_id'];
+				var knum = 0;
+				await r.promiseGet('/api/weshop/activitylist/getActLen/' + os.stoid + '/9/' + aid, {
+				}).then(res => {
+					if (res.data.code == 0) {
+						knum = res.data.data;
+					}
+					
+				});
-                        var  content= good['goods_name']+"超出活动限购\n";
-                        th.toast(content);
-                        return false;
-                    }
-                }
-            }
+				if (knum <= 0) {
+					getApp().confirmBox("库存为0，支付失败");
+					return false;
+				}
-            //如果优惠促销和搭配购的时候
-			if((good.prom_type==3 || good.prom_type==5) && good.is_collocation!=1 && good.is_gift!=1){
-				var p_ok=1;
-			    await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => {
-			        if(res.data.code==0){
-			                var r_data=res.data.data;
-			                if(!r_data.collocationPromList && good.prom_type==5){
-			                   
-			                    var content=good.goods_name+'未找到活动,请取消订单重新购买';
-			                    th.toast(content);
-								p_ok=0;
-			                }
-			                if(!r_data.promGoodsLists && good.prom_type==3){
-			                   
-			                    var  content=good.goods_name+'未找到活动,请取消订单重新购买';
-			                    th.toast(content);
-								p_ok=0;
-			                }
-			        }else{
-			          
-			            var content=good.goods_name+'未找到活动,请取消订单重新购买';
-			            th.toast(content);
-			            p_ok=0;
-			        }
-			    })	
-				if(!p_ok) return false;				
 			}
-								
-			//商品的普通购买 ，不要进行判断
-			if((good.prom_type==1 || good.prom_type==2 || good.prom_type==6  || good.prom_type==4) && !good.is_gift && !good.is_collocation && !good.is_integral_normal && !good.is_pd_normal){
-				   if(gg.prom_type!=good.prom_type && gg.prom_type>0)	{
-					   var content=gg.goods_name+'商品的活动发生了变化,请取消订单重新购买';
-					   th.toast(content);
-					   return false;		   
-				   }
-			  }else{
-				  if((gg.prom_type==1 || gg.prom_type==3 || gg.prom_type==5 || gg.prom_type==6 || gg.prom_type==4)
-					  && !good.is_collocation  && !good.is_gift && !good.is_integral_normal && !good.is_pd_normal) {
-				  				  var prom=null;
-				  				  //---如果是活动的时候---
-				  				  var prom=null,th=this;
-				  				  if(gg.prom_type==1){	
-				  				  			  await getApp().request.promiseGet("/api/ms/flash_sale/getNew/"+os.stoid+"/"+user_id+"/"+gg.prom_id,{
-				  				  			  }).then(res=>{
-				  				  				  if(res.data.code==0){
-				  				  					  prom=res.data.data;
-				  				  					  prom.price=prom.user_price;
-				  				  				  }
-				  				  			  })
-				  				  }	  
-								  
-								  if (gg.prom_type == 2) {
-								      await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/"+ gg.goods_id + "/" + gg.prom_id, {}).then(res => {
-								          if (res.data.code == 0) {
-								              prom = res.data.data;
-								              prom.price=prom.price;
-								          }
-								      })
-								  }
-								  
-								  
-				  				  if(gg.prom_type==6){
-				  				  			await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+gg.prom_id,{
-				  				  			}).then(res=>{
-				  				  				  if(res.data.code==0){
-				  				  					  prom=res.data.data;
-				  				  				  }
-				  				  			})	  
-				  				  }	 
-				  				  
-				  				  if(gg.prom_type==4){
-				  				  			await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1",{
-				  								data:{store_id:os.stoid,goods_id:gg.goods_id}
-				  				  			}).then(res=>{
-				  				  				  if(res.data.code==0 && res.data.data && res.data.data.pageData){
-				  				  					  prom=res.data.data.pageData[0];
-				  				  				  }
-				  				  			})	  
-				  				  }	
-				  				  								
-				  				  if(prom){
-				  					  var t_now=ut.gettimestamp();
-				  					  if(prom.is_end==0 && prom.start_time<t_now && prom.end_time>t_now){
-				  						  
-				  						  var  content=gg.goods_name+'商品的活动发生了变化,请取消订单重新购买';
-				  						  th.toast(content);
-				  						  return false;	
-				  					  }
-				  				  } 				  
-				  }
-				  else{
-                          //不是赠品的时候
-				  	      if(!good.is_gift && good.prom_type!=3){
-							  var t_ok=1;
-							  await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => {
-								  if(res.data.code==0){
-									  var r_data=res.data.data;
-									  //-- 参加了全局的优惠活动 --
-									  if(r_data.promGoodsLists){
-										 
-										  var content=gg.goods_name+'商品的活动发生了变化,请取消订单重新购买';
-										  th.toast(content);
-										  t_ok=0;
-									  }
-								  }
-							  })
-							  if(!t_ok) return false;
-						  }
-
-						  //-- 如果有参加线下取价 --		  
-						  if(good.offline_cut>0) wlist+=encodeURIComponent(gg.erpwareid)+",";	
-				   }
-				  //赠品和搭配购不判断商品金额
-				  var isok=1;
-				  var card_field=th.data.card_field;
-				  //如果会员是等级会员,商品有等级价,且不是活动商品
-		          if(!good.is_gift && !good.is_collocation) {
-		             if (card_field && gg[card_field] > 0) {
-		                 if (good.goods_price != gg[card_field] && good.offline_cut<=0) isok = 0;
-		                 if (good.goods_price >gg[card_field] && good.offline_cut>0) isok = 0;  //如果线下价格比较贵，则不通过
-	             					 				  
-		             } else {
-		                 if (good.goods_price != gg.shop_price && good.offline_cut<=0) isok = 0;
-		                 if (good.goods_price> gg.shop_price && good.offline_cut>0) isok = 0; //如果线下价格比较贵，则不通过
-		             }
-		              var is_h=0;
-		              if (!isok) {
-		                 
-		                  var content=gg.goods_name + '商品的价格发生了变化,请取消订单重新购买';
-		                  th.toast(content);
-		                  return false;
-		              }
-		          }
-				
-				  //--如果是线下库存的时候--		
-				  if(th.data.conf.sales_rules==2){
-					   var ob={};
-					   await th.check_down_line_next(gg,good.goods_num,order.pickup_id,function(obj){
-						   ob=obj;
-					   })
-					   if(ob.code==-1){
-						 
-						   var content=gg.goods_name+'门店库存不足,请取消订单';
-						   th.toast(content);
-						   return false;		
-					   }				   
-					   
-				  }else{
-					  if(good.goods_num>store_count){
-						  
-						   var content=gg.goods_name+'商品的库存不足,请取消订单';
-						   th.toast(content);
-						   return false;		
-					  }
-					  
-				  }			  
-			  }
-			  
-			  console.log("------------------------------------");
-			   //---如果是活动的时候---
-			   var prom=null,goodsinfo=good,th=this;
-			   if(goodsinfo.prom_type==1){	
-			  			  await getApp().request.promiseGet("/api/ms/flash_sale/getNew/"+os.stoid+"/"+user_id+"/"+goodsinfo.prom_id,{
-			  			  }).then(res=>{
-			  				  if(res.data.code==0){
-			  					  prom=res.data.data;
-                                  prom.price=prom.user_price;
-			  				  }
-			  			  })
-			   }	
-			   
-			   if (goodsinfo.prom_type == 2) {
-			       await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/"+ good.goods_id + "/" + goodsinfo.prom_id, {}).then(res => {
-			           if (res.data.code == 0) {
-			               prom = res.data.data;
-			               prom.price=prom.price;
-			           }
-			       })
-			   }
-				 
-				 	 
-			   if(goodsinfo.prom_type==6 && !good.is_pd_normal){
-			  			await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+goodsinfo.prom_id,{
-			  			}).then(res=>{
-			  				  if(res.data.code==0){
-			  					  prom=res.data.data;
-			  				  }
-			  			})	  
-			   }
-			  				
-			  if(goodsinfo.prom_type==4 && !good.is_integral_normal){
-			  			 await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1",{
-			  			 	data:{store_id:os.stoid,goods_id:goodsinfo.goods_id}
-			  			 }).then(res=>{
-			  			 	  if(res.data.code==0 && res.data.data && res.data.data.pageData){
-			  			 		  prom=res.data.data.pageData[0];
-			  			 	  }
-			  			 })	  
-			  }		
-			  							
-			   //----------如果有活动，并且在进行中，就不计算线下库存---------------	 
-			   if(prom){
-			  			  var now=ut.gettimestamp();
-			  			  if(prom.is_end==1 && prom.end_time<now){			   
-			  				
-			  				var content=goodsinfo.goods_name+'商品的活动已经结束,请取消订单重新购买';
-			  				th.toast(content);
-			  				return false;		
-			  			  }
-			  			  
-			  			  buyed_mum2=promgoodsbuynum+good.goods_num;
-			  			  if (buyed_mum2 > prom.buy_limit && prom.buy_limit > 0) {
-			  			   
-			  			    var content=goodsinfo.goods_name+'购买数量超出商品活动限购,请取消订单重新购买';
-			  			    th.toast(content);
-			  			    return false;
-			  			  }
-			  			  //看一下会员的秒杀价格是不是发生了变化
-                          if(goodsinfo.prom_type==1 && goodsinfo.goods_price!=prom.price){
-                               var content=goodsinfo.goods_name+'秒杀活动的价格发生了变化';
-                               th.toast(content);
-                               return false;
-                          }
-						  
-						  //看一下会员的团购价格是不是发生了变化
-						  if(goodsinfo.prom_type==2 && goodsinfo.goods_price!=prom.price){
-						       var content=goodsinfo.goods_name+'秒杀活动的价格发生了变化';
-						       th.toast(content);
-						       return false;
-						  }
-			  			  if(goodsinfo.prom_type==4){
-			  				  if (good.goods_num > prom.limitqty-prom.buy_num) {
-			  				   
-			  				    var content=goodsinfo.goods_name+'购买数量超出商品活动库存,请取消订单';
-			  				    th.toast(content);
-			  				    return false;
-			  				  }				  
-			  			  }else if(goodsinfo.prom_type == 1 || goodsinfo.prom_type == 2 || goodsinfo.prom_type == 6 ) {
-								if(order.add_time+5*60<ut.gettimestamp()) {
-									var content = gg.goods_name + '该订单已经超时无法支付,请取消订单';
-									th.toast(content);
-									return false;
-								}
-						}
-											  
-			   }
-			  
-		}
+			var order=this.data.order;
+			var order_goods=order.order_goods;
+			var user_id=order.user_id;
+			// 检测活动是否结束
+			
-		//-- 要判断一下线下取价价格是不是发生改变 --
-		if(wlist!="" && th.data.is_open_offline && th.data.is_open_offline>0){
-			wlist=ut.sub_last(wlist);
-			var keyid=order.pickup_id;
-			var user_info=getApp().globalData.userInfo;
-			if(!keyid) return false;	
-			var offarr=null;	
-			await getApp().request.promiseGet("/api/weshop/goods/listWarePrice", {
-			       data:{
-					   VIPId:encodeURIComponent(user_info.erpvipid),
-				  	   store_id:os.stoid,
-			           PickupId:keyid,
-				  	   WareIds:wlist},			 
-					},
-			).then(res=>{
-				if(res.data.code==0 && res.data.data && res.data.data.length>0){
-					offarr=res.data.data;						  
-				}
-			})				
-			if(!offarr && offarr.length<=0 ){
-				wx.showModal({ title: '获取线下取价失败',});
-			}
-			var newarr=ut.convert_arr_key(offarr,'WareId');	
-			//-- 循环判断线下的价格 --	
-			for(var k in order_goods){
-				var good=order_goods[k];
-				//判断线下取价是不是一样
-				if(newarr[good.erpwareid] && 
-				   parseFloat(newarr[good.erpwareid].WarePrice)!=parseFloat(good.goods_price)){		
-					
-					 var content=good.goods_name + '商品的价格发生了变化,请取消订单重新购买';
-					 th.toast(content);
-					 return false;	
-				}
-			}	
-				
-		}
-
-		/*---
-		o.jumpToCart4({
-            order_sn: this.data.order.order_sn,
-            order_amount: this.data.order.order_amount,
-			type: 1 //正常单
-        }, 1);--*/
-
         py.pay(this.data.order.order_sn, function() {
-            wx.showToast({title: '支付成功'})
-			wx.navigateBack();
+          wx.showToast({title: '支付成功'})
+					wx.navigateBack();
         },null,os.stoid,1);
-    },
+		},
+
     checkTeam: function() {
         wx.navigateTo({
             url: "/pages/team/team_detail/team_detail?foundId=" + this.data.order.orderTeamFound.found_id
@@ -1472,27 +1084,41 @@ Page({
     //跳转到商品
     go_gd:function (e) {
+			// console.log(e);
         var gd= e.currentTarget.dataset.gd;
-        var good_url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + gd;
-        var url="/api/weshop/activitylist/getGoodActInfo";
-        var req_data={
-            store_id:os.stoid,goodsidlist:gd,is_detail:1
-        };
+				var prom_type = this.data.order.order_goods[0].prom_type;
+				// var good_url='';
+				// if(prom_type == 9) {
+				// 	good_url = '';
+				// } else {
+				// 	good_url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + gd;
+				// };
+				
+        var good_url="/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=" + gd + '&group_id=' + this.data.group_id;
+				getApp().goto(good_url);
+				
+        // var url="/api/weshop/activitylist/getGoodActInfo";
+        // var req_data={
+        //     store_id:os.stoid,goodsidlist:gd,is_detail:1
+        // };
         //获取秒杀的多规格
-        getApp().request.promiseGet(url, {data:req_data}).then(res=>{
-            if(res.data.code==0 && res.data.data){
-                if(res.data.data.length==1){
-                    good_url+="&prom_type="+res.data.data[0].prom_type+"&prom_id="+res.data.data[0].act_id;
-                }
-                getApp().goto(good_url);
+        // getApp().request.promiseGet(url, {data:req_data}).then(res=>{
+        //     if(res.data.code==0 && res.data.data){
+        //         if(res.data.data.length==1){
+        //             good_url+="&prom_type="+res.data.data[0].prom_type+"&prom_id="+res.data.data[0].act_id;
+        //         }
+        //         getApp().goto(good_url);
-            }else{
-                getApp().goto(good_url);
-            }
-        })
+        //     }else{
+        //         getApp().goto(good_url);
+        //     }
+        // })
     },
+		
+		
+		
@@ -30,16 +30,16 @@
 						            data-errorimg="order.order_goods[{{index}}].original_img"></image>
 						</view>
 						<!-- 跳转到商品 -->
-						<navigator class="order-cont pdh20"  bindtap="go_gd" data-gd="{{item.goods_id}}">
+						<view class="order-cont pdh20"  bindtap="go_gd" data-gd="{{item.goods_id}}">
 						    <view class="goods-name ellipsis-2">{{item.goods_name}}</view>
 						    <!--<view class="goods-color">{{item.goods_spec}} {{item.goods_color}}</view>-->
 						    <view class="goods-color">{{filters.show_gui_ge(item.goods_spec,item.goods_color)}}</view>
-						</navigator>
+						</view>
 					</view>
             <view class="order-num">
-                <view class="goods-price">￥{{item.member_goods_price}}</view>
+                <view class="goods-price">￥{{item.goods_price}}</view>
                 <view class="goods-num">×{{item.goods_num}}</view>
                 <!-- 不是整单退的时候 -->
@@ -84,9 +84,10 @@
             <view>{{order.addTimeFormat}}</view>
         </view>
-        <view class="item" wx:if="{{order.order_prom_type!=5}}">
+        <view class="item">
             <view>配送方式</view>
-            <view>{{(order.shipping_name!=''&& order.shipping_name!=null) ?order.shipping_name:'无'}}</view>
+            <view wx:if="{{order.exp_type == 0}}">{{order.shipping_name}}</view>
+            <view wx:if="{{order.exp_type == 1}}">自提</view>
         </view>
         <view class="item">
             <view>买家留言</view>
@@ -173,7 +174,7 @@
-    <!-- <view class="btn-wrap">
+    <view class="btn-wrap">
         <view bindtap="zfwk" class="tips-btn" wx:if="{{order.pt_tail_money>0 && order.pt_status==2 }}">支付尾款</view>
         <view bindtap="jumpToCart4" class="tips-btn" hidden="{{!order.pay_btn}}">立即付款</view>
@@ -183,9 +184,8 @@
         </block>
 		<view class="tips-btn" wx:if="{{order.order_status==3}}"  bindtap="deleteOrderData" data-order_id="{{order.order_id}}" >删除订单</view>
-		
-        <navigator class="tips-btn" hidden="{{!order.shipping_btn}}" url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator> -->
+        <navigator class="tips-btn" hidden="{{!order.shipping_btn}}" url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator> 
           <!---has_rt部分退---->
          <!-- <block wx:if="{{order.return_btn==undefined && order.is_all_return!=1 && order.has_rt!=1}}">
@@ -197,7 +197,8 @@
                           <navigator class="tips-btn" wx:if="{{order.is_all_return_status==3 && order.order_status<2}}"  url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">重新退款</navigator>
                           <navigator class="tips-btn" wx:if="{{order.is_all_return_status==0 || order.is_all_return_status==1}}"
                                      url="/pages/user/return_goods_info/return_goods_info?order_id={{order.order_id}}">退款详情</navigator>
-        </block>
+		
+        </block>-->
         <block wx:if="{{order.order_status==2 && order.is_zsorder!=4}}">
@@ -205,12 +206,9 @@
                        url="/packageB/pages/user/comment/comment?status=0&order_id={{order.order_id}}">评价</navigator>
             <navigator wx:else  class="tips-btn"
                        url="/packageB/pages/user/add_comment/add_comment?goods_id={{order.order_goods[0].goods_id}}&order_id={{order.order_id}}}">去评价</navigator>
-        </block> -->
-		<!-- 积分购  拼团 搭配购没有有再来一单 -->
-		<!-- <block wx:if="{{ (order.pay_status==1 || order.order_status==3) && order.pt_prom_id<=0 && order.integral<=0 && order.order_goods[0].prom_type!=5}}">
-			<view style="background-color: #feca53;"  class="tips-btn"  bindtap="moreOrder" >再来一单</view>										
-		</block>
-    </view> -->
+        </block>
+		
+    </view>
 </view>
 <warn id="warn"></warn>
@@ -68,6 +68,7 @@ Page({
 					store_id: app.globalData.setting.stoid,
 					team_status: 2,
 					goods_id: self.data.options.goods_id,
+					pageSize: 20,
 				});
@@ -104,8 +105,9 @@ Page({
   onReachBottom: function () {
 		this.scrollToLower('/api/weshop/prom/luckyOrder/page', {
 			store_id: app.globalData.setting.stoid,
-			team_status: 1,
+			team_status: 2,
 			goods_id: this.data.options.goods_id,
+			pageSize: 20,
 		});
   },
@@ -8,11 +8,11 @@ page {
 }
 .img-container {
-	width: 60rpx;
-	height: 60rpx;
+	width: 80rpx;
+	height: 80rpx;
 	border-radius: 50%;
 	overflow: hidden;
-	margin-right: 10rpx;
+	margin-right: 20rpx;
 	flex-shrink: 0;
 }
@@ -32,7 +32,7 @@ page {
 	display: flex;
 	align-items: center;
 	text-align: center;
-	font-size: 26rpx;
+	font-size: 28rpx;
 }
 .list-hd {
@@ -21,7 +21,7 @@
 		<view class="information bdr14 mgt20 fs26">
 			<view class="pd20 bdb">代付订单信息</view>
 			<view>
-				<view class="use-item bfff bdr_t-14 mgt20">
+				<view class="use-item bfff bdr_t-14">
 					<image class="dp" src='{{imgUrl}}/miniapp/images/goodscategory/new_store.png'></image>
 					<view>{{bn_pickname}}门店名称</view>
 				</view>
@@ -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'];
@@ -25,39 +25,55 @@ Page({
     curpage: 1, //当前分页数
     pageSize: 10, //页大小
     total: 0, //总数量
-	ad_data:null,
+    ad_data: null,
+    first_leader: e.globalData.first_leader || 0, // 推荐人ID
   },
-  onLoad: function(options) {
-
+  onLoad: function (options) {
     var th = this;
     var my_confirm = th.selectComponent("#my_confirm"); //组件的id
     my_confirm.open_cancel(0);
     th.setData({
       getStorageID: a.stoid,
       getUserID: d.user_id
+    });
+    //-- 获取分享人的ID --
+    var first_leader = options.first_leader || getApp().globalData.first_leader;
+    if (first_leader) {
+      this.setData({
+        first_leader,
+      })
+      //--  user_id代过来免登录 --
+      getApp().globalData.first_leader = first_leader;
+      //调用接口判断是不是会员
+      getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => {
+        if (res.data.code == 0) {
+          getApp().globalData.guide_id = res.data.data.id;
+        }
+      })
+    }
+
+    getApp().request.promiseGet("/api/weshop/ad/page?pid=901&store_id=" + os.stoid, {
+      data: {
+        enabled: 1
+      }
+    }).then(res => {
+      if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length > 0) {
+        var a = res.data.data.pageData;
+        var tt = {
+          'ad_code': os.imghost + a[0].ad_code,
+          'media_link': '',
+          'ad_weapplink': a[0].ad_weapplink,
+          'bgcolor': a[0].bgcolor,
+        };
+        th.setData({
+          ad_data: tt
+        });
+      }
     })
-	
-	
-	getApp().request.promiseGet("/api/weshop/ad/page?pid=901&store_id=" + os.stoid, {
-	  data: {
-	    enabled: 1
-	  }
-	}).then(res => {
-		if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
-			var a = res.data.data.pageData;
-			var tt = {
-			  'ad_code': os.imghost + a[0].ad_code,
-			  'media_link': '',
-			  'ad_weapplink':a[0].ad_weapplink,
-			  'bgcolor':a[0].bgcolor,
-			};
-			th.setData({ad_data:tt});				
-		}					 			
-	})
-	
+
   },
-  onShow: function() {
+  onShow: function () {
     //--先判断会员状态--
     var user_info = getApp().globalData.userInfo;
     if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
@@ -68,7 +84,8 @@ Page({
   },
-  GetBuyPrice: function(e) {
+  //购买礼包
+  GetBuyPrice: function (e) {
     var that = this.data;
     var th = this;
     var id = e.currentTarget.dataset.id; //活动id
@@ -79,10 +96,10 @@ Page({
       "是否确定购买该礼包",
       "取消",
       "确定",
-      function() {
+      function () {
         my_confirm.open_cancel(0);
       },
-      function() {
+      function () {
         my_confirm.open_cancel(0);
         var json = {
           "actId": '', //活动Id
@@ -91,25 +108,23 @@ 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;
-		}
-		
-		
+
+        //-- 分享导购要记录 --
+        if (getApp().globalData.guide_id) {
+          json.guide_id = getApp().globalData.guide_id;
+        }
+
         var data = JSON.stringify(json);
         var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert";
         getApp().request.json_post(url, json,
-          function(res) {
+          function (res) {
             if (res.data.code == 0 && res.data.data) {
-			   	
-              var order_sn = res.data.data.orderSn;	  
-              res = res.data.data.result;		  
-			  if(!res) return false;
-			  
+              var order_sn = res.data.data.orderSn;
+              res = res.data.data.result;
+              if (!res) return false;
               var url = "/pages/giftpack/payment/payment?money=" + money + "&order_sn=" + order_sn;
               wx.requestPayment({
                 timeStamp: String(res.timeStamp),
@@ -117,10 +132,10 @@ Page({
                 package: res.packageValue,
                 signType: res.signType,
                 paySign: res.paySign,
-                success: function(res) {
+                success: function (res) {
                   getApp().goto(url);
                 },
-                fail: function(res) {
+                fail: function (res) {
                   getApp().my_warnning("取消支付", 0, th);
                 }
               });
@@ -128,7 +143,7 @@ Page({
               getApp().my_warnning(res.data.msg, 0, th);
             }
           },
-          function(res) {
+          function (res) {
           }
@@ -141,19 +156,21 @@ Page({
   },
-  GetBuyIntegral: function(e) {
+  // 积分兑换
+  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(
       "是否确定兑换该礼包",
       "取消",
       "确定",
-      function() {
+      function () {
         my_confirm.open_cancel(0);
       },
-      function() {
+      function () {
         my_confirm.open_cancel(0);
         var json = {
           "actId": '', //活动Id
@@ -162,72 +179,74 @@ 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;
-		}
+        //-- 分享导购要记录 --
+        if (getApp().globalData.guide_id) {
+          json.guide_id = getApp().globalData.guide_id;
+        }
+        console.log(json,'json');
         var data = JSON.stringify(json);
         var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert";
         getApp().request.json_post(url, json,
-          function(res) {
+          function (res) {
             if (res.data.code == 0) {
               getApp().my_warnning("兑换成功！", 1, th);
             } else {
               getApp().my_warnning(res.data.msg, 0, th);
             }
           },
-          function(res) {})
+          function (res) {})
       })
   },
   //免费领取
-  GetFree:function (e){
+  GetFree: 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(
-        "是否确定领取该礼包",
-        "取消",
-        "确定",
-        function() {
-          my_confirm.open_cancel(0);
-        },
-        function() {
-          my_confirm.open_cancel(0);
-          var json = {
-            "actId": '', //活动Id
-            "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
-            "buyType": '3', //1=积分兑换 2=余额购买  3=免费领取
-            "giftBagId": id, //礼包Id
-            "storeId": that.getStorageID, //商家Id
-            "userId": that.getUserID, //用户ID
-            "buyFrom": 2
-          };
-          //-- 分享导购要记录 --
-          if(getApp().globalData.guide_id){
-            json.guide_id=getApp().globalData.guide_id;
-          }
-          var data = JSON.stringify(json);
-          var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert";
-          getApp().request.json_post(url, json,
-              function(res) {
-                if (res.data.code == 0) {
-                  getApp().my_warnning("领取成功！", 1, th);
-                } else {
-                  getApp().my_warnning(res.data.msg, 0, th);
-                }
-              },
-              function(res) {})
-        })
+      "是否确定领取该礼包",
+      "取消",
+      "确定",
+      function () {
+        my_confirm.open_cancel(0);
+      },
+      function () {
+        my_confirm.open_cancel(0);
+        var json = {
+          "actId": '', //活动Id
+          "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
+          "buyType": '3', //1=积分兑换 2=余额购买  3=免费领取
+          "giftBagId": id, //礼包Id
+          "storeId": that.getStorageID, //商家Id
+          "userId": that.getUserID, //用户ID
+          "buyFrom": 2,
+          "first_leader": that.first_leader
+        };
+        //-- 分享导购要记录 --
+        if (getApp().globalData.guide_id) {
+          json.guide_id = getApp().globalData.guide_id;
+        }
+        var data = JSON.stringify(json);
+        var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert";
+        getApp().request.json_post(url, json,
+          function (res) {
+            if (res.data.code == 0) {
+              getApp().my_warnning("领取成功！", 1, th);
+            } else {
+              getApp().my_warnning(res.data.msg, 0, th);
+            }
+          },
+          function (res) {})
+      })
   },
-  getList: function(e) {
+  getList: function (e) {
     var th = this;
     getApp().request.get('/api/weshop/marketing/giftbag/page', {
       isShowLoading: true,
@@ -237,7 +256,7 @@ Page({
         page: th.data.curpage,
         pageSize: th.data.pageSize
       },
-      success: function(res) {
+      success: function (res) {
         if (res.data.code == 0) {
           th.data.curpage++;
           var arr1 = th.data.wareCard;
@@ -254,7 +273,7 @@ Page({
         } else {
           th.setData({
             is_read: 1,
-            ismore:1
+            ismore: 1
           })
         }
       }
@@ -262,7 +281,7 @@ Page({
   },
   //销毁界面跳转
-  redirectTo: function(e) {
+  redirectTo: function (e) {
     var th = this;
     var url = e.currentTarget.dataset.url;
     //销毁跳转
@@ -271,14 +290,14 @@ Page({
     });
   },
   //不销毁界面跳转
-  navigateTo: function(e) {
+  navigateTo: function (e) {
     var th = this;
     var url = e.currentTarget.dataset.url;
     getApp().goto(url);
   },
   //下拉事件
-  onReachBottom: function() {
+  onReachBottom: function () {
     var th = this;
     if (th.data.total <= th.data.pageSize) return;
     if (th.data.ismore) return;
@@ -286,41 +305,44 @@ Page({
     th.getList();
   },
   //图片失败，默认图片
-  bind_bnerr2: function(e) {
+  bind_bnerr2: function (e) {
     var _errImg = e.target.dataset.errorimg;
     var _errObj = {};
     _errObj[_errImg] = "/miniapp/images/default_g_img.gif";
     this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; 
   },
-  goto: function(e) {
+  goto: function (e) {
     var th = this;
     var url = e.currentTarget.dataset.url;
     getApp().goto(url);
   },
-	
-	onShareAppMessage: function (e) {
-	  var curPage=this;
-	  var pagePath = curPage.route; //当前页面url
-	  if (pagePath.indexOf('/') != 0) {
-	    pagePath = '/' + pagePath;
-	  }
-	  return {
-	    title: "专享礼包",
-	    path:pagePath,
-	  }
-	},
-	
-		onShareTimeline() {
-			var curPage=this;
-			var pagePath = curPage.route; //当前页面url
-			if (pagePath.indexOf('/') != 0) {
-			  pagePath = '/' + pagePath;
-			}
-			return {
-			  title: '专享礼包',
-				imageUrl: this.data.ad_data.ad_code,
-			  path: pagePath,
-			}
-		},
-		
+
+  onShareAppMessage: function (e) {
+    var curPage = this;
+    var pagePath = curPage.route; //当前页面url
+    if (pagePath.indexOf('/') != 0) {
+      pagePath = '/' + pagePath;
+    }
+    pagePath += "?first_leader="+this.data.getUserID;
+    return {
+      title: "专享礼包",
+      path: pagePath,
+    }
+  },
+
+  // 分享朋友圈
+  onShareTimeline() {
+    var curPage = this;
+    var pagePath = curPage.route; //当前页面url
+    if (pagePath.indexOf('/') != 0) {
+      pagePath = '/' + pagePath;
+    }
+    pagePath += "?first_leader="+this.data.getUserID;
+    return {
+      title: '专享礼包',
+      imageUrl: this.data.ad_data.ad_code,
+      path: pagePath,
+    }
+  },
+
 })
 \ No newline at end of file
@@ -28,33 +28,36 @@ Page({
     code: "", //核销码
     c_state: "0", //判断是否已经使用, 0正常  1已使用  2已过期
     is_lb: 0, //是否有礼包
-    default_color:null,
+    default_color: null,
+    first_leader: e.globalData.first_leader || 0, // 推荐人ID
   },
-  onLoad: function(options) {
+  onLoad: function (options) {
     var th = this;
     th.setData({
       isBuy: options.isBuy,
       getGiftID: options.lbId,
-      orderSn: options.orderSn
+      orderSn: options.orderSn,
+      getUserID: d.user_id,
     })
-	
-	//-- 获取分享人的ID --
-	var first_leader=options.first_leader;
-	if(first_leader){
-		 //--  user_id代过来免登录 --
-	     getApp().globalData.first_leader=first_leader;	  	  
-	     //调用接口判断是不是会员
-	     getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{
-	         if(res.data.code==0){
-	             getApp().globalData.guide_id=res.data.data.id;
-	         }
-	     })
-	 }
-
+    //-- 获取分享人的ID --
+    var first_leader = options.first_leader || getApp().globalData.first_leader;
+    if (first_leader) {
+      this.setData({
+        first_leader,
+      })
+      //--  user_id代过来免登录 --
+      getApp().globalData.first_leader = first_leader;
+      //调用接口判断是不是会员
+      getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => {
+        if (res.data.code == 0) {
+          getApp().globalData.guide_id = res.data.data.id;
+        }
+      })
+    }
     th.close();
   },
-  
-  onShow: function() {	  
+
+  onShow: function () {
     //--先判断会员状态--
     var user_info = getApp().globalData.userInfo;
     if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
@@ -68,14 +71,14 @@ Page({
     }
   },
-  GetBuyPrice: function(e) {
+  GetBuyPrice: function (e) {
     var that = this.data;
     var th = this;
     // var id = e.currentTarget.dataset.id;//活动id
     //如果还没有开始的话
-    if(th.data.isStart!=1){
-       getApp().my_warnning("活动还没有开始", 0, th);
-       return false;
+    if (th.data.isStart != 1) {
+      getApp().my_warnning("活动还没有开始", 0, th);
+      return false;
     }
@@ -85,10 +88,10 @@ Page({
       "是否确定购买该礼包",
       "取消",
       "确定",
-      function() {
+      function () {
         my_confirm.open_cancel(0);
       },
-      function() {
+      function () {
         my_confirm.open_cancel(0);
         var json = {
@@ -98,24 +101,25 @@ Page({
           "giftBagId": that.getGiftID, //礼包Id
           "storeId": a.stoid, //商家Id
           "userId": d.user_id, //用户ID
-          "buyFrom": 2
+          "buyFrom": 2,
+          "first_leader": that.first_leader,
         };
-		
-		//-- 分享导购要记录 --
-		if(getApp().globalData.guide_id){
-			json.guide_id=getApp().globalData.guide_id;
-		}
-				
+
+        //-- 分享导购要记录 --
+        if (getApp().globalData.guide_id) {
+          json.guide_id = getApp().globalData.guide_id;
+        }
+
         var data = JSON.stringify(json);
         var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert";
         getApp().request.json_post(url, json,
-          function(res) {
+          function (res) {
             if (res.data.code == 0) {
               var res = res.data.data;
-			  if(!res) return false;
-			  if(!res.result) return false;
-			  			  
+              if (!res) return false;
+              if (!res.result) return false;
+
               var order_sn = res.orderSn;
               var url = "/pages/giftpack/payment/payment?money=" + money + "&order_sn=" + order_sn;
               wx.requestPayment({
@@ -124,10 +128,10 @@ Page({
                 package: res.result.packageValue,
                 signType: res.result.signType,
                 paySign: res.result.paySign,
-                success: function(n) {
+                success: function (n) {
                   getApp().goto(url);
                 },
-                fail: function(n) {
+                fail: function (n) {
                   getApp().my_warnning("取消支付", 0, th);
                 }
               });
@@ -135,7 +139,7 @@ Page({
               getApp().my_warnning(res.data.msg, 0, th);
             }
           },
-          function(res) {
+          function (res) {
           }
@@ -147,12 +151,12 @@ Page({
     )
   },
-  GetBuyIntegral: function(e) {
+  GetBuyIntegral: function (e) {
     var that = this.data;
     var th = this;
     //如果还没有开始的话
-    if(th.data.isStart!=1){
+    if (th.data.isStart != 1) {
       getApp().my_warnning("活动还没有开始", 0, th);
       return false;
     }
@@ -162,10 +166,10 @@ Page({
       "是否确定兑换该礼包",
       "取消",
       "确定",
-      function() {
+      function () {
         my_confirm.open_cancel(0);
       },
-      function() {
+      function () {
         my_confirm.open_cancel(0);
         var json = {
           "actId": '', //活动Id
@@ -174,26 +178,25 @@ Page({
           "giftBagId": that.getGiftID, //礼包Id
           "storeId": a.stoid, //商家ID
           "userId": d.user_id, //用户ID
-          "buyFrom":2
+          "buyFrom": 2,
+          "first_leader": that.first_leader,
         };
-		
-		//-- 分享导购要记录 --
-		if(getApp().globalData.guide_id){
-			json.guide_id=getApp().globalData.guide_id;
-		}
-		
-		
+        //-- 分享导购要记录 --
+        if (getApp().globalData.guide_id) {
+          json.guide_id = getApp().globalData.guide_id;
+        }
+
         var data = JSON.stringify(json);
         var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert";
         getApp().request.json_post(url, json,
-          function(res) {
+          function (res) {
             if (res.data.code == 0) {
               getApp().my_warnning("兑换成功！", 1, th);
             } else {
               getApp().my_warnning(res.data.msg, 0, th);
             }
           },
-          function(res) {
+          function (res) {
           }
@@ -203,7 +206,7 @@ Page({
   },
-  GetMyGiftList: function() {
+  GetMyGiftList: function () {
     var _this = this;
     var th = this;
     getApp().request.get('/api/weshop/marketing/my/giftbag/detail/get', {
@@ -213,12 +216,12 @@ Page({
         "userId": d.user_id, //用户ID
         "orderSn": th.data.orderSn
       },
-      success: function(res) {
+      success: function (res) {
         if (res.data.code == 0) {
           th.setData({
             giftImage: th.data.iurl + res.data.data.lbUrl,
             giftTitle: res.data.data.giftTitle,
-            default_color:res.data.data.bgcolor
+            default_color: res.data.data.bgcolor
           })
           if (res.data.data.giftRemark == '') {
             th.setData({
@@ -272,7 +275,7 @@ Page({
     });
   },
-  GetBuyGiftList: function() {
+  GetBuyGiftList: function () {
     var _this2 = this;
     var th = this.data;
     getApp().request.get('/api/weshop/marketing/giftbag/detail/get', {
@@ -287,7 +290,7 @@ Page({
           _this2.setData({
             giftImage: th.iurl + res.data.data.lbUrl,
             giftTitle: res.data.data.giftTitle,
-            default_color:res.data.data.bgcolor
+            default_color: res.data.data.bgcolor
           })
           if (res.data.data.giftRemark == '') {
             _this2.setData({
@@ -299,13 +302,13 @@ Page({
             })
           }
-          var isStart=0;
-          var now=ut.gettimestamp();
+          var isStart = 0;
+          var now = ut.gettimestamp();
-          var str = res.data.data.starTime.replace(/-/g,'/');
+          var str = res.data.data.starTime.replace(/-/g, '/');
           var start = Date.parse(new Date(str));
           start = start / 1000;
-          if(start<now) isStart=1;
+          if (start < now) isStart = 1;
           _this2.setData({
             giftDate: res.data.data.endTime,
@@ -317,7 +320,7 @@ Page({
             giftType: res.data.data.actType,
             actTitle: res.data.data.actTitle,
             wareCard: res.data.data.wareCard,
-            isStart:isStart,
+            isStart: isStart,
           })
         } else {
           getApp().my_warnning(res.data.msg, 0, _this2);
@@ -328,7 +331,7 @@ Page({
   },
   //显示核销码
-  code_show: function(e) {
+  code_show: function (e) {
     var th = this;
     //--获取成功的时候--
     var no = th.data.code;
@@ -340,17 +343,21 @@ Page({
     qc_com.open(obj)
   },
   //获取核销码
-  getcode: function() {
+  getcode: function (e) {
     var th = this;
     var orderSn = th.data.orderSn; //订单号
+    let codeId = e.currentTarget.dataset.codeid;
     var json = {
       "storeId": a.stoid,
-      "orderSn": orderSn
-    };
+      "orderSn": orderSn,
+    }
+    if (codeId && codeId !== "") {
+      json.id = codeId
+    }
     var data = JSON.stringify(json);
     var url = th.data.url + "/api/weshop/marketing/gift/goods/verify/code/get"; //预约接口地址
     getApp().request.json_post(url, json,
-      function(res) {
+      function (res) {
         if (res.data.code == 0) {
           th.setData({
             code: res.data.data
@@ -360,7 +367,7 @@ Page({
           getApp().my_warnning(res.data.msg, 0, th);
         }
       },
-      function(res) {
+      function (res) {
       },
       "put"
@@ -368,13 +375,13 @@ Page({
   },
   //界面跳转
-  goto: function(e) {
+  goto: function (e) {
     var th = this;
     var url = e.currentTarget.dataset.url;
     getApp().goto(url);
   },
   //图片失败，默认图片
-  bind_bnerr2: function(e) {
+  bind_bnerr2: function (e) {
     var _errImg = e.target.dataset.errorimg;
     var _errObj = {};
     _errObj[_errImg] = "/miniapp/images/giftbag/gift01.png";
@@ -392,7 +399,7 @@ Page({
   },
   //关闭导航
-  close: function() {
+  close: function () {
     var th = this;
     var nav_b = th.selectComponent("#nav_b"); //组件的id
     nav_b.close_box();
@@ -401,76 +408,95 @@ Page({
   //--- 分享设置 --
   onShareAppMessage: function (e) {
-    var curPage=this;
+    var curPage = this;
     var pagePath = curPage.route; //当前页面url
     if (pagePath.indexOf('/') != 0) {
       pagePath = '/' + pagePath;
     }
-
-    pagePath+="?isBuy="+this.data.isBuy;
-    if(this.data.isBuy==0){
-       pagePath+="&orderSn="+this.data.orderSn;
-    }else{      
-	   pagePath+="&lbId="+this.data.getGiftID;
+    pagePath += "?isBuy=1" + "&lbId=" + this.data.lbId + "&first_leader="+ this.data.getUserID;
+    // if (this.data.isBuy == 0) {
+    //   pagePath += "&orderSn=" + this.data.orderSn;
+    // } else {
+    //   pagePath += "&lbId=" + this.data.getGiftID;
+    // }
+    return {
+      title: "礼包详情",
+      path: pagePath,
     }
+  },
+  /**
+   * 用户分享朋友圈
+   */
+  onShareTimeline() {
+    var curPage = this;
+    var pagePath = curPage.route; //当前页面url
+    if (pagePath.indexOf('/') != 0) {
+      pagePath = '/' + pagePath;
+    }
+    pagePath += "?isBuy=1" + "&lbId=" + this.data.lbId + "&first_leader="+ this.data.getUserID;
+    // if (this.data.isBuy == 0) {
+    //   pagePath += "&orderSn=" + this.data.orderSn;
+    // } else {
+    //   pagePath += "&lbId=" + this.data.getGiftID;
+    // }
     return {
       title: "礼包详情",
-      path:pagePath,
+      path: pagePath,
     }
   },
   //免费领取
-  GetFree: function(e) {
+  GetFree: function (e) {
     var that = this.data;
     var th = this;
     //如果还没有开始的话
-    if(th.data.isStart!=1){
+    if (th.data.isStart != 1) {
       getApp().my_warnning("活动还没有开始", 0, th);
       return false;
     }
     // var id = e.currentTarget.dataset.id;//活动id
     var my_confirm = th.selectComponent("#my_confirm"); //组件的id
     my_confirm.open(
-        "是否确定领取该礼包",
-        "取消",
-        "确定",
-        function() {
-          my_confirm.open_cancel(0);
-        },
-        function() {
-          my_confirm.open_cancel(0);
-          var json = {
-            "actId": '', //活动Id
-            "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
-            "buyType": '3', //1=积分兑换 2=余额购买
-            "giftBagId": that.getGiftID, //礼包Id
-            "storeId": a.stoid, //商家ID
-            "userId": d.user_id, //用户ID
-            "buyFrom":2
-          };
-
-          //-- 分享导购要记录 --
-          if(getApp().globalData.guide_id){
-            json.guide_id=getApp().globalData.guide_id;
-          }
+      "是否确定领取该礼包",
+      "取消",
+      "确定",
+      function () {
+        my_confirm.open_cancel(0);
+      },
+      function () {
+        my_confirm.open_cancel(0);
+        var json = {
+          "actId": '', //活动Id
+          "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
+          "buyType": '3', //1=积分兑换 2=余额购买
+          "giftBagId": that.getGiftID, //礼包Id
+          "storeId": a.stoid, //商家ID
+          "userId": d.user_id, //用户ID
+          "buyFrom": 2,
+          "first_leader": that.first_leader,
+        };
+        //-- 分享导购要记录 --
+        if (getApp().globalData.guide_id) {
+          json.guide_id = getApp().globalData.guide_id;
+        }
-          var data = JSON.stringify(json);
-          var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert";
-          getApp().request.json_post(url, json,
-              function(res) {
-                if (res.data.code == 0) {
-                  getApp().my_warnning("领取成功！", 1, th);
-                } else {
-                  getApp().my_warnning(res.data.msg, 0, th);
-                }
-              },
-              function(res) {}
+        var data = JSON.stringify(json);
+        var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert";
+        getApp().request.json_post(url, json,
+          function (res) {
+            if (res.data.code == 0) {
+              getApp().my_warnning("领取成功！", 1, th);
+            } else {
+              getApp().my_warnning(res.data.msg, 0, th);
+            }
+          },
+          function (res) {}
-          )
-        })
+        )
+      })
   },
@@ -47,7 +47,7 @@
     <view class="box_ware_title data-v-3a5b7e36">
       <text class="data-v-3a5b7e36">礼包内容</text>
     </view>
-    <block wx:for="{{wareCard}}" wx:for-item="item" wx:for-index="index" wx:key="index">
+    <block wx:for="{{wareCard}}" wx:for-item="item" wx:for-index="index" wx:key="Id">
       <view wx:if="{{item.couponName!=undefined}}" class="box_ware_box data-v-3a5b7e36">
         <view class="box_ware_img data-v-3a5b7e36">
           <block wx:if="{{item.lbType==1}}">
@@ -73,15 +73,23 @@
           <view class="box_ware_item_price data-v-3a5b7e36">
             <text class="data-v-3a5b7e36"></text>
           </view>
-          <view class="box_ware_item_qty data-v-3a5b7e36">
+          <view class="box_ware_item_qty data-v-3a5b7e36 flex">
             <text class="data-v-3a5b7e36 ellipsis-1">
-			    {{"数量:"+item.num}}
-			</text>
+			        {{"数量:"+item.num}}
+			      </text>
+            <block wx:if="{{isBuy==0}}">
+              <text style="margin-left:10rpx" wx:if="{{item.useState}}">
+              已核销
+            </text>
+            <text style="margin-left:10rpx" wx:else>
+              未核销
+            </text>
+            </block>
           </view>
           <view class="box_ware_code data-v-3a5b7e36">
             <!-- <block wx:if="{{c_state==0}}"> -->
               <block wx:if="{{isBuy==0&item.lbType==1}}">
-                <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" lazy-load="true" bindtap="getcode" class="data-v-3a5b7e36"></image>
+                <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" lazy-load="true" bindtap="getcode" data-codeId="{{item.Id}}" class="data-v-3a5b7e36"></image>
               </block>
             <!-- </block> -->
 			<!--
@@ -25,18 +25,34 @@ Page({
     curpage: 1, //当前分页数
     pageSize: 10, //页大小
     total: 0, //总数量
-	ad_data:null,
+    ad_data:null,
+    first_leader: e.globalData.first_leader || 0, // 推荐人ID
   },
   onLoad: function(options) {
-
     var th = this;
     th.setData({
       getStorageID: a.stoid,
       getUserID: d.user_id,
       loadingType: 0,
       getDate: i.formatTime(new Date().getTime())
-    })
+    });
+    
+    //-- 获取分享人的ID --
+    var first_leader = options.first_leader || getApp().globalData.first_leader;
+    if (first_leader) {
+      this.setData({
+        first_leader,
+      })
+      //--  user_id代过来免登录 --
+      getApp().globalData.first_leader = first_leader;
+      //调用接口判断是不是会员
+      getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => {
+        if (res.data.code == 0) {
+          getApp().globalData.guide_id = res.data.data.id;
+        }
+      })
+    }
 	getApp().request.promiseGet("/api/weshop/ad/page?pid=901&store_id=" + os.stoid, {
 	  data: {
@@ -125,13 +141,13 @@ Page({
     if (th.data.ismore) return;
     th.getList();
   },
+
   //图片失败，默认图片
   bind_bnerr2: function(e) {
     var _errImg = e.target.dataset.errorimg;
     var _errObj = {};
     _errObj[_errImg] = "/miniapp/images/default_g_img.gif";
     this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; 
-
   },
@@ -142,6 +158,7 @@ onShareAppMessage: function (e) {
   if (pagePath.indexOf('/') != 0) {
     pagePath = '/' + pagePath;
   }
+  pagePath += "?first_leader="+ this.data.getUserID;
   return {
     title: "专享礼包",
     path:pagePath,
@@ -153,7 +170,8 @@ onShareAppMessage: function (e) {
 		var pagePath = curPage.route; //当前页面url
 		if (pagePath.indexOf('/') != 0) {
 		  pagePath = '/' + pagePath;
-		}
+    }
+    pagePath += "?first_leader="+ this.data.getUserID;
 		return {
 		  title: '专享礼包',
 			imageUrl: this.data.ad_data.ad_code,
@@ -702,7 +702,7 @@ Page({
   //---展示---
   onShow: function () {
-    console.log('djfijsaoifjoisadjfoij');
+    // console.log('djfijsaoifjoisadjfoij');
     var goods_list = null, th = this, that = this;
     var show_prew_img = this.data.show_prew_img
     if (show_prew_img) {
@@ -836,7 +836,6 @@ Page({
             t.data.data.prom_type=ee.data.prom_type;
             t.data.data.prom_id=ee.data.prom_id;
           }
-            
           ee.setData({
             data: t.data.data,
             sele_g: t.data.data,
@@ -845,7 +844,7 @@ Page({
           //获取统一条形码,普通商品和优惠促销的商品
-          if (ee.data.data.prom_type == 0 || ee.data.data.prom_type == 3 || ee.data.data.prom_type == 5 || ee.data.data.prom_type == 7) {
+          if (ee.data.data.prom_type == 0 || ee.data.data.prom_type == 3 || ee.data.data.prom_type == 5 || ee.data.data.prom_type == 7 || ee.data.data.prom_type == 9) {
             //默认门店要拿下门店库存
             if (that.data.sales_rules == 2 && that.data.is_newsales_rules) {
               //获取门店
@@ -1838,7 +1837,20 @@ Page({
       return false;
     }
-    if(th.data.more_flash && open_store==1){
+    var check_up=0;
+    if(th.data.more_flash){
+        for(var i in th.data.more_flash){
+           var item=th.data.more_flash[i];
+           if(item.prom_type==1){
+               check_up=1;
+               break
+           }
+        }
+    }
+
+
+
+    if(check_up && open_store==1){
        th.setData({is_pop_more:1});
     }else{
         var ind = t.currentTarget.dataset.ind;
@@ -2269,7 +2281,9 @@ Page({
               if (res.data.code == 0) prom = res.data.data;
             })
             break
-	       case 8:		
+           //预售和幸运购不参与
+	       case 8:
+           case 9:
 		     continue;
         }
@@ -2342,6 +2356,9 @@ Page({
     for (var i in sku_g) {
       if (sku_g[i].goods_id == gid) {
         item = sku_g[i];
+        if(item.original_img.indexOf(that.data.iurl)==-1){
+            item.original_img=that.data.iurl+item.original_img;
+        }
         break
       }
     }
@@ -3015,7 +3032,7 @@ Page({
     var user_id=getApp().globalData.user_id;
     if(!user_id) user_id=0;
-    if (prom_type == 3 || prom_type == 0 || prom_type == 5 || prom_type == 7) {
+    if (prom_type == 3 || prom_type == 0 || prom_type == 5 || prom_type == 7 || prom_type == 9) {
       this.setData({
         prom_type: 0,isshow: 1,
       });
@@ -3096,9 +3113,8 @@ Page({
                 });
             }
         })
-
-
     }
+
     if (prom_type == 1 && prom_id==0){
         this.setData({
             prom_type: 0,isshow: 1,
@@ -4355,6 +4371,12 @@ Page({
 			context.fillText('强烈推荐', 64*unit, 672*unit);
 			// 7.商品价格
 			let price = '￥' + this.data.data.shop_price;
+
+           if(this.data.card_field && this.data.data[this.data.card_field]){
+               price = '￥' + this.data.data[this.data.card_field];
+           }
+
+
 			// if (th.data.prom_act)
 			//   pri0 = th.data.prom_act.price;
 			context.setFontSize(32*unit);
@@ -4527,8 +4549,11 @@ Page({
             context.setFontSize(23 * unit)
             context.setFillStyle("red")
-
             var pri0 = th.data.data.shop_price;
+            if(th.data.card_field && th.data.data[th.data.card_field]){
+                pri0=th.data.data[th.data.card_field];
+            }
+
             if (th.data.prom_act)
                 pri0 = th.data.prom_price;
             pri0 = parseFloat(pri0).toFixed(2);
@@ -62,7 +62,7 @@
       <view class="item-cont">
         <view class="title ellipsis-2">{{item.goods_name}}</view>
         <!-- 判断是否有活动价 -->
-        <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_id>0 }}">
+        <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_id>0 && item.prom_type!=7 }}">
 				<view class="flex on">
 					<!-- 活动价 -->
 					<view class="price">
@@ -88,6 +88,11 @@ var g_filters = {
         		   if(item.prom_type==8){
         		      url1="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id
         		   }
+							 // 如果是幸运购活动商品
+							 if(item.prom_type == 9){
+							    url1 = "/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=" + item.goods_id + "&group_id=" + item.prom_id
+							 }
+							 
         		   if(item.prom_type==1 && item.prom_id>0){
                        url1="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id+"&prom_type=1";
                    }
@@ -146,7 +146,6 @@ Page({
                 for(let i in res.data.data.pageData){
                     let item=res.data.data.pageData[i];
                     item.original_img = th.data.url + item.original_img;
-
                     var url="/api/weshop/activitylist/getGoodActInfo";
                     var req_data={
                         store_id:oo.stoid,goodsidlist:item.goods_id,is_detail:1
@@ -184,7 +183,7 @@ Page({
                             var rd= {
                                 store_id: oo.stoid,
                                 presell_id: presell_id,
-                                goods_id: val.goods_id
+                                goods_id: item.goods_id
                             }
                             //------获取预售从表----------
                             await getApp().request.promiseGet(url1, {
@@ -220,14 +219,13 @@ Page({
                     }
                     th.data.requestData.push(item);
                     e.setData({requestData: e.data.requestData});
-                    e.closeSearchModal();
                 }
             }
-
+            e.closeSearchModal();
         })
-
     },
     onReachBottom: function() {
+        this.data.currentPage++
         this.data.openSearchModal || e.canloadMore() && this.requestSearch(this.data.requestUrl);
     },
     openFilterModal: function() {
@@ -289,7 +287,7 @@ Page({
     search: function(t) {
         if ("string" != typeof t || "" == t) return a.showWarning("请输入搜索关键词");
         this.data.key_str=t;
-				this.historyRecord();
+		this.historyRecord();
         this.resetData(), this.requestSearch(this.data.baseUrl + "&key_str=" + encodeURIComponent(t));
     },
@@ -35,7 +35,7 @@
       <view class="item-cont">
         <view class="title ellipsis-2">{{item.goods_name}}</view>
         <!-- 判断是否有活动价，小程序没有有团购和拼单 -->
-        <block wx:if="{{(item.prom_price>0 || item.prom_integral) && item.prom_id>0}}">
+        <block wx:if="{{(item.prom_price>0 || item.prom_integral) && item.prom_id>0 && item.prom_type!=7}}">
           <!-- 活动价 -->
           <view class="price">
 			  <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text>
@@ -87,7 +87,15 @@ Page({
   },
   onLoad: async function (tt) {
-    var th = this;
+      // onLoad生命周期内判断
+      let obj = wx.getLaunchOptionsSync();
+      console.log(obj.scene,'launch_scene');
+      if (obj.scene === 1011 || obj.scene === 1012  || obj.scene === 1013 || obj.scene === 1017 ||
+          obj.scene === 1047 ||obj.scene === 1089 || obj.scene === 1038) {
+         this.setData({is_ok_h5:1})
+      }
+
+      var th = this;
     var first_leader = tt.first_leader;
     if (!first_leader && tt.scene) {
       var first_leader_str = decodeURIComponent(tt.scene);
@@ -290,6 +298,9 @@ Page({
   },
   async onShow() {
+			this.getTabBar().setData({
+			  cartGoodsNum: getApp().globalData.cartGoodsNum
+			})
         var th = this;
         //-- 登录回来判断弹框 --
         var user_id=getApp().globalData.user_id;
@@ -383,6 +394,7 @@ Page({
       var json_d = JSON.parse(e.switch_list);
       th.setData({ is_closecoupon: json_d.is_closecoupon })
       th.setData({ is_topstore: json_d.is_show_storeselect })
+      th.setData({is_gz_h5:json_d.is_gz_h5})
     }, 1)
     if (typeof this.getTabBar === 'function' && this.getTabBar()) {
@@ -439,7 +451,6 @@ Page({
 		});
-
   },
   //当隐藏的时候就关闭计时器
   onHide: function () {
@@ -617,14 +628,7 @@ Page({
         });
       }
     })
-		
-		
-		
-		
-		
-		
-		
-		
+
     //---调用信息---
     // this.requestRecommend();
     this.setData({
@@ -937,10 +941,13 @@ Page({
     getApp().goto("/pages/goods/categoryList/categoryList");
   },
+  // 幸运购跳转
   go_url: function (e) {
+
     var url = e.currentTarget.dataset.url;
     getApp().goto(url);
-  },
+
+  }, //
   bind_bnerr_icon: function (e) {
     var def = "/miniapp/images/no_cate_def.png";
@@ -19,7 +19,8 @@
         "service": "/components/diy_service/diy_service",
 		"scan": "/components/diy_scan/diy_scan",
 		"store_select": "/components/diy_store_select/diy_store_select",
-        "presell": "/components/diy_pregoods/diy_pregoods"
+        "presell": "/components/diy_pregoods/diy_pregoods",
+				"luckyGo": "/components/diy_luckyGo/diy_luckyGo"
     },
 	"enablePullDownRefresh": false
 }
 \ No newline at end of file
@@ -11,14 +11,17 @@
 <view class="container rel nor" wx:if="{{ishow}}">
   <block wx:if="{{banner}}">
-    <image class="xc-top-img abs" src="{{url}}/miniapp/images/top-img.png"></image>
+    <image class="xc-top-img abs" src="{{url}}/miniapp/images/top-img.png"></image><!-- 红色背景 -->
   </block>
-	<view class="top-bar">
+
+  <view class="top-bar">
+        <!-- 顶部关注公众号 -->
+        <view wx:if="{{is_gz_h5 && is_ok_h5}}"><official-account></official-account></view>
+
 		<!-- 控制要不要显示顶部门店选择 -->
 		<block wx:if="{{is_topstore}}">
 		   <store_select style="z-index: 999;"></store_select>
 		</block>
-		
 		<!--搜索框-->
 		<!-- <view class="search-box {{scrollTop>10?'search-fixed':''}} flex-center white " style="top:{{is_topstore?88:0}}rpx"> -->
 		<view class="search-box flex-center white">
@@ -41,7 +44,11 @@
 		  </view>
 		</view>
 	</view>
-  
+  <!-- 如果有关注，要 -->
+  <view wx:if="{{is_gz_h5 && is_ok_h5}}" style="height: 84px"></view>
+  <!-- 如果有顶部门店 -->
+  <view wx:if="{{is_topstore}}" style="height: 60rpx"></view>
+
   <!--滚动广告-->
   <view class="rel title-img" wx:if="{{banner}}">
     <swiper circular="true" indicator-dots indicator-active-color="#fff" autoplay="true" class="swiper_box" duration="1000" interval="3000" vertical="" bindchange="bannerSwiperChange" style="height:{{max_sw_height}}rpx">
@@ -229,9 +236,8 @@
 	<!--幸运购-->
-	<!--幸运购-->
 		<view class="seckill" wx:if="{{luckGo_list && luckGo_list.length != 0}}">
-			<navigator bindtap="go_url"  data-url="/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList" hover-class="none">
+			<navigator bindtap="go_url" data-remark="1"  data-url="/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList" hover-class="none">
 				<view class="seckill-time">
 					<view class="classname flex ai_c">
 						<i class="iconfont icon-luck"></i>
@@ -243,8 +249,8 @@
 					</view>
 				</view>
 			</navigator>
-			<view class="seckill-list luck">
-				<view class="list-item" wx:for="{{luckGo_list}}" bindtap="go_url" data-url="/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id={{item.goods_id}}&group_id={{item.id}}" wx:if="{{item.status == 1}}">
+			<view class=" luck">
+				<view class="list-item" wx:for="{{luckGo_list}}" bindtap="{{item.actLen == 0 ? '':'go_url'}}" data-aid="{{item.id}}" data-remark="2" data-url="/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id={{item.goods_id}}&group_id={{item.id}}" wx:if="{{item.status == 1}}">
 					<view class="flex ai-center">
 						<view class="img-container"><image class="img-block" src="{{url + item.original_img}}" data-val="{{item.original_img}}"
 							data-errorimg="luckGo_list[{{index}}].original_img" binderror="bind_bnerr2" lazy-load="true"></image></view>
@@ -258,7 +264,8 @@
 								</view>
 								<view class="flex jc_sb">
 									<progress class="pdr20 f1 progress" percent="{{filter.percent(item.num, item.group_num)}}" activeColor="#FF6768" backgroundColor="#d0d0d0" border-radius="12" stroke-width="12" data-content="{{item.num}}人已参团"></progress>
-									<view class="btn fs26">去参团</view>
+									<view class="btn fs26 {{item.actLen == 0 ? 'gray':''}}" wx:if="{{item.actLen == 0}}">已抢光</view>
+									<view class="btn fs26" wx:else>去参团</view>
 									<!-- &title=狐狸3号测速003&prom_type=7&prom_id=468 -->
 								</view>
 							</view>
@@ -406,6 +413,9 @@
 <view class="container" wx:if="{{isTemplate}}" style="background-color:{{bgcolor_t}}; padding-bottom: 10rpx">
   <!-- 置顶层 -->	
   <view class="dis_top">
+      <!-- 关注公众号的显示 -->
+      <view wx:if="{{is_gz_h5 && is_ok_h5}}"><official-account></official-account></view>
+
 	  <block wx:for="{{template_arr}}" >
 		   <block wx:if="{{item.content.is_top==1}}">			   
 			    <!--如果是搜索框的时候 --> 
@@ -420,6 +430,8 @@
   </view>
   <!-- 撑开层 -->	
   <view>
+       <!-- 关注层的撑开 -->
+       <view wx:if="{{is_gz_h5 && is_ok_h5}}" style="height: 84px"></view>
 	   <block wx:for="{{template_arr}}" >
            <block wx:if="{{item.content.is_top==1 && item.ename=='searchbox'}}">
 		       <view wx:if="{{item.content.style==1}}" style="height: 115rpx;"></view>
@@ -505,6 +517,11 @@
 		<block wx:if="{{item.ename=='groupbuy'}}">
 			 <groupbuy object="{{item.content}}"></groupbuy>
 		</block>
+		<!-- 幸运购 -->
+		<block wx:if="{{item.ename=='luckyactivity'}}">
+			 <luckyGo object="{{item.content}}"></luckyGo>
+		</block>
+		
     </view>
@@ -64,7 +64,7 @@
 	width: 48rpx;
 	height: 48rpx;
 	margin: 0 18rpx;
-	border-radius: 50%;
+	/* border-radius: 50%; */
 	overflow: hidden;
 }
@@ -110,6 +110,7 @@
 	/* height: auto; */
 	border-radius: 16rpx;
 	overflow: hidden;
+	min-height: 300rpx;
 }
 .swiperItem {
@@ -663,6 +664,7 @@
 	border-radius: 8rpx;
 	white-space: nowrap;
 	height: 28rpx;
+	align-items: center;
 }
 .xc-people-val-frame .val-img {
@@ -1014,7 +1016,7 @@ page {
 }
 .container.nor{
-	padding-top: 140rpx;
+	padding-top: 80rpx;
 }
 /* page,
@@ -1130,8 +1132,8 @@ page {
 }
 .luck .img-container {
-	width: 200rpx;
-	height: 200rpx;
+	width: 220rpx;
+	height: 220rpx;
 	border-radius: 14rpx;
 	overflow: hidden;
 	flex-shrink: 0;
@@ -1180,6 +1182,7 @@ page {
 .luck .name {
 	height: 88rpx;
+	word-break: break-all;
 }
@@ -1195,3 +1198,7 @@ page {
 	text-align: center;
 }
+.luck .btn.gray {
+	background-color: #ccc;
+}
+
@@ -58,6 +58,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {	  
+		
     var th=this;
 	//-- 读取会员中心按钮列表 --
 	getApp().request.get("/api/weshop/userTool/page?pageSize=100", {
@@ -98,6 +99,9 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function() {
+		this.getTabBar().setData({
+		  cartGoodsNum: getApp().globalData.cartGoodsNum,
+		})
       //看一下小程序是不是过期了
       getApp().getConfig2(function(config2){
           if(config2 && config2.is_overdue==1){
@@ -462,11 +466,11 @@ Page({
   },
   setappdata: function(t) {
     var t=getApp().globalData.wxapp_buy_obj;
-    if (t.isout == 1)
+    if (t && t.isout == 1)
       wx.navigateTo({
         url: "/pages/error/error?msg=小程序已经过期",
       });
-    if (t.isbuy == 0)
+    if (t && t.isbuy == 0)
       wx.navigateTo({
         url: "/pages/error/error?msg=还未购买小程序",
       });
@@ -642,7 +646,9 @@ Page({
     }
     var url = e.currentTarget.dataset.img;
-
+    if(!url || url==""){
+      url=`/public/upload/userqy/quanbg.jpg`
+    }
     switch (no) {
       case "01":
         getApp().goto("/packageB/pages/user/user_coupon/user_coupon?img=" +
@@ -652,7 +658,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", {
@@ -316,6 +316,7 @@ Page({
     //--------立即支付----------
     async jumpToCart4(e) {
+			
 		var th=this;	
         if(this.data.optionIsGoup) 
 		     wx.navigateTo({
@@ -567,8 +568,7 @@ Page({
 				  						  return false;	
 				  					  }
 				  				  } 				  
-				  }
-				  else{
+				  }else{
                           //不是赠品的时候
 				  	      if(!good.is_gift && good.prom_type!=3){
 							  var t_ok=1;
@@ -592,7 +592,7 @@ Page({
 				   }
 				  //赠品和搭配购不判断商品金额
 				  var isok=1;
-				  var card_field=th.data.card_field;
+				  var card_field=th.data.card_field; // 会员等级
 				  //如果会员是等级会员,商品有等级价,且不是活动商品
 		          if(!good.is_gift && !good.is_collocation) {
 		             if (card_field && gg[card_field] > 0) {
@@ -606,7 +606,7 @@ Page({
 		              var is_h=0;
 		              if (!isok) {
-		                  var content=gg.goods_name + '商品的价格发生了变化,请取消订单重新购买';
+		                  var content=gg.goods_name + '商品的价格发生了变化,请取消订单重新购买22';
 		                  th.toast(content);
 		                  return false;
 		              }
@@ -77,7 +77,7 @@
         <view class="item" wx:if="{{order.order_prom_type!=5}}">
             <view>配送方式</view>
-            <view>{{(order.shipping_name!=''&& order.shipping_name!=null) ?order.shipping_name:'无'}}</view>
+            <view>{{(order.shipping_name!=''&& order.shipping_name!=null) ?order.shipping_name:'自提'}}</view>
         </view>
         <view class="item">
             <view>买家留言</view>
@@ -195,6 +195,28 @@ Page({
                         }
                     })
                 }
+								// 如果是幸运购活动
+								if(glist[0].prom_type==9){
+								    await getApp().request.promiseGet('/api/weshop/prom/luckyOrder/list', {
+											data: {
+												store_id: os.stoid,
+												user_id: oo.user_id,
+												order_id: item.order_id,
+											}
+								    }).then(res => {
+								        if(res.data.code==0){
+														// console.log('luckyGo+++++++++>>>', res.data.data);
+														// data[ind]['team_status'] = res.data.data[0]['team_status'];
+														if(res.data.data[0] && res.data.data[0]['team_status']) {
+															data[ind]['team_status'] = res.data.data[0]['team_status'];
+														} else {
+															data[ind]['team_status'] = 0;
+														};
+								            
+								            // data[ind]['ord_url']='/packageC/pages/presell/cart/cart';
+								        }
+								    })
+								}
                 //------------对比一下有没有退款记录------------
                 await getApp().request.promiseGet("/api/weshop/order/returngoods/page", {
                     data: {
@@ -462,6 +484,7 @@ Page({
   },
     /*----------跳转支付-----------*/
     async jumpToCart4(t) {
+
         var o_index = t.currentTarget.dataset.idx;
         var e = this.data.orderList[o_index];
         var th = this;
@@ -469,6 +492,25 @@ Page({
         var order_goods = e.order_goods;
         var user_id=getApp().globalData.userInfo.user_id;
+        // 幸运购检查库存量 api/weshop/activitylist/getActLen/{store_id}/{prom_type}/{prom_id}
+        if (parseInt(order_goods['0']['prom_type']) == 9) {
+            var aid = order_goods['0']['prom_id'];
+            var knum = 0;
+            await r.promiseGet('/api/weshop/activitylist/getActLen/' + os.stoid + '/9/' + aid, {
+            }).then(res => {
+                if (res.data.code == 0) {
+                    knum = res.data.data;
+                }
+                
+            });
+
+            if (knum <= 0) {
+                getApp().confirmBox("库存为0，支付失败");
+                return false;
+            }
+
+        }
+
         var wlist = "";
         for (var i in order_goods) {
             var good = order_goods[i];
@@ -577,7 +619,7 @@ Page({
             }
             //如果是预售的时候，
-            if(good.prom_type==8){
+            if(good.prom_type==8) {
                 await  getApp().request.promiseGet("/api/weshop/order/orderPresell/countBuyGoodsSum",{
                     data: {store_id: os.stoid, user_id: user_id, goods_id: good.goods_id, prom_id: good.prom_id},
                 }).then(e=>{
@@ -699,7 +741,7 @@ Page({
                     return false;
                 }
-            } else {
+            } else { 
                 if ((gg.prom_type == 1 || good.prom_type == 2 || gg.prom_type == 3 || gg.prom_type == 5 || gg.prom_type == 6 || gg.prom_type == 4)
                     && !good.is_collocation && !good.is_gift && !good.is_integral_normal && !good.is_pd_normal) {
                     var prom = null;
@@ -776,7 +818,7 @@ Page({
                 var card_field = th.data.card_field;
                 //-- 如果会员是等级会员,商品有等级价,且不是活动商品，同时线下取价的要放在最后来判断 --
-                if (!good.is_gift && !good.is_collocation) {
+                if (!good.is_gift && !good.is_collocation && gg.prom_type != 9) {
                     if (card_field && gg[card_field] > 0) {
                         if (good.goods_price != gg[card_field] && good.offline_cut <= 0) isok = 0;
                         if (good.goods_price > gg[card_field] && good.offline_cut > 0) isok = 0;  //如果线下价格比较贵，则不通过
@@ -40,7 +40,7 @@
 	    <text selectable='true'>订单编号：{{item.order_sn}}</text>
 	    <!-- 商品评价状态 -->
 	    <view class="flex-center c-r">
-
+			<!-- 这是预售的 -->
 			<block wx:if="{{item.presell}}">
 				<block wx:if="{{item.order_status==3}}">
 					<text wx:if="{{item.presell.tail_pay_state==2}}">尾款支付失败</text>
@@ -64,6 +64,19 @@
 				<block wx:else>退款中</block>
 			</block>
+			<!-- 幸运购 -->
+			<block wx:elif="{{item.order_goods[0].prom_type == 9}}">
+				<view wx:if="{{item.is_back ==1 && item.pay_status ==1}}">已退款</view>
+				<view wx:elif="{{item.is_back == 0 && item.pay_status ==1 && item.team_status == 0}}">已支付,待成团</view>
+				<view wx:if="{{(item.order_status==0&&item.pay_status==0)}}">未支付</view>
+				<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0 && item.team_status == 2)}}">待发货</view>
+				<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1 && item.team_status == 2)}}">待收货</view>
+				<view wx:if="{{(item.order_status==2)}}">待评价</view>
+				<view wx:if="{{item.order_status==4}}">已评价</view>
+				<view wx:if="{{item.pay_status == 0 && item.order_status==3 && item.pt_status!=6}}"  class="flex-center" >已取消<view class="lin"></view>
+					<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
+				</view>
+			</block>
 			<block wx:else>
 				<!-- 订单状态 -->
 				<view wx:if="{{item.pt_status==1 && item.pt_prom_id>0}}">组团中</view>
@@ -82,6 +95,8 @@
 				</block>
 				<block wx:else>退款中</block>
 			</block>
+			
+			
 	    </view>
 	  </view>
@@ -91,7 +106,9 @@
 	    <!-- 单个商品 -->
 	    <!-- wx:if="{{goods.return_btn!=4}}" -->
 	    <view>
-	      <navigator class="detail_commodity flex-vertical padding" wx:for="{{item.order_goods}}" wx:for-item="goods"  wx:for-index="pinx" url="{{item.ord_url}}?order_id={{item.order_id}}">
+				 <!-- url="/packageC/pages/luckyGo/luckyGo_order/luckyGo_order?order_id={{item.order_id}}" wx:if="{{item.order_goods[0].prom_type==9}}"
+				{{item.ord_url}}?order_id={{item.order_id}} -->
+	      <navigator class="detail_commodity flex-vertical padding" wx:for="{{item.order_goods}}" wx:for-item="goods"  wx:for-index="pinx" url="{{item.order_goods[0].prom_type==9 ? ('/packageC/pages/luckyGo/luckyGo_order/luckyGo_order?order_id=' + item.order_id + '&group_id=' + item.order_goods[0].prom_id):(item.ord_url + '?order_id=' + item.order_id)}}">
 	        <!-- 商品图片 -->
 	        <navigator class="rel">
 	          <image src="{{resourceUrl+goods.original_img}}" binderror="bind_bnerr" lazy-load="{{true}}" data-errorimg="orderList[{{index}}].order_goods[{{pinx}}].original_img"></image>
@@ -128,7 +145,10 @@
 	            <!-- 商品价格 -->
 	            <view class="flex-vertical c-tb baseline">
 	              <view class="fs24">￥</view>
-	              <view class="fs26">{{filters.toFix(goods.member_goods_price,2)}}</view>
+								<!-- 幸运购prom_type等于9 -->
+								<!-- 如果是幸运购就显示幸运购参团价格 -->
+								<view class="fs26" wx:if="{{goods.prom_type == 9}}">{{filters.toFix(goods.goods_price,2)}}</view>
+	              <view class="fs26" wx:else>{{filters.toFix(goods.member_goods_price,2)}}</view>
 	            </view>
 	            <view class="fs26 c-a9">x{{goods.goods_num}}</view>
 	          </view>
@@ -162,7 +182,8 @@
 	                <view class="commodity_money flex baseline" wx:else>
 	                  <view>合计<text wx:if="{{item.discount!=underdefine && item.discount!=null && item.discount!=0}}" style="color:#d60021;">(改)</text>:</view>
 	                  <view class="fs24 c-r">￥</view>
-	                     <view class="c-r">{{filters.toFix(item.order_amount+item.user_money,2)}}
+	                     <view class="c-r">
+											 {{filters.toFix(item.order_amount+item.user_money,2)}}
 	                     <text wx:if="{{item.coupon_price}}">+{{item.coupon_price}}元优惠券</text>
 	                     <text wx:if="{{item.integral}}">+{{item.integral}}积分</text>
 	                  </view>
@@ -196,7 +217,7 @@
 	          <navigator class="commodity_To_evaluate flex-level View_evaluation" hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==1)}}" url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</navigator>
 	          <navigator class="commodity_To_evaluate flex-level View_evaluation" hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==2)}}" url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</navigator>
-				<navigator class="commodity_To_evaluate flex-level View_evaluation" url="/packageC/pages/luckyGo/luckyGo_order/luckyGo_order?order_id={{item.order_id}}" wx:if="{{item.order_goods[0].prom_type==9}}">订单详情</navigator>	 
+				<navigator class="commodity_To_evaluate flex-level View_evaluation" url="/packageC/pages/luckyGo/luckyGo_order/luckyGo_order?order_id={{item.order_id}}&&group_id={{item.order_goods[0].prom_id}}" wx:if="{{item.order_goods[0].prom_type==9}}">订单详情</navigator>	 
 			  <navigator class="commodity_To_evaluate flex-level View_evaluation" url="{{item.ord_url}}?order_id={{item.order_id}}" wx:else>订单详情</navigator>
 	          <block wx:if="{{!(item.has_rt || item.return_btn==2 || item.return_btn==4)}}">
 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 +21,27 @@ 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	
+    staffNo_arr: [], //多个营业员
+    focus:false, 
+    is_select: false, //是否选择营业员过
   },
   swiperChange: function (e) {
     var currentId = e.detail.current;
@@ -48,34 +53,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 +97,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 +140,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 +156,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 +190,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 +220,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 +275,73 @@ 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
+      })
     }
   },
+  //选择营业员
+  select_serviceman(e) {
+    let StaffNo = e.currentTarget.dataset.staffno;
+    let {req_data,req} = this.data;
+    if (StaffNo && StaffNo !== "") {
+      req_data.staffNo = StaffNo;
+      req.serviceman = StaffNo;
+    };
+    this.setData({
+      is_select: 1,
+      staffNo_arr:[],
+    })
+    this.check_serviceman(req_data,req)
+  },
+  //--绑定邀请码的输入--
+  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 () {
+    console.log(11111);
     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,19 +349,21 @@ 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
       }
       //--后台要求要输入营业员--
       if (th.data.is_salesman) {
         if (!th.data.inp_serviceman) {
           getApp().my_warnning("请输入营业员", 0, th);
+          th.setData({
+            focus:true
+          })
           return false;
         }
         req.serviceman = th.data.inp_serviceman
@@ -296,137 +372,222 @@ 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;
-      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);
-			}
-         }
+    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;
+      th.setData({
+        req_data,
+        req,
       })
-    }else{
+      th.check_serviceman(req_data,req)
+      // getApp().request.get("/api/weshop/plus/vip/mem/referee/code/check", {
+      //   data: req_data,
+      //   success: function (res) {
+      //     if (res.data.code == 0) {
+      //       if(res.data.data.length > 1 && !th.data.is_select){
+      //         th.setData({
+      //           staffNo_arr:res.data.data
+      //         })
+      //       }else{
+      //         t_pay.pay(req, th.success, function () {
+      //           getApp().my_warnning("支付失败", 0, th);
+      //           th.setData({
+      //             is_select:0,
+      //           })
+      //         });
+      //       }
+      //     } else {
+      //       getApp().my_warnning(res.data.msg, 0, th);
+      //       th.setData({
+      //         is_select:0,
+      //       })
+      //     }
+      //   }
+      // })
+    } else {
       t_pay.pay(req, th.success, function () {
         getApp().my_warnning("支付失败", 0, th);
+        th.setData({
+          is_select:0,
+          focus:true,
+        })
       });
-    }
+    } 
   },
   //返回会员页面
-  OpeningClose: function() {
-     this.setData({open_yq:0});
+  OpeningClose: function () {
+    this.setData({
+      open_yq: 0,
+      inp_serviceman:""
+    });
+  },
+  dialog_close() {
+    this.setData({
+      staffNo_arr: [],
+    });
+  },
+  check_serviceman(data,req) {
+    let th = this;
+    getApp().request.get("/api/weshop/plus/vip/mem/referee/code/check", {
+      data,
+      isShowLoading:true,
+      success: function (res) {
+        if (res.data.code == 0) {
+          if (res.data.data.length > 1 && !th.data.is_select) {
+            th.setData({
+              staffNo_arr: res.data.data
+            })
+          }else{
+            t_pay.pay(req, th.success, function () {
+              getApp().my_warnning("支付失败", 0, th);
+              th.setData({
+                is_select:0,
+                focus:true,
+              })
+            });
+          }
+        } else {
+          getApp().my_warnning(res.data.msg, 0, th);
+          th.setData({
+            is_select:0,
+            focus:true,
+          })
+        }
+      }
+    })
   },
-
   //返回会员中心
-  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
 <block wx:if="{{is_show && (fir_leader?is_fengxiang:1)}}">
-<!-- 我的会员背景图片 -->
-<import src="../../../utils/wxParse/wxParse.wxml"></import>
-<view>
-  <image class="Member_bk" src="{{url}}/miniapp/images/plus/page_bk.png"></image>
-</view>
-<view class="plus">
-  <!-- 开通会员模块 -->
+  <!-- 我的会员背景图片 -->
+  <import src="../../../utils/wxParse/wxParse.wxml"></import>
+  <view>
+    <image class="Member_bk" src="{{url}}/miniapp/images/plus/page_bk.png"></image>
+  </view>
+  <view class="plus">
+    <!-- 开通会员模块 -->
-  <block wx:if="{{is_plusCard}}">
-    <view class="Opening_plus">
-      <view class="Opening_bk">
-        <image src="{{url}}/miniapp/images/plus/card_bk.png"></image>
-      </view>
-      <view class="swiper">
+    <block wx:if="{{is_plusCard}}">
+      <view class="Opening_plus">
+        <view class="Opening_bk">
+          <image src="{{url}}/miniapp/images/plus/card_bk.png"></image>
+        </view>
+        <view class="swiper">
           <!-- 未开通会员swiper-item -->
           <swiper current="{{currentId}}" current-item-id="{{currentId}}" next-margin="60rpx" previous-margin="60rpx" bindchange="swiperChange">
             <swiper-item class="flex" item-id="{{index}}" data-item-id="{{index}}" wx:for="{{is_plusCard}}">
-              <view  class="Membership {{currentId==index?'enlarge':''}}" style=" background-image: url({{item.CardImg}});color:{{item.CardColor}}">
+              <view class="Membership {{currentId==index?'enlarge':''}}" style=" background-image: url({{item.CardImg}});color:{{item.CardColor}}">
                 <view class="flex-space-between Membership_go">
                   <view>
                     <view class="fs36">{{item.CardName}}</view>
@@ -32,7 +32,7 @@
                   <view class="flex-vertical fs24" style="overflow:hidden">
-                    <view class="Member"style="background-image:url('{{url}}/miniapp/images/plus/privilege_o.png');filter: drop-shadow( 40rpx 0rpx 0rpx {{item.CardColor}});"></view>
+                    <view class="Member" style="background-image:url('{{url}}/miniapp/images/plus/privilege_o.png');filter: drop-shadow( 40rpx 0rpx 0rpx {{item.CardColor}});"></view>
                     <view style="margin-left:5rpx;white-space: nowrap;">按去年用户消费计算，开卡后一年预计省￥{{item.free}}元
                     </view>
                   </view>
@@ -41,76 +41,80 @@
             </swiper-item>
           </swiper>
+        </view>
       </view>
-    </view>
-  </block>
+    </block>
-  <!-- 会员礼遇 -->
-  <view class="Courtesy">
+    <!-- 会员礼遇 -->
+    <view class="Courtesy">
+
+      <!-- 标题 -->
+      <view class="flex-center" style="width:100%;height:200rpx;">
+        <view>
+          <view class="Courtesy_title flex-center fs36">开通PLUS会员尊享礼遇
+          </view>
-    <!-- 标题 -->
-    <view class="flex-center" style="width:100%;height:200rpx;">
-      <view>
-        <view  class="Courtesy_title flex-center fs36">开通PLUS会员尊享礼遇
-        </view>
-       
-        <view class="flex-center">
-          <image class="Courtesy_image" src="{{url}}/miniapp/images/plus/Courtesy.png"></image>
+          <view class="flex-center">
+            <image class="Courtesy_image" src="{{url}}/miniapp/images/plus/Courtesy.png"></image>
-        
-          <view class="Courtesy_can fs24">PLUS会员可享受以下特权
+
+            <view class="Courtesy_can fs24">PLUS会员可享受以下特权
+            </view>
+
+            <image class="Courtesy_image" src="{{url}}/miniapp/images/plus/Courtesy.png"></image>
           </view>
+        </view>
+      </view>
+
-          <image class="Courtesy_image" src="{{url}}/miniapp/images/plus/Courtesy.png"></image>
+
+      <!-- 会员权益内容 -->
+      <view class="Courtesy_comment " style="padding:0 20rpx" wx:if="{{is_card_rule!=null&&is_card_rule!=''}}">
+        <view class="wxParse">
+          <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
         </view>
       </view>
     </view>
-    <!-- 会员权益内容 -->
-    <view class="Courtesy_comment "  style="padding:0 20rpx"  wx:if="{{is_card_rule!=null&&is_card_rule!=''}}">
-     <view class="wxParse">
-        <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
-     </view>
-    </view>
-  </view>
+    <!-- 好物推荐 -->
+    <!-- 好物推荐 -->
+    <view class="title">
+      <!-- 标题 -->
+      <view>
+        <!-- 中文名标题 -->
+        <view class="China flex-level">
+          <view class="line flex-vertical">
+            <view class="one"></view>
+            <view class="two"></view>
+            <view class="three"></view>
+          </view>
-  <!-- 好物推荐 -->
-  <!-- 好物推荐 -->
-  <view class="title">
-    <!-- 标题 -->
-    <view>
-      <!-- 中文名标题 -->
-      <view class="China flex-level">
-        <view class="line flex-vertical">
-          <view class="one"></view><view class="two"></view><view class="three"></view>
-        </view>
+          <view class="Recommend flex-level" bindtap="requestList">好物推荐</view>
-        <view class="Recommend flex-level" bindtap="requestList">好物推荐</view>
+          <view class="line flex-vertical">
+            <view class="three"></view>
+            <view class="two"></view>
+            <view class="one"></view>
+          </view>
+        </view>
-        <view class="line flex-vertical">
-          <view class="three"></view>
-          <view class="two"></view>
-          <view class="one"></view>
+        <!-- 英文标题 -->
+        <view class="english flex-center">
+          <view class="silk"></view>
+          <view class="esh five-level-word">GOOD HOT THING</view>
+          <view class="silk"></view>
         </view>
-      </view>
-      <!-- 英文标题 -->
-      <view class="english flex-center">
-        <view class="silk"></view>
-        <view class="esh five-level-word">GOOD HOT THING</view>
-        <view class="silk"></view>
       </view>
+      <!-- 商品列表组件 -->
+      <goods_recommend id="goods_list"></goods_recommend>
+      <!-- 商品列表 -->
     </view>
-    <!-- 商品列表组件 -->
-    <goods_recommend id="goods_list"></goods_recommend>
-    <!-- 商品列表 -->
   </view>
-
-</view>
 </block>
 <!-- 开通会员弹窗 -->
@@ -127,32 +131,55 @@
       <view class="fs36 flex-level perfect">请完善下面信息</view>
       <view class="fillin">
         <!-- 输入推荐人手机号 -->
-        <view class="flex ai_and Enter_phone" wx:if="{{isyaoqingma}}" >
+        <view class="flex ai_and Enter_phone" wx:if="{{isyaoqingma}}">
           <image class="phone_image" src="{{url}}/miniapp/images/plus/Invitation_code.png"></image>
           <view class="phone">
-            <input bindinput="b_input" data-name="inp_recommon" class="fs30" placeholder="请输入邀请码(推荐人手机号)" type="number" maxlength="20" />
+            <input bindinput="b_input" bindconfirm="buy_card" data-name="inp_recommon" class="fs30" placeholder="请输入邀请码(推荐人手机号)" type="number" maxlength="20" />
           </view>
         </view>
         <!-- 输入营业员 -->
         <view class="flex ai_and enter_SalesClerk" wx:if="{{is_salesman}}">
           <image class="SalesClerk_image" src="{{url}}/miniapp/images/plus/Sales_Clerk.png"></image>
           <view class="SalesClerk">
-            <input bindinput="b_input" class="fs30" data-name="inp_serviceman" placeholder="请输入营业员" maxlength="30" />
+            <input bindinput="b_input" bindconfirm="buy_card" class="fs30" focus="{{focus}}" data-name="inp_serviceman" value="{{inp_serviceman}}" placeholder="请输入营业员" maxlength="30" />
           </view>
         </view>
         <!-- 确认购买 -->
         <view class="flex-center" bindtap="buy_card">
-          <view class="flex-center purchase"
-                style="background-image:url({{url}}/miniapp/images/plus/purchase_Bk.png);">
+          <view class="flex-center purchase" style="background-image:url({{url}}/miniapp/images/plus/purchase_Bk.png);">
             确认购买
           </view>
         </view>
       </view>
     </view>
+
+
     <view class="flex-level">
       <image class="purchaseClose" bindtap="OpeningClose" src="{{url}}/miniapp/images/plus/Close.png"></image>
     </view>
   </view>
 </view>
+
+<view class="Disgraceful" wx:if="{{staffNo_arr.length>0}}">
+  <view bindtap="OpeningClose"></view>
+  <view class="dialog_body">
+    <view style="background-color: #fff;">
+      <view class="dialog_choose">
+        <text>请选择营业员</text>
+        <text class="dialog_close" bindtap="dialog_close">X</text>
+      </view>
+      <view class="dialog_name">
+        <text class="w50">编号</text>
+        <text class="w50">姓名</text>
+      </view>
+    </view>
+    <view class="dialog_name" bindtap="select_serviceman" data-StaffNo="{{item.StaffNo}}" wx:for="{{staffNo_arr}}" wx:key="id" hover-class="weui-active" hover-start-time="200" style="background-color: #fff;">
+      <view class="w50">{{item.StaffNo}}</view>
+      <view class="w50">{{item.StaffName}}</view>
+    </view>
+  </view>
+</view>
+
+
 <warn id="warn"></warn>
 \ No newline at end of file
@@ -16,7 +16,48 @@ page {
   width: 100%;
   height: 100%;
 }
-
+.dialogful{
+  position: fixed;
+  left: 0;
+  top: 15%;
+  right: 0;
+  bottom: 0;
+  z-index: 11;
+  background: rgba(0, 0, 0, 0.6);
+  width: 100%;
+  height: 100%;
+}
+.dialog_body {
+  margin:30% auto;
+  width: 660rpx;
+}
+.dialog_close{
+  float: right;
+  width: 50rpx;
+  height: 50rpx;
+  text-align: right;
+}
+.dialog_choose{
+  position: relative;
+  padding: 20rpx;
+  border-bottom: 1rpx solid #eee;
+}
+.dialog_name,
+.dialog_content {
+  padding: 10rpx;
+  display: flex;
+  border-bottom: 1rpx solid #f7f7f7;
+  justify-content: space-around;
+  
+}
+.weui-active{
+  opacity: 0.9;
+  background: #f7f7f7;
+}
+.w50 {
+  width: 50%;
+  text-align: center;
+}
 .Opening_bk image {
   position: absolute;
   z-index: 2;
 // 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,102 @@ 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,GradeId)
+  },
   /**
    * 生命周期函数--监听页面显示
    */
-  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(FormId,GradeId) {
+    const res = await getApp().request.promiseGet("/api/weshop/users/grade/wares/code/get", {
+      data: {
+        privilegeId: FormId,
+        storeId: os.stoid,
+        GradeId:GradeId,
+        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,
+      isShowLoading:true,
+    });
+
+    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 +122,43 @@ 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) {
+    setTimeout(() => {
+      let qr_code_object = this.data.qr_code_object;
+      if (qr_code_object !== {}) {
+        let {
+          WriteOffCode: val,
+          BeginDate,
+          EndDate
+        } = qr_code_object;
+        let qr_code = this.selectComponent("#qc_com");
+        let obj = {
+          val,
+          content: "当前核销码仅限当面使用",
+          now: BeginDate,
+          validay: EndDate,
+          is_quan: 0,
+          is_fw:0,
+        };
+        qr_code.open(obj)
+      } else {
+        wx.showToast({
+          title: "获取失败",
+          icon: 'none',
+          duration: 1000
+        })
+      }
+    }, 500);
+  },
+  close: function () {
+    this.getQrCode(this.data.FormId)
+  }
 })
 \ No newline at end of file
 {
-  "navigationBarTitleText": "新品试用",
+  "navigationBarTitleText": "免费领取",
   "usingComponents": {
     "qr_code": "/components/qr_code/qr_code"
   }
-<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="btn1">已使用</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
@@ -3,66 +3,34 @@ 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;
+  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-bottom .xc-goods-money{
-color: #ca4e59;
-  padding-top: 12rpx;
-}
-.xc-bottom .xc-money{
- color: #ca4e59;
-  font-size: 40rpx;
-  height: 100%;
-  line-height:50rpx
+.btn {
+  background-color: #FF6768;
+	color: white;
+	padding: 26rpx;
+	text-align: center;
+	/* border-radius: 8rpx; */
+}
+.btn1 {
+  background-color: #ccc;
+	color: white;
+	padding: 26rpx;
+	text-align: center;
+	/* border-radius: 8rpx; */
 }
-
-.xc-clike-get{
-  width: 120rpx;
-  height: 36rpx;
-  border-radius: 20rpx;
-  background: #ca4e59;
-  line-height:28rpx;
-  font-size:27rpx;
-  margin-left: 120rpx;
-padding-top: 10rpx
-}
-
@@ -187,7 +187,9 @@ Page({
       }
       var url=e.currentTarget.dataset.img;
-
+      if(!url || url==""){
+        url=`/public/upload/userqy/quanbg.jpg`
+      }
       switch (no) {
           case "01":
               getApp().goto("/packageB/pages/user/user_coupon/user_coupon?img="
@@ -197,7 +199,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",{
@@ -88,12 +88,13 @@
     </view>
   </view>
+
    <view class="project-frame">
         <view class="item t-c" wx:for="{{qy_list}}" data-no="{{item.PrivilegeType}}"
               data-img="{{item.PrivilegeImageUrl}}"
               bindtap="go_url"  data-ind="{{index}}" data-name='{{item.PrivilegeName}}' >
           <image class="xc-project-img  {{item.ishas==1?'':'img_gray'}} " src="{{item.PrivilegeICOUrl}}"></image>
-          <view class="three-level-word xc-project-word">{{item.PrivilegeName}}</view>
+          <view class="three-level-word xc-project-word ellipsis-1">{{item.PrivilegeName}}</view>
         </view>
     </view>
   </view>
@@ -143,6 +143,10 @@ var filters = {
 		return  val / 100;
 	},
+	div100: function(val) {
+		return  val / 100;
+	},
+	
 	// 计算百分比, 不带百分号
 	percent: function(num1, num2) {
 		// console.log('百分比',Math.round(num1/num2 * 10000) / 100);
@@ -188,5 +192,6 @@ module.exports = {
 	difference: filters.difference,
 	multiply: filters.multiply,
 	price: filters.price,
+	div100: filters.div100,
 	JSONStringify: filters.JSONStringify,
 }
 \ No newline at end of file