From 8a985c61e1c5b86a41b0db868034c46473cee683 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Wed, 12 Apr 2023 08:54:38 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                      |  6 +-
 pages/index/index.js                        | 34 +++++---
 pages/index/index.wxml                      |  4 +-
 pages/info/sceneProductInfo/index.js        | 97 +++++++++++----------
 pages/list/activitynew/index.wxml           |  5 +-
 pages/list/activitynew/index.wxss           |  9 ++
 pages/list/movieticket/list/info/index.wxss |  1 +
 pages/list/museum/index.wxss                |  1 +
 8 files changed, 91 insertions(+), 66 deletions(-)

diff --git a/app.js b/app.js
index a60eb32..ab55933 100644
--- a/app.js
+++ b/app.js
@@ -21,7 +21,7 @@ App({
       unique_key: "wechatxcx"
     }).then(res => {
       let data = JSON.parse(res.data);
-      data.isTest = data.isTest68? true : false;
+      data.isTest = data.isTest71? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
@@ -31,6 +31,7 @@ App({
           obj[item.id] = item.image
         });
         this.globalData.configJson.indexSeason = obj 
+        this.globalData.loadIndexSeason = true
       })
     })
 
@@ -253,6 +254,7 @@ App({
     prizeId: null,
     loginPageEvent: {
       "pages/list/message/index": 'message_login_'
-    }
+    },
+    loadIndexSeason:false
   }
 })
\ No newline at end of file
diff --git a/pages/index/index.js b/pages/index/index.js
index 71f024e..f7d1ec7 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -206,6 +206,16 @@ Page({
     })
 
   },
