diff --git a/packageA/pages/activity_share/activity_share.js b/packageA/pages/activity_share/activity_share.js
index b4230de..a3dbdee 100644
--- a/packageA/pages/activity_share/activity_share.js
+++ b/packageA/pages/activity_share/activity_share.js
@@ -7,7 +7,7 @@ Page({
*/
data: {
// tab
- tab: ['秒杀','拼单','促销','专享礼包','预售','团购','组合购'],
+ tab: ['秒杀','拼单','促销','专享礼包','预售','团购','组合购','幸运购'],
currentIndex: 0,
//促销页tab
tab2: ['订单促销','搭配促销','优惠促销'],
@@ -170,13 +170,15 @@ Page({
let url = `packageC/pages/presell/goodsInfo/goodsInfo?goods_id=${goods_id}&pre_id=${pre_id}`;
let title = item.goods_name;
let img = this.data.url + item.original_img;
-
+ let ind = 9;
// console.log('preselll=======>>>>>', item, url);
if(getApp().globalData.user_id){
url += "&first_leader=" + getApp().globalData.user_id;
- }
- th.setData({share_hidden:1,share_good:null});
+ }
+ th.insert_act_share(title,pre_id,ind,item.goods_sn,price);
+ th.setData({share_hidden:1,share_good:null});
+
return {
title: price + "元 " +title,
path: url,
@@ -189,12 +191,14 @@ Page({
let price = item.zhprice;
let url = `/packageB/pages/zuhegou/index/index?id=${id}&title=${title}`;
let img = this.data.url + item.img_url;
-
- console.log('zuhebuy=======>>>>>', item, url);
+ let ind = 11;
+ // console.log('zuhebuy=======>>>>>', item, url);
if(getApp().globalData.user_id){
url += "&first_leader=" + getApp().globalData.user_id;
- }
+ }
+
+ th.insert_act_share(title,id,ind,null,price);
th.setData({share_hidden:1});
return {
title: price + "元 " +title,
@@ -202,6 +206,29 @@ Page({
imageUrl: img,
};
+ } else if(th.data.currentIndex==7) {
+ // /packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=462393&group_id=288
+ let item = this.data.hui_active;
+ // console.log('luckygo>>>>>', item);
+ let id = item.id;
+ let title = item.title;
+ let price = item.group_price / 100;
+ let url = `/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=462393&group_id=288`;
+ let img = this.data.url + item.original_img;
+ let ind = 12;
+ // console.log('zuhebuy=======>>>>>', item, url);
+
+ if(getApp().globalData.user_id){
+ url += "&first_leader=" + getApp().globalData.user_id;
+ }
+
+ th.insert_act_share(title,id,ind,null,price);
+ th.setData({share_hidden:1});
+ return {
+ title: price + "元 " +title,
+ path: url,
+ imageUrl: img,
+ };
} else {
//---秒杀，拼团，促销, 团购---
var item=this.data.share_good;
@@ -247,7 +274,7 @@ Page({
}else if(th.data.currentIndex==2){
ind=5;//促销
}else if(th.data.currentIndex==5){
- ind=8;//团购
+ ind=10;//团购
}
//插入活动
@@ -515,6 +542,15 @@ Page({
req_data.key_str = th.data.key_str.trim();
}
break;
+
+ case 7: //幸运购
+ url = '/api/weshop/prom/luckyActivity/page';
+ req_data.is_end = 0;
+ req_data.timetype = 1;
+ if(th.data.key_str && th.data.key_str.trim()){
+ req_data.key_str = th.data.key_str.trim();
+ }
+ break;
}
if(this.data.key_str && this.data.key_str.trim()){
@@ -1319,7 +1355,13 @@ Page({
})
- }
+ },
+
+ //跳转
+ go: function (e) {
+ var url = e.currentTarget.dataset.url;
+ getApp().goto(url);
+ },
})
\ No newline at end of file
diff --git a/packageA/pages/activity_share/activity_share.wxml b/packageA/pages/activity_share/activity_share.wxml
index 61fa5b2..1556605 100644
--- a/packageA/pages/activity_share/activity_share.wxml
+++ b/packageA/pages/activity_share/activity_share.wxml
@@ -225,6 +225,34 @@
+
+
+
+
+
+
+
+
+ {{item.title}}
+
+
+ {{filters.price(item.group_price)}}
+ 零售价:{{item.market_price}}
+
+
+
+
+ 分享
+
+
+
+
+
+ *{{item.group_num}}人成团，{{item.group_win}}人得商品，{{item.group_num - item.group_win}}人全额退款并得惊喜礼品！
+
+
+
暂无数据
diff --git a/packageA/pages/activity_share/activity_share.wxss b/packageA/pages/activity_share/activity_share.wxss
index b1985a3..8363201 100644
--- a/packageA/pages/activity_share/activity_share.wxss
+++ b/packageA/pages/activity_share/activity_share.wxss
@@ -139,7 +139,7 @@ page {
padding-bottom: 8rpx;
}
.pdl20 {
- padding-left: 104rpx;
+ padding-left: 20rpx;
}
@@ -562,3 +562,93 @@ padding-top: 4rpx;
padding-top: 20rpx;
}
+
+
+
+.luckygo.list-item {
+ display: block;
+ background-color: white;
+ padding: 20rpx;
+ border-radius: 12rpx;
+ /* margin-top: 20rpx; */
+}
+
+.luckygo .img-container {
+ width: 220rpx;
+ height: 220rpx;
+ border-radius: 14rpx;
+ overflow: hidden;
+ flex-shrink: 0;
+ position: relative;
+}
+
+.luckygo .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;
+}
+
+.luckygo .name::before {
+ content: attr(data-content);
+ background-color: #FF6768;
+ color: white;
+ font-size: 24rpx;
+ padding-left: 10rpx;
+ padding-right: 10rpx;
+ border-radius: 20rpx;
+ margin-right: 10rpx;
+}
+
+.luckygo .rmb::before {
+ content: '￥';
+ font-size: 24rpx;
+}
+
+.luckygo .del {
+ text-decoration: line-through;
+}
+
+.luckygo .btn {
+ background-color: #FF6768;
+ border-radius: 20rpx;
+ padding-left:20rpx;
+ padding-right: 20rpx;
+ color: white;
+}
+
+.luckygo .name {
+ height: 88rpx;
+ word-break: break-all;
+}
+
+/* .no-more {
+ font-size: 24rpx;
+ line-height: 2;
+ text-align: center;
+ padding-top: 20rpx;
+ padding-bottom: 20rpx;
+ color: #ccc;
+} */
+
+.luckygo .progress {
+ position: relative;
+}
+.luckygo .progress::before {
+ position: absolute;
+ width: 100%;
+ content: attr(data-content);
+ font-size: 20rpx;
+ color: white;
+ text-align: center;
+}
+
+.luckygo .btn.gray {
+ background-color: #ccc;
+}
+