From f2c47ac354315484d5066e391c14efb37c1b1b07 Mon Sep 17 00:00:00 2001 From: yvan.ni <765199919@qq.com> Date: Tue, 16 Jun 2020 15:34:54 +0800 Subject: [PATCH] 1. 小程序添加分享页面的优化，有商品列表的都要能分享 2. 小程序plus升降级的优化 --- pages/activity/pind_list/pind_list.js | 31 +++++++++++++++++++++++++------ pages/activity/pind_list/pind_list.json | 5 ++++- pages/activity/pind_list/pind_list.wxml | 4 +++- pages/activity/seckill_list/seckill_list.js | 29 +++++++++++++++++++++++------ pages/activity/seckill_list/seckill_list.json | 5 ++++- pages/activity/seckill_list/seckill_list.wxml | 2 ++ pages/goods/goodsList/goodsList.wxml | 1 + pages/goods/search/search.js | 32 ++++++++++++++++++++++++-------- pages/goods/search/search.json | 5 ++++- pages/goods/search/search.wxml | 3 +++ pages/team/team_success/team_success.js | 1 - pages/user/cardinfo/cardinfo.js | 2 +- pages/user/cardinfo/cardinfo.wxml | 2 +- 13 files changed, 95 insertions(+), 27 deletions(-) diff --git a/pages/activity/pind_list/pind_list.js b/pages/activity/pind_list/pind_list.js index a3e37d2..559c9a2 100644 --- a/pages/activity/pind_list/pind_list.js +++ b/pages/activity/pind_list/pind_list.js @@ -126,12 +126,31 @@ Page({ this.reloadGoodList(); }, - //---------分享配置-------- - onShareAppMessage: function (e) { - return { - title: "限时团购", - } - }, + + + //---------分享配置-------- + onShareAppMessage: function (e) { + var curPage=this; + var pagePath = curPage.route; //当前页面url + 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, + } + }, + + + //图片失败，默认图片 bind_bnerr2: function (e) { diff --git a/pages/activity/pind_list/pind_list.json b/pages/activity/pind_list/pind_list.json index 47305b4..fe12943 100644 --- a/pages/activity/pind_list/pind_list.json +++ b/pages/activity/pind_list/pind_list.json @@ -1,3 +1,6 @@ { - "navigationBarTitleText": "天天拼单" + "navigationBarTitleText": "天天拼单", + "usingComponents": { + "share_box": "/components/share_box/share_box" + } } \ No newline at end of file diff --git a/pages/activity/pind_list/pind_list.wxml b/pages/activity/pind_list/pind_list.wxml index e19716e..12741c4 100644 --- a/pages/activity/pind_list/pind_list.wxml +++ b/pages/activity/pind_list/pind_list.wxml @@ -84,4 +84,6 @@ 没有相关内容 - \ No newline at end of file + + + \ No newline at end of file diff --git a/pages/activity/seckill_list/seckill_list.js b/pages/activity/seckill_list/seckill_list.js index a669049..d728e26 100644 --- a/pages/activity/seckill_list/seckill_list.js +++ b/pages/activity/seckill_list/seckill_list.js @@ -123,12 +123,29 @@ Page({ this.setData({type:a,goodlist:null}); this.reloadGoodList(); }, - //---------分享配置-------- - onShareAppMessage: function (e) { - return { - title: "疯狂秒杀", - } - }, + + + //---------分享配置-------- + onShareAppMessage: function (e) { + var curPage=this; + var pagePath = curPage.route; //当前页面url + 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, + } + }, + //图片失败，默认图片 bind_bnerr2: function (e) { var _errImg = e.target.dataset.errorimg; diff --git a/pages/activity/seckill_list/seckill_list.json b/pages/activity/seckill_list/seckill_list.json index b6cce60..e533db3 100644 --- a/pages/activity/seckill_list/seckill_list.json +++ b/pages/activity/seckill_list/seckill_list.json @@ -1,3 +1,6 @@ { - "navigationBarTitleText": "商品秒杀" + "navigationBarTitleText": "商品秒杀", + "usingComponents": { + "share_box": "/components/share_box/share_box" + } } \ No newline at end of file diff --git a/pages/activity/seckill_list/seckill_list.wxml b/pages/activity/seckill_list/seckill_list.wxml index c10ebd1..8de10eb 100644 --- a/pages/activity/seckill_list/seckill_list.wxml +++ b/pages/activity/seckill_list/seckill_list.wxml @@ -73,3 +73,5 @@ + + diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml index e3d4e06..36b4f38 100644 --- a/pages/goods/goodsList/goodsList.wxml +++ b/pages/goods/goodsList/goodsList.wxml @@ -142,6 +142,7 @@ {{item.name}} + {{item.name}} diff --git a/pages/goods/search/search.js b/pages/goods/search/search.js index b8081f8..552da0c 100644 --- a/pages/goods/search/search.js +++ b/pages/goods/search/search.js @@ -52,8 +52,7 @@ Page({ th.setData({ hotWords: arr}); } - - + //计算等级价相关 var swithc_list=rs.switch_list; var sw_arr=JSON.parse(swithc_list); @@ -187,12 +186,29 @@ Page({ if ("string" != typeof t || "" == t) return a.showWarning("请输入搜索关键词"); this.resetData(), this.requestSearch(this.data.baseUrl + "&key_str=" + encodeURIComponent(t)); }, - //---------分享配置-------- - onShareAppMessage: function (e) { - return { - title: "商品分类", - } - }, + + //---------分享配置-------- + onShareAppMessage: function (e) { + var curPage=this; + var pagePath = curPage.route; //当前页面url + 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, + } + }, + + //---------图片失败，默认图片-------- bind_bnerr: function (e) { var _errImg = e.target.dataset.errorimg; diff --git a/pages/goods/search/search.json b/pages/goods/search/search.json index 45e88b5..0aa7add 100644 --- a/pages/goods/search/search.json +++ b/pages/goods/search/search.json @@ -1,4 +1,7 @@ { "navigationBarTitleText": "商品搜索", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "usingComponents": { + "share_box": "/components/share_box/share_box" + } } \ No newline at end of file diff --git a/pages/goods/search/search.wxml b/pages/goods/search/search.wxml index 0666b43..270f2b9 100644 --- a/pages/goods/search/search.wxml +++ b/pages/goods/search/search.wxml @@ -106,6 +106,9 @@ + + + diff --git a/pages/team/team_success/team_success.js b/pages/team/team_success/team_success.js index 8408738..111cc8f 100644 --- a/pages/team/team_success/team_success.js +++ b/pages/team/team_success/team_success.js @@ -360,7 +360,6 @@ Page({ scene+="_"+user_id; } - //二微码 var path3 = os.url+ "/api/wx/open/app/user/getWeAppEwm/"+ os.stoid+"?sceneValue="+scene+"&pageValue=pages/team/team_show/team_show"; diff --git a/pages/user/cardinfo/cardinfo.js b/pages/user/cardinfo/cardinfo.js index ca417c9..9cb5ffa 100644 --- a/pages/user/cardinfo/cardinfo.js +++ b/pages/user/cardinfo/cardinfo.js @@ -842,7 +842,7 @@ Page({ if(th.data.is_guoqi){ my_con.open(" \n 温馨提示：与原等级不符，是否变更！\n\n 有效时间："+time+"\n\n", "是", "否", th.sure_pay, null) }else{ - //如果是升级的话 + //如果是升级的话 await getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/updatePrice/get", {data:{storeId: os.stoid,userId:getApp().globalData.user_id,OldCardId:th.data.user_card.CardId,NewCardId:card_id}}).then(res => { if (res.data.code == 0) { diff --git a/pages/user/cardinfo/cardinfo.wxml b/pages/user/cardinfo/cardinfo.wxml index 79b9a00..5ec3555 100644 --- a/pages/user/cardinfo/cardinfo.wxml +++ b/pages/user/cardinfo/cardinfo.wxml @@ -157,7 +157,7 @@ - + -- libgit2 0.21.4