From 1f3c7be72049ef1cda34588d3bdc3a939cd08bad Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Tue, 31 Jan 2023 17:42:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/component/TitleHeader.js        | 10 +++---
 pages/index/index.wxml                | 46 ++++++++++++++-------------
 pages/index/index.wxss                |  2 ++
 pages/list/activitynew/index.js       |  1 +
 pages/list/museum/index.wxml          |  4 +--
 pages/list/scene/index.js             |  3 +-
 pages/list/six/index.wxml             |  4 +--
 pages/list/six/index.wxss             |  3 +-
 pages/list/strategy/index.js          |  8 +++--
 pages/pbService/appreciate/index.js   |  1 +
 pages/pbService/appreciate/index.wxml |  4 +--
 pages/user/service/index.js           |  2 +-
 12 files changed, 50 insertions(+), 38 deletions(-)

diff --git a/pages/component/TitleHeader.js b/pages/component/TitleHeader.js
index 1bb59d9..3791421 100644
--- a/pages/component/TitleHeader.js
+++ b/pages/component/TitleHeader.js
@@ -69,11 +69,11 @@ Component({
           })
         }
       }
-	  else if (pages[pages.length-1].route.indexOf('cartlist') != -1){
-		  wx.switchTab({
-		    url: '/pages/user/user'
-		  })
-	  }
+	  // else if (pages[pages.length-1].route.indexOf('cartlist') != -1){
+		//   wx.switchTab({
+		//     url: '/pages/user/user'
+		//   })
+	  // }
 	  else if (pages[pages.length-1].route.indexOf('orderList') != -1){
       console.log(11111);
 		  wx.navigateTo({
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 9a6d415..5bf0986 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -179,11 +179,21 @@
         <image src="https://static.ticket.sz-trip.com/uploads/20220907/d50f492083b419b9b538de274423084c.png" mode="widthFix"></image>
         <view>数字博物馆</view>
       </view>
-      <view bindtap="gotoUrl" data-title="数字文物"
+      <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/"
+        class="pbservice-item">
+        <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb1.png" mode="widthFix"></image>
+        <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>
         <view>数字文物</view>
-      </view>
+      </view> -->
       <view bindtap="gotoPath" data-event="institution_click" data-title="文旅单位"
         data-path="/pages/list/culturalUnit/index" class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb11.png" mode="widthFix"></image>
@@ -194,21 +204,22 @@
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb9.png" mode="widthFix"></image>
         <view>团体预约</view>
       </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 bindtap="gotoUrl" data-title="廉洁地图"
         data-url="https://ljwhdt.lianshi.gov.cn:8443/Web/WebChatJCW/Mobile/EduBase/MobileMap.aspx"
         class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb10.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="gotoPath" data-event="book_click" data-title="书香借阅" data-path="/pages/pbService/library/index"
         class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
-        <view>云上文博会</view>
+        <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb5.png" mode="widthFix"></image>
+        <view>书香借阅</view>
+      </view>
+      <view bindtap="gotoPath" data-event="book_click" data-title="文化配送" data-path="/pages/culture/index"
+        class="pbservice-item">
+        <image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image>
+        <view>文化配送</view>
       </view>
       <view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展"
         data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
@@ -225,16 +236,7 @@
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb4.png" mode="widthFix"></image>
         <view>视觉中心</view>
       </view>
-      <view bindtap="gotoPath" data-event="book_click" data-title="书香借阅" data-path="/pages/pbService/library/index"
-        class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb5.png" mode="widthFix"></image>
-        <view>书香借阅</view>
-      </view>
-      <view bindtap="gotoPath" data-event="book_click" data-title="文化配送" data-path="/pages/culture/index"
-        class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/uploads/20220818/e02af6e8bf9170060ed7295d367d72c1.png" mode="widthFix"></image>
-        <view>文化配送</view>
-      </view>
+
 	  <view bindtap="gotoUrl" data-event="book_click" data-title="公共文化资源库" data-url="https://m.cloud.sz-trip.com/PublicCulture2022"
 	    class="pbservice-item">
 	    <image src="https://static.ticket.sz-trip.com/xcxImages/index/ggwh.png" mode="widthFix"></image>
@@ -360,9 +362,9 @@
           </view>
           <view class="hot-info">
             <view class="hot-title">{{item.title}}</view>
-            <view class="tags textOver">
+            <!-- <view class="tags textOver">
               <view wx:for="{{item.ext.display_tags}}" class="tag textOver">{{item}}</view>
-            </view>
+            </view> -->
             <view wx:if="{{item.ext.type!='tenscenic' && item.ext.price}}" class="hot-price">
               <text>￥</text><text>{{item.ext.price/100}}</text><text>起</text></view>
           </view>
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 959a2ef..80f2505 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -376,6 +376,8 @@
 .hot-price {
   color: #D62828;
   font-size: 24rpx;
+  margin-top:28rpx;
+
 }
 .hot-price text:nth-child(2){
   font-size: 33rpx;
diff --git a/pages/list/activitynew/index.js b/pages/list/activitynew/index.js
index f3ae26e..a094d64 100644
--- a/pages/list/activitynew/index.js
+++ b/pages/list/activitynew/index.js
@@ -108,6 +108,7 @@ Page({
       pageNo:1,
       total:1,
       moreFlag:true,
+      selectDay:null
     })
     this.getList()
   },
diff --git a/pages/list/museum/index.wxml b/pages/list/museum/index.wxml
index 0157b4b..7d1b16a 100644
--- a/pages/list/museum/index.wxml
+++ b/pages/list/museum/index.wxml
@@ -26,13 +26,13 @@
           </view>
           <view class="iconfont icon-you"></view>
         </view>
-        <view class="com-flex" style="margin-bottom:0" catchtap="gotoDetailOther" data-id='52136'>
+        <!-- <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>
diff --git a/pages/list/scene/index.js b/pages/list/scene/index.js
index 7b1dbeb..eb9e183 100644
--- a/pages/list/scene/index.js
+++ b/pages/list/scene/index.js
@@ -70,7 +70,8 @@ Page({
         item.tags = item.display_tags?item.display_tags.split(","):[];
         item.tags = item.tags.splice(0,2);
         if(item.distance && item.distance>=1000){
-          item.distance = item.distance/1000 + "km"
+          item.distance = item.distance/1000 
+          item.distance = item.distance.toFixed(1) + "km"
         }
         else if(item.distance){
           item.distance = item.distance + "m"
diff --git a/pages/list/six/index.wxml b/pages/list/six/index.wxml
index 075a0fc..e3e1e40 100644
--- a/pages/list/six/index.wxml
+++ b/pages/list/six/index.wxml
@@ -32,10 +32,10 @@
     <image class="blue-shadow" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/six/icon3.png" mode="widthFix"></image>
     <view>酒店住宿</view>
   </navigator>
-  <navigator url="../movieticket/index?area_id={{areas[areaIndex].area_id}}" class="new-icon">
+  <!-- <navigator url="../movieticket/index?area_id={{areas[areaIndex].area_id}}" class="new-icon">
     <image class="purple-shadow" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/six/icon4.png" mode="widthFix"></image>
     <view>电影购票</view>
-  </navigator>
+  </navigator> -->
 </view>
 <view class="new-title">公共服务</view>
 <view class="new-icons">
diff --git a/pages/list/six/index.wxss b/pages/list/six/index.wxss
index 01e1376..a8ad548 100644
--- a/pages/list/six/index.wxss
+++ b/pages/list/six/index.wxss
@@ -95,7 +95,7 @@
 }
 .new-icons {
   display: flex;
-  justify-content: space-between;
+  /* justify-content: space-between; */
   text-align: center;
   margin: 0 25rpx;
   font-size: 27rpx;
@@ -113,6 +113,7 @@
 .new-icon {
   width: 131rpx;
   margin-bottom: 20rpx;
+  margin-right: 15rpx;
 }
 .new-icon image.green-shadow {
   box-shadow: 3rpx 6rpx 18rpx 5rpx rgba(41, 176, 100, 0.24);
diff --git a/pages/list/strategy/index.js b/pages/list/strategy/index.js
index 723c474..a69bf5b 100644
--- a/pages/list/strategy/index.js
+++ b/pages/list/strategy/index.js
@@ -19,7 +19,6 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    this.getList()
   },
   changeType:function(e){
     let type = e.currentTarget.dataset.type;
@@ -116,7 +115,12 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
+    this.setData({
+      list:[],
+      page_no:1,
+      total:1,
+    })
+    this.getList()
   },
 
   /**
diff --git a/pages/pbService/appreciate/index.js b/pages/pbService/appreciate/index.js
index 7857825..5703e2d 100644
--- a/pages/pbService/appreciate/index.js
+++ b/pages/pbService/appreciate/index.js
@@ -103,6 +103,7 @@ Page({
   },
   gotoDetail:function(e){
     let info = e.currentTarget.dataset.info;
+    console.log(this.data.type);
     if(this.data.type==2) {
       if(this.data.isIos==false){
         this.setData({
diff --git a/pages/pbService/appreciate/index.wxml b/pages/pbService/appreciate/index.wxml
index 1850f03..7cecc02 100644
--- a/pages/pbService/appreciate/index.wxml
+++ b/pages/pbService/appreciate/index.wxml
@@ -19,7 +19,7 @@
     <view class="subtitle textOver">{{item.CatalogName || item.Tag}}</view>
   </view>
 </view>
-<view class="mask"  wx:if="{{imgInfo}}" catchtouchmove="preventTouchMove">
+<!-- <view class="mask"  wx:if="{{imgInfo}}" catchtouchmove="preventTouchMove">
   <view class="mask-bg" bindtap="closeImg"></view>
   <image bindtap="closeImg" style="width:100%;height:100%;display:block" src="{{imgInfo.Pic}}" mode="aspectFit"></image>
-</view>
\ No newline at end of file
+</view> -->
\ No newline at end of file
diff --git a/pages/user/service/index.js b/pages/user/service/index.js
index 214336e..4b01b44 100644
--- a/pages/user/service/index.js
+++ b/pages/user/service/index.js
@@ -53,7 +53,7 @@ Page({
     commonApi._post("ics/getQuestionByTypeId",{
       type_id:this.data.typeId,
       page_no:1,
-      page_num:10
+      page_num:5
     }).then(res=>{
       this.setData({
         list:res.data.rows,