Merge branch 'test' into 'qa'

Test See merge request !844

Merge branch 'test' into 'qa'
Test See merge request !844
后端研发-苏明海
2 parents 92b7f01b 4b69d423
Showing 69 changed files with 5259 additions and 944 deletions
app.json
app.wxss
components/diy_goodsGroup/diy_goodsGroup.js
components/diy_goodsGroup/diy_goodsGroup.wxml
components/diy_goodsGroup/diy_goodsGroup.wxss
components/diy_seckill/diy_seckill.js
components/diy_seckill/diy_seckill.wxml
components/diy_seckill/diy_seckill.wxss
components/diy_service/diy_service.js
components/diy_service/diy_service.wxml
components/goods_list/goods_list.wxml
components/userqy_pop_up/userqy_pop_up.js
packageA/pages/activity_share/activity_share.js
packageA/pages/chongzhi/g_filter.wxs
packageA/pages/distribution/goods/goods.wxml
packageA/pages/distribution/shop/shop.wxml
packageA/pages/goodsInfo/goodsInfo.js
packageA/pages/goodsInfo/goodsInfo.wxml
packageA/pages/goods_share/goods_share.js
packageB/pages/user/collect_list/collect_list.wxml
@@ -157,7 +157,8 @@
 {
   "root": "packageC/",
   "name":"pack3",
-  "pages": [            
+  "pages": [
+	"pages/group_list/group_list",
   "pages/presell/list/list",
   "pages/presell/cart/cart",
   "pages/presell/cart/cart2",
@@ -165,7 +166,9 @@
   "pages/presell/goodsInfo/goodsInfo",
   "pages/goods/distributionCategoryList/index",
   "pages/goods/goodsList/goodsList",
-  "pages/payForAnother/payForAnother"
+  "pages/payForAnother/payForAnother",
+	"pages/luckyGo/luckyGo_list/luckyGo_list",
+	"pages/luckyGo/luckyGo_details/luckyGo_details"
   ]  
 }
@@ -4,6 +4,9 @@
 .pdt4 {
 	padding-top: 4rpx;
 }
+.pdt6 {
+	padding-top: 6rpx;
+}
 .pd10 {
 	padding: 10rpx;
 }
@@ -37,6 +40,9 @@
 .pdt12 {
 	padding-top: 12rpx;
 }
+.pdt16 {
+	padding-top: 16rpx;
+}
 .pdb10 {
 	padding-bottom: 10rpx;
 }
@@ -49,6 +55,9 @@
 .pdl30 {
 	padding-left: 30rpx;
 }
+.pdl60 {
+	padding-left: 60rpx;
+}
 .pdr10 {
 	padding-right: 10rpx;
 }
@@ -137,9 +146,7 @@
 	color: #c7c7c7;
 }
