Browse Source

活动日历,文旅鉴赏,公共服务,人工客服提示,精彩回顾调整

master
shaojing 2 years ago
parent
commit
4c50efb6dd
  1. 2
      app.js
  2. 154
      pages/component/newCalendar/index.js
  3. 13
      pages/component/newCalendar/index.wxml
  4. 19
      pages/component/newCalendar/index.wxss
  5. 146
      pages/index/index.wxml
  6. 11
      pages/list/activitynew/index.js
  7. 45
      pages/list/activitynew/index.wxml
  8. 66
      pages/list/activitynew/index.wxss
  9. 19
      pages/pbService/activity/index.js
  10. 3
      pages/pbService/activity/index.wxml
  11. 2
      pages/pbService/activity/index.wxss
  12. 26
      pages/pbService/index.wxml
  13. 3
      pages/user/service/list/index.wxml
  14. 3
      pages/user/user.wxml

2
app.js

@ -21,7 +21,7 @@ App({
unique_key: "wechatxcx"
}).then(res => {
let data = JSON.parse(res.data);
data.isTest = data.isTest111? true : false;
data.isTest = data.isTest112? true : false;
this.globalData.configJson = data
}).then(() => {
// 获取ui配置文件

154
pages/component/newCalendar/index.js

@ -1,5 +1,6 @@
// components/xx-calendar/xx-calendar.js
import calendarFormatter from "./xx_calendar";
import commonApi from "../../../utils/https/common"
Component({
/**
* 组件的属性列表
@ -26,7 +27,10 @@ Component({
nextMonthDays: [], //下一个月
weekDay:[], //周 日期list
activeDateStr:'', // 当前日期,
currentViewType: 'week' //当前选中的是周还是月
currentViewType: 'week', //当前选中的是周还是月
holidayList:[], //节假日
holidayList2:['2024/01/01','2024/02/10','2024/04/04', '2024/05/01', '2024/06/10','2024/09/17','2024/10/01'], // 节假日()
// lisClickNext: true, // 是否可以点下一周
},
/**
@ -40,7 +44,6 @@ Component({
/** 总方法 */
//创建日期
createDays(year, month) {
if( this.data.currentViewType === "month" ) {
this.getLastMonthDays(year, month)
this.getNowMonthDays(year, month)
@ -53,6 +56,9 @@ Component({
/** 视图收起/展开 */
toggleMode() {
if ((this.data.currentViewType === 'week' && this.data.weekDay.some(s => s.year === 2025)) || (this.data.currentViewType === 'week' && this.data.weekDay.some(s => s.year === 2023))) {
return
}
this.setData({
currentViewType: this.data.currentViewType === "month" ? "week" : "month",
})
@ -124,17 +130,21 @@ Component({
}
// 当前月数据
let festival = calendarFormatter.getFestival(timer) // 返回当前节假日名称, 不是节日返回 '工作日'
let realDate = new Date() 
                let realMonth = realDate.getMonth() + 1
let _time = `${years}/${+months < 10 ? '0'+months : months}/${+day2 < 10 ? '0'+day2 :day2}`
console.log(this.data.holidayList2.includes(_time))
nowMonthDays.push({
date: i, //几号
week: this.data.weeksArr[new Date(year, month - 1, i).getDay()], //星期几
time,
_time,
color: false,
day: ['工作日', '周末'].includes(festival) || festival.indexOf('补') > -1 ? newdate : festival,
day: newdate,
// day: ['工作日', '周末'].includes(festival) || festival.indexOf('补') > -1 || [如果有不想展示的日期,放这里].includes(timer) ? newdate : festival,
isNowMonthDay: (month == nowMonth && i == nowDay) ? "isNowMonthDay" : "",
isHoliday: calendarFormatter.isHoliday(timer), // 判断是否是休息日 是的话返回true, 不是的话返回false
isNowMonthDay: (month == realMonth && i == nowDay) ? "isNowMonthDay" : "",
isHoliday: this.data.holidayList.find(s => s.date == _time ), // 判断是否是休息日 是的话返回true, 不是的话返回false
holidayList2: this.data.holidayList2.includes(_time)
});
}
this.data.use_date_arr.forEach(ele => {
@ -192,6 +202,9 @@ Component({
year = (parseInt(month) + 1) > 12 ? year + 1 : year
month = (parseInt(month) + 1) > 12 ? 1 : parseInt(month) + 1
}
if (year != this.data.year) {
return
}
this.setData({
year,
month,
@ -200,16 +213,99 @@ Component({
})
this.createDays(year, month)
} else {
let {
year,
month,
nowDay
} = this.data
let type = e.currentTarget.dataset.type //类型
let newActiveDateStr = this.getActiveDateStrByWeek(this.data.activeDateStr, type)
if ((type == 'next' && this.data.weekDay[0].year === 2025) || (type == 'prev' && this.data.weekDay[0].year === 2023)) {
return
}
// if (type == 'next' && this.data.weekDay[0].year === 2025) {
// // debugger
// return
// }
// let newActiveDateStr = this.getActiveDateStrByWeek(this.data.activeDateStr, type)
let newActiveDateStr = this.getActiveDateStrByWeek(this.data.weekDay[6].dateStr, type)
// debugger
this.getWeekData(newActiveDateStr)
this.setData({
activeDateStr: newActiveDateStr,
})
console.log(this.data.weekDay);
// this.data.lisClickNext = this.data.weekDay.every(s => s.year == 2024)
}
},
// 获取节假日
getHoliday(){
commonApi._post("pbservice/Actcalendar/getHoliday",{year:this.data.year}).then(res => {
// console.log(res);
this.setData({
holidayList: res.data
})
 this.data.holidayList = this.data.holidayList.map(item=> {
if (item.name == '清明节') {
return {
  ...item,
color:'#009EA3',
  background:'#DAF0EE'
}
}else if (item.name == '劳动节') {
return {
  ...item,
color:'#DE4126',
  background:'#FFECDB'
}
}else if (item.name == '春节') {
return {
  ...item,
color:'#D10000',
  background:'#FAE3E3'
}
}else if (item.name == '元旦') {
return {
  ...item,
color:'#EB3300',
  background:'#FFDED9'
}
}else if (item.name == '端午节') {
return {
  ...item,
color:'#0B8E3F',
  background:'#CEEDDB'
}
}else if (item.name == '国庆节') {
return {
  ...item,
color:'#D41E1E',
  background:'#FFE8E8'
}
}else if (item.name == '中秋节') {
return {
  ...item,
color:'#FF8E24',
  background:'#FFF3DB'
}
} else {
return {
  ...item,
color:'#fff',
  background:'#fff'
}
}
})
console.log('------------------------------',this.data.holidayList);
let {
year,
month,
nowDay
} = this.data
this.setData({
activeDateStr: `${year}/${month}/${nowDay}`
})
this.createDays(year, month, nowDay)
})
},
/** 获取周视图数据 */
getWeekData(defaultDate) {
/** 是否是从周一开始 */
@ -231,7 +327,7 @@ Component({
let lastDay = new Date(YEAR, MONTH, 0)
/** 当月最后一天是几号 */
let lastDate = lastDay.getDate()
// debugger
var ret = []
/** 前面有几天 */
let preCount = isStartFromMonday ? WEEK - 1 : WEEK
@ -272,19 +368,26 @@ Component({
month,
nowDay
} = this.data
 let realMonth =new Date().getMonth() + 1
// 当前周数据
let festival = calendarFormatter.getFestival(`${showYear}-${showMonth}-${showDate}`) // 返回当前节假日名称, 不是节日返回 '工作日'
// debugger
ret.push({
year: showYear,
month: showMonth,
date: showDate,
calDate: date,
day: ['工作日', '周末'].includes(festival) || festival.indexOf('补') > -1 ? newdate : festival,
day: newdate,
dateStr: `${showYear}/${showMonth}/${showDate}`,
isNowMonthDay: (month == showMonth && nowDay == showDate) ? "isNowMonthDay" : "",
isHoliday: calendarFormatter.isHoliday(`${showYear}-${showMonth}-${showDate}`), // 判断是否是休息日 是的话返回true, 不是的话返回false
isNowMonthDay: ( realMonth  == showMonth && nowDay == showDate) ? "isNowMonthDay" : "",
isHoliday: this.data.holidayList.find(s => s.date === `${showYear}/${+showMonth < 10 ? '0'+showMonth : showMonth}/${+showDate < 10 ? '0'+showDate :showDate}` ),
holidayList2: this.data.holidayList2.includes(`${showYear}/${+showMonth < 10 ? '0'+showMonth : showMonth}/${+showDate < 10 ? '0'+showDate :showDate}` )
// `${showYear}/${showMonth}/${showDate}`
// isHoliday: calendarFormatter.isHoliday(`${showYear}-${showMonth}-${showDate}`), // 判断是否是休息日 是的话返回true, 不是的话返回false
})
}
console.log(ret);
// debugger
this.setData({
weekDay: ret,
year: YEAR,
@ -335,8 +438,13 @@ Component({
selectDate(e){
let type = e.currentTarget.dataset.type //选择的时间类型
let index = e.currentTarget.dataset.index //选择的下标
// let date = e.currentTarget.dataset.item.time //选择的下标
let date = e.currentTarget.dataset.item.dateStr //选择的下标
let date
if (this.data.currentViewType == 'week') {
date = e.currentTarget.dataset.item.dateStr //选择的下标
type = 'weekDay'
} else {
date = e.currentTarget.dataset.item.time //选择的下标
}
let selectDate = date.replace(/\//g, "-")
console.log("选择的时间", selectDate)
// 自定义事件,父组件调用,回调 选择的时间selectDate
@ -345,6 +453,7 @@ Component({
this.data[type]?.forEach(item => {
item.isNowMonthDay = ''
})
console.log(index,this.data,[type]);
this.data[type]?.forEach((item, idx) => {
if (index == idx) {
item.isNowMonthDay = (item.time == new Date().toLocaleDateString() ? "isNowMonthDay" : "isNotNowMonthDay"); //判断当前选中的日期是否是当前时间
@ -364,15 +473,8 @@ Component({
},
},
ready() {
let {
year,
month,
nowDay
} = this.data
this.setData({
activeDateStr: `${year}/${month}/${nowDay}`
})
this.createDays(year, month, nowDay)
this.getHoliday()
}
})

13
pages/component/newCalendar/index.wxml

@ -10,9 +10,9 @@
<view class="year-mouth">
{{year}}年 {{month}}月
</view>
<view class="next" bindtap="changeMonthFun" data-type="next">
<view class="next" bindtap="changeMonthFun" data-type="next" >
<text wx:if="{{currentViewType==='month'}}">下一月</text>
<text wx:else>下一周</text>
<text wx:else>下一周 </text>
<image style="margin-left: 10rpx;" src="https://static.ticket.sz-trip.com/uploads/20240327/ab2097432f5c34915665cb376e72c4aa.png" mode="" />
</view>
</view>
@ -32,14 +32,15 @@
<view class="mouth-date current-mouth " wx:for="{{currentViewType === 'month' ? nowMonthDays : weekDay}}" wx:key="*this" bindtap="selectDate"
data-item="{{item}}" data-type="nowMonthDays" data-index="{{index}}"
>
<!-- <view class="day-box {{item.isNowMonthDay?'active':''}} {{item.isHoliday ? 'holiday' : ''}}"> -->
<view class="day-box {{item.isNowMonthDay?'active':''}} {{item.isHoliday ? 'holiday' : ''}}">
<text class="day-text {{item.color?'color':''}} ">
<view class="day-box {{item.isNowMonthDay?'active':''}} {{item.isHoliday ? 'holiday' : ''}}{{item.isHoliday&&item.isNowMonthDay ? 'active' : ''}}" style="background: {{ item.isHoliday.background }};color: {{ item.isHoliday.color }}">
<text class="day-text">
<!-- <text class="day-text {{item.isHoliday?'color':''}} "> -->
<text>{{item.date}}</text>
<text wx:if="{{item.isHoliday}}" class="xiu" >休</text>
</text>
<!-- day 后面会换成农历展示 -->
<text class="day-nongli">{{item.day}}</text>
<text class="day-nongli" wx:if="{{item.isHoliday && item.holidayList2}}" style="color: {{ item.isHoliday.color }}">{{ item.isHoliday.name}} </text>
<text class="day-nongli" wx:else="" style="color: {{ item.isHoliday ? item.isHoliday.color : '#888888' }}">{{ item.day}}</text>
<text class=" {{item.color?'day-dot':'not-dot'}}"></text>
</view>
</view>

19
pages/component/newCalendar/index.wxss

@ -70,7 +70,7 @@
}
.mouth-date .day-nongli{
font-size: 18rpx;
color: #888888;
/* color: #888888; */
margin-bottom: 6rpx;
}
.mouth-date .color{
@ -93,11 +93,15 @@
padding-bottom: 8rpx;
}
.mouth-date .active{
background-color: #0B898E;
background-color: #0B898E !important;
}
.mouth-date .active text{
color: #fff;
color: #fff !important;
}
.mouth-date .active .day-text{
font-weight: 600;
}
@ -114,6 +118,15 @@
position: relative;
/* color: #e1856e; */
}
.holidayactive {
position: relative;
}
.day-text .xiu {
font-size: 6px;
position: absolute;
right: 5px;
top: 5px;
}
.holiday .xiu {
font-size: 6px;
position: absolute;

146
pages/index/index.wxml

@ -230,13 +230,85 @@
<!-- 元旦修改 .slide-box的原样式 height:360rpx-->
<scroll-view scroll-x style="height:343.33rpx" bindscroll="listenScroll" class="slide-box">
<view class="pbservice" style="margin-bottom:30rpx">
<view bindtap="gotoUrl" style="margin-left:20rpx" data-title="非遗鉴赏" data-url="https://m.cloud.sz-trip.com/IntangibleCultural2" class="pbservice-item">
<view bindtap="gotoUrl" data-title="非遗鉴赏" style="margin-left: 20rpx;" data-url="https://m.cloud.sz-trip.com/IntangibleCultural2" class="pbservice-item">
<!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.jpg" mode="widthFix"></image>
<view>非遗鉴赏</view> -->
<!-- 元旦修改 第一个pbservice-item新增margin-left -->
<image src="https://static.ticket.sz-trip.com/uploads/20240228/e975683fe59dcd25bbbc6790fc7d0979.png" mode="widthFix"></image>
<view class="text">非遗鉴赏</view>
</view>
<view bindtap="goH5" data-title="数字博物馆"
data-path="BwsInfo" class="pbservice-item">
<!-- <image src="https://static.ticket.sz-trip.com/uploads/20220907/d50f492083b419b9b538de274423084c.png" mode="widthFix"></image>
<view>数字博物馆</view> -->
<!-- 元旦修改 -->
<image src="https://static.ticket.sz-trip.com/uploads/20240228/5969e3a1d76f1110c6308017a60db97c.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="goH5" data-event="book_click" data-title="文博会" data-path="CloudExpo"
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/uploads/20240228/2a438fc454c328b907d5648c3300ba20.png" mode="widthFix"></image>
<view class="text">云上文博会</view>
</view>
<view bindtap="gotoUrl" data-event="cloud_click" data-title="云上观展"
data-url="https://m.cloud.sz-trip.com/CloudPerform2022" class="pbservice-item">
<!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb13.png" mode="widthFix"></image>
<view>云上观展</view> -->
<!-- 元旦修改 -->
<image src="https://static.ticket.sz-trip.com/uploads/20240228/51a356aa37b192792d04f0fb7c1d6b3b.png" mode="widthFix"></image>
<view>云上观展</view>
</view>
<view bindtap="gotoPath" data-event="review_click" data-title="精彩回顾" data-path="/pages/pbService/activity/index"
class="pbservice-item">
<!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb8.png" mode="widthFix"></image>
<view>精彩回顾</view> -->
<!-- 元旦修改 -->
<image src="https://static.ticket.sz-trip.com/uploads/20240228/86f6ca0f39c0b5e6e262f97047bdb871.png" mode="widthFix"></image>
<view class="text">精彩回顾</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>
<view>文旅单位</view> -->
<!-- 元旦修改 -->
<image src="https://static.ticket.sz-trip.com/uploads/20240228/85017f4a5732416391618582107429e5.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="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>
<view>苏影通</view> -->
<!-- 元旦修改 -->
<image src="https://static.ticket.sz-trip.com/uploads/20240228/4e60d8de231e1c9a93446a9493e09470.png" mode="widthFix"></image>
<view class="text">苏影通</view>
</view>
<view bindtap="gotoPath" data-event="appreciate_click" data-title="视觉中心"
data-path="/pages/pbService/appreciate/index" class="pbservice-item">
<!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb4.png" mode="widthFix"></image>
<view>视觉中心</view> -->
<!-- 元旦修改 -->
<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="culture_search_click" data-title="文物查询"
data-path="/pages/pbService/wwcx/index" class="pbservice-item">
<image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb3.png" mode="widthFix"></image>
@ -255,27 +327,11 @@
<image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb6.png" mode="widthFix"></image>
<view>博物馆查询</view>
</view> -->
<view bindtap="goH5" data-title="数字博物馆"
data-path="BwsInfo" class="pbservice-item">
<!-- <image src="https://static.ticket.sz-trip.com/uploads/20220907/d50f492083b419b9b538de274423084c.png" mode="widthFix"></image>
<view>数字博物馆</view> -->
<!-- 元旦修改 -->
<image src="https://static.ticket.sz-trip.com/uploads/20240228/5969e3a1d76f1110c6308017a60db97c.png" mode="widthFix"></image>
<view class="text">数字博物馆</view>
</view>
<!-- <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="goH5" data-event="book_click" data-title="文博会" data-path="CloudExpo"
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/uploads/20240228/2a438fc454c328b907d5648c3300ba20.png" mode="widthFix"></image>
<view class="text">云上文博会</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>
@ -289,14 +345,6 @@
<image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb12.png" mode="widthFix"></image>
<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>
<view>文旅单位</view> -->
<!-- 元旦修改 -->
<image src="https://static.ticket.sz-trip.com/uploads/20240228/85017f4a5732416391618582107429e5.png" mode="widthFix"></image>
<view class="text">文旅单位</view>
</view>
<!-- <view bindtap="gotoPath" data-event="team_click" data-title="团体预约" data-path="/pages/pbService/group/index"
class="pbservice-item">
<image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb9.png" mode="widthFix"></image>
@ -309,60 +357,12 @@
<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>
<view>苏影通</view> -->
<!-- 元旦修改 -->
<image src="https://static.ticket.sz-trip.com/uploads/20240228/4e60d8de231e1c9a93446a9493e09470.png" mode="widthFix"></image>
<view class="text">苏影通</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">
<!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb13.png" mode="widthFix"></image>
<view>云上观展</view> -->
<!-- 元旦修改 -->
<image src="https://static.ticket.sz-trip.com/uploads/20240228/51a356aa37b192792d04f0fb7c1d6b3b.png" mode="widthFix"></image>
<view>云上观展</view>
</view>
<view bindtap="gotoPath" data-event="review_click" data-title="精彩回顾" data-path="/pages/pbService/activity/index"
class="pbservice-item">
<!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb8.png" mode="widthFix"></image>
<view>精彩回顾</view> -->
<!-- 元旦修改 -->
<image src="https://static.ticket.sz-trip.com/uploads/20240228/86f6ca0f39c0b5e6e262f97047bdb871.png" mode="widthFix"></image>
<view class="text">精彩回顾</view>
</view>
<view bindtap="gotoPath" data-event="appreciate_click" data-title="视觉中心"
data-path="/pages/pbService/appreciate/index" class="pbservice-item">
<!-- <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb4.png" mode="widthFix"></image>
<view>视觉中心</view> -->
<!-- 元旦修改 -->
<image src="https://static.ticket.sz-trip.com/uploads/20240228/7fc9a10cd3df18bd7b8eb4bc96579a04.png" mode="widthFix"></image>
<view class="text">视觉中心</view>
</view>
</view>
</scroll-view>
<view class="scroll-line">

11
pages/list/activitynew/index.js

@ -82,6 +82,17 @@ Page({
})
})
},
selectDate: function (e) {
console.log(e.detail);
this.setData({
date: e.detail,
pageNo: 1,
list: [],
total: 1,
moreFlag: true
})
this.getList()
},
changeType: function (e) {
this.setData({
type: e.currentTarget.dataset.type,

45
pages/list/activitynew/index.wxml

@ -1,20 +1,30 @@
<!--pages/activity/index.wxml-->
<title-header title="活动日历"></title-header>
<new-calendar wx:if="{{type!=4}}" bind:selectDate="selectDate"></new-calendar>
<view class="top-fixed-box">
<view class="acitivity-search-box" >
<!-- <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" wx:if="{{type!=4}}">
<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="请输入搜索关键字" />
<view class="search-btn" bindtap="search">搜索</view>
</view>
</view>
<view scroll-x enable-flex class="types">
<view class="types-box">
<view class="{{type==9?'types-item-active':'types-item'}}" bindtap="changeType" data-type="9">全部</view>
<view class="{{type==3?'types-item-active':'types-item'}}" bindtap="changeType" data-type="3">景区活动</view>
<view class="{{type==1?'types-item-active':'types-item'}}" bindtap="changeType" data-type="1">演出</view>
<view class="{{type==2?'types-item-active':'types-item'}}" bindtap="changeType" data-type="2">展览</view>
<view class="{{type==4?'types-item-active':'types-item'}}" bindtap="changeType" data-type="4">电影</view>
<view class="{{type==7?'types-item-active':'types-item'}}" bindtap="changeType" data-type="7">文化惠民</view>
<view class="{{type==6?'types-item-active':'types-item'}}" bindtap="changeType" data-type="6">其他</view>
</view>
<!-- <view scroll-x enable-flex class="types">
<view class="type-item" bindtap="changeType" data-type="9">
<image src="https://static.ticket.sz-trip.com/uploads/20230208/{{type==9?'b44d3101973581c7efe097df2119504d':'4bf0b55112e6607e62a6b3498757b86f'}}.png" mode="widthFix"></image>
<view style="{{type==9?'color: #0B898E':''}}">全部</view>
@ -38,20 +48,20 @@
<view class="type-item" bindtap="changeType" data-type="7">
<image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon8{{type==7?'_active':''}}.png" mode="widthFix"></image>
<view style="{{type==7?'color:#F75D2A':''}}">文化惠民</view>
</view>
</view> -->
<!-- <view class="type-item" bindtap="changeType" data-type="5">
<image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon5{{type==5?'_active':''}}.png" mode="widthFix"></image>
<view style="{{type==5?'color:#0B898E':''}}">讲座</view>
</view> -->
<view class="type-item" bindtap="changeType" data-type="6" style="margin-right:30rpx">
<!-- <view class="type-item" bindtap="changeType" data-type="6" style="margin-right:30rpx">
<image src="https://static.ticket.sz-trip.com/xcxImages/activitynew/icon6{{type==6?'_active':''}}.png" mode="widthFix"></image>
<view style="{{type==6?'color:#54b9ed':''}}">其他</view>
</view>
<view style="width:1rpx;flex-shrink:0;height:1rpx"></view>
</view>
<view class="date-box" hidden="{{type==4}}">
</view> -->
<!-- <view class="date-box" hidden="{{type==4}}">
<view class="yulan{{isYL?' active':''}}" data-flag="0" bindtap="yulan">
<view>
全部
@ -69,7 +79,7 @@
<image width="56rpx" height="60rpx" mode="aspectFill" src="https://static.ticket.sz-trip.com/uploads/20230208/967796a90039681fee47e9271c2207d7.png"></image>
</view>
</picker>
</view>
</view> -->
</view>
<view class="activity-list activity-list1">
<view class="movie-types" wx:if="{{type==4}}">
@ -89,22 +99,23 @@
<view class="{{sort=='distance'?'active':''}} m-sort" bindtap="setSort" data-sort="distance">离我最近</view>
<view class="{{sort=='price'?'active':''}} m-sort" bindtap="setSort" data-sort="price">价格最低</view>
</view>
<view wx:if="{{list.length>0 && type!=4}}" style="background:#0B898E;padding:1rpx 0">
<view wx:for="{{list}}" bindtap="gotoDetail" data-item="{{item}}" class="activity-item-out">
<view class="activity-item">
<view wx:if="{{list.length>0 && type!=4}}" style="background:#fff;padding:1rpx 0">
<!-- <view wx:for="{{list}}" bindtap="gotoDetail" data-item="{{item}}" class="activity-item-out"> -->
<view class="activity-item" wx:for="{{list}}" bindtap="gotoDetail" data-item="{{item}}">
<common-image width="320rpx" height='220rpx' style="margin-right: 13rpx;" src="{{item.post_url || item.cover}}" defaultImage="/images/place3.jpg" mode="aspectFill"></common-image>
<view class="activity-info">
<view class="activity-title textOver2">{{item.name || item.title}}</view>
<view>
<view style="margin-bottom:10rpx">{{item.begin_date}}—{{item.end_date}}</view>
<view class="textOver2">{{item.detail_address?item.detail_address:""}}</view>
<view class="textOver2">{{item.from_platform}}</view>
<!-- <view class="textOver2">{{item.detail_address?item.detail_address:""}}</view> -->
</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_act_end}}">已结束</view>
</view>
<view class="new-tip">{{item.from_platform}}</view>
<!-- <view class="new-tip">{{item.from_platform}}</view> -->
</view>
</view>
<!-- </view> -->
<!-- 后面都是电影的 -->
<view wx:if="{{list.length>0 && type==4 && movieType!=2}}">
<view bindtap="gotoDetail" data-item="{{item}}" class="activity-item activity-item-out" style="margin-top:0" wx:for="{{list}}">
@ -131,7 +142,7 @@
</view>
</view>
</view>
<view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1;top:430rpx">
<view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1;top:430rpx;position: inherit;">
<image mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
<view>暂无内容</view>
</view>

66
pages/list/activitynew/index.wxss

@ -1,14 +1,14 @@
/* pages/activity/index.wxss */
page {
background: #fff;
background: #F2F2F2;
}
.types {
/* justify-content: space-between; */
background: #fff;
display: flex;
color: #666;
width: 750rpx;
width: 697rpx;
overflow-x: scroll;
border-bottom: 1rpx solid #d8d8d8;
font-size: 0;
@ -121,11 +121,18 @@ background: rgba(11, 137, 142, .1);
}
.top-fixed-box {
background: #FFF;
width: 697rpx;
margin: 0 auto;
border-radius: 20rpx;
margin-top: 20rpx;
}
.activity-list {
padding: 0 24rpx;
background: #0B898E;
width: 697rpx;
/* padding: 0 24rpx; */
/* background: #0B898E; */
background: #FFFFFF;
min-height:1300rpx;
margin: 0 auto;
}
.acitivity-search-box {
display: flex;
@ -133,6 +140,7 @@ background: rgba(11, 137, 142, .1);
margin-bottom: 0;
justify-content: space-between;
align-items: center;
padding-top: 30rpx;
}
.acitivity-search-box .picker {
margin-right: 30rpx;
@ -188,13 +196,14 @@ background: rgba(11, 137, 142, .1);
display: flex;
align-items: center;
justify-content: space-between;
padding: 27rpx 22rpx;
padding: 10rpx 22rpx;
/* padding: 27rpx 22rpx; */
position: relative;
}
.end-mask {
position: absolute;
right: 22rpx;
top: 27rpx;
/* top: 27rpx; */
text-align: center;
width: 320rpx;
height: 220rpx;
@ -228,17 +237,20 @@ background: rgba(11, 137, 142, .1);
display: flex;
flex-direction: column;
justify-content: space-between;
font-size: 23rpx;
color: #999;
/* font-size: 23rpx;
color: #999; */
flex: 1;
min-height: 220rpx;
margin-right: 28rpx;
/* margin-right: 28rpx; */
font-size: 24rpx;
color: #666;
}
.activity-title {
font-weight: 500;
font-size: 31rpx;
line-height: 45rpx;
color: #333;
color: #000;
/* color: #333; */
}
.movie-types {
@ -319,3 +331,37 @@ flex-shrink: 0;
border-radius: 40rpx;
margin-left: 10rpx;
}
.types-box {
/* margin-top: 31rpx; */
font-size: 28rpx;
color: #000;
font-weight: 500;
display: flex;
overflow-x: scroll;
padding: 31rpx 30rpx 30rpx;
}
.types-item {
border: 1px solid #999999;
border-radius: 27rpx;
height: 53rpx;
padding: 0 25rpx;
display: inline-block;
line-height: 53rpx;
margin-right: 13rpx;
flex-shrink: 0;
}
.types-item-active {
padding: 0 25rpx;
height: 57rpx;
line-height: 57rpx;
display: inline-block;
background: #0B898E;
color: #FFFFFF;
border-radius: 27rpx;
margin-right: 13rpx;
flex-shrink: 0;
}
/* 不显示滚动条 */
.types-box::-webkit-scrollbar {
display: none;
}

19
pages/pbService/activity/index.js

@ -10,10 +10,12 @@ Page({
list:[],
page:1,
total:1,
navList: [{title: '精彩2023', year: 2023}, {title: '往期回顾', year: 2022}],
navList: [{title: '精彩2024', year: 2024}, {title: '往期回顾', year: 2023}],
navIndex: 0,
sNavIndex:0,
sNavList:[{title: '回顾2022', year: 2022}, {title: '回顾2021', year: 2021}]
sNavList:[{title: '回顾2023', year: 2023},{title: '回顾2022', year: 2022}, {title: '回顾2021', year: 2021}],
last_page:0,
current_page:1
},
/**
@ -26,7 +28,8 @@ Page({
this.setData({
page:0,
list:[],
navIndex:e.currentTarget.dataset.index
navIndex:e.currentTarget.dataset.index,
last_page:0
})
this.getList()
},
@ -34,12 +37,14 @@ Page({
this.setData({
page:0,
list:[],
sNavIndex:e.currentTarget.dataset.index
sNavIndex:e.currentTarget.dataset.index,
last_page:0
})
this.getList()
},
getList:function(){
if(this.data.list.length>=this.data.total) return;
// if(this.data.list.length>=this.data.total) return;
if(this.data.current_page == this.data.last_page) return;
https._post("review/getList",{
limit:10,
page:this.data.page,
@ -48,7 +53,9 @@ Page({
this.setData({
total:res.data.total,
list:this.data.list.concat(res.data.data),
page:this.data.page+1
page:this.data.page+1,
last_page:res.data.last_page,
current_page: res.data.current_page
})
})
},

3
pages/pbService/activity/index.wxml

@ -19,3 +19,6 @@
</view>
</view>
</view>
<view style="margin: 0 auto;width: 200rpx;">
没有更多了
</view>

2
pages/pbService/activity/index.wxss

@ -73,7 +73,7 @@ page {
display: flex;
align-items: center;
justify-content: space-between;
padding: 0 122rpx;
padding: 0 42rpx;
margin-top: 45rpx;
}
.s_item{

26
pages/pbService/index.wxml

@ -9,10 +9,10 @@
<image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb1.png" mode="widthFix"></image>
<view>苏康码</view>
</view> -->
<view class="pb-item" data-event="security_public_click" data-title="安全服务" bindtap="gotoPath"
data-path="/pages/pbService/security/index">
<image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb2.png" mode="widthFix"></image>
<view>安全服务</view>
<view class="pb-item" data-event="comfort_click" data-title="景区舒适度" bindtap="gotoPath"
data-path="/pages/pbService/sceneComfort/index">
<image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
<view>景区舒适度</view>
</view>
<view class="pb-item" bindtap="gotoUrl" data-event="xlqc"
data-url="https://weixin.2500sz.net/zt/2023/07/luggage_storage/">
@ -24,10 +24,10 @@
<image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb3.png" mode="widthFix"></image>
<view>找厕所</view>
</view>
<view class="pb-item" data-event="comfort_click" data-title="景区舒适度" bindtap="gotoPath"
data-path="/pages/pbService/sceneComfort/index">
<image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
<view>景区舒适度</view>
<view class="pb-item" data-event="security_public_click" data-title="安全服务" bindtap="gotoPath"
data-path="/pages/pbService/security/index">
<image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb2.png" mode="widthFix"></image>
<view>安全服务</view>
</view>
<!-- <view class="pb-item" data-event="stadium_click" data-title="体育场馆" bindtap="gotoPath"
data-path="/pages/pbService/gym/index">
@ -38,11 +38,6 @@
<image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb16.png" mode="widthFix"></image>
<view>垃圾分类</view>
</view>
<view bindtap="gotoPath" data-event="security_home_click" data-title="12348" data-path="/pages/index/index"
class="pb-item">
<image src="https://static.ticket.sz-trip.com/xcxImages/index/pb4New.png" mode="widthFix"></image>
<view>12348</view>
</view>
<!-- <view class="pb-item" data-title="文化配送" bindtap="gotoPath" data-path="/pages/culture/index">
<image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb20.png" mode="widthFix"></image>
<view>文化配送</view>
@ -51,6 +46,11 @@
<image src="https://static.ticket.sz-trip.com/uploads/20231031/858e6ced1edaf072aa7879ee6ff5204f.png" mode="widthFix"></image>
<view>附近图书馆</view>
</view>
<view bindtap="gotoPath" data-event="security_home_click" data-title="12348" data-path="/pages/index/index"
class="pb-item">
<image src="https://static.ticket.sz-trip.com/xcxImages/index/pb4New.png" mode="widthFix"></image>
<view>12348</view>
</view>
</view>
</view>
<image class="title-img" src="https://static.ticket.sz-trip.com/uploads/20211115/335a42385c9e15ece075980209b0643a.png"

3
pages/user/service/list/index.wxml

@ -22,7 +22,8 @@
<!-- 成功 -->
<view class="modal-dialog" wx:if="{{showModal && ses}}">
<view class="modal-title"><view class="modal-info">即将跳转人工在线客服
<view>客服服务时间:08:30-17:30</view>
<view>客服服务时间:8:30-11:30,</view>
<view>13:00-17:30</view>
如遇紧急情况可拨打 <view class="green" bindtap="phoneCall"> 0512-66555111 </view></view></view>
<view class="modal-footer">
<view

3
pages/user/user.wxml

@ -126,7 +126,8 @@
<view class="model-content">
<view>即将跳转人工客服</view>
<view style="margin-top: 40rpx;">客服服务时间:08:30-17:30</view>
<view style="margin-top: 40rpx;">客服服务时间:08:30-17:30,</view>
<view style="margin-top: 30rpx;margin-left: 110rpx;">13:00-17:30</view>
</view>
<view class="btn-list">
<button class="model-btn" bindtap="closeModel">

Loading…
Cancel
Save