From 00bcff5bf0793c568e14e7b16639e87891c1eccd Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Tue, 12 Mar 2024 14:57:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8B=8F=E5=BD=B1=E9=80=9A=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=EF=BC=8C=E6=9C=9F=E7=A5=A8=E5=88=A4=E6=96=AD=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/activitynew/index.js   |  8 +++++---
 pages/list/activitynew/index.wxml |  6 +++---
 pages/list/movieticket/index.js   | 17 ++++++++++++-----
 pages/list/movieticket/index.wxml |  8 ++++----
 pages/list/movieticket/index.wxss |  3 ++-
 pages/order/scene/index.wxml      |  2 +-
 7 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/app.js b/app.js
index fe0fc13..f80aaa2 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.isTest101? true : false;
+      data.isTest = data.isTest102? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/list/activitynew/index.js b/pages/list/activitynew/index.js
index e537870..0fe9198 100644
--- a/pages/list/activitynew/index.js
+++ b/pages/list/activitynew/index.js
@@ -254,7 +254,8 @@ Page({
     };
     let data = {
       page: this.data.pageNo,
-      pageSize: 10
+      pageSize: 10,
+      title:this.data.realKeywords
     };
     if (this.data.movieType == 2) {
       data.lat = this.data.lat;
@@ -355,7 +356,8 @@ setCity(e){
       list: [],
       pageNo: 1,
       total: 1,
-      moreFlag: true
+      moreFlag: true,
+      realKeywords:''
     })
     this.getList()
   },
@@ -388,7 +390,7 @@ setCity(e){
       total: 1,
       moreFlag: true,
       date:null,
-      isYL: true,
+      isYL: this.data.type == 4 ? false: true,
       selectDay: null
 
     })
diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml
index 6c831a6..19edc3b 100644
--- a/pages/list/activitynew/index.wxml
+++ b/pages/list/activitynew/index.wxml
@@ -1,13 +1,13 @@
 <!--pages/activity/index.wxml-->
 <title-header title="活动日历"></title-header>
 <view class="top-fixed-box">
-  <view class="acitivity-search-box" hidden="{{type==4}}">
-    <picker mode="selector" value="{{area}}" range="{{areas}}" range-key="area_name" bindchange="changeArea">
+  <view class="acitivity-search-box" >
+    <!-- <picker mode="selector" value="{{area}}" range="{{areas}}" range-key="area_name" bindchange="changeArea">
       <view class="picker">
         <view class="areatext">{{areas[area].area_name}}</view>
         <image src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image>
       </view>
-    </picker>
+    </picker> -->
     <view class="my-search-box">
       <view class="iconfont icon-sousuo"></view>
       <input bindinput="changeKeywords" value="{{realKeywords}}" type="text" placeholder="请输入搜索关键字" />
diff --git a/pages/list/movieticket/index.js b/pages/list/movieticket/index.js
index 7bb8b85..bb2a09f 100644
--- a/pages/list/movieticket/index.js
+++ b/pages/list/movieticket/index.js
@@ -101,12 +101,17 @@ Page({
   },
   search:function(){
     if(!this.data.keyword) {
-      wx.showToast({
-        title: '请输入关键字',
-        icon:'none'
-      })
-      return;
+      // wx.showToast({
+      //   title: '请输入关键字',
+      //   icon:'none'
+      // })
+      // return;
     }
+    this.setData({
+      page:1,
+      list:[],
+      isMore:true
+    })
     this.getList()
     // wx.navigateTo({
     //   url: 'list/index?keyword='+this.data.keyword,
@@ -126,6 +131,7 @@ Page({
   },
   changeType:function(e){
     this.setData({
+      keyword:'',
       type:e.currentTarget.dataset.type,
       list:[],
       page:1,
@@ -151,6 +157,7 @@ Page({
     }
     data.page = this.data.page;
     data.pageSize = 10;
+    data.title = this.data.keyword
     commonApi._post(service,data).then(res=>{
       console.log(res)
       res.data.map(item=>{
diff --git a/pages/list/movieticket/index.wxml b/pages/list/movieticket/index.wxml
index 5345a58..5cbbc5d 100644
--- a/pages/list/movieticket/index.wxml
+++ b/pages/list/movieticket/index.wxml
@@ -1,11 +1,11 @@
 <title title="电影购票"></title>
-<!-- <view class="my-top-search">
+<view class="my-top-search">
   <view class="my-search-box">
     <view class="iconfont icon-sousuo"></view>
-    <input bindinput="inputKeyword" type="text" placeholder="搜索"></input>
+    <input bindinput="inputKeyword" type="text" placeholder="搜索" value='{{keyword}}'></input>
     <view class="my-search-btn" bindtap="search">搜索</view>
   </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>
@@ -13,7 +13,7 @@
 </view>
 <view style="height:87rpx"></view>
 <!-- 热映 -->
-<view wx:if="{{type==1}}">
+<view wx:if="{{type==1}}"  style="margin-top: 110rpx;">
   <navigator url="list/info/index?id={{item.third_id}}" class="item" wx:for="{{list}}">
     <image src="{{item.headimg}}" mode="aspectFill"></image>
     <view class="info">
diff --git a/pages/list/movieticket/index.wxss b/pages/list/movieticket/index.wxss
index cd124ce..09307b4 100644
--- a/pages/list/movieticket/index.wxss
+++ b/pages/list/movieticket/index.wxss
@@ -10,6 +10,7 @@ page {
   position: fixed;
   left: 0;
   right: 0;
+  top: 250rpx;
   border-bottom: 1rpx solid #ccc;
   font-size: 29rpx;
   color: #333;
@@ -183,7 +184,7 @@ page {
   border-bottom: none;
 }
 .my-top-search {
-  /* position: fixed; */
+  position: fixed;
   left: 0;
   right: 0;
   background: #f0f0f0;
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index fecee13..ae82641 100644
--- a/pages/order/scene/index.wxml
+++ b/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}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime"
+  <date wx:if="{{isLogin && type!='activity' && ticket_type == 1}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime"
     product="{{product}}"></date>
   <view class="box" wx:if="{{product && product.isGroup==1}}">
     <view class="box-title">