From 5764db5d847b561240337a436dd7fa3e329243d5 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Fri, 31 Mar 2023 18:52:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=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/museumInfo/index.js       |  1 +
 pages/info/sceneProductInfo/index.js |  1 +
 pages/order/scene/index.js           | 12 ++++++++----
 pages/order/scene/index.wxml         |  4 ++--
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app.js b/app.js
index 96d82b9..a60eb32 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.isTest67? true : false;
+      data.isTest = data.isTest68? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/info/museumInfo/index.js b/pages/info/museumInfo/index.js
index 28f17ec..af26a02 100644
--- a/pages/info/museumInfo/index.js
+++ b/pages/info/museumInfo/index.js
@@ -451,6 +451,7 @@ Page({
       isGroup: this.data.isGroup,
       isTeam: this.data.info.team_order && this.data.isGroup?1:0
     }
+    app.globalData.index = 0
     wx.navigateTo({
       url: '/pages/order/scene/index?type=museum'
     })
diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index bb1a3df..0981ea2 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -352,6 +352,7 @@ Page({
             ...sku,
             ...product
           }
+          app.globalData.index = 0
           wx.navigateTo({
             url: '/pages/order/scene/index',
           })
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 15a8be3..2e38932 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -8,7 +8,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    product: app.globalData.product,
+    product:null,
     productNum: 1,
     linkmanList: [],
     date: "",
@@ -35,12 +35,16 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    console.log(app.globalData.product);
+    console.log(this.data.date);
     this.setData({
+      product: app.globalData.product,
       type: options.type,
       kjId: app.globalData.kjId,
       gp_id: app.globalData.gp_id || app.globalData.team_id,
       prizeId: wx.getStorageSync('prizeId'),
       flag:options.flag,
+      date:null,
       ticket_type:app.globalData.product.sku.ticket_type || 1
     })
     if (!app.globalData.product) {
@@ -60,6 +64,7 @@ Page({
       product: app.globalData.product,
       singlePrice: this.data.gp_id ? app.globalData.product.sku.event_price : app.globalData.product.sku.price
     })
+   console.log(this.data.product);
     if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1) {
       this.couponCom = this.selectAllComponents("#coupon")[0];
     }
@@ -269,7 +274,7 @@ Page({
 	}
   app.globalData.ticketPrice += (this.data.singlePrice * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0))/100;
   console.log(app.globalData);
-	if(app.globalData.list && app.globalData.list.length > app.globalData.index + 1){
+	if(app.globalData.list && app.globalData.list.length > app.globalData.index + 1 &&this.data.type!='museum'){
 		if(app.globalData.createDate){
 			app.globalData.createDate.product_list.push(data.product_list[0])
 		}else{
@@ -364,8 +369,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
-	if(app.globalData.list && app.globalData.list.length != 0){
+	if(app.globalData.list && app.globalData.list.length != 0 && this.data.type!='museum'){
 		app.globalData.product = app.globalData.list[app.globalData.index]
 	}
     if (!this.data.isLogin) {
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index f4ee161..69dd90f 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -1,11 +1,11 @@
 <!--pages/order/scene/index.wxml-->
-<view class="{{product && product.isGroup==1?'group-order':''}}">
+<view  class="{{product && product.isGroup==1?'group-order':''}}">
   <title title="订单填写"></title>
   <view class="product-info" wx:if="{{product}}">
     <view class="product-title">{{product.product.title  + product.isGroup==1?'（团体预约）':product.sku.sku_name}}</view>
     <view class="product-price" wx:if="{{type=='museum' || type=='activity'}}">免费</view>
   </view>
-  <date wx:if="{{isLogin && type!='activity' && ticket_type == 1}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime"
+  <date  wx:if="{{isLogin && type!='activity' && ticket_type == 1}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime"
     product="{{product}}"></date>
   <view class="box" wx:if="{{product && product.isGroup==1}}">
     <view class="box-title">