From 456ffc9c6ccf6e3c8bd8891066739c94daee3ba6 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Thu, 16 Mar 2023 17:06:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=9A=E7=89=A9=E9=A6=86=20=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E7=9B=B4=E6=8E=A5=E8=B7=B3=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                 |  2 +-
 pages/index/index.js                   | 18 ++++++++++++++++++
 pages/index/index.wxml                 |  8 ++++----
 pages/index/index.wxss                 |  2 +-
 pages/info/sceneProductInfo/index.wxml |  4 ++--
 pages/list/activitynew/index.wxml      |  2 +-
 pages/list/museum/index.wxml           | 18 +++++-------------
 pages/list/museum/index.wxss           | 26 +++++++++++++++++++++-----
 pages/list/six/index.js                |  8 +++++++-
 pages/list/six/index.wxml              |  4 ++--
 pages/list/theatre/index.wxml          |  2 +-
 11 files changed, 63 insertions(+), 31 deletions(-)

diff --git a/app.js b/app.js
index 1188526..803dea3 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.isTest60? true : false;
+      data.isTest = data.isTest62? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.js b/pages/index/index.js
index 0fcd33d..33e2454 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -351,6 +351,24 @@ Page({
         path: 'pages/index/index'
       })
       return;
+    }else if (e.currentTarget.dataset.event == 'kunshan_click') {
+      wx.navigateToMiniProgram({
+        appId: 'wx8888a3fd0862b4c8',
+        path: 'pages/index/index'
+      })
+      return;
+    }else if (e.currentTarget.dataset.event == 'taicang_click') {
+      wx.navigateToMiniProgram({
+        appId: 'wx8853b0d93cbca75e',
+        path: 'pages/home/home'
+      })
+      return;
+    }else if (e.currentTarget.dataset.event == 'gongyeyuanqu_click') {
+      wx.navigateToMiniProgram({
+        appId: 'wxd323e63a10aa6865',
+        path: 'pages/home/index'
+      })
+      return;
     }
     wx.navigateTo({
       url: e.currentTarget.dataset.path,
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 193659b..5bf0986 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -179,16 +179,16 @@
         <image src="https://static.ticket.sz-trip.com/uploads/20220907/d50f492083b419b9b538de274423084c.png" mode="widthFix"></image>
         <view>数字博物馆</view>
       </view>
-      <!-- <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
+      <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
         class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
         <view>云上文博会</view>
-      </view> -->
-      <!-- <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
+      </view>
+      <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
         class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb1.png" mode="widthFix"></image>
         <view>投资导引图</view>
-      </view> -->
+      </view>
       <!-- <view bindtap="gotoUrl" data-title="数字文物"
         data-url="https://foxnut-gffcu6t2.pai.tcloudbase.com/suzhouguobao/index.html#/" class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb12.png" mode="widthFix"></image>
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 80f2505..1186938 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -293,7 +293,7 @@
   font-size: 22rpx;
 }
 .pbservice {
-  width: calc(175rpx * 8);
+  width: calc(175rpx * 6);
   display: flex;
   margin-top: 20rpx;
   flex-wrap: wrap;
diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml
index 6c68ef6..923f0f1 100644
--- a/pages/info/sceneProductInfo/index.wxml
+++ b/pages/info/sceneProductInfo/index.wxml
@@ -51,7 +51,7 @@
         <view class="order-tip-text" bindtap="showBookingInfo" data-item="{{sku}}">预订须知>></view>
       </view>
       <view class="product-right">
-        <view class="price"><text>￥</text><text>{{sku.price?tool.toFix(sku.price):0}}</text><text>起</text></view>
+        <view class="price"><text>￥</text><text>{{sku.price?sku.price/100:0}}</text><text>起</text></view>
         <!-- <view bindtap="order" data-sku="{{sku}}" data-product="{{item}}"
           data-disable="{{item.flag==0 || sku.flag=='off'?1:0}}"
           class="btn{{item.flag==0 || sku.flag=='off'?' disable':''}}">立即预订</view> -->
@@ -117,7 +117,7 @@
       <view class="sku-info-box">
         <image id="skuImg" src="{{skuList[skuIndex].headimg||skuList[0].headimg}}" mode="aspectFill"></image>
         <view class="sku-info">
-          <view class="sku-price">{{skuIndex||skuIndex==0?tool.toFix(skuList[skuIndex].price):tool.toFix(skuList[0].price)}}
+          <view class="sku-price">{{skuIndex||skuIndex==0?skuList[skuIndex].price/100:skuList[0].price/100}}
             <view class="allowance" wx:if="{{allowance_data}}">
               补贴价：￥{{ (1 - allowance_data.discount_rate / 100) * info.sku[skuIndex].price / 100 }}</view>
           </view>
diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
index 7fc61dd..68718d7 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -86,7 +86,7 @@
           </view>
         </view>
         <common-image width="320rpx" height='220rpx' src="{{item.post_url || item.cover}}" defaultImage="/images/place3.jpg" mode="aspectFill"></common-image>
-        <view class="end-mask" wx:if="{{item.is_end}}">已结束</view>
+        <view class="end-mask" wx:if="{{item.is_act_end}}">已结束</view>
       </view>
       <view class="new-tip">{{item.from_platform}}</view>
     </view>
diff --git a/pages/list/museum/index.wxml b/pages/list/museum/index.wxml
index 7d1b16a..22a5544 100644
--- a/pages/list/museum/index.wxml
+++ b/pages/list/museum/index.wxml
@@ -3,7 +3,7 @@
 <view class="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}}">
     <view style="position:relative">
-      <image src="{{item.headimg}}" style="{{item.title!='苏州博物馆'?'':'height:353rpx'}}" mode="aspectFill"></image>
+      <image src="{{item.headimg}}" style="{{item.title!='苏州博物馆'?'':'height:353rpx;'}}" mode="aspectFill"></image>
       <view class="status-text" wx:if="{{item.garden_flag_text && item.garden_flag!=1}}">{{item.garden_flag_text}}</view>
     </view>
     <view class="info textOver" wx:if="{{item.title!='苏州博物馆'}}">
@@ -12,27 +12,19 @@
       <view class="tel textOver">电话：{{item.tel}}</view>
       <view class="btn">点击预约</view>
     </view>
-    <view class="info textOver" wx:else style="height:320rpx">
+    <view class="info textOver" wx:else style="height:320rpx;">
       <view class="title textOver">{{item.title}}</view>
-      <view class="com-flex">
+      <view class="com-flex border">
         <text>博物馆本馆</text>
-        <view class="iconfont icon-you"></view>
+        <view class="btn-yy">预约</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 class="btn-yy">预约</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>
diff --git a/pages/list/museum/index.wxss b/pages/list/museum/index.wxss
index a3564c8..88ee367 100644
--- a/pages/list/museum/index.wxss
+++ b/pages/list/museum/index.wxss
@@ -28,6 +28,10 @@ page {
   font-size: 19rpx;
   color: #666;
   align-items: center;
+ 
+}
+.border{
+  
 }
 .item:nth-child(2n) .info {
   border-radius: 17rpx 0 0 17rpx;
@@ -56,14 +60,25 @@ page {
   width: 240rpx;
   height: 67rpx;
   background: #FFFFFF;
-  box-shadow: 0px 0px 6rpx 0px rgba(108, 74, 33, 0.35);
+  /* 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;
+  margin: 18rpx auto;
+
+}
+.btn-yy{
+
+background: #CA2A28;
+border-radius: 36rpx;
+font-size: 27rpx;
+font-family: PingFangSC;
+font-weight: 500;
+color: #FFFFFF;
+padding: 6rpx 18rpx;
+margin-left:16rpx ;
 }
 .info .com-flex .iconfont {
   width: 27rpx;
@@ -76,13 +91,14 @@ page {
   margin-left: 10rpx;
 }
 .info .tip-box {
-  height: 180rpx;
-  background: #FBECDC;
+  /* height: 180rpx; */
+  /* background: #FBECDC; */
   width: 100%;
   display: flex;
   flex-direction: column;
   align-items: center;
   justify-content: center;
+  border-top:1rpx solid rgba(216, 216, 216, 1) ;
 }
 .info .tip-box .com-flex {
   height: 71rpx;
diff --git a/pages/list/six/index.js b/pages/list/six/index.js
index 22781a5..b2c94be 100644
--- a/pages/list/six/index.js
+++ b/pages/list/six/index.js
@@ -38,6 +38,7 @@ Page({
     })
   },
   gotoPath:function(e){
+    console.log(e);
 	if(e.currentTarget.dataset.event.area_key == 'taicang'){
 		wx.navigateToMiniProgram({
 		  appId: 'wx8853b0d93cbca75e',
@@ -48,7 +49,12 @@ Page({
 		  appId: 'wxd323e63a10aa6865',
 		  path: 'pages/home/index'
 		})
-	}
+	}else if (e.currentTarget.dataset.event.area_key == 'kunshan') {
+    wx.navigateToMiniProgram({
+		  appId: 'wx8888a3fd0862b4c8',
+		  path: 'pages/index/index'
+		})
+  }
   },
   goH5(e){
     let url = e.currentTarget.dataset.url;
diff --git a/pages/list/six/index.wxml b/pages/list/six/index.wxml
index 8beacd3..c571922 100644
--- a/pages/list/six/index.wxml
+++ b/pages/list/six/index.wxml
@@ -55,10 +55,10 @@
     <image class="yellow-shadow" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/six/icon8.png" mode="widthFix"></image>
     <view>文物查询</view>
   </navigator> -->
-  <view  data-url="https://m.cloud.sz-trip.com/CulturalRelics?area_key={{areas[areaIndex].area_key}}" bindtap="goH5"  class="new-icon">
+  <!-- <view  data-url="https://m.cloud.sz-trip.com/CulturalRelics?area_key={{areas[areaIndex].area_key}}" bindtap="goH5"  class="new-icon">
     <image class="yellow-shadow" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/six/icon8.png" mode="widthFix"></image>
     <view>文物查询</view>
-  </view>
+  </view> -->
 </view>
 <view class="new-title">周边推荐</view>
 <view class="list">
diff --git a/pages/list/theatre/index.wxml b/pages/list/theatre/index.wxml
index ae70777..849b02e 100644
--- a/pages/list/theatre/index.wxml
+++ b/pages/list/theatre/index.wxml
@@ -15,7 +15,7 @@
     <view class="textOver subtitle">{{item.subtitle?item.subtitle:""}}</view>
     <view class="tags textOver">
       <view class="tag" wx:for="{{item.display_tags}}">{{item}}</view>
-      <view class="price"><text>￥</text><text>{{item.price?tool.toFix(item.price):0}}</text><text>起</text></view>
+      <view class="price"><text>￥</text><text>{{item.price?item.price/100:0}}</text><text>起</text></view>
     </view>
   </view>
 </view>