更新下

pages/index/index.js

@@ -278,7 +278,7 @@ Page({
           item.ext.display_tags = []
         }
       })
-      if(res.data.length<10) {
+      if(res.data.length<15) {
         this.setData({
           listMore:false
         })
@@ -286,7 +286,6 @@ Page({
       this.setData({
         list:this.data.list.concat(res.data)
       })
-      console.log(res)
     })
   },
   onReachBottom:function(){

pages/index/index.wxml

@@ -73,25 +73,15 @@
   <view class="sale-road-boxes">
     <view class="sale-box" bindtap="gotoPath" data-title="特惠新品" data-path="/pages/list/{{isTest==false?'sale':'scene'}}/index" >
       <view class="sale-title"><text>特惠新品</text>超值商品限时抢购</view>
-      <view class="sale-product" wx:if="{{saleProduct && isTest==false}}">
+      <view class="sale-product">
         <view class="sale-product-bg"></view>
-        <common-image class="sale-img" width="173rpx" height="165rpx" src="{{saleProduct.sku.headimg}}" mode="aspectFill"></common-image>
+        <image mode="aspectFill" class="sale-img" src="https://static.ticket.sz-trip.com/uploads/20211022/0c90b027b5572b559b34c219eaf257ba.jpg"></image>
-        <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/index/sale.png" mode="aspectFill"></image>
-        <view class="sale-info">
-          <view class="sale-product-title textOver2">{{saleProduct.sku.product.title+saleProduct.sku.sku_name}}</view>
-          <view class="sale-price">￥{{saleProduct.price/100}}起</view>
-        </view>
-      </view>
-      <view class="sale-product" wx:else>
-        <view class="sale-product-bg"></view>
-        <common-image class="sale-img" width="173rpx" height="165rpx" src="https://static.ticket.sz-trip.com/xcxImages/index/tehuizhanwei.jpg" mode="aspectFill"></common-image>
         <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/index/sale.png" mode="aspectFill"></image>
         <view class="sale-info">
           <view class="sale-product-title textOver2">
             <view>限时特惠</view>
             <view>新品推荐</view>
           </view>
-          <view class="sale-price">敬请期待</view>
         </view>
       </view>
     </view>
@@ -99,12 +89,13 @@
       <view class="sale-title"><text>精品线路</text>四季苏州最是江南</view>
       <view class="sale-product" wx:if="{{roadProduct}}">
         <view class="sale-product-bg road-product-bg"></view>
-        <common-image class="sale-img" width="173rpx" height="165rpx" src="{{roadProduct.headimg}}" mode="aspectFill"></common-image>
+        <common-image class="sale-img" width="173rpx" height="165rpx" src="https://static.ticket.sz-trip.com/uploads/20211022/f8d9b54fa477b9ad8bf14e119664455e.jpg" mode="aspectFill"></common-image>
-        <!-- <image src="{{roadProduct.headimg}}" class="sale-img" mode="aspectFill"></image> -->
         <image class="sale-tip-img" src="https://static.ticket.sz-trip.com/xcxImages/index/road.png" mode="aspectFill"></image>
         <view class="sale-info">
-          <view class="sale-product-title textOver2">{{roadProduct.title}}</view>
+          <view class="sale-product-title textOver2">
-          <view class="sale-price" style="color:#009989">￥{{roadProduct.price/100}}起</view>
+            <view>四季苏州</view>
+            <view>最是江南</view>
+          </view>
         </view>
       </view>
     </view>

pages/index/index.wxss

@@ -139,6 +139,8 @@
   top: 20rpx;
   bottom: 20rpx;
   width: 140rpx;
+  display: flex;
+  align-items: center;
 }
 .sale-product-title {
   font-size: 28rpx;
@@ -467,10 +469,13 @@
 }
 .more-btn-text {
   text-align: center;
-  line-height: 40rpx;
   color: #999;
-  font-size: 24rpx;
+  font-size: 27rpx;
-  margin-bottom: 20rpx;
+  width: 200rpx;
+  line-height: 65rpx;
+  border: 1px solid #999999;
+  border-radius: 33rpx;
+  margin: 20rpx auto;
 }
 .scroll-line {
   height: 6rpx;

pages/list/sale/index.js

@@ -96,8 +96,13 @@ Page({
   gotoDetail:function(e){
     // if(this.data.type!=0) return;
     let item = e.currentTarget.dataset.item;
-    if(item.sku.product){
+    if(this.data.type==0){
-      util.gotoDetail(item.sku.product)
+      if(item.sku.product){
+        util.gotoDetail(item.sku.product)
+      }
+    }
+    else {
+      util.gotoDetail(item)
     }
     console.log(item);
   },

pages/map/index.js

@@ -415,7 +415,7 @@ Page({
   },
   getList:function(){
     this.mapCtx = wx.createMapContext("map");
-    let types = ['','scenic','venue','post','restaurant','relic','tenscenic','cinema','academes','units'],that = this;
+    let types = ['','scenic','venue','post','restaurant','relic','tenscenic','cinema','academes','red_map'],that = this;
     this.mapCtx.getRegion({
       type: 'gcj02',
       success: function(res) {
@@ -436,7 +436,12 @@ Page({
             mapItem.longitude = Number(item.lon);
             mapItem.id = index;
             mapItem.info = item;
-            mapItem.iconPath = "https://static.ticket.sz-trip.com/xcxImages/map/"+item.type+".png";
+            if(item.type=='red_map'){
+              mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20211022/4bb3b753c625e89e1214105c03390e54.png";
+            }
+            else {
+              mapItem.iconPath = "https://static.ticket.sz-trip.com/xcxImages/map/"+item.type+".png";
+            }
             mapItem.width = 20;
             mapItem.height=23;
             if(mapItem.latitude<40){

pages/map/index.wxml

@@ -42,6 +42,10 @@
     <text style="color:#9d6b00" class="iconfont icon-location"></text>
     <text>江南小书场</text>
   </view>
+  <view class="right-menu-item{{type==9?' active':''}}" bindtap="changeType" data-title="江南小书场" data-type="9">
+    <text style="color:#F60C1C" class="iconfont icon-location"></text>
+    <text>红色地图</text>
+  </view>
   <!-- <view class="right-menu-item{{type==9?' active':''}}" bindtap="changeType" data-title="文化单位" data-type="9">
     <text style="color:rgb(160, 248, 248)" class="iconfont icon-location"></text>
     <text>文化单位</text>
@@ -53,7 +57,7 @@
   <view class="info" style="{{info.info.headimg?'':'width:100%'}}">
     <view class="title textOver">{{info.info.title}}</view>
     <view class="subtitle textOver2">地址：{{info.info.address}}</view>
-    <view wx:if="{{info.info.type!='academes'}}" bindtap="gotoDetail" class="info-btn">查看详情</view>
+    <view wx:if="{{info.info.type!='academes' && info.info.type!='red_map'}}" bindtap="gotoDetail" class="info-btn">查看详情</view>
   </view>
 </view>
 <!-- 运河十景样式特殊 -->

pages/map/index.wxss

@@ -85,9 +85,13 @@
   background: #9d6b00;
   border-color: #9d6b00;
 }
-.right-menus .right-menu-item:nth-child(9).active {
+/* .right-menus .right-menu-item:nth-child(9).active {
   background: rgb(160, 248, 248);
   border-color: rgb(160, 248, 248);
+} */
+.right-menus .right-menu-item:nth-child(9).active {
+  background: #F60C1C;
+  border-color: #F60C1C;
 }
 
 .right-menu-item.active .iconfont {

pages/pbService/feiyi/info/index.wxml

@@ -1,7 +1,15 @@
 <!--pages/pbService/museum/info/index.wxml-->
 <wxs src="../../../../utils/filter.wxs" module="tool" />
 <title title="非遗详情"></title>
-<view wx:if="{{info}}" class="bg" style="top:{{top}}px">
+<view wx:if="{{info}}">
+  <common-image src="{{info.default_pic_url}}" mode="widthFix" width="100%"></common-image>
+  <view class="info">
+    <view class="title">{{info.title}}</view>
+    <view class="title">{{info.protect_office}}</view>
+    <rich-text nodes="{{filter.formateRichText(info.content)}}"></rich-text>
+  </view>
+</view>
+<!-- <view wx:if="{{info}}" class="bg" style="top:{{top}}px">
   <swiper class="page" vertical bindchange="changeSlide">
     <swiper-item>
       <view class="title">{{info.title}}</view>
@@ -23,4 +31,4 @@
     </swiper-item>
   </swiper>
   <image mode="widthFix" class="infoarrow{{currentIndex<htmls.length?' ani':''}}" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/{{currentIndex<htmls.length?'infoarrow':'infoover'}}.png"></image>
-</view>
+</view> -->

pages/pbService/feiyi/info/index.wxss

@@ -1,5 +1,17 @@
 /* pages/pbService/museum/info/index.wxss */
-.bg {
+.info {
+  margin: 30rpx;
+  color: #333;
+  font-size: 26rpx;
+}
+.title {
+  font-size: 30rpx;
+  margin-bottom: 22rpx;
+}  
+page {
+  font-size: 28rpx;
+}
+/* .bg {
   background: url(https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infobg.png);
   background-size: 100% 100%;
   position: absolute;
@@ -80,4 +92,4 @@
   font-size: 36rpx;
   height: 126rpx;
   margin-bottom: 0;
-}
+} */

pages/pbService/gym/info/index.wxml

@@ -1,6 +1,22 @@
 <!--pages/pbService/museum/info/index.wxml-->
 <wxs src="../../../../utils/filter.wxs" module="tool" />
-<title title="体育馆详情"></title>
+<title title="场馆详情"></title>
+<swiper class="swiper" indicator-dots="{{true}}" wx:if="{{info}}"
+  autoplay="{{true}}" interval="{{2000}}" duration="{{300}}">
+  <block wx:for="{{picList}}" wx:key="*this">
+    <swiper-item>
+      <image src="{{item.pic_address}}" mode="aspectFill"></image>
+    </swiper-item>
+  </block>
+</swiper>
+<view class="info" wx:if="{{info}}">
+  <view class="title">{{info.name}}</view>
+  <view class="info-tip"><text>开放时间：</text>{{info.open_time}}</view>
+  <view class="info-tip"><text>联系方式：</text>{{info.telephone}}</view>
+  <view class="info-tip"><text>地址：</text>{{info.address}}</view>
+</view>
+
+<!-- <title title="体育馆详情"></title>
 <view wx:if="{{info}}" class="bg" style="top:{{top}}px">
   <swiper class="page" vertical bindchange="changeSlide">
     <swiper-item>
@@ -38,4 +54,4 @@
     </swiper-item>
   </swiper>
   <image mode="widthFix" class="infoarrow{{currentIndex<htmls.length+1?' ani':''}}" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/{{currentIndex<htmls.length+1?'infoarrow':'infoover'}}.png"></image>
-</view>
+</view> -->

pages/pbService/gym/info/index.wxss

@@ -1,5 +1,29 @@
 /* pages/pbService/museum/info/index.wxss */
-.bg {
+.swiper,.swiper image {
+  height: 360rpx;
+  width: 100%;
+  display: block;
+
+}
+.info {
+  font-size: 26rpx;
+  padding: 20rpx 30rpx;
+  color: #333;
+}
+.info .title {
+  font-size: 30rpx;
+}
+.info-tip {
+  display: flex;
+  color: #888;
+  margin-top: 20rpx;
+}
+.info-tip text {
+  width: 130rpx;
+  color: #333;
+  flex-shrink: 0;
+}
+/* .bg {
   background: url(https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infobg.png);
   background-size: 100% 100%;
   position: absolute;
@@ -80,4 +104,4 @@
   font-size: 36rpx;
   height: 126rpx;
   margin-bottom: 0;
-}
+} */

pages/pbService/museum/info/index.wxml

@@ -1,7 +1,31 @@
 <!--pages/pbService/museum/info/index.wxml-->
 <wxs src="../../../../utils/filter.wxs" module="tool" />
 <title title="详情"></title>
-<view wx:if="{{info}}" class="bg" style="top:{{top}}px">
+<view class="content" wx:if="{{info}}">
+  <swiper class="swiper">
+    <block wx:for="{{info.listimg}}" wx:key="*this">
+      <swiper-item>
+        <image src="{{item || '/images/place1.png'}}" mode="aspectFill" class="mainimg"></image>
+      </swiper-item>
+    </block>
+  </swiper>
+  <view class="title">{{info.name}}</view>
+  <view class="tips">
+    <view class="iconfont icon-dianhua"></view>
+    <view class="textOver">{{info.phone}}</view>
+  </view>
+  <view class="tips">
+    <view class="iconfont icon-location"></view>
+    <view class="textOver">{{info.address}}</view>
+  </view>
+  <view class="subtitle">场馆详情</view>
+  <rich-text nodes="{{tool.formateRichText(info.detail)}}"></rich-text>
+  <view class="subtitle">接待时间</view>
+  <rich-text nodes="{{tool.formateRichText(info.open_time)}}"></rich-text>
+  <view class="subtitle">交通路线</view>
+  <rich-text nodes="{{tool.formateRichText(info.route)}}"></rich-text>
+</view>
+<!-- <view wx:if="{{info}}" class="bg" style="top:{{top}}px">
   <swiper class="page" vertical bindchange="changeSlide">
     <swiper-item>
       <view class="title">{{info.name}}</view>
@@ -43,4 +67,4 @@
     </swiper-item>
   </swiper>
   <image mode="widthFix" class="infoarrow{{currentIndex<htmls.length+1?' ani':''}}" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/{{currentIndex<htmls.length+1?'infoarrow':'infoover'}}.png"></image>
-</view>
+</view> -->

pages/pbService/museum/info/index.wxss

@@ -1,5 +1,52 @@
 /* pages/pbService/museum/info/index.wxss */
-.bg {
+.mainimg {
+  display: block;
+  width: 100%;
+  height: 300rpx;
+
+}
+  
+.swiper {
+  height: 300rpx;
+  margin-bottom: 30rpx;
+
+}
+.content {
+  padding: 20rpx;
+  color: #666666;
+  font-size: 28rpx;
+}
+page {
+  background: white;
+}
+.title {
+  font-size: 36rpx;
+  font-weight: bold;
+  color: #333;
+  margin-bottom: 10rpx;
+}
+.tips {
+  display: flex;
+  align-items: center;
+  height: 50rpx;
+}
+.tips .iconfont {
+  flex-shrink: 0;
+  margin-right: 10rpx;
+  color: #999;
+}
+.subtitle {
+  padding-left: 20rpx;
+  border-left: 6rpx solid #0F9095;
+  line-height: 30rpx;
+  color: #333;
+  font-size: 30rpx;
+  font-weight: bold;
+  margin-top: 40rpx;
+  margin-bottom: 20rpx;
+}
+  
+/* .bg {
   background: url(https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infobg.png);
   background-size: 100% 100%;
   position: absolute;
@@ -80,4 +127,4 @@
   font-size: 36rpx;
   height: 126rpx;
   margin-bottom: 0;
-}
+} */

pages/pbService/wwcx/info/index.wxml

@@ -1,7 +1,18 @@
 <!--pages/pbService/museum/info/index.wxml-->
 <wxs src="../../../../utils/filter.wxs" module="tool" />
 <title title="文物详情"></title>
-<view wx:if="{{info}}" class="bg" style="top:{{top}}px">
+<image class="main-img" wx:if="{{info}}" src="{{info.logo}}" mode="widthFix"></image>
+<view class="content" wx:if="{{info}}">
+  <view class="title">{{info.name}}</view>
+  <view class="subtitle" wx:if="{{info.collection_name}}"><text>藏于：</text>{{info.collection_name}}</view>
+  <view class="subtitle" wx:if="{{info.level_name}}"><text>等级：</text>{{info.level_name}}</view>
+  <view class="subtitle" wx:if="{{info.age}}"><text>历史年代：</text>{{info.age}}</view>
+  <view class="detail">
+    <view style="margin-bottom:10rpx">文物介绍</view>
+    <view>{{info.introduction}}</view>
+  </view>
+</view>
+<!-- <view wx:if="{{info}}" class="bg" style="top:{{top}}px">
   <swiper class="page" vertical bindchange="changeSlide">
     <swiper-item>
       <view class="title">{{info.name}}</view>
@@ -27,4 +38,4 @@
     </swiper-item>
   </swiper>
   <image mode="widthFix" class="infoarrow{{currentIndex<htmls.length?' ani':''}}" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/{{currentIndex<htmls.length?'infoarrow':'infoover'}}.png"></image>
-</view>
+</view> -->

pages/pbService/wwcx/info/index.wxss

@@ -1,5 +1,24 @@
 /* pages/pbService/museum/info/index.wxss */
-.bg {
+.main-img {
+  display: block;
+  width: 100%;
+
+}
+.content {
+  margin: 30rpx;
+  color: #333;
+  font-size: 30rpx;
+}
+.subtitle {
+  margin-bottom: 10rpx;
+  font-size: 26rpx;
+  
+}
+.detail {
+  margin-top: 40rpx;
+  font-size: 26rpx;
+}
+/* .bg {
   background: url(https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/info/infobg.png);
   background-size: 100% 100%;
   position: absolute;
@@ -80,4 +99,4 @@
   font-size: 36rpx;
   height: 126rpx;
   margin-bottom: 0;
-}
+} */

project.private.config.json

@@ -13,9 +13,9 @@
     "miniprogram": {
       "list": [
         {
-          "name": "pages/pbService/feiyi/info/index",
+          "name": "pages/pbService/gym/info/index",
-          "pathName": "pages/pbService/feiyi/info/index",
+          "pathName": "pages/pbService/gym/info/index",
-          "query": "id=24",
+          "query": "id=1001",
           "scene": null
         },
         {