电影

app.js

@@ -21,7 +21,7 @@ App({
       unique_key: "wechatxcx"
     }).then(res => {
       let data = JSON.parse(res.data);
-      data.isTest = data.isTest188? true : false;
+      data.isTest = data.isTest189? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件

pages/index/index.wxml

@@ -123,7 +123,7 @@
             <image src="https://static.ticket.sz-trip.com/uploads/20250429/77bf17a7cf31614720bd8b1932b32473.png" mode="widthFix"></image>
             <view class="text">一日游</view>
           </view>
-          <view bindtap="gotoUrl" data-url="https://m.cloud.sz-trip.com/LearningTravel" data-event="one_card" data-title="户外游"  class="pbservice-item">
+          <view bindtap="gotoUrl" data-url="https://test.m.cloud.sz-trip.com/movies" data-event="one_card" data-title="户外游"  class="pbservice-item">
             <image src="https://static.ticket.sz-trip.com/uploads/20250430/4329eb909a6660062235f4a6cc7b2963.png" mode="widthFix"></image>
             <view class="text">户外游</view>
           </view>

pages/order/pay/index.js

@@ -56,6 +56,11 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+      // 有token 先更换token
+    if (options.token) {
+        wx.setStorageSync("jstrip_token", options.token)
+    }
+
     this.setData({
       id:options.id
     })

pages/pbService/web/index.js

@@ -73,7 +73,20 @@ Page({
             })
         })
     }
