Merge branch 'test' of http://git.vipzhuang.cn/wxd/MShopWeApp into qa

season
2 parents 1a583ada eb2ef05a
Showing 11 changed files with 35 additions and 17 deletions
app.json
packageA/pages/goodsInfo/goodsInfo.js
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
packageC/pages/presell/cardInfo/goodsInfo.js
packageC/pages/presell/goodsInfo/goodsInfo.js
packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js
packageG/pages/group_buy/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.js
pages/user/index/index.js
setting.js
@@ -241,7 +241,8 @@
               "pages/team/team_show/team_show",              
               "pages/user/order_detail/order_detail",
               "pages/group_buy/goodsInfo/goodsInfo",
-              "pages/user/my_beauty_consultant/my_beauty_consultant"
+              "pages/user/my_beauty_consultant/my_beauty_consultant",
+              "pages/customer_chat/customer_chat"
           ]
       }
     ],
@@ -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){
@@ -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){
@@ -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){
@@ -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){
@@ -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){
@@ -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 () {
@@ -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){
@@ -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={};
@@ -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;
@@ -2,13 +2,14 @@ module.exports = {
     appName: "派派通",
     versionCode: "1.0.0",
     appLogo: "../../../images/logo.png",
-    url: "https://test-weshop.xinda100.cn",
+    //url: "https://test-weshop.xinda100.cn",
     //url:"https://weshop.yolipai.net", //外网的网址
-    //url:"https://qa-weshop.yolipai.net", //外网的网址
-    //url:"http://172.20.3.41:8085", //明海的网址
+    url:"https://qa-weshop.yolipai.net", //外网的网址
+    //url:"http://172.20.3.148:8085", //明海的网址
     //url:"http://172.20.3.102:8085", //自己的网址
     banner_err:"../../../images/del/logo.png",
     imghost: "https://mshopimg.yolipai.net/",
+    h5_host: "https://qa-mshop.yolipai.net/",   //客服聊天使用
     share: {},
     stoid:1