Skip to content

严立 / mini-shimao

Go to a project
Commit 7a45e84c by 严立
Options

LL - 畅玩，订单详情

parent 3a64cb5f
Expand all
Inline Side-by-side
Showing with 433 additions and 394 deletions
app.js
......@@ -45,7 +45,7 @@ App({
return funcCss
},
wxRequest(obj) {
wxRequest: function (obj) {
let that = this
var token = that.globalData.token
var param = obj.data ? JSON.stringify(obj.data) : ""
......@@ -104,9 +104,8 @@ App({
});
},
login(obj) {
login: function (obj) {
let token = this.globalData.token
let that = this
if (token) {
if (obj.success) {
obj.success(token)
......@@ -119,10 +118,14 @@ App({
url: '/api/v1/login/getSmallSession?code=' + res.code,
method: 'GET',
success: (response) => {
console.log(response)
let funcResponse = response.data
this.globalData.token = funcResponse.token
this.globalData.refreshToken = funcResponse.refreshToken
wx.setStorageSync('sessionKey', funcResponse.session_key)
let funcUserInfo = {
'openId': funcResponse.openid,
'name': funcResponse.nickName,
......@@ -143,9 +146,7 @@ App({
})
}
})
}
},
registUserInfo(obj) {
......
pages/commodity/home/home.js
......@@ -274,7 +274,7 @@ Page({
*/
onBuySupply: function (event) {
// funcShopType 使用函数区分商品类型，所以每个函数里的数值是固定的
let funcShopType = 2
let funcShopType = 5
let funcShopAppId = event.currentTarget.dataset.id
this.setShopInfo(funcShopAppId, funcShopType)
......
pages/home/home/home.js
......@@ -335,11 +335,6 @@ Page({
onTest2: function (event) {
},
onTest3: function (event) {
wx.navigateTo({
url: '/pages/pay/order-detail/order-detail?type=' + event.currentTarget.dataset.index
})
},
onTest6: function (event) {
wx.navigateTo({
url: '/pages/pay/order-comment/order-comment',
......
pages/home/home/home.wxml
......@@ -79,20 +79,6 @@
<l-water-flow column-gap="14rpx" generic:l-water-flow-item="strategy-item" bind:linitemtap="onStrategyDetail"></l-water-flow>
</view>
</block> -->
<button class="test-button" data-index="{{1}}" bindtap="onTest">年卡月卡</button>
<button class="test-button" data-index="{{2}}" bindtap="onTest">次票</button>
<button class="test-button" data-index="{{3}}" bindtap="onTest">SPA</button>
<button class="test-button" data-index="{{4}}" bindtap="onTest">文创</button>
<button class="test-button" data-index="{{5}}" bindtap="onTest">餐品</button>
<button class="test-button" data-index="{{6}}" bindtap="onTest">活动</button>
<button class="test-button" data-index="{{7}}" bindtap="onTest">观影</button>
<button class="test-button" bindtap="onTest2">餐品列表</button>
<button class="test-button" data-index="{{0}}" bindtap="onTest3">订单 未使用</button>
<button class="test-button" data-index="{{1}}" bindtap="onTest3">订单 待评价</button>
<button class="test-button" data-index="{{2}}" bindtap="onTest3">订单 已过期</button>
<button class="test-button" data-index="{{3}}" bindtap="onTest3">订单 已取消</button>
<button class="test-button" data-index="{{4}}" bindtap="onTest3">订单 已评价</button>
<button class="test-button" data-index="{{5}}" bindtap="onTest3">订单 待付款</button>
<button class="test-button" bindtap="onTest4">券码核销</button>
<button class="test-button" data-index="{{4}}" bindtap="onTest5">券码详情 普通</button>
<button class="test-button" data-index="{{5}}" bindtap="onTest5">券码详情 餐品</button>
......
pages/login/login.js
const app = getApp()
const App = getApp()
Page({
data: {
height: '',
islogin: false,
isphone: false,
userInfo: {},
},
onLoad: function (options) {
let mobile = wx.getStorageSync('mobile')
let nickName = wx.getStorageSync('nickName')
let avatarUrl = wx.getStorageSync('avatarUrl')
let funcUserInfo = wx.getStorageSync('userInfo')
this.setData({
height: wx.getSystemInfoSync().windowHeight, //获取屏幕的高度
islogin: (nickName && avatarUrl) ? true : false,
isphone: (mobile) ? true : false,
height: wx.getSystemInfoSync().windowHeight,
islogin: (funcUserInfo.name && funcUserInfo.avatar) ? true : false,
isphone: (funcUserInfo.phone) ? true : false,
})
},
......@@ -37,32 +37,33 @@ Page({
* 获取用户信息
*/
userInfoHandler: function (res) {
let funcGetUserInfo = res.detail.userInfo
console.log('userInfo', res)
if (!res.detail.userInfo) {
return
}
let avatarUrl = res.detail.userInfo.avatarUrl
let nickName = res.detail.userInfo.nickName
// let gender = res.detail.userInfo.gender
let that = this
let funcUserInfo = this.data.userInfo
funcUserInfo.avatar = funcGetUserInfo.avatarUrl
funcUserInfo.name = funcGetUserInfo.nickName
funcUserInfo.sex = funcGetUserInfo.gender
this.registUserInfo({
param: {
avatarUrl: avatarUrl,
nickName: nickName,
// sex: gender,
avatarUrl: funcUserInfo.avatar,
nickName: funcUserInfo.name,
sessionKey: '',
encryptedData: '',
iv: '',
},
success: function(res) {
wx.setStorageSync('avatarUrl', avatarUrl)
wx.setStorageSync('nickName', nickName)
// wx.setStorageSync('sex', gender)
that.setData({
success: (res) => {
console.log(res)
wx.setStorageSync('userInfo', funcUserInfo)
this.setData({
islogin: true
})
setTimeout(() => {
that.checkFinish()
this.checkFinish()
}, 1000)
}
})
......@@ -72,27 +73,27 @@ Page({
* 绑定手机号
*/
userPhoneHandler: function (res) {
console.log('userPhone', res)
if (!res.detail.encryptedData) {
return
}
let sessionKey = wx.getStorageSync('session_key')
let that = this
let sessionKey = wx.getStorageSync('sessionKey')
let funcUserInfo = wx.getStorageSync('userInfo')
this.registUserInfo({
param: {
avatarUrl: wx.getStorageSync('avatarUrl'),
nickName: wx.getStorageSync('nickName'),
avatarUrl: funcUserInfo.avatar,
nickName: funcUserInfo.name,
sessionKey: sessionKey,
encryptedData: res.detail.encryptedData,
iv: res.detail.iv,
},
success: function(res) {
wx.setStorageSync('mobile', res.data.phoneNumber)
that.setData({
success: (res) => {
funcUserInfo.phone = res.data.phoneNumber
wx.setStorageSync('userInfo', funcUserInfo)
this.setData({
isphone: true
})
setTimeout(() => {
that.checkFinish()
this.checkFinish()
}, 1000)
}
......
pages/mine/home/home.js
......@@ -9,6 +9,17 @@ Page({
imageBase: App.globalData.appImageBase,
orderType: 1, // 1 - 年卡/月卡，2 - 次票， 3 - SPA， 4 - 文创， 5 - 餐品， 6 - 活动， 7 - 观影
userInfo: {
'openId': '',
'name': '',
'phone': '',
'avatar': '',
'address': '',
'birthday': '',
'sex': '',
'userType': 0
},
mobile: '',
nickName: '',
......@@ -94,33 +105,37 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
onShow: function () {
let that = this
let mobile = wx.getStorageSync('mobile')
let nickName = wx.getStorageSync('nickName')
let avatarUrl = wx.getStorageSync('avatarUrl')
if (mobile && nickName && avatarUrl) {
that.setData({
mobile: that.toHide(mobile),
nickName: nickName,
avatarUrl: avatarUrl,
this.setUserInfo()
},
setUserInfo: function () {
let funcUserInfo = wx.getStorageSync('userInfo')
if (funcUserInfo.phone && funcUserInfo.name && funcUserInfo.avatar) {
funcUserInfo.phone = this.toHide(funcUserInfo.phone)
this.setData({
isRegister: true,
userInfo: funcUserInfo
})
App.login({
success: function (token) {
that.getMyActivityList()
that.getList()
that.getAuth()
success: (token) => {
this.getMyActivityList()
this.getList()
this.getAuth()
}
})
let userType = wx.getStorageSync('userType')
that.setData({
type: userType == 1 ? 1 : 0,
let funcUserType = funcUserInfo.userType
this.setData({
type: funcUserType === 1 ? 1 : 0,
})
} else {
that.setData({
this.setData({
isRegister: false,
})
}
......@@ -274,11 +289,10 @@ Page({
// 获取业主认证信息
getAuth() {
let that = this
App.wxRequest({
url: '/api/v1/userAuth/getAuth',
method: 'GET',
success: function (res) {
success: (res) => {
let state = res.data.state * 1 // 0 待审核 1 审核通过 2 不通过
let stateTest = '去认证'
switch (state) {
......@@ -286,11 +300,14 @@ Page({
case 1: stateTest = '审核通过 '; break;
case 2: stateTest = '审核失败'; break;
}
that.setData({
this.setData({
type: state == 1 ? 1 : 0,
stateTest: stateTest,
})
wx.setStorageSync('userType', state)
let funcUserInfo = wx.getStorageSync('userInfo')
funcUserInfo.userType = state
wx.setStorageSync('userInfo', funcUserInfo)
}
})
},
......
pages/mine/home/home.wxml
......@@ -5,16 +5,16 @@
<image class="background-image" src="./image/mine.png"></image>
<view class="row align-c">
<view class="mine-avatar" bindtap="checkRegister">
<l-avatar size="112" src="{{avatarUrl}}"/>
<l-avatar size="112" src="{{userInfo.avatar}}"/>
</view>
<view wx:if="{{isRegister}}" class="mine-info col">
<view class="row align-c">
<text>{{nickName}}</text>
<text>{{userInfo.name}}</text>
<image src="./image/inform.png" bindtap="goMyInfo"></image>
</view>
<view>
<text>{{mobile}}</text>
<text>{{userInfo.phone}}</text>
</view>
</view>
<view wx:else class="mine-info col">
......@@ -29,15 +29,15 @@
<image class="background-image" style="height:512rpx;" src="http://upload.miaomiao-bao.com/8f046202008201043321555.jpg"></image>
<view class="row align-c approve">
<view class="mine-avatar">
<l-avatar size="112" src="{{avatarUrl}}"/>
<l-avatar size="112" src="{{userInfo.avatar}}"/>
</view>
<view class="mine-info col">
<view class="row align-c">
<text style="color:#F0DABB;font-weight:500;">{{nickName}}</text>
<text style="color:#F0DABB;font-weight:500;">{{userInfo.name}}</text>
<image src="/image/inform-w.png" bindtap="goMyInfo"></image>
</view>
<view>
<text>{{mobile}}</text>
<text>{{userInfo.phone}}</text>
</view>
</view>
<view bindtap="maskShow" class="align-c" style="positive:relative;margin-left:68rpx;display:flex;">
......
pages/mine/order/order.js
......@@ -38,8 +38,6 @@ Page({
queryOrder: function () {
let funcName = this.data.orderType[this.data.orderTypeActive].value
let funcValue = this.data.statusList[this.data.statusActive].value
console.log(this.data.orderType)
console.log(this.data.statusList)
App.wxRequest({
url: '/api/v1/order/getOrderList',
......@@ -55,8 +53,10 @@ Page({
for (let i = 0, l = funcResponse.length; i < l; i++) {
let funcItem = {
'id': funcResponse[i].orderId,
'logo': '',
'name': funcResponse[i].officeName,
'shopId': '',
'shopAppId': '',
'shopName': funcResponse[i].officeName,
'shopLogo': '',
'total': 0,
'status': Number(funcResponse[i].status),
'amount': funcResponse[i].totalMoney,
......@@ -80,39 +80,20 @@ Page({
// 映射门店信息
for (let i = 0, l = App.globalData.shopId.length; i < l; i++) {
if (funcItem.name === App.globalData.shopId[i].name) {
funcItem.logo = App.globalData.shopId[i].logo
if (funcItem.shopName === App.globalData.shopId[i].name) {
funcItem.shopId = App.globalData.shopId[i].id
funcItem.shopAppId = App.globalData.shopId[i].appId
funcItem.shopLogo = App.globalData.shopId[i].logo
break
}
}
// 映射显示状态与后台状态
switch (funcItem.status) {
case -2:
funcItem.status = 0
break
case -1:
funcItem.status = 1
break
case 0:
funcItem.status = 2
break
case 1:
funcItem.status = 3
break
case 2:
funcItem.status = 5
break
}
funcList.push(funcItem)
}
this.setData({
orderList: funcList
orderList: this.data.orderList.concat(funcList)
})
console.log(this.data.orderList)
}
})
},
......@@ -166,8 +147,6 @@ Page({
let funcItem = event.currentTarget.dataset.item
let funcIndex = event.currentTarget.dataset.index
console.log(funcItem)
this.setData({
'orderTypeTitle': funcItem.name,
'orderTypeActive': funcIndex,
......@@ -206,6 +185,16 @@ Page({
*/
onOrderDetail: function (event) {
let funcItem = event.currentTarget.dataset.item
// 缓存当前订单所在商店信息
let funcShopInfo = {
'id': funcItem.shopId,
'appId': funcItem.shopAppId,
'name': funcItem.shopName,
'logo': funcItem.shopLogo,
'shopType': '',
}
wx.setStorageSync('shopInfoBuffer', funcShopInfo)
wx.navigateTo({
url: '/pages/pay/order-detail/order-detail?id=' + funcItem.id,
})
......@@ -293,4 +282,17 @@ Page({
onOrderAgain: function (event) {
},
/**
* 页面触底事件
* @function
* @param
* @returns
*/
onReachBottom: function () {
this.setData({
orderPages: this.data.orderPages + 1
})
this.queryOrder()
},
})
\ No newline at end of file
pages/mine/order/order.wxml
......@@ -65,16 +65,16 @@
<view class="order-list-item col align-c" data-item="{{item}}" bindtap="onOrderDetail">
<view class="order-list-item-title row con-b align-c">
<view class="row align-c">
<image wx:if="{{item.logo}}" src="{{resourcesBase + 'commodity/' + item.logo}}"></image>
<image wx:if="{{item.shopLogo}}" src="{{resourcesBase + 'commodity/' + item.shopLogo}}"></image>
<text>{{item.name}}</text>
</view>
<view>
<text class="warning" wx:if="{{item.status === 0}}">待付款</text>
<text class="warning" wx:if="{{item.status === 1}}">待使用</text>
<text class="warning" wx:if="{{item.status === 2}}">待评价</text>
<text class="message" wx:if="{{item.status === 3}}">已取消</text>
<text class="warning" wx:if="{{item.status === 2}}">待使用</text>
<text class="warning" wx:if="{{item.status === 3}}">待评价</text>
<text class="message" wx:if="{{item.status === -1}}">已取消</text>
<text class="message" wx:if="{{item.status === 4}}">已过期</text>
<text class="message" wx:if="{{item.status === 5}}">已评价</text>
<text class="message" wx:if="{{item.status === 3}}">已评价</text>
</view>
</view>
......@@ -100,11 +100,11 @@
</view>
<view class="row align-c">
<button wx:if="{{item.status === 0}}" class="delete row con-c align-c" data-item="{{item}}" catchtap="onOrderCancel">取消订单</button>
<button wx:if="{{item.status >= 3}}" class="delete row con-c align-c" data-item="{{item}}" catchtap="onOrderRemove">删除订单</button>
<button wx:if="{{item.status === -1 || item.status === 4}}" class="delete row con-c align-c" data-item="{{item}}" catchtap="onOrderRemove">删除订单</button>
<button wx:if="{{item.status === 0}}" class="again row con-c align-c" data-item="{{item}}" catchtap="onOrderPay">去支付</button>
<button wx:if="{{item.status === 1}}" class="again row con-c align-c" data-item="{{item}}" catchtap="onOrderUse">去使用</button>
<button wx:if="{{item.status === 2}}" class="again row con-c align-c" data-item="{{item}}" catchtap="onOrderEvaluate">去评价</button>
<button wx:if="{{item.status === 3}}" class="again row con-c align-c" data-item="{{item}}" catchtap="onOrderAgain">再次下单</button>
<button wx:if="{{item.status === 2}}" class="again row con-c align-c" data-item="{{item}}" catchtap="onOrderUse">去使用</button>
<button wx:if="{{item.status === 3}}" class="again row con-c align-c" data-item="{{item}}" catchtap="onOrderEvaluate">去评价</button>
<button wx:if="{{item.status === -1}}" class="again row con-c align-c" data-item="{{item}}" catchtap="onOrderAgain">再次下单</button>
</view>
</view>
</view>
......
pages/pay/order-detail/order-detail.wxml
......@@ -3,8 +3,7 @@
<view class="container">
<!-- 订单状态 -->
<view class="state row con-c">
<!-- <view class="state-content col con-c" wx:if="{{orderInfo.state === 0}}"> -->
<view class="state-content col con-c">
<view class="state-content col con-c" wx:if="{{orderInfo.state === 0}}">
<view class="state-content-title row">
<text>订单待付款</text>
</view>
......@@ -47,7 +46,7 @@
<!-- 订单信息 -->
<view class="info">
<!-- 年卡月卡 -->
<view class="info-content col con-c">
<view class="info-content col con-c" wx:if="{{orderInfo.commodityType === 1}}">
<view class="info-content-item row">
<text class="info-content-item-label">使用门店</text>
<text class="info-content-item-title">儿童营地</text>
......@@ -60,10 +59,10 @@
<!-- 普通商品 -->
<!-- 餐品 -->
<view class="info-content col con-c">
<view class="info-content col con-c" wx:if="{{orderInfo.commodityType === 2}}">
<view class="info-content-item row">
<text class="info-content-item-label">使用门店</text>
<text class="info-content-item-title">儿童营地</text>
<text class="info-content-item-title">{{orderInfo.shopName}}</text>
</view>
<view class="info-content-item row">
<text class="info-content-item-label"></text>
......@@ -80,7 +79,7 @@
</view>
<!-- 活动 -->
<view class="info-content col con-c">
<view class="info-content col con-c" wx:if="{{orderInfo.commodityType === -1}}">
<view class="info-content-item row">
<text class="info-content-item-label">报名活动</text>
<text class="info-content-item-title">儿童营地儿童营地儿童营地儿童营地儿童营地儿童营地</text>
......@@ -104,7 +103,7 @@
</view>
<!-- 观影 -->
<view class="info-content col con-c">
<view class="info-content col con-c" wx:if="{{orderInfo.commodityType === -2}}">
<view class="info-content-item row">
<text class="info-content-item-label">电影</text>
<text class="info-content-item-title">儿童营地</text>
......@@ -131,28 +130,45 @@
</view>
<view class="commodity-list">
<view class="commodity-shop-info row align-c">
<image></image>
<text>商店名称</text>
</view>
<view class="commodity-item row align-c">
<image></image>
<view class="commodity-item-info col">
<view>
<text>儿童营地年卡</text>
<image src="{{resourcesBase + 'commodity/' + shopInfo.logo}}"></image>
<text>{{shopInfo.name}}</text>
</view>
<block wx:for="{{orderInfo.commodity}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="commodity-item row align-c">
<image src="{{item.cover}}"></image>
<view class="commodity-item-info col">
<view>
<text>{{item.name}}</text>
</view>
<view class="row">
<text>¥</text>
<text>{{item.amount}}</text>
</view>
</view>
<view>
<text>1680.00</text>
<view class="commodity-item-operation">
<button class="row con-c align-c" data-item="{{item}}" bindtap="onCouponCode">查看券码</button>
</view>
</view>
<view class="commodity-item-operation">
<button class="row con-c align-c">查看券码</button>
</view>
</view>
</block>
</view>
</view>
<!-- 订单提示 -->
<view class="tip">
<view class="tip-pay row con-b align-c">
<view class="tip-pay-title">
<text>实付金额</text>
</view>
<view class="tip-pay-amount">
<text>¥</text>
<text>{{orderInfo.amount}}</text>
</view>
</view>
<view class="tip-describe col">
<text>{{'订单编号：' + orderInfo.tipOrderNo}}</text>
<text>{{'下单时间：' + orderInfo.tipTimeSubmit}}</text>
<text>{{'付款时间：' + orderInfo.tipTimePay}}</text>
<text>{{'获得积分：' + orderInfo.tipIntegral}}</text>
</view>
</view>
</view>
\ No newline at end of file
pages/pay/order-detail/order-detail.wxss
......@@ -36,6 +36,10 @@
}
/* 订单信息 */
.info {
margin-top: 50rpx;
}
.info-content {
width: 670rpx;
min-height: 206rpx;
......@@ -98,14 +102,14 @@
height: 48rpx;
font-size: 34rpx;
font-weight: 500;
line-height: 48px;
line-height: 48rpx;
color: #15191F;
}
.commodity-list {
width: 670rpx;
height: 676rpx;
padding: 40rpx;
margin-top: 40rpx;
padding: 40rpx 32rpx 0 32rpx;
border-radius: 4px;
background: #F3F4F6;
}
......@@ -132,10 +136,6 @@
.commodity-item-info {
width: 290rpx;
}
.commodity-item-operation {
width: 290rpx;
margin-right: 32rpx;
}
......@@ -149,4 +149,51 @@
font-weight: 500;
line-height: 32rpx;
color: #FFFFFF;
}
.commodity-list .commodity-item:last-child {
border: none;
}
/* 订单提示 */
.tip {
margin: 74rpx 40rpx 70rpx 40rpx;
}
.tip-pay {
width: 670rpx;
}
.tip-pay-title text {
height: 48rpx;
font-size: 34rpx;
font-weight: 800;
line-height: 48rpx;
color: #15191F;
}
.tip-pay-amount text:nth-child(1) {
height: 58rpx;
font-size: 34rpx;
font-weight: 500;
line-height: 48rpx;
color: #5DB5DD;
}
.tip-pay-amount text:nth-child(2) {
height: 58rpx;
font-size: 42rpx;
font-weight: 500;
line-height: 48rpx;
color: #5DB5DD;
}
.tip-describe {
width: 670rpx;
height: 168rpx;
margin-top: 32rpx;
font-size: 22rpx;
font-weight: 400;
line-height: 42rpx;
color: #959DA9;
}
\ No newline at end of file
pages/play/home/home.js
......@@ -11,42 +11,6 @@ Page({
navigationLogoTop: 0,
navigationLogoMarginTop: 0,
tabMarginTop: 0,
// banner: [],
// bannerIndex: 0,
tab: [
{
'text': '艺文',
'defaultImage': './image/literatue.png',
'activeImage': './image/literatue-s.png',
}, {
'text': '健康',
'defaultImage': './image/healthy.png',
'activeImage': './image/healthy-s.png',
}, {
'text': '美食',
'defaultImage': './image/food.png',
'activeImage': './image/food-s.png',
}, {
'text': '休闲',
'defaultImage': './image/relaxation.png',
'activeImage': './image/relaxation-s.png',
}, {
'text': '住宿',
'defaultImage': './image/hotel.png',
'activeImage': './image/hotel-s.png',
}
],
tabIndex: 0,
tabDetail: [],
navigationBackground: 'rgba(0, 0, 0, 0)',
navigationFixed: false,
navigationFixedBoundary: 212,
navigationCapsuleTop: wx.getMenuButtonBoundingClientRect().top,
recentList: [
{
......@@ -92,107 +56,37 @@ Page({
swiperMovieCurrent: 0
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
this.setData({
navigationFixedBoundary: 700 / 750 * wx.getSystemInfoSync().windowWidth
})
this.setNavigationLogo()
this.queryDetail()
},
onShow: function () {
this.getActivityList(1)
},
queryDetail: function () {
let response = [
{
describe: [
App.globalData.appResourcesBase + 'play/detail/detail-1-1.png'
],
shop: [{
id: 1,
name: '海错图展馆',
cover: App.globalData.appResourcesBase + 'play/detail/detail-1-2.png',
x: 108,
y: 212,
}, {
id: 2,
name: '拾光花坊',
cover: App.globalData.appResourcesBase + 'play/detail/detail-1-3.png',
x: 108,
y: 264,
}]
}, {
describe: [
App.globalData.appResourcesBase + 'play/detail/detail-2-1.png'
],
shop: [{
id: 3,
name: '水元养韵SPA',
cover: App.globalData.appResourcesBase + 'play/detail/detail-2-2.png',
x: 108,
y: 212,
}]
}, {
describe: [
App.globalData.appResourcesBase + 'play/detail/detail-3-1.png'
],
shop: [{
id: 4,
name: '原味舒食',
cover: App.globalData.appResourcesBase + 'play/detail/detail-3-2.png',
x: 108,
y: 212,
}, {
id: 5,
name: '原野MOJITO',
cover: App.globalData.appResourcesBase + 'play/detail/detail-3-3.png',
x: 108,
y: 212,
}]
}, {
describe: [
App.globalData.appResourcesBase + 'play/detail/detail-4-1.png'
],
shop: [{
id: 6,
name: '星空影院',
cover: App.globalData.appResourcesBase + 'play/detail/detail-4-2.png',
x: 108,
y: 212,
}]
}, {
describe: [
App.globalData.appResourcesBase + 'play/detail/detail-5-1.png'
],
shop: []
},
]
this.setData({
tabDetail: response
})
},
/**
* 设置标题高度
* @function
* @param
* @returns
*/
setNavigationLogo: function () {
let funcUnitProportion = wx.getStorageSync('unitProportion')
let funcLogoTop = App.modular.utils.navigationElementCenterMarginTop(50)
let funcLogoMinorTop = funcLogoTop + 50 * funcUnitProportion + 20 * funcUnitProportion
let funcTabMarginTop = funcLogoMinorTop + 20 * funcUnitProportion
this.setData({
navigationLogoTop: funcLogoTop,
navigationLogoMarginTop: funcLogoMinorTop,
tabMarginTop: funcTabMarginTop
})
},
/**
* 设置标题高度
* @function
* @param
* @returns
*/
onActivity: function () {
wx.navigateTo({
url: '/pages/play/activity/activity'
......@@ -206,68 +100,12 @@ Page({
})
},
onTabSelection: function (funcEvent) {
this.setData({
tabIndex: funcEvent.currentTarget.dataset.index
})
},
onPageScroll: function (funcEvent) {
// console.log(funcEvent)
// 优化滚动事件触发频率
// if (logicData.pageScrollLock) return
// logicData.pageScrollLock = true
this.setTab(funcEvent)
// 恢复滚动事件
// logicData.pageScrollTimer = setTimeout(function () {
// logicData.pageScrollLock = false
// clearTimeout(logicData.pageScrollTimer)
// }, 20)
},
setTab: function (funcEvent) {
// 判断标签吸顶边距
if (funcEvent.scrollTop - this.data.navigationFixedBoundary > -20 && !this.data.navigationFixed) {
this.setData({
navigationFixed: true
})
}
if (funcEvent.scrollTop - this.data.navigationFixedBoundary < -20 && this.data.navigationFixed) {
this.setData({
navigationFixed: false
})
}
if (funcEvent.scrollTop > 40 && this.data.navigationBackground !== 'rgba(255, 255, 255, 1)') {
this.setData({
navigationBackground: 'rgba(255, 255, 255, 1)'
})
}
if (funcEvent.scrollTop <= 40) {
this.setData({
navigationBackground: 'rgba(0, 0, 0, 0)'
})
}
},
onShopDetail: function (funcItem) {
wx.navigateTo({
url: '/pages/play/service-detail/service-detail?id=' + funcItem.currentTarget.dataset.id
})
},
eventBannerChange: function (event) {
this.setData({
bannerIndex: event.detail.current
})
},
//主题活动列表 type 1 近期 0 往期
getActivityList(type) {
var that = this
......@@ -313,23 +151,33 @@ Page({
//跳转到艺文
onToArt: function () {
console.log('art')
wx.navigateTo({
url: '/pages/play/service/service?type=0&title=文艺'
})
},
//跳转到健康
onToHealth: function () {
console.log('Health')
wx.navigateTo({
url: '/pages/play/service/service?type=1&title=健康'
})
},
//跳转到美食
onToFood: function () {
console.log('Food')
wx.navigateTo({
url: '/pages/play/service/service?type=2&title=美食'
})
},
//跳转到休闲
onToLeisure: function () {
console.log('Leisure')
wx.navigateTo({
url: '/pages/play/service/service?type=3&title=休闲'
})
},
//跳转到住宿
onToHotel: function () {
console.log('Hotel')
wx.navigateTo({
url: '/pages/play/service/service?type=4&title=住宿'
})
},
// 近期活动swiper
......@@ -345,5 +193,14 @@ Page({
this.setData({
swiperMovieCurrent
})
}
},
onAllRecent: function () {
wx.navigateTo({
url: '/pages/play/movie/movie'
})
},
})
\ No newline at end of file
pages/play/home/home.wxml
<navigation class="navigation" background="{{navigationBackground}}"></navigation>
<navigation class="navigation" background="#FFFFFF"></navigation>
<view class="container">
<image class="logo" src="./image/title.png" style="{{'top: ' + navigationLogoTop + 'px'}}"></image>
<view class="logo-minor row align-c" style="{{'top: ' + (navigationLogoMarginTop - 2) + 'px; background: ' + navigationBackground}}">
<view class="logo-minor row align-c" style="{{'top: ' + (navigationLogoMarginTop - 2) + 'px; background: #FFFFFF'}}">
<image src="./image/title-minor.png"></image>
</view>
......@@ -17,7 +17,7 @@
<view class="title-wrapper row con-b align-c">
<image class="title">近期活动</image>
<image class="all" bindtap="onAllRecent">查看全部</image>
<text bindtap="onAllRecent">查看全部</text>
</view>
<swiper class="recent-swiper" next-margin="38rpx" bindchange="swiperRecentChange">
<block wx:for="{{recentList}}" wx:key="id">
......@@ -34,7 +34,7 @@
<swiper class="movie-swiper" next-margin="38rpx" bindchange="swiperMovieChange">
<block wx:for="{{movieList}}" wx:key="id">
<swiper-item class="movie-item col con-e">
<view class="movie-wrapper {{swiperMovieCurrent === index ? 'movie-item-left' : '' }} {{swiperMovieCurrent === movieList.length - 1 ? 'movie-item-center' : ''}}">
<view class="movie-wrapper {{swiperMovieCurrent === index ? 'movie-item-left' : '' }} {{swiperMovieCurrent === movieList.length - 1 ? 'movie-item-center' : ''}}">
<view class="movie-cover">
<image src="{{item.img}}"></image>
</view>
......@@ -65,59 +65,8 @@
<text>报名观影</text>
</view>
</view>
</view>
</view>
</swiper-item>
</block>
</swiper>
<!-- <view class="banner">
<swiper autoplay circular interval="2000" next-margin="64rpx" bindchange="eventBannerChange">
<block wx:for="{{banner}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<swiper-item>
<image src="{{item.cover}}" class="{{bannerIndex !== index ? 'banner-content': 'banner-content-active'}}" data-id="{{item.id}}" bindtap="onActivityDetail"/>
</swiper-item>
</block>
</swiper>
</view> -->
<!-- 更多活动 -->
<!-- <view class="activity row con-e align-c" bindtap="onActivity">
<text>查看全部活动</text>
<image src="/image/more.png"></image>
</view> -->
<!-- <view class="ornament-wave">
<image src="/image/ornament-1.png"></image>
</view> -->
<!-- 板块标签 -->
<!-- <view class="tab row con-b align-c {{navigationFixed ? 'tab-fixed' : ''}}" style="{{navigationFixed ? 'top: ' + (tabMarginTop - 4) + 'px' : ''}}">
<block wx:for="{{tab}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="tab-item col con-c" data-index="{{index}}" bindtap="onTabSelection">
<view class="row con-c align-c {{tabIndex === index ? 'tab-item-active' : 'tab-item-inactive'}}">
<image src="{{tabIndex === index ? item.activeImage : item.defaultImage}}"></image>
</view>
<view class="row con-c align-c {{tabIndex === index ? 'tab-item-text-active' : 'tab-item-text-inactive'}}">
<text>{{item.text}}</text>
</view>
</view>
</block>
</view>
<view class="tab-blank" hidden="{{!navigationFixed}}"></view> -->
<!-- <view class="detail">
<block wx:for="{{tabDetail[tabIndex].describe}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<image mode="widthFix" src="{{item}}"></image>
</block>
</view> -->
<!-- <view class="shop">
<block wx:for="{{tabDetail[tabIndex].shop}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="shop-item">
<image src="{{item.cover}}"></image>
<button class="button row con-c align-c" style="{{'bottom: ' + item.y + 'rpx;left: ' + item.x + 'rpx;'}}" data-id="{{item.id}}" bindtap="onShopDetail">立即预定</button>
</view>
</block>
</view> -->
</view>
\ No newline at end of file
pages/play/service/service.js
let App = getApp()
Page({
data: {
navTitle: '',
tabIndex: 0,
tabDetail: [],
},
onLoad: function (options) {
this.setData({
navTitle: options.title,
tabIndex: options.type,
})
this.queryDetail()
},
queryDetail: function () {
let response = [
{
describe: [
App.globalData.appResourcesBase + 'play/detail/detail-1-1.png'
],
shop: [{
appId: 1,
name: '海错图展馆',
cover: App.globalData.appResourcesBase + 'play/detail/detail-1-2.png',
x: 108,
y: 212,
}, {
appId: 5,
name: '拾光花坊',
cover: App.globalData.appResourcesBase + 'play/detail/detail-1-3.png',
x: 108,
y: 264,
}]
}, {
describe: [
App.globalData.appResourcesBase + 'play/detail/detail-2-1.png'
],
shop: [{
appId: 7,
name: '水元养韵SPA',
cover: App.globalData.appResourcesBase + 'play/detail/detail-2-2.png',
x: 108,
y: 212,
}]
}, {
describe: [
App.globalData.appResourcesBase + 'play/detail/detail-3-1.png'
],
shop: [{
appId: 6,
name: '原味舒食',
cover: App.globalData.appResourcesBase + 'play/detail/detail-3-2.png',
x: 108,
y: 212,
}, {
appId: 4,
name: '原野MOJITO',
cover: App.globalData.appResourcesBase + 'play/detail/detail-3-3.png',
x: 108,
y: 212,
}]
}, {
describe: [
App.globalData.appResourcesBase + 'play/detail/detail-4-1.png'
],
shop: [{
appId: 2,
name: '星空影院',
cover: App.globalData.appResourcesBase + 'play/detail/detail-4-2.png',
x: 108,
y: 212,
}]
}, {
describe: [
App.globalData.appResourcesBase + 'play/detail/detail-5-1.png'
],
shop: []
},
]
this.setData({
tabDetail: response
})
},
onShopDetail: function (funcItem) {
let funcShopAppId = funcItem.currentTarget.dataset.id
console.log('funcShopAppId', funcShopAppId)
wx.navigateTo({
url: '/pages/play/service-detail/service-detail?id=' + funcShopAppId
})
},
})
\ No newline at end of file
pages/play/service/service.wxml
<!--pages/home/home/home.wxml-->
<text>pages/home/home/home.wxml</text>
<navigation class="navigation" titleText="{{navTitle}}" background="#FFFFFF" backIcon="/image/icon/arrow-l-1.png"></navigation>
<view class="container">
<view class="detail">
<block wx:for="{{tabDetail[tabIndex].describe}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<image mode="widthFix" src="{{item}}"></image>
</block>
</view>
<view class="shop">
<block wx:for="{{tabDetail[tabIndex].shop}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="shop-item">
<image src="{{item.cover}}"></image>
<button
class="button row con-c align-c"
style="{{'bottom: ' + item.y + 'rpx;left: ' + item.x + 'rpx;'}}"
data-id="{{item.appId}}"
bindtap="onShopDetail"
>
<text>立即预定</text>
</button>
</view>
</block>
</view>
</view>
\ No newline at end of file
pages/play/service/service.wxss
/* pages/home/home/home.wxss */
\ No newline at end of file
page {
background: linear-gradient(182deg,#FFFFFF 0%,#EBEDF7 100%);
}
.navigation {
z-index: 1900;
}
.container {
margin-top: 60rpx;
}
/* 详情 */
.detail {
width: 750rpx;
min-height: 500rpx;
background: #fefefe;
}
.detail image {
display: block;
width: 100%;
height: 100%;
}
/* 商店详情 */
.shop-item {
position: relative;
width: 750rpx;
height: 1152rpx;
background: #f3f6fc;
}
.shop-item image {
display: block;
width: 750rpx;
height: 1152rpx;
font-size: 0;
}
.shop-item .button {
position: absolute;
width: 534rpx;
height: 96rpx;
background: #86C5E1;
border-radius: 2px;
overflow: hidden;
font-size: 30rpx;
font-weight: 500;
color: #ffffff;
line-height: 42rpx;
}
\ 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