From 808b2a777e07254f801fba1f1d1c11eec8fd0c7e Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Wed, 8 May 2024 11:38:21 +0800
Subject: [PATCH] 在线客服的优化

---
 packageA/pages/goodsInfo/goodsInfo.js         | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------
 packageG/pages/customer_chat/customer_chat.js |  4 ++--
 2 files changed, 64 insertions(+), 15 deletions(-)

diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js
index 2f3dcd3..70fcde7 100644
--- a/packageA/pages/goodsInfo/goodsInfo.js
+++ b/packageA/pages/goodsInfo/goodsInfo.js
@@ -281,7 +281,9 @@ Page({
 
     };
 
-    //-- 设置顶部高度 --
+
+
+      //-- 设置顶部高度 --
     let height= getApp().globalData.navBarHeight;
     ee.setData({ gid: gid,top_nav:height});
 		
@@ -645,14 +647,7 @@ Page({
     var ee = this,gid = this.data.gid, i = getApp().request;
 
     //判断是不是要跳转到拼团服务卡
-    getApp().check_go_fw(gid,function (act,url){
-
-        if(act){
-            wx.redirectTo({
-                url:url
-            })
-            return false;
-        }
+    this.check_go_act_fw(gid,function (){
 
         th.data.is_timer = 1;
         //获取用户的默认门店
@@ -881,10 +876,6 @@ Page({
         if(!th.data.prom_type) th.get_sto();
     })
 
-
-
-
-
 		
   },
 	
@@ -4460,6 +4451,64 @@ Page({
     },
 
 
+    async check_go_act_fw(gid,func){
+
+        if(this.data.options.prom_type==1){
+            func();
+            return false;
+        }
+
+        var th=this;
+        var rurl = '/api/weshop/activitylist/listGoodActInfo2New';
+        var req_d = {
+            "store_id": getApp().globalData.setting.stoid,
+            "goods_id": gid,
+            "user_id": getApp().globalData.user_id || 0,
+            "goods_type":1
+        }
+        var res= await getApp().request.promiseGet(rurl, {data: req_d});
+
+        var url = "/packageA/pages/goodsInfo/goodsInfo?goods_id=" + gid;
+        if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
+            var arr = res.data.data;
+            let times = new Date().getTime();
+            //-- 预热也要计算 --
+            var arr2 = arr.filter(function (e) {
+                return e.s_time < ut.gettimestamp() || (e.warm_uptime && e.warm_uptime < ut.gettimestamp())
+            })
+            if(arr2.length==1) {
+                switch(arr2[0].prom_type){
+                    case 1:
+                        //url+="&prom_type=1&prom_id="+arr2[0].act_id;
+                        th.data.options.prom_id=arr2[0].act_id;
+                        th.data.options.prom_type=1;
+                        url='';
+                        break;
+                    case 2:
+                        url="/packageG/pages/group_buy/goodsInfo/goodsInfo?goods_id="+gid+"&prom_id="+arr2[0].act_id;
+                        break;
+                    case 6:
+                        url = `/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id=${gid}&prom_type=${arr2[0].prom_type}&prom_id=${arr2[0].act_id}`;
+                        break;
+                    case 8:
+                        url = `/packageC/pages/presell/cardInfo/goodsInfo?goods_id=${gid}&prom_id=${arr2[0].act_id}`;
+                        break;
+                }
+                if(url){
+                    wx.redirectTo({
+                        url: url,
+                    });
+                    return false;
+
+                }
+            }
+
+        }
+
+        func();
+    }
+
+
 });
 
 
diff --git a/packageG/pages/customer_chat/customer_chat.js b/packageG/pages/customer_chat/customer_chat.js
index d7333d6..6d3eef2 100644
--- a/packageG/pages/customer_chat/customer_chat.js
+++ b/packageG/pages/customer_chat/customer_chat.js
@@ -25,9 +25,9 @@ Page({
       return false;
     }
 
-    let url= os.h5_host+"/mchat/mbchat/index?goods_id="+goods_id+"&stoid="+os.stoid+"&user_id="+user_id;
+    let url= os.h5_host+"/mchat/mbchat/index?is_webview=1&goods_id="+goods_id+"&stoid="+os.stoid+"&user_id="+user_id;
     if(type)
-      url= os.h5_host+"/mchat/mbchat/index?card_id="+goods_id+"&stoid="+os.stoid+"&user_id="+user_id;
+      url= os.h5_host+"/mchat/mbchat/index?is_webview=1&card_id="+goods_id+"&stoid="+os.stoid+"&user_id="+user_id;
 
     console.log("chat"+url);
     this.setData({
--
libgit2 0.21.4