From 5856604073efd6e1742a3d2a2d3fc478b62bbc0d Mon Sep 17 00:00:00 2001
From: panyiping <981892160@qq.com>
Date: Wed, 13 Apr 2022 09:33:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=9A=E7=89=A9=E9=A6=86=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/list/museum/index.js   |  5 +++++
 pages/list/museum/index.wxml | 27 +++++++++++++++++++++++++--
 pages/list/museum/index.wxss | 35 +++++++++++++++++++++++++++++++++++
 project.private.config.json  |  4 ++--
 5 files changed, 68 insertions(+), 5 deletions(-)

diff --git a/app.js b/app.js
index 3b05979..2756aab 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.isTest15?true:false;
+      data.isTest = data.isTest16?true:false;
       this.globalData.configJson = data
     })
     
diff --git a/pages/list/museum/index.js b/pages/list/museum/index.js
index 10094ef..4f0d59a 100644
--- a/pages/list/museum/index.js
+++ b/pages/list/museum/index.js
@@ -22,6 +22,11 @@ Page({
     let item = e.currentTarget.dataset.item;
     util.gotoDetail(item,1);
   },
+  gotoDetailOther: function(e) {
+    wx.navigateTo({
+      url: '/pages/info/museumInfo/index?id='+e.currentTarget.dataset.id
+    })
+  },
   search:function(e){
     this.setData(e.detail);
     this.setData({
diff --git a/pages/list/museum/index.wxml b/pages/list/museum/index.wxml
index 887b247..245a4c1 100644
--- a/pages/list/museum/index.wxml
+++ b/pages/list/museum/index.wxml
@@ -2,13 +2,36 @@
 <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}}">
-    <image src="{{item.headimg}}" mode="aspectFill"></image>
-    <view class="info textOver">
+    <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>
       <view class="address textOver">地址：{{item.address}}</view>
       <view class="tel textOver">电话：{{item.tel}}</view>
       <view class="btn">点击预约</view>
     </view>
+    <view class="info textOver" wx:else style="height:320rpx">
+      <view class="title textOver">{{item.title}}</view>
+      <view class="com-flex">
+        <text>博物馆本馆</text>
+        <view class="iconfont icon-you"></view>
+      </view>
+      <view class="tip-box">
+        <view class="com-flex" catchtap="gotoDetailOther" data-id='44703'>
+          <view>
+            <text>博物馆西馆</text>
+            <view style="color:#888888;font-size:21rpx">不含探索体验馆</view>
+          </view>
+          <view class="iconfont icon-you"></view>
+        </view>
+        <view class="com-flex" style="margin-bottom:0" catchtap="gotoDetailOther" data-id='52136'>
+          <view>
+            <text>探索体验馆</text>
+            <view style="color:#888888;font-size:21rpx">含博物馆西馆</view>
+          </view>
+          <view class="iconfont icon-you"></view>
+        </view>
+      </view>
+    </view>
   </view>
 </view>
 <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1">
diff --git a/pages/list/museum/index.wxss b/pages/list/museum/index.wxss
index b473521..c7ab354 100644
--- a/pages/list/museum/index.wxss
+++ b/pages/list/museum/index.wxss
@@ -50,4 +50,39 @@ page {
 }
 .info .address {
   margin-bottom: 15rpx;
+}
+.info .com-flex {
+  width: 240rpx;
+  height: 67rpx;
+  background: #FFFFFF;
+  box-shadow: 0px 0px 6rpx 0px rgba(108, 74, 33, 0.35);
+  border-radius: 33rpx;
+  justify-content: center;
+  font-size: 28rpx;
+  color: #333333;
+  font-weight: bold;
+  margin: 0 auto;
+  margin-bottom: 13rpx;
+}
+.info .com-flex .iconfont {
+  width: 27rpx;
+  line-height: 27rpx;
+  background: #CA2A28;
+  text-align: center;
+  border-radius: 50%;
+  font-size: 16rpx;
+  color: #fff;
+  margin-left: 10rpx;
+}
+.info .tip-box {
+  height: 180rpx;
+  background: #FBECDC;
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+.info .tip-box .com-flex {
+  height: 71rpx;
 }
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index d4b3046..337eb90 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -13,8 +13,8 @@
     "miniprogram": {
       "list": [
         {
-          "name": "pages/user/order/expressInfo/index",
-          "pathName": "pages/user/order/expressInfo/index",
+          "name": "pages/list/museum/index",
+          "pathName": "pages/list/museum/index",
           "query": "id=59532203100900035699",
           "scene": null
         },