幸运购修改3

taiyuan
1 parent 6ab9d9e2
Showing 8 changed files with 66 additions and 53 deletions
packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js
packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxss
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js
packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxml
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
pages/index/index/index.wxml
pages/index/index/index.wxss
@@ -208,19 +208,19 @@ Page({
 	    }
 	},
  
-	onShareTimeline() {
-		var store_name = getApp().globalData.config ? getApp().globalData.config.store_name:'';
-		var pagePath = this.route; //当前页面url
+	// onShareTimeline() {
+	// 	var store_name = getApp().globalData.config ? getApp().globalData.config.store_name:'';
+	// 	var pagePath = this.route; //当前页面url
  
-		if(!store_name) store_name = getApp().globalData.setting.appName;
-		if (pagePath.indexOf('/') != 0) {
-		  pagePath = '/' + pagePath;
-		}
-		return {
-		  title: store_name + '-幸运购活动列表',
-		  path: pagePath,
-		}
-	},
+	// 	if(!store_name) store_name = getApp().globalData.setting.appName;
+	// 	if (pagePath.indexOf('/') != 0) {
+	// 	  pagePath = '/' + pagePath;
+	// 	}
+	// 	return {
+	// 	  title: store_name + '-幸运购活动列表',
+	// 	  path: pagePath,
+	// 	}
+	// },
  
 })
  