-     else {
+    // 君到苏州 加token
+    else if(lowerUrl.indexOf('m.cloud.sz-trip.com')!=-1) {
+        let token = wx.getStorageSync('jstrip_token')
+        if (token) {
+            if (Object.keys(webParam).length>0) {
+                weburl += '&token='+token
+            } else {
+                weburl += '?token='+token
+            }
+        } 
+        this.setData({
+            webUrl:weburl
+        })
+    } else {
         this.setData({
             webUrl:weburl
         })

pages/user/order/movieOrderInfo/index.js

@@ -20,7 +20,9 @@ Page({
     id:null,
     minute:"",
     second:"",
-    ids:[]
+    ids:[],
+
+    showKeFuFlag: false,
   },
 
   /**
@@ -90,6 +92,11 @@ Page({
       feeInfoFlag:!this.data.feeInfoFlag
     })
   },
+  showKeFu: function(){
+    this.setData({
+        showKeFuFlag:!this.data.showKeFuFlag
+      })
+  },
   close:function(){
     let _this = this,info = _this.data.info;
     wx.showModal({

pages/user/order/movieOrderInfo/index.wxml

@@ -3,7 +3,14 @@
 <title title="订单详情"></title>
 <view class="top-bg"></view>
 <canvas wx:for="{{info.order_product_list[0].qrcode}}" class="code-img" style="position:absolute;z-index:-1;" canvas-id="damocode{{index}}"></canvas>
-<view class="state-text" wx:if="{{info}}">{{info.state_text}}</view>
+<view class="state-text" wx:if="{{info}}">
+    <view style="display: flex;flex-direction: column;">
+        <view>{{info.state_text}}</view>
+        <text class="movie-type">{{info.order_product_list[0].supplier_code == 'syt'?'苏影通' : '淘票票'}}-电影票</text>
+    </view>
+
+    <image bind:tap="showKeFu" class="kefu" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/movieKefu.png"></image>
+</view>
 <view class="code-box box" wx:if="{{info && info.order_product_list[0].state=='WAIT_USE' && codeImgs.length>0}}">
   <view bindtap="prevCodeImg" class="iconfont icon-you-copy"></view>
   <view wx:for="{{info.order_product_list[0].qrcode}}" wx:if="{{codeIndex==index && codeImgs[codeIndex]}}">
@@ -141,9 +148,9 @@
 </view>
 
 
-<navigator url="/pages/user/service/index" class="bottom-btn">
+<!-- <navigator url="/pages/user/service/index" class="bottom-btn">
   <image src="https://static.ticket.sz-trip.com/xcxImages/index/service.png" mode="widthFix"></image>联系客服
-</navigator>
+</navigator> -->
 <view class="mask" wx:if="{{feeInfoFlag}}">
   <view class="mask-bg" bindtap="showFeeInfo"></view>
   <view class="mask-content">
@@ -153,4 +160,16 @@
     <view class="mask-item"><text>优惠券抵扣</text><text>-￥{{info.preference_money/100}}</text></view>
     <view class="mask-item"><text>订单实付</text><text>￥{{info.paid_money/100}}</text></view>
   </view>
+</view>
+
+<view class="mask" wx:if="{{showKeFuFlag}}">
+  <view class="mask-bg" bindtap="showKeFu"></view>
+  <view class="mask-content kefu-mask">
+    <view class="mask-title"></view>
+    <view class="iconfont icon-close" bindtap="showKeFu"></view>
+    <view>如有问题</view>
+    <view>请联系{{info.order_product_list[0].supplier_code == 'syt'?'苏影通' : '淘票票'}}客服</view>
+    <view style="font-size: 40rpx;color: #0B898E;padding: 41rpx 0;">{{orderDetail.order_product_list[0].supplier_code == 'syt' ? '0512 6836 2565' : '4006979968'}}</view>
+    <view style="font-weight: 500;font-size: 26rpx;color: #000000;padding-bottom: 40rpx;">服务时间（9:00-21:00）</view>
+  </view>
 </view>

pages/user/order/movieOrderInfo/index.wxss

@@ -12,9 +12,22 @@ page {
 }
 .state-text {
   margin: 20rpx 30rpx;
-  line-height: 100rpx;
+  /* line-height: 100rpx; */
   color: #fff;
   font-size: 48rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.state-text .kefu{
+    width: 80rpx;
+    height: 80rpx;
+}
+.movie-type{
+    font-weight: 500;
+font-size: 26rpx;
+color: #FFFFFF;
+padding-top: 20rpx;
 }
 .box {
   padding: 20rpx;
@@ -281,4 +294,11 @@ page {
   font-size: 24rpx;
   color: #999;
   margin-top: 30rpx;
+}
+.kefu-mask{
+    text-align: center;
+    font-weight: bold;
+    font-size: 32rpx;
+    color: #111111;
+    line-height: 48rpx;
 }

pages/user/user.wxml

@@ -122,6 +122,9 @@
     <navigator url="userPrivacy/index?id=14" class="user-box-line" catchtap="pagePoint" data-event="mine_receiveinfo">
       第三方共享信息清单
     </navigator>
+    <navigator url="/pages/pbService/web/index?weburl=https://m.supplier.cloud.sz-trip.com/login" class="user-box-line" catchtap="pagePoint" data-event="mine_receiveinfo">
+      商户核销
+    </navigator>
   </view>
 
   <view class="bottom-intro">

utils/util.js

@@ -480,7 +480,7 @@ const pagePoint = function(data,type) {
 }
 
 const goMovieDetail= function(id, title, needReturn) {
-    let tempUrl = 'https://m.cloud.sz-trip.com'+`/MovieInfo?id=${id}`
+    let tempUrl = 'https://test.m.cloud.sz-trip.com'+`/MovieInfo?id=${id}`
     if (title) {
         tempUrl += +'&title='+item.title
     }
@@ -495,7 +495,7 @@ const goMovieDetail= function(id, title, needReturn) {
 }
 
 const goMovieList= function(needReturn) {
-    let tempUrl = 'https://m.cloud.sz-trip.com'+`/MoviesChangShu`
+    let tempUrl = 'https://test.m.cloud.sz-trip.com/movies'
     let url = '/pages/pbService/web/index?weburl=' + encodeURIComponent(tempUrl)
     if (needReturn) {
         return url