-.c-7b {
-	color: #7b7b7b;
-}
+
 .c-d {
 	color: #ddd;
@@ -708,9 +715,9 @@ background: #ffe3e2;
 /* 图标字体(ty) */
 @font-face {
   font-family: 'iconfont';  /* Project id 2054717 */
-  src: url('//at.alicdn.com/t/font_2054717_hsngh9ootwv.woff2?t=1632559813006') format('woff2'),
-       url('//at.alicdn.com/t/font_2054717_hsngh9ootwv.woff?t=1632559813006') format('woff'),
-       url('//at.alicdn.com/t/font_2054717_hsngh9ootwv.ttf?t=1632559813006') format('truetype');
+  src: url('//at.alicdn.com/t/font_2054717_kwrwze5y6c.woff2?t=1635844276600') format('woff2'),
+       url('//at.alicdn.com/t/font_2054717_kwrwze5y6c.woff?t=1635844276600') format('woff'),
+       url('//at.alicdn.com/t/font_2054717_kwrwze5y6c.ttf?t=1635844276600') format('truetype');
 }
 .iconfont {
@@ -721,6 +728,19 @@ background: #ffe3e2;
   -moz-osx-font-smoothing: grayscale;
 }
+.icon-luck:before {
+  content: "\e621";
+}
+
+.icon-shizhong:before {
+  content: "\e74f";
+}
+
+.icon-dingwei:before {
+  content: "\e6b4";
+}
+
+
 .icon-fenlei:before {
   content: "\e628";
 }
@@ -151,6 +151,9 @@ Component({
           index = 0,
           gdata = [];
+        var user_id=getApp().globalData.user_id;
+        if(!user_id) user_id=0;
+
       //--初始化卡类--
       th.card_init();
       var os=getApp().globalData.setting;
@@ -162,8 +165,10 @@ Component({
           for (var i = 0; i < g_id.length; i++) {
             str += g_id[i].goodsid + ",";           
           }
-          str=str.substring(0, str.length - 1);     
+          str=str.substring(0, str.length - 1);
+
           await app.request.get("/api/weshop/goods/getgoodslistOrdby?store_id=" + os.stoid + "&goodsidlist=" + str,  {
+          	    data:{user_id:user_id},
 			    isShowLoading:false,  
 			    success: function(res) {
                      th.data.loading=0;
@@ -218,6 +223,10 @@ Component({
            if(th.data.is_hot) r_data.is_hot=th.data.is_hot;
            if(th.data.is_new) r_data.is_new=th.data.is_new;
+            var user_id=getApp().globalData.user_id;
+            if(!user_id) user_id=0;
+            r_data.user_id=user_id;
+
          await app.request.promiseGet("/api/weshop/goods/page", {
               data:r_data
           }).then(res => {
@@ -245,6 +254,7 @@ Component({
 			  isonsale: 1,
 			  orderField: "sort",
 			  orderType: 'asc',
+			  user_id:user_id
             }
           }).then(res => {
             th.data.loading=0;
@@ -17,10 +17,18 @@
             <view class='zs_goods {{g_filter.get_border_type(object.big_order_type)}}'>
                 <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
                     <view class='zs_top rel'>
-                        <image class='zs_t_img' src="{{item.goods_img}}"
-                               data-errorimg="goods_array[{{index}}].goods_img"
-                               binderror="bind_bnerr3" lazy-load="true" 
-                        ></image>
+
+                        <block wx:if="{{object.big_order_type==3}}">
+                            <view style="position: relative; width: 100%; height: 100%">
+                                <image class='zs_t_img' src="{{object.pic_back}}" data-errorimg="object.pic_back" lazy-load="true"
+                                       binderror="bind_bnerr3"></image>
+                                <image class="n_box"  style="top: {{object.top}}%;left:{{object.left}}%;width: {{object.width}}%;height: {{object.width}}%"  src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true"  binderror="bind_bnerr3"></image>
+                            </view>
+                        </block>
+                        <block wx:else>
+                            <image class='zs_t_img' src="{{item.goods_img}}"  data-errorimg="goods_array[{{index}}].goods_img"
+                                   binderror="bind_bnerr3" lazy-load="true" ></image>
+                        </block>
                         <block wx:if="{{object.goodicon==3}}">
                             <image class='{{g_filter.get_class(object.column,object.position)}}' src='{{object.customicon}}'></image>
@@ -166,8 +174,20 @@
             <view class="zs_goods_ban">
                 <view class='zs_goods_2l'>
                     <view class='zs_top_2l rel'>
-                        <image class='zs_t_img_2l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true" 
+
+                        <block wx:if="{{object.big_order_type==3}}">
+                            <view style="position: relative; width: 100%; height: 100%">
+                                <image class='zs_t_img_2l' src="{{object.pic_back}}" data-errorimg="object.pic_back" lazy-load="true"
+                                       binderror="bind_bnerr3"></image>
+                                <image class="n_box"  style="top: {{object.top}}%;left:{{object.left}}%;width: {{object.width}}%;height: {{object.width}}%"  src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true"
+                                       binderror="bind_bnerr3"></image>
+                            </view>
+                        </block>
+                        <block wx:else>
+                          <image class='zs_t_img_2l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true"
                                    binderror="bind_bnerr3"></image>
+                        </block>
+
                         <block wx:if="{{object.goodicon==3}}">
                             <image class='{{g_filter.get_class(object.column,object.position)}}'
                                    src='{{object.customicon}}'></image>
@@ -312,9 +332,20 @@
             <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)}}'>
-                        <view class='zs_top_3l rel'>                       
-                            <image class='zs_t_img_3l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true" 
+                        <view class='zs_top_3l rel'>
+                            <block wx:if="{{object.big_order_type==3}}">
+                                <view style="position: relative; width: 100%; height: 100%">
+                                    <image class='zs_t_img_3l' src="{{object.pic_back}}" data-errorimg="object.pic_back" lazy-load="true"
+                                           binderror="bind_bnerr3"></image>
+                                    <image class="n_box"  style="top: {{object.top}}%;left:{{object.left}}%;width: {{object.width}}%;height: {{object.width}}%"  src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true"
+                                           binderror="bind_bnerr3"></image>
+                                </view>
+                            </block>
+                            <block wx:else>
+                                <image class='zs_t_img_3l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true"
                                        binderror="bind_bnerr3"></image>
+                            </block>
+
                             <block wx:if="{{object.goodicon==3}}">
                                 <image class='{{g_filter.get_class(object.column,object.position)}}'
                                        src='{{object.customicon}}'></image>
@@ -457,9 +488,18 @@
         <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
             <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}" >
                 <view class='zs_top_x'>
-                    <!--<image class='zs_t_img_x'></image>-->
-                    <block>
-                        <image class='zs_t_img_x' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"  lazy-load="true" 
+                    <block wx:if="{{object.big_order_type==3}}">
+                        <view style="position: relative; width: 100%; height: 100%">
+                            <image class='zs_t_img_x' src="{{object.pic_back}}" data-errorimg="object.pic_back" lazy-load="true"
+                                   binderror="bind_bnerr3"></image>
+                            <image class="n_box"  style="top: {{object.top}}%;left:{{object.left}}%;width: {{object.width}}%;height: {{object.width}}%"  src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true"
+                                   binderror="bind_bnerr3"></image>
+                        </view>
+                    </block>
+
+                    <block wx:else>
+                        <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>
                     </block>
@@ -587,12 +627,8 @@
 							   <view class='wz_red'>￥{{item.shop_price}}</view>
 							   <view class='del'>￥{{item.market_price}}</view>
 							</block>
-							
-							
+
 						</block>
-						
-						
-						
                     </view>
                     <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
                 </view>
@@ -622,17 +658,30 @@
 <!--商品展示-->
-  <swiper class="s_prom" indicator-active-color='red' indicator-dots="false" wx:if="{{object.column==5}}" style="height: {{swiper_hei}}rpx;">
+<swiper class="s_prom" indicator-active-color='red' indicator-dots="false" wx:if="{{object.column==5}}" style="height: {{swiper_hei}}rpx;">
     <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}}" style="width: 32%" >
-            <view class='one' style="margin-left: 10rpx">
+            <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%">
-                  <image src="{{aitem.goods_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].goods_img"
+
+                  <block wx:if="{{object.big_order_type==3}}">
+                        <view style="position: relative; width: 100%; height: 100%">
+                            <image  src="{{object.pic_back}}" data-errorimg="object.pic_back" lazy-load="true"
+                                   binderror="bind_bnerr3"></image>
+
+                            <image class="n_box"  style="top: {{object.top}}%;left:{{object.left}}%;width: {{object.width}}%;height: {{object.width}}%"  src="{{aitem.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true"  binderror="bind_bnerr3"></image>
+                        </view>
+                  </block>
+
+                  <block wx:else>
+                    <image src="{{aitem.goods_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].goods_img"
                          binderror="bind_bnerr3" lazy-load="true" style="width: 100%"></image>
-				  				  
+                  </block>
+
+
 				  <block wx:if="{{object.goodicon==3}}">
 				      <image class='{{g_filter.get_class(object.column,object.position)}}'
 				             src='{{object.customicon}}'></image>
@@ -154,6 +154,10 @@
   margin-left: 20rpx;
 }
+.zs_t_img_x.zj{ border: 1rpx solid #eee;} 
+.zs_t_img_x.yj{ border: 1rpx solid #eee;border-radius: 18rpx;} 
+
+
 .zs_center_x {
   width: 100%;
   min-height: 200rpx;
@@ -727,8 +731,13 @@ swiper {
 .one {
   margin-left: 14rpx;
+  overflow: hidden;
 }
+.one.zj{ border: 1rpx solid #eee;}
+.one.yj{ border: 1rpx solid #eee; border-radius: 18rpx;}
+
+
 .sp .sp_top .s_top1_kill {
   position: absolute;
   background-color: #c4182e;
@@ -814,5 +823,6 @@ top: 10rpx;
 	position: absolute;
 	right: 0rpx;
 	bottom: 10rpx;
+}
-}
 \ No newline at end of file
+.n_box{ position: absolute !important;z-index: 10}
 \ No newline at end of file
@@ -40,21 +40,22 @@ Component({
   pageLifetimes: {
     //要处理一下，游客登录后的界面的变化,主要还该是改变会员
     show: function () {
-
-      var th = this;
-      if (this.data.goods_array.length > 0) {
-        th.data.timer = setInterval(function () {
-          th.countDown2(th);
-        }, 1000);
-      }
+        //会员身份变化
+        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 () {
-    console.log("ready");
-    // var g_id = this.data.object.data;
     var g_id = this.data.object;
-    // console.log(g_id);
     this.init(g_id);
   },
   detached() {
@@ -75,9 +76,12 @@ Component({
           })
           goodsidlist = ut.sub_last(goodsidlist);
+          var user_id=getApp().globalData.user_id;
+          if(!user_id){ user_id=0;}
+
           //--调用接口,读取秒杀--
           app.request.promiseGet("/api/ms/flash_sale/getGoodsList?store_id="
-            + os.stoid + "&goodsidlist=" + goodsidlist, {}).then(res => {
+            + os.stoid + "&goodsidlist=" + goodsidlist+"&user_id"+user_id, {}).then(res => {
               console.log(res);
               //如果秒杀的数组为空的时候    
               var goodslist = res.data.data;
@@ -94,9 +98,11 @@ Component({
     //当是默认的情况
     no_gid_set() {
-      console.log(5623);
+      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};
       getApp().request.promiseGet("/api/ms/flash_sale/spikepage?page=1&pageSize=9",
-        { isShowLoading: 1, data: { store_id: os.stoid, is_end: 0, is_show: 1, timetype: 2 } }
+        { 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;
@@ -115,8 +121,8 @@ 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);
-              //th.setData({goods_array:arr});
             }
           })
         })
@@ -129,6 +135,11 @@ Component({
         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) {
@@ -15,29 +15,29 @@
     <view class='sp' 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="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}" class="s1_gk_a1">
+          <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&prom_type=1&prom_id={{aitem.id}}" class="s1_gk_a1">
             <view class='one'>
               <view class='sp_top'>
                 <view class='po'></view>
                 <block wx:if="{{aitem.start_time>newTime}}">
-                  <view class="rob">
+                  <view class="rob" style="justify-content: flex-start">
                     <span class='s_top_kill' style="background-color: #ffe718;color: #3c3b31;font-weight: bold">即将开始</span>
                   </view>
                 </block>
 				<block wx:if="{{aitem.end_time<=newTime}}">
-					<view class="rob">
+					<view class="rob" style="justify-content: flex-start">
 					  <span class='s_top_kill gray'>活动已结束</span>
 					</view>
 				</block>				
 				<block wx:else>
 					 <block wx:if="{{aitem.start_time<newTime && aitem.goods_num>aitem.buy_num}}">
-					   <view class="rob">
+					   <view class="rob" style="justify-content: flex-start">
 					     <span class='s_top_kill'>火热进行</span>
 					   </view>
 					 </block>
 					 <block wx:if="{{aitem.goods_num<=aitem.buy_num}}">
-					   <view class="rob">
+					   <view class="rob" style="justify-content: flex-start">
 					     <span class='s_top_kill gray'>已抢光</span>
 					   </view>
 					 </block>
@@ -62,7 +62,7 @@
               </view>
               <view class='sp_wz'>
-                <view class='sp_wzi'>{{aitem.title}}</view>
+                <view class='sp_wzi'>{{aitem.goods_name}}</view>
                 <view class='sp_jg'>￥{{aitem.price}}</view>
                 <view class='sp_jgx'>￥{{aitem.market_price}}</view>
               </view>
@@ -77,7 +77,7 @@
   <view class="sp2" wx:if="{{object.style==2}}">
     <block 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}}" class="s1_gk_a1">
+        <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&prom_type=1&prom_id={{aitem.id}}" class="s1_gk_a1">
           <view class='one1'>
             <view class="o1_img">
@@ -77,13 +77,12 @@ swiper {
   font-size: 24rpx;
   height: 38rpx;
   line-height: 38rpx;
-  left: 6rpx;
   padding: 4rpx 10rpx;
   border-radius: 10rpx;
   z-index: 999;
   position: relative;
-  top: -6rpx;
-  width: 210rpx;
+  top: 1rpx;
+  width: 110rpx;
   color: #fff;
   text-align: center;
 }
@@ -36,8 +36,8 @@ Component({
 	   	return false;
 	},
-	//---------联系客服------------
-	contactService: function() {
+	 //---------联系客服------------
+	  contactService: function() {
 	  getApp().getConfig(function(t) {
 	    if (t.store_tel == undefined) {
 	      getApp().request.get("/api/weshop/store/get/" + os.stoid, {
@@ -57,5 +57,16 @@ Component({
 	    }
 	  });
 	},
+
+      //---------联系微信客服------------
+      con_weixin:function () {
+		  var url=this.data.sys_switch.weapp_customertype_url;
+		  var id=this.data.sys_switch.weapp_customertype_appid;
+          wx.openCustomerServiceChat({
+              extInfo: {url: url},
+              corpId: id,
+              success(res) {}
+          })
+      }
   }
 })
 <!--有在线客户 和 打电话-->
-<block wx:if="{{sys_switch.weapp_customertype}}">
+<block wx:if="{{sys_switch.weapp_customertype==1}}">
    <!-- 判断是不是有登录  -->
    <view  wx:if="{{userInfo}}" class="custom-service" bindtap="go_user" >
 	    <view style="text-align: center;">
@@ -14,7 +14,16 @@
          <view class="s_title" wx:if="{{object.title!=''}}">{{object.title}}</view>
 	   </view>	 
     </button>	
-</block>	
+</block>
+
+<block wx:elif="{{sys_switch.weapp_customertype==2}}">
+	<view class="custom-service cart-ico new_split" bindtap="con_weixin">
+		<view style="text-align: center;">
+			<image class="cs-img" src="{{object.img}}"></image>
+			<view class="s_title" wx:if="{{object.title!=''}}">{{object.title}}</view>
+		</view>
+	</view>
+</block>
 <block wx:else>	
 	<view class="custom-service cart-ico new_split" bindtap="contactService">
@@ -4,15 +4,15 @@
 <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}}">
-      <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&title={{item.goods_name}}" hover-class="none">
+    <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">
         <!-- 商品图⽚ -->
         <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}}">
+          <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_type!=2 && item.prom_id>0}}">
 						<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>	
@@ -28,9 +28,4 @@ Component({
     },
   },
-  
-
- 
-  
-  
 })
 \ No newline at end of file
@@ -167,10 +167,22 @@ Page({
 		  if(item){
 			  var price = item.price;
 			  if(!price) price=item.shop_price;
-			  			  
+			  switch(th.data.currentIndex){
+				  case 0: item.prom_type=1;break;
+				  case 1: item.prom_type=6;break;
+                  case 2:
+                      if(th.data.currentIndex2==1) item.prom_type = 5;
+                      if(th.data.currentIndex2==2) {
+                          item.prom_type = 3;
+                          item.id=item.prom_id;
+					  }
+                      break;
+			  }
+              item.prom_id=item.id;
+
 			  var title= item.goods_name;		
 			  var img=this.data.url+item.original_img;		  
-			  var url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + item.goods_id;
+			  var url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + item.goods_id+"&prom_type="+item.prom_type+"&prom_id="+item.prom_id;
 			  if(getApp().globalData.user_id){
 			     url+="&first_leader="+getApp().globalData.user_id;
 			  }	  
@@ -362,6 +374,8 @@ Page({
 			page:this.data.currentPage,			
 			store_id:oo.stoid,
 		}
+		var user_id=getApp().globalData.user_id;
+		if(!user_id) user_id=0;
 		switch(th.data.currentIndex){
 			case 0:  //--秒杀--
@@ -373,7 +387,8 @@ Page({
 			  }			  
 			  req_data.is_show=1;
 			  req_data.is_end=0;	
-			 		
+			  req_data.user_id=user_id;
+
 			  if(th.data.key_str && th.data.key_str.trim()){
 				  req_data.key_str=th.data.key_str.trim();
 			  }			  
@@ -427,7 +442,15 @@ Page({
 			th.data.is_load=0;
 			if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0){
 				 th.data.currentPage++;
-				 var data=res.data.data.pageData;				 
+				 var data=res.data.data.pageData;
+
+                 if(th.data.currentIndex==0){
+                 	for(let i in data){
+                 		let item=data[i];
+                 		if(item.user_price) item.price=item.price;
+                 	}
+				 }
+
 				 if(res.data.data.page*10>res.data.data.total){th.setData({is_no_more:1});}		  									 
 				 var list=th.data.list;
 				 list=list.concat(data);
@@ -536,7 +559,26 @@ Page({
 	  var app = getApp();
 	  var unit = that.data.screenWidth / 750 * 1.35;  //基础单位，
+
+        var prom_type=0;
+        var prom_id=th.data.share_good.id;
+        switch(th.data.currentIndex){
+            case 0: prom_type=1;break;
+            case 1: prom_type=6;break;
+            case 2:
+                if(th.data.currentIndex2==1) prom_type = 5;
+                if(th.data.currentIndex2==2){
+                    prom_type = 3;
+                    prom_id=th.data.share_good.prom_id;
+				}
+                break;
+        }
+
+
+
 	  var scene = th.data.share_good.goods_id+"";
+      scene+="."+prom_type+"."+prom_id;
+
 	  var user_id=getApp().globalData.user_id?getApp().globalData.user_id:0;
 	  if(user_id>0){
 	    scene+="_"+user_id;
@@ -1118,14 +1160,27 @@ Page({
 	 		 this.data.currentPage=1;	
 	 		 this.requestGoodsList();	
 	 },
-	 
-	 
-	 go_goods:function(e){
-	 		 var index=e.currentTarget.dataset.index;
-	 		 var item=this.data.list[index];
-	 		 var url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + item.goods_id;
-	 		 getApp().goto(url); 
-	 },
+
+
+    go_goods: function (e) {
+        var index = e.currentTarget.dataset.index;
+        var item = this.data.list[index];
+        var url = "/pages/goods/goodsInfo/goodsInfo?goods_id=" + item.goods_id;
+
+        switch(this.data.currentIndex){
+			case 0:  item.prom_type = 1;break;
+			case 1:  item.prom_type = 6;break;
+			case 2:
+				if(th.data.currentIndex2==1) item.prom_type = 5;
+				if(th.data.currentIndex2==2) item.prom_type = 3;
+				break;
+		}
+
+        item.prom_id = item.id;
+        url+="&prom_type="+item.prom_type+"&prom_id="+item.prom_id
+
+        getApp().goto(url);
+    },
 	 go_coll_good:function(e){
 		 var gid=e.currentTarget.dataset.gid;		
 var is_acting = function(endtime){
-  //判断结束时间减去当前时间 ，如果当前时间大于0则为True
-  if(endtime=='') return true;
-  endtime = endtime.substring(0, 19);
-  var reg = getRegExp("-", "g");
-  endtime = endtime.replace(reg, '/');  
-  var bijiao = getDate(endtime) - getDate(); 
-  return bijiao > 0 ? true : false;
+   //判断结束时间减去当前时间 ，如果当前时间大于0则为True
+   endtime=endtime+" 23:59:59";
+   if(endtime=='') return true;
+   endtime = endtime.substring(0, 19);
+   var reg = getRegExp("-", "g");
+   endtime = endtime.replace(reg, '/');
+   var bijiao = getDate(endtime) - getDate();
+   return bijiao >= 0 ? true : false;
 }
 module.exports = {
 	is_acting:is_acting  
@@ -75,13 +75,13 @@
 				</label> -->
 				<checkbox value="{{item.goods_id}}" checked="{{item.checked}}" wx:if="{{!(options.index == 1 && currentTabIndex ==1)}}"/>
-				<view class="flex pdl10" bindtap="goto" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
+				<view class="flex pdl10" bindtap="goto" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_type={{item.prom_type}}&prom_id={{item.prom_id}}">
 					<view class="pdr20"><image class="img" src="{{imghost + (item.original_img ? item.original_img : default_img)}}" lazy-load/></view>
 					<view class="flex fdc jc_sb">
 						<view class="ellipsis-2">{{item.goods_name}}</view>
 						<view>
 							<!-- 判断是否有活动价 -->
-							<block wx:if="{{item.prom_price>0 || item.prom_integral>0}}">
+							<block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_type!=2 && item.prom_id>0}}">
 							  <view class="flex xc-wc ai-center" >
 										  <text wx:if="{{item.prom_integral}}"><text class="fs30">{{item.prom_integral}}</text>积分</text>	
 										  <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>	
@@ -214,7 +214,7 @@
 		</checkbox-group>
 		<checkbox-group class="fs26 flex pd16 wrap"  catchchange="checkboxChange" wx:else>
-			<view class="item2 bg-white" wx:for="{{list.pageData}}" bindtap="goto" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
+			<view class="item2 bg-white" wx:for="{{list.pageData}}" bindtap="goto" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_type={{item.prom_type}}&prom_id={{item.prom_id}}">
 				<image class="img2" src="{{imghost + (item.original_img ? item.original_img : default_img)}}" mode="aspectFit" lazy-load/>
 				<view class="pd20 fs26 flex jc_sb fdc f1">
 					<view class="ellipsis-2">{{item.goods_name}}</view>
@@ -222,7 +222,7 @@
 						<checkbox value="{{item.goods_id}}" checked="{{item.checked}}" data-name="checkbox" wx:if="{{!(options.index == 1 && currentTabIndex ==1)}}"/>
 						<view>
 							<!-- 判断是否有活动价 -->
-							<block wx:if="{{item.prom_price>0 || item.prom_integral>0}}">
+							<block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_type!=2 && item.prom_id>0 }}">
 							  <view class="flex xc-wc ai-center" >
 										  <text wx:if="{{item.prom_integral}}"><text class="fs30">{{item.prom_integral}}</text>积分</text>	
 										  <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>	
@@ -69,14 +69,14 @@
   <view class="content">
     <view class="fs26" wx:if="{{isShowRow}}">
       <view class="item bg-white flex ai-center pd20" wx:for="{{list}}">
-        <view class="flex pdl10" bindtap="goto" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
+        <view class="flex pdl10" bindtap="goto" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_type={{item.prom_type}}&prom_id={{item.prom_id}}">
           <view class="img-container pdr20" data-txt="已售:{{item.sales_sum}}">
             <image class="img" src="{{imghost + (item.original_img ? item.original_img : default_img)}}" lazy-load mode="aspectFit" />
           </view>
           <view class="flex fdc jc_sb">
             <view class="ellipsis-2 h68 mgb20">{{item.goods_name}}</view>
             <!-- 判断是否有活动价 -->
-            <block wx:if="{{item.prom_price>0 || item.prom_integral>0}}">
+            <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_type!=2 && item.prom_id>0}}">
               <view class="flex xc-wc pdt20">
                 <text wx:if="{{item.prom_integral}}">
                   <text class="fs30">{{item.prom_integral}}</text>
@@ -213,14 +213,14 @@
       </view>
     </view>
     <view class="fs26 flex pd20 wrap" wx:else>
-      <view class="item2 bg-white" wx:for="{{list}}" bindtap="goto" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
+      <view class="item2 bg-white" wx:for="{{list}}" bindtap="goto" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_type={{item.prom_type}}&prom_id={{item.prom_id}}">
         <view class="img-container" data-txt="已售:{{item.sales_sum}}">
           <image class="img2" src="{{imghost + (item.original_img ? item.original_img : default_img)}}" lazy-load="true" />
         </view>
         <view class="pd20 fs26">
           <view class="ellipsis-2 h68 mgb20">{{item.goods_name}}</view>
           <!-- 判断是否有活动价 -->
-          <block wx:if="{{item.prom_price>0 || item.prom_integral>0}}">
+          <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_type!=2 && item.prom_id>0}}">
             <view class="flex xc-wc">
               <text wx:if="{{item.prom_integral}}">
                 <text class="fs30" style="font-weight: bold;">{{item.prom_integral}}</text>
@@ -2209,6 +2209,17 @@ Page({
 			flag: !this.data.flag,
 		})
 	},
+
+    //---------联系微信客服------------
+    con_weixin:function () {
+        var url=this.data.sys_switch.weapp_customertype_url;
+        var id=this.data.sys_switch.weapp_customertype_appid;
+        wx.openCustomerServiceChat({
+            extInfo: {url: url},
+            corpId: id,
+            success(res) {}
+        })
+    }
@@ -160,10 +160,16 @@
   <view class="join-cart jc_sb">
 			<view class="flex">
-				<button wx:if="{{sys_switch.weapp_customertype}}" 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">
+				<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>
+				</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>
@@ -292,6 +292,11 @@ Page({
 			orderField:this.data.orderField,
 			orderType:this.data.orderType,
 		}
+
+		var user_id=getApp().globalData.user_id;
+		if(!user_id){ user_id=0;}
+        req_data.user_id=user_id;
+
 		if(this.data.key_str && this.data.key_str.trim()){
 			var str=this.data.key_str.trim();
 			req_data.key_str=str;
@@ -22,7 +22,7 @@
     <!-- 商品集合 -->
     <view class="{{editEd?'collects_max colls_max':'collects_max'}}">
       <navigator class="collect flex-vertical" bindtap="iconClick" data-index="{{index}}" wx:for="{{collects}}" wx:key="{{index}}"
-                 data-url="{{editEd==0?'/pages/goods/goodsInfo/goodsInfo?goods_id='+item.goods_id:''}}">
+                 data-url="{{editEd==0?'/pages/goods/goodsInfo/goodsInfo?goods_id='+item.goods_id+'&prom_type='+item.prom_type+'&prom_id='+item.prom_id:''}}">
         <view class="radioCheck iconClick" wx:if="{{editEd}}">
           <radio color="rgb(214,1,33)" class="scale" checked="{{item.checked==true?true:false}}"></radio>
@@ -46,7 +46,7 @@
                 <!-- 优惠价 -->
                 <view class="price flex xc-wc">
                   <view class="fs24">￥</view>
-                  <view class="fs40">{{item.shop_price}}</view>
+                  <view class="fs40">{{item.prom_price?item.prom_price:item.final_price}}</view>
                 </view>
                 <!-- 原价 -->
                 <view class="flex fs24 line through xc-ash">
@@ -124,6 +124,9 @@ Page({
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
+
+        console.log(options,111);
+
         self = this;
         var the_id = options.id;
 				if(options.title) {
@@ -131,7 +134,8 @@ Page({
 						title: options.title,
 					});
 				};
-        var first_leader='';
+        var first_leader=options.first_leader;
+
         //--如果tg_id是空的话，分享回来--
         if (the_id == undefined || the_id == null || the_id == "") {
             var  gid_str = decodeURIComponent(options.scene);
@@ -249,8 +253,7 @@ Page({
                         return false;
                     }
-                    //获取购物车的内容
-                    th.get_cart_val(e);
+
                     var ee = JSON.parse(JSON.stringify(e));
                     var appd = getApp().globalData;
@@ -342,8 +345,13 @@ Page({
                                     });
                                 }
                             }
+                            //获取购物车的内容
+                            th.get_cart_val(e);
                         })
+                    }else{
+                        //获取购物车的内容
+                        th.get_cart_val(e);
                     }
                 }, 1);
@@ -418,6 +426,18 @@ Page({
      * 用户点击右上角分享
      */
     onShareAppMessage: function () {
+        var title = this.data.act.name;
+        var url= "/packageB/pages/zuhegou/index/index?id="+this.data.act.id;
+        if (getApp().globalData.user_id) {
+            url += "&first_leader=" + getApp().globalData.user_id;
+        }
+        var ob = {
+            title:title,
+            path: url,
+        };
+        if(this.data.act.img_url)
+            ob.imageUrl=this.data.iurl+this.data.act.img_url;
+        return ob;
     },
     /**
@@ -2004,7 +2024,7 @@ Page({
                     await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
                         data: {
                             store_id: os.stoid,
-                            user_id: user_id,
+                            user_id: oo.user_id,
                             goods_id: item_j.goods_id,
                             prom_type: 7,
                             prom_id: th.data.act.id
+var e = getApp(), i = e.request, a = e.globalData.setting,os=a,ut = require("../../../utils/util.js");
+var regeneratorRuntime = require('../../../utils/runtime.js');
+const app = getApp();
+let self = null;
+		
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+		// type:1,
+		// goodlist: null,
+		
+		isLogin: false,
+		list: null,
+		isLoading: false, // 检测是否已经发送请求,防止重复发送请求
+		noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据
+		pageNum: 1, // 当前页数
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+		self = this;
+		
+		app.isLogin().then(function(data) {//进入页面前已经授权登录成功
+			self.setData({
+				userInfo: data,
+			});
+		});
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+		if(app.globalData.userInfo) {
+			if(!this.data.isLogin) {
+				this.setData({
+					userInfo: app.globalData.userInfo,
+					imghost: app.globalData.setting.imghost,
+					isLogin: true,
+				});
+		
+		
+				let url = '/api/weshop/goods/groupBuy/page';
+				let data = {
+					store_id: app.globalData.setting.stoid,
+					is_show: 1,
+					is_end: 0,
+					timetype:1
+				};
+				
+				this.setData({
+					list: null,
+					pageNum: 1,
+					noMore: false,
+				});
+		
+				this.getData(true, url, data).then(function() {
+					self.setData({
+						currentData: data,
+					});
+				});
+				
+				this.data.is_timer=1;
+
+			};
+			
+			
+			//设置全局定时器
+			this.data.timer = setInterval(function () {
+			  self.countDown();
+			},1000);	
+			
+
+		};
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+		clearInterval(this.data.timer);
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+		let data = this.data.currentData;
+		this.scrollToLower('/api/weshop/goods/groupBuy/page', data);
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+	
+	
+	/**
+	 * 请求数据
+	 */
+	getData: function(isInit, url, data) {
+		let p = app.request.promiseGet(url, {
+			data: data,
+			isShowLoading: true,
+		})
+		.then(function(res) {
+			if(res.data.code == 0) {
+				
+				self.setData({
+					isLoading: false
+				});
+				
+				if(isInit) {// 第一次加载
+					self.setData({
+						list: res.data.data
+					});
+				} else {
+					self.setData({
+						'list.pageData': self.data.list.pageData.concat(res.data.data.pageData)
+					});
+				};
+				
+				if((res.data.data.pageData.length == 0) || (res.data.data.pageSize * res.data.data.page >= res.data.data.total)) {
+					self.setData({
+						noMore: true
+					});
+				};
+				
+			} else {
+				self.setData({
+					'list.pageData': []
+				});
+			};
+			
+		});
+	
+		return p;
+	},
+	
+	
+	/**
+	 * 上拉加载
+	 */
+	scrollToLower(url, requestData) {
+		// 数据总量
+		let total = this.data.list.total;
+		// 单页最大数据量
+		let pageSize = this.data.list.pageSize;
+		// 如果数据总量不为0且小于或等于单页最大数据量，说明数据已全部加载，显示‘没有更多了’
+		if((total != 0)&&(total <= pageSize)) {
+			this.setData({
+				noMore: true
+			});
+		};
+		
+		if(!this.data.isLoading && !this.data.noMore) {
+			this.setData({
+				isLoading: true,
+				pageNum: this.data.pageNum + 1
+			});
+			requestData.page = this.data.pageNum;
+			this.getData(false, url, requestData);
+		};
+	},
+	
+	
+	//---小于10的格式化函数----
+	timeFormat(param) {
+	   return param < 10 ? '0' + param : param;
+	},
+	
+	
+	//----倒计时函数-----
+	 countDown() {
+	  if(!this.data.is_timer) return false;
+	  var th=this;
+	  // 获取当前时间，同时得到活动结束时间数组
+	  let newTime = ut.gettimestamp();
+	  var endTimeList = this.data.list.pageData;
+	  if(endTimeList == null) return null;
+	  // 对结束时间进行处理渲染到页面
+	  for(var i = 0; i < endTimeList.length; i++) {
+	       var o = endTimeList[i];
+	       var endTime = o.end_time;
+	       // if(th.data.type==0) 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), hide: 1
+	            }
+	        } else {
+	           //活动已结束，全部设置为'00'
+	         obj = { day: '00', hou: '00', min: '00', sec: '00' }
+	        }
+	        var txt ="goodlist["+i+"].djs";
+	        th.setData({ [txt]: obj});
+	      }
+	 },
+	 
+	 
+	 
+	 //图片失败，默认图片
+	 bind_bnerr2: function (e) {
+	    var _errImg = e.target.dataset.errorimg;
+	    var val = e.target.dataset.val;
+	    if(val!=undefined && val!=null && val!='null' ){
+	       var _errObj = {};
+	       _errObj[_errImg] = "/public/images/default_goods_image_240.gif";
+	       this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+	    }
+	 },
+	 
+	 goto(e) {
+		 let url = e.target.dataset.url;
+		 app.goto(url);
+	 },
+	
+	
+})
 \ No newline at end of file
+{
+	"navigationBarTitleText": "团购",
+	"enablePullDownRefresh": false,
+  "usingComponents": {
+		"nodata": "/components/nodata/nodata"
+	}
+}
 \ No newline at end of file
+<view class="list">
+	<view class="list-item" wx:for="{{list.pageData}}">
+		<view class="img-container">
+			<image class="img-block" src="{{imghost + item.original_img}}" data-val="{{item.original_img}}"
+			    data-errorimg="list.pageData[{{index}}].original_img" binderror="bind_bnerr2" lazy-load="true"></image>
+		</view>
+		<view class="mgl20 flex fdc f1 jc_sb">
+			<view>
+				<view class="fs30">{{item.title}}</view>
+				<view class="flex ai_c">
+					<view class="fs26 tag">{{item.rebate}}折</view>
+					<view class="rmb c-red fs30">{{item.price}}</view>
+					<view class="rmb del fs24 c-7b pdl10">{{item.market_price}}</view>
+				</view>
+			</view>
+			<view class="flex jc_sb ai-center c-7b">
+				<view class="fs24">
+					<view>已售{{item.buy_num}}件</view>
+					<view class=""><text class="iconfont icon-shizhong fs24"></text>{{goodlist[index].djs.day}}天{{goodlist[index].djs.hou}}时{{goodlist[index].djs.min}}分{{goodlist[index].djs.sec}}秒</view>
+				</view>
+				<view class="btn" bindtap="goto" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_id={{item.id}}&prom_type=2">去团购</view>
+			</view>
+		</view>
+	</view>
+</view>
+
+<view class="no-more" hidden="{{!noMore}}" wx:if="{{list.pageData.length !== 0}}">—— 已经到底啦 ——</view>
+<nodata nodataContainer="t-c" wx:if="{{list.pageData.length == 0}}"></nodata>
+page {
+	background-color: #f2f2f2;
+}
+
+.list {
+	padding-left: 20rpx;
+	padding-right: 20rpx;
+}
+
+.list-item {
+	background-color: white;
+	border-radius: 12rpx;
+	margin-top: 20rpx;
+	padding: 20rpx;
+	display: flex;
+}
+
+.tag {
+	background-color: #ff6768;
+	color: white;
+	font-size: 24rpx;
+	padding-left: 10rpx;
+	padding-right: 10rpx;
+}
+
+.img-container {
+	width: 200rpx;
+	height: 200rpx;
+}
+
+.btn {
+	background-color: #ff6768;
+	color: white;
+	padding: 10rpx 30rpx;
+	border-radius: 40rpx;
+	font-size: 26rpx;
+}
+
+.rmb {
+	position: relative;
+}
+
+.rmb::before {
+	content: '￥';
+	font-size: 24rpx;
+}
+
+.del {
+	text-decoration: line-through;
+}
+
+.no-more {
+	font-size: 24rpx;
+	line-height: 2;
+	text-align: center;
+	/* margin-top: 10rpx; */
+	color: #ccc;
+}
 \ No newline at end of file
+var t = require("../../../../utils/util.js"),
+  ut = t,
+  e = require("../../../../utils/common.js"),
+  a = require("../../../../utils/wxParse/wxParse.js"),
+  s = getApp(),
+  i = s.request,
+  rq = i, 
+  oo = s.globalData,
+  o = s.globalData.setting,
+  os = o;
+  var regeneratorRuntime = require('../../../../utils/runtime.js');
+
+Page({
+  data: {
+    //activity_type:1,//活动类型 商家1 阶梯2 会员3
+    p_status:1,//会员团的详细情况 1是正在行  2是成功  3失败
+    sf_length: 1,//人数大于5
+
+    erweima:false,
+    meng:false,
+    zk:true,
+    stoid: o.stoid,
+    hiddenName: true,
+    teamlist:null,
+    teamgroup:null,
+    goods:null,//商品数据
+    pindGoods: null,//拼单数据
+    imageurl: o.imghost,
+    pay_f:0,//支付是否成功
+    order_sn:"",//订单编号
+    canvasHidden:false,  //画画版
+    screenWidth:0,
+
+    pd_xx: 0, //弹框
+    max_num:0,//最低成团人数
+    min_price:0,//最低价格
+    is_show:0,//加载完才显示
+
+    share_img_localpath:"",  //分享图片的本地图片
+    share_ewm_localpath: "", //分享的二维码本地图片
+    share_head:"",           //分享头像的本地图片
+
+    iurl:os.imghost,
+    ct_price:0,//阶梯团成团价格
+      sf_arr:null,
+
+  },
+  onLoad: function (t) {
+      // wx.setNavigationBarTitle({ title: "拼团订单",})
+	  
+      var that=this; 
+	  var th=this;
+      //获取用户设备信息，屏幕宽度
+      wx.getSystemInfo({
+         success: res => {
+            that.setData({ screenWidth: res.screenWidth })
+         }
+       })
+      var pay_f = t.payf, order_sn = t.ordersn;
+      this.setData({ pay_f: pay_f, order_sn: order_sn});
+      this.init(order_sn);
+	  
+	  //-- 自定义海报 --
+	  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})					  							
+	  		}			
+	  	}
+	  })	
+  },
+  //关闭展开列表
+  click:function(e){
+    this.setData({
+      hiddenName: !this.data.hiddenName,
+      zk: !this.data.zk,
+    })
+  },
+  //打开收起拼团列表
+  czk:function(e){
+    this.setData({
+      zk:!this.data.zk,
+      hiddenName: !this.data.hiddenName,
+    })
+  },
+ //打开蒙板提示
+  cmeng:function(e){
+    this.setData({
+      meng:!this.data.meng,
+    })
+  },
+
+  //关闭蒙板提示
+  cmc:function(e){
+    this.setData({
+      meng: !this.data.meng,
+    })
+  },
+//打开二维码提示
+  cerweima:function(e){
+    this.setData({
+      meng: !this.data.meng,
+      erweima: !this.data.erweima,
+    })
+  },
+
+  cerc:function(e){
+    this.setData({
+      erweima: !this.data.erweima,
+      meng: !this.data.meng,
+    })
+  },
+
+  async init( order_sn) {
+     
+        wx.showLoading();
+
+        var goods_id = 0,//商品ID,
+        pageteam=null,//
+        original_img=null ,//商品图片
+        order=null,//订单编号
+        id = 0,//团购id
+        pt_listno = "",//团编号
+        pt_prom_id = 0, //活动id
+        ee = this,
+        team_id = 0,//活动id
+        ordertx=[],//头像图片
+        share_img=null,//分享图片
+        teamlist=null,//活动表
+        goods=null,//商品
+        teamgroup=null,//活動从表
+        max_num=0,//最低价格时的成团人数
+        p_status=1;
+
+      //--如果商家团的时候---
+      await  getApp().request.promisePost("/api/weshop/order/pay/vipAutoTuan", {
+          data: {orderSn:order_sn,storeId:os.stoid }
+      })
+
+    //获取order信息根据订单编号order_sn
+    await getApp().request.promiseGet("/api/weshop/order/page", {
+      data: { store_id: o.stoid, order_sn: order_sn,}
+    }).then(res => {
+      order = res.data.data.pageData[0];
+      pt_prom_id = order.pt_prom_id;
+      pt_listno = order.pt_listno;
+    })
+
+    if (this.data.payf || order.pt_status == 3) p_status = 3;  //失败
+    if (order.pt_status == 2 || order.pt_status == 4 || order.pt_status == 5)
+       p_status = 2;  //成功
+    if (order.pt_status < 2 && !this.data.payf)
+       p_status = 1; //正在进行
+    if ( order.pt_status == 6)   p_status = 4; //支付尾款失败
+
+    //多少人参团头像
+    await getApp().request.promiseGet("/api/weshop/order/pagePtList", {
+      data: { store_id: o.stoid, pt_listno: pt_listno, }
+    }).then(res => {
+      ordertx = res.data.data.pageData;
+    })
+
+
+    var min_price=0;
+    //获取活动表的信息根据活动pt_prom_id
+    await getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + pt_prom_id, {
+      data: { }
+    }).then(res => {
+      if (res.data.code==0){
+         teamlist = res.data.data;
+        this.setData({teamlist: teamlist});
+         //获取当前时间,并且判断剩余时间
+         var nt = ut.gettimestamp();
+         teamlist.status = 0;
+         if (nt >= teamlist.start_time) teamlist.status = 1;
+
+          goods_id = res.data.data.goods_id;
+          id = res.data.data.id;
+          share_img = ee.data.imageurl + res.data.data.share_imgurl;
+
+           //----------查看阶梯团------------
+          if (teamlist.ct_rylist != "" && teamlist.ct_rylist != null && teamlist.ct_rylist != undefined){
+            var ct_rylist = JSON.parse(teamlist.ct_rylist);
+            var max=0; var pri=0;
+            ct_rylist.forEach(function (val,ind) {
+              if(val.rynum>max){
+                  max=val.rynum;
+                   pri = val.price;
+              }
+            })
+            max_num=max;
+            min_price=pri;
+           
+          }
+		  
+		  
+		  //获取商品信息
+		  getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + goods_id, {
+		  }).then(res => {
+		    //商品地址
+		    original_img = ee.data.imageurl+ res.data.data.original_img,
+		    goods = res.data.data
+			
+			ee.setData({goods: goods,image: original_img,})
+			
+		  })
+		  
+      }
+    })
+
+
+      //只装5个
+      var ordertx2=[],sf_num=0,ct_nun=teamlist.ct_num;
+      if(max_num){
+         ct_nun=parseInt(max_num);
+         if (ct_nun < ordertx.length) ct_nun = ordertx.length;
+      }
+
+      if(ct_nun>5) ct_nun=5;
+      for(var i=0;i<ct_nun;i++){
+          if (i >= ordertx.length) sf_num++
+          else
+            ordertx2.push(ordertx[i]);
+      }
+
+      var sf_arr=[];
+      for (var i=0;i<sf_num;i++){
+          sf_arr.push(i);
+      }
+
+
+   
+
+    //获取活动从表信息team_id:305暂时
+    await getApp().request.promiseGet("/api/weshop/teamgroup/page" , {
+      data: { store_id: os.stoid, listno: pt_listno, team_id: pt_prom_id }
+    }).then(res => {
+        teamgroup = res.data.data.pageData[0];
+        if (teamgroup){
+			     var buy_start_date = ut.formatTime(teamgroup.buy_start_date, "yyyy-MM-dd hh:mm:ss");
+		    		teamgroup.buy_start_date=buy_start_date;
+        }
+    })
+
+
+    var ct_price = 0,
+        num_0 = ordertx.length;
+    if (teamlist.kttype == 3){
+        var js_data = JSON.parse(teamlist.ct_rylist);
+        js_data.forEach(function (val,ind) {
+            if (num_0<=val.rynum && ct_price==0){
+                ct_price=val.price;
+            }
+         })
+        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,})  
+		}
+	        
+    })
+
+    //--当是成团的时候的操作--
+    if(order.pt_status==2 || order.pt_status==4 || order.pt_status==5){
+        //设置值
+
+      ee.setData({
+        ordertx2: ordertx2, ordertx: ordertx, teamlist: teamlist, teamgroup: teamgroup, min_price: min_price,
+            order: order,  share_img: share_img,max_num:max_num,
+             pindGoods: teamlist,is_show:1,  zk:false,
+            hiddenName: false, ct_price:ct_price,p_status:p_status,sf_arr:sf_arr});
+
+             //--是否支付了尾款--
+             if(order.pt_status==4 || order.pt_status==5){
+                  ee.setData({is_pay_wk:1});
+             }
+    }else{
+      console.log("239什么鬼", teamlist);
+        //设置值
+      ee.setData({
+        ordertx2: ordertx2, ordertx: ordertx, teamlist: teamlist, teamgroup: teamgroup,
+        order: order, p_status: p_status, min_price:min_price,
+          share_img: share_img, max_num: max_num, pindGoods: teamlist, is_show: 1,
+           ct_price: ct_price, p_status: p_status,sf_arr:sf_arr});
+    }
+
+    wx.hideLoading();
+
+    wx.setNavigationBarTitle({
+      title: "拼团详情",
+    })
+  
+    ee.countDown2();
+
+    //获取分享图片的本地地址
+    var path2 = os.imghost + teamlist.share_imgurl;
+    wx.getImageInfo({
+      src: path2,
+      success: function (res) {
+        //res.path是网络图片的本地地址
+        ee.data.share_img_localpath = res.path;
+      },
+      fail: function (res) {
+        //失败回调
+      }
+    });
+
+
+  },
+  //---小于10的格式化函数----
+  timeFormat(param) {
+    return param < 10 ? '0' + param : param;
+  },
+  countDown2() {
+        var th = this;
+        // 获取当前时间，同时得到活动结束时间数组
+        var newTime = ut.gettimestamp();
+        var o = this.data.teamgroup;
+		if(!o) return false;
+				
+        var endTime = o.kt_end_time;
+        if (o.status == 0) endTime = o.start_time;
+
+        //看一下，是否要支付尾款
+        if(o.team_type==3 && th.data.order.pt_status==2){
+            endTime = o.wk_end_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 = "pindGoods.djs";
+        th.setData({
+          obj: obj
+        });
+        setTimeout(th.countDown2, 1000);
+  },
+
+   //--定义的保存图片方法，分享团---
+  saveImageToPhotosAlbum: function () {
+        //类型  0普通商品 1秒杀商品  2商家和会员团  3阶梯团
+        var type=1;
+        if(this.data.teamlist.kttype==3) type=2;
+
+        wx.showLoading({ title: '生成中...', })
+        var that = this, th = that;
+        //设置画板显示，才能开始绘图
+        that.setData({
+            canvasHidden: true,
+        })
+
+        if(this.data.share_hidden) {
+          this.setData({
+              share_hidden: false,
+          });
+        };
+
+        var app = getApp();
+        var unit = that.data.screenWidth / 750 * 1.35;
+        var scene=th.data.teamgroup.id;
+        var user_id=getApp().globalData.user_id?getApp().globalData.user_id:0;
+        if(user_id>0){
+           scene+="_"+user_id;
+        }
+
+        //二微码
+        var path3 = os.url+ "/api/wx/open/app/user/getWeAppEwm/"+
+           os.stoid+"?sceneValue="+scene+"&pageValue=pages/team/team_show/team_show";
+
+        //读取文件成功则OK--
+        wx.getImageInfo({
+            src: path3,
+            success:function (res) {
+                //回调写法
+                th.get_head_temp(th.get_goods_temp,function () {
+                    var vpath = res.path;
+                    var context = wx.createCanvasContext('share');
+
+
+                    //先画背景
+                    var pg_path = "../../../images/share/share_bg.png";					
+					//-- 如果有自定义海报的时候，判断背景的图片 --
+					if(th.data.share_b_img){
+						pg_path=th.data.share_b_img;
+					}
+
+					var share_title=th.data.teamlist.share_title;
+					if(!share_title)
+                        share_title=th.data.teamlist.title;
+                    context.drawImage(pg_path, 0, 0, 554 * unit, 899 * unit);
+					
+					//-- 是自定义海报的情况下 --
+					if(th.data.poster && parseInt(th.data.poster.style)==2){
+						//在线上分享人的情况下
+						if(parseInt(th.data.poster.show_headpic)){				 
+							  //获取坐标
+							  var x=parseFloat(th.data.poster.head_x)*2;
+							  var y=parseFloat(th.data.poster.head_y)*2;				  
+							  var x1=(x+90) *unit;
+							  var y1=(y+50) *unit;		  
+							  //--昵称---
+							  context.setFontSize(24 * unit)
+							  context.setFillStyle("black")
+							  context.fillText(app.globalData.userInfo.nickname, x1, y1);
+							  var width = 24 * app.globalData.userInfo.nickname.length * unit + 4 * unit;				  
+							  //强烈推荐 改许程
+							  var tj_path = "../../../images/share/q_tj.png";
+							  context.drawImage(tj_path, x1 + width, y1-22*unit, 85 * unit, 30 * unit);
+							  context.setFontSize(16 * unit)
+							  context.setLineJoin('round'); //交点设置成圆角
+							  context.setFillStyle("white")
+							  context.fillText('强烈推荐', x1 + width+8*unit, y1-1*unit); 				  				  
+						}	
+						
+					}else{
+						//--昵称---
+						context.setFontSize(24 * unit)
+						context.setFillStyle("black")
+						context.fillText(app.globalData.userInfo.nickname, 152 * unit, 76 * unit);
+						var width = 24 * app.globalData.userInfo.nickname.length * unit + 2 * unit;
+						//强烈推荐
+						var tj_path = "../../../images/share/q_tj.png";
+						context.drawImage(tj_path, 152 * unit + width, 54 * unit, 110 * unit, 30 * unit);
+						context.setFontSize(18 * unit)
+						context.setFillStyle("white")
+						context.fillText('强烈推荐', 152 * unit + width + 20 * unit, 76 * unit);
+					}
+					
+
+                    //---产品名称---
+                    context.setFontSize(21.3 * unit);
+                    context.setFillStyle("black");
+
+
+
+
+                    th.draw_Text(context,share_title,
+                        38 * unit, 180 * unit, 200 * unit, 279 * unit, unit);
+                    //------产品的价格-------
+                    context.setFontSize(24 * unit)
+                    context.setFillStyle("red")
+
+                    var pri0 = th.data.teamlist.price;
+                    pri0=parseFloat(pri0).toFixed(2);
+                    var wd1=th.data.screenWidth-ut.measureText(pri0, 31 * unit)-25;
+                    context.fillText("￥", wd1-15, 180 * unit);
+                    context.setFontSize(31 * unit)
+                    context.fillText(pri0, wd1, 180 * unit);
+
+                    //---市场价划掉---
+                    context.setFillStyle("gray")
+                    context.setFontSize(22 * unit)
+                    pri0= "￥" + parseFloat(th.data.goods.market_price).toFixed(2);
+                    var wd2=th.data.screenWidth-ut.measureText(pri0, 22 * unit)-25;
+                    context.fillText(pri0, wd2, 210 * unit);
+
+                    context.setStrokeStyle('gray')
+                    context.setLineWidth(1 * unit)
+                    context.moveTo(wd2-5, 204 * unit)
+                    context.lineTo(wd2+ut.measureText(pri0, 22 * unit)+5, 204 * unit)
+                    context.stroke();
+                    console.log(th.data.share_img_localpath);
+
+
+                    //---中间大图---
+                    context.drawImage(th.data.share_img_localpath, 68 * unit, 242 * unit, 410 * unit, 410 * unit);
+
+                    var g_ct=th.data.teamlist.ct_num-th.data.ordertx.length;
+                    var wz= "";
+                    if(g_ct>0)  wz="还差"+g_ct+"人成团，";
+                    else{
+                        g_ct= th.data.max_num -th.data.ordertx.length;
+                        if(g_ct>0){
+                            wz="还差"+g_ct+"人享最低优惠，";
+                        }else{
+                            wz="已享受最优惠，";
+                        }
+                    }
+
+                    //-------大图后面就不一样了-----------
+                    switch (type) {
+                        case 1://会员团和商家团的展示
+                            //---画线---
+                            context.setLineWidth(1 * unit)
+                            context.moveTo(32 * unit, 670 * unit)
+                            context.lineTo(520 * unit, 670 * unit)
+                            context.stroke();
+
+                            //---文字---
+                            context.setFontSize(22 * unit)
+                            context.setFillStyle("black")
+                            context.fillText("好物拼起来,拼拼更划算", 40 * unit, 726 * unit);
+
+                            //绘制成团图片
+                            var ct_img ="../../../images/share/ct_num.png";
+                            context.drawImage(ct_img, 40 * unit, 740 * unit, 120 * unit, 30 * unit);
+                            var ct_num = th.data.teamlist.ct_num;
+                            context.setFontSize(14 * unit)
+                         
+                            context.setFillStyle("red")
+                            if(ct_num<10){
+                                context.fillText(ct_num+"人拼团", 92 * unit, 760 * unit);
+                            }else{
+                                context.fillText(ct_num+"人拼团", 86 * unit, 760 * unit);
+                            }
+                            context.setFontSize(22 * unit)
+                            context.fillText("已拼"+th.data.teamlist.buy_num+"份", 166 * unit, 763 * unit);
+                            context.setFillStyle("gray")
+                            context.fillText(wz+"快来和我一起拼团吧！", 40 * unit, 826 * unit);
+                            context.setFillStyle("black")
+                            
+                            context.setFontSize(22 * unit)
+                            context.fillText("长按识别二维码，立即参团", 40 * unit, 856 * unit);
+                            //---二维吗图---
+                            //-- 自定义海报 --
+                            if(th.data.poster){
+							   var erm_x= parseFloat(th.data.poster.ewm_x)*2; 
+							   var erm_y= parseFloat(th.data.poster.ewm_y)*2; 
+							   context.drawImage(vpath, erm_x * unit, erm_y * unit, 120 * unit, 120 * unit);				  
+                            }else{
+							   //---二维吗图---
+							   context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
+                            }	
+                            break
+                        case 2://阶梯团的展示
+                            //---画线---
+                            context.setLineWidth(1 * unit)
+                            context.moveTo(32 * unit, 670 * unit)
+                            context.lineTo(520 * unit, 670 * unit)
+                            context.stroke();
+                            //---文字---
+                            context.setFontSize(22 * unit)
+                            context.setFillStyle("black")
+                            context.fillText("好物拼起来,拼拼更划算", 40 * unit, 726 * unit);
+                            //---绘制中间阶梯的价格---
+                            var list= JSON.parse(th.data.teamlist.ct_rylist);
+                            for(var i=0; i<list.length;i++){
+                                var item=list[i];
+                                var wi=i*90*unit;
+                                context.setFontSize(16 * unit)
+                                context.setFillStyle("red")
+                                context.fillText("￥", 40 * unit+wi, 756 * unit);
+                                context.setFontSize(22 * unit)
+                                var pri=parseFloat(item.price).toFixed(2);
+                                context.fillText(pri, 56 * unit+wi, 756 * unit);
+                                context.setFillStyle("gray")
+                                context.fillText("满"+item.rynum+"人", 40 * unit+wi, 786 * unit);
+                            }
+
+                            //----------------下面部分----------------
+                            context.setFillStyle("gray")
+                            context.fillText(wz+"快来和我一起拼团吧！", 40 * unit, 830 * unit);
+                            context.setFillStyle("black")                        
+                            context.setFontSize(22 * unit)
+
+                            context.fillText("长按识别二维码，立即参团", 40 * unit, 860 * unit);
+                            //---二维吗图---
+                            //-- 自定义海报 --
+                            if(th.data.poster){
+                               var erm_x= parseFloat(th.data.poster.ewm_x)*2; 
+                               var erm_y= parseFloat(th.data.poster.ewm_y)*2; 
+                               context.drawImage(vpath, erm_x * unit, erm_y * unit, 120 * unit, 120 * unit);				  
+                            }else{
+                               //---二维吗图---
+                               context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
+                            }	
+                            break
+                    }
+
+                    //--- 如果是自定义海报的时候 ---
+                    if(th.data.poster && parseInt(th.data.poster.style)==2){
+                 			  
+						  //如果显示会员信息的话
+						  if(parseInt(th.data.poster.show_headpic)){				  
+							  //获取坐标
+							  var x= parseFloat(th.data.poster.head_x)*2;
+							  var y=parseFloat(th.data.poster.head_y)*2;				  
+							  //---绘制圆形要放在最后----
+							  context.save();
+							  context.beginPath();
+							  var h_x = x* unit;
+							  var h_y = y * unit;
+							  var h_r = 40 * unit;
+							  var cx = h_x + h_r;
+							  var cy = h_y + h_r;
+							  context.arc(cx, cy, h_r, 0, Math.PI * 2, false);
+							  context.closePath();
+							  context.fill();
+							  context.clip();
+							  context.drawImage(th.data.share_head, h_x, h_y, h_r * 2, h_r * 2);
+							  context.restore();
+						  }
+                    			  
+                    }else{
+						  //---绘制圆形要放在最后----
+						  context.save();
+						  context.beginPath();
+						  var h_x = 60 * unit;
+						  var h_y = 24 * unit;
+						  var h_r = 40 * unit;
+						  var cx = h_x + h_r;
+						  var cy = h_y + h_r;
+						  context.arc(cx, cy, h_r, 0, Math.PI * 2, false);
+						  context.closePath();
+						  context.fill();
+						  context.clip();
+						  context.drawImage(th.data.share_head, h_x, h_y, h_r * 2, h_r * 2);
+						  context.restore();
+                    }
+
+                    //把画板内容绘制成图片，并回调 画板图片路径
+                    context.draw(false, function () {
+                        setTimeout(function () {
+                            wx.canvasToTempFilePath({
+                                x: 0, y: 0,
+                                width: 750,
+                                height: 1217,
+                                destWidth: 750 * 750 / that.data.screenWidth,
+                                destHeight: 1217 * 750 / that.data.screenWidth,
+                                canvasId: 'share',
+                                success: function (res) {
+
+                                    that.setData({
+                                        shareImgPath: res.tempFilePath, canvasHidden: false,
+                                    })
+                                    if (!res.tempFilePath) {
+                                        wx.showModal({
+                                            title: '提示',
+                                            content: '图片绘制中，请稍后重试',
+                                            showCancel: false
+                                        })
+                                        return false;
+                                    }
+
+                                    // wx.previewImage({
+                                    //     //将图片预览出来
+                                    //     urls: [that.data.shareImgPath]
+                                    // });
+
+                                    that.setData({
+                                        showPoster: true,
+                                    });
+
+                                    wx.hideLoading();
+                                }
+                            })
+                        },500)
+                    });
+                });
+            }
+        });
+    },
+
+
+  //文本换行 参数：1、canvas对象，2、文本 3、距离左侧的距离 4、距离顶部的距离 5、6、文本的宽度
+  draw_Text: function (ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, unit) {
+    var lineWidth = 0;
+    var lastSubStrIndex = 0; //每次开始截取的字符串的索引
+    var han = 0;
+    for (let i = 0; i < str.length; i++) {
+      if (han == 2) return;
+   
+      //lineWidth += ctx.measureText(str[i]).width;
+      lineWidth += ut.measureText(str[i], 21.3 * unit);
+
+      if (lineWidth > canvasWidth) {
+        han++;
+        if (han == 2)
+          ctx.fillText(str.substring(lastSubStrIndex, i) + '...', leftWidth, initHeight); //绘制截取部分
+        else
+          ctx.fillText(str.substring(lastSubStrIndex, i), leftWidth, initHeight);
+
+        initHeight += 22; //22为字体的高度
+        lineWidth = 0;
+        lastSubStrIndex = i;
+        titleHeight += 20;
+      }
+      if (i == str.length - 1) { //绘制剩余部分
+        ctx.fillText(str.substring(lastSubStrIndex, i + 1), leftWidth, initHeight);
+      }
+    }
+  },  
+
+  //c点击打开拼团弹窗
+  cpd: function() {
+    console.log("heheh");
+    this.setData({  pd_xx: 1,})
+  },
+
+  //点击关闭拼团弹窗
+  close_pt_xx: function() {
+    this.setData({ pd_xx: 0, })
+  },
+
+  go_goodsinfo:function (e) {
+     var gid=e.currentTarget.dataset.gid;
+     var url="/pages/goods/goodsInfo/goodsInfo?goods_id="+gid;
+     wx.navigateTo({ url: url, })  //跳到非tabbar页
+  },
+
+    gohome:function () {
+        getApp().goto("/pages/index/index/index");
+    },
+
+    //--获取头像的本地缓存,回调写法--
+    get_head_temp:function (tt,func) {
+        var ee=this;
+        if(ee.data.share_head){
+            tt(func);
+            return false;
+        }
+        //---获取分享图片的本地地址,头像和商品图片----
+        var path2 = getApp().globalData.userInfo.head_pic;
+        if(path2==""){
+            ee.data.share_head ="../../../images/share/hui_hear_pic.png";
+            tt(func);
+        }else {
+            path2=path2.replace("http://thirdwx.qlogo.cn","https://wx.qlogo.cn");
+            path2=path2.replace("https://thirdwx.qlogo.cn","https://wx.qlogo.cn");
+            wx.getImageInfo({
+                src: path2,
+                success: function (res) {
+                    //res.path是网络图片的本地地址
+                    ee.data.share_head = res.path;
+                    tt(func);;
+                },
+                fail: function (res) {
+                    ee.data.share_head = "../../../images/share/hui_hear_pic.png"; //分享的图片不能用网络的
+                    tt(func);
+                }
+            });
+        }
+    },
+
+    //--获取商品图片的本地缓存，回调写法--
+    get_goods_temp:function (tt) {
+        var ee=this;
+        if(ee.data.share_img_localpath) {
+            tt();
+            return false;
+        }
+        var path2 = os.imghost + ee.data.teamlist.share_imgurl;
+        //获取商品是分享图信息
+        wx.getImageInfo({
+            src:  path2,
+            success: function (res) {
+                //res.path是网络图片的本地地址
+                ee.data.share_img_localpath = res.path;
+                tt();
+            },
+            fail: function (res) {
+                ee.data.share_img_localpath= "../../../images/share/default_g_img.gif";  //分享的图片不能用网络的
+                tt();
+            }
+        });
+    },
+
+    go_pay_wk:function(){
+      var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.order.order_id;
+      getApp().goto(url);
+    },
+
+    img_show_err:function(e){
+        var err_img = e.currentTarget.dataset.err;
+        var ob={};
+        ob[err_img] = this.data.iurl + "/miniapp/images/default_g_img.gif";
+        this.setData(ob);
+        
+    },
+
+    //------ 分享配置 --------
+    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;
+        }
+
+        return {
+            path:url,
+            title: share_title,
+            imageUrl: img,
+        }
+    },
+		
+		clickShare() {
+			this.setData({
+				share_hidden: true,
+			});
+		},
+		
+		send() {
+			this.setData({
+				share_hidden:false,
+			});
+		},
+		
+		cancel() {
+			this.setData({
+				share_hidden:false,
+			});
+		},
+
+
+    closePoster() {
+        this.setData({
+            showPoster: false,
+        });
+    },
+
+
+    // 保存图片到手机
+    savePic() {
+        console.log('保存图片');
+        var self = this;
+        // 获取用户的当前设置，返回值中有小程序已经向用户请求过的权限
+        this.getSetting().then((res) => {
+            // 判断用户是否授权了保存到相册的权限，如果没有发起授权
+            if (!res.authSetting['scope.writePhotosAlbum']) {
+                this.authorize().then(() => {
+                    // 同意授权后保存下载文件
+                    this.saveImage(self.data.shareImgPath)
+                        .then(() => {
+                            self.setData({
+                                showPoster: false
+                            });
+                        });
+                })
+            } else {
+                // 如果已经授权，保存下载文件
+                this.saveImage(self.data.shareImgPath)
+                    .then(() => {
+                        self.setData({
+                            showPoster: false
+                        });
+                    });
+            }
+
+        })
+    },
+
+
+    // 保存图片到系统相册
+    saveImage(saveUrl) {
+        var self = this;
+        return new Promise((resolve, reject) => {
+            wx.saveImageToPhotosAlbum({
+                filePath: saveUrl,
+                success: (res) => {
+                    wx.showToast({
+                        title: '保存成功',
+                        duration: 1000,
+                    });
+                    self.setData({
+                        showPlaybill: 'true'
+                    });
+                    resolve();
+                },
+                fail: () => {
+                    wx.showToast({
+                        title: '保存失败',
+                        duration: 1000,
+                    });
+                }
+            })
+        })
+    },
+
+    // 获取用户已经授予了哪些权限
+    getSetting() {
+        return new Promise((resolve, reject) => {
+            wx.getSetting({
+                success: res => {
+                    resolve(res)
+                }
+            })
+        })
+    },
+
+    // 发起首次授权请求
+    authorize() {
+        // isFirst 用来记录是否为首次发起授权，
+        // 如果首次授权拒绝后，isFirst赋值为1
+        let isFirst = wx.getStorageSync('isFirst') || 0;
+        return new Promise((resolve, reject) => {
+            wx.authorize({
+                scope: 'scope.writePhotosAlbum',
+                // 同意授权
+                success: () => {
+                    resolve();
+                },
+                // 拒绝授权,这里是用户拒绝授权后的回调
+                fail: res => {
+                    if(isFirst === 0) {
+                        wx.setStorageSync('isFirst', 1);
+                        wx.showToast({
+                            title: '保存失败',
+                            icon: 'none',
+                            duration: 1000
+                        })
+                    } else {
+                        this.showModal();
+                    }
+                    console.log('拒绝授权');
+                    reject();
+                }
+            })
+        })
+    },
+
+
+
+
+})
+
+{
+  "windom": {
+    "navigationBarTitleText": "参团详情",
+    "backgroundTextStyle": "light",
+    "navigationBarTextStyle": "white",
+    "navigationBarBackgroundColor": "#ffffff",
+    "backgroundColor": "#eeeeee"
+  },
+	"usingComponents": {
+			"share": "/components/share/share"
+	}
+}
 \ No newline at end of file
+<wxs module="filters" src="../../../../utils/filter.wxs"></wxs>
+<!---- //文字"-->
+<view>
+
+  <view class='center'>
+    <view class='cenleft'>
+      <image src='{{image}}' binderror='img_show_err' data-err="image"></image>
+    </view>
+    <view class='cenright'>
+      <!----//图片区域---->
+      <view class='cenrt'>
+        <view class='xc-goods-details ellipsis-2 fs30'>
+          {{goods.goods_name}}
+        </view>
+      </view>
+      <view class='cenrcen flex-vertical-between'>
+        <view>
+          <view class="fs40 xc-wc" style='font-size:40rpx'>
+            <span class="fs28 xc-rmbs" style="font-weight:500;">￥</span>{{teamlist.price}}</view>
+          <view class="fs22 word-line xc-wc" style="width:172rpx;">
+            零售价￥{{goods.market_price}}
+          </view>
+        </view>
+        <view class="xc-wc fs24">
+          <view>
+            <view class="">已拼{{teamlist.buy_num}}件</view>
+            <view class="flex xc-valframe t-c">
+              <view class="xc-frame-img">
+                <image class="picture" src="{{iurl}}/miniapp/images/bai-ren.png"></image>
+              </view>
+              <view class="xc-people-val">
+                {{teamlist.ct_num}}人拼
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class='clear'></view>
+  </view>
+  <!----以上商品显示完成---->
+
+
+  <view class='body'>
+    <!-- 阶梯团 -->
+    <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}}">
+          <text class="xc-wc">还差{{max_num-ordertx.length}}</text>人享受最低价格<text class="xc-wc">￥{{min_price}}</text>
+      </block>
+      <block wx:else>
+        该团已经拼购到最低价了哦~
+      </block>
+    </view>
+    <!-- 拼团成功 -->
+    <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">
+        <image class="img" src="{{iurl}}/miniapp/images/xc_qtcg.png"></image>
+      </view>
+    </view>
+
+    <view style="height: 20rpx" wx:if="{{teamlist.kttype==3&&p_status==4}}"></view>
+
+
+    <!-- 阶梯团失败 -->
+    <view class=".xc-fail-ladder flex-level fs28" wx:if="{{pay_f==1 || order.pt_status==3}}">
+      <view class="xc-wc">拼团失败</view>
+      <view class="xc-img-frame oh" >
+        <image class="img" src="{{iurl}}/miniapp/images/xc-qtshibai.png"></image>
+      </view>
+    </view>
+
+    <!-- 会员团和商家团 -->
+    <view class='bodytop' wx:if="{{(teamlist.kttype==2 || teamlist.kttype==1) && p_status==1}}">
+      还差
+      <text class="xc-wc">{{teamlist.ct_num-ordertx.length}}</text>人成团,组团成功为您节省
+      <text class="xc-wc">{{filters.toFix(goods.market_price-teamlist.price,2)}}</text>元
+    </view>
+    <!-- 拼团成功 -->
+    <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 class="flex_tou">
+      <view class='bodyimg flex-level'>
+        <view class='d' wx:for="{{ordertx2}}" wx:key>
+          <image src='{{item.head_pic}}'></image>
+          <span wx:if="{{item.is_pt_tz==1}}">团长</span>
+        </view>
+        <view class='d' wx:for="{{sf_arr}}" wx:if="{{p_status!=2}}">
+          <image  src='{{iurl}}/miniapp/images/shafa.png'></image>
+        </view>
+
+        <view class='xc-ellipsis-img flex-vertical' wx:if="{{ordertx.length>5}}">
+          <image class="pictures " src="{{iurl}}/miniapp/images/xc_ellipsis.png"></image>
+        </view>
+      </view>
+    </view>
+
+    <view class='bodytime'>
+      <!----/ //旁边直线---->
+      <view class='bodytimeleft'>
+        <view class='xian'></view>
+      </view>
+
+      <!-- 阶梯团 开始-->
+      <view class='bodytimecen' wx:if='{{p_status==1}}'>
+        剩余
+      
+        <span>{{obj.hou}}</span>:
+        <span>{{obj.hou}}</span>:
+        <span>{{obj.min}}</span>:
+        <span>{{obj.sec}}</span>结束
+      </view>
+      
+      <!-- 阶梯团 成功-->
+      <view class='bodytimecen-success' wx:if='{{teamlist.kttype==3&&p_status==2 && is_pay_wk!=1}}'>
+        剩余支付时间:
+     
+        <span>{{obj.hou}}</span>时
+        <span>{{obj.min}}</span>分
+        <span>{{obj.sec}}</span>秒
+      </view>
+
+      <view class='bodytimecen-success' wx:if='{{teamlist.kttype==3&&p_status==4 }}'>
+         拼团已结束
+      </view>
+
+      <!-- </block> -->
+      <!-- 阶梯团失败 -->
+      <view class='bodytimecen' wx:if='{{p_status==3}}'>
+        还差
+        <text class="xc-wc">{{teamlist.ct_num-ordertx.length}}</text>人参团, 拼团失败。
+      </view>
+      <!-- 会员团 -->
+      <view class='bodytimecen' wx:if='{{(teamlist.kttype==1 || teamlist.kttype==2) && p_status==2}}'>
+        已经有
+        <text class="xc-wc">{{ordertx.length}}</text>人参团, 拼团成功。
+      </view>
+
+      <!----//旁边直线---->
+      <view class='bodytimeright'>
+        <view class='xian'></view>
+      </view>
+    </view>
+
+    <!-- 阶梯团 -->
+    <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>
+
+    <!-- <block wx:if="{{pay_f!=1 && order.pt_status<2}}"> -->
+      <!----/ // // // //按钮---->
+      
+      <view wx:if="{{teamlist.kttype==3}}" class='bodybutton'>
+        <!-- 阶梯团 -->
+				<button wx:if="{{p_status==1}}"  bindtap="clickShare"  style='background-color:#fab55a; color:#fff'>
+        <!-- <button wx:if="{{p_status==1}}"  bindtap="clickShare" bindtap='cmeng'  style='background-color:#fab55a; color:#fff'> -->
+          邀请好友参团
+        </button>
+        <button bindtap="go_pay_wk" style='background-color:#42c780;' wx:if="{{order.pt_status==2 && order.is_zsorder==4 }}">
+          支付尾款
+        </button>    
+      </view>
+      <!-- <view wx:elif="{{teamlist.ct_num-ordertx.length>0}}" class='' bindtap='cmeng'> -->
+    
+        <!--会员团 商家团-->
+        <button class="bodybutton" style='background-color:#fab55a; color:#fff' bindtap='clickShare'
+                wx:if="{{(teamlist.kttype==2||teamlist.kttype==1)&&p_status==1}}">邀请好友参团</button>
+        
+      <!-- </view> -->
+    <!-- </block> -->
+ <view class="xc-home-page-frame">
+  <button class="xc-home-page" bindtap='gohome'> 返回首页</button>
+  </view>
+ 
+    <view class='zspan' hidden="{{hiddenName}}" bindtap='click'>查看拼团列表
+      <view class='down-arrow1'></view>
+    </view>
+   
+  </view>
+  
+  <!---/ // // // // //展开拼团列表---->
+  <view class='bodyfoot'>
+    <view class='bodyselect' wx:if="{{zk}}" bindtap='czk'>
+      <span>查看拼团列表
+        <view class='down-arrow'></view>
+      </span>
+    </view>
+
+    <view class='zhangxi' hidden="{{hiddenName}}" wx:for="{{ordertx}}" wx:for-index="ky">
+      <view class='img rel'>
+        <view class="xc-list" wx:if="{{item.is_pt_tz}}">
+          <span>团长</span>
+        </view>
+        <image src='{{item.head_pic}}'></image>{{item.nickname}}
+      </view>
+      <!-- <view class='zssj' wx:if="{{teamlist.kttype==1}}">{{item.add_time_date}}参团</view> -->
+      <view class='zssj' wx:if="{{ky==0 &&teamlist.kttype!=1}}">{{item.add_time_date}}
+        <text>开团</text>
+      </view>
+      <view class='zssj' wx:else>{{item.add_time_date}} 参团</view>
+      <view class="clear"></view>
+    </view>
+
+
+    <view class='clear'></view>
+  </view>
+  <view class='clear'></view>
+
+  <!----//大家都在团---->
+  <view class='goodslist'>
+    <view class='goodslisttop'>
+      <!-- <view class='goodslistspan fs24'>大家都在团</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>
+      </view>
+      <view class='goodslisttopright'></view>
+    </view>
+    <view class="changxin">
+      <view class='onegoods' wx:for="{{pageteam}}" wx:key="{{index}}" bindtap="go_goodsinfo" data-gid="{{item.goods_id}}">
+        <view class='onegoodsimg'>
+          <image src="{{imageurl+item.share_imgurl}}"></image>
+        </view>
+        <view class="xc-buttmo-frame">
+        <view class='onegoodsdesc '>
+
+           <view class='price flex-vertical-between'>
+          <view class='jgleft fs32 flex-center xc-wc'>
+          <view class="xc-ping xc-wc fs26 t-c">拼</view>
+          <text class="fs20" style='height:39rpx;margin-right:5rpx;margin-left:15rpx;' >¥</text>11.00{{item.price}}
+          </view>
+          <view class='jgright'>{{item.ct_num}}2
+            <span>人参团</span>
+          </view>
+        </view>
+        </view>
+           <view class="xc-shuoming ellipsis-2 fs26">
+          <text>{{item.goods_name}}</text>
+        </view> 
+   </view>
+      </view>
+    </view>
+  </view>
+</view>
+
+
+
+
+<!--二维码显示页面-->
+<canvas canvas-id='share' style='width:750rpx;height:1217rpx;' wx:if='{{canvasHidden}}'></canvas>
+<!--拼团玩法弹出框-->
+<!----弹起的---->
+<block wx:if="{{pd_xx}}">
+  <view class="bview"></view>
+  <view class="juzhong">
+    <view class="xq">
+      <view class="title" bindtap="close_pt_xx">拼团玩法介绍
+        <image src="{{iurl}}/miniapp/images/gbi.png" class="close"></image>
+      </view>
+      <view>1.开团：
+        <text class="hs1">选择心仪商品，点击“发起X人团”按钮，付款后即为开团成功；</text>
+      </view>
+      <view>2.参团：
+        <text class="hs1">进入朋友分享的页面，点击“立即参团”按钮，付款后即为参团成功，若多人同时支付，支付成功时间较早的人获得参团资格；</text>
+      </view>
+      <view>3.成团：
+        <text class="hs1">在开团或参团成功后，点击“邀请小伙伴参团”将页面分享给好友，在有效时间内凑齐人数即为成团，此时商家会开始发货；</text>
+      </view>
+      <view>4.组团失败：
+        <text class="hs1">在有效时间内未凑齐人数，即为组团失败，此时付款项会原路退回到支付账户；</text>
+      </view>
+      <view>5.
+        <text class="hs1">组团有效期间内，拼购商品订单不允许取消。 </text>
+      </view>
+    </view>
+  </view>
+</block>
+
+<!-- 分享控件，底部弹出 -->
+<share id="share_button" bind:send="send" 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">
+    <view class="poster-wrapper">
+      <view class="poster">
+        <!-- <view class="poster" bindtap="previewImage"> -->
+        <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 class="btn-container">
+       <!--<button class="btn-share" open-type="share" bindtap="">微信好友分享</button>-->
+       <button class="btn-share" bindtap="savePic">保存到相册</button>
+       </view>
+    </view>
+  </view>
+</view>
+
+
+
+page{
+  background-color:#eee;
+}
+.top{
+  background-color:rgb(216, 230, 220);
+  color: rgb(98, 155, 13);
+  text-align: center;
+  height:120rpx;
+  width: 100%;
+  padding-top:24rpx;
+}
+
+.center{
+  height: 240rpx;
+  width: 100%;
+  position: relative;
+  background:#fff;
+}
+
+.cenleft{
+  width: 240rpx;
+  height: 100%;
+  
+  float: left;
+ display:flex;
+ justify-content: center;
+ align-items: center;
+}
+
+.cenleft image{
+  background-color:white ;
+  width: 200rpx;
+  height: 200rpx;
+
+}
+
+
+.cenrt{
+  width: 460rpx; margin-top: 10rpx;
+}
+
+.cenright{
+  height: 100%;
+  width: 460rpx;
+  
+  float: left;
+}
+
+.cenrtop{
+  margin-top: 10rpx;
+ background-color: red;
+  color: white;
+  border-radius:10rpx;
+  padding-left: 16rpx;
+  width: 140rpx;
+  font-size: 32rpx;
+ float: left;
+ height: 40rpx;
+}
+
+.cenrtoptitle{
+  float: left;
+  width: 295rpx;
+  height: 40rpx;
+  margin-left: 12rpx;
+  font-size: 28rpx;
+  margin-top:12rpx;
+}
+
+.cenrtoptitle>span{
+    width: 100%;
+    display: inline-block;
+    overflow:hidden;
+    text-overflow:ellipsis;
+    white-space:nowrap
+}
+
+.cenrcen{
+  height: 70rpx;
+  margin-top: 35rpx;
+  width:474rpx;
+}
+.jg{ font-size: 40rpx;
+  margin-right: 30rpx;}
+.jgx{
+  font-size: 28rpx;
+  color: #777;
+  text-decoration:line-through;
+  margin-left: 20rpx;
+}
+
+.cenrfoot{
+  align-content: center;
+  text-align: center;
+  border: 2rpx solid red;
+  border-radius:10rpx;
+  color: red;
+  float: left;
+  font-size: 24rpx;
+  padding: 4rpx  16rpx;
+}
+
+.body{
+  background-color: white;
+  /* min-height:418rpx; */
+  width: 100%;
+  margin-top: 4rpx;
+  border-top:5rpx solid #eee;
+  height: auto;
+}
+
+.bodytop{
+  background-color: white;
+  text-align: center;
+  font-size: 28rpx;
+ height:100rpx;
+  line-height:117rpx;
+
+}
+
+.bodytop span{
+  color: red;
+}
+
+
+.bodyimg{
+  height:140rpx;
+   width:590rpx;
+  
+  
+
+}
+.bodyimg image{
+
+border-radius:50rpx;
+height: 96rpx;
+width: 96rpx;
+background-color:burlywood;
+margin-top: 30rpx;
+ position: absolute;
+
+}
+
+.d{
+width:101rpx;
+  height:101rpx;
+  display: inline-block;
+  margin-right:15rpx;
+
+}
+
+.bodyimg span{
+  background-color:#e22b44;
+  color: white;
+  font-size: 24rpx;
+  border-radius:6rpx;
+  padding:2rpx 10rpx;
+  position: relative;
+  top: 0rpx;
+  left: 40rpx;
+}
+
+
+
+.bodyspan{
+  color: red;
+  text-align: center;
+  font-size: 26rpx;
+ 
+}
+
+.bodyselect{
+  line-height: 47rpx;
+}
+
+.bodytime{
+  height: 88rpx;
+  width: 100%; 
+  display: flex;
+  flex-wrap: nowrap;
+  margin-left:40rpx;
+  align-items:center;
+
+}
+
+.bodytimeleft{
+  text-decoration:line-through;
+  flex-grow: 1.7;
+}
+
+
+.bodytimecen-success{
+  text-align: center;
+  flex-grow: 1;
+  line-height:75rpx;
+  font-size: 30rpx;
+ color: #000; 
+}
+.bodytimecen-success span{
+  
+  color: #18ba5f;
+  border-radius:7rpx;
+  font-size: 30rpx;
+  margin: 0 auto;
+ 
+}
+.bodytimecen{
+  text-align: center;
+  flex-grow: 1;
+
+  font-size: 30rpx;
+ color: #000; 
+}
+.bodytimecen span{
+  background-color: #333333;
+  color: white;
+  border-radius:7rpx;
+  padding-left: 10rpx;
+  font-size: 30rpx;
+  margin: 0 auto;
+  padding-right:10rpx;
+  margin-right:5px
+}
+
+
+.bodytimecen span:last-child{
+  margin-right: 10rpx;
+}
+
+.bodytimeright{
+  flex-grow: 1.7;
+   margin-right:72rpx;
+  
+}
+
+.bodybutton{
+  width: 90%;
+  margin: 0 auto;
+  text-align: center;
+  line-height: 60rpx;
+  border-radius:15rpx;
+  height: auto;
+}
+
+.bodybutton button{
+    height:60rpx;
+    width: 100%;
+    background-color: #e4374d;
+    color: white;
+    font-size:26rpx;
+    border-radius:12rpx;
+  
+}
+
+.bodyfoot{
+ 
+  width: 100%;
+  text-align: center;
+
+  font-size: 28rpx;
+  color: #000;
+   background-color: white;
+}
+
+
+
+
+
+.pintuan{
+  width: 100%;
+  height: 84rpx;
+  background-color: white;
+  color: black;
+  text-align: center;
+  font-size:36rpx;
+  margin-top: 60rpx;
+}
+
+.pintuanzhou{
+float: left;
+
+line-height: 84rpx;
+width: 220rpx;
+}
+
+.pintuanyou{
+  float: right;
+  color: rgb(168, 167, 167);
+  line-height: 84rpx;
+  font-size: 28rpx;
+  margin-right: 20rpx;
+}
+
+.onegoods{
+  background-color: white;
+  width: 345rpx;
+  min-height: 490rpx;
+  height:auto;
+
+  border:2rpx solid #eee;
+
+  float: left;
+  margin-right:17rpx;
+  border-radius:20rpx;
+}
+
+.goodsl{
+  background-color: white;
+}
+
+.onegoodsimg{
+  width: 100%;
+  height: 360rpx;
+}
+
+.onegoodsimg image{
+  height: 100%;
+  width: 100%;
+  border-radius:20rpx 20rpx 0 0;
+
+}
+ .xc-buttmo-frame{
+  min-height: 103rpx;
+  height: auto;
+  padding-bottom:15rpx;
+
+ }
+.xc-buttmo-frame .onegoodsdesc {
+
+  height: 80rpx;
+}
+
+.xc-buttmo-frame .onegoodsdesc .price{
+ 
+  padding-left:10rpx;
+   height:85rpx;
+
+}
+.xc-ping{
+  border-radius: 50%;
+  background: #fff;
+  line-height:34rpx;
+width:34rpx;
+height:34rpx;
+font-size:24rpx;
+
+}
+.jgleft{
+border-radius:36rpx;
+height:45rpx;
+line-height:50rpx;
+color:#fff;
+padding-left:7rpx;
+padding-right:24rpx;
+background:#e4374d;
+}
+
+.jgright{
+  font-size: 26rpx;
+  height:16rpx;
+padding-right:10rpx;
+color:rgb(168, 167, 167);
+}
+
+.jgright span{
+  color: rgb(168, 167, 167);
+}
+
+.goodslisttop{
+  width: 100%;
+}
+
+.goodslisttop{
+  width: 100%;
+  margin-top: 5rpx;
+  border-bottom: 4rpx solid #eee;
+   text-align: center;
+}
+
+.goodslistspan{
+  
+  margin: 0 auto;
+ padding-top: 20rpx;
+}
+
+.xian{
+  width: 100%;
+  border-bottom: 2rpx solid #eee;
+  float: left;
+}
+
+.bodyselect{
+  height: 90rpx;
+  background-color: white;
+  width: 100%;
+  line-height:90rpx;
+
+}
+
+
+.changxin{
+ overflow: hidden;
+  width: 100%;
+  padding-left:20rpx;
+  
+}
+
+.zhangxi{
+  width: 100%;
+  background-color:white;
+  color: black;
+}
+
+.img{
+  height: 100rpx;
+  margin-bottom: 0rpx;
+  float: left;
+  color: black;
+  line-height:100rpx;
+display:flex;
+align-items:center;
+
+}
+
+.zhangxi image{
+  border-radius:50rpx;
+ height: 60rpx;
+ width: 60rpx;
+ float: left;
+
+ background-color: red;
+ margin-left: 40rpx;
+ margin-right:10rpx;
+
+}
+
+.zhangxi .zssj{
+ width: 413rpx;
+ margin-left: 28rpx;
+ float: right;
+ margin-top:32rpx;
+}
+
+.zspan{
+  float: left;
+  text-align: center;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 48rpx;
+  font-size: 28rpx;
+ color:#000;
+  margin-bottom: 10rpx;
+  padding-bottom: 10rpx;
+  width: 100%;
+  background: #fff;
+  border-bottom:3rpx solid #eee;
+ margin-top:20rpx;
+
+}
+
+
+
+.mtop{
+  text-align: center;
+  color: white;
+  background-color:rgba(0, 0, 0, .4);
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  z-index: 5;top:0;left: 0;
+
+}
+
+.mt1{
+  margin-top: 200rpx;
+  margin-bottom: 20rpx;
+}
+
+.mts{
+  color:#E1E10B;
+}
+
+.mcou{
+  font-size: 48rpx;
+  
+}
+
+.mfoot{
+  width: 100%;
+  margin-top: 700rpx;
+}
+
+
+.mbtn{
+    margin-top: 60rrpx;
+    width: 400rpx;
+    background: #666666;
+    color: #fff;
+    border-radius: 20rpx;
+    font-size: 32rpx;
+}
+
+
+
+
+
+
+
+.etop{
+  padding-top: 200rpx;
+ width: 100%;
+  height: 100%;
+ position: fixed;
+ left: 0rpx;
+ top: 0rpx;
+ z-index: 12rpx;
+background-color:rgba(0, 0, 0, .4);
+ 
+}
+
+.emyimage{
+   display:flex; 
+    justify-content: center; 
+    align-items: center;
+}
+
+
+.emyimage image{
+  background-color: red;
+  width: 300rpx;
+  height: 300rpx;
+  margin: 0 auto;
+  
+}
+
+.espan{
+  font-size: 32rpx;
+  margin-top: 10rpx;
+}
+
+.erweima{
+  margin-top: 10rpx;
+  display: flex;
+  width: 100%;
+  
+}
+
+.erzhou{
+  width: 200rpx;
+  
+
+  margin-right: 20rpx;
+}
+
+.erzhou image{
+  background-color: blanchedalmond;
+  width: 200rpx;
+  height: 200rpx;
+}
+
+
+.eright{
+   width: 500rpx;
+  font-size: 32rpx;
+  
+}
+
+
+
+.ecc{
+  float: right;
+  margin-right: 48rpx;
+}
+
+
+.eee{
+ padding-top:40rpx;
+
+width:90%;
+height:70%;
+
+padding-left:32rpx;
+margin-left:20rpx;
+
+background-color:white;
+
+}
+
+.clear{
+    clear: both;
+}
+
+.down-arrow {
+    display: inline-block;
+    position: relative;
+    width: 40rpx;
+    height: 30rpx;
+    margin-right: 20rpx;
+}
+
+.down-arrow::after {
+    display: inline-block;
+    content: " ";
+    height: 18rpx;
+    width: 18rpx;
+    border-width: 0 2rpx 2rpx 0;
+    border-color: #000;
+    border-style: solid;
+    transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
+    transform-origin: center;
+    transition: transform 0.3s;
+    position: absolute;
+    top: 50%;
+    right: 10rpx;
+    margin-top: -10rpx;
+}
+
+.down-arrow1 {
+    display: inline-block;
+    position: relative;
+    width: 40rpx;
+    height: 30rpx;
+    margin-right: 20rpx;
+    margin-top: 12rpx;
+}
+
+.down-arrow1::after {
+    display: inline-block;
+    content: " ";
+    height: 18rpx;
+    width: 18rpx;
+    border-width: 0 2rpx 2rpx 0;
+    border-color: #000;
+    border-style: solid;
+    transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
+    transform-origin: center;
+    transition: transform 0.3s;
+    position: absolute;
+    top: 50%;
+    right: 10rpx;
+    margin-top: -10rpx;
+}
+
+.down-arrow1::after {
+    transform-origin: center;
+    transform: rotate(-135deg);
+    transition: transform 0.3s;
+}
+
+.bview {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0, 0, 0, 0.5);
+}
+
+.juzhong {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    align-items: center;
+}
+
+.juzhong .xq {
+    padding: 0 20rpx;
+    background: #fff;
+    font-size: 30rpx;
+    padding-bottom: 20rpx;
+}
+
+.juzhong .xq .title {
+    text-align: center;
+    margin: 20rpx 0;
+    position: relative;
+    height: 50rpx;
+}
+
+.juzhong .xq .hs1 {
+    font-size: 28rpx;
+    color: #ab8f9e;
+}
+
+.juzhong .xq .title .close {
+    position: absolute;
+    top: 0;
+    right: 0;
+    width: 45rpx;
+    height: 45rpx;
+}
+
+.pt_qd {
+    margin-top: 40rpx;
+    height: auto;
+}
+
+.spec-cart-btn.w100 {
+    width: 100%;
+    margin-left: 0;
+    height: 80rpx;
+    line-height: 80rpx;
+}
+
+.pt_status_set{
+    position: absolute; right: 10rpx; top:50rpx; width: 120rpx; height: 120rpx;
+}
+
+
+
+.xc-goods-details{
+width:479rpx;
+margin-top:20rpx;
+height:77rpx;
+}
+
+.xc-valframe{
+  border-radius:7rpx;
+border:1rpx solid;
+margin-top:3rpx;
+}
+.xc-valframe .xc-frame-img{
+  width:30rpx;
+height:100%;
+background:#e22b44;
+}
+.xc-valframe .xc-frame-img .picture{
+  width:25rpx;
+height:25rpx;
+margin-top:4rpx;
+
+}
+.xc-ellipsis-img{
+width:56rpx;
+height:96rpx;
+
+}
+.xc-ellipsis-img .pictures{
+  width:56rpx;height:56rpx;
+}
+.flex_tou{ display: flex; justify-content: center; width: 100%;}
+.xc-ptcomplete{
+  width:74%;
+height:105rpx;
+line-height:105rpx;
+float:right;
+
+}
+.xc-ptcomplete .xc-img-frame .img{
+  width: 105rpx;
+  height: 105rpx;
+  float: right;
+}
+.xc-ptcomplete-ladder .xc-img-frame{
+ width:201rpx;
+  height: 105rpx;
+  margin-top:20rpx;
+}
+.xc-ptcomplete-ladder .xc-img-frame .img{
+  width: 105rpx;
+  height: 105rpx;
+  float: right;
+  padding-right:6rpx;
+}
+.xc-ptcomplete .xc-img-frame{
+ width:190rpx;
+  height: 105rpx;
+  margin-top:20rpx;
+}
+.xc-ptcomplete .xc-end{
+  width:283rpx;
+text-align:right;
+}
+.iw{
+padding-right:33rpx;
+}
+.xc-ptcomplete .xc-img-frames{
+  width:360rpx;
+height:105rpx;
+margin-top:20rpx;
+
+}
+.xc-ptcomplete .xc-img-frames .img{
+  width: 105rpx;
+  height: 105rpx;
+  float: right;
+  padding-right:6rpx;
+}
+.xc-home-page-frame{
+  padding-top:16rpx;
+
+}
+.xc-home-page-frame .xc-home-page{
+ background-color: #e22b44;border-radius:15rpx;
+width:90%;
+color:#fff;
+height:60rpx;
+font-size:26rpx;
+line-height:60rpx;
+}
+/* */
+.xc-people-val{
+  padding-left:8rpx;
+padding-right:8rpx;
+}
+.xc-onclik{
+   width:100%;
+height:70rpx;
+
+}
+.xc-green{
+   color: #18ba5f;
+   text-align:center;
+flex-grow:1;
+height:90rpx;
+
+
+}
+.xc-ptcomplete-ladder{
+  width:74%;
+height:105rpx;
+line-height:105rpx;
+float:right;
+}
+.xc-fail-ladder{
+  width:61%;
+height:105rpx;
+line-height:105rpx;
+float:right;
+
+}
+.xc-fail-ladder .xc-img-frame{
+  width:61%;
+height:105rpx;
+margin-top:20rpx;
+}
+.xc-fail-ladder .xc-img-frame .img{
+  width: 105rpx;
+  height: 105rpx;
+  float: right;
+  padding-right:6rpx;
+}
+.xc-list{
+  background-color:#e22b44;
+color:white;
+font-size:17rpx;
+border-radius:6rpx;
+padding:0 5rpx;
+position:absolute;
+top:13rpx;
+left:80rpx;
+width:34rpx;
+line-height:25rpx;
+
+}
+
+.xc-linellae-frame{
+  width: 100%;
+  height: 60rpx;
+  background: #eee;
+}
+.xc-linellae-frame .xc-linellae{
+  width: 425rpx;
+  height: 1rpx;
+  border-bottom: 1rpx solid #a5a5a5;
+}
+.xc-recommend-frame{
+background:#eee;
+width:200rpx;
+height:100%;
+
+}
+.xc-recommend-frame .xc-recommend{
+  width: 35rpx;
+  height: 27rpx;
+  margin-top:7rpx;
+}
+.xc-recommend-frame .xc-recommend-word{
+font-size:26rpx;
+color: #a9a9a9;
+margin-left:5rpx;
+}
+.xc-rmbs{
+  
+height:40rpx;
+}
+.xc-shuoming{
+  padding-left:10rpx;
+}
+
+
+.poster-container {
+    box-sizing: border-box;
+    position: fixed;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    width: calc(100% - 210rpx);
+    z-index: 1000;
+}
+.mask {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    z-index: 999;
+    background-color: rgba(0,0,0,.4);
+}
+.poster-wrapper {
+    width: 100%;
+}
+
+.poster {
+    box-sizing: border-box;
+    width: 100%;
+    height: 905rpx;
+    border-radius: 20rpx;
+    /* box-shadow: 0 8px 12px #666; */
+    position: relative;
+    z-index: 999;
+    overflow: hidden;
+}
+.poster-img {
+    display: block;
+    width: 100%;
+    height: 100%;
+}
+.btn-container {
+    display: flex;
+    justify-content: space-around;
+}
+.btn-share {
+    display: block;
+    background-color: #FE6867;
+    color: white;
+    border-radius: 8rpx;
+    line-height: 80rpx;
+    margin-top: 28rpx;
+    padding: 0 60rpx;
+}
+
+
+.btn-close {
+    /* background-color: rgba(0,0,0,.5); */
+    color: #ccc;
+    width: 50rpx;
+    height: 50rpx;
+    line-height: 50rpx;
+    text-align: center;
+    border-radius: 50%;
+    position: absolute;
+    right: 20rpx;
+    top: 20rpx;
+}
+
+.icon-close {
+    font-size: 48rpx;
+}
 \ No newline at end of file
