Merge branch 'master' into dev_scene

app.js

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

pages/component/newCalendar/index.wxss

@@ -1,6 +1,7 @@
 /* components/xx-calendar/xx-calendar.wxss */
 page{
-    background: #F0B643;
+    /* background: #F0B643; */
+    background: #F2F2F2;
 }
 /* 头部样式start */
 .title-wrap{
@@ -21,7 +22,7 @@ page{
     width: 100%;
     /* height: 65.67rpx; */
     height: 256.67rpx;
-    background-image: url("https://static.ticket.sz-trip.com/uploads/20250421/58fee5695a0b676a14e8157b809ba1d6.png");
+    /* background-image: url("https://static.ticket.sz-trip.com/uploads/20250421/58fee5695a0b676a14e8157b809ba1d6.png"); */
     box-sizing: border-box;
 }
 .change-date{
@@ -205,4 +206,5 @@ page{
     right: 0;
     width: 290.13rpx;
     height: 146rpx;
+    display: none;
 }

pages/index/index.wxss

@@ -426,9 +426,11 @@
   margin-bottom: 40rpx;
 }
 .pbservice {
-  width: calc(186rpx * 7);
+  /* width: calc(186rpx * 7); */
   display: flex;
   flex-wrap: wrap;
+  flex-direction: column;
+  height: 350rpx;
 }
 .pbservice-item {
   /* 元旦修改 截止到注释的width*/

pages/info/sceneProductInfo/index.js

@@ -1048,7 +1048,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    commonApi.user_post('cart/get_list', {}).then(res => {
+    commonApi.user_post('cart/get_list', {noLogin: true}).then(res => {
       this.setData({
         cartCount: res.data.length //1
       })

pages/list/activitynew/index.wxss

@@ -128,7 +128,7 @@ background: rgba(11, 137, 142, .1);
   border-radius: 20rpx 20rpx 0 0;
   margin-top: 20rpx;
   position: relative;
-  background-image: url("https://static.ticket.sz-trip.com/uploads/20250421/63b9ec7a1192790eed3e5dcf915212c0.png");
+  /* background-image: url("https://static.ticket.sz-trip.com/uploads/20250421/63b9ec7a1192790eed3e5dcf915212c0.png"); */
   background-size: 100% 100%;
 }
 .activity-list {
@@ -327,7 +327,6 @@ background: rgba(11, 137, 142, .1);
   color: #0B898E;
   /* 节假日花样 */
   /* color: #DE4126; */
-  color: #DE4126;
 }
 .new-top-search-box {
   display: flex;
@@ -356,7 +355,7 @@ flex-shrink: 0;
     
 }
 .types-item {
-    /* border: 1px solid #999999; */
+    border: 1px solid #999999;
     border-radius: 27rpx;
     height: 53rpx;
     padding: 0 25rpx;
@@ -364,7 +363,7 @@ flex-shrink: 0;
     line-height: 53rpx;
     margin-right: 13rpx;
     flex-shrink: 0;
-    border: 1px solid #FFC987;
+    /* border: 1px solid #FFC987; */
 }
 .types-item-active {
   /* padding: 0 79rpx; */
@@ -374,7 +373,7 @@ flex-shrink: 0;
   /* height: 91.33rpx; */
   line-height: 57rpx;
   display: inline-block;
-  /* background: #0B898E; */
+  background: #0B898E;
   color: #FFFFFF;
   border-radius: 27rpx;
   margin-right: 13rpx;
@@ -384,15 +383,15 @@ flex-shrink: 0;
   background-size: 100% 100%;
   /* margin-top: -15rpx; */
     text-align: center;
-    min-width: 177.33rpx;
+    /* min-width: 177.33rpx; */
     box-sizing: border-box;
-    color: #DA4939;
+    /* color: #DA4939;
     text-shadow: 
                 -1px -1px 0 white,  
                 1px -1px 0 white,
                 -1px 1px 0 white,
                 1px 1px 0 white;
-    background-image: url("https://static.ticket.sz-trip.com/uploads/20250421/48ce52adb4044d6b91bbce05047695a5.png");
+    background-image: url("https://static.ticket.sz-trip.com/uploads/20250421/48ce52adb4044d6b91bbce05047695a5.png"); */
 }
 /* 不显示滚动条 */
 .types-box::-webkit-scrollbar {

pages/pbService/index.wxml

@@ -60,6 +60,12 @@
       <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb4New.png" mode="widthFix"></image>
       <view>12348</view>
     </view>
+    <view bindtap="gotoUrl"  data-title="文化场馆查询" data-url="https://m.cloud.sz-trip.com/Museum" class="pb-item">
+      <image src="https://static.ticket.sz-trip.com/uploads/20250812/ed95e68969c28c75e1ed348a56d4c198.png" mode="widthFix"></image>
+      <view>文化场馆查询</view>
+    </view>
+
+    
   </view>
 </view>
 <image class="title-img" src="https://static.ticket.sz-trip.com/uploads/20211115/335a42385c9e15ece075980209b0643a.png"

pages/pbService/web/index.js

@@ -24,7 +24,9 @@ Page({
     console.log('weburl',weburl)
     // 获取路径参数
     let webParam = {}
+    let baseUrl = ""
     try {
+        baseUrl = weburl.split('?')[0]
         let paramStr = weburl.split('?')[1]
         if (paramStr) {
             paramStr.split('&').forEach((param) => {
@@ -37,6 +39,7 @@ Page({
         console.log(e)
     }
     console.log(webParam)
+ 
     let lowerUrl = weburl.toLowerCase()
     // 宠你有礼 市民卡授权
     if (lowerUrl.indexOf('petyou2024') && webParam.cnylCode) {
@@ -78,6 +81,19 @@ Page({
     }
     // 君到苏州 加token
     else if(lowerUrl.indexOf('m.cloud.sz-trip.com')!=-1) {
+        delete webParam.token
+        delete webParam.lon
+        delete webParam.lat
+        weburl = baseUrl
+
+        if(Object.keys(webParam).length>0) {
+            const newParamsArray = [];
+            for (let key in webParam) {
+                newParamsArray.push(`${key}=${(webParam[key])}`);
+            }
+            weburl = `${baseUrl}?${newParamsArray.join('&')}`;
+        }
+
         let token = wx.getStorageSync('jstrip_token')
         if (token) {
             if (Object.keys(webParam).length>0) {
@@ -119,9 +135,7 @@ Page({
         } catch(e) {
             this.setUrl(weburl)
         }
-        // this.setData({
-        //     webUrl:weburl
-        // })
+        // this.setUrl(weburl)
     } else {
         // this.setData({
         //     webUrl:weburl
@@ -186,6 +200,7 @@ Page({
   },
 
   setUrl (url) {
+      console.log(url)
       let that = this
       if (this.data.canSetData) {
           this.data.canSetData = false

project.private.config.json

@@ -6,6 +6,13 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/pbService/web/index",
+          "pathName": "pages/pbService/web/index",
+          "query": "weburl=https%253A%252F%252Fm.cloud.sz-trip.com%252FmeetingLotus2025%253Ftoken%253D180c8775-e37f-4f91-a638-1d7f90069c52%2526lon%253D120.63327853732639%2526lat%253D31.26709312760416",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "pages/info/postProductInfo/index",
           "pathName": "pages/info/postProductInfo/index",