Skip to content

严立 / mini-shimao

Go to a project
Commit 5dde238d by wjw
Options

ww-畅玩界面接口修改

parents 93370b34 db659438
Expand all
Inline Side-by-side
Showing with 922 additions and 339 deletions
pages/commodity/home/home.js
const App = getApp() const App = getApp()
Page({ Page({
data: { data: {
imageBase: App.globalData.appImageBase, imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase, resourcesBase: App.globalData.appResourcesBase,
option: {}, option: {},
userInfo: {},
greetingName: '', // 问候姓名
greetingMessage: '', // 问候消息
phone: '13316748039', phone: '13316748039',
hotline: false, //客服热线 hotline: false, //客服热线
...@@ -17,8 +21,11 @@ Page({ ...@@ -17,8 +21,11 @@ Page({
onLoad: function (option) { onLoad: function (option) {
this.setData({ this.setData({
option: option option: option,
userInfo: wx.getStorageSync('userInfo')
}) })
this.setGreetingMessage()
// formPage=order&shopAppId=1&commodityType=5 // formPage=order&shopAppId=1&commodityType=5
}, },
...@@ -28,6 +35,54 @@ Page({ ...@@ -28,6 +35,54 @@ Page({
}, },
/** /**
* 问候消息
* @function
* @param {object} - funcEvent
* @returns
*/
setGreetingMessage: function () {
let funcHour = Number(App.modular.miment().format('hh'))
let funcMinute = Number(App.modular.miment().format('mm'))
let funcTime = [{
'min': 0,
'max': 12,
'message': '上午好！'
}, {
'min': 12,
'max': 18,
'message': '下午好！'
}, {
'min': 18,
'max': 24,
'message': '晚上好！'
}]
let funcIndex = 0
for (let i = 0, l = funcTime.length; i < l; i ++) {
// 判断小时区间
if (funcTime[i].min < funcHour && funcHour <= funcTime[i].max) {
// 如果小时区间等于该区间最大数值，那么分钟不为零时递增一个区间
if (funcHour === funcTime[i].max && 0 < funcMinute) {
funcIndex = i + 1
} else {
funcIndex = i
}
break
}
}
let funcGreetingName = this.data.userInfo.name
if (funcGreetingName.length > 5) funcGreetingName = funcGreetingName.substring(0, 5) + '...'
if (funcGreetingName === '') funcGreetingName = 'Hello，'
this.setData({
greetingName: funcGreetingName,
greetingMessage: funcTime[funcIndex].message
})
},
/**
* 查询推荐商品 * 查询推荐商品
* @function * @function
* @param {object} - funcEvent * @param {object} - funcEvent
...@@ -190,6 +245,7 @@ Page({ ...@@ -190,6 +245,7 @@ Page({
'logo': funcShopId[i].logo, 'logo': funcShopId[i].logo,
'cover': funcShopId[i].cover, 'cover': funcShopId[i].cover,
'shopType': funcShopType, 'shopType': funcShopType,
'commodityLogo': funcShopId[i].commodityLogo
} }
wx.setStorageSync('shopInfoBuffer', funcShopInfo) wx.setStorageSync('shopInfoBuffer', funcShopInfo)
break break
......
pages/commodity/home/home.wxml
<navigation class="navigation"></navigation> <navigation class="navigation"></navigation>
<view class="container"> <view class="container">
<view class="title"> <!-- 问候订制 -->
<image src="{{resourcesBase + 'commodity/home/title.png'}}" class="title_img"></image> <view class="greeting">
<text>{{greetingName + greetingMessage}}</text>
</view> </view>
<!-- 商店 --> <!-- 商店 -->
......
pages/commodity/home/home.wxss
...@@ -11,12 +11,6 @@ ...@@ -11,12 +11,6 @@
text-align: left; text-align: left;
} }
.title_img {
width: 214rpx;
height: 50rpx;
margin-top: 128rpx;
}
.greetings_body { .greetings_body {
width: 750rpx; width: 750rpx;
height: height; height: height;
...@@ -182,14 +176,17 @@ ...@@ -182,14 +176,17 @@
font-weight: 500; font-weight: 500;
} }
.title { .greeting {
width: 750rpx; width: 750rpx;
height: 280rpx; padding: 140rpx 46rpx 130rpx 46rpx;
} }
.title image { .greeting text {
width: 750rpx; height: 82rpx;
height: 80rpx; font-size: 58rpx;
font-weight: 500;
line-height: 82rpx;
color: #15191F;
} }
/* 商店样式 */ /* 商店样式 */
......
pages/commodity/menu-food/menu-food.js
...@@ -39,15 +39,15 @@ Page({ ...@@ -39,15 +39,15 @@ Page({
}) })
this.setSideBarStyle() this.setSideBarStyle()
},
onShow: function () {
this.resetShoppingCart() this.resetShoppingCart()
this.setCartAnimation() this.setCartAnimation()
this.setShopInfo() this.setShopInfo()
this.querySideBar() this.querySideBar()
},
onShow: function () {
if (wx.getStorageSync('shoppingCartBuffer').length === 0) { if (wx.getStorageSync('shoppingCartBuffer').length === 0) {
this.resetShoppingCart() this.resetShoppingCart()
} else { } else {
...@@ -116,6 +116,24 @@ Page({ ...@@ -116,6 +116,24 @@ Page({
}, },
setShopInfo: function () { setShopInfo: function () {
if (this.data.option.formPage === 'order') {
let funcAppId = Number(this.data.option.shopAppId)
for (let i = 0, l = App.globalData.shopId.length; i < l; i++) {
if (funcAppId === App.globalData.shopId[i].appId) {
let funcShopInfo = {
'appId': App.globalData.shopId[i].appId,
'id': App.globalData.shopId[i].id,
'name': App.globalData.shopId[i].name,
'logo': App.globalData.shopId[i].logo,
'shopType': Number(this.data.option.commodityType)
}
wx.setStorageSync('shopInfoBuffer', funcShopInfo)
break
}
}
}
let funcShopInfo = wx.getStorageSync('shopInfoBuffer') let funcShopInfo = wx.getStorageSync('shopInfoBuffer')
this.setData({ this.setData({
shopInfo: funcShopInfo shopInfo: funcShopInfo
...@@ -346,8 +364,6 @@ Page({ ...@@ -346,8 +364,6 @@ Page({
funcItem = this.data.commodityDetail funcItem = this.data.commodityDetail
} }
console.log(funcItem)
// 判断购物车中是否存在同类商品 // 判断购物车中是否存在同类商品
// 修改相应的商品数量 // 修改相应的商品数量
if (funcShoppingCart.length !== 0) { if (funcShoppingCart.length !== 0) {
......
pages/commodity/project-detail/project-detail.js
...@@ -94,6 +94,7 @@ Page({ ...@@ -94,6 +94,7 @@ Page({
'priceType': 1, 'priceType': 1,
'describe': funcResponse[i].synopsis, 'describe': funcResponse[i].synopsis,
'tags': funcResponse[i].tags, 'tags': funcResponse[i].tags,
'notificationId': funcResponse[i].notificationId, // 下单须知
} }
let funcUserType = wx.getStorageSync('userInfo').userType let funcUserType = wx.getStorageSync('userInfo').userType
...@@ -135,6 +136,7 @@ Page({ ...@@ -135,6 +136,7 @@ Page({
'priceType': 1, 'priceType': 1,
'describe': funcResponse[i].synopsis, 'describe': funcResponse[i].synopsis,
'tags': funcResponse[i].tags, 'tags': funcResponse[i].tags,
'notificationId': funcResponse[i].notificationId, // 下单须知
} }
let funcUserType = wx.getStorageSync('userInfo').userType let funcUserType = wx.getStorageSync('userInfo').userType
......
pages/commodity/project/project.wxss
...@@ -26,110 +26,132 @@ ...@@ -26,110 +26,132 @@
left: 0; left: 0;
} }
.project-wrapper { /* 门店样式 */
.shop-list {
background: #F3F4F6;
}
.shop-item {
width: 670rpx; width: 670rpx;
margin-top: 48rpx; margin: 48rpx 40rpx 0 40rpx;
padding: 36rpx 32rpx 14rpx; padding: 32rpx;
background-color: #fff; border-radius: 4px;
background: #FFFFFF;
} }
.project-title {
height: 88rpx; .shop-name {
background-color: #ccc; width: 606rpx;
height: 70rpx;
} }
.project-item {
margin-top: 48rpx; .shop-name image {
padding-bottom: 50rpx; margin-right: 20rpx;
border-bottom: 1px solid #E2E7EF; }
/* 商品信息样式 */
.commodity-item {
height: 214rpx;
margin-top: 50rpx;
border-bottom: 1px #E2E7EF solid;
} }
.project-item:last-child {
.commodity-item:last-child {
border-bottom: none; border-bottom: none;
} }
.project-cover { .commodity-cover image {
width: 128rpx; width: 128rpx;
height: 128rpx; height: 128rpx;
background-color: #ccc; margin-right: 24rpx;
background: #999999;
} }
.project-content { .commodity-describe {
margin-left: 24rpx; position: relative;
flex: 1; flex-grow: 1;
} }
.project-info { .commodity-describe text:nth-child(1) {
height: 42rpx;
}
.project-name {
height: 46rpx;
color: #15191F;
font-size: 30rpx; font-size: 30rpx;
font-weight: 600; font-weight: 500;
line-height: 42rpx;
color: #15191F;
overflow: hidden;
text-overflow: ellipsis;
} }
.project-msg text {
margin-top: 8rpx; .commodity-describe text:nth-child(2) {
color: #959DA9; position: absolute;
top: 54rpx;
left: 0;
max-width: 320rpx;
max-height: 120rpx;
border: 1px red solid;
background: #FFFFFF;
overflow: hidden;
font-size: 22rpx; font-size: 22rpx;
} font-weight: 400;
.project-price-wrapper { line-height: 40rpx;
flex: 1; word-wrap: break-word;
height: 100%; color: #959DA9;
width: 100%;
}
.project-price-special {
}
.price-wrap {
color: #EF4E4E;
letter-spacing: 2rpx;
display: table-cell;
vertical-align: bottom;
} }
.price-symbol { .commodity-price-symbol {
height: 32rpx;
font-size: 24rpx; font-size: 24rpx;
font-weight: 500;
line-height: 32rpx;
color: #EF4E4E;
} }
.price-special { .commodity-price-value {
font-size: 34rpx; height: 32rpx;
font-size: 32rpx;
font-weight: 500;
line-height: 32rpx;
color: #EF4E4E;
} }
.price-special-msg {
.commodity-price-special {
display: inline-block;
width: 78rpx; width: 78rpx;
height: 32rpx; height: 32rpx;
color: #E8D0AF; margin: 0 0 0 8rpx;
font-size: 18rpx; border-radius: 4px;
background: linear-gradient(180deg, #3F4357 0%, #252532 100%);
text-align: center; text-align: center;
font-size: 18rpx;
font-weight: 500;
line-height: 32rpx; line-height: 32rpx;
background: linear-gradient(180deg, #3F4357 0%, #252532 100%); color: #E8D0AF;
border-radius: 4rpx;
} }
.project-price-old {
.commodity-price-through {
margin-top: 12rpx;
}
.commodity-price-through text {
height: 32rpx; height: 32rpx;
color: #959DA9; font-size: 22rpx;
font-weight: 400;
line-height: 32rpx; line-height: 32rpx;
text-decoration: line-through; text-decoration: line-through;
color: #959DA9;
} }
.price-old {
font-size: 22rpx; .commodity-price-operation button {
}
.price-symbol-old {
font-size: 20rpx;
}
.project-buy-wrapper {
flex: 1;
}
.project-buy-btn {
width: 120rpx; width: 120rpx;
height: 56rpx; height: 56rpx;
margin-top: 24rpx; margin-top: 24rpx;
color: #fff; border-radius: 4px;
font-size: 22rpx; background: #86C5E1;
line-height: 56rpx;
text-align: center;
background-color: #86C5E1;
border-radius: 4rpx;
}
image { font-size: 22rpx;
width: 100%; font-weight: 500;
height: 100%; line-height: 32rpx;
} color: #FFFFFF;
}
\ No newline at end of file
pages/commodity/shopping-cart/shopping-cart.js
...@@ -7,7 +7,6 @@ Page({ ...@@ -7,7 +7,6 @@ Page({
shopId: '', shopId: '',
shopName: '',
shopLogo: '', shopLogo: '',
shoppingCart: [], // 购物车列表 shoppingCart: [], // 购物车列表
shoppingCartSelection: 0, // 购物车选择数量 shoppingCartSelection: 0, // 购物车选择数量
...@@ -101,8 +100,7 @@ Page({ ...@@ -101,8 +100,7 @@ Page({
let funcShopInfo = wx.getStorageSync('shopInfoBuffer') let funcShopInfo = wx.getStorageSync('shopInfoBuffer')
this.setData({ this.setData({
shopId: funcShopInfo.id, shopId: funcShopInfo.id,
shopName: funcShopInfo.name, shopLogo: funcShopInfo.commodityLogo
shopLogo: funcShopInfo.logo
}) })
console.log(this.data.shopLogo) console.log(this.data.shopLogo)
...@@ -161,7 +159,7 @@ Page({ ...@@ -161,7 +159,7 @@ Page({
let funcShoppingCart = this.data.shoppingCart let funcShoppingCart = this.data.shoppingCart
if (funcShoppingCart[funcIndex].quantityMax <= funcShoppingCart[funcIndex].quantity) return if (funcShoppingCart[funcIndex].quantityMax <= funcShoppingCart[funcIndex].quantity) return
funcShoppingCart[funcIndex].quantity = funcShoppingCart[funcIndex].quantity + 1 funcShoppingCart[funcIndex].quantity = funcShoppingCart[funcIndex].quantity + 100
this.setData({ this.setData({
shoppingCart: funcShoppingCart shoppingCart: funcShoppingCart
}) })
......
pages/commodity/shopping-cart/shopping-cart.wxml
...@@ -3,9 +3,8 @@ ...@@ -3,9 +3,8 @@
<l-toast show="{{winToast}}" icon="error" title="请选购商品后结算"></l-toast> <l-toast show="{{winToast}}" icon="error" title="请选购商品后结算"></l-toast>
<view class="container" wx:if="{{shoppingCart.length > 0}}"> <view class="container" wx:if="{{shoppingCart.length > 0}}">
<view class="shop-info row align-c"> <view class="shop-info row con-b align-c">
<image wx:if="{{shopLogo}}" src="{{resourcesBase + shopLogo}}" mode="left"></image> <image wx:if="{{shopLogo}}" src="{{resourcesBase + shopLogo}}" mode="widthFix"></image>
<text>{{shopName}}</text>
<text bindtap="onClearn">清空</text> <text bindtap="onClearn">清空</text>
</view> </view>
......
pages/commodity/shopping-cart/shopping-cart.wxss
...@@ -12,33 +12,23 @@ ...@@ -12,33 +12,23 @@
.shop-info { .shop-info {
width: 750rpx; width: 750rpx;
height: 116rpx; height: 110rpx;
padding: 16rpx 40rpx; padding: 0 30rpx 0 40rpx;
font-size: 30rpx; font-size: 30rpx;
} }
.shop-info > image { .shop-info > image {
max-width: 120rpx; width: 380rpx;
height: 100%; height: 110rpx;
} }
.shop-info > text:nth-child(2) { .shop-info > text {
flex-grow: 1;
height: 42rpx; height: 42rpx;
font-size: 30rpx; font-size: 30rpx;
font-weight: 500; font-weight: 500;
line-height: 42rpx; line-height: 42rpx;
color: #586A46; color: #586A46;
} }
.shop-info > text:nth-child(3) {
flex-grow: 1;
height: 100rpx;
text-align: right;
line-height: 100rpx;
color: #656e7b;
}
.l-content { .l-content {
color: #959da9 !important; color: #959da9 !important;
} }
...@@ -134,6 +124,8 @@ ...@@ -134,6 +124,8 @@
font-weight: 400; font-weight: 400;
line-height: 32rpx; line-height: 32rpx;
color: #959DA9; color: #959DA9;
text-decoration: line-through;
} }
.list-item-quantity { .list-item-quantity {
......
pages/home/home/home.js
...@@ -71,7 +71,7 @@ Page({ ...@@ -71,7 +71,7 @@ Page({
App.login({ App.login({
success: function (token) { success: function (token) {
that.getBanner() that.getBanner()
that.loadVisiterPlanList() // that.loadVisiterPlanList()
that.getNoticeList() that.getNoticeList()
that.getBrands() that.getBrands()
} }
...@@ -237,82 +237,82 @@ Page({ ...@@ -237,82 +237,82 @@ Page({
}, },
// 游客攻略列表 // // 游客攻略列表
loadVisiterPlanList() { // loadVisiterPlanList() {
this.data.loading = true // this.data.loading = true
var that = this // var that = this
App.wxRequest({ // App.wxRequest({
url: '/api/v1/strategy/getList', // url: '/api/v1/strategy/getList',
data: { pageSize: that.data.pageSize+'', pageNo: that.data.pageNo+''}, // data: { pageSize: that.data.pageSize+'', pageNo: that.data.pageNo+''},
success: function (res) { // success: function (res) {
console.log(res) // console.log(res)
that.setData({ // that.setData({
loading: false // loading: false
}) // })
if (res.data.list.length > 0) { // if (res.data.list.length > 0) {
let count = that.data.strategyOriginList.length // let count = that.data.strategyOriginList.length
if (that.data.pageNo == 1) { // if (that.data.pageNo == 1) {
count = 0 // count = 0
} // }
let tempArray = [] // let tempArray = []
for(let i = 0; i < res.data.list.length; i++) { // for(let i = 0; i < res.data.list.length; i++) {
let item = res.data.list[i] // let item = res.data.list[i]
let strategy = { // let strategy = {
id: item.id, // id: item.id,
image: (count == 0 && i == 0) ? item.topImg : item.cover, // image: (count == 0 && i == 0) ? item.topImg : item.cover,
title: item.title, // title: item.title,
date: item.updateDate, // date: item.updateDate,
index: count + i - 1, // index: count + i - 1,
} // }
tempArray.push(strategy) // tempArray.push(strategy)
} // }
if (that.data.pageNo == 1) { // if (that.data.pageNo == 1) {
var newArr = tempArray.slice(1) // var newArr = tempArray.slice(1)
var firstItem = tempArray[0] // var firstItem = tempArray[0]
that.setData({ // that.setData({
moreData: (tempArray.length >= Number(res.data.count)) ? false : true, // moreData: (tempArray.length >= Number(res.data.count)) ? false : true,
['strategyFirstItem.id']: firstItem.id, // ['strategyFirstItem.id']: firstItem.id,
['strategyFirstItem.image']: firstItem.image, // ['strategyFirstItem.image']: firstItem.image,
['strategyFirstItem.title']: firstItem.title, // ['strategyFirstItem.title']: firstItem.title,
['strategyFirstItem.date']: firstItem.date, // ['strategyFirstItem.date']: firstItem.date,
strategyList: newArr, // strategyList: newArr,
strategyOriginList: tempArray, // strategyOriginList: tempArray,
}) // })
} else { // } else {
that.setData({ // that.setData({
moreData: (count + tempArray.length >= Number(res.data.count)) ? false : true, // moreData: (count + tempArray.length >= Number(res.data.count)) ? false : true,
strategyOriginList: that.data.strategyOriginList.concat(tempArray), // strategyOriginList: that.data.strategyOriginList.concat(tempArray),
strategyList: tempArray, // strategyList: tempArray,
}) // })
} // }
// 游客攻略瀑布列表 // // 游客攻略瀑布列表
// wx.lin.renderWaterFlow(that.data.strategyList, that.data.pageNo == 1 ? true : false, () => {}) // // wx.lin.renderWaterFlow(that.data.strategyList, that.data.pageNo == 1 ? true : false, () => {})
} else { // } else {
} // }
}, // },
fail: function(err) { // fail: function(err) {
that.setData({ // that.setData({
loading: false // loading: false
}) // })
} // }
}) // })
}, // },
onReachBottom: function() { // onReachBottom: function() {
// console.log('触底啦') // // console.log('触底啦')
if (this.data.loading || !this.data.moreData) { // if (this.data.loading || !this.data.moreData) {
return // return
} // }
this.data.pageNo += 1 // this.data.pageNo += 1
this.loadVisiterPlanList() // this.loadVisiterPlanList()
}, // },
// 最新动态列表 // 最新动态列表
getNoticeList() { getNoticeList() {
......
pages/home/home/home.wxml
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<view class="banner-notice login-notice row align-c" bindtap="onLogin" wx:if="{{!isLogin}}"> <view class="banner-notice login-notice row align-c" bindtap="onLogin" wx:if="{{!isLogin}}">
<view class="row align-c"> <view class="row align-c">
<image src="./image/inform.png"></image> <image src="/image/wechat.png"></image>
<text>微信登陆</text> <text>微信登陆</text>
</view> </view>
<view class="row con-b align-c"> <view class="row con-b align-c">
......
pages/mine/card/card.js
...@@ -4,7 +4,7 @@ const App = getApp() ...@@ -4,7 +4,7 @@ const App = getApp()
Page({ Page({
data: { data: {
imageBase: App.globalData.appImageBase, imageBase: App.globalData.appImageBase,
passListType: 0, // 0为单张卡 1为多张卡 passListType: 1, // 0为单张卡 1为多张卡
privateStatus: true, privateStatus: true,
swiperCurrent: 0, swiperCurrent: 0,
passList: [ passList: [
......
pages/mine/home/home.js
...@@ -77,7 +77,8 @@ Page({ ...@@ -77,7 +77,8 @@ Page({
img: '', img: '',
title: '日落观光游船体验活动之船行碧波共赏美景', title: '日落观光游船体验活动之船行碧波共赏美景',
num: 3 num: 3
}] }],
orderListBackup: []
}, },
close() { close() {
...@@ -109,7 +110,59 @@ Page({ ...@@ -109,7 +110,59 @@ Page({
// 去核销 // 去核销
goCouponInput(event) { goCouponInput(event) {
wx.navigateTo({ wx.navigateTo({
url: '/pages/pay/coupon-input/coupon-input', url: '/pages/pay/coupon-input/coupon-input',
})
},
//获取待使用订单
getWillUseOrders() {
let that = this
App.wxRequest({
url: '/api/v1/order/getOrderList',
data: {
goodType: "", //数据字典(good_type) 商品分类(全部为"")
status: 2, //状态(-1已取消0未付款1未发货2待使用3已使用4已过期)
pageNo: 1,
pageSize: -1
},
success: function (res) {
let tmpArr = []
console.log('daishiyongdingdan', res);
let list = res.data
let listBackUp = JSON.parse(JSON.stringify(list)) //备份数据
let orderList = `myOrder.artOrder.orderList`
list.length = 1
that.setData({
[orderList]: list,
orderListBackup: listBackUp
})
}
})
},
//获取卡数据
getCardList() {
let that = this
App.wxRequest({
url: '/api/v1/volume/getVolumeList',
data: {
status: "", //0已过期1待使用2已使用(""全部)
pageNo: 1,
pageSize: -1
},
success: function (res) {
let tmpArr = []
console.log('卡片数据', res);
let list = res.data.map(item => {
return item
})
let passOrder = `myOrder.passOrder`
that.setData({
[passOrder]: list
})
}
}) })
}, },
...@@ -145,6 +198,8 @@ Page({ ...@@ -145,6 +198,8 @@ Page({
userInfo: funcUserInfo userInfo: funcUserInfo
}) })
this.getMyActivityList() this.getMyActivityList()
this.getCardList()
this.getWillUseOrders()
} else { } else {
this.setData({ this.setData({
isRegister: false, isRegister: false,
...@@ -328,9 +383,30 @@ Page({ ...@@ -328,9 +383,30 @@ Page({
//查看更多 //查看更多
onShowMoreOrder: function () { onShowMoreOrder: function () {
let showMoreOrder = !this.data.showMoreOrder let showMoreOrder = !this.data.showMoreOrder
let orderList = `myOrder.artOrder.orderList`
console.log(JSON.parse(JSON.stringify(this.data.orderListBackup)));
if (showMoreOrder) {
// 展开
this.setData({
[orderList]: JSON.parse(JSON.stringify(this.data.orderListBackup)),
})
} else {
// 收起
let list = JSON.parse(JSON.stringify(this.data.orderListBackup))
list.length = 1
this.setData({
[orderList]: list,
})
}
this.setData({ this.setData({
showMoreOrder showMoreOrder,
}) })
}, },
onShowMoreActivity: function () { onShowMoreActivity: function () {
let showMoreActivity = !this.data.showMoreActivity let showMoreActivity = !this.data.showMoreActivity
......
pages/mine/home/home.wxml
...@@ -128,41 +128,40 @@ ...@@ -128,41 +128,40 @@
<view class="pass-bg-two" wx:if="{{myOrder.passOrder.length > 1}}"></view> <view class="pass-bg-two" wx:if="{{myOrder.passOrder.length > 1}}"></view>
<view class="pass-logo-wrapper row align-c"> <view class="pass-logo-wrapper row align-c">
<image src="{{myOrder.passOrder[0].logo}}"></image> <image src="{{myOrder.passOrder[0].logo}}"></image>
<text>{{myOrder.passOrder[0].store}}</text> <text>{{myOrder.passOrder[0].officeName}}</text>
</view> </view>
<view class="pass-title"> <view class="pass-title">
<text>{{myOrder.passOrder[0].title}}</text> <text>精灵鸟理想国{{myOrder.passOrder[0].name}}</text>
</view> </view>
<view class="pass-time"> <view class="pass-time">
<text>{{myOrder.passOrder[0].time}}</text> <text>有效期至{{myOrder.passOrder[0].expireTime}}</text>
</view> </view>
<view class="pass-name"> <view class="pass-name">
<text>{{myOrder.passOrder[0].name}}</text> <text>{{myOrder.passOrder[0].personName}}</text>
</view> </view>
<view class="pass-idNum"> <view class="pass-idNum">
<text>{{myOrder.passOrder[0].idNum}}</text> <text>{{myOrder.passOrder[0].identityCard}}</text>
</view> </view>
</view> </view>
<!-- 商品 --> <!-- 商品 -->
<view class="goods-wrapper"> <view class="goods-wrapper" wx:for="{{myOrder.artOrder.orderList}}" wx:key="*this">
<view class="goods-logo-wrapper row align-c"> <view class="goods-logo-wrapper row align-c">
<view class="art-logo"> <view class="art-logo">
<image src="{{myOrder.artOrder.logo}}"></image> <image src="{{myOrder.artOrder.logo}}"></image>
</view> </view>
<text>{{myOrder.artOrder.orderList[0].store}}</text> <text>{{item.officeName}}</text>
</view> </view>
<view class="goods-content row align-c"> <view class="goods-content row align-c">
<image src="{{item.cover}}" wx:for="{{myOrder.artOrder.orderList}}" wx:key="id"></image> <image src="{{k.imgUrl}}" wx:for="{{item.smOrderDetails}}" wx:for-item="k" wx:key="*this"></image>
<text wx:if="{{myOrder.artOrder.orderList.length === 1}}">{{myOrder.artOrder.orderList[0].title}}</text> <text wx:if="{{item.smOrderDetails.length == 1}}">{{item.smOrderDetails[0].name}}</text>
</view> </view>
<view class="goods-footer row align-c con-b"> <view class="goods-footer row align-c con-b">
<text>{{myOrder.artOrder.orderList[0].time}}</text> <text>有效期至{{item.time}}</text>
<text>{{myOrder.artOrder.orderList[0].quantity}}</text> <text>共{{item.smOrderDetails.length}}</text>
</view> </view>
</view> </view>
<!-- more --> <!-- more -->
<view class="more row align-c con-c" bindtap="onShowMoreOrder"> <view class="more row align-c con-c" bindtap="onShowMoreOrder">
<text wx:if="{{!showMoreOrder}}">展开更多</text> <text wx:if="{{!showMoreOrder}}">展开更多</text>
......
pages/mine/home/home.wxss
.container { .container {
background: linear-gradient(180deg, #FFFFFF 0%, #F3F4F6 100%); background: linear-gradient(180deg, #fff 10%, #F3F4F6 20%);
/* background: #F3F4F6 */
} }
.navigation { .navigation {
z-index: 2; z-index: 2;
} }
...@@ -13,6 +15,7 @@ ...@@ -13,6 +15,7 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.mine { .mine {
position: relative; position: relative;
width: 750rpx; width: 750rpx;
...@@ -25,7 +28,7 @@ ...@@ -25,7 +28,7 @@
margin-right: 32rpx; margin-right: 32rpx;
} }
.mine-avatar > image { .mine-avatar>image {
width: 128rpx; width: 128rpx;
height: 128rpx; height: 128rpx;
border-radius: 50%; border-radius: 50%;
...@@ -61,10 +64,13 @@ ...@@ -61,10 +64,13 @@
padding: 41rpx 32rpx; padding: 41rpx 32rpx;
background-color: #fff; background-color: #fff;
border-radius: 4rpx; border-radius: 4rpx;
margin-top:48rpx;
} }
.cpopon-info { .cpopon-info {
flex: 1; flex: 1;
} }
.cpopon-info text:nth-child(1) { .cpopon-info text:nth-child(1) {
font-size: 34rpx; font-size: 34rpx;
font-weight: 600; font-weight: 600;
...@@ -76,6 +82,7 @@ ...@@ -76,6 +82,7 @@
font-size: 26rpx; font-size: 26rpx;
color: #161A1F; color: #161A1F;
} }
.coupon image { .coupon image {
width: 32rpx; width: 32rpx;
height: 32rpx; height: 32rpx;
...@@ -127,7 +134,7 @@ ...@@ -127,7 +134,7 @@
.menu { .menu {
width: 750rpx; width: 750rpx;
margin-top: 16rpx; /* margin-top: 16rpx; */
margin-bottom: 30rpx; margin-bottom: 30rpx;
padding: 0 48rpx; padding: 0 48rpx;
overflow-x: hidden; overflow-x: hidden;
...@@ -328,24 +335,30 @@ ...@@ -328,24 +335,30 @@
background-color: #fff; background-color: #fff;
border-radius: 4rpx; border-radius: 4rpx;
} }
.order-activity image { .order-activity image {
width: 32rpx; width: 32rpx;
height: 32rpx; height: 32rpx;
} }
.order-activity-title-wrapper { .order-activity-title-wrapper {
height: 48rpx; height: 48rpx;
} }
.order-activity-title { .order-activity-title {
font-size: 34rpx; font-size: 34rpx;
color: #15191F; color: #15191F;
font-weight: 600; font-weight: 600;
} }
.order-activity-icon-list { .order-activity-icon-list {
margin-top: 56rpx; margin-top: 56rpx;
} }
.order-activity-icon-wrapper { .order-activity-icon-wrapper {
flex: 1; flex: 1;
} }
.order-activity-icon { .order-activity-icon {
position: relative; position: relative;
width: 80rpx; width: 80rpx;
...@@ -353,10 +366,12 @@ ...@@ -353,10 +366,12 @@
background-color: #F5F6F8; background-color: #F5F6F8;
border-radius: 50%; border-radius: 50%;
} }
.order-activity-icon image{
.order-activity-icon image {
width: 48rpx; width: 48rpx;
height: 48rpx; height: 48rpx;
} }
.order-activity-badge { .order-activity-badge {
position: absolute; position: absolute;
top: -10rpx; top: -10rpx;
...@@ -370,9 +385,11 @@ ...@@ -370,9 +385,11 @@
background-color: #E66060; background-color: #E66060;
border-radius: 16rpx; border-radius: 16rpx;
} }
.badge-widen { .badge-widen {
width: 48rpx; width: 48rpx;
} }
.order-activity-icon-wrapper text { .order-activity-icon-wrapper text {
margin-top: 16rpx; margin-top: 16rpx;
font-size: 22rpx; font-size: 22rpx;
...@@ -394,6 +411,7 @@ ...@@ -394,6 +411,7 @@
border-radius: 4rpx; border-radius: 4rpx;
opacity: 0.81; opacity: 0.81;
} }
.pass-bg-one { .pass-bg-one {
position: absolute; position: absolute;
left: 0; left: 0;
...@@ -405,6 +423,7 @@ ...@@ -405,6 +423,7 @@
background: rgba(247, 179, 197, 0.5); background: rgba(247, 179, 197, 0.5);
border-radius: 4rpx 4rpx 0 0; border-radius: 4rpx 4rpx 0 0;
} }
.pass-bg-two { .pass-bg-two {
position: absolute; position: absolute;
left: 0; left: 0;
...@@ -417,33 +436,40 @@ ...@@ -417,33 +436,40 @@
background: rgba(247, 179, 197, 0.3); background: rgba(247, 179, 197, 0.3);
border-radius: 4rpx 4rpx 0 0; border-radius: 4rpx 4rpx 0 0;
} }
.pass-logo-wrapper { .pass-logo-wrapper {
height: 50rpx; height: 50rpx;
} }
.pass-logo-wrapper image { .pass-logo-wrapper image {
width: 64rpx; width: 64rpx;
height: 50rpx; height: 50rpx;
background-color: #ccc; background-color: #ccc;
} }
.pass-logo-wrapper text { .pass-logo-wrapper text {
height: 50rpx; height: 50rpx;
margin-left: 20rpx; margin-left: 20rpx;
font-size: 26rpx; font-size: 26rpx;
line-height: 50rpx; line-height: 50rpx;
} }
.pass-title { .pass-title {
margin-top: 24rpx; margin-top: 24rpx;
font-size: 42rpx; font-size: 42rpx;
font-weight: 600; font-weight: 600;
} }
.pass-time { .pass-time {
margin-top: 8rpx; margin-top: 8rpx;
font-size: 26rpx; font-size: 26rpx;
} }
.pass-name { .pass-name {
margin-top: 32rpx; margin-top: 32rpx;
font-size: 22rpx; font-size: 22rpx;
} }
.pass-idNum { .pass-idNum {
margin-top: 8rpx; margin-top: 8rpx;
font-size: 22rpx; font-size: 22rpx;
...@@ -456,10 +482,12 @@ ...@@ -456,10 +482,12 @@
background-color: #F5F6F8; background-color: #F5F6F8;
border-radius: 4rpx; border-radius: 4rpx;
} }
.goods-logo-wrapper { .goods-logo-wrapper {
height: 100rpx; height: 100rpx;
margin-top: 40rpx; margin-top: 40rpx;
} }
.goods-logo-wrapper text { .goods-logo-wrapper text {
height: 100rpx; height: 100rpx;
margin-left: 20rpx; margin-left: 20rpx;
...@@ -467,24 +495,29 @@ ...@@ -467,24 +495,29 @@
color: #15191F; color: #15191F;
line-height: 100rpx; line-height: 100rpx;
} }
.goods-content { .goods-content {
height: 136rpx; height: 136rpx;
} }
.goods-content image{
.goods-content image {
width: 140rpx; width: 140rpx;
height: 136rpx; height: 136rpx;
margin-right: 32rpx; margin-right: 32rpx;
background-color: #ccc; background-color: #ccc;
} }
.goods-content text { .goods-content text {
font-size: 30rpx; font-size: 30rpx;
color: #15191F; color: #15191F;
font-weight: 600; font-weight: 600;
line-height: 42rpx; line-height: 42rpx;
} }
.goods-footer { .goods-footer {
height: 84rpx; height: 84rpx;
} }
.goods-footer text { .goods-footer text {
font-size: 26rpx; font-size: 26rpx;
color: #959DA9; color: #959DA9;
...@@ -509,6 +542,7 @@ ...@@ -509,6 +542,7 @@
background-color: #F5F6F8; background-color: #F5F6F8;
border-radius: 4rpx; border-radius: 4rpx;
} }
.appointment-time { .appointment-time {
position: absolute; position: absolute;
left: 0; left: 0;
...@@ -523,23 +557,26 @@ ...@@ -523,23 +557,26 @@
border-radius: 4rpx; border-radius: 4rpx;
} }
.appointment-activity-content { .appointment-activity-content {}
}
.appointment-activity-img { .appointment-activity-img {
width: 140rpx; width: 140rpx;
height: 136rpx; height: 136rpx;
background-color: #ccc; background-color: #ccc;
} }
.appointment-activity-info { .appointment-activity-info {
flex: 1; flex: 1;
margin-left: 32rpx; margin-left: 32rpx;
} }
.appointment-activity-title { .appointment-activity-title {
color: #15191F; color: #15191F;
font-size: 30rpx; font-size: 30rpx;
font-weight: 600; font-weight: 600;
line-height: 42rpx; line-height: 42rpx;
} }
.appointment-activity-num { .appointment-activity-num {
margin-top: 16rpx; margin-top: 16rpx;
color: #959DA9; color: #959DA9;
...@@ -550,6 +587,7 @@ ...@@ -550,6 +587,7 @@
width: 305rpx; width: 305rpx;
height: 110rpx; height: 110rpx;
} }
.border-right { .border-right {
width: 1rpx; width: 1rpx;
height: 75rpx; height: 75rpx;
...@@ -571,10 +609,12 @@ ...@@ -571,10 +609,12 @@
.more { .more {
margin-top: 32rpx; margin-top: 32rpx;
} }
.more text { .more text {
font-size: 26rpx; font-size: 26rpx;
color: #15191F; color: #15191F;
} }
.more image { .more image {
margin-left: 8rpx; margin-left: 8rpx;
} }
...@@ -587,16 +627,19 @@ ...@@ -587,16 +627,19 @@
background-color: #fff; background-color: #fff;
border-radius: 4rpx; border-radius: 4rpx;
} }
.service text { .service text {
font-size: 34rpx; font-size: 34rpx;
color: #15191F; color: #15191F;
font-weight: 600; font-weight: 600;
} }
.service image { .service image {
width: 32rpx; width: 32rpx;
height: 32rpx; height: 32rpx;
} }
image { image {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
\ No newline at end of file
pages/mine/info/info.js
...@@ -15,13 +15,15 @@ Page({ ...@@ -15,13 +15,15 @@ Page({
address: '', address: '',
}, },
onLoad: function (options) { onLoad: function (options) {
let funcUserInfo = wx.getStorageSync('userInfo')
let mobile = wx.getStorageSync('mobile')
let nickName = wx.getStorageSync('nickName') let mobile = funcUserInfo.phone
let avatarUrl = wx.getStorageSync('avatarUrl') let nickName = funcUserInfo.name
let sex = wx.getStorageSync('sex') let avatarUrl = funcUserInfo.avatar
let birthday = wx.getStorageSync('birthday') let sex = funcUserInfo.sex
let address = wx.getStorageSync('address') let birthday = funcUserInfo.birthday
let address = birthday.address
this.setData({ this.setData({
mobile: this.toHide(mobile), mobile: this.toHide(mobile),
nickName: nickName, nickName: nickName,
......
pages/mine/order/order.js
...@@ -4,6 +4,9 @@ Page({ ...@@ -4,6 +4,9 @@ Page({
data: { data: {
imageBase: App.globalData.appImageBase, imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase, resourcesBase: App.globalData.appResourcesBase,
option: {},
orderTypeTitle: '全部分类', orderTypeTitle: '全部分类',
orderTypeHeight: 0, orderTypeHeight: 0,
orderType: [], orderType: [],
...@@ -18,7 +21,7 @@ Page({ ...@@ -18,7 +21,7 @@ Page({
'name': '待付款' 'name': '待付款'
}, },
{ {
'value': '1', 'value': '2',
'name': '待使用' 'name': '待使用'
}, },
{ {
...@@ -34,7 +37,17 @@ Page({ ...@@ -34,7 +37,17 @@ Page({
isFinished: false isFinished: false
}, },
onLoad: function (options) { onLoad: function (options) {
this.setOrderType() this.setData({
option: options
})
App.login({
timeout: 0,
success: (result) => {
this.setOrderType()
},
})
}, },
/** /**
...@@ -87,6 +100,7 @@ Page({ ...@@ -87,6 +100,7 @@ Page({
'status': Number(funcResponse[i].status), 'status': Number(funcResponse[i].status),
'amount': funcResponse[i].totalMoney, 'amount': funcResponse[i].totalMoney,
'commodity': [], 'commodity': [],
'commodityType': Number(funcResponse[i].goodType),
'wxRequest': funcResponse[i].wxRequest 'wxRequest': funcResponse[i].wxRequest
} }
...@@ -219,9 +233,15 @@ Page({ ...@@ -219,9 +233,15 @@ Page({
}, },
onNavigationBack: function () { onNavigationBack: function () {
wx.navigateBack({ if (this.data.option.fromPage) {
'delta': 1 wx.switchTab({
}) url: '/pages/mine/home/home',
})
} else {
wx.navigateBack({
'delta': 1
})
}
}, },
/** /**
...@@ -414,7 +434,7 @@ Page({ ...@@ -414,7 +434,7 @@ Page({
onOrderEvaluate: function (event) { onOrderEvaluate: function (event) {
console.log(event.currentTarget.dataset, '----------------event.currentTarget.dataset'); console.log(event.currentTarget.dataset, '----------------event.currentTarget.dataset');
let item = JSON.stringify(event.currentTarget.dataset.item) let item = JSON.stringify(event.currentTarget.dataset.item)
wx.navigateTo({ wx.navigateTo({
url: `/pages/pay/order-comment/order-comment?orderItem=${item}`, url: `/pages/pay/order-comment/order-comment?orderItem=${item}`,
}) })
...@@ -451,14 +471,16 @@ Page({ ...@@ -451,14 +471,16 @@ Page({
* @returns * @returns
*/ */
onOrderAgain: function (event) { onOrderAgain: function (event) {
let item = event.currentTarget.dataset.item let item = event.currentTarget.dataset.item
let commodityType = item.goodType
console.log(item)
let commodityType = item.commodityType
let shopAppId = wx.getStorageSync('shopInfoBuffer') ? wx.getStorageSync('shopInfoBuffer').appId : "" let shopAppId = wx.getStorageSync('shopInfoBuffer') ? wx.getStorageSync('shopInfoBuffer').appId : ""
wx.navigateTo({ wx.navigateTo({
url: `/pages/commodity/menu-food/menu-food?formPage=order&shopAppId=${shopAppId}&commodityType=${commodityType}`, url: `/pages/commodity/menu-food/menu-food?formPage=order&shopAppId=${shopAppId}&commodityType=${commodityType}`,
}) })
}, },
/** /**
...@@ -468,7 +490,6 @@ Page({ ...@@ -468,7 +490,6 @@ Page({
* @returns * @returns
*/ */
onReachBottom: function () { onReachBottom: function () {
this.setData({ this.setData({
orderPages: this.data.orderPages + 1 orderPages: this.data.orderPages + 1
}) })
......
pages/pay/coupon-detail/coupon-detail.js
...@@ -117,13 +117,21 @@ Page({ ...@@ -117,13 +117,21 @@ Page({
volumeId: that.data.couponDetail.volumeId, volumeId: that.data.couponDetail.volumeId,
}, },
success: function(res) { success: function(res) {
wx.lin.showToast({ if (res.data.code * 1 == 200) {
image: '/image/success.png', wx.lin.showToast({
title: '核销成功', image: '/image/success.png',
}) title: '核销成功',
setTimeout(()=>{ })
wx.navigateBack() setTimeout(()=>{
},2000); wx.navigateBack()
},2000);
} else {
wx.lin.showToast({
image: '/image/error.png',
title: res.data.msg,
})
}
}, },
fail: function(err) { fail: function(err) {
wx.lin.showToast({ wx.lin.showToast({
......
pages/pay/order-detail/order-detail.js
...@@ -2,6 +2,9 @@ let App = getApp() ...@@ -2,6 +2,9 @@ let App = getApp()
Page({ Page({
data: { data: {
showNotice: false,
swiperCurrent: 0,
showCodePopup: false,
imageBase: App.globalData.appImageBase, imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase, resourcesBase: App.globalData.appResourcesBase,
...@@ -15,6 +18,45 @@ Page({ ...@@ -15,6 +18,45 @@ Page({
isFromUse: false, isFromUse: false,
winCode: false, winCode: false,
residuePayTime: "", //剩余支付时间 residuePayTime: "", //剩余支付时间
sealImgs: [{
type: 1,
url: App.globalData.appResourcesBase + 'sealOfOrder/ertongyingdi-2.png'
}],
sealTest: App.globalData.appResourcesBase + 'sealOfOrder/ertongyingdi-2.png',
sealBig: App.globalData.appResourcesBase + 'sealOfOrder/ertongyingdi-1.png',
seals: {
seal1: {
passSrc: App.globalData.appResourcesBase + 'sealOfOrder/ertongyingdi-2.png',
willPaySrc: App.globalData.appResourcesBase + 'sealOfOrder/ertongyingdi-2.png',
},
seal1: {
passSrc: App.globalData.appResourcesBase + 'sealOfOrder/ertongyingdi-2.png',
willPaySrc: App.globalData.appResourcesBase + 'sealOfOrder/ertongyingdi-2.png',
},
seal1: {
passSrc: App.globalData.appResourcesBase + 'sealOfOrder/ertongyingdi-2.png',
willPaySrc: App.globalData.appResourcesBase + 'sealOfOrder/ertongyingdi-2.png',
},
},
codeList: [{
id: 0,
title: '《 阿凡达 》电影票',
img: './image/QRcode.png',
num: '2179 7092 0925'
},
{
id: 1,
title: '《 阿凡达 》电影票',
img: './image/QRcode.png',
num: '2179 7092 0925'
},
{
id: 2,
title: '《 阿凡达 》电影票',
img: './image/QRcode.png',
num: '2179 7092 0925'
}
]
}, },
...@@ -27,11 +69,57 @@ Page({ ...@@ -27,11 +69,57 @@ Page({
fromPage: options.fromPage === 'order' ? 'order' : '', fromPage: options.fromPage === 'order' ? 'order' : '',
isFromUse: options.showCode === 'true' ? true : false, isFromUse: options.showCode === 'true' ? true : false,
}) })
App.login({
timeout: 0,
success: (result) => {
this.queryOrderDetail()
},
console.log(this.data.shopInfo) })
this.queryOrderDetail() },
// 使用须知
handleNotice() {
let showNotice = true
this.setData({
showNotice
})
}, },
// 一键扫码
onFastScan: function (event) {
wx.showLoading({
title: '加载中',
})
App.wxRequest({
url: '/api/v1/order/getVolumesByOrderId',
data: {
'orderId': this.data.orderInfo.id
},
success: (response) => {
wx.hideLoading()
let list = response.data
this.setData({
showCodePopup: true,
codeList: list
})
}
})
},
swiperChange(e) {
let swiperCurrent = e.detail.current
this.setData({
swiperCurrent
})
},
closeQRcode() {
let showCodePopup = false
this.setData({
showCodePopup,
// swiperCurrent:0
})
},
/** /**
* 订单详情 * 订单详情
* @function * @function
...@@ -59,7 +147,8 @@ Page({ ...@@ -59,7 +147,8 @@ Page({
'tipOrderNo': funcResponse.orderSerialNumber, // 订单编号 'tipOrderNo': funcResponse.orderSerialNumber, // 订单编号
'tipTimeSubmit': funcResponse.createDate, 'tipTimeSubmit': funcResponse.createDate,
'tipTimePay': App.modular.miment(funcResponse.paymentTime).format('YYYY-MM-DD hh:mm:ss'), 'tipTimePay': App.modular.miment(funcResponse.paymentTime).format('YYYY-MM-DD hh:mm:ss'),
'tipIntegral': funcResponse.integral 'tipIntegral': funcResponse.integral,
'officeName': funcResponse.officeName
} }
// 添加订单商品列表 // 添加订单商品列表
...@@ -119,7 +208,7 @@ Page({ ...@@ -119,7 +208,7 @@ Page({
}, },
// 弹出单张二维码
onCouponCode: function (event) { onCouponCode: function (event) {
let funcOrderInfo = event.currentTarget.dataset.item let funcOrderInfo = event.currentTarget.dataset.item
App.wxRequest({ App.wxRequest({
...@@ -141,7 +230,25 @@ Page({ ...@@ -141,7 +230,25 @@ Page({
} }
}) })
}, },
// 多二维码 复制券码
setClipboard(e) {
const code = e.currentTarget.dataset.code
wx.setClipboardData({
data: code,
success(res) {
wx.showToast({
title: '复制成功',
})
// wx.getClipboardData({
// success(res) {
// console.log(res.data) // data
// }
// })
}
})
},
// 单个二维码 复制券码
onCodeCopy: function () { onCodeCopy: function () {
wx.setClipboardData({ wx.setClipboardData({
data: this.data.codeInfo.codeNo, data: this.data.codeInfo.codeNo,
......
pages/pay/order-input/order-input.js
...@@ -308,6 +308,7 @@ Page({ ...@@ -308,6 +308,7 @@ Page({
setShoppingCartData: function () { setShoppingCartData: function () {
// 读取上级页面的购物车数据，默认选中所有。 // 读取上级页面的购物车数据，默认选中所有。
let funcShoppingCart = wx.getStorageSync('shoppingCartBuffer') let funcShoppingCart = wx.getStorageSync('shoppingCartBuffer')
console.log(JSON.stringify(funcShoppingCart))
// 设置商品的最终提交价格 // 设置商品的最终提交价格
let funcPayAmount = 0 let funcPayAmount = 0
...@@ -378,9 +379,6 @@ Page({ ...@@ -378,9 +379,6 @@ Page({
* @returns * @returns
*/ */
setStock: function () { setStock: function () {
console.log('funcCommodity')
console.log(this.data.shoppingCartList)
let funcItem = this.data.shoppingCartList[0] let funcItem = this.data.shoppingCartList[0]
App.wxRequest({ App.wxRequest({
...@@ -453,6 +451,8 @@ Page({ ...@@ -453,6 +451,8 @@ Page({
clearTimeout(funcTimer) clearTimeout(funcTimer)
}, 100) }, 100)
console.log(this.data.shoppingCartList)
App.wxRequest({ App.wxRequest({
url: '/api/v1/commodity/getNotification', url: '/api/v1/commodity/getNotification',
data: { data: {
...@@ -592,12 +592,14 @@ Page({ ...@@ -592,12 +592,14 @@ Page({
// 定位到当前问题位置 // 定位到当前问题位置
if (funcErrorIndex !== null) { if (funcErrorIndex !== null) {
const funcQuery = wx.createSelectorQuery() const funcQuery = wx.createSelectorQuery()
funcQuery.selectAll('.register-item-title').boundingClientRect() funcQuery.selectAll('.contact-input-mark').boundingClientRect()
funcQuery.exec((response) => { funcQuery.exec((response) => {
console.log(response) let funcScrollTop = response[0][funcErrorIndex].top
wx.pageScrollTo({ if (funcScrollTop !== 0) {
scrollTop: response[0][funcErrorIndex].top wx.pageScrollTo({
}) scrollTop: response[0][funcErrorIndex].top
})
}
}) })
} }
return funcPass return funcPass
...@@ -663,7 +665,30 @@ Page({ ...@@ -663,7 +665,30 @@ Page({
'smPersonalDetails': funcUserInfo 'smPersonalDetails': funcUserInfo
}, },
success: (response) => { success: (response) => {
console.log(response) if (/价格不一致/.test(response.data.msg)) {
wx.lin.showToast({
title: '价格已变更，请重新下单。',
icon: 'error',
success: () => {
wx.navigateBack({
delta: 2
})
}
})
return
}
if (/订单未支付/.test(response.data.msg)) {
wx.lin.showToast({
title: response.data.msg,
icon: 'error',
})
this.setData({
isPaySubmit: false,
})
return
}
if (/库存不足/.test(response.data.msg)) { if (/库存不足/.test(response.data.msg)) {
let funcList = [] let funcList = []
for (let i = 0, l = response.data.data.list.length; i < l; i++) { for (let i = 0, l = response.data.data.list.length; i < l; i++) {
...@@ -763,7 +788,7 @@ Page({ ...@@ -763,7 +788,7 @@ Page({
} else { } else {
// 取消支付直接进入订单 // 取消支付直接进入订单
wx.reLaunch({ wx.reLaunch({
url: '/pages/pay/order/order' url: '/pages/mine/order/order?fromPage=pay'
}) })
} }
}, },
......
pages/pay/order-input/order-input.wxml
<!-- 购买须知详情 --> <l-toast></l-toast>
<view class="notice-detail" wx:if="{{winNoticeDetail}}" bindtap="onNoticeClose">
<view class="notice-item" animation="{{animation}}">
<view class="notice-title">
<text>{{noticeText}}</text>
</view>
<view class="notice-rich">
<rich-text nodes="{{noticeDetail}}"></rich-text>
</view>
</view>
</view>
<view class="container"> <view class="container">
<!-- winBuyContent --> <!-- winBuyContent -->
...@@ -201,7 +191,7 @@ ...@@ -201,7 +191,7 @@
<text>仅用于接收订单确认短信</text> <text>仅用于接收订单确认短信</text>
</view> </view>
<view class="contact-input col"> <view class="contact-input col">
<text>姓名</text> <text class="contact-input-mark">姓名</text>
<input placeholder="请输入姓名" data-type="name" data-index="{{0}}" bindblur="onInputBlur"></input> <input placeholder="请输入姓名" data-type="name" data-index="{{0}}" bindblur="onInputBlur"></input>
<text>{{registerInfo[0].errorName}}</text> <text>{{registerInfo[0].errorName}}</text>
</view> </view>
...@@ -227,7 +217,7 @@ ...@@ -227,7 +217,7 @@
<text>{{registerTitle + (index + 1)}}</text> <text>{{registerTitle + (index + 1)}}</text>
</view> </view>
<view class="contact-input col"> <view class="contact-input col">
<text>姓名</text> <text class="contact-input-mark">姓名</text>
<input placeholder="请输入姓名" data-type="name" data-index="{{index}}" bindblur="onInputBlur"></input> <input placeholder="请输入姓名" data-type="name" data-index="{{index}}" bindblur="onInputBlur"></input>
<text>{{item.errorName}}</text> <text>{{item.errorName}}</text>
</view> </view>
...@@ -262,6 +252,21 @@ ...@@ -262,6 +252,21 @@
<cover-view class="appointment-confirm row con-c align-c">确认预约</cover-view> <cover-view class="appointment-confirm row con-c align-c">确认预约</cover-view>
</cover-view> </cover-view>
<!-- 购买须知详情 -->
<view class="notice-detail" wx:if="{{winNoticeDetail}}" bindtap="onNoticeClose">
<view class="notice-item" animation="{{animation}}">
<view class="notice-title">
<text>{{noticeText}}</text>
</view>
<view class="notice-rich">
<rich-text nodes="{{noticeDetail}}"></rich-text>
</view>
</view>
</view>
<!-- 未支付订单超额提示 -->
<!-- 库存不足提示 --> <!-- 库存不足提示 -->
<view class="stock-mask row con-c align-c" wx:if="{{winStockTip}}"> <view class="stock-mask row con-c align-c" wx:if="{{winStockTip}}">
<view class="stock col con-c align-c"> <view class="stock col con-c align-c">
......
pages/pay/order-input/order-input.wxss
...@@ -915,6 +915,8 @@ ...@@ -915,6 +915,8 @@
.stock-info { .stock-info {
width: 526rpx; width: 526rpx;
max-height: 480rpx;
overflow-y: scroll;
} }
.stock-close { .stock-close {
......
pages/play/home/home.js
...@@ -278,7 +278,8 @@ Page({ ...@@ -278,7 +278,8 @@ Page({
}) })
} }
// 游客攻略瀑布列表 // 游客攻略瀑布列表
wx.lin.renderWaterFlow(that.data.strategyList, that.data.pageNo == 1 ? true : false, () => { }) // wx.lin.renderWaterFlow(that.data.strategyList, that.data.pageNo == 1 ? true : false, () => { })
wx.lin.renderWaterFlow(this.data.strategyList, false, () => {})
} else { } else {
} }
......
pages/play/home/home.wxml
...@@ -39,11 +39,11 @@ ...@@ -39,11 +39,11 @@
<image src="{{item.cover}}"></image> <image src="{{item.cover}}"></image>
</view> </view>
<view class="movie-info-wrapper"> <view class="movie-info-wrapper">
<view class="row"> <view class="row align-c">
<view class="movie-name"> <view class="movie-name">
<text>{{item.movieName}}</text> <text>{{item.movieName}}</text>
</view> </view>
<view class="movie-tags"> <view class="movie-tags row">
<block wx:for="{{item.tags}}" wx:for-item="tags" wx:key="index"> <block wx:for="{{item.tags}}" wx:for-item="tags" wx:key="index">
<text>{{tags}}</text> <text>{{tags}}</text>
</block> </block>
...@@ -83,4 +83,18 @@ ...@@ -83,4 +83,18 @@
<l-water-flow column-gap="14rpx" generic:l-water-flow-item="strategy-item" bind:linitemtap="onStrategyDetail"></l-water-flow> <l-water-flow column-gap="14rpx" generic:l-water-flow-item="strategy-item" bind:linitemtap="onStrategyDetail"></l-water-flow>
</view> </view>
</view> </view>
<!-- <block wx:if="{{strategyOriginList.length > 0}}">
<view class="strategy detail-item" bindtap="onFirstStrategyDetail">
<image src="./image/title-route.png"></image>
<view class="strategy-content">
<image class="background-image" src="{{strategyFirstItem.image}}" mode="aspectFit"></image>
<view class="operation col">
<text>{{strategyFirstItem.title}}</text>
</view>
</view>
</view>
<view style="margin-bottom:10px">
<l-water-flow column-gap="14rpx" generic:l-water-flow-item="strategy-item" bind:linitemtap="onStrategyDetail"></l-water-flow>
</view>
</block> -->
</view> </view>
\ No newline at end of file
pages/play/home/home.wxss
...@@ -157,6 +157,7 @@ ...@@ -157,6 +157,7 @@
} }
.movie-name { .movie-name {
height: 44rpx;
max-width: 240rpx; max-width: 240rpx;
color: #15191f; color: #15191f;
font-size: 30rpx; font-size: 30rpx;
...@@ -389,4 +390,29 @@ image { ...@@ -389,4 +390,29 @@ image {
.title > image { .title > image {
width: 184rpx; width: 184rpx;
height: 44rpx; height: 44rpx;
}
.strategy-content {
z-index: 3;
position: relative;
width: 670rpx;
height: 320rpx;
margin-top: 32rpx;
border-radius: 2px;
overflow: hidden;
}
.strategy-content .operation {
position: absolute;
bottom: 32rpx;
margin: 0 40rpx;
}
.strategy-content .operation text {
/* height: 40rpx; */
font-size: 38rpx;
font-weight: 800;
color: #ffffff;
}
.detail-item {
margin-top: 58rpx;
} }
\ No newline at end of file
pages/play/movie/movie.js
...@@ -8,7 +8,7 @@ Page({ ...@@ -8,7 +8,7 @@ Page({
pageSize: '-1' pageSize: '-1'
}, },
statusActive: 1, statusActive: 0,
statusList: [ statusList: [
{ 'id': 0, 'name': '今日放映' }, { 'id': 0, 'name': '今日放映' },
{ 'id': 1, 'name': '全部热映' }, { 'id': 1, 'name': '全部热映' },
......
pages/play/movie/movie.wxml
...@@ -28,13 +28,13 @@ ...@@ -28,13 +28,13 @@
<image src="{{item.cover}}"></image> <image src="{{item.cover}}"></image>
</view> </view>
<view class="movie-info-wrapper"> <view class="movie-info-wrapper">
<view class="row"> <view class="movie-name-wrapper row align-c">
<view class="movie-name"> <view class="movie-name">
<text>{{item.movieName}}</text> <text>{{item.filmName}}</text>
</view> </view>
<view class="movie-tags"> <view class="movie-tags row">
<block wx:for="{{item.tags}}" wx:for-item="tags" wx:key="index"> <block wx:for="{{item.tags}}" wx:for-item="tagsItem" wx:for-index="tagsIndex" wx:key="tagsIndex">
<text>{{tags}}</text> <text>{{tagsItem}}</text>
</block> </block>
</view> </view>
</view> </view>
...@@ -93,15 +93,15 @@ ...@@ -93,15 +93,15 @@
<image src="{{item.cover}}"></image> <image src="{{item.cover}}"></image>
</view> </view>
<view class="movie-info-wrapper"> <view class="movie-info-wrapper">
<view class="movie-name-wrapper row"> <view class="movie-name-wrapper row align-c">
<view class="movie-name"> <view class="movie-name">
<text>{{item.filmName}}</text> <text>{{item.filmName}}</text>
</view> </view>
<block wx:for="{{item.tags}}" wx:for-item="tagsItem" wx:for-index="tagsIndex" wx:key="tagsIndex"> <view class="movie-tags row">
<view class="movie-tags"> <block wx:for="{{item.tags}}" wx:for-item="tagsItem" wx:for-index="tagsIndex" wx:key="tagsIndex">
<text>{{tagsItem}}</text> <text>{{tagsItem}}</text>
</view> </block>
</block> </view>
</view> </view>
<view class="movie-info row"> <view class="movie-info row">
<view class="movie-info-left"> <view class="movie-info-left">
...@@ -139,6 +139,6 @@ ...@@ -139,6 +139,6 @@
</block> </block>
</view> </view>
<view class="footer-img"> <view class="footer-img">
<image src=""></image> <image src="/image/movie-bottom.png"></image>
</view> </view>
</view> </view>
\ No newline at end of file
pages/play/movie/movie.wxss
...@@ -205,7 +205,6 @@ page { ...@@ -205,7 +205,6 @@ page {
width: 750rpx; width: 750rpx;
height: 150rpx; height: 150rpx;
margin-top: 64rpx; margin-top: 64rpx;
background-color: #ccc;
} }
image { image {
......
pages/play/point-detail/point-detail.js
...@@ -47,7 +47,7 @@ Page({ ...@@ -47,7 +47,7 @@ Page({
App.globalData.appResourcesBase + 'guide/detail/detail-1-4.png', App.globalData.appResourcesBase + 'guide/detail/detail-1-4.png',
], ],
background: 'background: #314f88;', background: 'background: #314f88;',
popupImage: '' popupImage: App.globalData.appResourcesBase + 'share/share-8.png',
}, { }, {
id: 102, id: 102,
name: '云之亭', name: '云之亭',
...@@ -65,7 +65,7 @@ Page({ ...@@ -65,7 +65,7 @@ Page({
App.globalData.appResourcesBase + 'guide/detail/detail-2-4.png', App.globalData.appResourcesBase + 'guide/detail/detail-2-4.png',
], ],
background: 'background: #9d9ee0;', background: 'background: #9d9ee0;',
popupImage: '' popupImage: App.globalData.appResourcesBase + 'share/share-14.png',
}, { }, {
id: 103, id: 103,
name: '湿地公园', name: '湿地公园',
...@@ -83,7 +83,7 @@ Page({ ...@@ -83,7 +83,7 @@ Page({
App.globalData.appResourcesBase + 'guide/detail/detail-3-4.png', App.globalData.appResourcesBase + 'guide/detail/detail-3-4.png',
], ],
background: 'background: #8bac7d;', background: 'background: #8bac7d;',
popupImage: '' popupImage: App.globalData.appResourcesBase + 'share/share-4.png',
}, { }, {
id: 104, id: 104,
name: '新月码头', name: '新月码头',
...@@ -101,7 +101,7 @@ Page({ ...@@ -101,7 +101,7 @@ Page({
App.globalData.appResourcesBase + 'guide/detail/detail-4-4.png', App.globalData.appResourcesBase + 'guide/detail/detail-4-4.png',
], ],
background: 'background: #6fc0d0;', background: 'background: #6fc0d0;',
popupImage: '' popupImage: App.globalData.appResourcesBase + 'share/share-7.png',
}, { }, {
id: 105, id: 105,
name: '温泉洋房', name: '温泉洋房',
...@@ -119,7 +119,7 @@ Page({ ...@@ -119,7 +119,7 @@ Page({
App.globalData.appResourcesBase + 'guide/detail/detail-5-4.png', App.globalData.appResourcesBase + 'guide/detail/detail-5-4.png',
], ],
background: 'background: #5ca2e2;', background: 'background: #5ca2e2;',
popupImage: '' popupImage: App.globalData.appResourcesBase + 'share/share-6.png',
}, { }, {
id: 106, id: 106,
name: '星耀银湖', name: '星耀银湖',
...@@ -137,7 +137,7 @@ Page({ ...@@ -137,7 +137,7 @@ Page({
App.globalData.appResourcesBase + 'guide/detail/detail-6-4.png', App.globalData.appResourcesBase + 'guide/detail/detail-6-4.png',
], ],
background: 'background: #82524c;', background: 'background: #82524c;',
popupImage: '' popupImage: App.globalData.appResourcesBase + 'share/share-10.png',
}, { }, {
id: 107, id: 107,
name: '奇幻森林', name: '奇幻森林',
...@@ -155,7 +155,7 @@ Page({ ...@@ -155,7 +155,7 @@ Page({
App.globalData.appResourcesBase + 'guide/detail/detail-7-4.png', App.globalData.appResourcesBase + 'guide/detail/detail-7-4.png',
], ],
background: 'background: #659b82;', background: 'background: #659b82;',
popupImage: '' popupImage: App.globalData.appResourcesBase + 'share/share-3.png',
} }
] ]
......
pages/play/point-detail/point-detail.wxml
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<!-- 弹出图片 --> <!-- 弹出图片 -->
<l-popup show="{{showPopup}}" animation="{{false}}"> <l-popup show="{{showPopup}}" animation="{{false}}">
<view class="popupImage"> <view class="popupImage">
<image src="popupImage"></image> <image src="{{popupImage}}"></image>
</view> </view>
<view class="row con-b"> <view class="row con-b">
<view class="cancel" bindtap="onCancel"> <view class="cancel" bindtap="onCancel">
......
pages/play/point-detail/point-detail.wxss
...@@ -94,11 +94,10 @@ page { ...@@ -94,11 +94,10 @@ page {
} }
/* 分享弹窗 */ /* 分享弹窗 */
.popupImage { .popupImage image {
width: 606rpx; width: 606rpx;
height: 977rpx; height: 977rpx;
margin-bottom: 64rpx; margin-bottom: 64rpx;
background-color: #ccc;
} }
.cancel, .download { .cancel, .download {
width: 288rpx; width: 288rpx;
......
pages/play/service-detail/service-detail.js
...@@ -74,8 +74,12 @@ Page({ ...@@ -74,8 +74,12 @@ Page({
}) })
console.log(this.data.option) console.log(this.data.option)
this.queryDetail(Number(options.id)) this.queryDetail(Number(options.id))
if (Number(options.id) === 2) {
this.queryDetailMovie()
} else {
this.queryDetailCommodity()
}
this.getAppraise() this.getAppraise()
this.queryDetailCommodity()
}, },
/** /**
...@@ -95,6 +99,7 @@ Page({ ...@@ -95,6 +99,7 @@ Page({
App.globalData.appResourcesBase + 'shop/banner/banner-1-1-2.png', App.globalData.appResourcesBase + 'shop/banner/banner-1-1-2.png',
App.globalData.appResourcesBase + 'shop/banner/banner-1-1-3.png', App.globalData.appResourcesBase + 'shop/banner/banner-1-1-3.png',
], ],
shareImage: App.globalData.appResourcesBase + 'share/share-2.png',
name: '海错图展馆', name: '海错图展馆',
title: '海错图', title: '海错图',
date: '周一至周日 10:00 - 20:00', date: '周一至周日 10:00 - 20:00',
...@@ -155,6 +160,7 @@ Page({ ...@@ -155,6 +160,7 @@ Page({
App.globalData.appResourcesBase + 'shop/banner/banner-1-2-2.png', App.globalData.appResourcesBase + 'shop/banner/banner-1-2-2.png',
App.globalData.appResourcesBase + 'shop/banner/banner-1-2-3.png', App.globalData.appResourcesBase + 'shop/banner/banner-1-2-3.png',
], ],
shareImage: App.globalData.appResourcesBase + 'share/share-5.png',
name: '拾光花坊', name: '拾光花坊',
title: '拾光花坊', title: '拾光花坊',
date: '周一至周日 10:00 - 20:00', date: '周一至周日 10:00 - 20:00',
...@@ -169,6 +175,7 @@ Page({ ...@@ -169,6 +175,7 @@ Page({
App.globalData.appResourcesBase + 'shop/banner/banner-2-1-2.png', App.globalData.appResourcesBase + 'shop/banner/banner-2-1-2.png',
App.globalData.appResourcesBase + 'shop/banner/banner-2-1-3.png', App.globalData.appResourcesBase + 'shop/banner/banner-2-1-3.png',
], ],
shareImage: App.globalData.appResourcesBase + 'share/share-11.png',
name: '元养水韵SPA', name: '元养水韵SPA',
title: '元养水韵SPA', title: '元养水韵SPA',
date: '周一至周日 10:00 - 22:00', date: '周一至周日 10:00 - 22:00',
...@@ -186,6 +193,7 @@ Page({ ...@@ -186,6 +193,7 @@ Page({
App.globalData.appResourcesBase + 'shop/banner/banner-3-1-2.png', App.globalData.appResourcesBase + 'shop/banner/banner-3-1-2.png',
App.globalData.appResourcesBase + 'shop/banner/banner-3-1-3.png', App.globalData.appResourcesBase + 'shop/banner/banner-3-1-3.png',
], ],
shareImage: App.globalData.appResourcesBase + 'share/share-12.png',
name: '原味舒食', name: '原味舒食',
title: '原味舒食', title: '原味舒食',
date: '周一至周日 10:00 - 21:30', date: '周一至周日 10:00 - 21:30',
...@@ -206,6 +214,7 @@ Page({ ...@@ -206,6 +214,7 @@ Page({
App.globalData.appResourcesBase + 'shop/banner/banner-3-2-2.png', App.globalData.appResourcesBase + 'shop/banner/banner-3-2-2.png',
App.globalData.appResourcesBase + 'shop/banner/banner-3-2-3.png', App.globalData.appResourcesBase + 'shop/banner/banner-3-2-3.png',
], ],
shareImage: App.globalData.appResourcesBase + 'share/share-13.png',
name: '原野MOJITO', name: '原野MOJITO',
title: '原味舒食', title: '原味舒食',
date: '周一至周日 10:00 - 凌晨02:00', date: '周一至周日 10:00 - 凌晨02:00',
...@@ -220,6 +229,7 @@ Page({ ...@@ -220,6 +229,7 @@ Page({
App.globalData.appResourcesBase + 'shop/banner/banner-4-1-2.png', App.globalData.appResourcesBase + 'shop/banner/banner-4-1-2.png',
App.globalData.appResourcesBase + 'shop/banner/banner-4-1-3.png', App.globalData.appResourcesBase + 'shop/banner/banner-4-1-3.png',
], ],
shareImage: App.globalData.appResourcesBase + 'share/share-9.png',
name: '星空影院', name: '星空影院',
title: '星空影院', title: '星空影院',
date: '周一至周日 10:00 - 20:30', date: '周一至周日 10:00 - 20:30',
...@@ -245,13 +255,14 @@ Page({ ...@@ -245,13 +255,14 @@ Page({
// 缓存当前商店信息 // 缓存当前商店信息
for (let i = 0, l = App.globalData.shopId.length; i < l; i++) { for (let i = 0, l = App.globalData.shopId.length; i < l; i++) {
if (funcAppId === App.globalData.shopId[i].appId) { if (funcAppId === App.globalData.shopId[i].appId) {
console.log(funcAppId)
let funcItem = { let funcItem = {
'id': App.globalData.shopId[i].id, 'id': App.globalData.shopId[i].id,
'appId': App.globalData.shopId[i].appId, 'appId': App.globalData.shopId[i].appId,
'name': App.globalData.shopId[i].name, 'name': App.globalData.shopId[i].name,
'logo': App.globalData.shopId[i].logo, 'logo': App.globalData.shopId[i].logo,
'cover': App.globalData.shopId[i].cover, 'cover': App.globalData.shopId[i].cover,
'shopType': '4' 'shopType': this.data.option.type
} }
wx.setStorageSync('shopInfoBuffer', funcItem) wx.setStorageSync('shopInfoBuffer', funcItem)
break break
...@@ -260,6 +271,7 @@ Page({ ...@@ -260,6 +271,7 @@ Page({
this.setData({ this.setData({
banner: funcDetail[funcIndex].banner, banner: funcDetail[funcIndex].banner,
shareImage: funcDetail[funcIndex].shareImage,
info: { info: {
id: funcDetail[funcIndex].id, id: funcDetail[funcIndex].id,
name: funcDetail[funcIndex].name, name: funcDetail[funcIndex].name,
...@@ -286,8 +298,10 @@ Page({ ...@@ -286,8 +298,10 @@ Page({
queryDetailCommodity: function () { queryDetailCommodity: function () {
let that = this let that = this
let officeId = wx.getStorageSync('shopInfoBuffer').id let shopInfo = wx.getStorageSync('shopInfoBuffer')
let genre = wx.getStorageSync('shopInfoBuffer').shopType let officeId = shopInfo.id
let genre = shopInfo.shopType
console.log(shopInfo)
App.wxRequest({ App.wxRequest({
url: '/api/v1/commodity/recommend', url: '/api/v1/commodity/recommend',
data: { data: {
...@@ -296,7 +310,71 @@ Page({ ...@@ -296,7 +310,71 @@ Page({
'tag': '201' 'tag': '201'
}, },
success: function(res) { success: function(res) {
console.log(res) let funcResponse = res.data
console.log(funcResponse)
let funcList = []
for (let i = 0, l = funcResponse.length; i < l; i++) {
let funcItem = {
'classifyId': funcResponse[i].classifyId,
'coverImg': funcResponse[i].coverImg,
'genre': funcResponse[i].genre,
'id': funcResponse[i].id,
'title': funcResponse[i].name,
'officeId': funcResponse[i].officeId,
'price': funcResponse[i].sightseerPrice, // 普通价
'priceText': App.modular.utils.formatAmount(funcResponse[i].sightseerPrice), // 普通价文本格式
'priceSpecial': funcResponse[i].ownerPrice, // 业主价
'priceSpecialText': App.modular.utils.formatAmount(funcResponse[i].ownerPrice), // 业主价文本格式
'priceType': 1,
'content': funcResponse[i].synopsis,
}
funcList.push(funcItem)
}
that.setData({
detailCommodity: funcList
})
}
})
},
queryDetailMovie: function () {
App.wxRequest({
url: '/api/v1/film/getAllFilm',
data: {
'weekType': 0,
'pageSize': 10,
'pageNo': 1,
},
success: (response) => {
let funcResponse = response.data.list
let funcList = []
for (let i = 0, l = funcResponse.length; i < l; i++) {
let funcItem = {
'name': funcResponse[i].activityId,
'dateBegin': funcResponse[i].beginDate,
'dateEnd': funcResponse[i].endDate,
'cover': funcResponse[i].cover,
'movieDirector': funcResponse[i].filmDirector,
'movieLeader': funcResponse[i].filmLead,
'movieName': funcResponse[i].filmName,
'movieType': funcResponse[i].filmType,
'movieKeyWord': funcResponse[i].keyword,
'movieLeader': funcResponse[i].filmLead,
'price': funcResponse[i].visitorPrice, // 普通价
'priceText': App.modular.utils.formatAmount(funcResponse[i].visitorPrice), // 普通价文本格式
'priceSpecial': funcResponse[i].ownerPrice, // 业主价
'priceSpecialText': App.modular.utils.formatAmount(funcResponse[i].ownerPrice), // 业主价文本格式
'priceType': 1,
'tagsId': funcResponse[i].tagIds,
'tags': funcResponse[i].tags.split(' '),
}
if (funcItem.tagsId.includes('102')) {
funcList.push(funcItem)
}
}
this.setData({
detailCommodity: funcList
})
} }
}) })
}, },
...@@ -440,4 +518,28 @@ Page({ ...@@ -440,4 +518,28 @@ Page({
showPopup: false showPopup: false
}) })
}, },
// 点击下载图片
onDownload: function () {
wx.showToast({
title: '已保存到相册',
icon: 'success'
})
this.setData({
showPopup: false
})
},
// 跳转到文创商品商店
onArtAll: function () {
wx.navigateTo({
url: '/pages/commodity/menu-art/menu-art',
})
},
onToBuy: function (event) {
console.log(event.currentTarget.dataset)
let id = event.currentTarget.dataset.id
let classifyId = event.currentTarget.dataset.classid
wx.navigateTo({
url: '/pages/commodity/menu-food/menu-food?commodityId=' + id + '&sideBarId=' + classifyId
})
}
}) })
\ No newline at end of file
pages/play/service-detail/service-detail.wxml
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<swiper-point bannerStyle="{{1}}" bannerActiveIndex="{{bannerIndex}}"></swiper-point> <swiper-point bannerStyle="{{1}}" bannerActiveIndex="{{bannerIndex}}"></swiper-point>
</view> </view>
<view class="banner-wave"> <view class="banner-wave">
<image src="/image/ornament-2-black.png" mode="widthFix"></image> <image src="/image/ornament-2.png" mode="widthFix"></image>
</view> </view>
</view> </view>
...@@ -22,13 +22,13 @@ ...@@ -22,13 +22,13 @@
<!-- 详情标题，分享，位置 --> <!-- 详情标题，分享，位置 -->
<view class="commodity-title row align-c"> <view class="commodity-title row align-c">
<text>{{info.title}}</text> <text>{{info.title}}</text>
<image src="{{imageBase + 'icon/share-3.png'}}" bindtap="onShare"></image> <image src="{{imageBase + 'icon/share-2.png'}}" bindtap="onShare"></image>
<image src="{{imageBase + 'icon/location-3.png'}}" bind:tap="onLocation"></image> <image src="{{imageBase + 'icon/location-2.png'}}" bind:tap="onLocation"></image>
</view> </view>
<!-- 分享弹出图片 --> <!-- 分享弹出图片 -->
<l-popup show="{{showPopup}}" animation="{{false}}"> <l-popup show="{{showPopup}}" animation="{{false}}">
<view class="popupImage"> <view class="popupImage">
<image src="popupImage"></image> <image src="{{shareImage}}"></image>
</view> </view>
<view class="row con-b"> <view class="row con-b">
<view class="cancel" bindtap="onCancel"> <view class="cancel" bindtap="onCancel">
...@@ -40,14 +40,14 @@ ...@@ -40,14 +40,14 @@
</view> </view>
</l-popup> </l-popup>
<!-- 开放时间信息 --> <!-- 开放时间信息 -->
<view class="commodity-other row align-c"> <view class="commodity-other {{option.id === '6' || option.id === '4' ? 'food-border' : ''}} row align-c">
<image src="./image/time.png"></image> <image src="./image/time.png"></image>
<text>开放时间</text> <text>开放时间</text>
<text>{{info.date}}</text> <text>{{info.date}}</text>
</view> </view>
<!-- 近期活动 --> <!-- 近期活动 -->
<view class="commodity-card"> <view class="commodity-card" wx:if="{{option.id === '1' || option.id === '5'}}">
<view class="commodity-card-title row con-b align-e"> <view class="commodity-card-title row con-b align-e">
<text>近期活动</text> <text>近期活动</text>
<text>查看全部</text> <text>查看全部</text>
...@@ -78,28 +78,62 @@ ...@@ -78,28 +78,62 @@
</block> </block>
</view> </view>
</view> </view>
<!-- SPA服务 -->
<view class="commodity-card" wx:if="{{option.id === '7'}}">
<view class="commodity-card-title row con-b align-e">
<text>SPA服务</text>
<text bindtap="">查看全部</text>
</view>
<view class="commodity-card-list row">
<block wx:for="{{detailCommodity}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="commodity-card-item col">
<image src=""></image>
<view class="commodity-card-item-title row con-b align-c">
<text>{{item.title}}</text>
</view>
<view class="commodity-card-item-date row align-c">
<text>{{item.content}}</text>
</view>
<view class="commodity-card-item-operation row con-b align-c">
<view class="row align-c">
<text>业主价</text>
<text class="price-symbol">￥</text>
<text>{{item.priceSpecialText == '0' ? '免费' : item.priceSpecialText}}</text>
<text class="price-unit">/人</text>
<text>{{'￥' + item.priceText}}</text>
</view>
<view>
<button class="row con-c align-c">购买</button>
</view>
</view>
</view>
</block>
</view>
</view>
<!-- 文创商品 --> <!-- 文创商品 -->
<view class="commodity-card"> <view class="commodity-card" wx:if="{{option.id === '1'}}">
<view class="commodity-card-title row con-b align-e"> <view class="commodity-card-title row con-b align-e">
<text>文创商品</text> <text>文创商品</text>
<text>查看全部</text> <text bindtap="onArtAll">查看全部</text>
</view> </view>
<view class="commodity-card-list row"> <view class="commodity-card-list row">
<block wx:for="{{detailActivity}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{detailCommodity}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="commodity-card-item col"> <view class="commodity-card-item col">
<image src=""></image> <image src="{{item.coverImg}}"></image>
<view class="commodity-card-item-title row align-c"> <view class="commodity-card-item-title row align-c">
<text>{{item.title}}</text> <text>{{item.title}}</text>
</view> </view>
<view class="commodity-card-item-operation row con-b align-c"> <view class="commodity-card-item-operation row con-b align-c">
<view class="row align-c"> <view class="row align-c">
<text>业主价</text> <text>业主价</text>
<text>免费</text> <text class="price-symbol">￥</text>
<text>{{item.price}}</text> <text>{{item.priceSpecialText == '0' ? '免费' : item.priceSpecialText}}</text>
<text class="price-unit">/人</text>
<text>{{item.priceText}}</text>
</view> </view>
<view> <view>
<button class="row con-c align-c">购买</button> <button class="row con-c align-c" bindtap="onToBuy" data-id="{{item.id}}" data-classid="{{item.classifyId}}">购买</button>
</view> </view>
</view> </view>
</view> </view>
...@@ -188,8 +222,11 @@ ...@@ -188,8 +222,11 @@
</view> </view>
<!-- 操作 --> <!-- 操作 -->
<view class="operation"> <view class="operation" wx:if="{{option.id === '1'}}">
<button class="button row con-c align-c" bindtap="onContact">电话预约</button> <button class="button row con-c align-c" bindtap="onContact">购买门票</button>
</view>
<view class="operation" wx:if="{{option.id === '4' || option.id === '6'}}">
<button class="button row con-c align-c" bindtap="onContact">立即点餐</button>
</view> </view>
<!-- 侧边返回顶部 --> <!-- 侧边返回顶部 -->
...@@ -214,7 +251,7 @@ ...@@ -214,7 +251,7 @@
<swiper-point bannerStyle="{{1}}" bannerActiveIndex="{{bannerIndex}}"></swiper-point> <swiper-point bannerStyle="{{1}}" bannerActiveIndex="{{bannerIndex}}"></swiper-point>
</view> </view>
<view class="banner-wave"> <view class="banner-wave">
<image src="/image/ornament-2.png" mode="widthFix"></image> <image src="/image/ornament-2-black.png" mode="widthFix"></image>
</view> </view>
</view> </view>
...@@ -228,7 +265,7 @@ ...@@ -228,7 +265,7 @@
<!-- 分享弹出图片 --> <!-- 分享弹出图片 -->
<l-popup show="{{showPopup}}" animation="{{false}}"> <l-popup show="{{showPopup}}" animation="{{false}}">
<view class="popupImage"> <view class="popupImage">
<image src="popupImage"></image> <image src="{{shareImage}}"></image>
</view> </view>
<view class="row con-b"> <view class="row con-b">
<view class="cancel" bindtap="onCancel"> <view class="cancel" bindtap="onCancel">
...@@ -258,32 +295,31 @@ ...@@ -258,32 +295,31 @@
<text>查看全部</text> <text>查看全部</text>
</view> </view>
<view class="commodity-card-list row"> <view class="commodity-card-list row">
<block wx:for="{{detailActivity}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{detailCommodity}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="movie-card-item col"> <view class="movie-card-item col">
<image src=""></image> <image src="{{item.cover}}"></image>
<view class="movie-card-item-title row align-c"> <view class="movie-card-item-title row align-c">
<text>{{item.title}}</text> <text>{{item.movieName}}</text>
</view> </view>
<view class="movie-card-item-info row align-c"> <view class="movie-card-item-info row align-c">
<view class="movie-card-item-info-left"> <view class="movie-card-item-info-left">
<text></text> <text>类型</text>
</view> </view>
<view class="movie-card-item-info-right"> <view class="movie-card-item-info-right">
<text></text> <text>{{item.movieType}}</text>
</view> </view>
</view> </view>
<view class="movie-card-item-info row align-c"> <view class="movie-card-item-info row align-c">
<view class="movie-card-item-info-left"> <view class="movie-card-item-info-left">
<text></text> <text>导演</text>
</view> </view>
<view class="movie-card-item-info-right"> <view class="movie-card-item-info-right">
<text></text> <text>{{item.movieDirector}}</text>
</view> </view>
</view> </view>
<view class="movie-card-item-operation row con-b align-c"> <view class="movie-card-item-operation row con-b align-c">
<view class="row align-c"> <view class="row align-c">
<text>免费</text> <text>免费</text>
<text>{{item.price}}</text>
</view> </view>
<view> <view>
<button class="row con-c align-c">报名观影</button> <button class="row con-c align-c">报名观影</button>
...@@ -296,7 +332,7 @@ ...@@ -296,7 +332,7 @@
</view> </view>
<view class="movie-footer"> <view class="movie-footer">
<image></image> <image src="/image/movie-bottom.png"></image>
</view> </view>
...@@ -318,7 +354,7 @@ ...@@ -318,7 +354,7 @@
</view> </view>
<!-- 评价 --> <!-- 评价 -->
<view class="evaluate" wx:if="{{contentType === 'evaluate'}}"> <view class="evaluate movie-evaluate" wx:if="{{contentType === 'evaluate'}}">
<view class="evaluate-option row con-b align-c"> <view class="evaluate-option row con-b align-c">
<view class="evaluate-option-item row align-c"> <view class="evaluate-option-item row align-c">
<image src="{{imageBase + 'icon/evaluate-1.png'}}"></image> <image src="{{imageBase + 'icon/evaluate-1.png'}}"></image>
......
pages/play/service-detail/service-detail.wxss
...@@ -177,6 +177,9 @@ ...@@ -177,6 +177,9 @@
font-weight: 400; font-weight: 400;
line-height: 44rpx; line-height: 44rpx;
} }
.food-border {
border-bottom: none;
}
.movie-border { .movie-border {
border-bottom: 1px #3A3A40 solid !important; border-bottom: 1px #3A3A40 solid !important;
} }
...@@ -273,7 +276,7 @@ ...@@ -273,7 +276,7 @@
font-size: 26rpx; font-size: 26rpx;
font-weight: 400; font-weight: 400;
line-height: 37rpx; line-height: 37rpx;
color: #15191F; color: #fff;
} }
.commodity-card-item-title text:nth-child(2) { .commodity-card-item-title text:nth-child(2) {
...@@ -309,18 +312,17 @@ ...@@ -309,18 +312,17 @@
font-weight: 400; font-weight: 400;
line-height: 40rpx; line-height: 40rpx;
color: #656E7B; color: #656E7B;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
} }
.movie-card-item-info:first-child { .movie-card-item-info {
height: 33rpx;
margin-top: 13rpx;
padding: 0 20rpx;
}
.movie-card-item-info:last-child {
height: 33rpx; height: 33rpx;
margin-top: 9rpx; margin-top: 10rpx;
padding: 0 20rpx; padding: 0 20rpx;
} }
.movie-card-item-info-left { .movie-card-item-info-left {
width: 44rpx; width: 44rpx;
height: 33rpx; height: 33rpx;
...@@ -331,12 +333,16 @@ ...@@ -331,12 +333,16 @@
} }
.movie-card-item-info-right { .movie-card-item-info-right {
flex: 1;
height: 33rpx; height: 33rpx;
margin-left: 8rpx; margin-left: 8rpx;
font-size: 22rpx; font-size: 22rpx;
font-weight: 400; font-weight: 400;
color: #C2C7CF; color: #C2C7CF;
line-height: 32rpx; line-height: 32rpx;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
} }
.commodity-card-item-operation { .commodity-card-item-operation {
...@@ -385,8 +391,7 @@ ...@@ -385,8 +391,7 @@
} }
.commodity-card-item-operation text:nth-child(2) { .commodity-card-item-operation text:nth-child(3) {
margin-right: 16rpx;
text-align: center; text-align: center;
font-size: 30rpx; font-size: 30rpx;
font-weight: 800; font-weight: 800;
...@@ -394,12 +399,27 @@ ...@@ -394,12 +399,27 @@
color: #15191F; color: #15191F;
} }
.commodity-card-item-operation text:nth-child(3) { .commodity-card-item-operation text:nth-child(5) {
text-align: center; text-align: center;
font-size: 22rpx; font-size: 22rpx;
font-weight: 400; font-weight: 400;
line-height: 32rpx; line-height: 32rpx;
color: #C2C7CF; color: #C2C7CF;
text-decoration: line-through;
}
.price-symbol {
margin-top: 8rpx;
color: #15191F;
font-size: 18rpx;
font-weight: 600;
}
.price-unit {
margin-top: 8rpx;
margin-right: 16rpx;
color: #15191F;
font-size: 18rpx;
font-weight: 600;
} }
.commodity-card-item-operation button { .commodity-card-item-operation button {
...@@ -425,18 +445,17 @@ ...@@ -425,18 +445,17 @@
font-weight: 500; font-weight: 500;
line-height: 36rpx; line-height: 36rpx;
} }
.movie-footer { .movie-footer image {
width: 750rpx; width: 750rpx;
height: 150rpx; height: 150rpx;
background-color: #ccc; margin-top: 80rpx;
} }
/* 分享弹窗 */ /* 分享弹窗 */
.popupImage { .popupImage image {
width: 606rpx; width: 606rpx;
height: 977rpx; height: 977rpx;
margin-bottom: 64rpx; margin-bottom: 64rpx;
background-color: #ccc;
} }
.cancel, .download { .cancel, .download {
width: 288rpx; width: 288rpx;
...@@ -551,7 +570,9 @@ ...@@ -551,7 +570,9 @@
line-height: 40rpx; line-height: 40rpx;
color: #15191F; color: #15191F;
} }
.movie-evaluate {
color: #fff;
}
/* 评论详情 */ /* 评论详情 */
.evaluate-item { .evaluate-item {
width: 670rpx; width: 670rpx;
......
pages/play/service/service.js
...@@ -27,12 +27,14 @@ Page({ ...@@ -27,12 +27,14 @@ Page({
cover: App.globalData.appResourcesBase + 'play/detail/detail-1-2.png', cover: App.globalData.appResourcesBase + 'play/detail/detail-1-2.png',
x: 108, x: 108,
y: 232, y: 232,
shopType: '4'
}, { }, {
appId: 5, appId: 5,
name: '拾光花坊', name: '拾光花坊',
cover: App.globalData.appResourcesBase + 'play/detail/detail-1-3.png', cover: App.globalData.appResourcesBase + 'play/detail/detail-1-3.png',
x: 108, x: 108,
y: 246, y: 246,
shopType: ''
}] }]
}, { }, {
describe: [ describe: [
...@@ -44,6 +46,7 @@ Page({ ...@@ -44,6 +46,7 @@ Page({
cover: App.globalData.appResourcesBase + 'play/detail/detail-2-2.png', cover: App.globalData.appResourcesBase + 'play/detail/detail-2-2.png',
x: 108, x: 108,
y: 246, y: 246,
shopType: '2'
}] }]
}, { }, {
describe: [ describe: [
...@@ -55,12 +58,14 @@ Page({ ...@@ -55,12 +58,14 @@ Page({
cover: App.globalData.appResourcesBase + 'play/detail/detail-3-2.png', cover: App.globalData.appResourcesBase + 'play/detail/detail-3-2.png',
x: 108, x: 108,
y: 232, y: 232,
shopType: '5'
}, { }, {
appId: 4, appId: 4,
name: '原野MOJITO', name: '原野MOJITO',
cover: App.globalData.appResourcesBase + 'play/detail/detail-3-3.png', cover: App.globalData.appResourcesBase + 'play/detail/detail-3-3.png',
x: 108, x: 108,
y: 246, y: 246,
shopType: '5'
}] }]
}, { }, {
describe: [ describe: [
...@@ -72,6 +77,7 @@ Page({ ...@@ -72,6 +77,7 @@ Page({
cover: App.globalData.appResourcesBase + 'play/detail/detail-4-2.png', cover: App.globalData.appResourcesBase + 'play/detail/detail-4-2.png',
x: 108, x: 108,
y: 246, y: 246,
shopType: ''
}] }]
}, { }, {
describe: [ describe: [
...@@ -88,9 +94,10 @@ Page({ ...@@ -88,9 +94,10 @@ Page({
onShopDetail: function (funcItem) { onShopDetail: function (funcItem) {
let funcShopAppId = funcItem.currentTarget.dataset.id let funcShopAppId = funcItem.currentTarget.dataset.id
let funcShopType = funcItem.currentTarget.dataset.type
console.log('funcShopAppId', funcShopAppId) console.log('funcShopAppId', funcShopAppId)
wx.navigateTo({ wx.navigateTo({
url: '/pages/play/service-detail/service-detail?id=' + funcShopAppId url: '/pages/play/service-detail/service-detail?id=' + funcShopAppId + '&type=' + funcShopType
}) })
}, },
}) })
\ No newline at end of file
pages/play/service/service.wxml
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
class="button row con-c align-c" class="button row con-c align-c"
style="{{'bottom: ' + item.y + 'rpx;left: ' + item.x + 'rpx;'}}" style="{{'bottom: ' + item.y + 'rpx;left: ' + item.x + 'rpx;'}}"
data-id="{{item.appId}}" data-id="{{item.appId}}"
data-type="{{item.shopType}}"
bindtap="onShopDetail" bindtap="onShopDetail"
> >
<text>立即预定</text> <text>立即预定</text>
......
utils/utils.js
...@@ -26,7 +26,6 @@ let output = { ...@@ -26,7 +26,6 @@ let output = {
*/ */
formatAmount: function (funcAmountValue) { formatAmount: function (funcAmountValue) {
if (!funcAmountValue && funcAmountValue !== 0) return if (!funcAmountValue && funcAmountValue !== 0) return
console.log(funcAmountValue, funcAmountValue.toString().length)
switch (funcAmountValue.toString().length) { switch (funcAmountValue.toString().length) {
case 1: case 1:
funcAmountValue = '00' + funcAmountValue funcAmountValue = '00' + funcAmountValue
......
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