+var t = require("../../../../utils/util.js"),
+  ut = t,
+  e = require("../../../../utils/common.js"),
+  a = require("../../../../utils/wxParse/wxParse.js"),
+  s = getApp(),
+  i = s.request,
+  rq = i,
+  oo = s.globalData,
+  o = s.globalData.setting,
+  os = o;
+var regeneratorRuntime = require('../../../../utils/runtime.js');
+var  e = getApp(),oo = e.globalData.setting;
+
+Page({
+  data: {
+    wu:false,
+    imageurl: os.imghost,//有礼派图片地址,
+    iurl:  os.imghost,//有礼派图片地址,
+    pt_state:0,
+    order : null,//订单数据
+    currentTab: 0,
+    current:0,
+    ordertx:[],//头像
+    baseUrl: "/api/weshop/order/page?1=1",
+    resourceUrl: e.globalData.setting.resourceUrl,
+    currentPage: 1,
+    requestData: null,
+    original_img:null,
+    timer:null,
+		
+		
+		
+		
+		tabArr: ['全部','参团中','已团中','未团中'],
+		currentTabIndex: 0,
+  },
+  onLoad: function () {
+    this.data.requestData=new Array();
+    this.init(0);
+  },
+  onShow:function(){
+    var th=this;
+    //设置全局定时器
+    th.data.timer=setInterval(function () {
+      th.countDown();
+    },1000);
+  },
+	
+	
+	clickTab(e) {
+		this.setData({
+			currentTabIndex: e.target.dataset.index,
+		});
+	},
+	
+
+  /**
+  * 点击tab切换
+  */
+  swichNav: function (e) {
+    this.data.requestData=[];
+    this.data.currentPage=1;
+    var that = this;
+
+    if (that.data.order == null){
+      that.setData({
+        wu:true
+      })
+    }
+
+    if (this.data.currentTab === e.target.dataset.current) {
+      return false;
+    } else {
+      that.setData({
+        currentTab: e.target.dataset.current,
+      })
+      that.init(e.target.dataset.current);
+    }
+  },
+  
+  async init(current) {
+    var where="1=1";
+    var user_id = getApp().globalData.user_id;
+    switch (current){
+       case "1":
+        where+="&pt_status=1";
+         break;
+      case "2":
+        where += "&pt_ok=1";
+        break;
+      case "3":
+        where += "&pt_status=3";
+        break;
+    }
+
+    var goods_id = 0,//商品ID,
+      original_img = [],//商品图片
+      ee = this,
+      ordertx=[],//头像
+      order = null,//订单数据
+      goods = null,//商品数据
+      users = null,//会员数据
+      order_goods=null;//订单商品表
+
+    //获取订单表的信息根据活动user_id,pt_prom_id>0 AND pay_time>0
+    /*---
+    await getApp().request.promiseGet("/api/weshop/order/page?"+where, {
+      data: { is_pt:1,store_id: os.stoid, user_id: user_id, pageSize: 6, page: this.data.currentPage,}
+    }).then(res => {
+        order = res.data.data.pageData;
+        this.data.currentPage++;
+    })--*/
+
+    await getApp().request.promiseGet("/api/weshop/order/pageTuan?"+where, {
+      data: { is_pt:1,store_id: os.stoid, user_id: user_id, pageSize: 6, page: this.data.currentPage,}
+    }).then(res => {
+       order = res.data.data.pageData;
+       this.data.currentPage++;
+    })
+
+
+    wx.showLoading({ title: "加载中"});
+    for (i = 0; i < order.length; i++) {
+      //获取订单从表信息
+      await getApp().request.promiseGet("/api/weshop/ordergoods/pageGoods", {
+        data: { store_id: os.stoid, order_id: order[i].order_id }
+      }).then(res => {
+        order_goods = res.data.data.pageData;
+        order[i].order_goods = order_goods;
+        order[i].gimage = ee.data.imageurl + order_goods[0].original_img; 
+      })
+
+          
+     //获取订单表信息根据上面查询的订单号order[i].pt_listno
+      await getApp().request.promiseGet("/api/weshop/order/pagePtList", {
+        data: { store_id: os.stoid, pt_listno: order[i].pt_listno,pageSize:60,page:1}
+      }).then(res => {
+         //console.log("ordertx");
+         ordertx = res.data.data.pageData;
+         //console.log(ordertx);
+         order[i].tx=ordertx;
+      })
+
+     
+
+      if (order[i].is_zsorder== 4) {
+        var num = 0;
+        var jt_data = JSON.parse(order[i].ct_rylist);
+        for (var m in jt_data) {
+          if (jt_data[m].rynum > num) num = jt_data[m].rynum;
+        }
+        order[i].max_ct_num = num;
+      }
+
+      var sf_num = order[i].ct_num;
+      if (order[i].ct_num>=3){ sf_num=3;}
+      sf_num=sf_num-ordertx.length;
+      if(sf_num>0) {
+        var arr = [];
+        for(var j=0;j<sf_num;j++){
+          arr.push(j);
+        }
+        order[i].sf_num=arr;
+      }
+
+    }
+    //设置值
+    for (var ii = 0; ii < order.length;ii++){
+      this.data.requestData.push(order[ii]);
+    }
+
+    wx.hideLoading();
+    ee.setData({ order: this.data.requestData, ordertx: ordertx, isgo:1});
+  },
+  
+  //---滚动到底部加载更多---
+  onReachBottom: function () {
+    this.init(this.data.currentTab);
+  },
+
+  resetData: function () {
+    n.resetConfig(), this.data.order = null, this.data.currentPage = 1;
+  },
+
+  //----跳转到拼单success展示-----
+  go_team_success:function(e) {
+     var order_sn=e.currentTarget.dataset.ordsn;
+     wx.navigateTo({
+      url: "/pages/team/team_success/team_success?ordersn=" + order_sn,
+    });
+  },
+
+  onHide:function(){
+    //--清理定时器--
+    clearInterval(this.timer);
+  },
+
+  //----倒计时函数-----
+  countDown() {
+    var th=this;
+    // 获取当前时间，同时得到活动结束时间数组
+    let newTime =ut.gettimestamp();
+    var endTimeList = this.data.order;
+    
+    if(endTimeList==null) return null
+    // 对结束时间进行处理渲染到页面
+    for (var i = 0; i < endTimeList.length;i++){
+      var o = endTimeList[i];
+      if(o.kt_end_time==undefined) continue;
+      var endTime = o.kt_end_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 ="order["+i+"].djs";
+      th.setData({ [txt]: obj});
+    }
+  },
+  //---小于10的格式化函数----
+  timeFormat(param) {
+    return param < 10 ? '0' + param : param;
+  },
+
+  images_err:function(e){
+      var txt = e.currentTarget.dataset.err;
+      var ob={};
+      ob[txt] = this.data.imageurl + "/miniapp/images/default_g_img.gif";
+      this.setData(ob);
+  }
+
+
+})
+
+{
+	"navigationBarTitleText": "幸运购列表",
+	"enablePullDownRefresh": false,
+  "usingComponents": {
+		"nodata": "/components/nodata/nodata"
+	}
+}
 \ No newline at end of file
