Skip to content

严立 / mini-shimao

Go to a project
Commit 4bb5939d by 严立
Options

LL - 订单修改

parent 67aac7a4
Inline Side-by-side
Showing with 178 additions and 42 deletions
pages/commodity/menu-food/menu-food.js
...@@ -103,7 +103,12 @@ Page({ ...@@ -103,7 +103,12 @@ Page({
'priceDiscountText': App.modular.utils.formatAmount(funcResponse[i].price), // 活动价文本格式 'priceDiscountText': App.modular.utils.formatAmount(funcResponse[i].price), // 活动价文本格式
'priceType': 1, 'priceType': 1,
'describe': funcResponse[i].synopsis, 'describe': funcResponse[i].synopsis,
'describeDetail': '', // 商品描述详情，在点击详情时获得数据
'tags': funcResponse[i].tags, 'tags': funcResponse[i].tags,
'quantityMin': 1,
'quantityMax': funcResponse[i].number,
'isActive': true,
} }
let funcUserType = wx.getStorageSync('userInfo').userType let funcUserType = wx.getStorageSync('userInfo').userType
...@@ -168,6 +173,8 @@ Page({ ...@@ -168,6 +173,8 @@ Page({
let funcResponse = response.data let funcResponse = response.data
funcItem.banner = funcResponse.imgs.split('|') funcItem.banner = funcResponse.imgs.split('|')
funcItem.banner.pop() funcItem.banner.pop()
funcItem.describeDetail = funcResponse.particulars
this.setData({ this.setData({
commodityDetail: funcItem, commodityDetail: funcItem,
winCommodityDetail: true winCommodityDetail: true
......
pages/commodity/menu-food/menu-food.wxml
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
<view class="popup-info-wrapper"> <view class="popup-info-wrapper">
<view class="popuo-info-title">{{commodityDetail.name}}</view> <view class="popuo-info-title">{{commodityDetail.name}}</view>
<view class="popup-info-text">{{commodityDetail.describe}}</view> <view class="popup-info-text">{{commodityDetail.describeDetail}}</view>
</view> </view>
<view class="popup-footer-wrapper"> <view class="popup-footer-wrapper">
......
pages/commodity/menu-snacks/menu-snacks.js
...@@ -103,6 +103,7 @@ Page({ ...@@ -103,6 +103,7 @@ Page({
'priceDiscountText': App.modular.utils.formatAmount(funcResponse[i].price), // 活动价文本格式 'priceDiscountText': App.modular.utils.formatAmount(funcResponse[i].price), // 活动价文本格式
'priceType': 1, 'priceType': 1,
'describe': funcResponse[i].synopsis, 'describe': funcResponse[i].synopsis,
'describeDetail': '',
'tags': funcResponse[i].tags, 'tags': funcResponse[i].tags,
} }
...@@ -168,6 +169,8 @@ Page({ ...@@ -168,6 +169,8 @@ Page({
let funcResponse = response.data let funcResponse = response.data
funcItem.banner = funcResponse.imgs.split('|') funcItem.banner = funcResponse.imgs.split('|')
funcItem.banner.pop() funcItem.banner.pop()
funcItem.describeDetail = funcResponse.particulars
this.setData({ this.setData({
commodityDetail: funcItem, commodityDetail: funcItem,
winCommodityDetail: true winCommodityDetail: true
......
pages/commodity/menu-snacks/menu-snacks.wxml
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
<view class="popup-info-wrapper"> <view class="popup-info-wrapper">
<view class="popuo-info-title">{{commodityDetail.name}}</view> <view class="popuo-info-title">{{commodityDetail.name}}</view>
<view class="popup-info-text">{{commodityDetail.describe}}</view> <view class="popup-info-text">{{commodityDetail.describeDetail}}</view>
</view> </view>
<view class="popup-footer-wrapper"> <view class="popup-footer-wrapper">
......
pages/commodity/shopping-cart/shopping-cart.js
...@@ -206,7 +206,7 @@ Page({ ...@@ -206,7 +206,7 @@ Page({
titleColor: '#15191F', titleColor: '#15191F',
success: (response) => { success: (response) => {
if (response.confirm) { if (response.confirm) {
// wx.setStorageSync('shoppingCartBuffer', []) wx.setStorageSync('shoppingCartBuffer', [])
this.setData({ this.setData({
shoppingCart: [] shoppingCart: []
}) })
......
pages/mine/order/order.js
...@@ -220,6 +220,9 @@ Page({ ...@@ -220,6 +220,9 @@ Page({
console.log(response) console.log(response)
} }
}) })
this.setData({
'orderList': [],
})
this.queryOrder() this.queryOrder()
}, },
...@@ -241,7 +244,9 @@ Page({ ...@@ -241,7 +244,9 @@ Page({
console.log(response) console.log(response)
} }
}) })
this.setData({
'orderList': [],
})
this.queryOrder() this.queryOrder()
}, },
......
pages/pay/order-detail/order-detail.js
...@@ -23,6 +23,8 @@ Page({ ...@@ -23,6 +23,8 @@ Page({
fromPage: options.fromPage === 'order' ? 'order' : '' fromPage: options.fromPage === 'order' ? 'order' : ''
}) })
console.log(funcOrderInfo, '--------------------------')
this.queryOrderDetail() this.queryOrderDetail()
}, },
......
pages/pay/order-detail/order-detail.wxml
...@@ -167,8 +167,8 @@ ...@@ -167,8 +167,8 @@
<view class="tip-describe col"> <view class="tip-describe col">
<text>{{'订单编号：' + orderInfo.tipOrderNo}}</text> <text>{{'订单编号：' + orderInfo.tipOrderNo}}</text>
<text>{{'下单时间：' + orderInfo.tipTimeSubmit}}</text> <text>{{'下单时间：' + orderInfo.tipTimeSubmit}}</text>
<text>{{'付款时间：' + orderInfo.tipTimePay}}</text> <text wx:if="{{orderInfo.state !== 0 && orderInfo.state !== -1}}">{{'付款时间：' + orderInfo.tipTimePay}}</text>
<text>{{'获得积分：' + orderInfo.tipIntegral}}</text> <text wx:if="{{orderInfo.state !== 0 && orderInfo.state !== -1}}">{{'获得积分：' + orderInfo.tipIntegral}}</text>
</view> </view>
</view> </view>
</view> </view>
\ No newline at end of file
pages/pay/order-detail/order-detail.wxss
...@@ -122,7 +122,6 @@ ...@@ -122,7 +122,6 @@
max-width: 62rpx; max-width: 62rpx;
max-height: 62rpx; max-height: 62rpx;
margin-right: 16rpx; margin-right: 16rpx;
background: #999999;
} }
.commodity-item { .commodity-item {
...@@ -135,7 +134,6 @@ ...@@ -135,7 +134,6 @@
width: 140rpx; width: 140rpx;
height: 136rpx; height: 136rpx;
margin-right: 24rpx; margin-right: 24rpx;
background: #999999;
} }
.commodity-item-info { .commodity-item-info {
......
pages/pay/order-input/order-input.js
...@@ -89,7 +89,6 @@ Page({ ...@@ -89,7 +89,6 @@ Page({
this.setShoppingCartData() this.setShoppingCartData()
this.setView() this.setView()
this.animation = wx.createAnimation({ this.animation = wx.createAnimation({
duration: 700, duration: 700,
timingFunction: 'ease' timingFunction: 'ease'
...@@ -507,7 +506,9 @@ Page({ ...@@ -507,7 +506,9 @@ Page({
// 整合商品数据 // 整合商品数据
let funcCommodity = [] let funcCommodity = []
let funcShoppingCartList = this.data.shoppingCartList let funcShoppingCartList = this.data.shoppingCartList
console.log(funcShoppingCartList)
for (let i = 0, l = funcShoppingCartList.length; i < l; i++) { for (let i = 0, l = funcShoppingCartList.length; i < l; i++) {
if (funcShoppingCartList.isActive) {
let funcItem = { let funcItem = {
'smCommodity': { 'smCommodity': {
'id': funcShoppingCartList[i].id, 'id': funcShoppingCartList[i].id,
...@@ -523,6 +524,7 @@ Page({ ...@@ -523,6 +524,7 @@ Page({
} }
funcCommodity.push(funcItem) funcCommodity.push(funcItem)
} }
}
// 整合用户数据 // 整合用户数据
let funcUserInfo = [] let funcUserInfo = []
...@@ -548,6 +550,10 @@ Page({ ...@@ -548,6 +550,10 @@ Page({
}, },
success: (response) => { success: (response) => {
let funcResponse = response.data.wxRequest let funcResponse = response.data.wxRequest
// 库存不足
// if (funcResponse.)
// 库存充足正常下单支付
pagePayId = response.data.orderId pagePayId = response.data.orderId
this.setData({ this.setData({
orderId: pagePayId orderId: pagePayId
...@@ -559,10 +565,10 @@ Page({ ...@@ -559,10 +565,10 @@ Page({
'package': funcResponse.package, 'package': funcResponse.package,
'signType': funcResponse.signType, 'signType': funcResponse.signType,
'paySign': funcResponse.paySign, 'paySign': funcResponse.paySign,
'success': (response) => { success: (response) => {
if (response.errMsg === 'requestPayment:ok') { if (response.errMsg === 'requestPayment:ok') {
// 用户点击支付完成按钮回调 // 用户点击支付完成按钮回调
this.payStatus(true) // this.payStatus(true)
} }
if (response.errMsg === 'requestPayment:fail cancel') { if (response.errMsg === 'requestPayment:fail cancel') {
...@@ -570,7 +576,7 @@ Page({ ...@@ -570,7 +576,7 @@ Page({
this.payStatus(false) this.payStatus(false)
} }
}, },
'fail': function (response) { fail: (response) => {
clearInterval(App.globalData.payStateTimer) clearInterval(App.globalData.payStateTimer)
this.payStatus(false) this.payStatus(false)
} }
...@@ -618,8 +624,16 @@ Page({ ...@@ -618,8 +624,16 @@ Page({
*/ */
payStatus: function (funcPayResult) { payStatus: function (funcPayResult) {
clearInterval(App.globalData.payStateTimer) clearInterval(App.globalData.payStateTimer)
if (funcPayResult) {
// 支付成功进入成功页面
wx.navigateTo({ wx.navigateTo({
url: '/pages/pay/order-state/order-state?state=' + funcPayResult + '&amount=' + this.data.buyContentAmount + '&orderId=' + this.data.orderId url: '/pages/pay/order-state/order-state?state=' + funcPayResult + '&amount=' + this.data.buyContentAmount + '&orderId=' + this.data.orderId
}) })
} else {
// 取消支付直接进入订单
wx.reLaunch({
url: '/pages/pay/order-detail/order-detail?id=' + this.data.orderId + '&fromPage=order'
})
}
}, },
}) })
\ No newline at end of file
pages/play/home/home.js
...@@ -208,4 +208,74 @@ Page({ ...@@ -208,4 +208,74 @@ Page({
url: '/pages/play/movie/movie' url: '/pages/play/movie/movie'
}) })
}, },
// 游客攻略列表
loadVisiterPlanList() {
this.data.loading = true
var that = this
app.wxRequest({
url: '/api/v1/strategy/getList',
data: { pageSize: that.data.pageSize + '', pageNo: that.data.pageNo + '' },
success: function (res) {
that.setData({
loading: false
})
if (res.data.list.length > 0) {
let count = that.data.strategyOriginList.length
if (that.data.pageNo == 1) {
count = 0
}
let tempArray = []
for (let i = 0; i < res.data.list.length; i++) {
let item = res.data.list[i]
let strategy = {
id: item.id,
image: (count == 0 && i == 0) ? item.topImg : item.cover,
title: item.title,
date: item.updateDate,
index: count + i - 1,
}
tempArray.push(strategy)
}
console.log('tempArray', tempArray)
if (that.data.pageNo == 1) {
var newArr = tempArray.slice(1)
var firstItem = tempArray[0]
console.log('firstItem', firstItem)
that.setData({
moreData: (tempArray.length >= Number(res.data.count)) ? false : true,
['strategyFirstItem.id']: firstItem.id,
['strategyFirstItem.image']: firstItem.image,
['strategyFirstItem.title']: firstItem.title,
['strategyFirstItem.date']: firstItem.date,
strategyList: newArr,
strategyOriginList: tempArray,
})
} else {
that.setData({
moreData: (count + tempArray.length >= Number(res.data.count)) ? false : true,
strategyOriginList: that.data.strategyOriginList.concat(tempArray),
strategyList: tempArray,
})
}
// 游客攻略瀑布列表
wx.lin.renderWaterFlow(that.data.strategyList, that.data.pageNo == 1 ? true : false, () => { })
} else {
}
},
fail: function (err) {
that.setData({
loading: false
})
}
})
},
}) })
\ No newline at end of file
pages/play/home/home.wxml
...@@ -70,10 +70,13 @@ ...@@ -70,10 +70,13 @@
</block> </block>
</swiper> </swiper>
<view class="title-wrapper row align-c"> <!-- 游客攻略 -->
<image class="title" src="./image/title-route.png">游客攻略</image> <view class="route">
<view class="title row align-c">
<image src="./image/title-route.png">游客攻略</image>
</view> </view>
<view> <view class="route-list">
</view> </view>
</view>
</view> </view>
\ No newline at end of file
pages/play/home/home.wxss
...@@ -29,12 +29,14 @@ ...@@ -29,12 +29,14 @@
width: 130rpx; width: 130rpx;
height: 20rpx; height: 20rpx;
} }
.banner { .banner {
position: relative; position: relative;
margin-top: 200rpx; margin-top: 200rpx;
width: 750rpx; width: 750rpx;
height: 1200rpx; height: 1200rpx;
} }
.art-button { .art-button {
position: absolute; position: absolute;
top: 40rpx; top: 40rpx;
...@@ -43,6 +45,7 @@ ...@@ -43,6 +45,7 @@
height: 260rpx; height: 260rpx;
background: transparent; background: transparent;
} }
.health-button { .health-button {
position: absolute; position: absolute;
top: 320rpx; top: 320rpx;
...@@ -51,6 +54,7 @@ ...@@ -51,6 +54,7 @@
height: 376rpx; height: 376rpx;
background: transparent; background: transparent;
} }
.food-button { .food-button {
position: absolute; position: absolute;
top: 350rpx; top: 350rpx;
...@@ -59,6 +63,7 @@ ...@@ -59,6 +63,7 @@
height: 376rpx; height: 376rpx;
background: transparent; background: transparent;
} }
.leisure-button { .leisure-button {
position: absolute; position: absolute;
top: 788rpx; top: 788rpx;
...@@ -66,8 +71,8 @@ ...@@ -66,8 +71,8 @@
width: 304rpx; width: 304rpx;
height: 308rpx; height: 308rpx;
background: transparent; background: transparent;
} }
.hotel-button { .hotel-button {
position: absolute; position: absolute;
top: 820rpx; top: 820rpx;
...@@ -75,37 +80,36 @@ ...@@ -75,37 +80,36 @@
width: 296rpx; width: 296rpx;
height: 328rpx; height: 328rpx;
background: transparent; background: transparent;
}
.title-wrapper {
width: 670rpx;
margin-top: 30rpx;
}
.title {
width: 184rpx;
height: 44rpx;
} }
.all { .all {
width: 104rpx; width: 104rpx;
height: 36rpx; height: 36rpx;
background-color: #ccc; background-color: #ccc;
} }
.recent-swiper { .recent-swiper {
width: 750rpx; width: 750rpx;
height: 721rpx; height: 721rpx;
margin-top: 80rpx; margin-top: 80rpx;
padding-bottom: 50rpx; padding-bottom: 50rpx;
} }
.recent-item { .recent-item {
width: 712rpx; width: 712rpx;
} }
.recent-item image { .recent-item image {
width: 648rpx; width: 648rpx;
background-color: #ccc; background-color: #ccc;
} }
.recent-item-left { .recent-item-left {
margin-left: 40rpx; margin-left: 40rpx;
} }
.recent-item-center { .recent-item-center {
margin-left: 51rpx; margin-left: 51rpx;
} }
...@@ -116,17 +120,20 @@ ...@@ -116,17 +120,20 @@
margin-top: 48rpx; margin-top: 48rpx;
padding-bottom: 50rpx; padding-bottom: 50rpx;
} }
.movie-item { .movie-item {
width: 712rpx; width: 712rpx;
} }
.movie-wrapper { .movie-wrapper {
position: relative; position: relative;
width: 648rpx; width: 648rpx;
height: 326rpx; height: 326rpx;
padding: 40rpx 40rpx 40rpx 260rpx; padding: 40rpx 40rpx 40rpx 260rpx;
background-color: #F5F6F8; background-color: #f5f6f8;
border-radius: 4rpx; border-radius: 4rpx;
} }
.movie-cover { .movie-cover {
position: absolute; position: absolute;
left: 40rpx; left: 40rpx;
...@@ -136,24 +143,29 @@ ...@@ -136,24 +143,29 @@
background-color: #ccc; background-color: #ccc;
border-radius: 4rpx; border-radius: 4rpx;
} }
.movie-item-left { .movie-item-left {
margin-left: 40rpx; margin-left: 40rpx;
} }
.movie-item-center { .movie-item-center {
margin-left: 51rpx; margin-left: 51rpx;
} }
.movie-info-wrapper { .movie-info-wrapper {
margin-left: 40rpx; margin-left: 40rpx;
} }
.movie-name text { .movie-name text {
display: -webkit-box; display: -webkit-box;
color: #15191F; color: #15191f;
font-size: 30rpx; font-size: 30rpx;
max-width: 240rpx; max-width: 240rpx;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-webkit-line-clamp: 1; -webkit-line-clamp: 1;
overflow: hidden; overflow: hidden;
} }
.movie-dimensional { .movie-dimensional {
width: 52rpx; width: 52rpx;
height: 32rpx; height: 32rpx;
...@@ -163,25 +175,29 @@ ...@@ -163,25 +175,29 @@
font-size: 20rpx; font-size: 20rpx;
text-align: center; text-align: center;
line-height: 32rpx; line-height: 32rpx;
background: #15191F; background: #15191f;
opacity: 0.5; opacity: 0.5;
border-radius: 4rpx; border-radius: 4rpx;
} }
.movie-info { .movie-info {
margin-top: 16rpx; margin-top: 16rpx;
font-size: 26rpx; font-size: 26rpx;
} }
.movie-info-left { .movie-info-left {
color: #959DA9; color: #959da9;
} }
.movie-info-right { .movie-info-right {
display: -webkit-box; display: -webkit-box;
margin-left: 8rpx; margin-left: 8rpx;
color: #656E7B; color: #656e7b;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-webkit-line-clamp: 1; -webkit-line-clamp: 1;
overflow: hidden; overflow: hidden;
} }
.movie-btn { .movie-btn {
width: 152rpx; width: 152rpx;
height: 56rpx; height: 56rpx;
...@@ -190,12 +206,10 @@ ...@@ -190,12 +206,10 @@
font-size: 26rpx; font-size: 26rpx;
text-align: center; text-align: center;
line-height: 56rpx; line-height: 56rpx;
background: #86C5E1; background: #86c5e1;
border-radius: 4rpx; border-radius: 4rpx;
} }
/* .banner, /* .banner,
swiper { swiper {
position: relative; position: relative;
...@@ -230,6 +244,7 @@ swiper-item { ...@@ -230,6 +244,7 @@ swiper-item {
} }
/* 更多活动 */ /* 更多活动 */
.activity { .activity {
width: 100%; width: 100%;
height: 34rpx; height: 34rpx;
...@@ -237,7 +252,7 @@ swiper-item { ...@@ -237,7 +252,7 @@ swiper-item {
padding: 0 56rpx; padding: 0 56rpx;
font-size: 26rpx; font-size: 26rpx;
font-weight: bolder; font-weight: bolder;
color: #1E2025; color: #1e2025;
} }
.activity image { .activity image {
...@@ -246,6 +261,7 @@ swiper-item { ...@@ -246,6 +261,7 @@ swiper-item {
} }
/* 装饰波浪 */ /* 装饰波浪 */
.ornament-wave { .ornament-wave {
width: 750rpx; width: 750rpx;
height: 60rpx; height: 60rpx;
...@@ -258,10 +274,11 @@ swiper-item { ...@@ -258,10 +274,11 @@ swiper-item {
} }
/* 标签选择 */ /* 标签选择 */
.tab { .tab {
width: 100%; width: 100%;
padding: 40rpx 40rpx 0 40rpx; padding: 40rpx 40rpx 0 40rpx;
background: #ffffff; background: #fff;
} }
.tab-fixed { .tab-fixed {
...@@ -275,7 +292,7 @@ swiper-item { ...@@ -275,7 +292,7 @@ swiper-item {
.tab-blank { .tab-blank {
width: 750rpx; width: 750rpx;
height: 190rpx; height: 190rpx;
background: #ffffff; background: #fff;
} }
.tab .tab-item-active { .tab .tab-item-active {
...@@ -283,7 +300,7 @@ swiper-item { ...@@ -283,7 +300,7 @@ swiper-item {
height: 100rpx; height: 100rpx;
margin-bottom: 16rpx; margin-bottom: 16rpx;
border-radius: 50%; border-radius: 50%;
background: #E3EEFF; background: #e3eeff;
} }
.tab .tab-item-inactive { .tab .tab-item-inactive {
...@@ -295,11 +312,11 @@ swiper-item { ...@@ -295,11 +312,11 @@ swiper-item {
} }
.tab .tab-item-text-active { .tab .tab-item-text-active {
color: #15191F; color: #15191f;
} }
.tab .tab-item-text-inactive { .tab .tab-item-text-inactive {
color: #959DA9; color: #959da9;
} }
.tab-item text { .tab-item text {
...@@ -313,6 +330,7 @@ swiper-item { ...@@ -313,6 +330,7 @@ swiper-item {
} }
/* 标签详情 */ /* 标签详情 */
.detail { .detail {
width: 750rpx; width: 750rpx;
min-height: 500rpx; min-height: 500rpx;
...@@ -326,6 +344,7 @@ swiper-item { ...@@ -326,6 +344,7 @@ swiper-item {
} }
/* 商店详情 */ /* 商店详情 */
.shop-item { .shop-item {
position: relative; position: relative;
width: 750rpx; width: 750rpx;
...@@ -344,13 +363,12 @@ swiper-item { ...@@ -344,13 +363,12 @@ swiper-item {
position: absolute; position: absolute;
width: 534rpx; width: 534rpx;
height: 96rpx; height: 96rpx;
background: #86C5E1; background: #86c5e1;
border-radius: 2px; border-radius: 2px;
overflow: hidden; overflow: hidden;
font-size: 30rpx; font-size: 30rpx;
font-weight: 500; font-weight: 500;
color: #ffffff; color: #fff;
line-height: 42rpx; line-height: 42rpx;
} }
...@@ -358,3 +376,14 @@ image { ...@@ -358,3 +376,14 @@ image {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
/* 游客攻略 */
.title {
width: 670rpx;
margin-top: 30rpx;
}
.title > image {
width: 184rpx;
height: 44rpx;
}
\ 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