十全街等修改

pages/index/index.js

@@ -436,6 +436,12 @@ Page({
         path: 'pages/home/home'
       })
       return;
+    }else if (e.currentTarget.dataset.event == 'changshu_click') {
+      wx.navigateToMiniProgram({
+        appId: 'wx4df5fd9a6a5ea123',
+        path: 'pages/index'
+      })
+      return;
     }else if (e.currentTarget.dataset.event == 'gongyeyuanqu_click') {
       wx.navigateToMiniProgram({
         appId: 'wxd323e63a10aa6865',
@@ -829,7 +835,7 @@ Page({
     if (item.type == 'h5') {
       app.globalData.weburl = item.url
       wx.navigateTo({
-        url: "/pages/pbService/web/index"
+        url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(item.url)
       })
     } else if (item.type == 'mini') {
       wx.navigateToMiniProgram({

pages/index/index.wxml

@@ -309,6 +309,22 @@
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb10.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> -->
+        <!-- 元旦修改 -->
+        <image src="https://static.ticket.sz-trip.com/uploads/20240228/6a06991fe4c99328d4d36e58c11c1558.png" mode="widthFix"></image>
+        <view class="text">书香借阅</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>
+	    <view>公共文化资源库</view> -->
+      <!-- 元旦修改 -->
+      <image src="https://static.ticket.sz-trip.com/uploads/20240228/b420eaeada1678958bc92f76bbc8348e.png" mode="widthFix"></image>
+      <view class="text">公共文化资源库</view>
+	  </view>
 			<view bindtap="gotoPath" style="margin-left: 20rpx;" data-event="book_click" data-title="苏影通" data-path="/pages/list/movieticket/index"
         class="pbservice-item">
         <!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/syt.png" mode="widthFix"></image>
@@ -347,23 +363,6 @@
         <image src="https://static.ticket.sz-trip.com/uploads/20240228/7fc9a10cd3df18bd7b8eb4bc96579a04.png" mode="widthFix"></image>
         <view class="text">视觉中心</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> -->
-        <!-- 元旦修改 -->
-        <image src="https://static.ticket.sz-trip.com/uploads/20240228/6a06991fe4c99328d4d36e58c11c1558.png" mode="widthFix"></image>
-        <view class="text">书香借阅</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>
-	    <view>公共文化资源库</view> -->
-      <!-- 元旦修改 -->
-      <image src="https://static.ticket.sz-trip.com/uploads/20240228/b420eaeada1678958bc92f76bbc8348e.png" mode="widthFix"></image>
-      <view class="text">公共文化资源库</view>
-	  </view>
     </view>
   </scroll-view>
   <view class="scroll-line">

pages/index/index.wxss

@@ -327,7 +327,7 @@ page {
 .pbservice {
   /* width: calc(175rpx * 6); */
   /* 元旦修改 */
-  width: calc(190rpx * 6);
+  width: calc(190rpx * 8);
   display: flex;
   margin-top: 20rpx;
   flex-wrap: wrap;

pages/list/movieticket/index.js

@@ -14,7 +14,8 @@ Page({
     lon:null,
     page:1,
     isMore:true,
-    list:[]
+    list:[],
+    keyword:"",
   },
 
   /**
@@ -93,6 +94,24 @@ Page({
   //     url: 'info/ticket/index?id='+item.third_id+"&title="+item.title
   //   })
   // },
+  inputKeyword:function(e){
+    this.setData({
+      keyword:e.detail.value
+    })
+  },
+  search:function(){
+    if(!this.data.keyword) {
+      wx.showToast({
+        title: '请输入关键字',
+        icon:'none'
+      })
+      return;
+    }
+    this.getList()
+    // wx.navigateTo({
+    //   url: 'list/index?keyword='+this.data.keyword,
+    // })
+  },
   gotoDetail1:function(e){
     let item = e.currentTarget.dataset.item;
     wx.navigateTo({

pages/list/movieticket/index.wxml

@@ -1,4 +1,11 @@
 <title title="电影购票"></title>
+<!-- <view class="my-top-search">
+  <view class="my-search-box">
+    <view class="iconfont icon-sousuo"></view>
+    <input bindinput="inputKeyword" type="text" placeholder="搜索"></input>
+    <view class="my-search-btn" bindtap="search">搜索</view>
+  </view>
+</view> -->
 <view class="movie-types">
   <view class="movie-type{{type==1?' active':''}}" bindtap="changeType" data-type="1">热映</view>
   <view class="movie-type{{type==2?' active':''}}" bindtap="changeType" data-type="2">影院</view>

pages/list/movieticket/index.wxss

@@ -181,4 +181,42 @@ page {
 }
 .cinemalist .cinema:last-child {
   border-bottom: none;
+}
+.my-top-search {
+  /* position: fixed; */
+  left: 0;
+  right: 0;
+  background: #f0f0f0;
+  padding: 16rpx 0;
+  z-index: 1;
+}
+.my-search-box {
+  height: 56rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding-left: 20rpx;
+  background: #fff;
+  border-radius: 30rpx;
+  margin: 0 auto;
+  width: 560rpx;
+}
+.my-search-box .iconfont {
+  color: #999999;
+  flex-shrink: 0;
+}
+.my-search-box input {
+  display: block;
+  flex: 1;
+  margin: 0 20rpx;
+  font-size: 26rpx;
+}
+.my-search-btn {
+  flex-shrink: 0;
+  width: 110rpx;
+  text-align: center;
+  font-size: 26rpx;
+  color: #0B898E;
+  border-left: 1rpx solid #ccc;
+  line-height: 40rpx;
 }

pages/list/six/index.wxml

@@ -1,6 +1,6 @@
 <!--pages/list/six/index.wxml-->
 <!-- <search bind:onload="search"></search> -->
-<title title="十全街"></title>
+<title title="十全十美"></title>
 
 <!-- <image src="https://resource.sz-trip.com/uploads/20190831/3ecfcb81bab36027606676737788110c.png" mode="aspectFill" class="topbg"></image> -->
 <image src="{{areas[areaIndex].img}}" mode="widthFix" class="bannerImg"  data-event="{{areas[areaIndex]}}" bindtap="gotoPath"></image>
@@ -47,7 +47,7 @@
     <image class="blue-shadow" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/six/icon6.png" mode="widthFix"></image>
     <view>停车场</view>
   </navigator>
-  <navigator url="/pages/pbService/bike/index?type=0&lat={{areas[areaIndex].lat}}&lon={{areas[areaIndex].lon}}" class="new-icon">
+  <navigator url="/pages/pbService/bike/index?type=0&lat={{areas[areaIndex].lat}}&lon={{areas[areaIndex].lon}}" class="new-icon" wx:if="{{areaIndex != 0 && areaIndex != 1 && areaIndex != 2 && areaIndex != 3}}">
     <image class="red-shadow" src="https://sz-qd.oss-cn-hangzhou.aliyuncs.com/xcxImages/six/icon7.png" mode="widthFix"></image>
     <view>公共自行车</view>
   </navigator>

pages/order/scene/index.wxml

@@ -5,7 +5,7 @@
     <view class="product-title">{{product.product.title  + product.isGroup==1?'（团体预约）':product.sku.sku_name}}</view>
     <view class="product-price" wx:if="{{type=='museum' || type=='activity'}}">免费</view>
   </view>
-  <date  wx:if="{{isLogin && type!='activity' && ticket_type == 1}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime"
+  <date  wx:if="{{isLogin}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime"
     product="{{product}}"></date>
   <view class="box" wx:if="{{product && product.isGroup==1}}">
     <view class="box-title">