+<view class="tab-hd" bindtap="clickTab">
+	<view class="tab-hd-item {{currentTabIndex == index ? 'active':''}}" wx:for="{{tabArr}}" data-index="{{index}}">{{item}}</view>
+</view>
+
+<view class="tab-bd">
+	<view class="list">
+		<view class="list-item">
+			<view class="pd20">
+				<view class="pdr40 arrow">参团中，还差<text class="c-red">2</text>人</view>
+			</view>
+			<view class="flex pd20">
+				<view class="img-container"><image src="../../../../images/bk.png" class="img-block"></image></view>
+				<view>
+					<view class="title ellipsis-2">商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称</view>
+					<view class="flex ai-center">
+						<text class="rmb fs40 c-red">15</text>
+						<view class="fs24 del pdl10 c-c7">零售价<text class="rmb">25</text></view>
+					</view>
+					<view class="c-red fs24">未团中可获得XXXX帮团奖励</view>
+				</view>
+			</view>
+			<view class="flex ai-center pd20 bdt fs24 jc_sb">
+				<view>共1件，实付金额：<text class="rmb">15.00</text></view>
+				<view class="flex">
+					<view class="btn gray">查看订单</view>
+					<view class="btn c-red mgl20">邀请好友</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="list-item">
+			<view class="pd20">
+				<view class="pdr40 arrow">已团中，待发货</view>
+			</view>
+			<view class="flex pd20">
+				<view class="img-container"><image src="../../../../images/bk.png" class="img-block"></image></view>
+				<view>
+					<view class="title ellipsis-2">商品名称商品名称</view>
+					<view class="flex ai-center">
+						<text class="rmb fs40 c-red">15</text>
+						<view class="fs24 del pdl10 c-c7">零售价<text class="rmb">25</text></view>
+					</view>
+					<view class="c-red fs24">未团中可获得XXXX帮团奖励</view>
+				</view>
+			</view>
+			<view class="flex ai-center pd20 bdt fs24 jc_sb">
+				<view>共1件，实付金额：<text class="rmb">15.00</text></view>
+				<view class="flex">
+					<view class="btn gray">查看订单</view>
+					<!-- <view class="btn c-red mgl20">邀请好友</view> -->
+				</view>
+			</view>
+		</view>
+		
+		<view class="list-item">
+			<view class="pd20">
+				<view class="pdr40 arrow">未团中，已退款</view>
+			</view>
+			<view class="flex pd20">
+				<view class="img-container"><image src="../../../../images/bk.png" class="img-block"></image></view>
+				<view>
+					<view class="title ellipsis-2">商品名称商品名称</view>
+					<view class="flex ai-center">
+						<text class="rmb fs40 c-red">15</text>
+						<view class="fs24 del pdl10 c-c7">零售价<text class="rmb">25</text></view>
+					</view>
+					<view class="c-red fs24">未团中可获得XXXX帮团奖励</view>
+				</view>
+			</view>
+			<view class="flex ai-center pd20 bdt fs24 jc_sb">
+				<view>共1件，实付金额：<text class="rmb">15.00</text></view>
+				<view class="flex">
+					<view class="btn gray">查看订单</view>
+					<view class="btn c-red mgl20">查看奖励</view>
+				</view>
+			</view>
+		</view>
+		
+	</view>
+</view>
+
+
+<view class="popup-container">
+	<view class="popup">
+		<view class="pd20 flex jc_sb">
+			<text class="c-red">帮团奖励</text>
+			<text class="iconfont icon-close fs32 c-7b"></text>
+		</view>
+		<view class="popup-list">
+			<view class="popup-list-item">
+				<view class="img-container"><image class="img-block" src="../../../../images/bk.png"></image></view>
+				<view class="f1">
+					<view class="ellipsis-2 popup-title">我是名称名称名称名称名称名称名称名称名称名称名称名称名称名称名称名称名称名称名称名称</view>
+					<view class="fs24 t-r pdt16 c-7b">数量：<text class="c-red">100</text></view>
+				</view>
+			</view>
+			
+			<view class="popup-list-item">
+				<view class="img-container"><image class="img-block" src="../../../../images/bk.png"></image></view>
+				<view class="f1">
+					<view class="ellipsis-2 popup-title">我是名称</view>
+					<view class="fs24 t-r pdt16 c-7b">数量：<text class="c-red">11</text></view>
+				</view>
+			</view>
+			
+			<view class="popup-list-item">
+				<view class="img-container"><image class="img-block" src="../../../../images/bk.png"></image></view>
+				<view class="f1">
+					<view class="ellipsis-2 popup-title">我是名称</view>
+					<view class="fs24 t-r pdt16 c-7b">数量：<text class="c-red">11</text></view>
+				</view>
+			</view>
+			
+			<view class="popup-list-item">
+				<view class="img-container"><image class="img-block" src="../../../../images/bk.png"></image></view>
+				<view class="f1">
+					<view class="ellipsis-2 popup-title">我是名称</view>
+					<view class="fs24 t-r pdt16 c-7b">数量：<text class="c-red">11</text></view>
+				</view>
+			</view>
+		
+		</view>
+	</view>
+</view>
+
+
+
+<view class="no-more">—— 已经到底啦 ——</view>
+<nodata nodataContainer="t-c"></nodata>
 \ No newline at end of file
+.bdt {
+	border-top: 2rpx solid #f5f5f5;
+}
+
+page {
+	background-color: #f2f2f2;
+}
+
+.btn {
+	border: 2rpx solid #ff6768;
+	padding: 10rpx 20rpx;
+	border-radius: 40rpx;
+}
+
+.btn.gray {
+	border-color: #ccc;
+}
+
+.tab-hd {
+	display: flex;
+	text-align: center;
+	font-size: 28rpx;
+	background-color: white;
+	position: sticky;
+	top: 0;
+	z-index: 2;
+}
+
+.tab-hd-item {
+	flex-grow: 1;
+	padding: 20rpx;
+	position: relative;
+}
+
+.tab-hd-item.active {
+	color: #ff6768;
+}
+
+.tab-hd-item.active::after {
+	content: '';
+	position: absolute;
+	width: 30%;
+	height: 4rpx;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	margin: 0 auto;
+	background-color: #ff6768;
+}
+
+.title {
+	height: 88rpx;
+}
+
+.tab-bd {
+	padding-left: 20rpx;
+	padding-right: 20rpx;
+}
+
+.list {
+	overflow: hidden;
+}
+
+.list-item {
+	background-color: white;
+	margin-top: 20rpx;
+	border-radius: 12rpx;
+	font-size: 28rpx;
+}
+
+.arrow {
+	position: relative;
+}
+
+.arrow::after {
+	font-family: iconfont;
+	content: '\e61f';
+	position: absolute;
+	right: 0;
+	color: #ccc;
+}
+
+.img-container {
+	width: 200rpx;
+	height: 200rpx;
+	flex-shrink: 0;
+	padding-right: 20rpx;
+}
+
+.rmb::before {
+	content: '￥';
+	font-size: 24rpx;
+}
+
+.del {
+	text-decoration: line-through;
+}
+
+.no-more {
+	font-size: 24rpx;
+	line-height: 2;
+	text-align: center;
+	margin-top: 10rpx;
+	color: #ccc;
+}
+
+
+.popup-container {
+	position: fixed;
+	top: 0;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	background-color: rgba(0,0,0,.8);
+}
+
+.popup {
+	background-color: #FFFAE7;
+	position: fixed;
+	left: 50%;
+	top: 50%;
+	transform: translate(-50%, -50%);
+	border-radius: 12rpx;
+	min-width: 600rpx;
+	color: #AF481D;
+}
+
+
+
+.popup-list-item {
+	display: flex;
+	padding: 20rpx;
+}
+
+.popup-list-item .img-container {
+	width: 140rpx;
+	height: 140rpx;
+}
+
+ .popup-title {
+	 font-size: 28rpx;
+	 height: 88rpx;
+ }
 \ No newline at end of file
