From eb2ef05ada1c95d4403e86b1f51aea08afd4379e Mon Sep 17 00:00:00 2001 From: yvan.ni Date: Thu, 25 Apr 2024 11:38:52 +0800 Subject: [PATCH] 1、月包的优化 2、聊天的优化 --- packageA/pages/goodsInfo/goodsInfo.js | 2 +- packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js | 2 +- packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js | 2 +- packageC/pages/presell/cardInfo/goodsInfo.js | 2 +- packageC/pages/presell/goodsInfo/goodsInfo.js | 2 +- packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js | 3 +++ packageG/pages/group_buy/goodsInfo/goodsInfo.js | 2 +- pages/goods/goodsInfo/goodsInfo.js | 7 +------ pages/user/index/index.js | 20 +++++++++++++++++++- 9 files changed, 29 insertions(+), 13 deletions(-) diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js index bb79cf9..2f3dcd3 100644 --- a/packageA/pages/goodsInfo/goodsInfo.js +++ b/packageA/pages/goodsInfo/goodsInfo.js @@ -320,7 +320,7 @@ Page({ }) var is_chat=0; - await getApp().request.promiseGet("/api/weshop/recharge/storageRechargeDetail/get/1", { + await getApp().request.promiseGet("/api/weshop/recharge/storageRechargeDetail/get/"+os.stoid, { }).then(res => { if(res && res.data.code==0 && res.data.data){ diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js index d1729be..1b37620 100644 --- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js +++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js @@ -311,7 +311,7 @@ Page({ }) var is_chat=0; - await getApp().request.promiseGet("/api/weshop/recharge/storageRechargeDetail/get/1", { + await getApp().request.promiseGet("/api/weshop/recharge/storageRechargeDetail/get/"+os.stoid, { }).then(res => { if(res && res.data.code==0 && res.data.data){ diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js index 23bd2bf..d23a8fc 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js @@ -460,7 +460,7 @@ Page({ }) var is_chat=0; - await getApp().request.promiseGet("/api/weshop/recharge/storageRechargeDetail/get/1", { + await getApp().request.promiseGet("/api/weshop/recharge/storageRechargeDetail/get/"+os.stoid, { }).then(res => { if(res && res.data.code==0 && res.data.data){ diff --git a/packageC/pages/presell/cardInfo/goodsInfo.js b/packageC/pages/presell/cardInfo/goodsInfo.js index 16fbad5..8c06e64 100644 --- a/packageC/pages/presell/cardInfo/goodsInfo.js +++ b/packageC/pages/presell/cardInfo/goodsInfo.js @@ -339,7 +339,7 @@ Page({ }) var is_chat=0; - await getApp().request.promiseGet("/api/weshop/recharge/storageRechargeDetail/get/1", { + await getApp().request.promiseGet("/api/weshop/recharge/storageRechargeDetail/get/"+os.stoid, { }).then(res => { if(res && res.data.code==0 && res.data.data){ diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js index e3c8424..8c8aba2 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.js +++ b/packageC/pages/presell/goodsInfo/goodsInfo.js @@ -391,7 +391,7 @@ Page({ var is_chat=0; - await getApp().request.promiseGet("/api/weshop/recharge/storageRechargeDetail/get/1", { + await getApp().request.promiseGet("/api/weshop/recharge/storageRechargeDetail/get/"+os.stoid, { }).then(res => { if(res && res.data.code==0 && res.data.data){ diff --git a/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js b/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js index 355446b..eb488d5 100644 --- a/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js +++ b/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js @@ -422,6 +422,9 @@ Page({ //res = res.data.data.result; //if (!res) return false; + this.setData({ + getUserID: d.user_id || 0, + }); getApp().check_can_share(this); getApp().is_Single_page(this, function () { diff --git a/packageG/pages/group_buy/goodsInfo/goodsInfo.js b/packageG/pages/group_buy/goodsInfo/goodsInfo.js index 34024f3..bb61c7b 100644 --- a/packageG/pages/group_buy/goodsInfo/goodsInfo.js +++ b/packageG/pages/group_buy/goodsInfo/goodsInfo.js @@ -309,7 +309,7 @@ Page({ }) var is_chat=0; - await getApp().request.promiseGet("/api/weshop/recharge/storageRechargeDetail/get/1", { + await getApp().request.promiseGet("/api/weshop/recharge/storageRechargeDetail/get/"+os.stoid, { }).then(res => { if(res && res.data.code==0 && res.data.data){ diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 1607263..11201db 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -440,7 +440,7 @@ Page({ var is_chat=0; - await getApp().request.promiseGet("/api/weshop/recharge/storageRechargeDetail/get/1", { + await getApp().request.promiseGet("/api/weshop/recharge/storageRechargeDetail/get/"+os.stoid, { }).then(res => { if(res && res.data.code==0 && res.data.data){ @@ -9052,11 +9052,6 @@ Page({ getApp().customer_chat(goods_id); }, - customer_chat:function(){ - var gid=this.data.front_g.goods_id; - getApp().customer_chat(gid); - }, - get_normal(gid) { var set_ob={}; diff --git a/pages/user/index/index.js b/pages/user/index/index.js index a5e90b1..6ed1dab 100644 --- a/pages/user/index/index.js +++ b/pages/user/index/index.js @@ -206,7 +206,7 @@ Page({ //先查看一下是不是系统会员 - getApp().waitfor_login(()=> { + getApp().waitfor_login(async ()=> { if (!getApp().globalData.user_id) { if(!this.data.is_show_yq){ ut.new_user_go(os.stoid, getApp().globalData.first_leader); @@ -505,11 +505,25 @@ Page({ /*-- 获取 --*/ th.requestRecommend(); + var is_chat=0; + await getApp().request.promiseGet("/api/weshop/recharge/storageRechargeDetail/get/"+os.stoid, { + }).then(res => { + if(res && res.data.code==0 && res.data.data){ + is_chat=1; + } + }) + /*-------系统是否开通等级卡，会员是等级卡-----*/ getApp().getConfig2(function (e) { var t_swi = e.switch_list; if (t_swi) t_swi = JSON.parse(t_swi) if (t_swi) { + + //如果商家未开通在线客服的话 + if(t_swi.weapp_customertype==3 && !is_chat){ + json_dt_swi.weapp_customertype=0 + } + th.setData({ sys_switch: t_swi }); var user_tool = []; if (t_swi.usertool) user_tool = JSON.parse(t_swi.usertool); @@ -1106,6 +1120,10 @@ Page({ getApp().con_wx(this); }, + customer_chat: function () { + getApp().customer_chat(0); + }, + //初始话按钮图标 init_user_tool: async function () { var d_list = null; -- libgit2 0.21.4