Merge pull request 'master' (#3) from master into dev

Reviewed-on: litiange/jundaosuzhou_wechatxcx#3

app.js

@@ -39,7 +39,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest159? true : false;
+            data.isTest = data.isTest160? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {

pages/user/logout/index.js

@@ -43,17 +43,23 @@ Page({
             if (res.confirm) {
                 common.user_post('uservice/user/user_logout', { protocol: that.data.protocol ? 1 : 0 }).then(res => {
                     if (res) {
-                      wx.showToast({
+                        if (res.code === 1) {
-                        title: res.msg,
+                            wx.showModal({
-                        icon: 'none'
+                              title: '提示',
-                      })
+                              content: res.msg,
-                      if (res.code === 1) {
+                              showCancel: false,
-                        setTimeout(() => {
+                              complete: () => {
-                          wx.switchTab({
+                                wx.switchTab({
-                            url: '/pages/user/user',
+                                    url: '/pages/user/user',
-                          })
+                                })
-                        }, 400)
+                              }
-                      }
+                            })
+                        } else {
+                            wx.showModal({
+                                title: res.msg,
+                                icon: 'none'
+                            })
+                        }
                     }
                   })
                 

pages/user/user.js

@@ -83,6 +83,8 @@ Page({
             this.setData({
                 info: res.data
             })
+        } else{
+            this.setData({info: null})
         }
     })
     util.pagePoint({

subPackages/goods/oneCardTour/info/index.js

@@ -60,6 +60,15 @@ Page({
       util.back()
       return;
     }
+
+    // 2026-1-6  详情跳H5
+    if (options.id) {
+        wx.redirectTo({
+          url: '/pages/pbService/web/index?weburl='+encodeURIComponent(util.detailDomain+"/OneCardTourDetail?id="+options.id),
+        })
+        return
+    }
+
     if (options.retailId) {
       this.setData({
         retailId: options.retailId

utils/util.js

@@ -784,8 +784,11 @@ const goProdInOtherPlatform = function (item) {
     // return webUrl;
 }
 
+// 详情跳转域名
+const detailDomain = "https://m.cloud.sz-trip.com"
 
 module.exports = {
+  detailDomain: detailDomain,
   formatTime: formatTime,
   formatNumber: formatNumber,
   isTel: isTel,