@@ -656,7 +656,7 @@ Page({
                 })
             }else{
                 th.setData({quan_price:0});
-                if(th.data.using_quan[bn_pick].isby==1){
+                if(th.data.using_quan && th.data.using_quan[bn_pick] && th.data.using_quan[bn_pick].isby==1){
                     var txt="using_quan["+bn_pick+"]";
                     th.setData({[txt]:{}});
                 }
@@ -2529,6 +2529,40 @@ Page({
     },
+    //---------联系客服------------
+    contactService: function() {
+        getApp().getConfig(function(t) {
+            if (t.store_tel == undefined) {
+                getApp().request.get("/api/weshop/store/get/" + os.stoid, {
+                    isShowLoading: 1,
+                    data: {},
+                    success: function(rs) {
+                        getApp().globalData.config = rs.data.data;
+                        if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) {
+                            getApp().my_warnning("商家未设置电话", 0, th);
+                            return false;
+                        }
+                        wx.makePhoneCall({ phoneNumber: rs.data.data.store_tel, })
+                    }
+                })
+            } else {
+                wx.makePhoneCall({ phoneNumber: t.store_tel, })
+            }
+        });
+    },
+
+    //---------联系微信客服------------
+    con_weixin:function () {
+        var url=this.data.sys_switch.weapp_customertype_url;
+        var id=this.data.sys_switch.weapp_customertype_appid;
+        wx.openCustomerServiceChat({
+            extInfo: {url: url},
+            corpId: id,
+            success(res) {}
+        })
+    }
+
+
@@ -647,15 +647,20 @@
 <!-- 客服 -->
 <view class="kefu-container shadow-1">
-    <block wx:if="{{sys_switch.weapp_customertype}}">
-        <button wx:if="{{sys_switch.weapp_customertype}}" class="kefu-btn"
+    <block wx:if="{{sys_switch.weapp_customertype==1}}">
+        <button  class="kefu-btn"
                 open-type="contact"
                 session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
             <text class="iconfont icon-kefu fs60 co-red"></text>
         </button>
     </block>
+
+    <block wx:elif="{{sys_switch.weapp_customertype==2}}">
+        <text bindtap="con_weixin" class="iconfont icon-kefu fs60 co-red"></text>
+    </block>
+
     <block wx:else>
-        <text class="iconfont icon-kefu fs60 co-red"></text>
+        <text  bindtap="contactService" class="iconfont icon-kefu fs60 co-red"></text>
     </block>
 </view>
@@ -3936,7 +3936,7 @@ Page({
         }
         var userInfo = getApp().globalData.userInfo;
-        var pre_data = {store_id: os.stoid, is_end: 0, timetype: 1, isuse: 1, prom_type: 8, prom_id: presell_id};
+        var pre_data = {store_id: os.stoid, is_end: 0, timetype: 1, isuse: 1, prom_type: 8, prom_id: presell_id,pageSize:1000};
         if (userInfo) {
             pre_data.user_id = userInfo.user_id;
         }
@@ -3965,6 +3965,16 @@ Page({
         if (func) {
             func();
         }
+    },
+
+   con_weixin:function () {
+        var url=this.data.sys_switch.weapp_customertype_url;
+        var id=this.data.sys_switch.weapp_customertype_appid;
+        wx.openCustomerServiceChat({
+            extInfo: {url: url},
+            corpId: id,
+            success(res) {}
+        })
     }
 });
@@ -482,10 +482,16 @@
 <!-- -----------------底部按钮------------------ -->
 <view class="join-cart">
   <!-- bindtap="contactService" -->
-  <button wx:if="{{sys_switch.weapp_customertype}}" class="custom-service cart-ico new_split" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
+  <button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
     <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" bindtap="con_weixin">
+    <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" bindtap="contactService">
     <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
     <view>客服</view>
@@ -76,7 +76,7 @@ Page({
     },
     onHide:function(){
       //--清理定时器--
-      clearInterval(this.timer);
+      clearInterval(this.data.timer);
       this.setData({isshow:0});
     },
    //---小于10的格式化函数----
@@ -124,9 +124,12 @@ Page({
         var e = this,th=e, i = "/api/ms/flash_sale/spikepage?page=" + e.data.currentPage;
         var plist=null,alllist=th.data.goodlist;
         if(!alllist) alllist=[];
+        var user_id=getApp().globalData.user_id;
+        if(!user_id) user_id=user_id;
+        var req={store_id:os.stoid,timetype:th.data.type,is_end:0,is_show:1,user_id:user_id};
         await getApp().request.promiseGet(i,
-          {isShowLoading:1,data:{store_id:os.stoid,timetype:th.data.type,is_end:0,is_show:1}}
+          {isShowLoading:1,data:req}
         ).then(res=>{
           plist=res.data.data.pageData;
           console.log("是什么即将开始",plist);
@@ -148,6 +151,8 @@ Page({
         //--循环读取接口---
         for(var i=0;i<plist.length;i++) {
+
+          if( plist[i].user_price)  plist[i].price= plist[i].user_price;
           var prom_id = plist[i].id;
           await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" +
             os.stoid + "/1/" + prom_id, {}
@@ -33,13 +33,13 @@
 <view class="kill-list abs seckill_list"> 
     <view class="kill-item" wx:for="{{goodlist}}" wx:if="{{item.djs.hide}}" >
-        <navigator class="kill-pic rel" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
+        <navigator class="kill-pic rel" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_id={{item.id}}&prom_type=1">
         <image class="abs xc-miaosha" src="{{url}}/miniapp/images/zms.png"></image>
             <image class="wh100" src="{{url+item.original_img}}" data-val="{{item.original_img}}"
                 data-errorimg="goodlist[{{index}}].original_img" binderror="bind_bnerr2" lazy-load="true"></image>
         </navigator>
         <view class="kill-cont">
-            <navigator class="goods-name ellipsis-2" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">{{item.title}}</navigator>
+            <navigator class="goods-name ellipsis-2" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_id={{item.id}}&prom_type=1">{{item.goods_name}}</navigator>
             <view class="flex-vertical xc-strip-frame">
             <view class="xc-strip-blank rel">
@@ -71,9 +71,9 @@
                 </view>
                 <view class="kill-btn ">
-                    <navigator style="background-color: #059de5;"  url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:if="{{type==0}}" >即将开始</navigator>
-                    <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:if="{{item.status==1 && type==1}}">马上抢</navigator>
-                    <navigator class="huise"url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:if="{{item.status==3 && type==1}}">已抢光</navigator>
+                    <navigator style="background-color: #059de5;"  url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_id={{item.id}}&prom_type=1" wx:if="{{type==0}}" >即将开始</navigator>
+                    <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_id={{item.id}}&prom_type=1" wx:if="{{item.status==1 && type==1}}">马上抢</navigator>
+                    <navigator class="huise"url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_id={{item.id}}&prom_type=1" wx:if="{{item.status==3 && type==1}}">已抢光</navigator>
                 </view>
             </view>
         </view>
@@ -120,15 +120,20 @@ Page({
 				}				
 				th.setData({ad_data:narr});				
 			}else{
+
+			    var user_id=getApp().globalData.user_id;
+			    if(!user_id) user_id=0;
+			    var req_d= {
+                    store_id: oo.stoid,
+                    timetype: 2,
+                    is_end: 0,
+                    is_show: 1,
+                    pageSize: 1,
+                    user_id:user_id
+                }
 				//--获取是否又秒杀活动--
 				getApp().request.promiseGet("/api/ms/flash_sale/spikepage", {
-				    data: {
-				        store_id: oo.stoid,
-				        timetype: 2,
-				        is_end: 0,
-				        is_show: 1,
-				        pageSize: 1
-				    },
+				    data:req_d,
 				}).then(res => {
 				    if (res.data.code == 0 && res.data.data && res.data.data.pageData.length > 0) {
 				        th.setData({
@@ -150,6 +155,7 @@ Page({
     },
     //-------------获取购物车列表,要安装门店进行分类订单-----------
     getCardList: function() {
+				
         var th = this;
         //要获取会员是不是等级会员
@@ -185,6 +191,7 @@ Page({
                     th.get_cart();
                     th.get_ser_cart();
                 }
+								
             }
         })
@@ -214,6 +221,7 @@ Page({
                 state:0
             },
             success:async function(su) {
+                console.log(su,10000);
                 //按门店分类的数组
                 var arr = new Array(),
                     carr = su.data.data.pageData;
@@ -302,8 +310,11 @@ Page({
                         if (item.prom_type == 1) {
                             var prom = null;
                             var now = ut.gettimestamp();
-                            await getApp().request.promiseGet("/api/ms/flash_sale/get/" + os.stoid + "/" + item.prom_id, {}).then(res => {
-                                if (res.data.code == 0) prom = res.data.data;
+                            await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + os.stoid +'/'+user_id+ "/" + item.prom_id, {}).then(res => {
+                                if (res.data.code == 0){
+                                    prom = res.data.data;
+                                    prom.price=prom.user_price;
+                                }
                             })
                             //---如果互动都已经过期，或者还未开始，或者无活动
                             if (!prom || prom.is_end == 1 || prom.end_time < now || prom.start_time > now) {
@@ -331,7 +342,18 @@ Page({
                                 })
                                 item.goods_num=cbuy;
                             }
+
+                            //价格不对，就要更新一下
+                            if(good.goods_price!=prom.price){
+                                good.goods_price=prom.price;
+                                //-- 购物车更新秒杀价格 --
+                                var updata1={id: item.id,goods_price:prom.price,store_id:os.stoid,user_id:getApp().globalData.userInfo.user_id };
+                                getApp().request.put("/api/weshop/cart/update", {
+                                    data: updata1,
+                                })
+                            }
                         }
+
                         //--判断优惠活动有没有过期--
                         else if (item.prom_type == 3) {
                             var isok = 1;
@@ -366,9 +388,11 @@ Page({
                             if(!th.data.zuhe_map[item.prom_id]){
                                 //如果有组合购
                                 var isok = 1;
+                                var is_flag=1;
                                 var act=null;
                                 var url="/api/weshop/prom/zhbuy/get/"+os.stoid+"/"+item.prom_id+"/"+getApp().globalData.userInfo.user_id;
                                 await getApp().request.promiseGet(url, {}).then(res => {
+                                    console.log(res,1000);
                                      if(res.data.code==0 && res.data.data){
                                           if(res.data.data.is_show!=1){
                                               isok=0;
@@ -386,12 +410,11 @@ Page({
                                               isok=0;
                                           }
                                           act=res.data.data;
-
+                                          
                                       }else{
-                                          //未找到商品的活动
-                                          isok = 0;
-                                      }
-
+                                         //未找到商品的活动
+                                         is_flag = 0;
+                                     }
                                 })
                                 if (!isok){
                                     var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
@@ -400,7 +423,6 @@ Page({
                                     continue;
                                 }
                                 th.data.zuhe_map[item.prom_id]=act;
-
                                 var url1 = "/api/weshop/prom/zhbuyGoods/page";
                                 var req_data = {
                                     page: 1,
@@ -411,8 +433,17 @@ Page({
                                 await getApp().request.promiseGet(url1, {
                                     data: req_data
                                 }).then(res => {
+                                    console.log(res,2000);
                                     if (ut.ajax_ok(res)) {
                                         var gdlist = res.data.data.pageData;
+                                        gdlist.forEach(i=>{
+                                            if(item.goods_id==i.goods_id&&!is_flag){
+                                                item.prom_type=0;
+                                                item.prom_type1=0;
+                                                item.prom_id=0;
+                                                item.prom_id1=0
+                                            }
+                                        })
                                         th.data.zuhe_map_good[item.prom_id]=gdlist;
                                     }
                                 })
@@ -423,15 +454,21 @@ Page({
                                 var t_item=gdlist.find(function (ele) {
                                     return   ele.goods_id==item.goods_id
                                 })
+                                if(!t_item){
+                                    var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
+                                    getApp().request.delete(url, {});
+                                    th.data.zuhe_map[item.prom_id]=-1;
+                                    continue;
+                                }
                                 item.buyqty=t_item.buyqty;
                                 item.zh_b_num=promgoodsbuynum;
                                 item.act=th.data.zuhe_map[item.prom_id];
-                            }else{
-                                var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
-                                getApp().request.delete(url, {});
-                                th.data.zuhe_map[item.prom_id]=-1;
-                                continue;
-                            }
+                            }//else{
+                            //     var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
+                            //     getApp().request.delete(url, {});
+                            //     th.data.zuhe_map[item.prom_id]=-1;
+                            //     continue;
+                            // }
                         }
                         else if(item.prom_type == 0) {
                             //如果有优惠活动，要更新活动
@@ -538,7 +575,9 @@ Page({
 				   }				   
 				}
-                  
+        // console.log('AAAAAAAAAAAA', all_num); 
+				// getApp().globalData.cartGoodsNum = all_num;
+				
 				th.setData({
                     requestData: arr,
                     all_num: all_num,
@@ -637,7 +676,7 @@ Page({
                     }
                 }
-             
+								// console.log('BBBBBB', all_num);
                 th.setData({
                     service_data: arr,
                     all_num2: all_num,
@@ -748,7 +787,8 @@ Page({
         var a = t.currentTarget.dataset.item;
         var b = t.currentTarget.dataset.pitems;
         a = this.data.requestData[b].goods[a];
-
+				
+				console.log('add+');
         if (a.goods_num<a.store_count) {
             var e = {
                 goods_num: a.goods_num + 1,
@@ -756,6 +796,7 @@ Page({
                 goods_id: a.goods_id,
                 store_id: oo.stoid
             };
+						// console.log('goods_num', e.goods_num);
             this.postCardList(e, t.currentTarget.dataset.item, t.currentTarget.dataset.pitems);
         } else {
             wx.showModal({
@@ -834,7 +875,7 @@ Page({
 			goods_id: a.goods_id,
 			store_id: oo.stoid
 		};
-		this.postCardList_ser(e, t.currentTarget.dataset.item, t.currentTarget.dataset.pitems);
+		// this.postCardList_ser(e, t.currentTarget.dataset.item, t.currentTarget.dataset.pitems);
 	},
 	//-------------减数量---------------------
@@ -1368,6 +1409,9 @@ Page({
                 });
             }
         }
+				
+				// getApp().globalData.cartGoodsNum = all_num;
+				// console.log('CCCCCCC', all_num, getApp().globalData.cartGoodsNum);
         this.setData({
             checkAllToggle: ischeck,
@@ -1382,14 +1426,14 @@ Page({
         var e = this,th=e;
         var user_id = getApp().globalData.user_id;
-        console.log('update');
-        console.log(t);
+        // console.log('update');
+        // console.log('9995959595959',t);
         rq.get("/api/weshop/goods/get/" + oo.stoid + "/" + t.goods_id, {
             isShowLoading: 0,
             async success(d) {
                 var limit = d.data.data.viplimited;
                 var store_count = d.data.data.store_count;
-                var wareIds=d.data.data.erpwareid;
+                var wareIds = d.data.data.erpwareid;
                 var goodsinfo = e.data.requestData[pitem].goods[item];
                 var promgoodsbuynum = 0;
@@ -1412,8 +1456,12 @@ Page({
                         th.setData({[txt]:promgoodsbuynum});
                     }
                     goodsbuynum = buy_num_data.goodsbuynum;
+										
+										
+										// console.log('goodsbuynum===========', goodsbuynum);
                 })
+							
                 var buyed_mum2 = t.goods_num + goodsbuynum;
                 if (buyed_mum2 > limit && limit > 0) {
@@ -1922,7 +1970,7 @@ Page({
                                         //如果会员是等级会员,商品有等级价,且不是活动商品
                                         if (card_field && val[card_field] > 0 &&
-                                            (val.prom_type == 0 || val.prom_type == 3 || val.prom_type == 4 || val.prom_type == 5 || val.prom_type == 7 || normal_arr[val.goods_id])) {
+                                            ((val.prom_type == 0 && g_arr[i].prom_type==0) || val.prom_type == 3 || val.prom_type == 4 || val.prom_type == 5 || val.prom_type == 7 || normal_arr[val.goods_id])) {
                                             if (g_arr[i].goods_price != val[card_field]) {
                                                 isok = 0;
                                                 gname = val.goods_name;
@@ -2069,7 +2117,11 @@ Page({
             var url = '/api/weshop/cart/delIds/' + oo.stoid + '/' + user_id + "/" + glist;
             getApp().request.delete(url, {
                 success: function(t) {
+									// console.log('del done1111111111');
                     th.getCardList();
+										getApp().requestCardNum(th);
+										// console.log('all================', th.data.all_num);
+										// getApp().globalData.cartGoodsNum = 
                 }
             });
         }
@@ -2080,10 +2132,12 @@ Page({
             getApp().request.delete(url, {
                 success: function(t) {
                     th.getCardList();
+										getApp().requestCardNum(th);
+										console.log('all2================', th.data.all_num);
                 }
             });
         }
-
+				
     },
     //跳到首页
     goto: function(e) {  
@@ -2351,6 +2405,28 @@ Page({
     go_url(e){
         var url=e.currentTarget.dataset.url;
         getApp().goto(url);
+    },
+
+    //跳转到商品
+    go_gd:function (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
+        };
+        //获取秒杀的多规格
+        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);
+            }
+        })
     }
 });
 \ No newline at end of file
@@ -56,7 +56,6 @@
         <view class="shmd_m">
           <!-- 门店 -->
           <!--<radio color="red" bindtap="check_th_all_item" class="order-raido flex-center" checked="{{checkAllToggle||item.selected}}" data-pitems="{{pidx}}"></radio>-->
-
           <icon wx:if="{{checkAllToggle||item.selected}}" class="order-raido flex-center"  bindtap="check_th_all_item" data-pitems="{{pidx}}"
                   color="red" size="20" type="success"></icon>
           <view  wx:else class="icon_no_sele2" bindtap="check_th_all_item" data-pitems="{{pidx}}"></view>
@@ -77,7 +76,7 @@
           </block>
           <block wx:else><view class="order-raido flex-vertical " style="width: 45rpx"></view></block>
-          <navigator class="goods-img rel" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{items.goods_id}}">
+          <navigator class="goods-img rel" bindtap="go_gd" data-gd="{{items.goods_id}}">
             <image class="wh100" src="{{items.original_img}}" binderror="bind_bnerr2" data-errorimg="requestData[{{pidx}}].goods[{{idx}}].original_img" data-url="{{items.original_img}}"></image>
             <block wx:if="{{items.is_gift}}">
                <view style="background-color:red" class="abs flex-center fs26" wx:if="{{items.is_gift==1}}">赠品</view>
@@ -91,8 +90,7 @@
             <block wx:if="{{items.prom_type==7}}">
                 <block wx:if="{{items.selected}}">
                     <!-- 主要显示限购 -->
-                    <text wx:if="{{items.buyqty>0 && items.zh_b_num>0}}" class="abs2">活动剩余可购{{items.buyqty-items.zh_b_num>0?items.buyqty-items.zh_b_num:0}}件</text>
-                    <text wx:elif="{{items.zhqty>items.goods_num}}" class="abs2">还需购买{{items.zhqty-items.goods_num}}件</text>
+                    <text wx:if="{{items.zhqty>items.goods_num}}" class="abs2">还需购买{{items.zhqty-items.goods_num}}件</text>
                 </block>
                 <block wx:else>
                    <text wx:if="{{items.zhqty}}" class="abs2">需购买{{items.zhqty}}件</text>
@@ -103,7 +101,7 @@
           </navigator>
           <view class="goods-cont">
             <view class="goods-name">
-              <navigator class="ellipsis-2 fs30" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{items.goods_id}}">{{items.goods_name}}</navigator>
+              <navigator bindtap="go_gd" class="ellipsis-2 fs30" data-gd="{{items.goods_id}}">{{items.goods_name}}</navigator>
               <view class="specifications  ellipsis-1">
                 <view  wx:if="{{items.goods_color || items.goods_spec}}">
@@ -113,6 +111,7 @@
               <block wx:if="{{items.is_gift}}">
                 <view>{{items.goods_num}}件</view>
               </block>
+              <view wx:if="{{items.buyqty>0}}" class="fs22 ml10 c-7b">组合限购{{items.buyqty}}件</view>
             </view>
@@ -124,6 +123,7 @@
                 <view wx:if="{{items.is_offline}}" class="quan_color flex ai-center"><text>券后 ￥{{g_filter.toFix(items.offline_price,2)}}</text></view>
+
               </view>
               <view class="count">
                 <view bindtap="{{items.goods_num <= 1 ? '':'subNum'}}" class="sub fs28 {{items.goods_num <= 1 ? 'active':''}}" data-pitems="{{pidx}}" data-item="{{idx}}">一</view>
@@ -124,6 +124,7 @@ Page({
         in_zhact_gdmap:{}, //不同门店参与同一活动的限购
         hid_inp:1,
         user_note:{},
+        zuhe_map_good:{},
     },
     onLoad: function (t) {
         wx.setNavigationBarTitle({title: "填写订单",})
@@ -289,7 +290,6 @@ Page({
             }
         }, 1);
-
         //值在这里换
         getApp().globalData.plus_buy_back = 0;
     },
@@ -454,6 +454,7 @@ Page({
                     //要把组合购的东西拿出来算一下
                     if (item1.prom_type == 7) {
                         var isok = 1;
+                        var is_flag=1;
                         //如果有组合购
                         var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + item1.prom_id+'/'+getApp().globalData.userInfo.user_id;
                         await getApp().request.promiseGet(url, {}).then(res => {
@@ -465,25 +466,45 @@ Page({
                                 if (ut.gettimestamp() > res.data.data.end_time) {
                                     isok = 0;
                                 }
+                                item1.act = res.data.data;
                             } else {
                                 //未找到商品的活动
-                                isok = 0;
+                                is_flag = 0;
                             }
-                            item1.act = res.data.data;
                         })
-
                         if (!isok) {
                             getApp().my_warnning("组合购的活动已经过期", 0, th);
                             return false;
                         }
-
+                        var url1 = "/api/weshop/prom/zhbuyGoods/page";
+                        var req_data = {
+                            page: 1,
+                            pageSize: 2000,
+                            store_id: os.stoid,
+                            zh_id: item1.prom_id,
+                        }
+                        await getApp().request.promiseGet(url1, {
+                            data: req_data
+                        }).then(res => {
+                            if (ut.ajax_ok(res)) {
+                               var gdlist = res.data.data.pageData;
+                                gdlist.forEach(i=>{
+                                    if(item1.goods_id==i.goods_id&&!is_flag){
+                                        item1.prom_type=0;
+                                        item1.prom_type1=0;
+                                        item1.prom_id=0;
+                                        item1.prom_id1=0
+                                    }
+                                })
+                                th.data.zuhe_map_good[item1.prom_id]=gdlist; 
+                            }
+                        })
                     }
                 }
                 //在分组的时候，就不要再调用接口，await
                 for (var i = 0; i < carr.length; i++) {
                     var item = carr[i];
-
                     //-- 如果是等级会员注册返回 --
                     if (is_card_back) {
                         th.data.card_name = th.data.userinfo.card_field;
@@ -667,22 +688,26 @@ Page({
                     //存储不同活动的商品列表
                     u_item.zh_prom_goods = {};
                     for (let var1 in obj) {
-                        var h_item = obj[var1];
-                        var gdlist = null;
-                        var url1 = "/api/weshop/prom/zhbuyGoods/page";
-                        var req_data = {
-                            page: 1,
-                            pageSize: 2000,
-                            store_id: os.stoid,
-                            zh_id: h_item.prom_id,
-                        }
-                        await getApp().request.promiseGet(url1, {
-                            data: req_data
-                        }).then(res => {
-                            if (ut.ajax_ok(res)) {
-                                gdlist = res.data.data.pageData;
-                            }
-                        })
+                        var h_item=obj[var1];
+				   	    var gdlist= th.data.zuhe_map_good[h_item.prom_id];
+						//获取活动需要的商品列表
+						// u_item.zh_prom_goods[h_item.prom_id]=gdlist;
+                        // var h_item = obj[var1];
+                        // var gdlist = null;
+                        // var url1 = "/api/weshop/prom/zhbuyGoods/page";
+                        // var req_data = {
+                        //     page: 1,
+                        //     pageSize: 2000,
+                        //     store_id: os.stoid,
+                        //     zh_id: h_item.prom_id,
+                        // }
+                        // await getApp().request.promiseGet(url1, {
+                        //     data: req_data
+                        // }).then(res => {
+                        //     if (ut.ajax_ok(res)) {
+                        //         gdlist = res.data.data.pageData;
+                        //     }
+                        // })
                         //获取活动需要的商品列表
                         u_item.zh_prom_goods[h_item.prom_id] = {gdlist: gdlist, act: h_item.act};
                     }
@@ -780,6 +805,10 @@ Page({
                         }
                     }
+                  
+                        gd.prom_type=gg.prom_type;
+                        gd.prom_id=gg.prom_id;
+                   
                     switch (gd.prom_type) {
                         case 0:
                         case 2:
@@ -948,22 +977,23 @@ Page({
                             break;
                         case 1: //---秒杀-----
                             var quanlist = null;
-                            getApp().request.get("/api/weshop/activitylist/getSJGoodsPrice/" + gd.store_id
-                                + "/" + gd.goods_id + "/1/" + gd.prom_id, {
+                            getApp().request.get("/api/weshop/activitylist/getSJGoodsPriceNew/" + gd.store_id
+                                + "/" + gd.goods_id + "/1/" + gd.prom_id+"/"+app.globalData.user_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.prom_price;
+                                        t.data.data.shop_price = tt.data.data.prom_user_price;
+                                        th.data.ckeck_quan_price=0;
                                     } else {
                                         t.data.data.prom_id = 0;
                                         t.data.data.prom_type = 0;
-
                                         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 + "";
                                     }
                                     th.setData({
-                                        bn_goods: t.data.data,
+                                        bn_goods: gd,
                                         bn_pickname: gg.pick_name,
                                         bn_exp_type: et,
                                         index: m_wind,
@@ -3810,6 +3840,11 @@ Page({
         var index = e.currentTarget.dataset.index;
         var txt = "cartlist[" + index + "].focus";
         this.setData({[txt]:0})
+    },
+
+    go_url:function (e) {
+        var url = e.currentTarget.dataset.url;
+        getApp().goto(url);
     }
@@ -78,26 +78,21 @@
 				</view>
 				<view class="order-detail" wx:for="{{item.goods}}" wx:for-index="idx" wx:for-item="items">
 					<!----商品图片----->
-					<view class="goods-img" style="position: relative">
+					<view class="goods-img" style="position: relative; overflow: hidden" bindtap="go_url" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{items.goods_id}}&prom_type={{items.prom_type}}&prom_id={{items.prom_id}}">
 						<image wx:if="{{items.is_gift}}" src="{{imgUrl}}/miniapp/images/giveaway.png" class="gift_image"></image>
+						<text class="zuhe" wx:if="{{items.prom_type==7}}">组合购</text>
 						<image class="wh100 bdr14" src="{{items.original_img}}" binderror='cart_set_err' data-err='cartlist[{{pidx}}].goods[{{idx}}].original_img'></image>
 					</view>
 					<!----商品名称规格---->
-					<navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{items.goods_id}}">
+					<navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{items.goods_id}}&prom_type={{items.prom_type}}&prom_id={{items.prom_id}}" >
 						<view class="goods-name ellipsis-2">{{items.goods_name}}</view>
 						<!-- 商品属性 -->
 						<view class="flex-vertical fs28 color-gray n_guige">
 							<view class="goods-color">
 								<block><text>{{filters.show_gui_ge(items.goods_spec,items.goods_color)}}</text></block>
-								<!--<block wx:if="{{!items.goods_spec && !items.goods_color}}"><text>规格1</text></block>-->
-								<!--<block wx:else>-->
-								<!--<text wx:if="{{items.goods_spec!=''}}">{{items.goods_spec}}<text wx:if="{{items.goods_color}}">/</text></text>-->
-								<!--<text wx:if="{{items.goods_color}}">{{items.goods_color}}</text>-->
-								<!--</block>-->
 							</view>
 						</view>
-
 						<!-----商品名称规格------>
 						<view class="order-num flex-space-between">
 							<view class="co-red">￥<text class="fs36">{{filters.toFix(items.goods_price,2)}}</text></view>
@@ -255,10 +250,10 @@
 				<!-- <view>门店：{{bn_pickname}}</view> -->
 			</view>
 			<view class="order-detail">
-				<view class="goods-img">
+				<view class="goods-img" bindtap="go_url" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{bn_goods.goods_id}}&prom_type={{bn_goods.prom_type}}&prom_id={{bn_goods.prom_id}}">
 					<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}}">
+				<navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{bn_goods.goods_id}}&prom_type={{items.prom_type}}&prom_id={{items.prom_id}}">
 					<view class="goods-name ellipsis-2">{{bn_goods.goods_name}}</view>
 					<!-- 商品属性 -->
 					<view class="flex-vertical fs28 xc-ash color-gray n_guige">
@@ -19,9 +19,6 @@
 	box-shadow: 16rpx 0px 12px #e7e9eb;
 }
-
-
-
 page {
 	/* background-color: #FAFAFA; */
 	background-color: #F0F0F0;
@@ -995,3 +992,16 @@ margin-left: 20rpx;
   top:36rpx
 }
+.zuhe {
+    width: 140rpx;
+    text-align: center;
+    height:40rpx;
+    position: absolute;
+    top: 15rpx;
+    left: -37rpx;
+    transform: rotate(-45deg);
+    background-color: rgb(255,0,0);
+    font-size:22rpx;
+    color: #fff;
+    line-height: 37rpx;
+}
@@ -193,6 +193,11 @@ module.exports = {
                         new_g.prom_type = 0;
                         new_g.prom_id = 0;
                         goods.push(new_g);
+
+                        //如果商品的数量已经为空了
+                        if(goods[idx].goods_num<=0){
+                            goods.splice(idx,1);
+                        }
                     }
                 }
@@ -148,5 +148,18 @@ onShareAppMessage: function (e) {
   }
 },
+	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,
+		}
+	},
+
 });
 \ No newline at end of file
@@ -52,7 +52,7 @@ Page({
     currentPage: 1,
     allData: null,
     openFilterModal: !1,
-    baseUrl: "api/weshop/goods/page?1=1&cat_id=1&parent_id=0&orderField=goods_id&orderType=desc&page=1&is_mainshow=1&isonsale=1&store_id="+oo.stoid+"&is_recommend=1",
+    baseUrl: "api/weshop/goods/page?1=1&cat_id=1&parent_id=0&orderField=sort&orderType=asc&page=1&is_mainshow=1&isonsale=1&store_id="+oo.stoid+"&is_recommend=1",
     requestUrl: "",
     tabname: "goods_id",   //排序的字段
     adname: "desc",        //升降的字段
@@ -791,7 +791,7 @@ Page({
     var that = this;
     that.data.requestUrl = t;
     e.get("/api/weshop/goods/page?1=1", {
-      data: { page: that.data.stylePage, cat_id: that.data.cat_id, parent_id: 0, orderField: 'goods_id', orderType: 'desc', is_mainshow: 1, isonsale: 1, store_id: oo.stoid, is_recommend: 1 },
+      data: { page: that.data.stylePage, cat_id: that.data.cat_id, parent_id: 0, orderField: 'sort', orderType: 'asc', is_mainshow: 1, isonsale: 1, store_id: oo.stoid, is_recommend: 1 },
       success: function (data) {
         console.log(data.data.data.pageData)
         that.setData({
@@ -853,7 +853,7 @@ Page({
     console.log("page:=" + page)
     var s = this
     e.get("/api/weshop/goods/page?1=1", {
-      data: { page: page, cat_id: cid, parent_id: 0, orderField: 'goods_id', orderType: 'desc', is_mainshow: 1, isonsale: 1, store_id: oo.stoid, is_recommend: 1 },
+      data: { page: page, cat_id: cid, parent_id: 0, orderField: 'sort', orderType: 'asc', is_mainshow: 1, isonsale: 1, store_id: oo.stoid, is_recommend: 1 },
       success: function (e) {
         console.log(e.data.data.pageData)
         s.setData({
@@ -8,7 +8,20 @@ function format_tt(ts) {
            var fm=(d.getMonth()+1)+"月"+ d.getDate()+"日";
            return fm;
 }
+
+function act_type(ty){
+   switch(ty){
+   case 1: return '秒杀';
+   case 2: return '团购';
+   case 4: return '积分购';
+   case 6: return '拼单';
+   case 7: return '组合购';
+   case 8: return '预售';
+   }
+}
+
 module.exports = {
   is_has: is_has,
-  format_tt:format_tt
+  format_tt:format_tt,
+  act_type:act_type
 }
@@ -255,15 +255,20 @@ Page({
   //------初始化加载----------
   onLoad: function (t) {
-
-
     var ee = this,
       that = ee,
       th = ee,
       gid = t.goods_id,
       first_leader = t.first_leader,
       room_id = t.room_id,
-      room_user_share = t.room_user_share; //如果是会员分享带有room_id的话，那么接下来会员分享就不传room_id
+      room_user_share = t.room_user_share, //如果是会员分享带有room_id的话，那么接下来会员分享就不传room_id
+      prom_type=t.prom_type,
+      prom_id=t.prom_id;  //活动ID
+
+      if(prom_type){
+        this.data.prom_type=prom_type;
+        this.data.prom_id=prom_id;
+      }
     //-- 自定义海报 --
     getApp().request.promiseGet("/api/weshop/goods/poster/page", {
@@ -300,6 +305,17 @@ Page({
       var gid_str = decodeURIComponent(t.scene);
       gid_str = gid_str.split("_");
       gid = gid_str[0];
+      if(gid.indexOf('.')!=-1){
+          var fir_arr=gid.split(".");
+          gid=fir_arr[0];
+          prom_type=fir_arr[1];
+          prom_id=fir_arr[2];
+          this.data.prom_type=prom_type;
+          this.data.prom_id=prom_id;
+      }
+
+
+
       if (gid_str.length > 1) {
         first_leader = gid_str[1];
       }
@@ -435,9 +451,6 @@ Page({
         if (th.data.fir_goods) var g_distr_type = th.data.fir_goods.distr_type;
         //--如果默认门店的配送方式不对，就不能被选择，这里不控制，如果不一样，就说明配送方式不对--
         if (ee.distr_type != 0 && g_distr_type != 0 && ee.distr_type != g_distr_type) {
-          //th.data.fir_def_store={}; //赋值空对象
-          //return false;
-          //th.data.fir_def_store.is_no_dis=1;
           ee.is_no_dis = 1;
         }
@@ -452,15 +465,7 @@ Page({
           if (that.data.lat != null) {
             //如果经纬度有变化的话
             if (e && appd.lat == that.data.lat && appd.lon == that.data.lon && e.distance > 0) {
-              //that.data.fir_def_store=e;
-              // that.setData({
-              //   def_pick_store: e,
-              //   sto_sele_name: e.pickup_name,
-              //   sto_sele_id: e.pickup_id,
-              //   sto_sele_distr: e.distr_type
-              // })
               that.set_def_storage(e);
-
             } else {
               //要用接口是获取距离，js的计算不准
               getApp().request.promiseGet("/api/weshop/pickup/list", {
@@ -471,13 +476,6 @@ Page({
                   if (e) {
                     e.is_no_dis = ee.is_no_dis;
                     appd.pk_store = e;
-                    // that.data.fir_def_store=e;
-                    // that.setData({
-                    //   def_pick_store: e,
-                    //   sto_sele_name: e.pickup_name,
-                    //   sto_sele_id: e.pickup_id,
-                    //   sto_sele_distr: e.distr_type
-                    // })
                     that.set_def_storage(e);
                   }
@@ -491,13 +489,6 @@ Page({
           } else {
             if (e) {
               e.distance = null;
-              // that.data.fir_def_store=e;
-              // that.setData({
-              //   def_pick_store: e,
-              //   sto_sele_name: e.pickup_name,
-              //   sto_sele_id: e.pickup_id,
-              //   sto_sele_distr: e.distr_type
-              // })
               that.set_def_storage(e);
             }
           }
@@ -614,7 +605,7 @@ Page({
     }).then(res => {
       var t = res;
       var data = t.data.data.pageData;
-      if (data.length > 0) {
+      if (data && data.length > 0) {
         //ee.setData({ is_collect: 1, collect_id: data[0].collect_id, });
         is_collect = 1;
         collect_id = data[0].collect_id;
@@ -671,7 +662,7 @@ Page({
       }
     }
-    if (th.data.is_closecoupon != 1) {
+    if (th.data.is_closecoupon != 1 && (!th.data.fir_quan || th.data.fir_quan.length<=0)) {
       //----获取详情页的券的数量----
       await getApp().request.promiseGet("/api/weshop/prom/coupon/pageCouponList", {
         data: {
@@ -790,7 +781,7 @@ Page({
           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.userInfo.user_id;
+              t.data.data.prom_id + "/" + getApp().globalData.user_id;
             getApp().request.get(url, {
               success: function (e) {
                 if (e.data.code == 0 && e.data.data) {
@@ -809,7 +800,8 @@ Page({
           //-- 把商品的赋值 --
           ee.data.fir_goods = JSON.parse(JSON.stringify(t.data.data));
-          ee.check_is_youhui(ee.data.gid);
+          if(ee.data.prom_type!=1 && ee.data.prom_type!=4  && ee.data.prom_type!=6)
+              ee.check_is_youhui(ee.data.gid);
           t.data.data.on_time = ut.formatTime(t.data.data.on_time, 'yyyy-MM-dd hh:mm:ss');
@@ -835,6 +827,11 @@ Page({
           a.wxParse("content", "html", t.data.data.goods_content, ee, 6);
           e.wxParseAddFullImageUrl(ee, "content");
+          if(ee.data.prom_type){
+            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,
@@ -848,43 +845,15 @@ Page({
             if (that.data.sales_rules == 2 && that.data.is_newsales_rules) {
               //获取门店
               ee.get_sto();
-              //--等待某个值只运行---,这里有可能因为导航的时间太久，而不能计算门店库存
-              /*---
-                    getApp().waitfor2(that,"wait_for_user_store","fir_def_store",function(){
-                      if(th.data.fir_def_store && th.data.fir_def_store.pickup_id ){
-                        var lock=0,plist=null;
-                        //先读取门店的lock,采用链式写法，少用await
-                        getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
-                          data:{store_id:os.stoid,wareId:ee.data.data.goods_id,storageId:that.data.fir_def_store.pickup_id,pageSize:1000}
-                        }).then(res=>{
-                          if(res.data.code==0 && res.data.data.total>0){
-                            for(var i in res.data.data.pageData)
-                              lock+=res.data.data.pageData[i].outQty
-                          }
-                          //---通过接口获取门店的线下库存信息--
-                          return  getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
-                            data:{storageNos:that.data.fir_def_store.pickup_no,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid}
-                          })
-                        }).then(res=>{
-                          if(res.data.code==0 && res.data.data.total>0){
-                            plist=res.data.data.pageData[0];
-                          }
-                          if(plist && plist.CanOutQty-lock>0){
-                            that.data.fir_def_store.CanOutQty=plist.CanOutQty-lock;
-                          }else{
-                            that.data.fir_def_store.CanOutQty=0;
-                          }
-                          //--给门店赋值线下库存--
-                          th.setData({def_pick_store:that.data.fir_def_store});
-                        })
-                      }
-                    })--*/
+
             } else {
               //获取门店
               ee.get_sto();
             }
             ee.get_sku(o.stoid, t.data.data, gid);
+            ee.check_has_flash();
+
           }
           else {
             var gg = "", item = t.data.data;
@@ -1260,6 +1229,8 @@ Page({
         goods_name: o.goods_name,
         goods_sn: o.goods_sn,
         sku: o.sku,
+        prom_id:th.data.sele_g.prom_id,
+        prom_type:th.data.sele_g.prom_type,
       };
       //---是不是从收藏夹出来的---
@@ -1428,7 +1399,7 @@ Page({
   add_cart_next(e, t, a, o, newd, CanOutQty) {
     var th = this, i = getApp().request;
     //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------
-    if (o.prom_type != 1 && ((o.prom_type != 6 && o.prom_type != 4) || th.data.is_normal)) {
+    if ((o.prom_type != 1 || o.prom_id<=0) && ((o.prom_type != 6 && o.prom_type != 4) || th.data.is_normal)) {
       var conf = th.data.bconfig;
       if (conf.switch_list && getApp().globalData.userInfo['card_field'] && getApp().globalData.userInfo['card_expiredate']) {
         var s_list = JSON.parse(conf.switch_list);
@@ -1850,17 +1821,33 @@ Page({
       return false;
     }
-    var ind = t.currentTarget.dataset.ind;
+    if(th.data.more_flash && open_store==1){
+       th.setData({is_pop_more:1});
+    }else{
+        var ind = t.currentTarget.dataset.ind;
+        //回调。判断是不是优惠促销
+        th.check_is_prom_goods(function () {
+            th.setData({
+                openSpecModal: !0,
+                openSpecModal_ind: ind,
+            });
+            //var is_open=th.data.config
+            th.get_off_price();
+        })
+    }
+  },
-    //回调。判断是不是优惠促销
-    th.check_is_prom_goods(function () {
-      th.setData({
-        openSpecModal: !0,
-        openSpecModal_ind: ind,
-      });
-      //var is_open=th.data.config
-      th.get_off_price();
-    })
+  open_next(){
+      var th=this;
+      //回调。判断是不是优惠促销
+      th.check_is_prom_goods(function () {
+          th.setData({
+              openSpecModal: !0,
+              openSpecModal_ind: 1,
+              is_pop_more:0
+          });
+          th.get_off_price();
+      })
   },
   //判断是不是优惠促销
@@ -2130,13 +2117,13 @@ Page({
   onShareAppMessage: function (t) {
     var th = this;
-    var price = th.data.data.shop_price;
+    var price = th.data.sele_g.shop_price;
     if (th.data.prom_act) {
       price = th.data.prom_act.price;
     }
-    var title = th.data.data.goods_name;
-    var img = th.data.data.original_img;
+    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;
@@ -2147,14 +2134,15 @@ Page({
     }
-    var url = "/pages/goods/goodsInfo/goodsInfo?goods_id=" + th.data.gid;
+    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.data.goods_id == getApp().globalData.room_goods_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";
@@ -2185,6 +2173,8 @@ Page({
       ob.title = text + " " + name;
     }
+    //-- 页面不能刷新 --
+    this.data.show_prew_img=1;
     return ob;
   },
@@ -2266,6 +2256,9 @@ Page({
 	       case 8:		
 		     continue;
+          case 8:
+             continue;
+
         }
@@ -2347,10 +2340,8 @@ Page({
     });
-
     that.check_is_youhui(gid, that.data.is_normal);
-    var ty = 0;
     this.get_sto(that.data.is_normal);
@@ -2391,11 +2382,14 @@ Page({
   async sele_spec_chech_activity() {
     //---如果是活动的时候---
     var prom = null, goodsinfo = this.data.sele_g, th = this;
+    var user_id=getApp().globalData.user_id;
+    if(!user_id) user_id=0;
     if (goodsinfo.prom_type == 1) {
-      await getApp().request.promiseGet("/api/ms/flash_sale/get/" + os.stoid + "/" + goodsinfo.prom_id, {
+      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 = res.data.data;
+            prom.price=prom.user_price;
         }
       })
     }
@@ -2420,16 +2414,53 @@ Page({
     //----------如果有活动，并且在进行中，就不计算线下库存---------------
     var now = ut.gettimestamp();
     if (prom) {
-      if (prom.is_end == 0 && prom.end_time > now && prom.start_time < now) {
+
+      var t1=prom.start_time;
+      var prom_st=1;
+      if(prom.show_time){
+          t1=prom.show_time;
+          if(prom.start_time>now) prom_st=0;
+      }
+      if (prom.is_end == 0 && prom.end_time > now && t1 < now) {
         th.setData({
           prom_type: goodsinfo.prom_type,
           prom_price: prom.price,
           prom_buy_limit: prom.buy_limit,
           prom_end_time: prom.end_time,
           prom_start_time: prom.start_time,
-          prom_st: 1,
+          prom_st: prom_st,
+          prom_act: prom,
+          prom_id:prom.id
         })
-        return false;
+
+          //却换图片
+          th.init(goodsinfo.goods_id);
+          var newTime = ut.gettimestamp();
+          var endTime2 = prom.end_time;
+          var endTime1 = prom.start_time;
+
+          this.data.is_timer=0;
+
+          setTimeout(function () {
+              th.data.is_timer=1;
+              if (endTime1 > newTime) {
+                  th.setData({
+                      prom_time_text: '距秒杀开始还有'
+                  })
+                  th.countDown(endTime1, 0);
+              } else {
+                  if (endTime2 > newTime) {
+                      th.setData({
+                          prom_time_text: '距秒杀结束还有',
+                          prom_st: 1
+                      })
+                      th.countDown(endTime2);
+                  }
+              }
+
+          },1000)
+
+          return false;
       }
     }
     //---设置普通商品---
@@ -2487,13 +2518,6 @@ Page({
       if (!th.data.def_pick_store && th.data.fir_def_store) {
         th.setData({ def_pick_store: th.data.fir_def_store });
       }
-
-      /*--最新的，不用这里筛选配送方式
-        if(th.data.def_pick_store && g_distr_type!=0 && th.data.def_pick_store.distr_type!=0 && th.data.def_pick_store.distr_type!=g_distr_type ){
-          th.setData({def_pick_store:null});
-        }--*/
-
-
       wx.showLoading({
         title: '加载中.'
       });
@@ -2859,9 +2883,7 @@ Page({
   //------隐藏取货门店2级----
   hide_sec_mend: function () {
-    this.setData({
-      is_sec_mend: 0,
-    });
+    this.setData({ is_sec_mend: 0, });
   },
   //评论的调用
@@ -2875,7 +2897,7 @@ Page({
       parent_id: 0, goods_id: th.data.gid, commenttype: tp,
     }
     if (getApp().globalData.userInfo) {
-      req_where.userId = getApp().globalData.userInfo.user_id;
+      req_where.userId = getApp().globalData.user_id;
     }
     var rs_data = null;
@@ -2943,19 +2965,32 @@ Page({
   //--------检查是否活动，活动是否开始，或者是否结束-------
   async check_prom(gid, prom_type, prom_id) {
-    var ee = this,
-      th = ee;
+    var ee = this,th = ee;
+    var user_id=getApp().globalData.user_id;
+    if(!user_id) user_id=0;
+
     if (prom_type == 3 || prom_type == 0 || prom_type == 2 || prom_type == 5 || prom_type == 7) {
       this.setData({
-        prom_type: 0,
-        isshow: 1,
+        prom_type: 0,isshow: 1,
       });
       return false;
     }
+    if (prom_type == 1 && prom_id==0){
+        this.setData({
+            prom_type: 0,isshow: 1,
+        });
+
+        //获取门店
+        this.get_sto();
+        this.get_sku(o.stoid, this.data.data, gid);
+        this.check_has_flash();
+        return false;
+    }
+
     //if (prom_type != 3 && prom_type!=0){
     //---判断秒杀----
-    if (prom_type == 1) {
+    if (prom_type == 1 && prom_id>0) {
       //-------判断活动是否抢光---------
       await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/" + prom_type + "/" + prom_id, {
         1: 1
@@ -2967,8 +3002,7 @@ Page({
             prom_r_null: 1
           });
           //拿取价格并且判断时间--
-          getApp().request.get("/api/ms/flash_sale/get/" +
-            os.stoid + "/" + prom_id, {
+          getApp().request.get("/api/ms/flash_sale/getNew/" +os.stoid + "/" +user_id+"/"+ prom_id, {
             success: function (t) {
               if (t.data.code != 0) {
                 ee.setData({
@@ -3015,7 +3049,7 @@ Page({
               var prom_start_time = ut.formatTime(t.data.data.start_time, "yyyy-MM-dd hh:mm:ss");
               ee.setData({
-                prom_price: t.data.data.price,
+                prom_price: t.data.data.user_price,
                 prom_type: 1,
                 prom_id: prom_id,
                 prom_buy_limit: t.data.data.buy_limit,
@@ -3026,17 +3060,9 @@ Page({
               });
               ee.get_sto();
-
-
               var newTime = ut.gettimestamp();
               var endTime2 = t.data.data.end_time;
               var endTime1 = t.data.data.start_time;
-
-              //---苹果机不兼容---
-              /*----
-              var endTime2 = new Date(prom_end_time).getTime();
-              var endTime1 = new Date(prom_start_time).getTime();----*/
-
               if (endTime1 > newTime) {
                 ee.setData({
                   prom_time_text: '距秒杀开始还有'
@@ -3051,6 +3077,56 @@ Page({
                   ee.countDown(endTime2);
                 }
               }
+
+              //如果是进行中的话
+              if (endTime1 < newTime) {
+                  //-- 获取秒杀活动的多少规格 --
+                  ee.get_more_flahs(function (list) {
+                      if (list && list.length > 1) {
+
+                          var n_item = list[0];
+                          var ind = list.findIndex(function (ele) {
+                              return ele.goods_id == ee.data.data.goods_id;
+                          })
+                          if (ind < 0) return false;
+                          if (ind > 0) {
+                              n_item = JSON.parse(JSON.stringify(list[ind]));
+                              list.splice(ind, 1);
+                              list.unshift(n_item);
+                          }
+
+                          ee.data.sele_g.viplimited = n_item.viplimited;
+                          ee.data.data.viplimited = n_item.viplimited;
+
+                          var gb = 1;
+                          //-- 显示多规格 --
+                          for (let i in list) {
+                              let item = list[i];
+                              var gg = "";
+                              if (item.goods_spec == "null" || item.goods_spec == null) item.goods_spec = "";
+                              if (item.goods_color == "null" || item.goods_color == null) item.goods_color = "";
+
+                              if (item.goods_spec != "" && item.goods_color != "") {
+                                  gg = item.goods_spec + "/" + item.goods_color;
+                              } else if (item.goods_spec != "" || item.goods_color != "") {
+                                  gg = item.goods_spec + item.goods_color;
+                              } else {
+                                  gg = "规格" + gb;
+                                  gb++;
+                              }
+                              item.gg = gg;
+                              item.prom_id = item.prom_id;
+                              item.prom_type = 1;
+                          }
+
+                          ee.setData({
+                              sku_g: list,
+                          });
+
+                      }
+                  })
+              }
+
             }
           });
         }
@@ -3106,7 +3182,6 @@ Page({
     }
-
     //---判断拼单----
     if (prom_type == 6) {
       //-------判断活动是否抢光---------
@@ -3454,6 +3529,12 @@ Page({
         success: function (t) {
           if (t.data.code == 0) {
             var g_buy_num = t.data.data.goodsbuynum;
+			
+			//如果是秒杀的时候
+			if(th.data.prom_type==0 && gd.prom_type == 1 ){
+				gd.prom_type= 0;
+			}
+			
             if (gd.prom_type == 1 || gd.prom_type == 2 || gd.prom_type == 4 || gd.prom_type == 6) {
               //----获取活动购买数----
               getApp().request.get("/api/weshop/ordergoods/getUserBuyGoodsNum", {
@@ -4116,6 +4197,95 @@ Page({
       }
     })
   },
+	
+	
+	drawPoster(context, unit, img, vpath) {
+			// 1.灰色背景
+			context.setFillStyle('#f2f1f6');
+			context.rect(0,0,554*unit,899*unit);
+			context.fill();
+			// 2.商城名称
+			let shopName = this.data.sto_sele_name_1;
+			// let shopNameLen = context.measureText(shopName);
+			// let x_shopNameLen = (554 - shopNameLen.width)/2*unit;
+			// console.log('11111111111111',shopNameLen,x_shopNameLen);
+			context.setTextAlign('center');
+			context.setFontSize(26*unit);
+			context.setFillStyle('black');
+			context.fillText(shopName, 277*unit, 60*unit);
+			// // 3.推荐来源
+			let fromText = `来自${getApp().globalData.userInfo.nickname}的推荐`;
+			// let fromTextLen = context.measureText(fromText);
+			// let x_fromText = (375 - fromTextLen.width)/2;
+			// console.log('222222',fromTextLen,x_fromText);
+			context.setTextAlign('center');
+			context.setFontSize(22*unit);
+			context.setFillStyle('#96959a');
+			context.fillText(fromText, 277*unit, 105*unit);
+			// 4.海报背景
+			// context.beginPath();
+			// context.setStrokeStyle('#f2f1f6');
+			context.setFillStyle('white');
+			context.fillRect(37*unit, 157*unit, 480*unit, 673*unit);
+			// context.stroke();
+			// context.fill();
+			// 5.商品图片
+			// 图片的x坐标
+			let bg_x = 37*unit
+			// 图片的y坐标
+			let bg_y = 157*unit
+			// 图片宽度
+			let bg_w = 480*unit
+			// 图片高度
+			let bg_h = 474*unit
+			// 图片圆角
+			let bg_r = 4
+			// 绘制海报背景图片圆角
+			context.save()
+			context.beginPath()
+			context.arc(bg_x + bg_r, bg_y + bg_r, bg_r, Math.PI, Math.PI*1.5)
+			context.arc(bg_x + bg_w - bg_r, bg_y + bg_r, bg_r, Math.PI * 1.5, Math.PI * 2)
+			context.arc(bg_x + bg_w, bg_y + bg_h, bg_r, 0, Math.PI * 0.5)
+			context.arc(bg_x, bg_y + bg_h, 0, Math.PI * 0.5, Math.PI)
+			context.clip()
+			context.drawImage(img, bg_x, bg_y, bg_w, bg_h);
+			context.restore()
+			// 6.强烈推荐
+			// context.beginPath();
+			let tj_path = "../../../images/share/q_tj.png";
+			context.beginPath()
+			context.drawImage(tj_path, 54*unit, 648*unit, 85*unit, 30*unit);
+			context.setFontSize(16*unit)
+			context.setLineJoin('round'); //交点设置成圆角
+			context.setFillStyle("white")
+			context.setTextAlign('left');
+			context.fillText('强烈推荐', 64*unit, 672*unit);
+			// 7.商品价格
+			let price = '￥' + this.data.data.shop_price;
+			// if (th.data.prom_act)
+			//   pri0 = th.data.prom_act.price;
+			context.setFontSize(32*unit);
+			context.setFillStyle('#DE1117');
+			context.fillText(price, 54*unit, 730*unit);
+			// 8.商品标题
+			context.setFontSize(20*unit);
+			context.setFillStyle('#898989');
+			this.draw_Text(context, this.data.data.goods_name,
+			  54*unit, 770*unit, 240*unit, 240*unit, unit);
+			// 9.小程序码
+			context.drawImage(vpath, 375*unit, 660*unit, 120*unit, 120*unit);
+			context.setFontSize(16*unit);
+			context.setFillStyle('#777');
+			context.fillText('长按识别二维码', 378*unit, 810*unit);
+			// 10.竖线
+			context.beginPath();
+			context.setFillStyle('#eee');
+			context.rect(354*unit, 670*unit, 1*unit, 130*unit);
+			context.fill();
+			
+		},
+	
+	
   //--定义的保存图片方法，分享团---
   saveImageToPhotosAlbum: function () {
@@ -4128,9 +4298,7 @@ Page({
     }
     if (this.data.share_hidden) {
-      this.setData({
-        share_hidden: false,
-      });
+      this.setData({ share_hidden: false,});
     };
     //类型  0普通商品 1秒杀商品  2商家和会员团  3阶梯团  4阶梯团
@@ -4138,11 +4306,8 @@ Page({
     if (type == 6) type = 2;
     if (this.data.prom_act && this.data.prom_act.kttype == 3) type = 3;
-    wx.showLoading({
-      title: '生成中...',
-    })
-    var that = this,
-      th = that;
+    wx.showLoading({ title: '生成中...',})
+    var that = this, th = that;
     //设置画板显示，才能开始绘图
     that.setData({
       canvasHidden: false
@@ -4152,6 +4317,8 @@ Page({
     var unit = that.data.screenWidth / 750 * 1.35;  //基础单位，
     var path2 = that.data.data.original_img;
     var scene = th.data.gid + "";
+    scene+="."+th.data.sele_g.prom_type+"."+th.data.sele_g.prom_id;
+
     var user_id = getApp().globalData.user_id ? getApp().globalData.user_id : 0;
     if (user_id > 0) {
       scene += "_" + user_id;
@@ -4167,67 +4334,90 @@ Page({
       os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo";
     console.log(path3);
+		
-    //读取文件成功则OK--
+    // 读取文件成功则OK--
     wx.getImageInfo({
       src: path3,
       success: function (res) {
-        //回调写法
+        // 回调写法
         th.get_head_temp(th.get_goods_temp, function () {
           var vpath = res.path;
           var context = wx.createCanvasContext('share');
-          //先画背景
+          // 先画背景
           var pg_path = "../../../images/share/share_bg.png";
           // context.fillStyle="#FFFFFF";
           // context.fillRect(0,0,554 * unit, 899 * unit);
+					
+					// if(type == 0) {
+					// 	this.drawPoster(context);
+					// 	return false;
+					// };
+					
           //-- 如果有自定义海报的时候，判断背景的图片 --
           if (th.data.share_b_img) {
             pg_path = th.data.share_b_img;
           }
-          context.drawImage(pg_path, 0, 0, 554 * unit, 899 * unit);
+          // context.drawImage(pg_path, 0, 0, 554 * unit, 899 * unit);
+					
+					
+					if(type == 0) { // 如果是普通商品，绘制新海报
+						th.drawPoster(context, unit, th.data.share_goods_img, vpath);
+					} else {
+						context.drawImage(pg_path, 0, 0, 554 * unit, 899 * unit);
+					};
+					
+					// th.drawPoster(context, unit, th.data.share_goods_img, vpath);
+					
           //-- 是自定义海报的情况下 --
-          if (th.data.poster && parseInt(th.data.poster.style) == 2) {
-            //在线上分享人的情况下
-            if (parseInt(th.data.poster.show_headpic)) {
-              //获取坐标
-              var x = parseFloat(th.data.poster.head_x) * 2;
-              var y = parseFloat(th.data.poster.head_y) * 2;
-              var x1 = (x + 90) * unit;
-              var y1 = (y + 50) * unit;
-              //--昵称---
-              context.setFontSize(24 * unit)
-              context.setFillStyle("black")
-              context.fillText(app.globalData.userInfo.nickname, x1, y1);
-              var width = 24 * app.globalData.userInfo.nickname.length * unit + 4 * unit;
-              //强烈推荐 改许程
-              var tj_path = "../../../images/share/q_tj.png";
-              context.drawImage(tj_path, x1 + width, y1 - 22 * unit, 85 * unit, 30 * unit);
-              context.setFontSize(16 * unit)
-              context.setLineJoin('round'); //交点设置成圆角
-              context.setFillStyle("white")
-              context.fillText('强烈推荐', x1 + width + 8 * unit, y1 - 1 * unit);
-
-              //context.setFillStyle("black")
-              //context.setFontSize(24 * unit)
-              //context.fillText(getApp().globalData.config.store_name, 40 * unit, 130 * unit);
-            }
-          } else {
-            //--昵称---
-            context.setFontSize(24 * unit)
-            context.setFillStyle("black")
-            context.fillText(app.globalData.userInfo.nickname, 152 * unit, 76 * unit);
-            var width = 24 * app.globalData.userInfo.nickname.length * unit + 2 * unit;
-            //强烈推荐 改许程
-            var tj_path = "../../../images/share/q_tj.png";
-            context.drawImage(tj_path, 152 * unit + width, 54 * unit, 85 * unit, 30 * unit);
-            context.setFontSize(16 * unit);
-            context.setLineJoin('round'); //交点设置成圆角
-            context.setFillStyle("white");
-            context.fillText('强烈推荐', 149 * unit + width + 15 * unit, 75 * unit);
-          }
+					if(type != 0) {
+						
+						if (th.data.poster && parseInt(th.data.poster.style) == 2) {
+						  //在线上分享人的情况下
+						  if (parseInt(th.data.poster.show_headpic)) {
+						    //获取坐标
+						    var x = parseFloat(th.data.poster.head_x) * 2;
+						    var y = parseFloat(th.data.poster.head_y) * 2;
+						    var x1 = (x + 90) * unit;
+						    var y1 = (y + 50) * unit;
+						    //--昵称---
+						    context.setFontSize(24 * unit)
+						    context.setFillStyle("black")
+						    context.fillText(app.globalData.userInfo.nickname, x1, y1);
+						    var width = 24 * app.globalData.userInfo.nickname.length * unit + 4 * unit;
+						    //强烈推荐 改许程
+						    var tj_path = "../../../images/share/q_tj.png";
+						    context.drawImage(tj_path, x1 + width, y1 - 22 * unit, 85 * unit, 30 * unit);
+						    context.setFontSize(16 * unit);
+						    context.setLineJoin('round'); //交点设置成圆角
+						    context.setFillStyle("white");
+						    context.fillText('强烈推荐', x1 + width + 8 * unit, y1 - 1 * unit);
+						
+						    //context.setFillStyle("black")
+						    //context.setFontSize(24 * unit)
+						    //context.fillText(getApp().globalData.config.store_name, 40 * unit, 130 * unit);
+						  }
+						} else {
+						  //--昵称---
+						  context.setFontSize(24 * unit);
+						  context.setFillStyle("black");
+						  context.fillText(app.globalData.userInfo.nickname, 152 * unit, 76 * unit);
+						  var width = 24 * app.globalData.userInfo.nickname.length * unit + 2 * unit;
+						  //强烈推荐 改许程
+						  var tj_path = "../../../images/share/q_tj.png";
+						  context.drawImage(tj_path, 152 * unit + width, 54 * unit, 85 * unit, 30 * unit);
+						  context.setFontSize(16 * unit);
+						  context.setLineJoin('round'); //交点设置成圆角
+						  context.setFillStyle("white");
+						  context.fillText('强烈推荐', 149 * unit + width + 15 * unit, 75 * unit);
+						}
+						
+					};
+					
+          
           var share_title = th.data.data.goods_name;
           if (th.data.prom_type == 1 || th.data.prom_type == 6 || th.data.prom_type == 4) {
@@ -4238,7 +4428,7 @@ Page({
           //---产品名称---
           //文本换行 参数：1、canvas对象，2、文本 3、距离左侧的距离 4、距离顶部的距离 5、6、文本的宽度
-          if (type != 4) {
+          if (type != 4 && type != 0) {
             context.setFillStyle("black");
             context.setFontSize(21.3 * unit)
             th.draw_Text(context, share_title,
@@ -4271,7 +4461,7 @@ Page({
             context.lineTo(wd2 + ut.measureText(pri0, 22 * unit) + 5, 206 * unit);
             context.stroke();
-          } else {
+          } else if(type == 4 && type != 0) {
             context.setFillStyle("black");
             context.setFontSize(21.3 * unit)
             th.draw_Text(context, share_title,
@@ -4291,10 +4481,15 @@ Page({
           }
           //---中间大图---
-          context.drawImage(th.data.share_goods_img, 70 * unit, 250 * unit, 408 * unit, 408 * unit);
+					if(type != 0) {
+						context.drawImage(th.data.share_goods_img, 70 * unit, 250 * unit, 408 * unit, 408 * unit);
+					};
+					
+					
+          
           //-------大图后面就不一样了-----------
           switch (type) {
-            case 0: //普通商品的展示
+            case 0: break;//普通商品的展示
             case 4:
               //中间的几个字
               if (th.data.poster && parseInt(th.data.poster.style) == 2) {
@@ -4361,7 +4556,6 @@ Page({
                 context.fillText("长按识别二维码", 40 * unit, 806 * unit);
                 context.fillText("立即开始兑换", 40 * unit, 846 * unit);
-
               }
               //---二维吗图---            
@@ -4373,7 +4567,7 @@ Page({
               } else {
                 //---二维吗图---
                 context.drawImage(vpath, 390 * unit, 726 * unit, 136 * unit, 136 * unit);
-              }
+              };
               break;
             case 1: //秒杀商品的展示
@@ -4416,7 +4610,6 @@ Page({
               context.lineTo(520 * unit, 670 * unit)
               context.stroke();
               //---文字---
-
               context.setFillStyle("black")
               context.setFontSize(24 * unit)
               context.fillText(th.data.sto_sele_name_1, 40 * unit, 720 * unit);
@@ -4462,7 +4655,6 @@ Page({
               context.lineTo(520 * unit, 670 * unit)
               context.stroke();
               //---文字---
-
               context.setFillStyle("black")
               context.setFontSize(24 * unit)
               context.fillText(th.data.sto_sele_name_1, 40 * unit, 720 * unit);
@@ -4513,45 +4705,50 @@ Page({
           //--- 如果是自定义海报的时候 ---
-          if (th.data.poster && parseInt(th.data.poster.style) == 2) {
-
-            //如果显示会员信息的话
-            if (parseInt(th.data.poster.show_headpic)) {
-              //获取坐标
-              var x = parseFloat(th.data.poster.head_x) * 2;
-              var y = parseFloat(th.data.poster.head_y) * 2;
-              //---绘制圆形要放在最后----
-              context.save();
-              context.beginPath();
-              var h_x = x * unit;
-              var h_y = y * unit;
-              var h_r = 40 * unit;
-              var cx = h_x + h_r;
-              var cy = h_y + h_r;
-              context.arc(cx, cy, h_r, 0, Math.PI * 2, false);
-              context.closePath();
-              context.fill();
-              context.clip();
-              context.drawImage(th.data.share_head, h_x, h_y, h_r * 2, h_r * 2);
-              context.restore();
-            }
-
-          } else {
-            //---绘制圆形要放在最后----
-            context.save();
-            context.beginPath();
-            var h_x = 60 * unit;
-            var h_y = 24 * unit;
-            var h_r = 40 * unit;
-            var cx = h_x + h_r;
-            var cy = h_y + h_r;
-            context.arc(cx, cy, h_r, 0, Math.PI * 2, false);
-            context.closePath();
-            context.fill();
-            context.clip();
-            context.drawImage(th.data.share_head, h_x, h_y, h_r * 2, h_r * 2);
-            context.restore();
-          }
+					if(type != 0) {
+						
+						if (th.data.poster && parseInt(th.data.poster.style) == 2) {
+						
+						  //如果显示会员信息的话
+						  if (parseInt(th.data.poster.show_headpic)) {
+						    //获取坐标
+						    var x = parseFloat(th.data.poster.head_x) * 2;
+						    var y = parseFloat(th.data.poster.head_y) * 2;
+						    //---绘制圆形要放在最后----
+						    context.save();
+						    context.beginPath();
+						    var h_x = x * unit;
+						    var h_y = y * unit;
+						    var h_r = 40 * unit;
+						    var cx = h_x + h_r;
+						    var cy = h_y + h_r;
+						    context.arc(cx, cy, h_r, 0, Math.PI * 2, false);
+						    context.closePath();
+						    context.fill();
+						    context.clip();
+						    context.drawImage(th.data.share_head, h_x, h_y, h_r * 2, h_r * 2);
+						    context.restore();
+						  }
+						
+						} else {
+						  //---绘制圆形要放在最后----
+						  context.save();
+						  context.beginPath();
+						  var h_x = 60 * unit;
+						  var h_y = 24 * unit;
+						  var h_r = 40 * unit;
+						  var cx = h_x + h_r;
+						  var cy = h_y + h_r;
+						  context.arc(cx, cy, h_r, 0, Math.PI * 2, false);
+						  context.closePath();
+						  context.fill();
+						  context.clip();
+						  context.drawImage(th.data.share_head, h_x, h_y, h_r * 2, h_r * 2);
+						  context.restore();
+						}
+						
+					};
+          
           //把画板内容绘制成图片，并回调 画板图片路径
@@ -5540,9 +5737,6 @@ Page({
     this.add_cart_func_inte(t);
   },
-
-
-
   onShareTimeline() {
     var store_name = getApp().globalData.config ? getApp().globalData.config.store_name : '';
     if (!store_name)
@@ -5602,7 +5796,7 @@ Page({
   check_zh_acting: function (func) {
     var isok = 1, item = this.data.sele_g;
     //如果有组合购
-    var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + item.prom_id + "/" + getApp().globalData.userInfo.user_id;
+    var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + item.prom_id + "/" + getApp().globalData.user_id;
     getApp().request.promiseGet(url, {}).then(res => {
       if (res.data.code == 0 && res.data.data) {
         if (res.data.data.is_show != 1) {
@@ -5628,5 +5822,84 @@ Page({
       item.act = res.data.data;
       func(isok);
     })
-  }
+  },
+
+    //获取更多秒杀
+    get_more_flahs: async function (func) {
+       var f_more=false;
+       var user_id=getApp().globalData.user_id;
+       if(!user_id) user_id=0;
+
+       var url="/api/weshop/goods/listSkuFlash?store_id="+os.stoid+"&goods_id="+this.data.data.goods_id+"&user_id="+user_id;
+       //获取秒杀的多规格
+       await getApp().request.promiseGet(url, {}).then(res=>{
+            if(res.data.code==0 && res.data.data && res.data.data.length>0){
+                f_more=res.data.data;
+            }
+        })
+        if(!f_more) {
+            func(false);
+            return false;
+        }
+        //-- 秒杀的价格要更新 --
+        for(let i in f_more){
+
+        	let item=f_more[i];
+            f_more[i].prom_id=item.act_id;
+            f_more[i].prom_type=1;
+        	if(item.goods_id==this.data.data.goods_id){
+        	    continue;
+            }
+            var url="/api/ms/flash_sale/getNew/"+os.stoid+"/"+user_id+"/"+item.act_id;
+            await getApp().request.promiseGet(url, {}).then(rs=>{
+              if(rs.data.code==0){
+                  f_more[i].price=rs.data.data.user_price;
+
+              }
+            })
+        }
+        func(f_more);
+
+    },
+
+    //-- 判断是否有秒杀 --
+    check_has_flash:function () {
+        var th=this;
+        var url="/api/weshop/activitylist/getGoodActInfo";
+        var req_data={
+            store_id:os.stoid,goodsidlist:this.data.data.goods_id,is_detail:1
+        };
+        //获取秒杀的多规格
+        getApp().request.promiseGet(url, {data:req_data}).then(res=>{
+            if(res.data.code==0 && res.data.data && res.data.data.length){
+                th.setData({more_flash:res.data.data});
+            }
+        })
+    },
+
+    //-- 跳转到秒杀商品详情页  --
+    go_more_flash:function (e) {
+        var prom_id=e.currentTarget.dataset.id;
+        var goods_id=this.data.data.goods_id;
+        var url="/pages/goods/goodsInfo/goodsInfo?goods_id="+goods_id+"&prom_id="+prom_id+"&prom_type=1";
+        getApp().goto(url);
+    },
+
+    close_pop_more:function () {
+       this.setData({is_pop_more:0})
+    },
+
+    con_weixin:function () {
+        var url=this.data.sys_switch.weapp_customertype_url;
+        var id=this.data.sys_switch.weapp_customertype_appid;
+        wx.openCustomerServiceChat({
+            extInfo: {url: url},
+            corpId: id,
+            success(res) {}
+        })
+    }
+
+
+
+
 });
@@ -7,16 +7,11 @@
   <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 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}}">
-        <!-- 视频 -->
-        <!-- <swiper bindchange="swiperChange"class="xc-pictures  swiperContainer rel" current="{{swiperCurrent}}"
-	  indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}"> -->
         <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">
@@ -31,7 +26,6 @@
                 </view>
               </swiper-item>
               <swiper-item wx:for="{{gallery}}" wx:key="gallery">
-                <!-- <image class="wh100" src="{{item.image_url}}" mode="aspectFit" binderror="bind_bnerr" lazy-load="true" data-errorimg="gallery[{{index}}].image_url"></image> -->
                 <view class="wh100 g_img_box" style="background-image:url({{item.image_url}});"></view>
               </swiper-item>
             </swiper>
@@ -93,7 +87,8 @@
                 零售价￥{{filters.toFix(data.market_price,2)}}
               </view>
             </view>
-            <view class="abs white xc-nanber">
+						
+            <!-- <view class="abs white xc-nanber">
               <text class="fs22">已拼{{prom_act.buy_num}}件</text>
               <view class="flex" style='margin-top:-34rpx'>
                 <view class="xc-people-img">
@@ -101,7 +96,19 @@
                 </view>
                 <view class="t-s fs20 xc-people-val">{{prom_act.ct_num}}人拼</view>
               </view>
-            </view>
+            </view> -->
+						
+						<!-- 幸运购 -->
+						<view class="abs white xc-nanber" wx:if="{{false}}">
+						  <text class="fs22">已成团{{prom_act.buy_num}}期</text>
+						  <view class="flex" style='margin-top:-34rpx'>
+						    <view class="xc-people-img">
+						      <image class="imgs" src="{{prom_st==1? iurl+'/miniapp/images/r_logo_red.png':iurl+'/miniapp/images/r_logo.png'}}"></image>
+						    </view>
+						    <view class="t-s fs20 xc-people-val">{{prom_act.ct_num}}人团</view>
+						  </view>
+						</view>
+						
             <view class="hy-stop word-color fs26 abs" wx:if="{{prom_st==1}}">距活动结束还有</view>
             <view class="hy-stop word-color-lan fs26  abs" wx:if="{{prom_st==0}}">距活动开始还有</view>
             <view class="secview  flex abs fs24 " style="color: black;right: 3px; top:46rpx;">
@@ -210,6 +217,72 @@
               </view>
             </view>
           </view>
+					
+					<!-- 幸运购 -->
+					<view class="pt_fir se2 bdt16" wx:if="{{teamgroup}}" hidden="{{true}}">
+					  <view class="xc-partner-frame">
+					    <view class="zzk-1 flex jc_sb" bindtap="go_t_more">
+					      <view class="pdl10">已参团4人，还差<text class="c-red">1</text>人成团</view>
+					      <view class="ckgd flex ai_c">
+					        查看奖励
+					        <view class="bg_right arrow-one"></view>
+					      </view>
+					    </view>
+					  </view>
+					  <view class='group'>
+					    <view class='group-list luck' bindtap="go_cj_team" data-ind="{{t_ind}}">
+					      <!-- <view class="flex ai_c"> -->
+					      <!-- //选项框头像 -->
+					      <view class='gtou'  wx:for="{{teamgroup}}" wx:for-index="t_ind" wx:key="teamgroup">
+					        <image src='{{item.user.head_pic}}'></image>
+					      </view>
+								<view class='gtou more'>
+								  <text class="iconfont icon-sandian"></text>
+								</view>
+								<!-- <view class='gtou'>
+								  <image src='{{item.user.head_pic}}'></image>
+								</view> -->
+					      <!-- //等你来拼 -->
+					      <!-- <view class='gdn ellipsis-1'>{{item.user.nickname}}</view> -->
+					      <!-- </view> -->
+					      <!-- //还差几人，剩余时间 -->
+					      <!-- <view class="rel">
+					        <view class='ghaicha ellipsis-2'>
+					          <text class='gred' wx:if="{{prom_act.max_ct_num >0}}">
+					            <text class="flex" wx:if="{{prom_act.max_ct_num - item.open_num>0}}">
+					              还差
+					              <text class="word-color">{{prom_act.max_ct_num - item.open_num}}</text>
+					              人享最低优惠
+					            </text>
+					            <text wx:else>您已经享最低优惠</text>
+					          </text>
+					          <text class='gred' wx:else>
+					            还差
+					            <text style='color:#ff2753'>{{prom_act.ct_num - item.open_num}}</text>
+					            人成团
+					          </text>
+					          <view class="t_show">
+					            剩余
+					            <text wx:if="{{timer[t_ind].day}}">{{timer[t_ind].day}}天:</text>
+					            <text>{{timer[t_ind].hou}}</text>
+					            :
+					            <text>{{timer[t_ind].min}}</text>
+					            :
+					            <text>{{timer[t_ind].sec}}</text>
+					          </view>
+					        </view>
+					      </view> -->
+					      <!-- //参加团 -->
+					      <!-- <view class='cjt t-c'>去参团</view> -->
+					      <!-- <view class="clear"></view> -->
+					    </view>
+							
+							<view class="fs24 pdh20 pdt20">*<text class="c-red">5</text>人成团，<text class="c-red">5</text>人得商品，<text class="c-red">5</text>人全额退款并获得<text class="c-red">惊喜礼品</text>！</view>
+					  </view>
+					</view>
+					
+					
+					
         </view>
         <!-- 积分购 -->
         <view wx:if="{{prom_type==4}}">
@@ -252,6 +325,9 @@
         </view>
         <!-- 不是拼团，不是积分购 -->
         <block wx:if="{{prom_type!=6 && prom_type!=4}}">
+
+
+
           <view class="goods-price">
             <view class="flex jc_sb">
               <view class="co-red" style="" wx:if="{{prom_type==0 || prom_type==3}}">
@@ -287,7 +363,8 @@
             </view>
             <!-- 不是秒杀 -->
             <!-- 等级卡的价格,不是等级卡会员，且商品又有设置等级级价，商家后台有开通升级卡同能 -->
-            <view class="flex ai_and" wx:if="{{!card_field && g_filters.is_has_rank(rank_switch,data) && prom_type!=1 && card_list && card_list.length>0}}">
+            <view class="flex ai_and" wx:if="{{!card_field && g_filters.is_has_rank(rank_switch,data) && prom_type!=1 && card_list && card_list.length>0 && g_filters.get_card_price(data,card_list,1)!=''}}">
+
               <view class="flex ai-center  grade-card-frame card-frame">
                 <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
                 <view class="fs24 white view card-name ellipsis-1">
@@ -295,14 +372,13 @@
                 </view>
               </view>
               <view class="fs32 xc-black3 ai_and carde_frame">
-                <text class="fs26">￥</text>
-                {{g_filters.get_card_price(data,card_list,0)}}
+                <text class="fs26">￥</text>{{g_filters.get_card_price(data,card_list,0)}}
               </view>
             </view>
             <!-- 等级卡的显示,购买, 等级卡近30天要显示续费 -->
             <block wx:if="{{g_filters.is_has_rank(rank_switch,data)}}">
               <!-- 不是秒杀，且会员不是等级会员 -->
-              <view wx:if="{{!card_field && prom_type!=1 && card_list && card_list.length>0}}">
+              <view wx:if="{{!card_field && prom_type!=1 && card_list && card_list.length>0 && g_filters.get_card_price(data,card_list,1)!=''}}">
                 <view class="beauty-makeup-frame flex ai-center">
                   <view class="left flex ai-center jc_sa">
                     <view class="flex ai-center  grade-card-frame card-frame advert-card">
@@ -314,10 +390,7 @@
                     <view class="card-effect">
                       <view class="fs24 xc-black3">
                         成为{{g_filters.get_card_price(data,card_list,1)}}立
-                        <text class="co-red">
-                          省{{filters.toFix(data.shop_price-g_filters.get_card_price(data,card_list,0),2)}}
-                        </text>
-                        元
+                        <text class="co-red">省{{filters.toFix(data.shop_price-g_filters.get_card_price(data,card_list,0),2)}}</text>元
                       </view>
                       <view class="fs22 xc-ash">开通会员 尽享更多优惠</view>
                     </view>
@@ -390,7 +463,7 @@
               </view>
             </view>
             <view class="xc-explain fs32 ellipsis-2" wx:if="{{prom_type!=0 && prom_type!=4}}">
-              {{data.goods_name}}
+              {{sele_g.goods_name}}
             </view>
             <!-- <view wx:if="{{prom_type==1}}" style='height:58rpx'></view> -->
             <!-- 许程 7.24 暂时注释 -->
@@ -398,7 +471,9 @@
               <view class="goods-num" wx:if="{{prom_type==1}}">
                 <block wx:if="prom_st>0">
                   <view class="stock">总数量：{{prom_act.goods_num+prom_act.virtual}}件</view>
-                  <view class="stock">限购:{{prom_act.buy_limit}}件</view>
+                  <view class="stock" wx:if="{{prom_act.buy_limit>0}}">限购:{{prom_act.buy_limit}}件</view>
+                  <view class="stock" wx:else>限购:不限</view>
+
                   <block wx:if="{{prom_st==0}}">
                     <view class="sales">已购:0件</view>
                   </block>
@@ -408,7 +483,8 @@
                 </block>
                 <block wx:else>
                   <view class="stock">总数量：{{prom_act.goods_num}}件</view>
-                  <view class="stock">限购:{{prom_act.buy_limit}}件</view>
+                  <view class="stock" wx:if="{{prom_act.buy_limit>0}}">限购:{{prom_act.buy_limit}}件</view>
+                  <view class="stock" wx:else>限购:不限</view>
                   <view class="sales">已购:{{prom_act.buy_num}}件</view>
                 </block>
               </view>
@@ -423,10 +499,7 @@
                 <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 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 pdv10">
@@ -501,6 +574,7 @@
             </view>
           </view>
         </block>
+
         <!-- 要判断是不是有订单优惠 -->
         <block wx:if="{{order_prom}}">
           <view class="cx-frame flex" style="position: relative; height: auto">
@@ -538,6 +612,29 @@
             </view>
           </view>
         </block>
+        <!-- 判断是不是有秒杀 -->
+        <block wx:if="{{more_flash}}">
+
+          <block wx:for="{{more_flash}}">
+
+            <view class="cx-frame flex" style="position: relative; height: auto" wx:if="{{item.prom_type==1}}" >
+            <view class="cx-sizs wsize" style="width: 144rpx">秒杀</view>
+            <!-- 中间显示层 -->
+            <view class="flex ai-center jc_sb" style="width: 570rpx" bindtap="go_more_flash" data-id="{{item.act_id}}">
+              <view class="flex">
+                <view class="miao_lab">秒</view>
+                <view class="order_hui">
+                  <view class="fs28 ellipsis-1">{{item.act_name}}</view>
+                  <view class="fs26">
+                    (活动时间：{{tool.format_tt(item.s_time)}} - {{tool.format_tt(item.e_time)}})
+                  </view>
+                </view>
+              </view>
+              <view><text class="bg_jj is_more_cx" style="position: relative;top:-10rpx"></text></view>
+            </view>
+          </view>
+          </block>
+        </block>
         <view class="bz_view flex bdt16" wx:if="{{bconfig}}" style="">
           <image class="bzfu_img" src="{{iurl}}/miniapp/images/bzfu_w.png"></image>
           <view class="flex f1 ai_c rel">
@@ -629,13 +726,6 @@
         </view>
         <!-- 图文详情 -->
         <view class="bdt16">
-          <!-- <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 class="t_g_info">
             <view class="red_shu"></view>
             <view class="fs30 bold">商品详情</view>
@@ -892,10 +982,16 @@
   <!-- -----------------底部按钮------------------ -->
   <view class="join-cart">
     <!-- bindtap="contactService" -->
-    <button wx:if="{{sys_switch.weapp_customertype}}" class="custom-service cart-ico new_split" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
+    <button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
       <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" bindtap="con_weixin">
+      <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" bindtap="contactService">
       <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
       <view>客服</view>
@@ -1094,10 +1190,7 @@
             <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 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>
@@ -1365,10 +1458,7 @@
             <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon>
           </view>
           <view class="felx choose_more" bindtap="more_store">
-            <text class="fs26 red-co" wx:if="{{is_show_sto_cat}}">
-              {{choice_sort_store==0?'更多门店':'返回'}}
-            </text>
-            <view class="bg_rights" wx:if="{{is_show_sto_cat}}"></view>
+            <text class="fs26 red-co" wx:if="{{is_show_sto_cat}}">{{choice_sort_store==0?'更多门店':'返回'}}</text> <view class="bg_rights" wx:if="{{is_show_sto_cat}}"></view>
           </view>
         </view>
       </view>
@@ -1518,4 +1608,27 @@
       </view>
     </view>
   </view>
-</view>
 \ No newline at end of file
+</view>
+
+<!-- 商品要加入购物车 -->
+<view class="pop_more_act" wx:if="{{is_pop_more}}">
+  <view class="cover-layer" bindtap="close_pop_more"></view>
+  <view class="content">
+    <view class="main pd20">
+      <view class="t-c fs36" style="color: #c3172d">提示</view>
+
+      <block wx:for="{{more_flash}}">
+      <view bindtap="go_more_flash" data-id="{{item.act_id}}" class="flex jc_sb fs28 mt20" wx:if="{{item.prom_type==1}}">
+        <view class="ellipsis-2" style="max-width: 80%">该商品有参与{{item.act_name}} {{tool.act_type(item.prom_type)}}  活动</view>
+        <view class="fs26 c-7b">去参与
+          <text class="bg_jj is_more_cx"></text>
+        </view>
+      </view>
+      </block>
+
+      <view style="margin-top: 30rpx" bindtap="open_next">
+        <button class="p_btn">继续加入购物车</button>
+      </view>
+    </view>
+  </view>
+</view>
@@ -2690,7 +2690,7 @@ border-radius: 55rpx;
 }
 .carde_frame{
   height: 50rpx;
-  line-height: 18rpx
+  /* line-height: 18rpx */
 }
 button.custom-service { line-height: normal; border: 0;}
@@ -2842,4 +2842,37 @@ button.custom-service::after{
 	width: 132rpx;
 	height: 37rpx;
 	margin-right: 10rpx;
+}
+
+.miao_lab{ width: 36rpx; height: 36rpx; border: 4rpx solid #e71f19; color:#e71f19; text-align: center;margin-right: 10rpx;
+   line-height: 36rpx;font-size: 22rpx; font-weight: bolder; border-radius: 50%;  }
+
+.pop_more_act .content{
+   position:fixed;background: #fff; width: 100%;
+   left: 0;bottom: 0;z-index: 1000;
+}
+
+.p_btn{
+    background-color: #f23030;
+    height: 70rpx;line-height: 70rpx;
+    color: #fff;
+}
+
+.mt20{ margin-top: 20rpx}
+
+.group .group-list.luck {
+	padding: 0 20rpx;
+	justify-content: flex-start;
+}
+
+.group-list.luck .gtou ~ .gtou {
+	margin-left: -16rpx;
+}
+
+.gtou.more {
+	background-color: #ddd;
+	text-align: center;
+	line-height: 70rpx;
+	border-radius: 50%;
+	color: #aaa;
 }
 \ No newline at end of file
@@ -81,12 +81,13 @@ var g_filters = {
 		},
 		//跳转的接口
         		get_goods_url:function(item){
-
-        		   console.log(item,111)
         		   var url1="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id
         		   if(item.prom_type==8){
-        		    url1="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id
-        		   }
+        		       url1="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_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";
+                    }
         		   return url1;
         		}
 }
@@ -177,7 +177,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_type!=2}}">
+		      <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_type!=2 && item.prom_id>0}}">
 					<view class="flex on">
 						<!-- 活动价 -->
 						<view class="price">
@@ -83,11 +83,14 @@ var g_filters = {
         		get_goods_url:function(item){
-        		   console.log(item,111)
+
         		   var url1="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id
         		   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==1 && item.prom_id>0){
+                       url1="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id+"&prom_type=1";
+                   }
         		   return url1;
         		}
 }
@@ -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_type!=2}}">
+        <block wx:if="{{(item.prom_price>0 || item.prom_integral) && item.prom_type!=2 && item.prom_id>0}}">
           <!-- 活动价 -->
           <view class="price">
 			  <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text>
@@ -335,6 +335,49 @@ Page({
         })
+      //-----秒杀-----
+      var flash_data = null;
+      var f_req={
+          store_id: os.stoid,
+          timetype: 2,
+          is_end: 0,
+          is_show: 1,
+          pageSize: 9,
+          user_id:0
+      };
+      if(user_id) f_req.user_id=user_id;
+      //--获取活动--
+      await getApp().request.promiseGet("/api/ms/flash_sale/spikepage", {
+          data:f_req ,
+      }).then(res => {
+          var e = res;
+          if (e.data.code == 0) {
+              flash_data = e.data.data.pageData;
+              if (flash_data == null || flash_data.length <= 0) return false;
+
+              //当前时间戳
+              var nt = ut.gettimestamp();
+
+              flash_data.forEach(function (val, ind) {
+
+                  if(val.user_price) val.price=val.user_price;
+                  if (val.start_time > nt) flash_data[ind].status = 0;
+                  else if (val.end_time > nt) flash_data[ind].status = 1;
+                  if (val.buy_num >= val.goods_num) flash_data[ind].status = 2;
+              });
+
+              var arr = new Array();
+              //--三个三个一组---
+              for (var i = 0; i < flash_data.length; i += 3) {
+                  arr.push(flash_data.slice(i, i + 3));
+              }
+              th.setData({
+                  saleGoods: arr
+              });
+          }
+      });
+
+
       //优惠券要实时更新
     getApp().getConfig2(function (e) {
@@ -458,45 +501,6 @@ Page({
       }
     })
-    //-----秒杀-----
-    var flash_data = null;
-    //--获取活动--
-    await getApp().request.promiseGet("/api/ms/flash_sale/spikepage", {
-      data: {
-        store_id: os.stoid,
-        timetype: 2,
-        is_end: 0,
-        is_show: 1,
-        pageSize: 9
-      },
-    }).then(res => {
-      var e = res;
-      if (e.data.code == 0) {
-        flash_data = e.data.data.pageData;
-        if (flash_data == null || flash_data.length <= 0) return false;
-
-        //当前时间戳
-        var nt = ut.gettimestamp();
-
-        flash_data.forEach(function (val, ind) {
-          if (val.start_time > nt) flash_data[ind].status = 0;
-          else if (val.end_time > nt) flash_data[ind].status = 1;
-          if (val.buy_num >= val.goods_num) flash_data[ind].status = 2;
-        });
-
-        var arr = new Array();
-        //--三个三个一组---
-        for (var i = 0; i < flash_data.length; i += 3) {
-          arr.push(flash_data.slice(i, i + 3));
-        }
-        th.setData({
-          saleGoods: arr
-        });
-        //th.countDown();
-      }
-    });
-
-
     //----拼单-----
     await getApp().request.promiseGet("/api/weshop/teamlist/pageteam/2", {
       data: {
@@ -153,9 +153,9 @@
 			</view>
 		</navigator>
 		<view class="seckill-list">
-			<swiper class="s_prom" indicator-dots="{{false}}" bindchange="flashSwiperChange" next-margin="105rpx">
-				<swiper-item wx:for="{{saleGoods}}" wx:key="{{index}}" class="p_swiper" wx:key="saleGoods" style="750rpx !important;">
-					<navigator class="nav" hover-class="none" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&title={{aitem.goods_name}}" wx:for="{{item}}" wx:key="item" wx:for-item="aitem" wx:for-index="aind">
+			<swiper class="s_prom" indicator-dots="{{false}}" bindchange="flashSwiperChange">
+				<swiper-item wx:for="{{saleGoods}}" wx:key="{{index}}" class="p_swiper" wx:key="saleGoods" style="740rpx !important;padding: 0; margin-left: 10rpx">
+					<navigator style="flex-shrink: 0;width: 247rpx" class="nav" hover-class="none" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&title={{aitem.goods_name}}&prom_type=1&prom_id={{aitem.id}}" wx:for="{{item}}" wx:key="item" wx:for-item="aitem" wx:for-index="aind">
 						<view class="imgview ">
 							<image src="{{url+aitem.original_img}}" mode="aspectFill" lazy-load="true" data-errorimg="saleGoods[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3" data-img="{{aitem.original_img}}"></image>
@@ -163,7 +163,7 @@
 							<image wx:if="{{aitem.status==1}}" class="status_img" src="{{url}}/miniapp/images/miao/going.png"></image>
 							<image wx:if="{{aitem.status==2}}" class="status_img" src="{{url}}/miniapp/images/miao/mend.png"></image>
 						</view>
-						<view class="ellipsis-2 mar-top10" style="height: 70rpx;">{{aitem.title}}</view>
+						<view class="ellipsis-2 mar-top10" style="height: 76rpx;">{{aitem.goods_name}}</view>
 						<!-- <view class="red-co mar-top10 is_seckill_height"> -->
 						<view class="co-red mar-top10">
 							<text class="fs20">￥</text>{{aitem.price}}
@@ -215,7 +215,52 @@
 				</swiper-item>
 			</swiper>
 		</view>
-	</view> 
+	</view>
+	
+	
+	
+	<!--幸运购-->
+	<view class="seckill" wx:if="{{false}}">
+		<navigator bindtap="go_pre"  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>
+					<text class="bold fs30">幸运购</text>
+				</view>
+				<view class="flex ai_c seckill-list">
+					<text class="fs24 xc-marfin-right">查看全部</text>
+					<image class="arrow-right" src="{{url}}/miniapp/images/icon-arrowdown.png"></image>
+				</view>
+			</view>
+		</navigator>
+		<view class="seckill-list luck">
+			<view class="list-item" wx:for="{{3}}">
+				<view class="flex ai-center">
+					<view class="img-container"><image class="img-block" src="../../../images/bk.png"></image></view>
+					<view class="pdl20 flex fdc jc_sb f1">
+						
+						<view class="ellipsis-2 name fs28">我是商品</view>
+						<view>
+							<view class="flex ai-center">
+								<text class="rmb c-red">189.00</text>
+								<view class="del fs22 c-a pdl10">零售价:<text class="rmb">155</text></view>
+							</view>
+							<view class="flex jc_sb">
+								<progress class="pdr20 f1 progress" percent="50" activeColor="#FF6768" backgroundColor="#d0d0d0" border-radius="12" stroke-width="12" data-content="1人已参团"></progress>
+								<view class="btn fs26">去参团</view>
+							</view>
+						</view>
+						
+					</view>
+				</view>
+				<view class="fs24 pdt10 c-7b">*<text class="c-red">5</text>人成团，<text class="c-red">5</text>人得商品，<text class="c-red">5</text>人全额退款并得<text class="c-red">惊喜礼品</text>！</view>
+			</view>
+		</view>
+	</view>
+	 
+	 
+	 
+	 
@@ -2,7 +2,8 @@
 	background: #ff7295;
 }
-.icon-presell {
+.icon-presell,
+.icon-luck {
 	color: #ED6064;
 	font-size: 18px;
 	margin-right: 4rpx;
@@ -1115,3 +1116,82 @@ page {
 	margin-right: 10rpx;
 }
+
+
+/* .luck {
+	padding-left: 20rpx;
+	padding-right: 20rpx;
+} */
+
+.luck .list-item {
+	background-color: white;
+	padding: 20rpx;
+	border-radius: 12rpx;
+}
+
+.luck .img-container {
+	width: 200rpx;
+	height: 200rpx;
+	border-radius: 14rpx;
+	overflow: hidden;
+	flex-shrink: 0;
+	position: relative;
+}
+
+.luck .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;
+}
+
+.luck .name::before {
+	content: '5人团';
+	background-color: #FF6768;
+	color: white;
+	font-size: 26rpx;
+	padding-left: 10rpx;
+	padding-right: 10rpx;
+	border-radius: 20rpx;
+	margin-right: 10rpx;
+}
+
+.rmb::before {
+	content: '￥';
+	font-size: 24rpx;
+}
+
+.del {
+	text-decoration: line-through;
+}
+
+.luck .btn {
+	background-color: #FF6768;
+	border-radius: 20rpx;
+	padding-left:20rpx;
+	padding-right: 20rpx;
+	color: white;
+}
+
+.luck .name {
+	height: 88rpx;
+}
+
+
+.luck .progress {
+	position: relative;
+}
+.luck .progress::before {
+	position: absolute;
+	width: 100%;
+	content: attr(data-content);
+	font-size: 20rpx;
+	color: white;
+	text-align: center;
+}
+
@@ -64,6 +64,14 @@ Page({
   //-- 会员授权 --
   bindGetUserInfo: function(ee) {
+		
+		if(!this.data.isAgree) {
+			wx.showToast({
+				title: '请您先阅读和勾选指定的内容',
+				icon: 'none',
+			});
+			return false;
+		}
     var that = this;
 	//-- 点击授权 --
 	that.getUserProfile(function(res){
@@ -286,7 +294,30 @@ Page({
   close_pop_back:function(){
 	  this.close_pop();
 	  wx.navigateBack({ delta: 1})
-  }
+  },
+	
+	
+	// 是否同意协议
+	isAgree(e) {
+		let isAgree = null;
+		if(e.detail.value[0]) {
+			isAgree = true;
+		} else {
+			isAgree = false;
+		}; 
+		// this.data.isAgree = isAgree;
+		this.setData({
+			isAgree,
+		});
+	},
+	
+	
+	//通过路径跳转到其他页面
+	goto: function(e) {
+		console.log('xxxx', e);
+	  var url = e.currentTarget.dataset.url;
+	  getApp().goto(url);
+	},
@@ -2,7 +2,7 @@
   <!-- 登录图 -->
   <view >
-    <view class="logins flex-center2 ali-c flex" style="position: relative;top: 120rpx;">
+    <view class="logins flex-center2 ali-c flex" style="padding-top: 120rpx;">
 	  <image mode="widthFix"  bindtap="go_index" class="login_img_back" src="{{imghots}}/miniapp/images/loginbg.jpg"></image>
       <view class="middle_view">
          <image bindtap="go_index" class="login_img" src="{{store_logo}}" binderror="bind_bnerr" lazy-load="true" data-errorimg="store_logo"></image>
@@ -14,6 +14,13 @@
   <!-- 登录按钮 -->
   <view>
     <view class="phones">
+			
+		<view bindtap="" class="user-name flex-vertical fs24 jc-center">
+			<checkbox-group bindchange="isAgree">
+				<checkbox value="true"/>
+			</checkbox-group>
+		  <view class="user-name-txt">我已阅读同意 <text class="gray" bindtap="goto" data-url="/packageA/pages/parseHtml/parseHtml?t=0">《用户使用协议》</text>与<text class="gray" bindtap="goto" data-url="/packageA/pages/parseHtml/parseHtml?t=1">《隐私政策》</text></view>
+		</view>	
 	 <!-- 授权获取基础信息 -->
 	 <block wx:if="{{canIUseGetUserProfile}}">  
@@ -4,7 +4,7 @@ page{
 }
 .logins {
   width: 100%;
-  padding-bottom: 130rpx;
+  /* padding-bottom: 130rpx; */
   background-position: center;
   background-repeat: no-repeat;
   background-size: cover
@@ -26,7 +26,7 @@ page{
   border-radius: 48rpx;
   color: rgb(255,255,255);
   font-size: 32rpx;
-  margin-top:150rpx;
+  margin-top: 40rpx;
 }
 .we_chat{
   width: 55rpx;
@@ -65,3 +65,13 @@ button{
 .middle_view{
     position: absolute; left: 0; width: 100%; text-align: center;
 }
+
+/*checkbox 选项框大小  */
+checkbox .wx-checkbox-input {
+  width: 30rpx;
+  height: 30rpx;
+}
+
+.gray {
+	color: #767f8e;
+}
@@ -67,7 +67,7 @@ Page({
 				 getApp().promiseGet("/api/weshop/storeDistribut/get/"+os.stoid,{}).then(rs=>{
 						  var dis=rs.data.data;
 						  for(var i in d_list){
-								 if(d_list[i].name=='我的分销' && dis && dis.switch==0){
+								 if(d_list[i].name=='我的分销' && (!dis || dis.switch==0)){
 									 d_list.splice(i,1);
 								 }
 						  }  
@@ -237,8 +237,26 @@ Page({
               });
             }
           }
-        })
-
+        });
+				
+				/*-----物流信息提醒-----*/
+				rq.get('/api/weshop/order/countDadaOrder', {
+				  isShowLoading:0,
+				  data: {
+				    user_id: e.user_id,
+				    store_id: os.stoid,
+				  },
+				  success: function(su) {
+				    if (su.data.code == 0) {
+				      th.setData({
+				        countDadaOrder: su.data.data
+				      });
+				    }
+				  }
+				});
+				
+				
+				
         //--初始化是否有打勾--
         getApp().request.get("/api/weshop/users/grade/vip/init/get", {
@@ -395,6 +413,11 @@ Page({
           }
         })
         //th.requestRecommend();
+				
+				
+				
+				
+				
      }
 	 /*-- 
@@ -817,6 +840,19 @@ Page({
         }
       })   
     },
-    
+
+    con_weixin:function () {
+        var url=this.data.sys_switch.weapp_customertype_url;
+        var id=this.data.sys_switch.weapp_customertype_appid;
+        wx.openCustomerServiceChat({
+            extInfo: {url: url},
+            corpId: id,
+            success(res) {}
+        })
+    }
+
+
+
+
 })
@@ -96,14 +96,16 @@
   </view>
   <view class="xc-after-sale rel">
     <!-- 顶上的一栏 -->
-    <view class="xc-equity-title flex-level" bindtap="go_order"  data-url="/pages/user/order_list/order_list">
-      <view class="xc-title-frame flex-space-between">
-        <view class="flex-vertical xc-title-content">
+    <view class="xc-equity-title flex-level">
+      <view class="xc-title-frame flex ai-center">
+        <view class="flex-vertical xc-title-content" bindtap="go_order" data-url="/pages/user/order_list/order_list">
           <image class="xc-title-img" src="{{iurl}}/miniapp/images/hdindan.png" style="width: 50rpx; height: 55rpx;margin-right: 5rpx"></image>
           <view class="three-level-word">我的订单</view>
         </view>
+				<!-- 物流信息提醒 -->
+				<view class="fs26 c-5 pdl60" wx:if="{{countDadaOrder != 0}}" bindtap="go_order" data-url="/pages/user/order_list/order_list?index=1"><text class="iconfont icon-dingwei"></text>您有<text class="c-red">{{countDadaOrder}}</text>个同城配送订单</view>
       </view>
-      <view class="three-level-word  xc-more-frame flex-vertical">
+      <view class="three-level-word  xc-more-frame flex-vertical" bindtap="go_order" data-url="/pages/user/order_list/order_list">
         <view class="three-level-word xc-more">更多</view>
         <view class="bg_right xc-more-click bcolor"></view>
       </view>
@@ -250,10 +252,16 @@
 					   <!-- 没有链接地址的时候 --> 
 					   <block wx:else>			   
 						   <block wx:if="{{item.name=='联系客服'}}">
-							   <button class="item t-c"  wx:if="{{sys_switch.weapp_customertype}}" open-type="contact"  session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
+							   <button class="item t-c"  wx:if="{{sys_switch.weapp_customertype==1}}" open-type="contact"  session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
 							      <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
 							      <view class="fs26">联系客服</view>
-							   </button>							             
+							   </button>
+
+                               <view class="item t-c" bindtap="con_weixin" wx:elif="{{sys_switch.weapp_customertype==2}}">
+                                   <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
+                                   <view class="fs26">联系客服</view>
+                               </view>
+
 							   <view class="item t-c" bindtap="contactService" wx:else>
 							      <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
 							      <view class="fs26">联系客服</view>
@@ -725,4 +725,13 @@ button::after{ border: 0}
 	width: 132rpx;
 	height: 37rpx;
 	margin-right: 10rpx;
+}
+
+.icon-dingwei {
+	color: #EA4F2B;
+	font-size: 28rpx;
+}
+
+.c-5 {
+	color: #555;
 }
 \ No newline at end of file
@@ -322,7 +322,8 @@ Page({
                  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 order_goods=order.order_goods;
+		var user_id=order.user_id;
 		var wlist="";	
 		for(var i in order_goods){		
@@ -474,8 +475,7 @@ Page({
 			//商品的普通购买 ，不要进行判断
 			if((good.prom_type==1 || 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)	{
-					  
+				   if(gg.prom_type!=good.prom_type && gg.prom_type>0)	{
 					   var content=gg.goods_name+'商品的活动发生了变化,请取消订单重新购买';
 					   th.toast(content);
 					   return false;		   
@@ -487,10 +487,11 @@ Page({
 				  				  //---如果是活动的时候---
 				  				  var prom=null,th=this;
 				  				  if(gg.prom_type==1){	
-				  				  			  await getApp().request.promiseGet("/api/ms/flash_sale/get/"+os.stoid+"/"+gg.prom_id,{		  		
+				  				  			  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;
 				  				  				  }
 				  				  			  })
 				  				  }	  
@@ -595,10 +596,11 @@ Page({
 			   //---如果是活动的时候---
 			   var prom=null,goodsinfo=good,th=this;
 			   if(goodsinfo.prom_type==1){	
-			  			  await getApp().request.promiseGet("/api/ms/flash_sale/get/"+os.stoid+"/"+goodsinfo.prom_id,{		  		
+			  			  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;
 			  				  }
 			  			  })
 			   }	  
@@ -638,7 +640,13 @@ Page({
 			  			    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==4){
 			  				  if (good.goods_num > prom.limitqty-prom.buy_num) {
@@ -897,6 +905,7 @@ Page({
 	check_more_order:async function(item){
 		  var pickup=null,th=this;
+		  var user_id=getApp().globalData.userInfo.user_id;
           wx.showLoading();
 		  //--------获取门店-----------
 		  await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + item.pickup_id, {
@@ -980,41 +989,62 @@ Page({
 			  if(card_field && good[card_field]>0){
 			  	 b_item.price=good[card_field]; 
 			  }
-			  		  
-			  //--判断商品当前的活动情况--
-			  switch(good.prom_type){
-				  case 1: 
-				     var flash=null;
-				     getApp().request.promiseGet("/api/ms/flash_sale/get/" + os.stoid + "/" + good.prom_id, {						 
-					 }).then(res=>{
-						  if (res.data.code== 0) {
-							  flash=res.data.data;
-						  }
-					 })				 		
-					 //----已经结束-----
-					 if (flash && flash.is_end == 0 && flash.end_time > timestamp && flash.start_time > timestamp ) {
-					      prom=flash;
-						  b_item.price=prom.price;  //
-					 }				 
-				     break;			    
-				  case 6: 
-				     b_item.is_pd_normal=1; break;
-                  case 7:
-                      //如果有组合购
-                      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 && res.data.data.is_end==0
-                                  && ut.gettimestamp()<res.data.data.end_time
-                                  && ut.gettimestamp()>res.data.data.start_time
-                              ){
-                                  b_item.prom_type=7;
-                                  b_item.prom_id=res.data.data.id;
+
+              var url="/api/weshop/activitylist/getGoodActInfo";
+              var req_data={
+                  store_id:g_item.store_id,goodsidlist:g_item.goods_id,is_detail:1
+              };
+              await getApp().request.promiseGet(url, {data:req_data}).then(res=>{
+                  if(res.data.code==0){
+                      var list = res.data.data;
+                      for(let i in list){
+                          let item=list[i];
+                          if(item.prom_type==1){ good.prom_type=1; good.prom_id=item.act_id; }
+                      }
+                  }
+              })
+
+              if(!prom) {
+                  //--判断商品当前的活动情况--
+                  switch (good.prom_type) {
+                      case 1:
+                          var flash = null;
+                          await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + good.prom_id, {}).then(res => {
+                              if (res.data.code == 0) {
+                                  flash = res.data.data;
                               }
+                          })
+                          //----已经结束-----
+                          if (flash && flash.is_end == 0 && flash.end_time > timestamp && flash.start_time < timestamp) {
+                              prom = flash;
+                              prom.price = prom.user_price;
+                              b_item.price = prom.price;
+                              good.prom_type = 1;
+                              good.prom_id = prom.id;
                           }
-                      })
-                      break;
-			  }
+                          break;
+                      case 6:
+                          b_item.is_pd_normal = 1;
+                          break;
+                      case 7:
+                          //如果有组合购
+                          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 && res.data.data.is_end == 0
+                                      && ut.gettimestamp() < res.data.data.end_time
+                                      && ut.gettimestamp() > res.data.data.start_time
+                                  ) {
+                                      b_item.prom_type = 7;
+                                      b_item.prom_id = res.data.data.id;
+                                      good.prom_type = 7;
+                                      good.prom_id = res.data.data.id;
+                                  }
+                              }
+                          })
+                          break;
+                  }
+              }
 			  //如果有优惠促销的时候,要看下商品的优惠活动有没有过期
 			  if(g_item.prom_type==3 || good.prom_type==3){
@@ -1132,7 +1162,6 @@ Page({
 				  back_goods_arr.push(b_item);  //返回商品元素	
 			  }else{
-				  
 				  //-- 看一下购物车上有多少商品 --
 				  var cart_num=0;				  
 				  await getApp().request.promiseGet("/api/weshop/cart/page", {				  	
@@ -1151,8 +1180,7 @@ Page({
 						  }
 						  cart_num=num;						 
 				  })
-				  			  
-				  
+
 				  if(good.store_count<=0){
 					  err_text+= good['goods_name']+"库存不足\n";
 					  continue; 
@@ -1226,16 +1254,19 @@ Page({
 					   if(b_item.goods_num>redis_num){
 						   b_item.goods_num=redis_num;
-					   }									 
-													  												 												  
-					   if(cart_num+buynum>prom['buy_limit']){
-					   	  err_text+= good['goods_name']+"超出活动限购\n";continue;
 					   }
-					   prom['buy_limit'] -= (cart_num+buynum);
-					   if(b_item.goods_num>prom['buy_limit']){
-					   	   b_item.goods_num=prom['buy_limit'];				   
-					   }
-					  
+
+					   if(prom['buy_limit']>0){
+                           if(cart_num+buynum>prom['buy_limit'] ){
+                               err_text+= good['goods_name']+"超出活动限购\n";continue;
+                           }
+                           prom['buy_limit'] -= (cart_num+buynum);
+                           if(b_item.goods_num>prom['buy_limit']){
+                               b_item.goods_num=prom['buy_limit'];
+                           }
+                       }
+													  												 												  
+
 				  }
 				  back_goods_arr.push(b_item);  //返回商品元素			  					  
 			  }		  			
@@ -1400,7 +1431,39 @@ Page({
 			icon: 'none',
 			duration: 3000
 		})
-	}
+	},
+
+    con_weixin:function () {
+        var url=this.data.sys_switch.weapp_customertype_url;
+        var id=this.data.sys_switch.weapp_customertype_appid;
+        wx.openCustomerServiceChat({
+            extInfo: {url: url},
+            corpId: id,
+            success(res) {}
+        })
+    },
+
+    //跳转到商品
+    go_gd:function (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
+        };
+        //获取秒杀的多规格
+        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);
+            }
+        })
+    }
@@ -20,12 +20,12 @@
         </view>
         <!--wx:if="{{item.return_btn!=4}}" -->
         <view class="order-detail" wx:for="{{order.order_goods}}" wx:key="{{index}}" >
-            <view class="goods-img">
+            <view class="goods-img"  bindtap="go_gd" data-gd="{{item.goods_id}}">
                 <image class="wh100" src="{{resourceUrl+item.original_img}}"  binderror="bind_bnerr" lazy-load="true"
                         data-errorimg="order.order_goods[{{index}}].original_img"></image>
             </view>
-
-            <navigator class="order-cont" openType="navigate" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
+            <!-- 跳转到商品 -->
+            <navigator class="order-cont"  bindtap="go_gd" data-gd="{{item.goods_id}}">
                 <view class="goods-name">{{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>
@@ -53,15 +53,10 @@
         <view class="order-operate">
             <view bindtap="checkTeam" class="contact-us check-btn" wx:if="{{optionIsGoup}}">查看拼团详情</view>
 						<view>
-							<!-- <button wx:if="{{sys_switch.weapp_customertype}}" class="custom-service cart-ico new_split"  open-type="contact"  session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}"> -->
-							    <!-- <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
-							    <view></view> -->
-							  <!-- </button> -->
-								<button wx:if="{{sys_switch.weapp_customertype}}" class="contact-us goods-btn"  open-type="contact"  session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">联系客服</button>
-							<!-- <view wx:else class="custom-service cart-ico new_split" bindtap="contactService">
-								<image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
-								<view>联系客服</view>
-							</view> -->
+
+							<button wx:if="{{sys_switch.weapp_customertype==1}}" class="contact-us goods-btn"  open-type="contact"  session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">联系客服</button>
+
+                            <view wx:elif="{{sys_switch.weapp_customertype==2}}" bindtap="con_weixin" class="contact-us goods-btn">联系客服</view>
 							<view wx:else bindtap="contactService" class="contact-us goods-btn">联系客服</view>
 						</view>
             <!-- <view bindtap="contactService" class="contact-us goods-btn">联系客服</view> -->
@@ -70,6 +70,13 @@ Page({
 		var nowDate = now.getFullYear() + '-' + (now.getMonth() + 1) + '-' + now.getDate(); 
 		var date = new Date(now.getTime() - 7 * 24 * 3600 * 1000);
 		var startDate=date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate(); 
+			
+		
+		if(t.index) {
+			this.setData({
+				currentIndex: t.index
+			});
+		};
 		this.setData({
 			currentDate: this.currentDate(),	
@@ -497,7 +504,7 @@ Page({
             await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
                 data: {
                     store_id: os.stoid,
-                    user_id: getApp().globalData.user_id,
+                    user_id: user_id,
                     goods_id: good.goods_id,
                     prom_type: good.prom_type,
                     prom_id: good.prom_id
@@ -567,12 +574,9 @@ Page({
                 })
                 var num = good['buyqty'];
-                console.log(1111);
-                console.log(num);
                 //---- 要计算商品的限购 -----
                 if (good['buyqty'] > 0) {
                     if (good.goods_num + promgoodsbuynum > good['buyqty']) {
-
                         var content = good['goods_name'] + "超出活动限购\n";
                         th.toast(content);
                         return false;
@@ -658,7 +662,7 @@ Page({
             //商品的普通购买 ，不要进行判断
             if ((good.prom_type == 1 || good.prom_type == 6 || good.prom_type == 4 || good.prom_type == 8)
                 && !good.is_gift && !good.is_collocation && !good.is_integral_normal && !good.is_pd_normal) {
-                if (gg.prom_type != good.prom_type) {
+                if (gg.prom_type != good.prom_type && gg.prom_type>0) {
                     var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买';
                     th.toast(content);
                     return false;
@@ -671,9 +675,10 @@ Page({
                     //---如果是活动的时候---
                     var prom = null, th = this;
                     if (gg.prom_type == 1) {
-                        await getApp().request.promiseGet("/api/ms/flash_sale/get/" + os.stoid + "/" + gg.prom_id, {}).then(res => {
+                        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;
                             }
                         })
                     }
@@ -771,13 +776,13 @@ Page({
                 }
             }
-            console.log("------------------------------------");
             //---如果是活动的时候---
             var prom = null, goodsinfo = good, th = this;
             if (goodsinfo.prom_type == 1) {
-                await getApp().request.promiseGet("/api/ms/flash_sale/get/" + os.stoid + "/" + goodsinfo.prom_id, {}).then(res => {
+                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;
                     }
                 })
             }
@@ -803,7 +808,6 @@ Page({
             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;
@@ -817,6 +821,13 @@ Page({
                     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 == 4) {
                     if (good.goods_num > prom.limitqty - prom.buy_num) {
@@ -1058,388 +1069,413 @@ Page({
 	  var item=th.data.orderList[index];
 	  th.check_more_order(item);  
   },
-  
-  check_more_order:async function(item){
-	  var pickup=null,th=this;
-      wx.showLoading();
-	  //--------获取门店-----------
-	  await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + item.pickup_id, {
-	       
-	  }).then(res=>{		
-		   pickup = res.data.data;
-	  })
-			
-	  //--------获取商品----------
-	  var goods_list=item.order_goods;	  
-	  //--- 返回的内容 ---
-	  var back_goods_arr=[];
-	  var err_text="";
-	  for(var i in goods_list){
-		  var g_item=goods_list[i];
-		   //--如果是赠品，不加入购物车--
-		  if(g_item['is_gift']) continue;
-		  if(g_item['prom_type']==4 ){
-		       err_text+= g_item['goods_name']+"积分购商品不加入购物车\n";
-		       continue;
-		  }
-		  if(g_item['prom_type']==5){
-			  err_text+= g_item['goods_name']+"搭配购商品不加入购物车\n";
-			  continue;
-		  }
-		  if(g_item['prom_type']==6 ){
-			  err_text+= g_item['goods_name']+"拼团商品不加入购物车\n";
-			  continue;
-		  }
-		  //--获取商品--
-		  var good=null;
-		  await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + g_item.goods_id, {
-		  }).then(res=>{
-			  good=res.data.data;
-		  })
-
-		  if(!good){
-			  err_text+= g_item['goods_name']+"未找到商品\n";
-			  continue;
-		  }
-		  if (good.is_on_sale != 1) {
-			  err_text+= g_item['goods_name']+"已经下架\n";
-			  continue;
-		  }
+  check_more_order:async function(item){
+        var pickup=null,th=this;
+        var user_id=getApp().globalData.user_id;
+        wx.showLoading();
+        //--------获取门店-----------
+        await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + item.pickup_id, {
+
+        }).then(res=>{
+            pickup = res.data.data;
+        })
-		  var timestamp = ut.gettimestamp();
-		  if (good.on_time > timestamp) {
-		    err_text+= g_item['goods_name']+"还未上架\n";
-		    continue;
-		  }
-		  if (good.down_time > 0) {
-		    if (good.down_time < timestamp) {
-		        err_text+=g_item['goods_name']+"已经下架\n";
-		        continue;
-		    }
-		  }
+        //--------获取商品----------
+        var goods_list=item.order_goods;
+        //--- 返回的内容 ---
+        var back_goods_arr=[];
+        var err_text="";
+        for(var i in goods_list){
+            var g_item=goods_list[i];
+            //--如果是赠品，不加入购物车--
+            if(g_item['is_gift']) continue;
+            if(g_item['prom_type']==4 ){
+                err_text+= g_item['goods_name']+"积分购商品不加入购物车\n";
+                continue;
+            }
+            if(g_item['prom_type']==5){
+                err_text+= g_item['goods_name']+"搭配购商品不加入购物车\n";
+                continue;
+            }
+            if(g_item['prom_type']==6 ){
+                err_text+= g_item['goods_name']+"拼团商品不加入购物车\n";
+                continue;
+            }
-		  //如果商品的配送方式和门店不匹配
-	      if(good['distr_type']>0 && pickup['distr_type']>0 && good['distr_type']!=pickup['distr_type'] ){
-		     err_text+= good['goods_name']+"配送方式不一致\n";
-		     continue;
-	      }
+            //--获取商品--
+            var good=null;
+            await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + g_item.goods_id, {
-		  var prom=null;
-		  var b_item={}
-		  b_item.goods_id=g_item.goods_id;
-		  b_item.goods_name=g_item.goods_name;
-		  b_item.goods_num=g_item.goods_num;
-		  b_item.guide_id=g_item.guide_id;
-		  b_item.guide_type=g_item.guide_type;
-		  b_item.pickup_id=item.pickup_id;
-		  b_item.price=good.shop_price;
-		  b_item.goods_sn=good.goods_sn;
-		  b_item.sku=good.sku;
-		  b_item.is_integral_normal=g_item.is_integral_normal;
-
-		  //-- 如果会员是等级卡的时候,同时商品也有设置相应的卡价格 --
-		  var card_field=th.data.card_field;
-		  if(card_field && good[card_field]>0){
-			   b_item.price=good[card_field];
-		  }
+            }).then(res=>{
+                good=res.data.data;
+            })
-		  //--判断商品当前的活动情况--
-		  switch(good.prom_type){
-			  //秒杀
-			  case 1:
-			     var flash=null;
-			     await getApp().request.promiseGet("/api/ms/flash_sale/get/" + os.stoid + "/" + good.prom_id, {
-				 }).then(res=>{
-					  if (res.data.code== 0) {
-						  flash=res.data.data;
-					  }
-				 })
-				 //----活动还没有结束-----
-				 if (flash && flash.is_end == 0 && flash.end_time>timestamp && flash.start_time<timestamp ) {
-				      prom=flash;
-					  b_item.price=prom.price;  //
-				 }
-			     break;
-
-			  //拼团
-			  case 6:
-			     b_item.is_pd_normal=1;
-			     break;
-              //组合购的再来一单
-              case 7:
-                  //如果有组合购
-                  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 && res.data.data.is_end==0
-                              && ut.gettimestamp()<res.data.data.end_time
-                              && ut.gettimestamp()>res.data.data.start_time
-                           ){
-                              b_item.prom_type=7;
-                              b_item.prom_id=res.data.data.id;
-                          }
-                      }
-                  })
-                  break;
-		  }
+            if(!good){
+                err_text+= g_item['goods_name']+"未找到商品\n";
+                continue;
+            }
+            if (good.is_on_sale != 1) {
+                err_text+= g_item['goods_name']+"已经下架\n";
+                continue;
+            }
+            var timestamp = ut.gettimestamp();
+            if (good.on_time > timestamp) {
+                err_text+= g_item['goods_name']+"还未上架\n";
+                continue;
+            }
+            if (good.down_time > 0) {
+                if (good.down_time < timestamp) {
+                    err_text+=g_item['goods_name']+"已经下架\n";
+                    continue;
+                }
+            }
-		  //如果有优惠促销的时候,要看下商品的优惠活动有没有过期
-		  if(g_item.prom_type==3 || good.prom_type==3){
-			  await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/1", {}).then(res => {
-				if (res.data.code == 0) {
-					var r_data = res.data.data;
-					if (r_data.promGoodsLists) {
-						 b_item.prom_type=3;
-						 b_item.prom_id=r_data.promGoodsLists[0].prom_id;
-					}
-				}
-			  })
-		  }
+            //如果商品的配送方式和门店不匹配
+            if(good['distr_type']>0 && pickup['distr_type']>0 && good['distr_type']!=pickup['distr_type'] ){
+                err_text+= good['goods_name']+"配送方式不一致\n";
+                continue;
+            }
-		  //判断是不是线下库存的购买，  是不是秒杀活动
-		  if(th.data.sales_rules==2 && !prom){
-			  //-- 看一下购物车上有多少商品 --
-			  var cart_num=0;
-			  await getApp().request.promiseGet("/api/weshop/cart/page", {
-				 data: {
-					store_id: os.stoid,
-					user_id: getApp().globalData.user_id,
-					state:0, is_gift:0,
-					goods_id:good.goods_id,
-					pick_id: b_item.pickup_id
-				 }
-			  }).then(res=>{
-				  var num = 0;
-				  if(res.data.code==0 && res.data.data && res.data.data.pageData) {
-					  for (var i = 0; i < res.data.data.pageData.length; i++) {
-						  num += res.data.data.pageData[i].goods_num;
-					  }
-				  }
-				  cart_num=num;
-			  })
+            var prom=null;
+            var b_item={}
+            b_item.goods_id=g_item.goods_id;
+            b_item.goods_name=g_item.goods_name;
+            b_item.goods_num=g_item.goods_num;
+            b_item.guide_id=g_item.guide_id;
+            b_item.guide_type=g_item.guide_type;
+            b_item.pickup_id=item.pickup_id;
+            b_item.price=good.shop_price;
+            b_item.goods_sn=good.goods_sn;
+            b_item.sku=good.sku;
+            b_item.is_integral_normal=g_item.is_integral_normal;
+
+            //-- 如果会员是等级卡的时候,同时商品也有设置相应的卡价格 --
+            var card_field=th.data.card_field;
+            if(card_field && good[card_field]>0){
+                b_item.price=good[card_field];
+            }
-			  var lock=0,plist=null;
-
-			  if(b_item.prom_type!=7) {
-                  //先读取门店的lock,
-                  await getApp().request.promiseGet("/api/weshop/order/ware/lock/page", {
-                      data: {store_id: os.stoid, wareId: good.goods_id, storageId: b_item.pickup_id, pageSize: 1000}
-                  }).then(res => {
-                      if (res.data.code == 0 && res.data.data.total > 0) {
-                          for (var i in res.data.data.pageData)
-                              lock += res.data.data.pageData[i].outQty
-                      }
-                  })
-                  //---通过接口获取门店的线下库存信息--
-                  await getApp().request.promiseGet("/api/weshop/goods/getWareStorages", {
-                      data: {
-                          storageNos: pickup.pickup_no,
-                          wareIds: encodeURIComponent(good.erpwareid),
-                          storeId: os.stoid
-                      }
-                  }).then(res => {
-                      if (res.data.code == 0 && res.data.data.total > 0) {
-                          plist = res.data.data.pageData[0];
-                      }
-                  })
-
-                  if (!plist) {
-                      err_text += good['goods_name'] + "库存不足\n";
-                      continue;
-                  }
-                  if (plist.CanOutQty - lock <= 0) {
-                      err_text += good['goods_name'] + "库存不足\n";
-                      continue;
-                  }
-                  if (b_item.goods_num > (plist.CanOutQty - lock)) {
-                      b_item.goods_num = plist.CanOutQty - lock;
+            var url="/api/weshop/activitylist/getGoodActInfo";
+            var req_data={
+                store_id:g_item.store_id,goodsidlist:g_item.goods_id,is_detail:1
+            };
+            await getApp().request.promiseGet(url, {data:req_data}).then(res=>{
+              if(res.data.code==0){
+                  var list = res.data.data;
+                  for(let i in list){
+                  	let item=list[i];
+                  	if(item.prom_type==1){ good.prom_type=1; good.prom_id=item.act_id; }
                   }
               }
-			  var req_data={
-			      store_id: os.stoid,
-			      user_id: getApp().globalData.user_id,
-			      goods_id: good.goods_id,
-			  };
+            })
-			  if(b_item.prom_type==7){
-                  req_data.prom_type=7;
-                  req_data.prom_id=b_item.prom_id;
-              }
+            if(!prom) {
+                //--判断商品当前的活动情况--
+                switch (good.prom_type) {
+                    case 1:
+                        var flash = null;
+                        await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + good.prom_id, {}).then(res => {
+                            if (res.data.code == 0) {
+                                flash = res.data.data;
+                            }
+                        })
+                        //----已经结束-----
+                        if (flash && flash.is_end == 0 && flash.end_time > timestamp && flash.start_time < timestamp) {
+                            prom = flash;
+                            prom.price = prom.user_price;
+                            b_item.price = prom.user_price;
+                        }
+                        break;
+                    case 6:
+                        b_item.is_pd_normal = 1;
+                        break;
+                    case 7:
+                        //如果有组合购
+                        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 && res.data.data.is_end == 0
+                                    && ut.gettimestamp() < res.data.data.end_time
+                                    && ut.gettimestamp() > res.data.data.start_time
+                                ) {
+                                    b_item.prom_type = 7;
+                                    b_item.prom_id = res.data.data.id;
+                                    good.prom_type = 7;
+                                    good.prom_id = b_item.prom_id;
-			  var buynum=0;
-			  var promnum=0;
-			  //---要获得商品，该用户买了多少件,同步应用---
-			  await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
-			    data: req_data,
-			  }).then(res => {
-				  if(res.data.code==0){
-					 var buy_num_data = res.data.data;
-					 buynum = buy_num_data.goodsbuynum;
-					 if(buy_num_data.promgoodsbuynum){
-                         promnum=buy_num_data.promgoodsbuynum;
-                     }
-				  }
-			  })
+                                }
+                            }
+                        })
+                        break;
+                }
+            }
-			  //---- 要计算商品的限购 -----
-			  if(good['viplimited']>0){
-				  if(cart_num+buynum>good['viplimited']){
-					   err_text+= good['goods_name']+"超出限购\n";
-					   continue;
-				  }
-				  good['viplimited']-=(cart_num+buynum);
-				  if(b_item.goods_num>good['viplimited']){
-					  b_item.goods_num=good['viplimited'];
-				  }
-			  }
-			  //不算组合购的限购
-			  back_goods_arr.push(b_item);  //返回商品元素
+            //如果有优惠促销的时候,要看下商品的优惠活动有没有过期
+            if(g_item.prom_type==3 || good.prom_type==3){
+                await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/1", {}).then(res => {
+                    if (res.data.code == 0) {
+                        var r_data = res.data.data;
+                        if (r_data.promGoodsLists) {
+                            b_item.prom_type=3;
+                            b_item.prom_id=r_data.promGoodsLists[0].prom_id;
+                        }
+                    }
+                })
+            }
-		  }else{
-			  //-- 看一下购物车上有多少商品 --
-			  var cart_num=0;
-			  await getApp().request.promiseGet("/api/weshop/cart/page", {
-					 data: {
-						store_id: os.stoid,
-						user_id: getApp().globalData.user_id,
-						state:0, is_gift:0,
-						goods_id:good.goods_id
-					 }
-			  }).then(res=>{
-					  var num = 0;
-					  if(res.data.code==0 && res.data.data && res.data.data.pageData) {
-						  for (var i = 0; i < res.data.data.pageData.length; i++) {
-							  num += res.data.data.pageData[i].goods_num;
-						  }
-					  }
-					  cart_num=num;
-			  })
+            //判断是不是线下库存的购买，  是不是秒杀活动
+            if(th.data.sales_rules==2 && !prom){
+
+                //-- 看一下购物车上有多少商品 --
+                var cart_num=0;
+                await getApp().request.promiseGet("/api/weshop/cart/page", {
+                    data: {
+                        store_id: os.stoid,
+                        user_id: getApp().globalData.user_id,
+                        state:0, is_gift:0,
+                        goods_id:good.goods_id,
+                        pick_id: b_item.pickup_id
+                    }
+                }).then(res=>{
+                    var num = 0;
+                    if(res.data.code==0 && res.data.data && res.data.data.pageData) {
+                        for (var i = 0; i < res.data.data.pageData.length; i++) {
+                            num += res.data.data.pageData[i].goods_num;
+                        }
+                    }
+                    cart_num=num;
+                })
+                var lock=0,plist=null;
-			  if(good.store_count<=0){
-				  err_text+= good['goods_name']+"库存不足\n";
-				  continue;
-			  }
-			  if(b_item.goods_num>good.store_count)
-			      b_item.goods_num=good.store_count;
-
-		      var buynum=0;             //商品已经购买多少件
-		      var promgoodsbuynum=0;	//活动已经购买多少件
-			  var redis_num = 0;        //redis库存
-
-		      var req_data={
-		          store_id: os.stoid,
-		          user_id: getApp().globalData.user_id,
-		          goods_id: good.goods_id,
-		      };
-
-		      if(prom){
-		      		req_data.prom_type= good.prom_type;
-		      		req_data.prom_id= good.prom_id;
-					b_item.prom_type=good.prom_type;
-					b_item.prom_id=good.prom_id;
-					//------判断活动是否抢光-----
-					await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" +
-					    os.stoid + "/" + good.prom_type + "/" + good.prom_id, {
-					  1: 1
-					}).then(res => {
-					  redis_num = res.data.data;
-					});
-					if(redis_num<=0){
-						err_text+= good['goods_name']+"活动不足\n";
-						continue;
-					}
+                if(b_item.prom_type!=7) {
+                    //先读取门店的lock,
+                    await getApp().request.promiseGet("/api/weshop/order/ware/lock/page", {
+                        data: {store_id: os.stoid, wareId: good.goods_id, storageId: b_item.pickup_id, pageSize: 1000}
+                    }).then(res => {
+                        if (res.data.code == 0 && res.data.data.total > 0) {
+                            for (var i in res.data.data.pageData)
+                                lock += res.data.data.pageData[i].outQty
+                        }
+                    })
-		      }
-
-		      //---要获得商品，该用户买了多少件,同步应用---
-		      await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
-		        data: req_data,
-		      }).then(res => {
-		      		if(res.data.code==0){
-		      			var buy_num_data = res.data.data;
-		      			if (buy_num_data.promgoodsbuynum) promgoodsbuynum = buy_num_data.promgoodsbuynum;
-		      			buynum = buy_num_data.goodsbuynum;
-		      		 }
-		      })
-
-			  //---- 要计算商品的限购 -----
-			  if(good['viplimited']>0){
-				  if(cart_num+buynum>good['viplimited']){
-					   err_text+= good['goods_name']+"超出限购\n";
-					   continue;
-				  }
-				  good['viplimited']-=(cart_num+buynum);
-				  if(b_item.goods_num>good['viplimited']){
-					  b_item.goods_num=good['viplimited'];
-				  }
+                    //---通过接口获取门店的线下库存信息--
+                    await getApp().request.promiseGet("/api/weshop/goods/getWareStorages", {
+                        data: {
+                            storageNos: pickup.pickup_no,
+                            wareIds: encodeURIComponent(good.erpwareid),
+                            storeId: os.stoid
+                        }
+                    }).then(res => {
+                        if (res.data.code == 0 && res.data.data.total > 0) {
+                            plist = res.data.data.pageData[0];
+                        }
+                    })
-			  }
+                    if (!plist) {
+                        err_text += good['goods_name'] + "库存不足\n";
+                        continue;
+                    }
+                    if (plist.CanOutQty - lock <= 0) {
+                        err_text += good['goods_name'] + "库存不足\n";
+                        continue;
+                    }
+                    if (b_item.goods_num > (plist.CanOutQty - lock)) {
+                        b_item.goods_num = plist.CanOutQty - lock;
+                    }
+                }
+                var req_data={
+                    store_id: os.stoid,
+                    user_id: getApp().globalData.user_id,
+                    goods_id: good.goods_id,
+                };
+                if(b_item.prom_type==7){
+                    req_data.prom_type=7;
+                    req_data.prom_id=b_item.prom_id;
+                }
-			  //-- 判断活动的库存 --
-			  if(prom){
-				   if(prom['goods_num']<=prom['buy_num']){
-				      err_text+= good['goods_name']+"超出活动库存\n";continue;
-				   }
+                var buynum=0;
+                var promnum=0;
+                //---要获得商品，该用户买了多少件,同步应用---
+                await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
+                    data: req_data,
+                }).then(res => {
+                    if(res.data.code==0){
+                        var buy_num_data = res.data.data;
+                        buynum = buy_num_data.goodsbuynum;
+                        if(buy_num_data.promgoodsbuynum){
+                            promnum=buy_num_data.promgoodsbuynum;
+                        }
+                    }
+                })
-				   if(b_item.goods_num>prom['goods_num']-prom['buy_num']){
-				      b_item['goods_num']= b_item['goods_num']-b_item['buy_num'];
-				   }
+                //---- 要计算商品的限购 -----
+                if(good['viplimited']>0){
+                    if(cart_num+buynum>good['viplimited']){
+                        err_text+= good['goods_name']+"超出限购\n";
+                        continue;
+                    }
+                    good['viplimited']-=(cart_num+buynum);
+                    if(b_item.goods_num>good['viplimited']){
+                        b_item.goods_num=good['viplimited'];
+                    }
+                }
+                //不需要计算组合购的限购
-				   if(b_item.goods_num>redis_num){
-					   b_item.goods_num=redis_num;
-				   }
+                back_goods_arr.push(b_item);  //返回商品元素
-				   if(cart_num+buynum>prom['buy_limit']){
-				   	  err_text+= good['goods_name']+"超出活动限购\n";continue;
-				   }
-				   prom['buy_limit'] -= (cart_num+buynum);
-				   if(b_item.goods_num>prom['buy_limit']){
-				   	   b_item.goods_num=prom['buy_limit'];
-				   }
+            }else{
-			  }
-			  back_goods_arr.push(b_item);  //返回商品元素
-		  }
-	  }
-	  
-	  //有重新购买的数据是时候，就要重新生成订单	  
-	  if(back_goods_arr.length>0){
-		  th.setData({back_goods_arr:back_goods_arr});
-		  if(!err_text){
-			  th.more_add_cart();
-		  }else{
-			  // 如果没有获取用户信息
-			  wx.showModal({
-			  	title:'确定',
-			  	content: err_text+',确定要买其他商品码？',
-			  	success(res) {
-			  		if (res.confirm) {
-			  			//跳转到登录页
-			  			 th.more_add_cart();
-			  		}else{
-                        wx.hideLoading();
+                //-- 看一下购物车上有多少商品 --
+                var cart_num=0;
+                await getApp().request.promiseGet("/api/weshop/cart/page", {
+                    data: {
+                        store_id: os.stoid,
+                        user_id: getApp().globalData.user_id,
+                        state:0, is_gift:0,
+                        goods_id:good.goods_id
+                    }
+                }).then(res=>{
+                    var num = 0;
+                    if(res.data.code==0 && res.data.data && res.data.data.pageData) {
+                        for (var i = 0; i < res.data.data.pageData.length; i++) {
+                            num += res.data.data.pageData[i].goods_num;
+                        }
+                    }
+                    cart_num=num;
+                })
+
+
+                if(good.store_count<=0){
+                    err_text+= good['goods_name']+"库存不足\n";
+                    continue;
+                }
+                if(b_item.goods_num>good.store_count)
+                    b_item.goods_num=good.store_count;
+
+                var buynum=0;             //商品已经购买多少件
+                var promgoodsbuynum=0;	//活动已经购买多少件
+                var redis_num = 0;        //redis库存
+
+                var req_data={
+                    store_id: os.stoid,
+                    user_id: getApp().globalData.user_id,
+                    goods_id: good.goods_id,
+                };
+
+                if(prom){
+                    req_data.prom_type= good.prom_type;
+                    req_data.prom_id= good.prom_id;
+                    b_item.prom_type=good.prom_type;
+                    b_item.prom_id=good.prom_id;
+
+                    //------判断活动是否抢光-----
+                    await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" +
+                        os.stoid + "/" + good.prom_type + "/" + good.prom_id, {
+                        1: 1
+                    }).then(res => {
+                        redis_num = res.data.data;
+                    });
+                    if(redis_num<=0){
+                        err_text+= good['goods_name']+"活动不足\n";
+                        continue;
+                    }
+
+                }
+
+                //---要获得商品，该用户买了多少件,同步应用---
+                await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
+                    data: req_data,
+                }).then(res => {
+                    if(res.data.code==0){
+                        var buy_num_data = res.data.data;
+                        if (buy_num_data.promgoodsbuynum) promgoodsbuynum = buy_num_data.promgoodsbuynum;
+                        buynum = buy_num_data.goodsbuynum;
+                    }
+                })
+
+                //---- 要计算商品的限购 -----
+                if(good['viplimited']>0){
+                    if(cart_num+buynum>good['viplimited']){
+                        err_text+= good['goods_name']+"超出限购\n";
+                        continue;
+                    }
+                    good['viplimited']-=(cart_num+buynum);
+                    if(b_item.goods_num>good['viplimited']){
+                        b_item.goods_num=good['viplimited'];
+                    }
+
+                }
+
+                //-- 判断活动的库存 --
+                if(prom) {
+                    if (prom['goods_num'] <= prom['buy_num']) {
+                        err_text += good['goods_name'] + "超出活动库存\n";
+                        continue;
+                    }
+
+                    if (b_item.goods_num > prom['goods_num'] - prom['buy_num']) {
+                        b_item['goods_num'] = b_item['goods_num'] - b_item['buy_num'];
+                    }
+
+                    if (b_item.goods_num > redis_num) {
+                        b_item.goods_num = redis_num;
+                    }
+
+                    if (prom['buy_limit'] > 0) {
+                        if (cart_num + buynum > prom['buy_limit']) {
+                            err_text += good['goods_name'] + "超出活动限购\n";
+                            continue;
+                        }
+                        prom['buy_limit'] -= (cart_num + buynum);
+                        if (b_item.goods_num > prom['buy_limit']) {
+                            b_item.goods_num = prom['buy_limit'];
+                        }
+                    }
+                }
+
+
+                back_goods_arr.push(b_item);  //返回商品元素
+            }
+        }
+
+        //有重新购买的数据是时候，就要重新生成订单
+        if(back_goods_arr.length>0){
+            th.setData({back_goods_arr:back_goods_arr});
+            if(!err_text){
+                th.more_add_cart();
+            }else{
+                wx.hideLoading();
+                // 如果没有获取用户信息
+                wx.showModal({
+                    title:'确定',
+                    content: err_text+',确定要买其他商品码？',
+                    success(res) {
+                        if (res.confirm) {
+                            //跳转到登录页
+                            th.more_add_cart();
+                        }else{
+                            th.data.moring=0;
+                            wx.hideLoading();
+                        }
+                    },fail(){
                         th.data.moring=0;
+                        wx.hideLoading();
                     }
-			  	},
-                fail: function (res) {
-                    wx.hideLoading();
-			  	    th.data.moring=0;
-			  	},//接口调用失败的回调函数
-			  });
-			  
-		  }		  
-	  }else{
-          wx.hideLoading();
-          this.data.moring=0;
-		  getApp().confirmBox(err_text);  
-	  }	  
-  },
+                });
+
+            }
+        }else{
+            th.data.moring=0;
+            wx.hideLoading();
+            getApp().confirmBox(err_text);
+        }
+    },
   more_add_cart:async function(){	 
 	  var back_goods_arr=this.data.back_goods_arr;     
@@ -241,7 +241,10 @@
 <view class="offline-container" wx:else>
 		<view class="offline-list">
 			<view class="item" wx:for="{{list2}}">
-				<view class="title"><text class="iconfont icon-order"></text>单号：{{item.No}}</view>
+				<view class="title">
+					<view><text class="iconfont icon-order"></text>单号：{{item.No}}</view>
+					<view>{{item.states}}</view>
+				</view>
 				<view class="subtitle">
 					<text>{{item.BillDate}}</text>
 					<view>消费总额：<text class="co-red fs28">￥{{item.Sum}}</text></view>
@@ -566,6 +566,7 @@ page {
 	padding: 20rpx;
 	font-size: 26rpx;
 	display: flex;
+	justify-content: space-between;
 	align-items: center;
 }
 .icon-order {