From 80cda58a8d3f8d544edd605017671fc6ca2b6738 Mon Sep 17 00:00:00 2001
From: taiyuan <taiyuan@yolipai.com>
Date: Mon, 22 Nov 2021 16:24:58 +0800
Subject: [PATCH] 幸运购

---
 packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js   |  20 --------------------
 packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxml |  11 +++++------
 packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js             | 934 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxml           |  11 ++++++-----
 packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxss           |   6 ++++++
 packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js         |  33 +++++++++++++++++----------------
 packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml       |   2 +-
 packageC/pages/luckyGo/luckyGo_list/luckyGo_list.js                   | 271 +++----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxml                 |  25 +++++++++++--------------
 packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxss                 |   4 ++--
 packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml               |  11 ++++++-----
 packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxss               |   2 +-
 pages/index/index/index.wxml                                          |   4 ++--
 13 files changed, 427 insertions(+), 907 deletions(-)

diff --git a/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js b/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js
index c08a3c4..24cf8d3 100644
--- a/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js
+++ b/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js
@@ -10,22 +10,6 @@ Page({
 		isLoading: false, // 检测是否已经发送请求,防止重复发送请求
 		noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据
 		pageNum: 1, // 当前页数
-		// typeArr: [{
-		// 	key: 'point',
-		// 	name: '积分',
-		// },{
-		// 	key: 'grow',
-		// 	name: '成长值',
-		// },{
-		// 	key: 'point',
-		// 	name: '优惠券',
-		// },{
-		// 	key: 'prestore_name',
-		// 	name: '项目服务',
-		// },{
-		// 	key: 'prestore_money',
-		// 	name: '预存金额',
-		// }],
   },
 	
   onLoad: function () {
@@ -54,13 +38,11 @@ Page({
 				    enabled: 1
 				  }
 				}).then(res => {
-					// console.log('获取广告', res);
 					if(res.data.code == 0) {
 						self.setData({
 							adList: res.data.data.pageData,
 						});
 					};
-					
 				});
 				
 				// 获取列表
@@ -72,8 +54,6 @@ Page({
 		
 				
 			};
-						
-		
 		};
   },
 	
diff --git a/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxml b/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxml
index 693287a..bf4862b 100644
--- a/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxml
+++ b/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxml
@@ -11,11 +11,11 @@
 	
 	<view class="list">	
 		<block wx:for="{{list.pageData}}">
-			<view class="list-item" wx:if="{{item.status}}">
-				
+			<view class="list-item" wx:if="{{item.status == 1}}" bindtap="go" data-url="/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id={{item.goods_id}}&prom_type=9&group_id={{item.id}}">
 				<view class="flex ai-center">
-					<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_bnerr" lazy-load="true"></image></view>
+					<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_bnerr" lazy-load="true" mode="heightFix"></image></view>
 					<view class="pdl20 flex fdc jc_sb f1">
 						
 						<view class="ellipsis-2 name fs28" data-content="{{item.group_num}}人团">{{item.title}}</view>
@@ -26,8 +26,7 @@
 							</view>
 							<view class="flex jc_sb">
 								<progress class="pdr20 f1 progress" percent="{{filters.percent(item.num, item.group_num)}}" activeColor="#FF6768" backgroundColor="#d0d0d0" border-radius="12" stroke-width="12" data-content="{{item.num}}人已参团"></progress>
-								<view class="btn fs26" bindtap="go" data-url="/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id={{item.goods_id}}&prom_type=9&group_id={{item.id}}">去参团</view>
-								<!-- &title=狐狸3号测速003&prom_type=7&prom_id=468 -->
+								<view class="btn fs26">去参团</view>
 							</view>
 						</view>
 						
