From 057dc3a56b3ccda5682025eda1a7181f62f40cb2 Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Tue, 11 Jun 2024 15:11:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=87=BA=E8=A1=8C=E8=A7=84?=
 =?UTF-8?q?=E5=88=92=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=85=A8=E9=83=A8=E6=99=AF?=
 =?UTF-8?q?=E7=82=B9=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                      | 2 +-
 pages/list/scene/index.js                   | 2 +-
 pages/user/order/list.wxml                  | 2 +-
 pages/user/order/museumOrderInfo/index.wxml | 2 +-
 pages/user/order/sceneOrderInfo/index.wxml  | 4 ++--
 pages/user/order/team/list.wxml             | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app.js b/app.js
index 00d0e3f..aa78b14 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.isTest119? true : false;
+      data.isTest = data.isTest120? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/list/scene/index.js b/pages/list/scene/index.js
index 0938434..5c66ea3 100644
--- a/pages/list/scene/index.js
+++ b/pages/list/scene/index.js
@@ -16,7 +16,7 @@ Page({
     navList:[
       {
         id:4,
-        name:'全部',
+        name:'全部景点',
         icon:'/uploads/20240604/4ac6b939e112ff183aadb95efbf07761.png'
       }
     ],
diff --git a/pages/user/order/list.wxml b/pages/user/order/list.wxml
index ac9f677..172840c 100644
--- a/pages/user/order/list.wxml
+++ b/pages/user/order/list.wxml
@@ -39,7 +39,7 @@
   </view>
   <!-- <view class="total"><text>共{{item.orderNum}}件商品</text><text style="margin-left:20rpx">合计</text> <text class="all-price">￥{{item.total_money/100}}</text></view> -->
   <view class="btns">
-    <view wx:if="{{item.guihuaUrl}}" catchtap="gotoWeb" data-web="{{item.guihuaUrl}}" class="btn" data-item="{{item}}">行程规划</view>
+    <!-- <view wx:if="{{item.guihuaUrl}}" catchtap="gotoWeb" data-web="{{item.guihuaUrl}}" class="btn" data-item="{{item}}">行程规划</view> -->
     <view class="btn" wx:if="{{item.order_product_list.length==1}}" catchtap="order" data-item="{{item}}">再次购买</view>
     <!-- <view catchtap="gotoComment" data-id="{{item.order_id}}" class="btn" wx:if="{{item.state=='WAIT_COMMENT'}}">立即评价</view> -->
     <view catchtap="cancel" data-index="{{index}}" class="btn" wx:if="{{item.state=='UNPAID'}}">取消预订</view>
diff --git a/pages/user/order/museumOrderInfo/index.wxml b/pages/user/order/museumOrderInfo/index.wxml
index 6fd5664..761d612 100644
--- a/pages/user/order/museumOrderInfo/index.wxml
+++ b/pages/user/order/museumOrderInfo/index.wxml
@@ -45,7 +45,7 @@
     <view class="price">{{info.paid_money/100}}</view>
   </view>
   <view class="btns" style="border-top:1rpx solid #ccc" wx:if="{{info.state!='CLOSED'}}">
-    <view bindtap="leadRoad" data-url="{{info.order_product_list[0].btnUrl}}" class="btn" wx:if="{{info.state!='UNPAID' && !isRefund && info.order_product_list[0].btnUrl}}">行程规划</view>
+    <!-- <view bindtap="leadRoad" data-url="{{info.order_product_list[0].btnUrl}}" class="btn" wx:if="{{info.state!='UNPAID' && !isRefund && info.order_product_list[0].btnUrl}}">行程规划</view> -->
     <navigator url="../refundInfo/index?id={{info.order_id}}" class="btn" wx:if="{{isRefund}}">退款详情</navigator>
     <navigator url="/pages/info/museumInfo/index?id={{info.order_product_list[0].scene_id}}" class="btn">再次购买</navigator>
     <view class="btn" wx:if="{{info.state=='PAID'}}" bindtap="refund">取消订单</view>
diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml
index f80ffa2..0642c0e 100644
--- a/pages/user/order/sceneOrderInfo/index.wxml
+++ b/pages/user/order/sceneOrderInfo/index.wxml
@@ -51,7 +51,7 @@
   <view class="scene-btns" wx:if="{{info.state!='CLOSED'}}">
     <view class="scene-rest-time" wx:if="{{info.state=='UNPAID'}}">剩余时间：00:{{minute}}:{{second}}</view>
     <navigator wx:if="{{info.state!='UNPAID'}}" url="/pages/info/sceneProductInfo/index?id={{info.order_product_list[0].scene_id}}" class="btn">再次购买</navigator>
-    <view bindtap="leadRoad" data-url="{{info.order_product_list[0].btnUrl}}" class="btn" wx:if="{{info.state!='UNPAID' && !isRefund}}">行程规划</view>
+    <!-- <view bindtap="leadRoad" data-url="{{info.order_product_list[0].btnUrl}}" class="btn" wx:if="{{info.state!='UNPAID' && !isRefund}}">行程规划</view> -->
     <navigator url="../refundInfo/index?id={{info.order_id}}" class="scene-btn" wx:if="{{isRefund}}">退款详情</navigator>
     <view class="scene-btn" wx:if="{{info.state=='PAID'}}" bindtap="refund">取消预订</view>
     <view class="scene-btn" wx:if="{{info.state=='UNPAID'}}" bindtap="close">取消预订</view>
@@ -125,7 +125,7 @@
         </view>
         <rich-text wx:if="{{sysm2}}" class="detail-item" style="display:block" nodes="{{tool.formateRichText(item.sku_model.bookinfo)}}"></rich-text>
       </view>
-      <view bindtap="leadRoad" data-url="{{item.btnUrl}}" class="btn" wx:if="{{item.state!='UNPAID' && item.product_model=='ticket'}}">行程规划</view>
+      <!-- <view bindtap="leadRoad" data-url="{{item.btnUrl}}" class="btn" wx:if="{{item.state!='UNPAID' && item.product_model=='ticket'}}">行程规划</view> -->
     </view>
   </view>
 </view>
diff --git a/pages/user/order/team/list.wxml b/pages/user/order/team/list.wxml
index 7a3f7ce..4d5100f 100644
--- a/pages/user/order/team/list.wxml
+++ b/pages/user/order/team/list.wxml
@@ -36,7 +36,7 @@
   </view>
   <!-- <view class="total"><text>共{{item.orderNum}}件商品</text><text style="margin-left:20rpx">合计</text> <text class="all-price">￥{{item.total_money/100}}</text></view> -->
   <view class="btns">
-    <view wx:if="{{item.guihuaUrl}}" catchtap="gotoWeb" data-web="{{item.guihuaUrl}}" class="btn" data-item="{{item}}">行程规划</view>
+    <!-- <view wx:if="{{item.guihuaUrl}}" catchtap="gotoWeb" data-web="{{item.guihuaUrl}}" class="btn" data-item="{{item}}">行程规划</view> -->
     <view class="btn" catchtap="order" data-item="{{item}}">再次购买</view>
     <view catchtap="gotoComment" data-id="{{item.order_id}}" class="btn" wx:if="{{item.state=='WAIT_COMMENT'}}">立即评价</view>
     <view catchtap="cancel" data-index="{{index}}" class="btn" wx:if="{{item.state=='UNPAID'}}">取消预订</view>