@@ -20,8 +20,8 @@ page {
 }
  
 .img-container {
-	width: 200rpx;
-	height: 200rpx;
+	width: 220rpx;
+	height: 220rpx;
 	border-radius: 14rpx;
 	overflow: hidden;
 	flex-shrink: 0;
@@ -786,10 +786,17 @@ Page({
 							// }, 1);
 							util_pay.pay(data.data, function() {
 								setTimeout(function() {
-									wx.reLaunch({
-										//url: "/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data,
-										url: "/pages/team/team_success/team_success?ordersn=" + data.data,
-									})
+									// wx.reLaunch({
+									// 	//url: "/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data,
+									// 	url: "/pages/team/team_success/team_success?ordersn=" + data.data,
+									// })
+									
+									wx.redirectTo({
+										url: "/packageC/pages/luckyGo/luckyGo_details/luckyGo_details?type=1&ordersn=" + data.data +
+											"&group_id=" + th.data.param.group_id + "&goods_id=" + th.data.param.goods_id +
+											"&goods_name=" + th.data.bn_goods.goods_name,
+									});
+									
 								}, 1000)
 							}, function() {
 								//支付失败
@@ -953,32 +953,39 @@ Page({
     },
  
     //------ 分享配置 --------
-    // onShareAppMessage: function (e) {
-    //     var th=this;
-    //     var scene=this.data.teamgroup.id;
-    //     var url="/pages/team/team_show/team_show?tg_id="+scene;
-    //     //--分享图片--
-    //     var img=th.data.iurl+th.data.teamlist.share_imgurl;
-    //     //--把会员分享出去--
-    //     if(getApp().globalData.user_id){
-    //         if(url.indexOf("?")>0)
-    //             url+="&first_leader="+getApp().globalData.user_id;
-    //         else
-    //             url+="?first_leader="+getApp().globalData.user_id;
-    //     }
-    //     // console.log('url+++++>>>>>', url, th.data.teamlist.title);
-
-    //     var share_title=th.data.teamlist.title;
-    //     if(th.data.teamlist.share_title){
-    //         share_title=th.data.teamlist.share_title;
-    //     }
-
-    //     return {
-    //         path:url,
-    //         title: share_title,
-    //         imageUrl: img,
-    //     }
-    // },
+    onShareAppMessage: function (e) {
+        var pagePath = `packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=${this.data.param.goods_id}&prom_type=9&group_id=${this.data.param.group_id}`; //当前页面url
+				// console.log('pagePath=====>', pagePath);
+        if (pagePath.indexOf('/') != 0) {
+            pagePath = '/' + pagePath;
+        }
+        if(getApp().globalData.user_id){
+        	
+            if(pagePath.indexOf("?")>0){
+                pagePath+="&first_leader="+getApp().globalData.user_id;
+            }else{
+                pagePath+="?first_leader="+getApp().globalData.user_id;
+            }
+        }
+        return {
+            title: "幸运购",
+            path: pagePath,
+        }
+    },
+		
+		onShareTimeline() {
+			// var store_name = getApp().globalData.config ? getApp().globalData.config.store_name:'';
+			// var pagePath = this.route; //当前页面url
+			
+			// if(!store_name) store_name = getApp().globalData.setting.appName;
+			// if (pagePath.indexOf('/') != 0) {
+			//   pagePath = '/' + pagePath;
+			// }
+			// return {
+			//   title: store_name + '-幸运购活动列表',
+			//   path: pagePath,
+			// }
+		},
  
 		clickShare() {
 			this.setData({
@@ -324,7 +324,7 @@
 </block>
  
 <!-- 分享控件，底部弹出 -->
-<share id="share_button" bind:send="send" bind:cancel="cancel" bind:share_img="saveImageToPhotosAlbum"  wx:if="{{share_hidden}}"></share>
+<share id="share_button" bind:send="onShareAppMessage" bind:cancel="cancel" bind:share_img="saveImageToPhotosAlbum"  wx:if="{{share_hidden}}"></share>
  
  
 <view wx:if="{{showPoster}}">
@@ -1588,7 +1588,7 @@
 							<view class="img-container"><image class="img-block" src="{{iurl + 'miniapp/images/luckDraw/yhq.png'}}"></image></view>
 							<view class="f1 pdl20">
 								<view class="ellipsis-2 popup-title">优惠券-{{i.name}}</view>
-								<view class="fs24 t-r pdt16 c-7b">数量：<text class="c-red">{{i.num}}</text></view>
+								<view class="fs26 t-r pdt16 c-7b">数量：<text class="c-red">{{i.num}}</text></view>
 							</view>
 						</view>
 					</block>
@@ -1598,7 +1598,7 @@
 							<view class="img-container"><image class="img-block" src="{{iurl + 'miniapp/images/luckDraw/fw.png'}}"></image></view>
 							<view class="f1 pdl20">
 								<view class="ellipsis-2 popup-title">服务项目-{{i.name}}</view>
-								<view class="fs24 t-r pdt16 c-7b">数量：<text class="c-red">{{i.num}}</text></view>
+								<view class="fs26 t-r pdt16 c-7b">数量：<text class="c-red">{{i.num}}</text></view>
 							</view>
 						</view>
 					</block>
@@ -1608,7 +1608,7 @@
 							<view class="img-container"><image class="img-block" src="{{iurl + 'miniapp/images/luckDraw/jf.png'}}"></image></view>
 							<view class="f1 pdl20">
 								<view class="ellipsis-2 popup-title">{{luckGoInfo[item.name]}}</view>
-								<view class="fs24 t-r pdt16 c-7b">金额：<text class="c-red">{{filters.div100(luckGoInfo[item.num])}}</text></view>
+								<view class="fs26 t-r pdt16 c-7b">金额：<text class="c-red">{{filters.div100(luckGoInfo[item.num])}}</text></view>
 							</view>
 						</view>
 					</block>
@@ -1621,7 +1621,7 @@
 							</view>
 							<view class="f1 pdl20">
 								<view class="ellipsis-2 popup-title">{{item.name}}</view>
-								<view class="fs24 t-r pdt16 c-7b">数量：<text class="c-red">{{luckGoInfo[item.num]}}</text></view>
+								<view class="fs26 t-r pdt16 c-7b">数量：<text class="c-red">{{luckGoInfo[item.num]}}</text></view>
 							</view>
 						</view>
 					</block>
@@ -229,7 +229,6 @@
  
  
 	<!--幸运购-->
-	<!--幸运购-->
 		<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">
@@ -243,7 +242,7 @@
 					</view>
 				</view>
 			</navigator>
-			<view class="seckill-list luck">
+			<view class=" luck">
 				<view class="list-item" wx:for="{{luckGo_list}}" bindtap="go_url" data-url="/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id={{item.goods_id}}&group_id={{item.id}}" wx:if="{{item.status == 1}}">
 					<view class="flex ai-center">
 						<view class="img-container"><image class="img-block" src="{{url + item.original_img}}" data-val="{{item.original_img}}"
@@ -1130,8 +1130,8 @@ page {
 }
  
 .luck .img-container {
-	width: 200rpx;
-	height: 200rpx;
+	width: 220rpx;
+	height: 220rpx;
 	border-radius: 14rpx;
 	overflow: hidden;
 	flex-shrink: 0;