+  //获取季节配置
+  getIndexSeason(){
+    this.setData({
+      indexHot: app.globalData.configJson.indexHot,
+      isTest: app.globalData.configJson.isTest,
+      otherPlat: app.globalData.configJson.otherPlats,
+      indexSeason: app.globalData.configJson.indexSeason
+    })
+    this.getFourProduct()
+  },
   //关闭弹窗广告
   closeAdv: function () {
     this.setData({
@@ -735,20 +745,8 @@ Page({
     return
   },
   onReady: function () {
-    if (app.globalData.configJson) {
-      this.setData({
-        indexHot: app.globalData.configJson.indexHot,
-        isTest: app.globalData.configJson.isTest,
-        otherPlat: app.globalData.configJson.otherPlats,
-        indexSeason: app.globalData.configJson.indexSeason
-      })
-      console.log(app.globalData.configJson)
-      this.getFourProduct()
-    } else {
-      setTimeout(() => {
-        this.onReady()
-      }, 300)
-    }
+
+
   },
   gotoOther: function (e) {
     let item = e.currentTarget.dataset.item;
@@ -772,6 +770,14 @@ Page({
     util.pagePoint(e, type)
   },
   onShow: function () {
+    if (app.globalData.loadIndexSeason) {
+      this.getIndexSeason()
+    } else {
+      setTimeout(() => {
+        this.getIndexSeason()
+      }, 500)
+    }
+
     this.pagePoint({
       event: 'home_view'
     }, 1)
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 5bf0986..307b4d7 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -216,11 +216,11 @@
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb5.png" mode="widthFix"></image>
         <view>书香借阅</view>
       </view>
-      <view bindtap="gotoPath" data-event="book_click" data-title="文化配送" data-path="/pages/culture/index"
+      <!-- <view bindtap="gotoPath" data-event="book_click" data-title="文化配送" data-path="/pages/culture/index"
         class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image>
         <view>文化配送</view>
-      </view>
+      </view> -->
       <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展"
         data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb13.png" mode="widthFix"></image>
diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index 0981ea2..ab71a71 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -32,41 +32,7 @@ Page({
     cartTop: 0,
     top: 0,
     skuList: [], //立即预定的列表
-    sku_ids: [
-      353954,
-      353950,
-      353949,
-      353951,
-      353947,
-      353953,
-      353685,
-      353684,
-      353952,
-      353686,
-      353948,
-      354730,
-      354409,
-      354359,
-      345343,
-      354756,
-      354385,
-      354360,
-      354361,
-      354362,
-      355466,
-      355465,
-      356230,
-      356223,
-      356207,
-      346648,
-      357518,
-      356233,
-      354381,
-      354384,
-      356324,
-      354737,
-      355467,
-    ]
+    sku_ids: []
   },
 
   /**
@@ -89,6 +55,7 @@ Page({
     commonApi._post("scene/detail", {
       id: options.id
     }).then(res => {
+      let flag = false
       if (!res.data) {
         wx.showToast({
           title: '产品已下架',
@@ -122,22 +89,58 @@ Page({
         if (pItem) {
           res.data.product = [pItem];
         }
-
-      } else if (options.zhuanti_type == "yihuFree") {
-
-        let skuArr = this.data.sku_ids
-        let newArr = []
-        for (let i = 0; i < res.data.product.length; i++) { //3
-          for (let j = 0; j < res.data.product[i].sku.length; j++) { //4
-            for (let k = 0; k < skuArr.length; k++) {
-              if (res.data.product[i].sku[j].id == skuArr[k]) {
-                newArr.push(res.data.product[i].sku[j])
+      } else if (options.zhuanti_type) {
+        flag = true
+        commonApi._post("theme/getYihuFreeList", {
+          zhuanti_type: options.zhuanti_type
+        }).then(res1 => {
+          let skuArr = res1.data.sku_ids
+          let newArr = []
+          for (let i = 0; i < res.data.product.length; i++) { //3
+            for (let j = 0; j < res.data.product[i].sku.length; j++) { //4
+              for (let k = 0; k < skuArr.length; k++) {
+                if (res.data.product[i].sku[j].id == skuArr[k]) {
+                  newArr.push(res.data.product[i].sku[j])
+                }
               }
             }
+            res.data.product[i].sku = newArr;
           }
-          res.data.product[i].sku = newArr;
-        }
+          res.data.product.map(product => {
+            product.sku.map(sku => {
+              sku.display_tags = (sku.display_tags ? sku.display_tags.split(",") : []).splice(0, 2);
+            })
+          })
+          this.setData({
+            info: res.data
+          })
+          var arr = []
+          res.data.product.forEach((item, index) => {
+            item.sku.forEach(itemB => {
+              itemB.proIndex = index
+              arr.push(itemB)
+            })
+          });
+          this.setData({
+            skuList: arr
+          })
+          util.pagePoint({
+            event: 'scene_view',
+            param: {
+              type: res.data.type,
+              id: res.data.id
+            }
+          }, 1)
+          this.BroswerRecord()
+        })
+
       }
+      console.log(res.data.product);
+        if (flag) {
+          return
+        }
+
+
       // res.data.listimg = res.data.listimg?res.data.listimg.split(","):[];
       res.data.product.map(product => {
         product.sku.map(sku => {
diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
index 65c01e8..9cb8dee 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -95,11 +95,14 @@
   <view wx:if="{{list.length>0 && type==4 && movieType!=2}}">
     <view bindtap="gotoDetail" data-item="{{item}}" class="activity-item activity-item-out" style="margin-top:0" wx:for="{{list}}">
       <common-image width="180rpx" height='180rpx' src="{{item.headimg}}" mode="aspectFill"></common-image>
-      <view style="height:180rpx;margin:0;margin-left:20rpx;display:block" class="activity-info">
+      <view style="height:180rpx;margin:0;margin-left:20rpx;display:block;max-width:327rpx" class="activity-info">
         <view class="activity-title textOver2" style="margin-bottom:20rpx">{{item.title}}</view>
         <view class="textOver" wx:if="{{item.director}}" style="margin-bottom:10rpx">导演：{{item.director}}</view>
         <view class="textOver2" wx:if="{{item.leading_role}}">主演：{{item.leading_role}}</view>
       </view>
+      <view class="btn">
+          查看
+      </view>
     </view>
   </view>
   <view wx:if="{{list.length>0 && type==4 && movieType==2}}">
diff --git a/pages/list/activitynew/index.wxss b/pages/list/activitynew/index.wxss
index c53c97a..50ae31f 100644
--- a/pages/list/activitynew/index.wxss
+++ b/pages/list/activitynew/index.wxss
@@ -290,4 +290,13 @@ background: rgba(11, 137, 142, .1);
 .new-top-search-box {
   display: flex;
   justify-content: space-between;
+}
+.btn{
+flex-shrink: 0;
+ color: #fff;
+ background: #f55;
+ font-size: 26rpx;
+ padding: 6rpx 20rpx;
+ border-radius: 40rpx;
+ margin-left: 10rpx;
 }
\ No newline at end of file
diff --git a/pages/list/movieticket/list/info/index.wxss b/pages/list/movieticket/list/info/index.wxss
index 8bb62ff..a35a1b3 100644
--- a/pages/list/movieticket/list/info/index.wxss
+++ b/pages/list/movieticket/list/info/index.wxss
@@ -34,6 +34,7 @@
   box-shadow: 0px 0px 20rpx 0px rgba(0, 0, 0, 0.06);
   border-radius: 27rpx 27rpx 0px 0px;
   padding: 0 40rpx;
+  padding-bottom: 60rpx;
 }
 .content .title {
   font-size: 33rpx;
diff --git a/pages/list/museum/index.wxss b/pages/list/museum/index.wxss
index 88ee367..41f26cf 100644
--- a/pages/list/museum/index.wxss
+++ b/pages/list/museum/index.wxss
@@ -55,6 +55,7 @@ page {
 }
 .info .address {
   margin-bottom: 15rpx;
+  max-width: 320rpx;
 }
 .info .com-flex {
   width: 240rpx;

From 68dfb6019f4c69059366418733d6e97d693450bf Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Sat, 15 Apr 2023 15:49:04 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E5=9B=A2=E9=98=9F=E9=A2=84=E7=BA=A6?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5id=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                             |  2 +-
 pages/info/groupOrderInfo/index.js | 57 ++++++++++++++++++++----------
 2 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/app.js b/app.js
index ab55933..c95d57e 100644
--- a/app.js
+++ b/app.js
@@ -21,7 +21,7 @@ App({
       unique_key: "wechatxcx"
     }).then(res => {
       let data = JSON.parse(res.data);
-      data.isTest = data.isTest71? true : false;
+      data.isTest = data.isTest72? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/info/groupOrderInfo/index.js b/pages/info/groupOrderInfo/index.js
index f85a2fe..412a43e 100644
--- a/pages/info/groupOrderInfo/index.js
+++ b/pages/info/groupOrderInfo/index.js
@@ -14,7 +14,8 @@ Page({
     restTime:null,
     countdown:0,
     codeImg:null,
-    showShareMask:false
+    showShareMask:false,
+    from:null
   },
 
   /**
@@ -22,25 +23,26 @@ Page({
    */
   onLoad: function (options) {
     this.setData({
-      id:options.id
+      id:options.id,
+      from:options.from
     })
     // 获取二维码
-    commonApi.user_post("team_order/get_qrcode",{
-      url:'https://m.cloud.sz-trip.com/TeamForm?team_id='+this.data.id
-    }).then(res=>{
-      this.setData({
-        codeImg:res.data
-      })
-    })
-    if(options.from=='order'){
-      wx.showModal({
-        title:"提示",
-        content:"团体预约发起后请前往个人中心团体预约订单中查看订单详情和组团详情。",
-        success:function(){
+    // commonApi.user_post("team_order/get_qrcode",{
+    //   url:'https://m.cloud.sz-trip.com/TeamForm?team_id='+this.data.id
+    // }).then(res=>{
+    //   this.setData({
+    //     codeImg:res.data
+    //   })
+    // })
+    // if(options.from=='order'){
+    //   wx.showModal({
+    //     title:"提示",
+    //     content:"团体预约发起后请前往个人中心团体预约订单中查看订单详情和组团详情。",
+    //     success:function(){
           
-        }
-      })
-    }
+    //     }
+    //   })
+    // }
   },
   showShare(){
     this.setData({
@@ -107,7 +109,24 @@ Page({
       }
     })
   },
-
+  getQrcode(id){
+    commonApi.user_post("team_order/get_qrcode",{
+      url:'https://m.cloud.sz-trip.com/TeamForm?team_id='+id
+    }).then(res=>{
+      this.setData({
+        codeImg:res.data
+      })
+    })
+    if(this.data.from=='order'){
+      wx.showModal({
+        title:"提示",
+        content:"团体预约发起后请前往个人中心团体预约订单中查看订单详情和组团详情。",
+        success:function(){
+          
+        }
+      })
+    }
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
@@ -123,6 +142,7 @@ Page({
       order_id:this.data.id
     }).then(res=>{
       if(res.code==1){
+        this.getQrcode(res.data.list.id)
         res.data.list.order_info = res.data.list.order_info?JSON.parse(res.data.list.order_info):null;
         res.data.list.members.reverse()
         this.setData({
@@ -141,6 +161,7 @@ Page({
         
       }
     })
+
   },
   setTime(){
     if(this.data.countdown && this.data.countdown>0){

From 940c39d6a424fd4b265d2df04a8a7439a19ffb52 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Fri, 21 Apr 2023 17:34:14 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E7=94=B5=E5=BD=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                        |  2 +-
 app.json                                      |  1 +
 pages/list/activitynew/index.js               |  1 +
 pages/list/activitynew/index.wxml             | 19 ++---
 pages/list/movieticket/list/cinema/index.js   | 49 +++++++++++-
 pages/list/movieticket/list/cinema/index.wxml |  6 +-
 pages/list/movieticket/list/seats/index.js    | 28 ++++---
 pages/list/movieticket/list/web/index.js      | 79 +++++++++++++++++++
 pages/list/movieticket/list/web/index.json    |  3 +
 pages/list/movieticket/list/web/index.wxml    |  4 +
 pages/list/movieticket/list/web/index.wxss    |  1 +
 pages/list/techan/index.wxml                  |  2 +-
 pages/order/coupon/index.js                   |  2 +-
 pages/order/hotel/index.wxml                  |  2 +-
 pages/order/movie/index.js                    | 45 ++++++-----
 pages/order/orderList/index.js                |  3 +
 pages/order/pay/index.js                      | 50 ++++++++++--
 pages/order/pay/index.wxml                    | 20 ++++-
 pages/order/scene/index.js                    |  2 +-
 pages/pbService/web/index.js                  |  1 -
 20 files changed, 259 insertions(+), 61 deletions(-)
 create mode 100644 pages/list/movieticket/list/web/index.js
 create mode 100644 pages/list/movieticket/list/web/index.json
 create mode 100644 pages/list/movieticket/list/web/index.wxml
 create mode 100644 pages/list/movieticket/list/web/index.wxss

diff --git a/app.js b/app.js
index c95d57e..81893c1 100644
--- a/app.js
+++ b/app.js
@@ -21,7 +21,7 @@ App({
       unique_key: "wechatxcx"
     }).then(res => {
       let data = JSON.parse(res.data);
-      data.isTest = data.isTest72? true : false;
+      data.isTest = data.isTest73? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/app.json b/app.json
index 23d26ac..7de07ea 100644
--- a/app.json
+++ b/app.json
@@ -104,6 +104,7 @@
     "pages/list/movieticket/list/seats/index",
     "pages/list/movieticket/list/cinema/index",
     "pages/list/movieticket/list/ticket/index",
+    "pages/list/movieticket/list/web/index",
     "pages/list/movieticket/list/info/index",
     "pages/list/theatre/index",
     "pages/list/card/index",
diff --git a/pages/list/activitynew/index.js b/pages/list/activitynew/index.js
index acb4921..604547e 100644
--- a/pages/list/activitynew/index.js
+++ b/pages/list/activitynew/index.js
@@ -335,6 +335,7 @@ Page({
         url: '/pages/list/movieticket/list/info/index?id=' + item.third_id
       })
     } else if (this.data.type == 4) {
+      return
       wx.navigateTo({
         url: '/pages/list/movieticket/list/cinema/index?id=' + item.third_id
       })
diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
index 9cb8dee..6cc988f 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -19,10 +19,6 @@
       <image src="https://static.ticket.sz-trip.com/uploads/20230208/{{type==9?'b44d3101973581c7efe097df2119504d':'4bf0b55112e6607e62a6b3498757b86f'}}.png" mode="widthFix"></image>
       <view style="{{type==9?'color: #0B898E':''}}">全部</view>
     </view>
-    <view class="type-item" bindtap="changeType" data-type="2">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon2{{type==2?'_active':''}}.png" mode="widthFix"></image>
-      <view style="{{type==2?'color:#C155E9':''}}">展览</view>
-    </view>
     <view class="type-item" bindtap="changeType" data-type="3">
       <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon3{{type==3?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==3?'color:#358FE4':''}}">景区</view>
@@ -31,14 +27,19 @@
       <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon1{{type==1?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==1?'color:#FFB423':''}}">演出</view>
     </view>
-    <!-- <view class="type-item" bindtap="changeType" data-type="5">
-      <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon5{{type==5?'_active':''}}.png" mode="widthFix"></image>
-      <view style="{{type==5?'color:#0B898E':''}}">讲座</view>
-    </view> -->
     <view class="type-item" bindtap="changeType" data-type="4">
       <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon4{{type==4?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==4?'color:#63B71F':''}}">电影</view>
     </view>
+    <view class="type-item" bindtap="changeType" data-type="2">
+      <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon2{{type==2?'_active':''}}.png" mode="widthFix"></image>
+      <view style="{{type==2?'color:#C155E9':''}}">展览</view>
+    </view>
+    <!-- <view class="type-item" bindtap="changeType" data-type="5">
+      <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon5{{type==5?'_active':''}}.png" mode="widthFix"></image>
+      <view style="{{type==5?'color:#0B898E':''}}">讲座</view>
+    </view> -->
+
     <view class="type-item" bindtap="changeType" data-type="6" style="margin-right:30rpx">
       <image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon6{{type==6?'_active':''}}.png" mode="widthFix"></image>
       <view style="{{type==6?'color:#54b9ed':''}}">其他</view>
@@ -106,7 +107,7 @@
     </view>
   </view>
   <view wx:if="{{list.length>0 && type==4 && movieType==2}}">
-    <view  data-item="{{item}}" class="activity-item activity-item-out" style="margin-top:0;padding:10rpx 20rpx" wx:for="{{list}}">
+    <view bindtap="gotoDetail"  data-item="{{item}}" class="activity-item activity-item-out" style="margin-top:0;padding:10rpx 20rpx" wx:for="{{list}}">
       <view class="activity-info" style="height:160rpx;width:500rpx">
         <view class="activity-title textOver2">{{item.title}}</view>
         <view class="textOver" wx:if="{{item.address}}">{{item.address}}</view>
diff --git a/pages/list/movieticket/list/cinema/index.js b/pages/list/movieticket/list/cinema/index.js
index 072bcb5..c84d836 100644
--- a/pages/list/movieticket/list/cinema/index.js
+++ b/pages/list/movieticket/list/cinema/index.js
@@ -1,4 +1,5 @@
 // pages/list/movieticket/list/cinema/index.js
+let app = getApp()
 import commonApi from "../../../../../utils/https/common"
 import util from "../../../../../utils/util"
 Page({
@@ -13,7 +14,8 @@ Page({
     dates:[],
     dateIndex:0,
     list:[],
-    name:""
+    name:"",
+    invoiceId:null,
   },
 
   /**
@@ -97,6 +99,49 @@ Page({
       console.log(res)
     })
   },
+  selectMovieSeat(e){
+    let info = e.currentTarget.dataset.info
+    const areaInfo = JSON.parse(info.schedule_area).map(item => ({...item, price:item.areaPrice,areaId:item.seatAreaId}));
+    let planData = {
+      areaInfo,
+      fee:info.service_fee,
+      movieName: this.data.movie[this.data.currentNum].title,
+      planId : info.schedule_id,
+      planTime : info.show_time,
+      type:'WECHATXCX',
+      remake : ''
+    }
+    let show_id = info.show_id
+    let cinema_id = info.cinema_id
+    // let schedule_id = info.schedule_id
+
+    commonApi._post('Cinema/getProductAndSku',{
+      show_id,
+      cinema_id,
+    }).then(res=>{
+      this.setData({
+        productInfo:res.data
+      })
+      app.globalData.product ={ 
+        product:this.data.productInfo,
+        info:{
+          hallName:this.data.name,
+          show_date:info.show_date,
+          start_end_time:info.show_time,
+          movieName:this.data.movie[this.data.currentNum].title,
+          show_version:info.show_version,
+          selectSeatInfo:null,
+          schedule_id:info.schedule_id
+        }
+      }
+      wx.navigateTo({
+        url:"/pages/list/movieticket/list/web/index?planData="+ JSON.stringify(planData),
+      })
+    })
+    // wx.navigateTo({
+    //   url: '/pages/list/movieticket/list/seats/index?show_id='+show_id+'&cinema_id='+cinema_id+'&schedule_id='+schedule_id+'&planData='+JSON.stringify(planData),
+    // })
+  },
   onChange:function(e){
     console.log(e)
     this.setData({
@@ -140,7 +185,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
+    console.log(123123123213);
   },
 
   /**
diff --git a/pages/list/movieticket/list/cinema/index.wxml b/pages/list/movieticket/list/cinema/index.wxml
index 8c03f56..a1a90d9 100644
--- a/pages/list/movieticket/list/cinema/index.wxml
+++ b/pages/list/movieticket/list/cinema/index.wxml
@@ -16,7 +16,7 @@
 <view class="dates-list">
   <view class="date-item{{index==dateIndex?' active':''}}" bindtap="changeDate" data-index="{{index}}" wx:for="{{dates}}">{{item.name}}</view>
 </view>
-<navigator url="../seats/index?show_id={{movie[currentNum].show_id}}&cinema_id={{id}}&schedule_id={{item.schedule_id}}" class="movie-item" wx:for="{{list}}">
+<div class="movie-item" wx:for="{{list}}" data-info="{{item}}" bindtap="selectMovieSeat">
   <view style="width:167rpx;flex-shrink:0">
     <view class="time">{{item.show_time}}</view>
     <view>{{item.close_time}}散场</view>
@@ -25,11 +25,11 @@
     <view class="type">{{item.show_version}}</view>
     <view>{{item.hall_name}}</view>
   </view>
-  <view class="price"><text>￥</text>{{item.price/100}}</view>
+  <view class="price"><text>￥</text>{{item.price}}</view>
   <view class="btn">
     购票
   </view>
-</navigator>
+</div>
 <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1">
   <image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
   <view>暂无内容</view>
diff --git a/pages/list/movieticket/list/seats/index.js b/pages/list/movieticket/list/seats/index.js
index a44f10f..6e885ba 100644
--- a/pages/list/movieticket/list/seats/index.js
+++ b/pages/list/movieticket/list/seats/index.js
@@ -137,6 +137,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    console.log(options);
     this.setData({
       options:options
     })
@@ -147,13 +148,16 @@ Page({
       this.setData({
         productInfo:res.data
       })
+      wx.navigateTo({
+        url:"/pages/list/movieticket/list/web/index?planData="+options.planData,
+      })
     })
-    let that = this;
-    let sys = wx.getSystemInfoSync()
-    that.setData({
-      seatArea: sys.screenHeight - sys.statusBarHeight - (500 * sys.screenWidth / 750),
-      rpxToPx: sys.screenWidth / 750
-    });
+    // let that = this;
+    // let sys = wx.getSystemInfoSync()
+    // that.setData({
+    //   seatArea: sys.screenHeight - sys.statusBarHeight - (500 * sys.screenWidth / 750),
+    //   rpxToPx: sys.screenWidth / 750
+    // });
   },
 
   /**
@@ -167,12 +171,12 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    commonApi.user_post("Cinema/getLockSeatInfo",{
-      schedule_id:this.data.options.schedule_id
-    }).then(res=>{
-      console.log(res)
-      this.getInfo();
-    })
+    // commonApi.user_post("Cinema/getLockSeatInfo",{
+    //   schedule_id:this.data.options.schedule_id
+    // }).then(res=>{
+    //   console.log(res)
+    //   this.getInfo();
+    // })
     
     
     //---这此替换成自己的接口请求成功后--end--
diff --git a/pages/list/movieticket/list/web/index.js b/pages/list/movieticket/list/web/index.js
new file mode 100644
index 0000000..0dcf23c
--- /dev/null
+++ b/pages/list/movieticket/list/web/index.js
@@ -0,0 +1,79 @@
+// pages/pbService/web/index.js
+let app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    webUrl:""
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    this.setData({
+      webUrl:'https://online.suiyuaninfo.com/?planData='+options.planData
+    })
+    console.log(this.data.webUrl);
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+   
+  },
+  handleGetMessage: function(e) {
+    console.log(e.target.data)
+    console.log(app.globalData.product);
+    return
+    app.globalData.product ={ 
+      product:this.data.productInfo,
+      info:{
+        hallName:this.data.hallName,
+        show_date:this.data.show_date,
+        start_end_time:this.data.start_end_time,
+        cinema_title:this.data.cinema_title,
+        movieName:this.data.movieName,
+        show_version:this.data.show_version,
+        selectSeatInfo:selectSeatInfo,
+        schedule_id:this.data.schedule_id
+      }
+    }
+  },
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+      
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  }
+})
\ No newline at end of file
diff --git a/pages/list/movieticket/list/web/index.json b/pages/list/movieticket/list/web/index.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/list/movieticket/list/web/index.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/list/movieticket/list/web/index.wxml b/pages/list/movieticket/list/web/index.wxml
new file mode 100644
index 0000000..5d9fd35
--- /dev/null
+++ b/pages/list/movieticket/list/web/index.wxml
@@ -0,0 +1,4 @@
+<!--pages/pbService/web/index.wxml-->
+<view wx:if="{{webUrl}}">
+  <web-view bindmessage="handleGetMessage" src="{{webUrl}}"></web-view>
+</view>
diff --git a/pages/list/movieticket/list/web/index.wxss b/pages/list/movieticket/list/web/index.wxss
new file mode 100644
index 0000000..3d9e18a
--- /dev/null
+++ b/pages/list/movieticket/list/web/index.wxss
@@ -0,0 +1 @@
+/* pages/pbService/web/index.wxss */
\ No newline at end of file
diff --git a/pages/list/techan/index.wxml b/pages/list/techan/index.wxml
index 9d8e3df..5ba68e6 100644
--- a/pages/list/techan/index.wxml
+++ b/pages/list/techan/index.wxml
@@ -17,7 +17,7 @@
         <view class="supplier-tags">
           <view class="supplier-tag textOver" wx:for="{{item.display_tags}}">{{item}}</view>
         </view>
-        <view class="supplier-address supplier-tags"><text class="iconfont icon-location"></text>{{item.address}}</view>
+        <view class="supplier-address supplier-tags"><text class="iconfont icon-location"></text><text class="textOver">{{item.address}}</text></view>
       </view>
       <view class="supplier-price"><text>￥</text><text>{{(item.start_price/100)}}</text><text>起</text></view>
     </view>
diff --git a/pages/order/coupon/index.js b/pages/order/coupon/index.js
index ac70388..1b7c0c3 100644
--- a/pages/order/coupon/index.js
+++ b/pages/order/coupon/index.js
@@ -71,7 +71,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
+    app.globalData.couponInfo = null;
   },
 
   /**
diff --git a/pages/order/hotel/index.wxml b/pages/order/hotel/index.wxml
index 694fdbd..f59a916 100644
--- a/pages/order/hotel/index.wxml
+++ b/pages/order/hotel/index.wxml
@@ -68,7 +68,7 @@
     </view>
   </view>
 </view>
-<!-- <coupon id="coupon" money="{{CtripHotelCart.price_sum * (numberIndex+1)}}" sku="{{CtripHotelCart.id}}"></coupon> -->
+<coupon id="coupon" money="{{CtripHotelCart.price_sum * (numberIndex+1)}}" sku="{{CtripHotelCart.id}}"></coupon>
 <!-- 支付按钮 -->
 <view style="height:{{100 }}rpx"></view>
 <view class="fixed-bottom">
diff --git a/pages/order/movie/index.js b/pages/order/movie/index.js
index 21a32fc..f33494f 100644
--- a/pages/order/movie/index.js
+++ b/pages/order/movie/index.js
@@ -21,22 +21,19 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    let key = options.key;
-    if(!key){
-      util.back()
-      return;
-    }
+    console.log(options.selectSeatInfo);
     this.setData({
       prizeId:wx.getStorageSync('prizeId')
     })
     let product = app.globalData.product,price=0;
-    product.info.selectSeatInfo.map(item=>{
-      price = Number(item.price) + Number(price)
+    product.info.selectSeatInfo = JSON.parse(options.selectSeatInfo)
+    product.info.selectSeatInfo.seatPriceInfo.map(item=>{
+      price =price + Number(item.split('-')[1]) 
     })
+    console.log(price);
     this.setData({
       product:product,
-      key:key,
-      price:price
+      price:price*100
     })
     userApi.user_post("user/getMyInfo").then(res=>{
       this.setData({
@@ -63,30 +60,30 @@ Page({
       })
       return;
     }
-    let product = this.data.product,seats_list=[],seats_ids=[];
-    product.info.selectSeatInfo.map(item=>{
-      seats_list.push(item.name);
-      seats_ids.push({
-        ext_id:item.ext_id,
-        area:item.area || "",
-        flag:Number(item.flag)
-      })
-    })
+    let product = this.data.product
+    // product.info.selectSeatInfo.map(item=>{
+    //   seats_list.push(item.name);
+    //   seats_ids.push({
+    //     ext_id:item.ext_id,
+    //     area:item.area || "",
+    //     flag:Number(item.flag)
+    //   })
+    // })
     let product_list = [{
       "type" : "movie",//电影,必填
       "product_id": product.product.id,
       "sku_id": product.product.sku_info.id,
-      "product_num": product.info.selectSeatInfo.length,//也就是锁定的座位数,必填
+      "product_num": product.info.selectSeatInfo.seatInfo.length,//也就是锁定的座位数,必填
       "reserve_mobile": this.data.tel,
       "use_date": product.info.show_date,//使用日期，Y-m-d日期格式字符串,必填
       "use_time": product.info.start_end_time,//场次时间,直接传字符串,必填
       "show_version": product.info.show_version,//场次版本,必填
       "scene_id": product.product.scene_id,//场景id，我方系统的场景id,必填
       "schedules_name": product.info.hallName,//放映厅名称,必填
-      "seats_list": seats_list.join(","),//座位中文名称,多个座位逗号分隔,必填
-      "key": this.data.key,//锁座返回的key,必填
+      "seats_list": product.info.selectSeatInfo.seatInfo.join(","),//座位中文名称,多个座位逗号分隔,必填
+      // "key": this.data.key,//锁座返回的key,必填
       "schedules_id": product.info.schedule_id,//淘票票场次id,必填
-      "seats_ids": seats_ids
+      "seats_ids": product.info.selectSeatInfo.seatPriceInfo
     }];
     let data = {
       product_list:product_list,
@@ -110,6 +107,7 @@ Page({
       data:JSON.stringify(data)
     }).then(res=>{
       console.log(res)
+
     })
   },
 
@@ -120,13 +118,14 @@ Page({
     this.setData({
       coupon:app.globalData.couponInfo
     })
+    console.log(this.coupon);
   },
 
   /**
    * 生命周期函数--监听页面隐藏
    */
   onHide: function () {
-
+    app.globalData.couponInfo = null
   },
 
   /**
diff --git a/pages/order/orderList/index.js b/pages/order/orderList/index.js
index 16f787c..220d57c 100644
--- a/pages/order/orderList/index.js
+++ b/pages/order/orderList/index.js
@@ -21,6 +21,7 @@ Page({
   select_allowance: false,
   allowance_data: null,
   allowance_price: 0,
+  flag:null
   },
 
   /**
@@ -32,7 +33,9 @@ Page({
       ticketList: app.globalData.list,
       kjId: app.globalData.kjId,
       gp_id: app.globalData.gp_id || app.globalData.team_id,
+      flag:options.flag
     })
+    console.log(this.data.flag);
     console.log(app.globalData);
     let price = 0, sku_id = [] ,postFee= 0; 
     app.globalData.postProduct.map(item => {
diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index c99612d..7481d63 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -13,8 +13,11 @@ Page({
     second:"00",
     minute:"00",
     payIndex:-1,
-    numIndex: 0,
-    showNumMask: false
+    numIndex:0,
+    showNumMask: false,
+    activePay:false,//是否活动支付
+    SUBWALLET:false,
+    wxPay:false
   },
 
   /**
@@ -85,9 +88,24 @@ Page({
       else {
         util.back()
       }
-      this.setData({
-        info:res.data
-      })
+      if (Object.keys(res.data.coupon_activity).length != 0) {
+        this.setData({
+          info:res.data,
+          activePay: Object.keys(res.data.coupon_activity).length === 0 ?false:true,
+          SUBWALLET:res.data.coupon_activity.pay_type.includes('SUBWALLET') || !res.data.coupon_activity.pay_type,
+          wxPay:res.data.coupon_activity.pay_type.includes('WEIXIN') || !res.data.coupon_activity.pay_type,
+          payIndex:Object.keys(res.data.coupon_activity).length === 0 ?-1:0,
+        })
+        console.log(this.data.wxPay);
+      }else{
+        this.setData({
+          info:res.data,
+        })
+      }
+     
+      
+      console.log(this.data.ERMB);
+
     })
     this.checkPay();
    
@@ -111,6 +129,28 @@ Page({
     })
   },
   pay:function(){
+    if (this.data.activePay) {
+      let flag = false
+      if (this.data.payList.length!=0 && !this.data.info.coupon_activity.pay_type.includes('SUBWALLET')) {
+        flag = true
+      }
+      if (this.data.activePay && flag && !this.data.wxPay) {
+         wx.showToast({
+           title: '暂无支付方式请前往其它端付款',
+           icon:'none'
+         })
+         return
+      }
+      console.log(this.data.payIndex);
+      if (this.data.payIndex===0) {
+        wx.showToast({
+          title: '请选择支付方式',
+          icon:'none'
+        })
+        return
+      }
+    }
+
     let _this = this;
     if(this.data.payIndex==1) {
       this.setData({
diff --git a/pages/order/pay/index.wxml b/pages/order/pay/index.wxml
index 44d2fb9..834cbb6 100644
--- a/pages/order/pay/index.wxml
+++ b/pages/order/pay/index.wxml
@@ -8,7 +8,25 @@
     <view class="price">¥{{info.paid_money/100}}</view>
   </view>
 </view>
-<view class="pay-methods-box">
+<view class="pay-methods-box" wx:if="{{activePay}}">
+  <view>支付方式：</view>
+  <view class="pay-method" bindtap="changePayMethod" data-index="-1" wx:if="{{wxPay}}">
+    <view class="iconfont icon-weixin1"></view>
+    <view class="method-name">微信支付</view>
+    <view class="iconfont {{payIndex==-1?'icon-iconfontoptionbutton':'icon-quan'}}"></view>
+  </view>
+  <view class="pay-method" wx:if="{{payList.length>0 && SUBWALLET}}" style="border-top:1rpx solid #ccc" bindtap="changePayMethod" data-index="1">
+    <image src="https://test.m.cloud.sz-trip.com/static/images/numLogo.png" mode="aspectFill"></image>
+    <view class="method-name">数字人民币</view>
+    <view class="iconfont {{payIndex==1?'icon-iconfontoptionbutton':'icon-quan'}}"></view>
+  </view>
+  <view class="pay-method" wx:else style="border-top:1rpx solid #ccc" data-index="1">
+    <image src="https://static.ticket.sz-trip.com/xcxImages/numLogo.png" mode="aspectFill"></image>
+    <view class="red-num">君到苏州现已支持数字人民币支付，请至数字人民币app中绑定授权</view>
+  </view>
+</view>
+
+<view class="pay-methods-box" wx:if="{{!activePay}}">
   <view>支付方式：</view>
   <view class="pay-method" bindtap="changePayMethod" data-index="-1">
     <view class="iconfont icon-weixin1"></view>
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 2e38932..64ce73a 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -292,7 +292,7 @@ Page({
 				app.globalData.createDate.product_list.push(data.product_list[0])
 			}
 			wx.redirectTo({
-			  url: '/pages/order/orderList/index'
+			  url: '/pages/order/orderList/index?flag='+ this.data.flag
 			})
 		}else{
 			commonApi.user_post(service, postData).then(res => {
diff --git a/pages/pbService/web/index.js b/pages/pbService/web/index.js
index 97bbea4..f5c5555 100644
--- a/pages/pbService/web/index.js
+++ b/pages/pbService/web/index.js
@@ -51,7 +51,6 @@ Page({
       })
     }
   },
-
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

From 95b033d0fcc322a45049e73f5bf64735c78a8e12 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Tue, 25 Apr 2023 09:28:20 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E4=BC=98=E6=83=A0=E6=9C=9F=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                          | 2 +-
 pages/list/activitynew/index.js | 1 -
 pages/order/coupon/index.wxml   | 2 +-
 pages/order/movie/index.js      | 2 +-
 pages/user/coupon/index.wxml    | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app.js b/app.js
index 81893c1..70097da 100644
--- a/app.js
+++ b/app.js
@@ -21,7 +21,7 @@ App({
       unique_key: "wechatxcx"
     }).then(res => {
       let data = JSON.parse(res.data);
-      data.isTest = data.isTest73? true : false;
+      data.isTest = data.isTest74? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/list/activitynew/index.js b/pages/list/activitynew/index.js
index 604547e..acb4921 100644
--- a/pages/list/activitynew/index.js
+++ b/pages/list/activitynew/index.js
@@ -335,7 +335,6 @@ Page({
         url: '/pages/list/movieticket/list/info/index?id=' + item.third_id
       })
     } else if (this.data.type == 4) {
-      return
       wx.navigateTo({
         url: '/pages/list/movieticket/list/cinema/index?id=' + item.third_id
       })
diff --git a/pages/order/coupon/index.wxml b/pages/order/coupon/index.wxml
index 704ff1e..6ee7140 100644
--- a/pages/order/coupon/index.wxml
+++ b/pages/order/coupon/index.wxml
@@ -5,7 +5,7 @@
     <view class="money">{{item.activity.money/100}}</view>
     <view class="coupon-info">
       <view>满{{item.activity.mini_money/100}}元可用</view>
-      <view class="couon-date">{{item.activity.end_time}}到期</view>
+      <view class="couon-date" wx:if="{{item.end_time}}">{{item.end_time}}到期</view>
     </view>
     <view class="iconfont icon-{{item.selected?'gou':'quan'}}" bindtap="selectIt" data-index="{{index}}"></view>
   </view>
diff --git a/pages/order/movie/index.js b/pages/order/movie/index.js
index f33494f..efa2c54 100644
--- a/pages/order/movie/index.js
+++ b/pages/order/movie/index.js
@@ -28,7 +28,7 @@ Page({
     let product = app.globalData.product,price=0;
     product.info.selectSeatInfo = JSON.parse(options.selectSeatInfo)
     product.info.selectSeatInfo.seatPriceInfo.map(item=>{
-      price =price + Number(item.split('-')[1]) 
+      price =price +Math.ceil(Number(item.split('-')[1])*1.006 * 100) / 100
     })
     console.log(price);
     this.setData({
diff --git a/pages/user/coupon/index.wxml b/pages/user/coupon/index.wxml
index c5db573..8d46f82 100644
--- a/pages/user/coupon/index.wxml
+++ b/pages/user/coupon/index.wxml
@@ -12,7 +12,7 @@
     <view class="coupon-money">￥<text>{{item.activity.money/100}}</text></view>
   </view>
   <view class="coupon-tip"><text>使用条件：</text>满{{item.activity.mini_money/100}}元</view>
-  <view class="coupon-tip"><text>有效期：</text>{{item.activity.end_time}}</view>
+  <view class="coupon-tip"><text>有效期：</text>{{item.end_time}}</view>
   <view class="coupon-tip"><text>优惠码：</text>{{item.key}}</view>
   <view class="coupon-rule">
   <view bindtap="showRule" data-item="{{item}}">使用规则  <text class="iconfont icon-xia"></text></view>

From c1692094c19269d32c73d6443d79cfac3fcd1eb1 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Wed, 26 Apr 2023 18:19:01 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=88=B8=20=E5=BD=B1=E9=99=A2=E8=B4=AD=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                        |  2 +-
 pages/list/activitynew/index.js               |  2 +-
 pages/list/activitynew/index.wxml             |  2 +-
 pages/list/movieticket/list/cinema/index.js   | 16 +++----
 pages/list/movieticket/list/cinema/index.wxml |  2 +-
 pages/list/movieticket/list/info/index.wxml   |  2 +-
 pages/list/movieticket/list/ticket/index.js   | 46 ++++++++++++++++++-
 pages/list/movieticket/list/ticket/index.wxml |  6 +--
 pages/order/movie/index.js                    | 11 +++--
 pages/order/movie/index.wxml                  |  7 +--
 pages/order/movie/index.wxss                  |  1 -
 pages/order/orderList/index.wxml              |  2 +-
 pages/order/scene/index.js                    | 12 +++--
 pages/order/scene/index.wxml                  |  4 +-
 pages/user/cartlist/list.js                   | 17 +++++--
 15 files changed, 96 insertions(+), 36 deletions(-)

diff --git a/app.js b/app.js
index 70097da..cca10f2 100644
--- a/app.js
+++ b/app.js
@@ -21,7 +21,7 @@ App({
       unique_key: "wechatxcx"
     }).then(res => {
       let data = JSON.parse(res.data);
-      data.isTest = data.isTest74? true : false;
+      data.isTest = data.isTest75? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/list/activitynew/index.js b/pages/list/activitynew/index.js
index acb4921..2e38e77 100644
--- a/pages/list/activitynew/index.js
+++ b/pages/list/activitynew/index.js
@@ -14,7 +14,7 @@ Page({
     types: [null, 'show', 'exhibition', 'scene', 'movie', 'lecture', 'other'],
     weeks: [],
     pageNo: 1,
-    sort: "",
+    sort: "distance",
     list: [],
     date: null,
     total: 1,
diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
index 6cc988f..887a8eb 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -102,7 +102,7 @@
         <view class="textOver2" wx:if="{{item.leading_role}}">主演：{{item.leading_role}}</view>
       </view>
       <view class="btn">
-          查看
+          {{movieType==1?'购买':'查看'}}
       </view>
     </view>
   </view>
diff --git a/pages/list/movieticket/list/cinema/index.js b/pages/list/movieticket/list/cinema/index.js
index c84d836..e00b4b3 100644
--- a/pages/list/movieticket/list/cinema/index.js
+++ b/pages/list/movieticket/list/cinema/index.js
@@ -113,8 +113,8 @@ Page({
     }
     let show_id = info.show_id
     let cinema_id = info.cinema_id
-    // let schedule_id = info.schedule_id
-
+		// let schedule_id = info.schedule_id
+		console.log(info);
     commonApi._post('Cinema/getProductAndSku',{
       show_id,
       cinema_id,
@@ -125,22 +125,22 @@ Page({
       app.globalData.product ={ 
         product:this.data.productInfo,
         info:{
-          hallName:this.data.name,
+					hallName:info.hall_name,
+					cinemaName:this.data.name,
           show_date:info.show_date,
-          start_end_time:info.show_time,
+					show_time:info.show_time,
+					close_time:info.close_time,
           movieName:this.data.movie[this.data.currentNum].title,
           show_version:info.show_version,
           selectSeatInfo:null,
-          schedule_id:info.schedule_id
+					schedule_id:info.schedule_id,
+					start_end_time:info.show_time
         }
       }
       wx.navigateTo({
         url:"/pages/list/movieticket/list/web/index?planData="+ JSON.stringify(planData),
       })
     })
-    // wx.navigateTo({
-    //   url: '/pages/list/movieticket/list/seats/index?show_id='+show_id+'&cinema_id='+cinema_id+'&schedule_id='+schedule_id+'&planData='+JSON.stringify(planData),
-    // })
   },
   onChange:function(e){
     console.log(e)
diff --git a/pages/list/movieticket/list/cinema/index.wxml b/pages/list/movieticket/list/cinema/index.wxml
index a1a90d9..30ab097 100644
--- a/pages/list/movieticket/list/cinema/index.wxml
+++ b/pages/list/movieticket/list/cinema/index.wxml
@@ -25,7 +25,7 @@
     <view class="type">{{item.show_version}}</view>
     <view>{{item.hall_name}}</view>
   </view>
-  <view class="price"><text>￥</text>{{item.price}}</view>
+  <view class="price"><text>￥</text>{{item.price}}<text style="font-size: 20rpx; color:#999 ;"> 起</text></view>
   <view class="btn">
     购票
   </view>
diff --git a/pages/list/movieticket/list/info/index.wxml b/pages/list/movieticket/list/info/index.wxml
index 8076186..4910bdb 100644
--- a/pages/list/movieticket/list/info/index.wxml
+++ b/pages/list/movieticket/list/info/index.wxml
@@ -25,5 +25,5 @@
 </view>
 <view style="height:104rpx" wx:if="{{showFlag}}"></view>
 <navigator wx:if="{{info && showFlag}}" url="../ticket/index?id={{info.third_id}}&title={{info.title}}" class="fixed-bottom">
-  <!-- <view class="order-btn">立即购票</view> -->
+  <view class="order-btn">立即购票</view>
 </navigator>
\ No newline at end of file
diff --git a/pages/list/movieticket/list/ticket/index.js b/pages/list/movieticket/list/ticket/index.js
index a368215..1767689 100644
--- a/pages/list/movieticket/list/ticket/index.js
+++ b/pages/list/movieticket/list/ticket/index.js
@@ -1,4 +1,5 @@
 // pages/list/movieticket/list/ticket/index.js
+let app = getApp()
 import commonApi from "../../../../../utils/https/common"
 import util from "../../../../../utils/util"
 Page({
@@ -159,7 +160,50 @@ Page({
       console.log(res)
     })
   },
-
+  selectMovieSeat(e){
+		let info = e.currentTarget.dataset.info
+		let index = e.currentTarget.dataset.index
+		console.log(index);
+		console.log(info.schedules);
+    const areaInfo = JSON.parse(info.schedules[index].schedule_area).map(item => ({...item, price:item.areaPrice,areaId:item.seatAreaId}));
+    let planData = {
+      areaInfo,
+      fee:info.schedules[index].service_fee,
+      movieName: this.data.title,
+      planId : info.schedules[index].schedule_id,
+      planTime : info.schedules[index].show_time,
+      type:'WECHATXCX',
+      remake : ''
+    }
+    let show_id = info.schedules[index].show_id
+    let cinema_id = info.schedules[index].cinema_id
+		// let schedule_id = info.schedule_id
+		console.log(info);
+    commonApi._post('Cinema/getProductAndSku',{
+      show_id,
+      cinema_id,
+    }).then(res=>{
+      app.globalData.product ={ 
+        product:res.data,
+        info:{
+					hallName:info.schedules[index].hall_name,
+					cinemaName:info.title,
+          show_date:info.schedules[index].show_date,
+					show_time:info.schedules[index].show_time,
+					close_time:info.schedules[index].close_time,
+					movieName:this.data.title,
+					start_end_time:info.schedules[index].show_time,
+          show_version:info.schedules[index].show_version,
+          selectSeatInfo:null,
+          schedule_id:info.schedules[index].schedule_id
+        }
+			}
+			console.log(planData);
+      wx.navigateTo({
+        url:"/pages/list/movieticket/list/web/index?planData="+ JSON.stringify(planData),
+      })
+    })
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
diff --git a/pages/list/movieticket/list/ticket/index.wxml b/pages/list/movieticket/list/ticket/index.wxml
index de209c1..d24b82e 100644
--- a/pages/list/movieticket/list/ticket/index.wxml
+++ b/pages/list/movieticket/list/ticket/index.wxml
@@ -32,11 +32,11 @@
       <view class="ciname-distance" wx:if="{{item.distance}}">{{item.distanceText}}</view>
     </view>
     <view class="tickets-list">
-      <navigator url="../seats/index?schedule_id={{schedule.schedule_id}}&show_id={{schedule.show_id}}&cinema_id={{schedule.cinema_id}}" class="ticket-item" catchtap="pagePoint" data-event="movie_detail_click" wx:for="{{item.schedules}}" wx:for-item="schedule">
+      <view  data-info="{{item}}" data-index="{{indexY}}"  wx:for-index="indexY" class="ticket-item" data-event="movie_detail_click" wx:for="{{item.schedules}}" wx:for-item="schedule" bindtap="selectMovieSeat">
         <view style="color:#000;font-size:33rpx">{{schedule.show_time}}</view>
         <view style="margin:10rpx 0">{{schedule.show_version}}</view>
-        <view style="color:#D62828">¥{{schedule.price/100}}</view>
-      </navigator>
+        <view style="color:#D62828">¥{{schedule.price}}</view>
+      </view>
     </view>
   </view>
   <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1">
diff --git a/pages/order/movie/index.js b/pages/order/movie/index.js
index efa2c54..a3e29d8 100644
--- a/pages/order/movie/index.js
+++ b/pages/order/movie/index.js
@@ -14,14 +14,14 @@ Page({
     product:null,
     price:0,
     coupon:null,
-    prizeId:null
+		prizeId:null,
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function (options) {
-    console.log(options.selectSeatInfo);
+	onLoad: function (options) {
+		console.log(options);
     this.setData({
       prizeId:wx.getStorageSync('prizeId')
     })
@@ -29,7 +29,8 @@ Page({
     product.info.selectSeatInfo = JSON.parse(options.selectSeatInfo)
     product.info.selectSeatInfo.seatPriceInfo.map(item=>{
       price =price +Math.ceil(Number(item.split('-')[1])*1.006 * 100) / 100
-    })
+		})
+		console.log(product);
     console.log(price);
     this.setData({
       product:product,
@@ -76,7 +77,7 @@ Page({
       "product_num": product.info.selectSeatInfo.seatInfo.length,//也就是锁定的座位数,必填
       "reserve_mobile": this.data.tel,
       "use_date": product.info.show_date,//使用日期，Y-m-d日期格式字符串,必填
-      "use_time": product.info.start_end_time,//场次时间,直接传字符串,必填
+      "use_time": product.info.show_time+'-'+product.info.close_time,//场次时间,直接传字符串,必填
       "show_version": product.info.show_version,//场次版本,必填
       "scene_id": product.product.scene_id,//场景id，我方系统的场景id,必填
       "schedules_name": product.info.hallName,//放映厅名称,必填
diff --git a/pages/order/movie/index.wxml b/pages/order/movie/index.wxml
index 7ad82ae..96ec340 100644
--- a/pages/order/movie/index.wxml
+++ b/pages/order/movie/index.wxml
@@ -5,9 +5,10 @@
     <image src="{{product.product.headimg}}" mode="aspectFill"></image>
     <view class="info">
       <view class="title">{{product.info.movieName}}</view>
-      <view>{{product.info.show_date}}  {{product.info.start_end_time}}{{product.info.show_version}}</view>
-      <view>{{product.info.cinema_title}}</view>
-      <view>{{product.info.hallName}} <text wx:for="{{product.info.selectSeatInfo}}">{{item.name}}</text></view>
+      <view>{{product.info.show_date}}  {{product.info.show_time}}-{{product.info.close_time}} {{'('+product.info.show_version+')'}}</view>
+      <!-- <view>{{product.info.cinema_title}}</view> -->
+      <view>{{product.info.cinemaName}}</view>
+      <view>{{product.info.hallName}} <text wx:if="{{product.info.selectSeatInfo}}">{{product.info.selectSeatInfo.seatInfo}}</text></view>
     </view>
   </view>
   <view class="tel-box">
diff --git a/pages/order/movie/index.wxss b/pages/order/movie/index.wxss
index 11ba0af..c2c042b 100644
--- a/pages/order/movie/index.wxss
+++ b/pages/order/movie/index.wxss
@@ -34,7 +34,6 @@ page {
   font-size: 35rpx;
   color: #000;
   font-weight: 500;
-  margin-bottom: 20rpx;
 }
 .tel-box {
   display: flex;
diff --git a/pages/order/orderList/index.wxml b/pages/order/orderList/index.wxml
index fe628a0..b9a3b52 100644
--- a/pages/order/orderList/index.wxml
+++ b/pages/order/orderList/index.wxml
@@ -52,7 +52,7 @@
     <view style="flex-shrink:0">订单备注：</view>
     <input type="text" bindinput="inputRemark" data-index="{{index}}" placeholder="选填"></input>
   </view>
-<coupon id="coupon" wx:if="{{!kjId && !gp_id && flag!='mix'}}" money="{{showPrice + postFee}}" sku="{{sku_id}}"></coupon>
+<coupon id="coupon" wx:if="{{!kjId && !gp_id}}" money="{{showPrice + postFee}}" sku="{{sku_id}}"></coupon>
 
 <view class="fixed-bottom">
     <view class="fixed-price-box">
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 64ce73a..84b6aea 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -28,15 +28,16 @@ Page({
     allowance_price: 0,
     pIndex: 0,
     flag:null,
-    ticket_type:1
+		ticket_type:1,
+		isCar:'single'
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    console.log(app.globalData.product);
-    console.log(this.data.date);
+		console.log(app.globalData.product);
+		console.log(options.isCar);
     this.setData({
       product: app.globalData.product,
       type: options.type,
@@ -45,8 +46,9 @@ Page({
       prizeId: wx.getStorageSync('prizeId'),
       flag:options.flag,
       date:null,
-      ticket_type:app.globalData.product.sku.ticket_type || 1
-    })
+			ticket_type:app.globalData.product.sku.ticket_type || 1,
+			isCar:options.isCar
+		})
     if (!app.globalData.product) {
       util.back();
       return;
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index 69dd90f..a454ed2 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -34,8 +34,10 @@
       </view>
     </view>
   </view>
-  <coupon wx:if="{{!kjId && !gp_id && type!='activity' && product && product.isGroup!=1 && flag!='mix'}}" id="coupon"
+
+  <coupon wx:if="{{!kjId && !gp_id && type!='activity' && product && product.isGroup!=1 && isCar=='single'}}" id="coupon"
     money="{{singlePrice * productNum}}" sku="{{product.sku.id}}"></coupon>
+
   <view class="box" wx:if="{{type!='activity' && product && product.isGroup!=1}}">
     <view class="box-title" wx:if="{{flag!='mix'}}">
       <view style="flex-shrink:0">订单备注</view>
diff --git a/pages/user/cartlist/list.js b/pages/user/cartlist/list.js
index 3065686..bd08800 100644
--- a/pages/user/cartlist/list.js
+++ b/pages/user/cartlist/list.js
@@ -20,7 +20,8 @@ Page({
     allPrice: 0,
     productType: '',
     manageFlag: false,
-    flag: false, //判断订单是否同时有商品和票
+		flag: false, //判断订单是否同时有商品和票
+		isCar:'single',//判断是否购物车
   },
 
   /**
@@ -177,7 +178,17 @@ Page({
       this.setData({
         flag: 'mix'
       })
-    }
+		}
+		if ( product1.length > 1) {
+      this.setData({
+        isCar:'multiple'
+      })
+		}else{
+			this.setData({
+        isCar:'single'
+      })
+		}
+		console.log(product1);
     app.globalData.postProduct = product;
     if (app.globalData.list) {
       app.globalData.product = app.globalData.list[app.globalData.index]
@@ -189,7 +200,7 @@ Page({
       })
     } else {
       wx.navigateTo({
-        url: '/pages/order/scene/index',
+        url: '/pages/order/scene/index?isCar=' + this.data.isCar,
       })
     }
   },

From fc441c93702b40709ebb1a112866488286b461fe Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Wed, 26 Apr 2023 18:26:13 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/postOrder/index.js | 6 ++++--
 pages/order/scene/index.js     | 2 +-
 pages/user/cartlist/list.js    | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pages/order/postOrder/index.js b/pages/order/postOrder/index.js
index 5248ae4..be9edfe 100644
--- a/pages/order/postOrder/index.js
+++ b/pages/order/postOrder/index.js
@@ -22,6 +22,7 @@ Page({
     allowance_price: 0,
     showAllowance: false,
     flag:null,
+    isCar:'single'
   },
 
   /**
@@ -33,7 +34,8 @@ Page({
       kjId: app.globalData.kjId,
       gp_id: app.globalData.gp_id || app.globalData.team_id,
       prizeId: wx.getStorageSync('prizeId'),
-      flag:options.flag
+      flag:options.flag,
+      isCar:options.isCar
     })
     let price = 0, sku_id = [];
     app.globalData.postProduct.map(item => {
@@ -191,7 +193,7 @@ Page({
       app.globalData.product = app.globalData.list[0]
     }
 		wx.redirectTo({
-		  url: '/pages/order/scene/index?flag='+this.data.flag,
+		  url: '/pages/order/scene/index?flag='+this.data.flag+'&isCar='+this.data.isCar,
 		})
 	}
   },
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 84b6aea..0db83ec 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -285,7 +285,7 @@ Page({
 		app.globalData.index = app.globalData.index + 1
 		app.globalData.product = app.globalData.list[app.globalData.index]
 		wx.redirectTo({
-		  url: '/pages/order/scene/index?flag='+ this.data.flag,
+		  url: '/pages/order/scene/index?flag='+ this.data.flag+'&isCar='+this.data.isCar,
 		})
 		return
 	}else{
diff --git a/pages/user/cartlist/list.js b/pages/user/cartlist/list.js
index bd08800..ad38fe5 100644
--- a/pages/user/cartlist/list.js
+++ b/pages/user/cartlist/list.js
@@ -176,7 +176,8 @@ Page({
     }
     if (product.length > 0 && product1.length > 0) {
       this.setData({
-        flag: 'mix'
+        flag: 'mix',
+        isCar:'multiple'
       })
 		}
 		if ( product1.length > 1) {

From 43af8cfd9dd3c38c57134a64027c4503ebb78eb9 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Wed, 26 Apr 2023 18:44:26 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/component/TitleHeader.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pages/component/TitleHeader.js b/pages/component/TitleHeader.js
index 6aaafbf..31dd347 100644
--- a/pages/component/TitleHeader.js
+++ b/pages/component/TitleHeader.js
@@ -83,6 +83,10 @@ Component({
 		  wx.switchTab({
 		    url: '/pages/user/user'
 		  })
+    } else if (pages[pages.length-1].route.indexOf('pages/user/cartlist/list') != -1){
+		  wx.switchTab({
+		    url: '/pages/user/user'
+		  })
     }