diff --git a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js
index 4a28f1c..1ee2e18 100644
--- a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js
+++ b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js
@@ -50,8 +50,6 @@ Page({
 		showPoster: false,
   },
   onLoad: function (t) {
-      // wx.setNavigationBarTitle({ title: "拼团订单",})
-			// console.log('options========>', t);
 			if(t.team_id != null && t.team_id !=undefined) {
 				this.setData({
 					team_id: t.team_id,
@@ -109,13 +107,13 @@ Page({
 	
 	onUnload: function () {
 		// 开团成功后,清除storage里的team_id
-		if(this.data.luckyGoInfo.num == 0) {
+		if(this.data.luckyGoInfo.num && this.data.luckyGoInfo.num == 0) {
 			wx.removeStorageSync('team_id');
 		};
 	},
 	
   //关闭展开列表
-  click:function(e){
+  click: function(e) {
     this.setData({
       hiddenName: !this.data.hiddenName,
       zk: !this.data.zk,
@@ -123,7 +121,7 @@ Page({
   },
 	
   //打开收起拼团列表
-  czk:function(e){
+  czk: function(e) {
     this.setData({
       zk:!this.data.zk,
       hiddenName: !this.data.hiddenName,
@@ -131,28 +129,28 @@ Page({
   },
 	
  //打开蒙板提示
-  cmeng:function(e){
+  cmeng: function(e) {
     this.setData({
       meng:!this.data.meng,
     })
   },
 
   //关闭蒙板提示
-  cmc:function(e){
+  cmc: function(e) {
     this.setData({
       meng: !this.data.meng,
     })
   },
 	
 //打开二维码提示
-  cerweima:function(e){
+  cerweima: function(e) {
     this.setData({
       meng: !this.data.meng,
       erweima: !this.data.erweima,
     })
   },
 
-  cerc:function(e){
+  cerc: function(e) {
     this.setData({
       erweima: !this.data.erweima,
       meng: !this.data.meng,
@@ -347,9 +345,9 @@ Page({
 
     wx.setNavigationBarTitle({
       title: "拼团详情",
-    })
+    });
   
-    ee.countDown2();
+    // ee.countDown2();
 
     //获取分享图片的本地地址
     // var path2 = os.imghost + th.data.luckyGoInfo.original_img;
@@ -367,106 +365,112 @@ Page({
 
   },
   //---小于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;
+  // 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;
+  //       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;
-        }
+  //       //看一下，是否要支付尾款
+  //       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);
-  },
+  //       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 () {
+		var that = this, th = that;
+		var app = getApp();
+		
+		 // 关闭底部分享弹窗
+		this.setData({
+			share_hidden: false,
+		});
+		
     //--先判断会员状态--
     var user_info = getApp().globalData.userInfo;
     if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
       //getApp().my_warnning("请先登录",0,this);
-      wx.navigateTo({ url: '/pages/togoin/togoin', })
-      return false;
+      // wx.navigateTo({ url: '/pages/togoin/togoin', })
+      // return false;
     }
   
-    if (this.data.share_hidden) {
-      this.setData({ share_hidden: false,});
-    };
+    // if (this.data.share_hidden) {
+    //   this.setData({ share_hidden: false,});
+    // };
   
     //类型  0普通商品 1秒杀商品  2商家和会员团  3阶梯团  4阶梯团 9幸运购
     var type = 9;
-    if (type == 6) type = 2;
-    if (this.data.prom_act && this.data.prom_act.kttype == 3) type = 3;
+    // 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: '生成海报中'});
+    
     //设置画板显示，才能开始绘图
-    that.setData({
-      canvasHidden: false
-    })
+    // that.setData({
+    //   canvasHidden: true
+    // })
   
-    var app = getApp();
+    
     var unit = that.data.screenWidth / 750 * 1.35;  //基础单位，
-    var path2 = that.data.luckyGoInfo.original_img;
-    var scene = th.data.param.goods_id + "";
+    // var path2 = th.data.iurl + th.data.luckyGoInfo.original_img;
+    var scene = th.data.param.goods_id + '';
     scene+="."+9+"."+th.data.luckyGoInfo.id;
   
     var user_id = getApp().globalData.user_id ? getApp().globalData.user_id : 0;
     if (user_id > 0) {
       scene += "_" + user_id;
-    }
+    };
     //-- 如果不是会员分享过来的要分享给别人 --
-    if (getApp().globalData.room_id && th.data.data.goods_id == getApp().globalData.room_goods_id && !getApp().globalData.room_user_share) {
+    if(getApp().globalData.room_id && th.data.data.goods_id == getApp().globalData.room_goods_id && !getApp().globalData.room_user_share) {
       //固定房间是第3个字符
       if (!user_id) scene += "_0";
       scene += "_" + getApp().globalData.room_id;
-    }
+    };
     ///二微码
     var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
       os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo";
   
-    console.log(path3);
   	
-  
     // 读取文件成功则OK--
     wx.getImageInfo({
       src: path3,
@@ -488,489 +492,294 @@ Page({
   				
   
           //-- 如果有自定义海报的时候，判断背景的图片 --
-          if (th.data.share_b_img) {
-            pg_path = th.data.share_b_img;
-          }
+          // if (th.data.share_b_img) {
+          //   pg_path = th.data.share_b_img;
+          // }
+					
           // context.drawImage(pg_path, 0, 0, 554 * unit, 899 * unit);
   				
   				
-  				if(type == 0) { // 如果是普通商品，绘制新海报
-  					th.drawPoster(context, unit, th.data.share_goods_img, vpath);
-  				} else {
+  				// 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(type != 0) {
+  				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);
+  					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, 60 * unit);
-  // 					  var width = 24 * app.globalData.userInfo.nickname.length * unit + 2 * unit;
-  // 					  //强烈推荐 改许程
-  // 					 //  var tj_path = "../../../../images/share/q_tj.png";
-  // 						// let txt_gn = th.data.luckGoInfo.group_num + '人团';
-  // 						// let width_gn = ut.measureText(txt_gn, 15);
-  // 					 //  context.drawImage(tj_path, 152 * unit + width, 54 * unit, (width_gn + 20) * unit, 30 * unit);
-  // 					 //  context.setFontSize(16 * unit);
-  // 					 //  context.setLineJoin('round'); //交点设置成圆角
-  // 					 //  context.setFillStyle("white");
-  // 					 //  context.fillText(txt_gn, 149 * unit + width + 15 * unit, 75 * unit);
-  // 						// 发出幸运购活动邀请
-  // 						context.setFillStyle("#7f7f7f")
-  // 						context.setFontSize(21.3 * unit)
-  // 						context.fillText("向您发出幸运购邀请", 152 * unit, 90 * 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(getApp().globalData.userInfo.nickname, 152 * unit, 60 * unit);
+  					  var width = 24 * getApp().globalData.userInfo.nickname.length * unit + 2 * unit;
+  					  //强烈推荐 改许程
+  					 //  var tj_path = "../../../../images/share/q_tj.png";
+  						// let txt_gn = th.data.luckGoInfo.group_num + '人团';
+  						// let width_gn = ut.measureText(txt_gn, 15);
+  					 //  context.drawImage(tj_path, 152 * unit + width, 54 * unit, (width_gn + 20) * unit, 30 * unit);
+  					 //  context.setFontSize(16 * unit);
+  					 //  context.setLineJoin('round'); //交点设置成圆角
+  					 //  context.setFillStyle("white");
+  					 //  context.fillText(txt_gn, 149 * unit + width + 15 * unit, 75 * unit);
+  						// 发出幸运购活动邀请
+  						context.setFillStyle("#7f7f7f")
+  						context.setFontSize(21.3 * unit)
+  						context.fillText("向您发出幸运购邀请", 152 * unit, 90 * unit);
   
-  // 					}
+  					}
   					
-  // 				};
+  				};
   				
           
-		// 			// var share_title = th.data.data.goods_name;
-  // 				var share_title = th.data.param.goods_name;
-  //         if (th.data.prom_type == 1 || th.data.prom_type == 6 || th.data.prom_type == 4) {
-  //           share_title = th.data.prom_act.share_title;
-  //           if (!share_title) share_title = th.data.prom_act.title;
-  //           if (th.data.prom_type == 4) share_title = th.data.prom_act.name;
-  //         }
+					// var share_title = th.data.data.goods_name;
+  				var share_title = th.data.param.goods_name;
+          // if (th.data.prom_type == 1 || th.data.prom_type == 6 || th.data.prom_type == 4) {
+          //   share_title = th.data.prom_act.share_title;
+          //   if (!share_title) share_title = th.data.prom_act.title;
+          //   if (th.data.prom_type == 4) share_title = th.data.prom_act.name;
+          // }
   
-  //         //---产品名称---
-  //         //文本换行 参数：1、canvas对象，2、文本 3、距离左侧的距离 4、距离顶部的距离 5、6、文本的宽度
-  //         if (type != 4 && type != 0) {
-  //           context.setFillStyle("black");
-  //           context.setFontSize(21.3 * unit)
-  //           th.draw_Text(context, share_title,
-  //             38 * unit, 180 * unit, 220 * unit, 220 * unit, unit);
+          //---产品名称---
+          //文本换行 参数：1、canvas对象，2、文本 3、距离左侧的距离 4、距离顶部的距离 5、6、文本的宽度
+          if (type != 4 && type != 0) {
+            context.setFillStyle("black");
+            context.setFontSize(21.3 * unit);
+            th.draw_Text(context, share_title,
+              38 * unit, 180 * unit, 220 * unit, 220 * unit, unit);
   
-  //           //------产品的价格-------
-  //           context.setFontSize(23 * unit)
-  //           context.setFillStyle("red")
+            //------产品的价格-------
+            context.setFontSize(23 * unit);
+            context.setFillStyle("red");
   
   
-  //           // var pri0 = th.data.data.shop_price;
-		// 				var pri0 = th.data.luckyGoInfo.group_price;
-  //           if (th.data.prom_act)
-  //             pri0 = th.data.prom_act.price;
-  //           pri0 = parseFloat(pri0).toFixed(2);
-  //           var wd1 = th.data.screenWidth - ut.measureText(pri0, 31 * unit) - 25;
-  //           context.fillText("￥", wd1 - 15, 185 * unit);
-  //           context.setFontSize(31 * unit)
-  //           context.fillText(pri0, wd1, 185 * unit);
+            // var pri0 = th.data.data.shop_price;
+						var pri0 = th.data.luckyGoInfo.group_price/100;
+            if (th.data.prom_act) pri0 = th.data.prom_act.price;
+            pri0 = parseFloat(pri0).toFixed(2);
+            var wd1 = th.data.screenWidth - ut.measureText(pri0, 31 * unit) - 25;
+            context.fillText("￥", wd1 - 15, 185 * unit);
+            context.setFontSize(31 * unit);
+            context.fillText(pri0, wd1, 185 * unit);
   					
-  // 					var tj_path = "../../../../images/share/q_tj.png";
-  // 					context.drawImage(tj_path, 315 * unit, 158 * unit, 85 * unit, 30 * unit);
-  // 					context.setLineJoin('round'); //交点设置成圆角
-  // 					context.setFontSize(18 * unit);
-  // 					context.setFillStyle("white");
-  // 					context.fillText('参团价', 330 * unit, 179 * unit);
+  					var tj_path = "../../../../images/share/q_tj.png";
+  					context.drawImage(tj_path, 315 * unit, 158 * unit, 85 * unit, 30 * unit);
+  					context.setLineJoin('round'); //交点设置成圆角
+  					context.setFontSize(18 * unit);
+  					context.setFillStyle("white");
+  					context.fillText('参团价', 330 * unit, 179 * unit);
   
-  //           //---市场价划掉---
-  //           context.setFillStyle("gray")
-  //           context.setFontSize(22 * unit)
-  //           pri0 = "零售价：￥" + th.data.luckyGoInfo.market_price.toFixed(2);
-  //           var wd2 = th.data.screenWidth - ut.measureText(pri0, 22 * unit) - 25;
-  //           context.fillText(pri0, wd2, 213 * unit);
+            //---市场价划掉---
+            context.setFillStyle("gray");
+            context.setFontSize(22 * unit);
+            pri0 = "零售价：￥" + th.data.luckyGoInfo.market_price.toFixed(2);
+            var wd2 = th.data.screenWidth - ut.measureText(pri0, 22 * unit) - 25;
+            context.fillText(pri0, wd2, 213 * unit);
   
-  //           context.setStrokeStyle('gray');
-  //           context.setLineWidth(1 * unit);
-  //           context.moveTo(wd2 - 5, 206 * unit);
-  //           context.lineTo(wd2 + ut.measureText(pri0, 22 * unit) + 5, 206 * unit);
-  //           context.stroke();
+            context.setStrokeStyle('gray');
+            context.setLineWidth(1 * unit);
+            context.moveTo(wd2 - 5, 206 * unit);
+            context.lineTo(wd2 + ut.measureText(pri0, 22 * unit) + 5, 206 * unit);
+            context.stroke();
   
-  //         } else if(type == 4 && type != 0) {
-  //           context.setFillStyle("black");
-  //           context.setFontSize(21.3 * unit)
-  //           th.draw_Text(context, share_title,
-  //             38 * unit, 170 * unit, 20 * unit, 300 * unit, unit);
-  //           //------ 产品的价格 -----			 
-  //           var pri0 = th.data.prom_act.addmoney;
-  //           var integral = th.data.prom_act.integral;
-  //           var text = "";
-  //           if (integral) { text = integral + "积分"; }
-  //           if (pri0 && integral) { text += "+"; }
-  //           if (pri0) { text += "￥" + pri0; }
+          } else if(type == 4 && type != 0) {
+            context.setFillStyle("black");
+            context.setFontSize(21.3 * unit);
+            th.draw_Text(context, share_title,
+              38 * unit, 170 * unit, 20 * unit, 300 * unit, unit);
+            //------ 产品的价格 -----			 
+            var pri0 = th.data.prom_act.addmoney;
+            var integral = th.data.prom_act.integral;
+            var text = "";
+            if (integral) { text = integral + "积分"; }
+            if (pri0 && integral) { text += "+"; }
+            if (pri0) { text += "￥" + pri0; }
   
-  //           if (!pri0 && !integral) { text = "0积分"; }
-  //           context.setFillStyle("red");
-  //           context.fillText(text, 38 * unit, 235 * unit);
+            if (!pri0 && !integral) { text = "0积分"; }
+            context.setFillStyle("red");
+            context.fillText(text, 38 * unit, 235 * unit);
   
-  //         }
+          }
   
-  //         //---中间大图---
-  // 				if(type != 0) {
-  // 					// context.drawImage(th.data.share_goods_img, 70 * unit, 250 * unit, 408 * unit, 408 * unit);
-		// 				context.drawImage(th.data.luckyGoInfo.original_img, 70 * unit, 250 * unit, 408 * unit, 408 * unit);
-  // 				};
+          //---中间大图---
+  				// if(type != 0) {
+						// ee.data.share_img_localpath
+  					context.drawImage(that.data.share_img_localpath, 70 * unit, 250 * unit, 408 * unit, 408 * unit);
+						// wx.getImageInfo({
+						//     src:  th.data.iurl + th.data.luckyGoInfo.original_img,
+						//     ssuccess: function (res) {
+						//         //res.path是网络图片的本地地址
+						// 				console.log('res.path', res.path);
+						// 				context.drawImage(res.path, 70 * unit, 250 * unit, 408 * unit, 408 * unit);
+						//         // ee.data.share_img_localpath = res.path;
+						//         // tt();
+						//     },
+						//     fail: function (res) {
+						// 			// context.drawImage('../../../../images/share/default_g_img.gif', 70 * unit, 250 * unit, 408 * unit, 408 * unit);
+						//         // ee.data.share_img_localpath= "../../../../images/share/default_g_img.gif";  //分享的图片不能用网络的
+						//         // tt();
+						//     }
+						// });
+						// context.drawImage(th.data.luckyGoInfo.original_img, 70 * unit, 250 * unit, 408 * unit, 408 * unit);
+  				// };
   				
   				
           
-  //         //-------大图后面就不一样了-----------
-  //         switch (type) {
-  //           case 0: break;//普通商品的展示
-  //           case 4:
-  //             //中间的几个字
-  //             if (th.data.poster && parseInt(th.data.poster.style) == 2) {
-  //               if (parseInt(th.data.poster.show_quality)) {
-  //                 var g_path = "../../../../images/share/s_gou.png";
-  //                 context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit);
-  //                 context.setFillStyle("red")
-  //                 context.setFontSize(18 * unit)
-  //                 context.fillText("正品保证", 84 * unit, 690 * unit);
-  
-  //                 context.drawImage(g_path, 218 * unit, 670 * unit, 22 * unit, 22 * unit);
-  //                 context.setFillStyle("red")
-  //                 context.setFontSize(18 * unit)
-  //                 context.fillText("纯实体店", 246 * unit, 690 * unit);
-  
-  //                 context.drawImage(g_path, 388 * unit, 670 * unit, 22 * unit, 22 * unit);
-  //                 context.setFillStyle("red")
-  //                 context.setFontSize(18 * unit)
-  //                 context.fillText("官方验证", 420 * unit, 690 * unit);
-  //               }
-  
-  //             } else {
-  //               var g_path = "../../../../images/share/s_gou.png";
-  //               context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit);
-  //               context.setFillStyle("red")
-  //               context.setFontSize(18 * unit)
-  //               context.fillText("正品保证", 84 * unit, 690 * unit);
-  
-  //               context.drawImage(g_path, 218 * unit, 670 * unit, 22 * unit, 22 * unit);
-  //               context.setFillStyle("red")
-  //               context.setFontSize(18 * unit)
-  //               context.fillText("纯实体店", 246 * unit, 690 * unit);
-  
-  //               context.drawImage(g_path, 388 * unit, 670 * unit, 22 * unit, 22 * unit);
-  //               context.setFillStyle("red")
-  //               context.setFontSize(18 * unit)
-  //               context.fillText("官方验证", 420 * unit, 690 * unit);
-  //             }
-  
-  
-  //             //---画线---
-  //             context.setLineWidth(1 * unit)
-  //             context.moveTo(32 * unit, 710 * unit)
-  //             context.lineTo(520 * unit, 710 * unit)
-  //             context.stroke();
-  
-  //             //---文字---
-  //             context.setFillStyle("black")
-  //             context.setFontSize(22 * unit)
-  
-  //             if (type == 0) {
-  //               // 原来start --->				  
-  //               context.setFontSize(24 * unit)
-  //               context.fillText(th.data.sto_sele_name_1, 40 * unit, 766 * unit);
-  
-  //               context.setFontSize(22 * unit)
-  //               context.fillText("优惠乐翻天，精彩就在你身边", 40 * unit, 806 * unit);
-  //               context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 846 * unit);
-  
-  //             } else {
-  //               context.setFontSize(24 * unit)
-  //               context.fillText(th.data.sto_sele_name_1, 40 * unit, 766 * unit);
-  //               context.setFontSize(22 * unit)
-  //               context.fillText("长按识别二维码", 40 * unit, 806 * unit);
-  //               context.fillText("立即开始兑换", 40 * unit, 846 * 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, 136 * unit, 136 * unit);
-  //             } else {
-  //               //---二维吗图---
-  //               context.drawImage(vpath, 390 * unit, 726 * unit, 136 * unit, 136 * unit);
-  //             };
-  
-  //             break;
-  //           case 1: //秒杀商品的展示
-  //             //---画线---
-  //             context.setLineWidth(1 * unit)
-  //             context.moveTo(32 * unit, 670 * unit)
-  //             context.lineTo(520 * unit, 670 * unit)
-  //             context.stroke();
-  
-  //             //画秒杀的图片
-  //             var miaos_path = '../../../../images/share/miao_share.png';
-  //             context.drawImage(miaos_path, 43 * unit, 700 * unit, 222 * unit, 40 * unit);
-  
-  //             context.setFillStyle("black")
-  //             context.setFontSize(24 * unit)
-  //             context.fillText(th.data.sto_sele_name_1, 40 * unit, 786 * unit);
-  //             //---文字---
-  //             context.setFontSize(22 * unit)
-  //             context.setFillStyle("black")
-  //             context.fillText("特惠好物，限时秒杀", 40 * unit, 826 * unit);
-  //             context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 866 * 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, 135 * unit, 135 * unit);
-  //             } else {
-  //               //---二维吗图---
-  //               context.drawImage(vpath, 390 * unit, 726 * unit, 135 * unit, 135 * unit);
-  //             }
-  //             break;
-  
-  //           case 2: //会员团和商家团的展示
-  //             //---画线---
-  //             context.setLineWidth(1 * unit)
-  //             context.moveTo(32 * unit, 670 * unit)
-  //             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);
-  
-  //             //绘制成团图片
-  //             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.prom_act.ct_num;
-  //             context.setFontSize(14 * unit)
-  //             // context.font = 'normal';
-  //             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.prom_act.buy_num + "份", 166 * unit, 763 * unit);
-  
-  //             context.setFillStyle("gray")
-  //             context.fillText("快来和我一起拼团吧！", 40 * unit, 806 * unit);
-  //             context.setFillStyle("black")
-  //             // context.font = 'normal bold 18px sans-serif';
-  //             context.setFontSize(21.3 * unit)
-  //             context.fillText("长按识别二维码，立即参团", 40 * unit, 836 * 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, 136 * unit, 136 * unit);
-  //             } else {
-  //               //---二维吗图---
-  //               context.drawImage(vpath, 390 * unit, 726 * unit, 136 * unit, 136 * unit);
-  //             }
-  //             break
-  //           case 3: //阶梯团的展示
-  //             //---画线---
-  //             context.setLineWidth(1 * unit)
-  //             context.moveTo(32 * unit, 670 * unit)
-  //             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);
-  
-  //             //---绘制中间阶梯的价格---
-  //             var list = th.data.prom_act.ct_rylist;
-  //             for (var i = 0; i < list.length; i++) {
-  //               var item = list[i];
-  //               var wi = i * 90 * unit;
-  //               // context.font = 'normal';
-  //               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("快来和我一起拼团吧！", 40 * unit, 830 * unit);
-  //             // context.setFillStyle("black")
-  //             // context.font = 'normal bold 18px sans-serif';
-  //             // context.setFontSize(22 * unit)
-  //             // context.fillText("长按识别二维码，立即参团", 40 * unit, 860 * unit);
-  //             //context.setFillStyle("gray")
-  //             context.setFillStyle("black")
-  //             context.fillText("快来和我一起拼团吧！", 40 * unit, 820 * unit);
-  //             //context.font = 'normal bold 18px sans-serif';
-  //             context.setFontSize(21 * unit)
-  //             context.fillText("长按识别二维码，立即参团", 40 * unit, 850 * 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, 136 * unit, 136 * unit);
-  //             } else {
-  //               //---二维吗图---
-  //               context.drawImage(vpath, 390 * unit, 726 * unit, 136 * unit, 136 * unit);
-  //             }
-  //             break;
+          //-------大图后面就不一样了-----------
+          switch (type) {
+						case 9: 
   						
-  						
-  // 						case 9: 
-  						
-  // 							//---画线---
-  // 							context.setLineWidth(1 * unit)
-  // 							context.moveTo(32 * unit, 680 * unit)
-  // 							context.lineTo(520 * unit, 680 * unit)
-  // 							context.stroke();
+  							//---画线---
+  							context.setLineWidth(1 * unit)
+  							context.moveTo(32 * unit, 680 * unit)
+  							context.lineTo(520 * unit, 680 * unit)
+  							context.stroke();
   							
-  // 							//---文字---
-  // 							context.setFillStyle("black")
-  // 							context.setFontSize(24 * unit)
-  // 							// context.font = 'normal bold 18px';
-  // 							// context.fillText(th.data.sto_sele_name_1, 40 * unit, 720 * unit);
+  							//---文字---
+  							context.setFillStyle("black")
+  							context.setFontSize(24 * unit)
+  							// context.font = 'normal bold 18px';
+  							// context.fillText(th.data.sto_sele_name_1, 40 * unit, 720 * unit);
   
-  // 							//还差N人,即可成团
-  // 							let group_num = th.data.luckyGoInfo.group_num;
-  // 							let num_joined = th.data.luckyGoInfo.num;
-  // 							let delta1 = group_num - num_joined;
-  // 							let width_delta1 = ut.measureText(delta1, 15);
-  // 							context.setFillStyle("black");
-  // 							context.setFontSize(21.3 * unit);
-  // 							context.fillText(group_num + "人团，还差", 40 * unit, 772 * unit);
-  // 							context.setFillStyle("#FF6768");
-  // 							context.setFontSize(21.3 * unit);
-  // 							context.fillText(delta1, 160 * unit, 772 * unit);
-  // 							context.setFillStyle("black");
-  // 							context.setFontSize(21.3 * unit);
-  // 							context.fillText("人，即可成团", (170 + width_delta1) * unit, 772 * unit);
+  							//还差N人,即可成团
+  							let group_num = th.data.luckyGoInfo.group_num;
+  							let num_joined = th.data.luckyGoInfo.num;
+  							let delta1 = group_num - num_joined;
+  							let width_delta1 = ut.measureText(delta1, 15);
+  							context.setFillStyle("black");
+  							context.setFontSize(21.3 * unit);
+  							context.fillText(group_num + "人团，还差", 40 * unit, 772 * unit);
+  							context.setFillStyle("#FF6768");
+  							context.setFontSize(21.3 * unit);
+  							context.fillText(delta1, 160 * unit, 772 * unit);
+  							context.setFillStyle("black");
+  							context.setFontSize(21.3 * unit);
+  							context.fillText("人，即可成团", (170 + width_delta1) * unit, 772 * unit);
   							
-  // 							// N人得商品,N人全额退款
-  // 							let group_win = th.data.luckyGoInfo.group_win;
-  // 							let delta2 = group_num - group_win;
-  // 							let width_delta2 = ut.measureText(delta2, 16);
-  // 							let width_groupNum = ut.measureText(group_num, 15);
-  // 							let width_groupWin = ut.measureText(group_win, 15);
-  // 							context.setFillStyle("#FF6768");
-  // 							context.setFontSize(21.3 * unit);
-  // 							context.fillText(group_win, 40 * unit, 806 * unit);
-  // 							context.setFillStyle("black");
-  // 							context.setFontSize(21.3 * unit);
-  // 							context.fillText("人得商品，", (54 + width_groupWin) * unit, 806 * unit);
-  // 							context.setFillStyle("#FF6768");
-  // 							context.setFontSize(21.3 * unit);
-  // 							context.fillText(delta2, 160 * unit, 806 * unit);
-  // 							context.setFillStyle("black");
-  // 							context.setFontSize(21.3 * unit);
-  // 							context.fillText("人全额退款", (170 + width_delta2) * unit, 806 * unit);
+  							// N人得商品,N人全额退款
+  							let group_win = th.data.luckyGoInfo.group_win;
+  							let delta2 = group_num - group_win;
+  							let width_delta2 = ut.measureText(delta2, 16);
+  							let width_groupNum = ut.measureText(group_num, 15);
+  							let width_groupWin = ut.measureText(group_win, 15);
+  							context.setFillStyle("#FF6768");
+  							context.setFontSize(21.3 * unit);
+  							context.fillText(group_win, 40 * unit, 806 * unit);
+  							context.setFillStyle("black");
+  							context.setFontSize(21.3 * unit);
+  							context.fillText("人得商品，", (54 + width_groupWin) * unit, 806 * unit);
+  							context.setFillStyle("#FF6768");
+  							context.setFontSize(21.3 * unit);
+  							context.fillText(delta2, 160 * unit, 806 * unit);
+  							context.setFillStyle("black");
+  							context.setFontSize(21.3 * unit);
+  							context.fillText("人全额退款", (170 + width_delta2) * unit, 806 * unit);
   							
-  // 							// 并得帮团惊喜礼品
-  // 							context.setFillStyle("black")
-  // 							context.setFontSize(21.3 * unit)
-  // 							context.fillText("并得帮团", 40 * unit, 840 * unit);
-  // 							context.setFillStyle("#FF6768")
-  // 							context.setFontSize(21.3 * unit)
-  // 							context.fillText("惊喜礼品", 130 * unit, 840 * unit);
-  // 							context.setFillStyle("black")
-  // 							context.setFontSize(21.3 * unit)
-  // 							context.fillText("！", 220 * unit, 840 * unit);
+  							// 并得帮团惊喜礼品
+  							context.setFillStyle("black")
+  							context.setFontSize(21.3 * unit)
+  							context.fillText("并得帮团", 40 * unit, 840 * unit);
+  							context.setFillStyle("#FF6768")
+  							context.setFontSize(21.3 * unit)
+  							context.fillText("惊喜礼品", 130 * unit, 840 * unit);
+  							context.setFillStyle("black")
+  							context.setFontSize(21.3 * unit)
+  							context.fillText("！", 220 * unit, 840 * 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, 136 * unit, 136 * unit);
-  // 							} else {
-  // 							  //---二维吗图---
-  // 							  context.drawImage(vpath, 390 * unit, 726 * unit, 136 * unit, 136 * 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, 136 * unit, 136 * unit);
+  							} else {
+  							  //---二维吗图---
+  							  context.drawImage(vpath, 390 * unit, 726 * unit, 136 * unit, 136 * unit);
+  							}
   						 
-  // 							break;
+  							break;
   
   
-  //         }
+          }
   
   
-  //         //--- 如果是自定义海报的时候 ---
-  // 				if(type != 0) {
+          //--- 如果是自定义海报的时候 ---
+  				if(type != 0) {
   					
-  // 					if (th.data.poster && parseInt(th.data.poster.style) == 2) {
+  					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();
-  // 					  }
+  					  //如果显示会员信息的话
+  					  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();
-  // 					}
+  					} 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();
+  					}
   					
-  // 				};
+  				};
           
   
   
@@ -1001,10 +810,7 @@ Page({
                     return false;
                   }
   
-                  // wx.previewImage({
-                  //   //将图片预览出来
-                  //   urls: [that.data.shareImgPath]
-                  // });
+
                   that.setData({
                     showPoster: true,
                   });
@@ -1020,7 +826,7 @@ Page({
         });
       },
       fail: function (res) {
-        console.log(res);
+        // console.log(res);
         wx.hideLoading();
   
       }
@@ -1069,9 +875,11 @@ Page({
   },
 
   go_goodsinfo:function (e) {
-     var gid=e.currentTarget.dataset.gid;
-     var url="/pages/goods/goodsInfo/goodsInfo?goods_id="+gid;
-     wx.navigateTo({ url: url, })  //跳到非tabbar页
+    var gid=e.currentTarget.dataset.gid;
+    var url="/pages/goods/goodsInfo/goodsInfo?goods_id="+gid;
+    wx.navigateTo({
+			url: url,
+		})//跳到非tabbar页
   },
 
     gohome:function () {
@@ -1080,32 +888,32 @@ Page({
 
     //--获取头像的本地缓存,回调写法--
     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);
-                }
-            });
-        }
+			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);
+					}
+				});
+			};
     },
 
     //--获取商品图片的本地缓存，回调写法--
@@ -1180,13 +988,13 @@ Page({
 		
 		send() {
 			this.setData({
-				share_hidden:false,
+				share_hidden: false,
 			});
 		},
 		
 		cancel() {
 			this.setData({
-				share_hidden:false,
+				share_hidden: false,
 			});
 		},
 
@@ -1313,6 +1121,7 @@ Page({
 			});
 		},
 		
+		// 获取幸运购参团情况
 		async get_team_info () {
 			var th = this;
 			// 幸运购成团信息
@@ -1326,7 +1135,7 @@ Page({
 			}).then(res => {
 			  var luckyGoInfo = res.data.data.pageData[0];
 				var team_id = luckyGoInfo.team_id;
-				console.log('成团信息====>', luckyGoInfo);
+
 				th.setData({
 					luckyGoInfo,
 					team_id,
@@ -1341,23 +1150,14 @@ Page({
 					  data: team_id,
 					});
 				} else {
-					// if(th.data.param.from = 'list') {
-					// 	th.setData({
-					// 		team_id: 0,
-					// 	});
-					// } else {
-						let team_id = wx.getStorageSync('team_id');
-						th.setData({
-							team_id: team_id,
-							isSuccess: true,
-						});
-					// };
-					
+					let team_id = wx.getStorageSync('team_id');
+					th.setData({
+						team_id: team_id,
+						isSuccess: true,
+					});
 				};
-				
-				
-			})
-			
+
+			});
 			
 			// 幸运购成团成员
 			await getApp().request.promiseGet("/api/weshop/prom/luckyOrder/page", {
@@ -1366,11 +1166,11 @@ Page({
 					team_id: this.data.team_id,
 				}
 			}).then(res => {
-				console.log('成团成员====>', res.data.data.pageData);
 				th.setData({
 					luckyGoMembers: res.data.data.pageData,
 				});
-			})
+			});
+			
 		},
 
 
diff --git a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxml b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxml
index 58b58df..2155d60 100644
--- a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxml
+++ b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxml
@@ -245,11 +245,11 @@
   <view class='clear'></view>
 
   <!----//大家都在团---->
-  <view class='goodslist'>
-    <view class='goodslisttop'>
+  <!-- <view class='goodslist'>
+    <view class='goodslisttop'> -->
       <!-- <view class='goodslistspan fs24'>大家都在团</view> -->
       <!-- 推荐商品 -->
-      <view class="flex-center rel xc-linellae-frame">
+      <!-- <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>
@@ -282,14 +282,15 @@
    </view>
       </view>
     </view>
-  </view>
+  </view> -->
 </view>
 
 
 
 
 <!--二维码显示页面-->
-<canvas canvas-id='share' style='width:750rpx;height:1217rpx;' wx:if='{{canvasHidden}}'></canvas>
+<canvas class="mycanvas" canvas-id='share' style='width:750rpx;height:1217rpx;'></canvas>
+<!-- <canvas canvas-id='share' style='width:750rpx;height:1217rpx;' wx:if='{{canvasHidden}}'></canvas> -->
 <!--拼团玩法弹出框-->
 <!----弹起的---->
 <block wx:if="{{pd_xx}}">
diff --git a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxss b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxss
index cdf7b56..0d64a21 100644
--- a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxss
+++ b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxss
@@ -1083,4 +1083,10 @@ height:40rpx;
 .popup-content {
 	max-height: 600rpx;
 	overflow-y: auto;
+}
+
+.mycanvas {
+	position: absolute;
+	top: -9999px;
+	left: -9999px;
 }
\ No newline at end of file
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
index ceb5573..c8b4439 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
@@ -4569,14 +4569,14 @@ Page({
 						  context.fillText(app.globalData.userInfo.nickname, 152 * unit, 60 * unit);
 						  var width = 24 * app.globalData.userInfo.nickname.length * unit + 2 * unit;
 						  //强烈推荐 改许程
-						  var tj_path = "../../../../images/share/q_tj.png";
-							let txt_gn = th.data.luckGoInfo.group_num + '人团';
-							let width_gn = ut.measureText(txt_gn, 15);
-						  context.drawImage(tj_path, 152 * unit + width, 54 * unit, (width_gn + 20) * unit, 30 * unit);
-						  context.setFontSize(16 * unit);
-						  context.setLineJoin('round'); //交点设置成圆角
-						  context.setFillStyle("white");
-						  context.fillText(txt_gn, 149 * unit + width + 15 * unit, 75 * unit);
+						 //  var tj_path = "../../../../images/share/q_tj.png";
+							// let txt_gn = th.data.luckGoInfo.group_num + '人团';
+							// let width_gn = ut.measureText(txt_gn, 15);
+						 //  context.drawImage(tj_path, 152 * unit + width, 54 * unit, (width_gn + 20) * unit, 30 * unit);
+						 //  context.setFontSize(16 * unit);
+						 //  context.setLineJoin('round'); //交点设置成圆角
+						 //  context.setFillStyle("white");
+						 //  context.fillText(txt_gn, 149 * unit + width + 15 * unit, 75 * unit);
 							// 发出幸运购活动邀请
 							context.setFillStyle("#7f7f7f")
 							context.setFontSize(21.3 * unit)
@@ -4588,7 +4588,7 @@ Page({
 					
           
 
-          var share_title = th.data.data.goods_name;
+					var share_title = th.data.data.goods_name;
           if (th.data.prom_type == 1 || th.data.prom_type == 6 || th.data.prom_type == 4) {
             share_title = th.data.prom_act.share_title;
             if (!share_title) share_title = th.data.prom_act.title;
@@ -4601,7 +4601,7 @@ Page({
             context.setFillStyle("black");
             context.setFontSize(21.3 * unit)
             th.draw_Text(context, share_title,
-              38 * unit, 180 * unit, 200 * unit, 279 * unit, unit);
+              38 * unit, 180 * unit, 220 * unit, 220 * unit, unit);
 
             //------产品的价格-------
             context.setFontSize(23 * unit)
@@ -4620,9 +4620,9 @@ Page({
 						var tj_path = "../../../../images/share/q_tj.png";
 						context.drawImage(tj_path, 315 * unit, 158 * unit, 85 * unit, 30 * unit);
 						context.setLineJoin('round'); //交点设置成圆角
-						context.setFontSize(22 * unit);
-						context.setFillStyle("blue");
-						context.fillText('参团价', 320 * unit, 168 * unit);
+						context.setFontSize(18 * unit);
+						context.setFillStyle("white");
+						context.fillText('参团价', 330 * unit, 179 * unit);
 
             //---市场价划掉---
             context.setFillStyle("gray")
@@ -4888,6 +4888,7 @@ Page({
 								//---文字---
 								context.setFillStyle("black")
 								context.setFontSize(24 * unit)
+								context.font = 'normal bold 18px';
 								context.fillText(th.data.sto_sele_name_1, 40 * unit, 720 * unit);
 
 								//还差N人,即可成团
@@ -4897,13 +4898,13 @@ Page({
 								let width_delta1 = ut.measureText(delta1, 15);
 								context.setFillStyle("black");
 								context.setFontSize(21.3 * unit);
-								context.fillText("还差", 40 * unit, 772 * unit);
+								context.fillText(group_num + "人团，还差", 40 * unit, 772 * unit);
 								context.setFillStyle("#FF6768");
 								context.setFontSize(21.3 * unit);
-								context.fillText(delta1, 86 * unit, 772 * unit);
+								context.fillText(delta1, 160 * unit, 772 * unit);
 								context.setFillStyle("black");
 								context.setFontSize(21.3 * unit);
-								context.fillText("人，即可成团", (95 + width_delta1) * unit, 772 * unit);
+								context.fillText("人，即可成团", (170 + width_delta1) * unit, 772 * unit);
 								
 								// N人得商品,N人全额退款
 								let group_win = th.data.luckGoInfo.group_win;
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
index db350a4..3c20cd6 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
@@ -889,7 +889,7 @@
 				</view>
 				<!-- data-ind="2" -->
 				<!-- openSpecModel_pt -->
-				<view class="btn-red f1 flex ai-center jc-center" bindtap="openSpecModel_pt" data-openSpecModal_ind="{{openSpecModal_ind}}" data-action="buy" data-ind="0">立即参团2</view>
+				<view class="btn-red f1 flex ai-center jc-center" bindtap="openSpecModel_pt" data-openSpecModal_ind="{{openSpecModal_ind}}" data-action="buy" data-ind="0">立即参团</view>
 				<!-- <view class="btn-red f1 flex ai-center jc-center" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" data-action="buy">立即参团</view> -->
 			</view>
         <!-- <view bindtap="openSpecModel" data-ind="1" class="btn-buy flex fdc jc-center">
diff --git a/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.js b/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.js
index 8f0cdd3..2726629 100644
--- a/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.js
+++ b/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.js
@@ -1,40 +1,8 @@
-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;
-
-
 const app = getApp();
 let self = null;
 
 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,
 		
@@ -82,7 +50,6 @@ Page({
 					isLogin: true,
 				});
 								
-				
 				let data = {
 					store_id: app.globalData.setting.stoid,
 					user_id: this.data.userInfo.user_id,
@@ -146,11 +113,11 @@ Page({
 				break;
 			};
 			case 2: {
-				currentData.team_status = 1;
+				currentData.team_status = 2;
 				break;
 			};
 			case 3: {
-				currentData.team_status = 2;
+				currentData.team_status = 1;
 				break;
 			};
 		};
@@ -239,27 +206,10 @@ Page({
 	//查看奖励
 	showReward: function(e) {
 		this.setData({
-			// showReward: true,
 			currentItemIndex: e.target.dataset.index,
 			currentItemAid: e.target.dataset.aid,
 		});
 		this.getPrizes(this.data.currentItemIndex);
-		
-		// Promise.resolve(this.getPrizes(this.data.currentItemIndex))
-		// .then((data)=> {
-		// 	// self.setData({
-		// 	// 	prizesArr: data,
-		// 	// 	showReward: true,
-		// 	// });
-		// 	console.dir(data);
-		// 	setTimeout(function() {
-		// 		self.setData({
-		// 			prizesArr: data,
-		// 			showReward: true,
-		// 		},3000);
-		// 	});
-			
-		// });
 	},
 	
 	//关闭奖励
@@ -349,18 +299,8 @@ Page({
 					showReward: true,
 				});
 			});
-			
-			
-			
+						
 		});
-		
-
-
-		
-		
-			
-		
-
 	},
 	
 	// 将type字符串分割成数组
@@ -372,213 +312,8 @@ Page({
 			index = parseInt(item);
 			newTypeArr.push(index);
 		});
-		// console.log('newTypeArr', newTypeArr);
 		return newTypeArr;
 	},
 	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-  /**
-  * 点击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);
-  }
-
-
 })
 
diff --git a/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxml b/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxml
index 7d86b26..bee6b31 100644
--- a/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxml
+++ b/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxml
@@ -10,8 +10,8 @@
 		<!-- <view class="list-item" wx:for="{{list.pageData}}"> -->
 			<view class="pd20" bindtap="go" data-url="/packageC/pages/luckyGo/luckyGo_order/luckyGo_order?order_id={{item.order_id}}">
 				<view class="pdr40 arrow" wx:if="{{item.team_status == 0}}">参团中，还差<text class="c-red">{{filters.difference(item.num, item.group_num)}}</text>人</view>
-				<view class="pdr40 arrow" wx:elif="{{item.team_status == 1}}">已团中，{{item.shipping_status == 0 ? '待发货':'已发货'}}</view>
-				<view class="pdr40 arrow" wx:elif="{{item.team_status == 2}}">未团中，已退款</view>
+				<view class="pdr40 arrow" wx:elif="{{item.team_status == 2}}">已团中，{{item.shipping_status == 0 ? '待发货':'已发货'}}</view>
+				<view class="pdr40 arrow" wx:elif="{{item.team_status == 1}}">未团中，已退款</view>
 			</view>
 			<view class="flex pd20">
 				<view class="img-container">
@@ -24,7 +24,7 @@
 						<text class="rmb fs40 c-red">{{filters.price(item.group_price)}}</text>
 						<view class="fs24 del pdl10 c-c7">零售价<text class="rmb">{{item.market_price}}</text></view>
 					</view>
-					<view class="c-red fs24">未团中可获得帮团奖励</view>
+					<view class="c-red fs24" wx:if="{{item.team_status != 2}}">未团中可获得帮团奖励</view>
 				</view>
 			</view>
 			<view class="flex ai-center pd20 bdt fs24 jc_sb">
@@ -32,10 +32,7 @@
 				<view class="flex">
 					<view class="btn gray" bindtap="go" data-url="/packageC/pages/luckyGo/luckyGo_order/luckyGo_order?order_id={{item.order_id}}&team_status={{item.team_status}}">查看订单</view>
 					<view class="btn c-red mgl20" wx:if="{{item.team_status == 0}}" bindtap="go" data-url="/packageC/pages/luckyGo/luckyGo_details/luckyGo_details?group_id={{item.aid}}&goods_id={{item.goods_id}}&goods_name={{item.goods_name}}&team_id={{item.team_id}}&&from=list">邀请好友</view>
-					
-					<!-- type=1&ordersn=" + data.data + "&group_id=" + th.data.param.group_id + "&goods_id=" + th.data.param.goods_id + "&goods_name=" -->
-					<!-- "&group_id=" + th.data.param.group_id + "&goods_id=" + th.data.param.goods_id + "&goods_name=" + th.data.bn_goods.goods_name -->
-					<view class="btn c-red mgl20" wx:if="{{item.team_status == 2}}" bindtap="showReward" data-index="{{index}}" data-aid="{{item.aid}}">查看奖励</view>
+					<view class="btn c-red mgl20" wx:if="{{item.team_status == 1}}" bindtap="showReward" data-index="{{index}}" data-aid="{{item.aid}}">查看奖励</view>
 				</view>
 			</view>
 		</view>
@@ -43,8 +40,6 @@
 </view>
 
 
-
-
 <view class="popup-container" wx:if="{{showReward}}">
 	<view class="popup">
 		<view class="pd20 flex jc_sb">
@@ -52,12 +47,11 @@
 			<text class="iconfont icon-close fs32 c-7b" bindtap="closeReward"></text>
 		</view>
 		<view class="popup-list">
-			
 			<block wx:for="{{prizesArr}}">
 				<!-- 优惠券奖励 -->
 				<block wx:if="{{item.type == 3}}">
 					<view class="popup-list-item" wx:for="{{item.couponList}}" wx:for-item="i">
-						<view class="img-container"><image class="img-block" src="../../../../images/bk.png"></image></view>
+						<view class="img-container"><image class="img-block" src="{{imghost + 'miniapp/images/luckDraw/yhq.png'}}"></image></view>
 						<view class="f1">
 							<view class="ellipsis-2 popup-title">优惠券-{{i.name}}</view>
 							<view class="fs24 t-r pdt16 c-7b">数量：<text class="c-red">{{i.num}}</text></view>
@@ -67,7 +61,7 @@
 				<!-- 服务项目奖励 -->
 				<block wx:elif="{{item.type == 4}}">
 					<view class="popup-list-item" wx:for="{{item.serviceList}}" wx:for-item="i">
-						<view class="img-container"><image class="img-block" src="../../../../images/bk.png"></image></view>
+						<view class="img-container"><image class="img-block" src="{{imghost + 'miniapp/images/luckDraw/fw.png'}}"></image></view>
 						<view class="f1">
 							<view class="ellipsis-2 popup-title">服务项目-{{i.name}}</view>
 							<view class="fs24 t-r pdt16 c-7b">数量：<text class="c-red">{{i.num}}</text></view>
@@ -77,7 +71,7 @@
 				<!-- 预存金额 -->
 				<block wx:elif="{{item.type == 5}}">
 					<view class="popup-list-item">
-						<view class="img-container"><image class="img-block" src="../../../../images/bk.png"></image></view>
+						<view class="img-container"><image class="img-block" src="{{imghost + 'miniapp/images/luckDraw/jf.png'}}"></image></view>
 						<view class="f1">
 							<view class="ellipsis-2 popup-title">{{list.pageData[currentItemIndex][item.name]}}</view>
 							<view class="fs24 t-r pdt16 c-7b">金额：<text class="c-red">{{filters.div100(list.pageData[currentItemIndex][item.num])}}</text></view>
@@ -87,7 +81,10 @@
 				<!-- 其他奖励 -->
 				<block wx:else>
 					<view class="popup-list-item">
-						<view class="img-container"><image class="img-block" src="../../../../images/bk.png"></image></view>
+						<view class="img-container">
+							<image class="img-block" src="{{imghost + 'miniapp/images/luckDraw/lb.png'}}" wx:if="{{item.type == 1}}"></image>
+							<image class="img-block" src="{{imghost + 'miniapp/images/luckDraw/czz.png'}}" wx:elif="{{item.type == 2}}"></image>
+						</view>
 						<view class="f1">
 							<view class="ellipsis-2 popup-title">{{item.name}}</view>
 							<view class="fs24 t-r pdt16 c-7b">数量：<text class="c-red">{{list.pageData[currentItemIndex][item.num]}}</text></view>
diff --git a/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxss b/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxss
index 982e0c5..0017462 100644
--- a/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxss
+++ b/packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxss
@@ -138,8 +138,8 @@ page {
 }
 
 .popup-list-item .img-container {
-	width: 140rpx;
-	height: 140rpx;
+	width: 120rpx;
+	height: 100rpx;
 }
 
  .popup-title {
diff --git a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml
index f459997..24652f6 100644
--- a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml
+++ b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml
@@ -19,8 +19,8 @@
 					<view class="shop_name">门店：{{order.pickname}}</view>
           <!-- <view>{{order.order_status_detail}}</view> -->
 					<view wx:if="{{team_status == 0}}">参团中</view>
-					<view wx:elif="{{team_status == 1}}">已团中 | {{order.shipping_status == 0 ? '待发货':'已发货'}}</view>
-					<view wx:elif="{{team_status == 2}}">未团中 | 已退款</view>
+					<view wx:elif="{{team_status == 2}}">已团中 | {{order.shipping_status == 0 ? '待发货':'已发货'}}</view>
+					<view wx:elif="{{team_status == 1}}">未团中 | 已退款</view>
         </view>
         <!--wx:if="{{item.return_btn!=4}}" -->
         <view class="order-detail pd20" wx:for="{{order.order_goods}}" wx:key="{{index}}" >
@@ -152,16 +152,17 @@
     </view>
 		
 		<!-- 幸运购 -->
-		<view class="price-information information">
+		<view class="price-information information" wx:if="{{order.is_back == 1}}">
 			 <view class="title">退款信息</view>
 
 			 <view class="item">
 						<view>退款金额</view>
-						<view>￥0.01</view>
+						<view wx:if="{{order.tail_pay_type==1}}">￥{{filters.toFix(order.user_money+order.pt_tail_money,2)}}</view>
+						<view wx:else>￥{{filters.toFix(order.user_money,2)}}</view>
 			 </view>
 			 <view class="item">
 					<view>退款时间</view>
-					<view>2021-10-11 18:00:00</view>
+					<view>{{filters.format_time(order.is_back_time, 1)}}</view>
 			 </view>
 			 <view class="item">
 					<view>退款方式</view>
diff --git a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxss b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxss
index e5209ed..8a0d6fc 100644
--- a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxss
+++ b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxss
@@ -37,7 +37,7 @@
     padding-right: 40rpx;
     padding-left: 40rpx; */
     background-color: #fff;
-    color: #f23030;
+    color: #FF6768;
     justify-content: space-between;
     display: flex;
 }
diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml
index 6b6ca3c..46111fc 100644
--- a/pages/index/index/index.wxml
+++ b/pages/index/index/index.wxml
@@ -230,7 +230,7 @@
 	
 	<!--幸运购-->
 	<!--幸运购-->
-		<view class="seckill">
+		<view class="seckill" wx:if="{{luckGo_list && luckGo_list.length != 0}}">
 			<navigator bindtap="go_url"  data-url="/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList" hover-class="none">
 				<view class="seckill-time">
 					<view class="classname flex ai_c">
@@ -244,7 +244,7 @@
 				</view>
 			</navigator>
 			<view class="seckill-list luck">
-				<view class="list-item" wx:for="{{luckGo_list}}" bindtap="go_url" data-url="/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id={{item.goods_id}}&group_id={{item.id}}">
+				<view class="list-item" wx:for="{{luckGo_list}}" bindtap="go_url" data-url="/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id={{item.goods_id}}&group_id={{item.id}}" wx:if="{{item.status == 1}}">
 					<view class="flex ai-center">
 						<view class="img-container"><image class="img-block" src="{{url + item.original_img}}" data-val="{{item.original_img}}"
 							data-errorimg="luckGo_list[{{index}}].original_img" binderror="bind_bnerr2" lazy-load="true"></image></view>
--
libgit2 0.21.4