From 8b0cc8caa832ac0cf177615dd0450de360af3c99 Mon Sep 17 00:00:00 2001 From: taiyuan Date: Wed, 1 Dec 2021 10:44:28 +0800 Subject: [PATCH] 幸运购修改3 --- packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js | 24 ++++++++++++------------ packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxss | 4 ++-- packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js | 15 +++++++++++---- packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js | 59 +++++++++++++++++++++++++++++++++-------------------------- packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxml | 2 +- packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml | 8 ++++---- pages/index/index/index.wxml | 3 +-- pages/index/index/index.wxss | 4 ++-- 8 files changed, 66 insertions(+), 53 deletions(-) diff --git a/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js b/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js index 0327421..c1ad43f 100644 --- a/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js +++ b/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js @@ -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, + // } + // }, }) diff --git a/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxss b/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxss index 2f254c1..00e52a5 100644 --- a/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxss +++ b/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxss @@ -20,8 +20,8 @@ page { } .img-container { - width: 200rpx; - height: 200rpx; + width: 220rpx; + height: 220rpx; border-radius: 14rpx; overflow: hidden; flex-shrink: 0; diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js index 7dbca86..ad15b33 100644 --- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js +++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js @@ -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() { //支付失败 diff --git a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js index 01bc74e..c204e88 100644 --- a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js +++ b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js @@ -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({ diff --git a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxml b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxml index 7924a0f..79e2e68 100644 --- a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxml +++ b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxml @@ -324,7 +324,7 @@ - + diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml index 8ebffa2..aaaa597 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml @@ -1588,7 +1588,7 @@ 优惠券-{{i.name}} - 数量：{{i.num}} + 数量：{{i.num}} @@ -1598,7 +1598,7 @@ 服务项目-{{i.name}} - 数量：{{i.num}} + 数量：{{i.num}} @@ -1608,7 +1608,7 @@ {{luckGoInfo[item.name]}} - 金额：{{filters.div100(luckGoInfo[item.num])}} + 金额：{{filters.div100(luckGoInfo[item.num])}} @@ -1621,7 +1621,7 @@ {{item.name}} - 数量：{{luckGoInfo[item.num]}} + 数量：{{luckGoInfo[item.num]}} diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml index 46111fc..7ab134c 100644 --- a/pages/index/index/index.wxml +++ b/pages/index/index/index.wxml @@ -229,7 +229,6 @@ - @@ -243,7 +242,7 @@ - +