From 1ed4237765d4be26a40c44e010864d5e30cf7372 Mon Sep 17 00:00:00 2001
From: panyiping <981892160@qq.com>
Date: Wed, 20 Apr 2022 17:31:36 +0800
Subject: [PATCH] =?UTF-8?q?=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/activityInfo/index.wxml | 2 +-
 pages/list/museum/index.wxml       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app.js b/app.js
index 2756aab..f7818a5 100644
--- a/app.js
+++ b/app.js
@@ -22,7 +22,7 @@ App({
       unique_key: "wechatxcx"
     }).then(res => {
       let data = JSON.parse(res.data);
-      data.isTest = data.isTest16?true:false;
+      data.isTest = data.isTest17?true:false;
       this.globalData.configJson = data
     })
     
diff --git a/pages/info/activityInfo/index.wxml b/pages/info/activityInfo/index.wxml
index 2070c7d..7cfa8fd 100644
--- a/pages/info/activityInfo/index.wxml
+++ b/pages/info/activityInfo/index.wxml
@@ -32,6 +32,7 @@
   </view>
   <view class="box-title">活动详情</view>
   <rich-text class="box-content" nodes="{{tool.formateRichText(info.intro)}}"></rich-text>
+  <view class="box-tip" wx:if="{{info && (info.is_bind_our_sku==0 || info.is_can_booking==0)}}">* 本活动无需在线预约，可直接前往。</view>
 </view>
 <navigator url="/pages/info/sceneProductInfo/index?id={{info.scene_data.id}}"
   wx:if="{{info && info.scene_data && info.scene_data.id}}" class="scene-box" catchtap="pagePoint" data-event='activity_detail_click' data-id='{{info.scene.data.id}}' data-type='scene'>
@@ -52,7 +53,6 @@
   <view class="bottom-btn" bindtap="order">预约活动</view>
   <!-- <view class="bottom-btn disable" wx:else>活动已过期</view> -->
 </view>
-
 <view class="mask" wx:if="{{showShareFlag}}" style="align-items: center;">
   <view class="mask-bg" bindtap="share"></view>
   <view class="mask-content share-img-box">
diff --git a/pages/list/museum/index.wxml b/pages/list/museum/index.wxml
index 245a4c1..968dce8 100644
--- a/pages/list/museum/index.wxml
+++ b/pages/list/museum/index.wxml
@@ -1,7 +1,7 @@
 <!--pages/list/museum/index.wxml-->
 <search bind:onload="search"></search>
 <view class="list">
-  <view bindtap="gotoDetail" data-item="{{item}}" url="/pages/info/museumInfo/index?id={{item.id}}" class="item" wx:for="{{list}}">
+  <view bindtap="gotoDetail" wx:if="{{item.title!=='苏州博物馆西馆' && item.title!=='苏州博物馆西馆探索体验馆'}}" data-item="{{item}}" url="/pages/info/museumInfo/index?id={{item.id}}" class="item" wx:for="{{list}}">
     <image src="{{item.headimg}}" style="{{item.title!='苏州博物馆'?'':'height:353rpx'}}" mode="aspectFill"></image>
     <view class="info textOver" wx:if="{{item.title!='苏州博物馆'}}">
       <view class="title textOver">{{item.title}}</view>