Skip to content

严立 / mini-shimao

Go to a project
Commit d79ef437 by 严立
Options

Merge branch 'master' of http://120.77.182.185/yanl/mini-shimao

parents 330c65f6 9d452e3a
Expand all
Inline Side-by-side
Showing with 947 additions and 289 deletions
app.json
...@@ -59,6 +59,7 @@ ...@@ -59,6 +59,7 @@
"usingComponents": { "usingComponents": {
"navigation": "./component/navigation/navigation", "navigation": "./component/navigation/navigation",
"swiper-point": "./component/swiper-point/swiper-point", "swiper-point": "./component/swiper-point/swiper-point",
"strategy-item": "./component/strategy-item/strategy-item",
"l-avatar": "./miniprogram_npm/lin-ui/avatar/index", "l-avatar": "./miniprogram_npm/lin-ui/avatar/index",
"l-button": "./miniprogram_npm/lin-ui/button/index", "l-button": "./miniprogram_npm/lin-ui/button/index",
"l-capsule-bar": "./miniprogram_npm/lin-ui/capsule-bar/index", "l-capsule-bar": "./miniprogram_npm/lin-ui/capsule-bar/index",
......
component/strategy-item/strategy-item.js
...@@ -12,7 +12,6 @@ Component({ ...@@ -12,7 +12,6 @@ Component({
data: { data: {
}, },
lifetimes: { lifetimes: {
attached: function () { attached: function () {
// console.log(this.data.data) // console.log(this.data.data)
......
component/strategy-item/strategy-item.wxml
...@@ -2,6 +2,11 @@ ...@@ -2,6 +2,11 @@
<view class="component-strategy-item"> <view class="component-strategy-item">
<image wx:if="{{data.index === 1}}" class="short" src="{{data.image}}" mode="aspectFill"></image> <image wx:if="{{data.index === 1}}" class="short" src="{{data.image}}" mode="aspectFill"></image>
<image wx:else src="{{data.image}}" mode="widthFix"></image> <image wx:else src="{{data.image}}" mode="widthFix"></image>
<view class="component-strategy-item-tags row align-c">
<block wx:for="{{data.tags}}" wx:key="index">
<text>{{'# ' + item}}</text>
</block>
</view>
<text class="component-strategy-item-title">{{data.title}}</text> <text class="component-strategy-item-title">{{data.title}}</text>
<text class="component-strategy-item-content">{{data.date}}</text> <text class="component-strategy-item-content">{{data.date}}</text>
</view> </view>
\ No newline at end of file
component/strategy-item/strategy-item.wxss
...@@ -16,13 +16,28 @@ ...@@ -16,13 +16,28 @@
height: 354rpx; height: 354rpx;
} }
.component-strategy-item-tags {
margin: 24rpx 24rpx 0;
height: 44rpx;
flex-wrap: wrap;
overflow: hidden;
}
.component-strategy-item-tags text{
margin-right: 16rpx;
padding: 4rpx 12rpx;
color: #fff;
font-size: 18rpx;
line-height: 32rpx;
background-color: #15191F;
border-radius: 4rpx;
}
.component-strategy-item-title { .component-strategy-item-title {
display: -webkit-box; display: -webkit-box;
margin: 24rpx 20rpx; margin: 24rpx 24rpx 0;
font-size: 26rpx; font-size: 26rpx;
font-weight: bolder; font-weight: bolder;
color: #000000; color: #000000;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
line-clamp: 2; line-clamp: 2;
...@@ -31,7 +46,7 @@ ...@@ -31,7 +46,7 @@
} }
.component-strategy-item-content { .component-strategy-item-content {
margin: 0 24rpx 24rpx 24rpx; margin: 12rpx 24rpx 24rpx 24rpx;
font-size: 22rpx; font-size: 22rpx;
color: #959DA9; color: #959DA9;
} }
\ No newline at end of file
image/wechat.png
image/wechat.png

3.17 KB | W: | H:

image/wechat.png

1.48 KB | W: | H:

image/wechat.png
image/wechat.png
image/wechat.png
image/wechat.png
  • 2-up
  • Swipe
  • Onion skin
pages/home/history/history.js
let App = getApp() let App = getApp()
let logicData = {
pageScrollLock: false,
pageScrollTimer: 0,
}
Page({ Page({
data: { data: {
// 导航栏相关属性
navigationStyle: {
normal: {
backIcon: '/image/back.png',
color: '#000000',
background: 'rgba(255, 255, 255, 0)'
},
change: {
backIcon: '/image/back.png',
color: '#000000',
background: 'rgba(255, 255, 255, 1)'
},
scroll: '100rpx',
},
navigationScroll: 0,
sideBarTopMargin: 0,
history: {} history: {}
}, },
onLoad: function (options) { onLoad: function (options) {
let { index } = options let { index } = options
this.setSideBarStyle()
this.getBrands(index) this.getBrands(index)
}, },
onPageScroll: function (funcEvent) {
// console.log(funcEvent)
// 优化滚动事件触发频率
if (logicData.pageScrollLock) return
logicData.pageScrollLock = true
this.setData({
navigationScroll: funcEvent.scrollTop
})
// 恢复滚动事件
logicData.pageScrollTimer = setTimeout(function () {
logicData.pageScrollLock = false
clearTimeout(logicData.pageScrollTimer)
}, 10)
},
// 获取导航栏高度
setSideBarStyle: function () {
this.setData({
sideBarTopMargin: wx.getStorageSync('navigationStatusHeight') + wx.getStorageSync('navigationCapsuleHeight') + 16
})
},
getBrands: function (index) { getBrands: function (index) {
App.wxRequest({ App.wxRequest({
url: '/api/v1/common/getBrands', url: '/api/v1/common/getBrands',
......
pages/home/history/history.wxml
<navigation class="navigation" titleText="{{history.name}}" backIcon="/image/back.png"></navigation> <navigation class="navigation" titleText="{{history.name}}" backIcon="/image/back.png" scrollStyle="{{navigationStyle}}" scrollHeight="{{navigationScroll}}"></navigation>
<view class="container"> <view class="container" style="{{'margin-top: ' + sideBarTopMargin + 'px;'}}">
<block wx:for="{{history.content}}" wx:key="index"> <block wx:for="{{history.content}}" wx:key="index">
<image mode="widthFix" src="{{item}}"></image> <image mode="widthFix" src="{{item}}"></image>
</block> </block>
......
pages/home/history/history.wxss
.container {
margin-top: 208rpx;
}
image { image {
width: 750rpx; width: 750rpx;
} }
\ No newline at end of file
pages/home/home/home.js
...@@ -78,9 +78,14 @@ Page({ ...@@ -78,9 +78,14 @@ Page({
}, },
setLogin: function () { setLogin: function () {
let funcUserInfo = wx.getStorageSync('userInfo') let funcUserInfo = wx.getStorageSync('userInfo')
if (funcUserInfo.phone && funcUserInfo.name && funcUserInfo.avatar) { // if (funcUserInfo.phone && funcUserInfo.name && funcUserInfo.avatar) {
// this.setData({
// isLogin: true,
// })
// }
if (funcUserInfo.isSignIn) {
this.setData({ this.setData({
isLogin: true, isLogin: true
}) })
} }
}, },
......
pages/home/home/image/into.png
pages/home/home/image/into.png

35.7 KB | W: | H:

pages/home/home/image/into.png

141 KB | W: | H:

pages/home/home/image/into.png
pages/home/home/image/into.png
pages/home/home/image/into.png
pages/home/home/image/into.png
  • 2-up
  • Swipe
  • Onion skin
pages/mine/accumulate/accumulate.js
...@@ -2,32 +2,58 @@ let App = getApp() ...@@ -2,32 +2,58 @@ let App = getApp()
Page({ Page({
data: { data: {
imageResourcesBase: App.globalData.appResourcesBase,
showMenu: false, showMenu: false,
menu: '全 部', menu: '全 部',
menuList: [ menuList: [{
{id: 0, name: '全 部'}, id: '',
{id: 1, name: '获 取'}, name: '全 部'
{id: 2, name: '已使用'} },
{
id: 0,
name: '获 取'
},
{
id: 1,
name: '已使用'
}
], ],
pageNo: '1', pageNo: '1',
pageSize: '-1', pageSize: '-1',
type: '', // "" 全部 0 获取 1消费(0 发放 1 兑换) type: '', // "" 全部 0 获取 1消费(0 发放 1 兑换)
accumulateList: [], accumulateList: [],
selectedList: [] selectedList: [],
integral: '0',
type: ''
}, },
onLoad: function (options) { onLoad: function (options) {
this.getAccumulate() let integral = options.integral
this.setData({
integral: integral
})
App.login({
timeout: 0,
success: (result) => {
this.getAccumulate()
},
})
}, },
// 获取积分列表 // 获取积分列表
getAccumulate: function () { getAccumulate: function () {
wx.showLoading({
title: '加载中',
})
App.wxRequest({ App.wxRequest({
url: '/api/v1/smUser/getIntegralDetails', url: '/api/v1/smUser/getIntegralDetails',
data: { data: {
'pageNo': this.data.pageNo, 'pageNo': this.data.pageNo,
'pageSize': this.data.pageSize, 'pageSize': this.data.pageSize,
type: '' type: this.data.type
}, },
success: (response) => { success: (response) => {
wx.hideLoading({
success: (res) => {},
})
let accumulateList = response.data let accumulateList = response.data
let selectedList = accumulateList let selectedList = accumulateList
this.setData({ this.setData({
...@@ -57,18 +83,23 @@ Page({ ...@@ -57,18 +83,23 @@ Page({
* @returns * @returns
*/ */
onTabMenu: function (event) { onTabMenu: function (event) {
let { index } = event.currentTarget.dataset let {
index,
type
} = event.currentTarget.dataset
let menu = this.data.menuList[index].name let menu = this.data.menuList[index].name
let selectedList = [] let selectedList = []
if (index === 0) { if (index === 0) {
selectedList = this.data.accumulateList selectedList = this.data.accumulateList
} else { } else {
selectedList = selectedList.filter(v => v.type === index-1) selectedList = selectedList.filter(v => v.type === index - 1)
} }
this.setData({ this.setData({
menu, menu,
selectedList selectedList,
type: type
}) })
this.onHideMenu() this.onHideMenu()
this.getAccumulate()
} }
}) })
\ No newline at end of file
pages/mine/accumulate/accumulate.wxml
...@@ -2,22 +2,24 @@ ...@@ -2,22 +2,24 @@
<view class="container con-s" bindtap="onHideMenu"> <view class="container con-s" bindtap="onHideMenu">
<!-- 积分背景图 --> <!-- 积分背景图 -->
<image class="banner" src=""></image> <image class="banner" src="{{imageResourcesBase + 'mine/home/integral-bg.png'}}"></image>
<view class="opacity-cover"></view>
<view class="my-accumulate"> <view class="my-accumulate">
<text>1888</text> <text>{{integral}}</text>
</view> </view>
<view class="accumulate-tips"> <view class="accumulate-tips">
<text>积分用于兑换积分商品，积分商城即将上线，敬请期待</text> <text>积分用于兑换积分商品，积分商城即将上线，敬请期待</text>
</view> </view>
<view class="banner-menu row con-b align-c" catchtap="onShowMenu"> <view class="banner-menu row con-b align-c" catchtap="onShowMenu">
<text>{{menu}}</text> <text>{{menu}}</text>
<image src="/image/icon/arrow-b-2.png"></image> <image src="/image/icon/arrow-b-2.png"></image>
<view class="banner-menu-down col" wx:if="{{showMenu}}"> <view class="banner-menu-down col" wx:if="{{showMenu}}">
<block wx:for="{{menuList}}" wx:key="id"> <block wx:for="{{menuList}}" wx:key="id">
<text class="{{menu === item.name ? 'selected' : ''}}" catchtap="onTabMenu" data-index="{{index}}">{{item.name}}</text> <text class="{{menu === item.name ? 'selected' : ''}}" data-type="{{item.id}}" catchtap="onTabMenu"
data-index="{{index}}">{{item.name}}</text>
</block> </block>
</view> </view>
</view> </view>
......
pages/mine/accumulate/accumulate.wxss
...@@ -9,6 +9,15 @@ page { ...@@ -9,6 +9,15 @@ page {
.banner { .banner {
position: fixed; position: fixed;
z-index: -2;
top: 0;
left: 0;
width: 750rpx;
height: 480rpx;
}
.opacity-cover {
position: fixed;
z-index: -1; z-index: -1;
top: 0; top: 0;
left: 0; left: 0;
...@@ -54,11 +63,11 @@ page { ...@@ -54,11 +63,11 @@ page {
width: 166rpx; width: 166rpx;
height: 180rpx; height: 180rpx;
background: rgba(255, 255, 255, 0.95); background: rgba(255, 255, 255, 0.95);
box-shadow: 10px 4px 40px 0px rgba(181,164,164,0.3); box-shadow: 10px 4px 40px 0px rgba(181, 164, 164, 0.3);
border-radius: 4rpx; border-radius: 4rpx;
} }
.banner-menu-down text{ .banner-menu-down text {
flex: 1; flex: 1;
padding-left: 24rpx; padding-left: 24rpx;
color: #959CA8; color: #959CA8;
...@@ -123,9 +132,11 @@ page { ...@@ -123,9 +132,11 @@ page {
font-size: 30rpx; font-size: 30rpx;
color: #E66060; color: #E66060;
} }
.accumulate-right text { .accumulate-right text {
margin-left: 6rpx; margin-left: 6rpx;
} }
.accumulate-type-color { .accumulate-type-color {
color: #959DA9; color: #959DA9;
} }
\ No newline at end of file
pages/mine/home/home.js
...@@ -8,6 +8,7 @@ Page({ ...@@ -8,6 +8,7 @@ Page({
data: { data: {
isCheckPermission: false, isCheckPermission: false,
imageBase: App.globalData.appImageBase, imageBase: App.globalData.appImageBase,
imageResourcesBase: App.globalData.appResourcesBase,
orderType: 1, // 1 - 年卡/月卡，2 - 次票， 3 - SPA， 4 - 文创， 5 - 餐品， 6 - 活动， 7 - 观影 orderType: 1, // 1 - 年卡/月卡，2 - 次票， 3 - SPA， 4 - 文创， 5 - 餐品， 6 - 活动， 7 - 观影
...@@ -79,7 +80,8 @@ Page({ ...@@ -79,7 +80,8 @@ Page({
title: '日落观光游船体验活动之船行碧波共赏美景', title: '日落观光游船体验活动之船行碧波共赏美景',
num: 3 num: 3
}], }],
orderListBackup: [] orderListBackup: [],
integral: 0, //积分
}, },
close() { close() {
...@@ -90,14 +92,7 @@ Page({ ...@@ -90,14 +92,7 @@ Page({
animation: true, animation: true,
}) })
}, },
maskShow() {
this.setData({
mask: true
});
wx.hideTabBar({
animation: true,
})
},
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
...@@ -108,6 +103,13 @@ Page({ ...@@ -108,6 +103,13 @@ Page({
onShow: function () { onShow: function () {
this.setUserInfo() this.setUserInfo()
}, },
// 查看积分明细
goIntegralDetail(event) {
let integral = event.currentTarget.dataset.integral
wx.navigateTo({
url: '/pages/mine/accumulate/accumulate?integral=' + integral,
})
},
// 去核销 // 去核销
goCouponInput(event) { goCouponInput(event) {
wx.navigateTo({ wx.navigateTo({
...@@ -115,7 +117,7 @@ Page({ ...@@ -115,7 +117,7 @@ Page({
}) })
}, },
// 获取核销权限 // 获取核销权限
// api/v1/login/getPermissions权限更上去了
getPermissions() { getPermissions() {
let that = this let that = this
App.wxRequest({ App.wxRequest({
...@@ -143,6 +145,23 @@ Page({ ...@@ -143,6 +145,23 @@ Page({
} }
}) })
}, },
// 获取积分
getIntegral() {
let that = this
App.wxRequest({
url: '/api/v1/smUser/getIntegral', //api/v1/smUser/getIntegral
data: {},
success: function (res) {
let integral = res.data ? res.data.integral : '0'
that.setData({
integral: integral
})
}
})
},
//获取待使用订单 //获取待使用订单
getWillUseOrders() { getWillUseOrders() {
let that = this let that = this
...@@ -227,10 +246,16 @@ Page({ ...@@ -227,10 +246,16 @@ Page({
isRegister: true, isRegister: true,
userInfo: funcUserInfo userInfo: funcUserInfo
}) })
this.getMyActivityList() App.login({
this.getCardList() timeout: 0,
this.getWillUseOrders() success: (result) => {
this.getPermissions() this.getMyActivityList()
this.getCardList()
this.getWillUseOrders()
this.getPermissions()
this.getIntegral()
},
})
} else { } else {
this.setData({ this.setData({
isRegister: false, isRegister: false,
......
pages/mine/home/home.wxss
...@@ -23,6 +23,26 @@ ...@@ -23,6 +23,26 @@
padding: 220rpx 0 0 48rpx; padding: 220rpx 0 0 48rpx;
} }
.user-type {
width: 126rpx;
height: 40rpx;
font-weight: 500;
font-size: 22rpx;
color: #fff;
background-color: #6783AE;
text-align: center;
line-height: 40rpx;
border-radius: 4rpx;
letter-spacing: 10rpx;
margin-top: 20rpx;
}
.owner-tag {
height: 80rpx;
width: 142rpx;
/* margin-top: 8rpx!important; */
}
.mine-avatar { .mine-avatar {
z-index: 11; z-index: 11;
margin-right: 32rpx; margin-right: 32rpx;
...@@ -40,6 +60,43 @@ ...@@ -40,6 +60,43 @@
font-size: 42rpx; font-size: 42rpx;
font-weight: bolder; font-weight: bolder;
} }
.padding-l-18{
padding-left: 18rpx;
}
/* 积分 */
.integral {
color: #0D0D0E;
text-align: right;
}
.glod {
color: #F0DABB;
}
.integral-num {
font-size: 54rpx;
line-height: 76rpx;
padding-right: 80rpx;
}
.integral-title {
display: flex;
height: 80rpx;
align-items: center;
font-size: 26rpx;
line-height: 36rpx;
flex-direction: row;
justify-content: flex-end;
padding-right: 40rpx;
}
.arrow-r {
width: 32rpx;
height: 32rpx;
margin-left: 8rpx;
}
.mine-info view:nth-child(1) image { .mine-info view:nth-child(1) image {
z-index: 11; z-index: 11;
...@@ -64,7 +121,7 @@ ...@@ -64,7 +121,7 @@
padding: 41rpx 32rpx; padding: 41rpx 32rpx;
background-color: #fff; background-color: #fff;
border-radius: 4rpx; border-radius: 4rpx;
margin-top:48rpx; margin-top: 48rpx;
} }
.cpopon-info { .cpopon-info {
...@@ -557,8 +614,6 @@ ...@@ -557,8 +614,6 @@
border-radius: 4rpx; border-radius: 4rpx;
} }
.appointment-activity-content {}
.appointment-activity-img { .appointment-activity-img {
width: 140rpx; width: 140rpx;
height: 136rpx; height: 136rpx;
...@@ -642,4 +697,17 @@ ...@@ -642,4 +697,17 @@
image { image {
width: 100%; width: 100%;
height: 100%; height: 100%;
}
.logo-box {
width: 100rpx;
height: 80rpx;
line-height: 80rpx;
text-align: center;
margin-right: 20rpx;
}
.logo-box image {
max-width: 100%!important;
max-height: 100%!important;
} }
\ No newline at end of file
pages/mine/order/order.wxss
...@@ -344,10 +344,10 @@ page { ...@@ -344,10 +344,10 @@ page {
height: 80rpx; height: 80rpx;
line-height: 80rpx; line-height: 80rpx;
text-align: center; text-align: center;
margin-right: 20rpx;
} }
.logo-box image { .logo-box image {
max-width: 100%!important; max-width: 100%!important;
max-height: 100%!important; max-height: 100%!important;
} }
\ No newline at end of file
pages/pay/order-detail/order-detail.wxss
...@@ -828,6 +828,7 @@ image { ...@@ -828,6 +828,7 @@ image {
height: 80rpx; height: 80rpx;
line-height: 80rpx; line-height: 80rpx;
text-align: center; text-align: center;
margin-right: 20rpx;
} }
.logo-box image { .logo-box image {
......
pages/play/movie-detail/movie-detail.js
let App = getApp() let App = getApp()
let logicData = {
pageScrollLock: false,
pageScrollTimer: 0,
}
Page({ Page({
data: { data: {
bannerIndex: 0, bannerIndex: 0,
...@@ -9,50 +14,42 @@ Page({ ...@@ -9,50 +14,42 @@ Page({
statusList: [], statusList: [],
movieInfo: {}, movieInfo: {},
showList: {}, showList: {},
// 导航栏相关属性
navigationStyle: {
normal: {
backIcon: '/image/back-w.png',
color: '#FFFFFF',
background: 'rgba(255, 255, 255, 0)'
},
change: {
backIcon: '/image/back-w.png',
color: '#ffffff',
background: 'rgba(28, 28, 37, 1)'
},
scroll: '200rpx',
},
navigationScroll: 0,
}, },
onLoad: function (options) { onLoad: function (options) {
let activityId = options.id let activityId = options.id
App.wxRequest({ this.queryDetail(activityId)
url: '/api/v1/film/getFilmDetail',
data: {
'activityId': activityId,
},
success: (response) => {
let movieInfo = response.data
movieInfo.tags = movieInfo.tags.split(' ')
// for (let key in movieInfo.allTimes) {
// console.log(key)
// }
let showList = {}
showList[0] = movieInfo.today
showList[1] = movieInfo.tomorrow
this.setData({
movieInfo,
showList
})
}
})
this.getNowTime()
}, },
// 获取标签日期 onPageScroll: function (funcEvent) {
getNowTime: function () { // console.log(funcEvent)
let now = new Date() // 优化滚动事件触发频率
let month = now.getMonth() + 1 if (logicData.pageScrollLock) return
let day = now.getDate() logicData.pageScrollLock = true
if (month < 10) {
month = '0' + month
}
if (day < 10) {
day = '0' + day
}
console.log(month, day)
console.log(App.modular.miment().format('YYYY-MM-DD'))
this.setData({ this.setData({
statusList: [ navigationScroll: funcEvent.scrollTop
{ 'id': 0, 'name': `今日${month}月${day}日`},
{ 'id': 1, 'name': `明日${month}月${day+1}日`},
],
}) })
// 恢复滚动事件
logicData.pageScrollTimer = setTimeout(function () {
logicData.pageScrollLock = false
clearTimeout(logicData.pageScrollTimer)
}, 10)
}, },
// 选择标签页日期 // 选择标签页日期
onSelectionStatus: function (event) { onSelectionStatus: function (event) {
...@@ -72,7 +69,70 @@ Page({ ...@@ -72,7 +69,70 @@ Page({
bannerIndex: funcEvent.detail.current bannerIndex: funcEvent.detail.current
}) })
}, },
// 获取电影详情场次
queryDetail: function (activityId) {
App.wxRequest({
url: '/api/v1/film/getFilmDetail',
data: {
'activityId': activityId,
},
success: (response) => {
let movieInfo = response.data
console.log(movieInfo)
let showList = {}
let statusList = []
let day = 2
let index = 0
let timeList = []
// 添加电影日期场次
for (let key in movieInfo.allTimes) {
timeList.push(App.modular.miment(key).stamp())
}
timeList = timeList.sort((a, b) => a-b )
timeList = timeList.map(v => App.modular.miment(v).format('YYYY-MM-DD'))
// console.log(timeList)
timeList.forEach(key => {
let tempItem = {}
if (key === App.modular.miment().format('YYYY-MM-DD')) {
tempItem = {
id: 0,
name: '今日' + App.modular.miment().format('MM月DD日')
}
statusList.push(tempItem)
showList[index] = movieInfo.allTimes[key]
index++
} else if (key === App.modular.miment().add(1, 'DD').format('YYYY-MM-DD')) {
tempItem = {
id: 1,
name: '明日' + App.modular.miment().add(1, 'DD').format('MM月DD日')
}
statusList.push(tempItem)
showList[index] = movieInfo.allTimes[key]
index++
} else if (key === App.modular.miment().add(day, 'DD').format('YYYY-MM-DD')) {
tempItem = {
id: day,
name: App.modular.miment().add(day, 'DD').format('MM月DD日')
}
statusList.push(tempItem)
showList[index] = movieInfo.allTimes[key]
index++
day++
}
})
// console.log(showList)
movieInfo.tags = movieInfo.tags.replace(/( )?热映影片( )?/, ' ').split(' ')
movieInfo.free = movieInfo.ownerPrice == '0' && movieInfo.visitorPrice == '0' ? '免费' : `￥${movieInfo.ownerPrice.toFixed(2)}`
this.setData({
movieInfo,
showList,
statusList
})
}
})
},
// 跳转到报名页面 // 跳转到报名页面
onReportMovie: function (event) { onReportMovie: function (event) {
let id = event.currentTarget.dataset.movieid let id = event.currentTarget.dataset.movieid
......
pages/play/movie-detail/movie-detail.wxml
<navigation class="navigation" titleText="{{movieInfo.filmName}}" color="#ffffff" backIcon="/image/back-w.png"></navigation> <navigation class="navigation" titleText="{{movieInfo.filmName}}" color="#ffffff" backIcon="/image/back-w.png" scrollStyle="{{navigationStyle}}" scrollHeight="{{navigationScroll}}"></navigation>
<view class="container"> <view class="container">
<!-- 顶部轮播图 --> <!-- 顶部轮播图 -->
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
<text>{{item.endTime + '散场'}}</text> <text>{{item.endTime + '散场'}}</text>
</view> </view>
<view class="show-free"> <view class="show-free">
<text>{{item.ownerPrice === 0 ? '免费' : item.ownerPrice}}</text> <text>{{movieInfo.free}}</text>
</view> </view>
<view class="show-btn" bindtap="onReportMovie" data-movieId="{{item.filmId}}"> <view class="show-btn" bindtap="onReportMovie" data-movieId="{{item.filmId}}">
<text>报名观影</text> <text>报名观影</text>
...@@ -90,4 +90,5 @@ ...@@ -90,4 +90,5 @@
</view> </view>
</block> </block>
</view> </view>
<view class="blank"></view>
</view> </view>
\ No newline at end of file
pages/play/movie-detail/movie-detail.wxss
...@@ -114,16 +114,25 @@ page { ...@@ -114,16 +114,25 @@ page {
width: 750rpx; width: 750rpx;
height: 76rpx; height: 76rpx;
margin-top: 48rpx; margin-top: 48rpx;
padding: 0 8rpx; padding: 0 40rpx;
border-bottom: 1px #3A3A40 solid; border-bottom: 1px #3A3A40 solid;
overflow: scroll;
flex-wrap: nowrap;
} }
.status-item { .status-item {
width: 220rpx;
height: 76rpx; height: 76rpx;
font-size: 26rpx; margin-right: 64rpx;
font-size: 30rpx;
font-weight: 400; font-weight: 400;
color: #959DA9; color: #959DA9;
} }
.status-item text {
display: inline-block;
white-space: nowrap;
}
.status-item:last-child {
padding-right: 40rpx;
}
.status-item-active { .status-item-active {
height: 76rpx; height: 76rpx;
color: #fff; color: #fff;
...@@ -131,6 +140,12 @@ page { ...@@ -131,6 +140,12 @@ page {
border-bottom: 4rpx #fff solid; border-bottom: 4rpx #fff solid;
} }
.status::-webkit-scrollbar {
width: 0;
height: 0;
color: transparent;
}
.show-wrapper { .show-wrapper {
width: 710rpx; width: 710rpx;
height: 160rpx; height: 160rpx;
...@@ -150,7 +165,6 @@ page { ...@@ -150,7 +165,6 @@ page {
font-size: 26rpx; font-size: 26rpx;
} }
.show-free { .show-free {
width: 60rpx;
margin-left: 130rpx; margin-left: 130rpx;
color: #fff; color: #fff;
font-size: 26; font-size: 26;
...@@ -174,7 +188,6 @@ page { ...@@ -174,7 +188,6 @@ page {
.show-end image { .show-end image {
width: 112rpx; width: 112rpx;
height: 112rpx; height: 112rpx;
background-color: #ccc;
} }
.show-end text{ .show-end text{
margin-top: 10rpx; margin-top: 10rpx;
...@@ -185,4 +198,9 @@ page { ...@@ -185,4 +198,9 @@ page {
image { image {
width: 100%; width: 100%;
height: 100%; height: 100%;
}
.blank {
width: 100%;
height: 168rpx;
} }
\ No newline at end of file
pages/play/movie/movie.js
let App = getApp() let App = getApp()
let logicData = {
pageScrollLock: false,
pageScrollTimer: 0,
}
Page({ Page({
data: { data: {
// 请求参数 // 请求参数
...@@ -8,6 +13,22 @@ Page({ ...@@ -8,6 +13,22 @@ Page({
pageSize: '-1' pageSize: '-1'
}, },
// 导航栏相关属性
navigationStyle: {
normal: {
backIcon: '/image/back-w.png',
color: '#FFFFFF',
background: 'rgba(255, 255, 255, 0)'
},
change: {
backIcon: '/image/back-w.png',
color: '#ffffff',
background: 'rgba(28, 28, 37, 1)'
},
scroll: '100rpx',
},
navigationScroll: 0,
statusActive: 0, statusActive: 0,
statusList: [ statusList: [
{ 'id': 0, 'name': '今日放映' }, { 'id': 0, 'name': '今日放映' },
...@@ -32,6 +53,22 @@ Page({ ...@@ -32,6 +53,22 @@ Page({
this.getTodayFilm() this.getTodayFilm()
this.getAllFilm() this.getAllFilm()
}, },
onPageScroll: function (funcEvent) {
// console.log(funcEvent)
// 优化滚动事件触发频率
if (logicData.pageScrollLock) return
logicData.pageScrollLock = true
this.setData({
navigationScroll: funcEvent.scrollTop
})
// 恢复滚动事件
logicData.pageScrollTimer = setTimeout(function () {
logicData.pageScrollLock = false
clearTimeout(logicData.pageScrollTimer)
}, 10)
},
/** /**
* 查询今日放映 * 查询今日放映
* @function * @function
...@@ -53,8 +90,8 @@ Page({ ...@@ -53,8 +90,8 @@ Page({
v.filmType = v.filmType.replace(/\//g, ' / ') v.filmType = v.filmType.replace(/\//g, ' / ')
v.filmDirector = v.filmDirector.replace(/\//g, ' ') v.filmDirector = v.filmDirector.replace(/\//g, ' ')
v.filmLead = v.filmLead.replace(/\//g, ' ') v.filmLead = v.filmLead.replace(/\//g, ' ')
v.free = v.ownerPrice === '0' ? '免费' : `￥${v.ownerPrice.toFixed(2)}` v.free = v.ownerPrice == '0' ? '免费' : `￥${v.ownerPrice.toFixed(2)}`
v.tags = v.tags.split(' ') v.tags = v.tags.replace(/( )?热映影片( )?/, ' ').split(' ')
}) })
this.setData({ this.setData({
movieToday movieToday
...@@ -87,8 +124,8 @@ Page({ ...@@ -87,8 +124,8 @@ Page({
v.filmType = v.filmType.replace(/\//g, ' / ') v.filmType = v.filmType.replace(/\//g, ' / ')
v.filmDirector = v.filmDirector.replace(/\//g, ' ') v.filmDirector = v.filmDirector.replace(/\//g, ' ')
v.filmLead = v.filmLead.replace(/\//g, ' ') v.filmLead = v.filmLead.replace(/\//g, ' ')
v.free = v.ownerPrice === 0 ? '免费' : `￥${v.ownerPrice.toFixed(2)}` v.free = v.ownerPrice == '0' ? '免费' : `￥${v.ownerPrice.toFixed(2)}`
v.tags = v.tags.split(' ') v.tags = v.tags.replace(/( )?热映影片( )?/, ' ').replace(/( )+$/, '').split(' ')
}) })
this.setData({ this.setData({
'movieAll.movieWeek': { 'movieAll.movieWeek': {
...@@ -112,8 +149,8 @@ Page({ ...@@ -112,8 +149,8 @@ Page({
v.filmType = v.filmType.replace(/\//g, ' / ') v.filmType = v.filmType.replace(/\//g, ' / ')
v.filmDirector = v.filmDirector.replace(/\//g, ' ') v.filmDirector = v.filmDirector.replace(/\//g, ' ')
v.filmLead = v.filmLead.replace(/\//g, ' ') v.filmLead = v.filmLead.replace(/\//g, ' ')
v.free = v.ownerPrice === 0 ? '免费' : `￥${v.ownerPrice.toFixed(2)}` v.free = v.ownerPrice == '0'? '免费' : `￥${v.ownerPrice.toFixed(2)}`
v.tags = v.tags.split(' ') v.tags = v.tags.replace(/( )?热映影片( )?/, ' ').split(' ')
}) })
this.setData({ this.setData({
'movieAll.movieNextWeek': { 'movieAll.movieNextWeek': {
......
pages/play/movie/movie.wxml
<navigation class="navigation" titleText="所有影片" color="#ffffff" backIcon="/image/back-w.png"></navigation> <navigation class="navigation" titleText="所有影片" color="#ffffff" backIcon="/image/back-w.png" scrollStyle="{{navigationStyle}}" scrollHeight="{{navigationScroll}}"></navigation>
<view class="contaniner con-s"> <view class="contaniner con-s">
<view class="status row align-c"> <view class="status row align-c">
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
</view> </view>
<view wx:if="{{statusActive === 0}}"> <view wx:if="{{statusActive === 0}}">
<block wx:for="{{movieToday}}" wx:key="id"> <block wx:for="{{movieToday}}" wx:key="id" wx:if="{{movieToday.length !== 0}}">
<view class="movie-wrapper row" bindtap="onToMovieDetail" data-movieId="{{item.activityId}}"> <view class="movie-wrapper row" bindtap="onToMovieDetail" data-movieId="{{item.activityId}}">
<view class="movie-time-wrapper row align-c"> <view class="movie-time-wrapper row align-c">
<view class="movie-time-start"> <view class="movie-time-start">
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</view> </view>
<view class="movie-tags row"> <view class="movie-tags row">
<block wx:for="{{item.tags}}" wx:for-item="tagsItem" wx:for-index="tagsIndex" wx:key="tagsIndex"> <block wx:for="{{item.tags}}" wx:for-item="tagsItem" wx:for-index="tagsIndex" wx:key="tagsIndex">
<text>{{tagsItem}}</text> <text wx:if="{{tagsItem}}">{{tagsItem}}</text>
</block> </block>
</view> </view>
</view> </view>
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
</view> </view>
</view> </view>
<view class="movie-label"> <view class="movie-label">
<text>{{item.keyword}}</text> <text wx:if="{{item.keyword}}">{{item.keyword}}</text>
</view> </view>
<view class="movie-free"> <view class="movie-free">
<text>{{item.free}}</text> <text>{{item.free}}</text>
...@@ -75,9 +75,16 @@ ...@@ -75,9 +75,16 @@
</view> </view>
</view> </view>
</block> </block>
<block wx:if="{{movieToday.length === 0}}">
<view class="show-end col align-c">
<image src="/image/no-movie.png"></image>
<text>观影已结束，请期待后续排片</text>
</view>
</block>
</view> </view>
<view wx:else> <view wx:else>
<block wx:for="{{movieAll}}" wx:for-index="key" wx:for-item="movieList" wx:key="key"> <block wx:for="{{movieAll}}" wx:for-index="key" wx:for-item="movieList" wx:key="key" wx:if="{{movieAll.moviewWeek.list.length > 0 || movieAll.movieNextWeek.list.length > 0}}">
<view class="movie-week row align-c con-c" wx:if="{{movieList.list.length > 0}}"> <view class="movie-week row align-c con-c" wx:if="{{movieList.list.length > 0}}">
<view class="line"></view> <view class="line"></view>
<view class="movie-week-title"> <view class="movie-week-title">
...@@ -137,6 +144,12 @@ ...@@ -137,6 +144,12 @@
</view> </view>
</block> </block>
</block> </block>
<block wx:if="{{movieAll.moviewWeek.list.length === 0 && movieAll.movieNextWeek.list.length === 0}}">
<view class="show-end col align-c">
<image src="/image/no-movie.png"></image>
<text>观影已结束，请期待后续排片</text>
</view>
</block>
</view> </view>
<view class="footer-img"> <view class="footer-img">
<image src="/image/movie-bottom.png"></image> <image src="/image/movie-bottom.png"></image>
......
pages/play/movie/movie.wxss
page { page {
background-color: #1C1C25; background-color: #1C1C25;
} }
.navigation {
z-index: 1900;
position: fixed;
top: 0;
left: 0;
width: 750rpx;
}
.navigation-bar-image {
z-index: 1100;
position: fixed;
top: 60rpx;
left: 50rpx;
width: 200rpx;
height: 60rpx;
}
.contaniner { .contaniner {
margin-top: 200rpx; margin-top: 200rpx;
} }
...@@ -207,6 +222,20 @@ page { ...@@ -207,6 +222,20 @@ page {
margin-top: 64rpx; margin-top: 64rpx;
} }
.show-end {
width: 750rpx;
margin-top: 400rpx;
}
.show-end image {
width: 112rpx;
height: 112rpx;
}
.show-end text{
margin-top: 10rpx;
font-size: 26rpx;
color: #959DA9;
}
image { image {
width: 100%; width: 100%;
height: 100%; height: 100%;
......
pages/play/service-detail/service-detail.js
...@@ -25,7 +25,7 @@ Page({ ...@@ -25,7 +25,7 @@ Page({
color: '#000000', color: '#000000',
background: 'rgba(255, 255, 255, 1)' background: 'rgba(255, 255, 255, 1)'
}, },
scroll: '600rpx', scroll: '200rpx',
}, },
navigationStyleBlack: { navigationStyleBlack: {
normal: { normal: {
...@@ -76,6 +76,9 @@ Page({ ...@@ -76,6 +76,9 @@ Page({
this.queryDetail(Number(options.id)) this.queryDetail(Number(options.id))
if (Number(options.id) === 2) { if (Number(options.id) === 2) {
this.queryDetailMovie() this.queryDetailMovie()
this.setData({
navigationStyle: this.data.navigationStyleBlack
})
} else { } else {
this.queryDetailCommodity() this.queryDetailCommodity()
} }
...@@ -89,11 +92,13 @@ Page({ ...@@ -89,11 +92,13 @@ Page({
* @returns * @returns
*/ */
queryDetail: function (funcAppId) { queryDetail: function (funcAppId) {
let that = this
let funcIndex = 0 let funcIndex = 0
// 预设数据 // 预设数据
let funcDetail = [ let funcDetail = [
{ {
appId: 1, appId: 1,
id: App.globalData.pointInfo[0].id,
banner: [ banner: [
App.globalData.appResourcesBase + 'shop/banner/banner-1-1-1.png', App.globalData.appResourcesBase + 'shop/banner/banner-1-1-1.png',
App.globalData.appResourcesBase + 'shop/banner/banner-1-1-2.png', App.globalData.appResourcesBase + 'shop/banner/banner-1-1-2.png',
...@@ -155,6 +160,7 @@ Page({ ...@@ -155,6 +160,7 @@ Page({
contact: '13316748039' contact: '13316748039'
}, { }, {
appId: 5, appId: 5,
id: App.globalData.pointInfo[4].id,
banner: [ banner: [
App.globalData.appResourcesBase + 'shop/banner/banner-1-2-1.png', App.globalData.appResourcesBase + 'shop/banner/banner-1-2-1.png',
App.globalData.appResourcesBase + 'shop/banner/banner-1-2-2.png', App.globalData.appResourcesBase + 'shop/banner/banner-1-2-2.png',
...@@ -170,6 +176,7 @@ Page({ ...@@ -170,6 +176,7 @@ Page({
contact: '13316748039' contact: '13316748039'
}, { }, {
appId: 7, appId: 7,
id: App.globalData.pointInfo[6].id,
banner: [ banner: [
App.globalData.appResourcesBase + 'shop/banner/banner-2-1-1.png', App.globalData.appResourcesBase + 'shop/banner/banner-2-1-1.png',
App.globalData.appResourcesBase + 'shop/banner/banner-2-1-2.png', App.globalData.appResourcesBase + 'shop/banner/banner-2-1-2.png',
...@@ -188,6 +195,7 @@ Page({ ...@@ -188,6 +195,7 @@ Page({
contact: '13316748039' contact: '13316748039'
}, { }, {
appId: 6, appId: 6,
id: App.globalData.pointInfo[5].id,
banner: [ banner: [
App.globalData.appResourcesBase + 'shop/banner/banner-3-1-1.png', App.globalData.appResourcesBase + 'shop/banner/banner-3-1-1.png',
App.globalData.appResourcesBase + 'shop/banner/banner-3-1-2.png', App.globalData.appResourcesBase + 'shop/banner/banner-3-1-2.png',
...@@ -209,6 +217,7 @@ Page({ ...@@ -209,6 +217,7 @@ Page({
contact: '13316748039' contact: '13316748039'
}, { }, {
appId: 4, appId: 4,
id: App.globalData.pointInfo[3].id,
banner: [ banner: [
App.globalData.appResourcesBase + 'shop/banner/banner-3-2-1.png', App.globalData.appResourcesBase + 'shop/banner/banner-3-2-1.png',
App.globalData.appResourcesBase + 'shop/banner/banner-3-2-2.png', App.globalData.appResourcesBase + 'shop/banner/banner-3-2-2.png',
...@@ -224,6 +233,7 @@ Page({ ...@@ -224,6 +233,7 @@ Page({
contact: '13316748039' contact: '13316748039'
}, { }, {
appId: 2, appId: 2,
id: App.globalData.pointInfo[1].id,
banner: [ banner: [
App.globalData.appResourcesBase + 'shop/banner/banner-4-1-1.png', App.globalData.appResourcesBase + 'shop/banner/banner-4-1-1.png',
App.globalData.appResourcesBase + 'shop/banner/banner-4-1-2.png', App.globalData.appResourcesBase + 'shop/banner/banner-4-1-2.png',
...@@ -242,6 +252,38 @@ Page({ ...@@ -242,6 +252,38 @@ Page({
contact: '13316748039' contact: '13316748039'
} }
] ]
App.wxRequest({
url: '/api/v1/park/getList',
success: function(res) {
let funcData = res.list
funcDetail.forEach(shop => {
funcData.forEach(item => {
if (shop.id === item .id) {
shop.banner = item.rotationImg
shop.name = item.name
shop.date = item.businessTime
shop.describe = item.content
shop.contact = item.hotTel
}
})
})
that.setData({
banner: funcDetail[funcIndex].banner,
shareImage: funcDetail[funcIndex].shareImage,
info: {
id: funcDetail[funcIndex].id,
name: funcDetail[funcIndex].name,
title: funcDetail[funcIndex].title,
date: funcDetail[funcIndex].date,
describe: funcDetail[funcIndex].describe,
contact: funcDetail[funcIndex].contact,
},
// detailActivity: funcDetail[funcIndex].activity,
// detailCommodity: funcDetail[funcIndex].commodity,
// detailEvaluate: funcDetail[funcIndex].evaluate,
})
}
})
// 读取预设信息，banner 图片等等 // 读取预设信息，banner 图片等等
for (let i = 0, l = funcDetail.length; i < l; i++) { for (let i = 0, l = funcDetail.length; i < l; i++) {
...@@ -267,27 +309,27 @@ Page({ ...@@ -267,27 +309,27 @@ Page({
} }
} }
this.setData({ // this.setData({
banner: funcDetail[funcIndex].banner, // banner: funcDetail[funcIndex].banner,
shareImage: funcDetail[funcIndex].shareImage, // shareImage: funcDetail[funcIndex].shareImage,
info: { // info: {
id: funcDetail[funcIndex].id, // id: funcDetail[funcIndex].id,
name: funcDetail[funcIndex].name, // name: funcDetail[funcIndex].name,
title: funcDetail[funcIndex].title, // title: funcDetail[funcIndex].title,
date: funcDetail[funcIndex].date, // date: funcDetail[funcIndex].date,
describe: funcDetail[funcIndex].describe, // describe: funcDetail[funcIndex].describe,
contact: funcDetail[funcIndex].contact, // contact: funcDetail[funcIndex].contact,
}, // },
detailActivity: funcDetail[funcIndex].activity, // detailActivity: funcDetail[funcIndex].activity,
detailCommodity: funcDetail[funcIndex].commodity, // detailCommodity: funcDetail[funcIndex].commodity,
detailEvaluate: funcDetail[funcIndex].evaluate, // detailEvaluate: funcDetail[funcIndex].evaluate,
}) // })
if (this.data.info.id === 6) { // if (this.data.info.id === 6) {
this.setData({ // this.setData({
isBlack: true // isBlack: true
}) // })
} // }
}, },
queryDetailActivity: function () { queryDetailActivity: function () {
......
pages/play/service-detail/service-detail.wxml
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<view class="commodity"> <view class="commodity">
<!-- 详情标题，分享，位置 --> <!-- 详情标题，分享，位置 -->
<view class="commodity-title row align-c"> <view class="commodity-title row align-c">
<text>{{info.title}}</text> <text>{{info.name}}</text>
<image src="{{imageBase + 'icon/share-2.png'}}" bindtap="onShare"></image> <image src="{{imageBase + 'icon/share-2.png'}}" bindtap="onShare"></image>
<image src="{{imageBase + 'icon/location-2.png'}}" bind:tap="onLocation"></image> <image src="{{imageBase + 'icon/location-2.png'}}" bind:tap="onLocation"></image>
</view> </view>
......
pages/play/service/service.js
...@@ -16,6 +16,7 @@ Page({ ...@@ -16,6 +16,7 @@ Page({
}, },
queryDetail: function () { queryDetail: function () {
let that = this
let response = [ let response = [
{ {
describe: [ describe: [
...@@ -23,17 +24,18 @@ Page({ ...@@ -23,17 +24,18 @@ Page({
], ],
shop: [{ shop: [{
appId: 1, appId: 1,
id: App.globalData.pointInfo[0].id,
name: '海错图展馆', name: '海错图展馆',
cover: App.globalData.appResourcesBase + 'play/detail/detail-1-2.png', cover: App.globalData.appResourcesBase + 'play/detail/shop-bg-1-1.png',
x: 108, subCover: App.globalData.appResourcesBase + 'play/detail/shop-bg-1-2.png',
y: 232, logo: App.globalData.appResourcesBase + 'shop/logo-1.png',
shopType: '4' shopType: '4'
}, { }, {
appId: 5, appId: 5,
id: App.globalData.pointInfo[4].id,
name: '拾光花坊', name: '拾光花坊',
cover: App.globalData.appResourcesBase + 'play/detail/detail-1-3.png', cover: App.globalData.appResourcesBase + 'play/detail/shop-bg-1-3.png',
x: 108, logo: App.globalData.appResourcesBase + 'shop/logo-5.png',
y: 246,
shopType: '' shopType: ''
}] }]
}, { }, {
...@@ -42,10 +44,10 @@ Page({ ...@@ -42,10 +44,10 @@ Page({
], ],
shop: [{ shop: [{
appId: 7, appId: 7,
id: App.globalData.pointInfo[6].id,
name: '水元养韵SPA', name: '水元养韵SPA',
cover: App.globalData.appResourcesBase + 'play/detail/detail-2-2.png', cover: App.globalData.appResourcesBase + 'play/detail/shop-bg-2-1.png',
x: 108, logo: App.globalData.appResourcesBase + 'shop/logo-7.png',
y: 246,
shopType: '2' shopType: '2'
}] }]
}, { }, {
...@@ -54,17 +56,17 @@ Page({ ...@@ -54,17 +56,17 @@ Page({
], ],
shop: [{ shop: [{
appId: 6, appId: 6,
id: App.globalData.pointInfo[5].id,
name: '原味舒食', name: '原味舒食',
cover: App.globalData.appResourcesBase + 'play/detail/detail-3-2.png', cover: App.globalData.appResourcesBase + 'play/detail/shop-bg-3-1.png',
x: 108, logo: App.globalData.appResourcesBase + 'shop/logo-6.png',
y: 232,
shopType: '5' shopType: '5'
}, { }, {
appId: 4, appId: 4,
id: App.globalData.pointInfo[3].id,
name: '原野MOJITO', name: '原野MOJITO',
cover: App.globalData.appResourcesBase + 'play/detail/detail-3-3.png', cover: App.globalData.appResourcesBase + 'play/detail/shop-bg-bg-3-2.png',
x: 108, logo: App.globalData.appResourcesBase + 'shop/logo-4.png',
y: 246,
shopType: '5' shopType: '5'
}] }]
}, { }, {
...@@ -73,10 +75,10 @@ Page({ ...@@ -73,10 +75,10 @@ Page({
], ],
shop: [{ shop: [{
appId: 2, appId: 2,
id: App.globalData.pointInfo[1].id,
name: '星空影院', name: '星空影院',
cover: App.globalData.appResourcesBase + 'play/detail/detail-4-2.png', cover: App.globalData.appResourcesBase + 'play/detail/shop-bg-bg-4-1.png',
x: 108, logo: App.globalData.appResourcesBase + 'shop/logo-2.png',
y: 246,
shopType: '' shopType: ''
}] }]
}, { }, {
...@@ -86,9 +88,25 @@ Page({ ...@@ -86,9 +88,25 @@ Page({
shop: [] shop: []
}, },
] ]
App.wxRequest({
this.setData({ url: '/api/v1/park/getList',
tabDetail: response success: function(res) {
let funcData = res.list
response.forEach(res => {
res.shop.forEach(shop => {
funcData.forEach(item => {
if (shop.id === item.id) {
shop.name = item.name
shop.summary = item.summary
shop.time = item.businessTime
}
})
})
})
that.setData({
tabDetail: response
})
}
}) })
}, },
......
pages/play/service/service.wxml
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
</view> </view>
<view class="shop"> <view class="shop">
<block wx:for="{{tabDetail[tabIndex].shop}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <!-- <block wx:for="{{tabDetail[tabIndex].shop}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="shop-item"> <view class="shop-item">
<image src="{{item.cover}}"></image> <image src="{{item.cover}}"></image>
<button <button
...@@ -21,6 +21,133 @@ ...@@ -21,6 +21,133 @@
<text>立即预定</text> <text>立即预定</text>
</button> </button>
</view> </view>
</block> </block> -->
<view class="shop-wrapper" wx:if="{{tabIndex === '0'}}">
<image class="shop-bg" src="{{tabDetail[0].shop[0].cover}}"></image>
<image class="shop-art-cover" src="{{tabDetail[0].shop[0].subCover}}"></image>
<view class="shop-content">
<view class="shop-logo">
<image class="art-logo" src="{{tabDetail[0].shop[0].logo}}"></image>
</view>
<view class="shop-name">
<text>{{tabDetail[0].shop[0].name}}</text>
</view>
<view class="shop-summary">
<text>{{tabDetail[0].shop[0].summary}}</text>
</view>
<view class="shop-date">
<text>时间</text>
<text>{{tabDetail[0].shop[0].time}}</text>
</view>
<view class="shop-btn" data-id="{{tabDetail[0].shop[0].appId}}" data-type="{{tabDetail[0].shop[0].shopType}}" bindtap="onShopDetail">
<text>立即购票</text>
</view>
</view>
</view>
<view class="shop-wrapper" wx:if="{{tabIndex === '0'}}">
<image class="shop-bg" src="{{tabDetail[0].shop[1].cover}}"></image>
<view class="shop-content">
<view class="shop-logo">
<image class="flower-logo" src="{{tabDetail[0].shop[1].logo}}"></image>
</view>
<view class="shop-name">
<text>{{tabDetail[0].shop[1].name}}</text>
</view>
<view class="shop-summary">
<text>{{tabDetail[0].shop[1].summary}}</text>
</view>
<view class="shop-date">
<text>时间</text>
<text>{{tabDetail[0].shop[1].time}}</text>
</view>
<view class="shop-btn" data-id="{{tabDetail[0].shop[1].appId}}" data-type="{{tabDetail[0].shop[1].shopType}}" bindtap="onShopDetail">
<text>查看详情</text>
</view>
</view>
</view>
<view class="shop-wrapper" wx:if="{{tabIndex === '1'}}">
<image class="shop-bg" src="{{tabDetail[1].shop[0].cover}}"></image>
<view class="shop-content">
<view class="shop-logo">
<image class="spa-logo" src="{{tabDetail[1].shop[0].logo}}"></image>
</view>
<view class="shop-name">
<text>{{tabDetail[1].shop[0].name}}</text>
</view>
<view class="shop-summary">
<text>{{tabDetail[1].shop[0].summary}}</text>
</view>
<view class="shop-date">
<text>时间</text>
<text>{{tabDetail[1].shop[0].time}}</text>
</view>
<view class="shop-btn" data-id="{{tabDetail[1].shop[0].appId}}" data-type="{{tabDetail[1].shop[0].shopType}}" bindtap="onShopDetail">
<text>立即购票</text>
</view>
</view>
</view>
<view class="shop-wrapper" wx:if="{{tabIndex === '2'}}">
<image class="shop-bg" src="{{tabDetail[2].shop[0].cover}}"></image>
<view class="shop-content">
<view class="shop-logo">
<image class="food-logo" src="{{tabDetail[2].shop[0].logo}}"></image>
</view>
<view class="shop-name">
<text>{{tabDetail[2].shop[0].name}}</text>
</view>
<view class="shop-summary">
<text>{{tabDetail[2].shop[0].summary}}</text>
</view>
<view class="shop-date">
<text>时间</text>
<text>{{tabDetail[2].shop[0].time}}</text>
</view>
<view class="shop-btn" data-id="{{tabDetail[2].shop[0].appId}}" data-type="{{tabDetail[2].shop[0].shopType}}" bindtap="onShopDetail">
<text>立即预订</text>
</view>
</view>
</view>
<view class="shop-wrapper" wx:if="{{tabIndex === '2'}}">
<image class="shop-bg" src="{{tabDetail[2].shop[1].cover}}"></image>
<view class="shop-content">
<view class="shop-logo">
<image class="mojito-logo" src="{{tabDetail[2].shop[1].logo}}"></image>
</view>
<view class="shop-name">
<text>{{tabDetail[2].shop[1].name}}</text>
</view>
<view class="shop-summary">
<text>{{tabDetail[2].shop[1].summary}}</text>
</view>
<view class="shop-date">
<text>时间</text>
<text>{{tabDetail[2].shop[1].time}}</text>
</view>
<view class="shop-btn" data-id="{{tabDetail[2].shop[1].appId}}" data-type="{{tabDetail[2].shop[1].shopType}}" bindtap="onShopDetail">
<text>立即预订</text>
</view>
</view>
</view>
<view class="shop-wrapper" wx:if="{{tabIndex === '3'}}">
<image class="shop-bg" src="{{tabDetail[3].shop[0].cover}}"></image>
<view class="shop-content">
<view class="shop-logo">
<image class="movie-logo" src="{{tabDetail[3].shop[0].logo}}"></image>
</view>
<view class="shop-name">
<text>{{tabDetail[3].shop[0].name}}</text>
</view>
<view class="shop-summary">
<text>{{tabDetail[3].shop[0].summary}}</text>
</view>
<view class="shop-date">
<text>时间</text>
<text>{{tabDetail[3].shop[0].time}}</text>
</view>
<view class="shop-btn" data-id="{{tabDetail[3].shop[0].appId}}" data-type="{{tabDetail[3].shop[0].shopType}}" bindtap="onShopDetail">
<text>立即购票</text>
</view>
</view>
</view>
</view> </view>
</view> </view>
\ No newline at end of file
pages/play/service/service.wxss
page {
background: linear-gradient(182deg,#FFFFFF 0%,#EBEDF7 100%);
}
.navigation { .navigation {
z-index: 1900; z-index: 1900;
} }
.container { .container {
margin-top: 120rpx; margin-top: 120rpx;
padding-bottom: 20rpx;
background: linear-gradient(182deg, #FFFFFF 0%, #EBEFF7 100%);
} }
/* 详情 */ /* 详情 */
...@@ -50,4 +48,107 @@ page { ...@@ -50,4 +48,107 @@ page {
font-weight: 500; font-weight: 500;
color: #ffffff; color: #ffffff;
line-height: 42rpx; line-height: 42rpx;
}
.shop-wrapper {
position: relative;
width: 750rpx;
height: 1106rpx;
}
.shop-bg {
width: 750rpx;
height: 436rpx;
}
.shop-art-cover {
position: absolute;
right: 0;
top: 0;
z-index: 3;
width: 478rpx;
height: 362rpx;
}
.shop-content {
position: absolute;
top: 231rpx;
left: 48rpx;
width: 654rpx;
height: 716rpx;
background-color: #fff;
}
.shop-logo {
height: 206rpx;
}
.art-logo {
width: 66rpx;
height: 122rpx;
margin: 42rpx 0 0 66rpx;
}
.art-logo {
width: 66rpx;
height: 122rpx;
margin: 42rpx 0 0 66rpx;
}
.flower-logo {
width: 124rpx;
height: 88rpx;
margin: 62rpx 0 0 60rpx;
}
.spa-logo {
width: 124rpx;
height: 100rpx;
margin: 56rpx 0 0 50rpx;
}
.food-logo {
width: 100rpx;
height: 104rpx;
margin: 56rpx 0 0 60rpx;
}
.mojito-logo {
width: 182rpx;
height: 70rpx;
margin: 74rpx 0 0 60rpx;
}
.movie-logo {
width: 168rpx;
height: 66rpx;
margin: 84rpx 0 0 60rpx;
}
.shop-name text {
margin: 10rpx 60rpx 0;
font-size: 38rpx;
font-weight: 600;
color: #15191F;
line-height: 52rpx;
}
.shop-summary {
height: 72rpx;
margin: 40rpx 60rpx 0;
font-size: 26rpx;
color: #959DA9;
line-height: 36rpx;
}
.shop-date {
margin: 80rpx 60rpx 0;
}
.shop-date text:nth-child(1) {
font-size: 26rpx;
color: #959DA9;
line-height: 36rpx;
}
.shop-date text:nth-child(2) {
margin-left: 48rpx;
font-size: 26rpx;
color: #15191F;
line-height: 36rpx;
}
.shop-btn {
width: 534rpx;
height: 96rpx;
margin: 64rpx 60rpx;
color: #fff;
font-size: 30rpx;
line-height: 96rpx;
text-align: center;
background: #86C5E1;
border-radius: 4rpx;
} }
\ No newline at end of file
pages/play/strategy-detail/strategy-detail.wxss
.navigation { .navigation {
z-index: 1900; z-index: 1900;
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; left: 0;
width: 750rpx; width: 750rpx;
} }
.banner { .banner {
position: relative; position: relative;
width: 750rpx; width: 750rpx;
height: 870rpx; height: 870rpx;
background: #ffffff; background: #ffffff;
} }
.banner-swiper, .banner-swiper,
.banner-swiper-item, .banner-swiper-item,
.banner-swiper-image { .banner-swiper-image {
position: absolute; position: absolute;
top: 0 !important; top: 0 !important;
left: 0 !important; left: 0 !important;
width: 750rpx; width: 750rpx;
height: 870rpx; height: 870rpx;
} }
.banner-swiper-point { .banner-swiper-point {
position: relative; position: relative;
top: 760rpx; top: 760rpx;
left: 0; left: 0;
} }
.detail { .detail {
width: 750rpx; width: 750rpx;
padding: 6px 32rpx; padding: 6px 32rpx;
} }
.detail-title { .detail-title {
width: 670rpx; width: 670rpx;
margin: 80rpx 0 64rpx 0; margin: 80rpx 0 64rpx 0;
font-size: 38rpx; font-size: 38rpx;
font-weight: 800; font-weight: 800;
color:#15191F; color:#15191F;
line-height: 52rpx; line-height: 52rpx;
} }
.detail-date { .detail-date {
/* width: 152rpx; */ /* width: 152rpx; */
height: 40rpx; height: 40rpx;
margin: 64rpx 0 32rpx 0; margin: 64rpx 0 32rpx 0;
font-size: 26rpx; font-size: 26rpx;
font-weight: 400; font-weight: 400;
color: #959DA9; color: #959DA9;
line-height: 40rpx; line-height: 40rpx;
} }
.detail > image { .detail > image {
min-width: 100%; min-width: 100%;
} }
rich-text { rich-text {
margin-bottom: 52rpx; margin-bottom: 52rpx;
font-size: 30rpx; font-size: 30rpx;
font-weight: 300; font-weight: 300;
color: #15191F; color: #15191F;
line-height: 52rpx; line-height: 52rpx;
} }
/* 攻略相关 */ /* 攻略相关 */
.relation-title { .relation-title {
margin: 0 40rpx 90rpx 40rpx; margin: 0 40rpx 90rpx 40rpx;
padding-top: 64rpx; padding-top: 64rpx;
border-top: 1px #E2E7EF solid; border-top: 1px #E2E7EF solid;
} }
.relation-title text { .relation-title text {
width: 120rpx; width: 120rpx;
height: 42rpx; height: 42rpx;
margin-top: 40rpx; margin-top: 40rpx;
font-size: 30rpx; font-size: 30rpx;
font-weight: bold; font-weight: bold;
color:rgba(21,25,31,1); color:rgba(21,25,31,1);
} }
.relation-item { .relation-item {
position: relative; position: relative;
width: 670rpx; width: 670rpx;
height: 238rpx; height: 238rpx;
margin: 0 40rpx 104rpx 40rpx; margin: 0 40rpx 104rpx 40rpx;
background:rgba(245, 246, 248, 1); background:rgba(245, 246, 248, 1);
border-radius: 2px; border-radius: 2px;
} }
.relation-item > image { .relation-item > image {
position: absolute; position: absolute;
top: -24rpx; top: -24rpx;
left: 24rpx; left: 24rpx;
width: 176rpx; width: 176rpx;
height: 214rpx; height: 214rpx;
border-radius: 2px; border-radius: 2px;
overflow: hidden; overflow: hidden;
} }
.relation-item { .relation-item {
padding: 32rpx 32rpx 48rpx 230rpx; padding: 32rpx 32rpx 48rpx 230rpx;
} }
.relation-item-info text:nth-child(1) { .relation-item-info text:nth-child(1) {
font-size: 30rpx; font-size: 30rpx;
font-weight: bold; font-weight: bold;
line-height: 42rpx; line-height: 42rpx;
color:rgba(21, 25, 31, 1); color:rgba(21, 25, 31, 1);
} }
.relation-item-info text:nth-child(2) { .relation-item-info text:nth-child(2) {
margin-top: 30rpx; margin-top: 30rpx;
font-size: 26rpx; font-size: 26rpx;
line-height: 36rpx; line-height: 36rpx;
color: #656E7B; color: #656E7B;
} }
.relation-item-info text:nth-child(3) { .relation-item-info text:nth-child(3) {
margin-top: 12rpx; margin-top: 12rpx;
font-size: 26rpx; font-size: 26rpx;
line-height: 36rpx; line-height: 36rpx;
color: #656E7B; color: #656E7B;
} }
.relation-item-more { .relation-item-more {
height: 100%; height: 100%;
} }
.relation-item-more image { .relation-item-more image {
width: 32rpx; width: 32rpx;
height: 32rpx; height: 32rpx;
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment