From ab5f61ae12c4c607ec180e00aa734cac4b725e51 Mon Sep 17 00:00:00 2001 From: yvan.ni <765199919@qq.com> Date: Thu, 18 Jun 2020 14:44:43 +0800 Subject: [PATCH] 1.分享的地址优化生成 2.接口的替换 --- packageA/pages/prom_list/prom_list.js | 4 ++-- pages/cart/cart2/cart2.js | 4 ++-- pages/goods/goodsList/goodsList.js | 11 ++++++++++- pages/goods/search/search.js | 11 +++++++++++ pages/team/team_success/team_success.js | 6 ++++-- utils/util.js | 12 +++++++++++- 6 files changed, 40 insertions(+), 8 deletions(-) diff --git a/packageA/pages/prom_list/prom_list.js b/packageA/pages/prom_list/prom_list.js index f51f0da..f795d44 100644 --- a/packageA/pages/prom_list/prom_list.js +++ b/packageA/pages/prom_list/prom_list.js @@ -641,9 +641,9 @@ Page({ } if(getApp().globalData.user_id){ if(pagePath.indexOf("?")>0){ - pagePath+="&first_leader="+getApp().globalData.user_id; + pagePath+="&goods_id="+this.data.gid+" &first_leader="+getApp().globalData.user_id; }else{ - pagePath+="?first_leader="+getApp().globalData.user_id; + pagePath+="?goods_id="+this.data.gid+"&first_leader="+getApp().globalData.user_id; } } diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index 1ba655c..8019f88 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -1431,7 +1431,7 @@ Page({ goods.guide_id=gg.guide_id; goods.guide_type=gg.guide_type; //调用接口判断是不是会员 - await getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+oo.stoid+"/"+gg.guide_id,{}).then(res=>{ + await getApp().request.promiseGet("/api/weshop/shoppingGuide/getid/"+oo.stoid+"/"+gg.guide_id,{}).then(res=>{ if(res.data.code==0){ goods.guide_name=res.data.data.salesman; goods.guide_sn=res.data.data.salesman_no; @@ -1631,7 +1631,7 @@ Page({ goods.guide_id=g_item.guide_id; goods.guide_type=g_item.guide_type; //调用接口判断是不是会员 - await getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+oo.stoid+"/"+g_item.guide_id,{}).then(res=>{ + await getApp().request.promiseGet("/api/weshop/shoppingGuide/getid/"+oo.stoid+"/"+g_item.guide_id,{}).then(res=>{ if(res.data.code==0){ goods.guide_name=res.data.data.salesman; goods.guide_sn=res.data.data.salesman_no; diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js index e8cee1d..209bd3f 100644 --- a/pages/goods/goodsList/goodsList.js +++ b/pages/goods/goodsList/goodsList.js @@ -21,10 +21,13 @@ Page({ is_new:0, is_hot:0, prom_goods_list:null, + rq_data:null, }, onLoad: function(t) { + this.data.rq_data=t; + //接受有没有导购的参数 var first_leader=t.first_leader; if(first_leader){ @@ -212,14 +215,20 @@ Page({ if (pagePath.indexOf('/') != 0) { pagePath = '/' + pagePath; } - if(getApp().globalData.user_id){ + if(this.data.rq_data && JSON.stringify(this.data.rq_data) != "{}") { + var parm = ut.ob_to_parm(this.data.rq_data); + pagePath += "?" + parm; + } + + if(getApp().globalData.user_id){ if(pagePath.indexOf("?")>0){ pagePath+="&first_leader="+getApp().globalData.user_id; }else{ pagePath+="?first_leader="+getApp().globalData.user_id; } } + console.log("11-11"+pagePath); return { title: "商品列表", path:pagePath, diff --git a/pages/goods/search/search.js b/pages/goods/search/search.js index 552da0c..f58b152 100644 --- a/pages/goods/search/search.js +++ b/pages/goods/search/search.js @@ -21,8 +21,11 @@ Page({ tabname: "goods_id", //排序的字段 adname: "desc", //升降的字段 + rq_data:null, }, onLoad: function(t) { + this.data.rq_data=t; + //接受有没有导购的参数 var first_leader=t.first_leader; if(first_leader){ @@ -184,6 +187,7 @@ Page({ //-----点击搜索按钮---- search: function(t) { if ("string" != typeof t || "" == t) return a.showWarning("请输入搜索关键词"); + this.data.key_str=t; this.resetData(), this.requestSearch(this.data.baseUrl + "&key_str=" + encodeURIComponent(t)); }, @@ -194,6 +198,11 @@ Page({ if (pagePath.indexOf('/') != 0) { pagePath = '/' + pagePath; } + + if(this.data.key_str) { + pagePath += "?s_key=" + this.data.key_str; + } + if(getApp().globalData.user_id){ if(pagePath.indexOf("?")>0){ @@ -202,6 +211,8 @@ Page({ pagePath+="?first_leader="+getApp().globalData.user_id; } } + + console.log("11-11"+pagePath); return { title: "商品搜索", path:pagePath, diff --git a/pages/team/team_success/team_success.js b/pages/team/team_success/team_success.js index 111cc8f..16352d8 100644 --- a/pages/team/team_success/team_success.js +++ b/pages/team/team_success/team_success.js @@ -677,10 +677,11 @@ Page({ //------ 分享配置 -------- onShareAppMessage: function (e) { - var scene=th.data.teamgroup.id; + var th=this; + var scene=this.data.teamgroup.id; var url="/pages/team/team_show/team_show?tg_id="+scene; //--分享图片-- - img=th.data.iurl+th.data.teamlist.share_imgurl; + var img=th.data.iurl+th.data.teamlist.share_imgurl; //--把会员分享出去-- if(getApp().globalData.user_id){ if(url.indexOf("?")>0) @@ -688,6 +689,7 @@ Page({ else url+="?first_leader="+getApp().globalData.user_id; } + console.log(url); return { path:url, diff --git a/utils/util.js b/utils/util.js index 38900e8..043bb12 100644 --- a/utils/util.js +++ b/utils/util.js @@ -401,6 +401,15 @@ function base64_encode (str) { // 编码，配合encodeURIComponent使用 return strin } +function ob_to_parm(ob){ + var parm=""; + for( var key in ob){ + parm+="&"+key+"="+ob[key]; + } + parm = parm.substr(1); + return parm; +} + module.exports = { formatTime: function(e, r) { var t = e ? new Date(1e3 * e) : new Date(), n = t.getFullYear(), o = t.getMonth() + 1, a = t.getDate(), u = t.getHours(), i = t.getMinutes(), f = t.getSeconds(), s = function(e) { @@ -505,5 +514,6 @@ module.exports = { draw_circle:draw_circle,//绘制圆， mergeArray:mergeArray, //数组合并 isContained:isContained, //是否包含 - base64_encode:base64_encode //64位加密 + base64_encode:base64_encode, //64位加密 + ob_to_parm:ob_to_parm //对象变成参数 }; -- libgit2 0.21.4