Skip to content

严立 / mini-shimao

Go to a project
Commit d93318d3 by wjw
Options

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

parents 3f10e4ac 24d5165a
Inline Side-by-side
Showing with 210 additions and 89 deletions
app.js
...@@ -13,6 +13,7 @@ App({ ...@@ -13,6 +13,7 @@ App({
}, },
globalData: { globalData: {
test:'999',
appImageBase: '../../../image/', appImageBase: '../../../image/',
appResourcesBase: 'https://sm-web.meiqicloud.com/userfiles/appResourcesS2/', appResourcesBase: 'https://sm-web.meiqicloud.com/userfiles/appResourcesS2/',
shopId: iEnvironmental.shopId, shopId: iEnvironmental.shopId,
......
pages/mine/order/order.js
...@@ -25,7 +25,7 @@ Page({ ...@@ -25,7 +25,7 @@ Page({
'name': '待使用' 'name': '待使用'
}, },
{ {
'value': '-1, 4', 'value': `-1','4`,
'name': '取消/过期' 'name': '取消/过期'
}, },
], ],
......
pages/mine/order/order.wxml
...@@ -69,13 +69,12 @@ ...@@ -69,13 +69,12 @@
<text class="name">{{item.commodity[0].name}}</text> <text class="name">{{item.commodity[0].name}}</text>
<text class="total">{{'x ' + item.total}}</text> <text class="total">{{'x ' + item.total}}</text>
</view> </view>
<!-- 商品数量样式二 --> <!-- 商品数量样式二 -->
<view class="order-list-item-service row con-b align-c" wx:if="{{item.commodity.length >= 2}}"> <view class="order-list-item-service row con-b align-c" wx:if="{{item.commodity.length >= 2}}">
<block wx:for="{{item.commodity}}" wx:for-index="commodityIndex" wx:for-item="commodityItem" wx:key="commodityIndex"> <block wx:for="{{item.commodity}}" wx:for-index="commodityIndex" wx:for-item="commodityItem" wx:key="commodityIndex">
<image class="cover" src="{{commodityItem.cover}}"></image> <image class="cover" src="{{commodityItem.cover}}"></image>
</block> </block>
<text class="total">{{'共 ' + item.total + ' 件'}}</text> <text class="total">{{'共 ' + item.commodity.length + ' 件'}}</text>
</view> </view>
<view class="order-list-item-operation row con-b align-c"> <view class="order-list-item-operation row con-b align-c">
......
pages/mine/order/order.wxss
...@@ -86,7 +86,7 @@ page { ...@@ -86,7 +86,7 @@ page {
.container-order { .container-order {
/* margin-top: 170rpx; */ /* margin-top: 170rpx; */
margin-top: 288rpx; padding-top: 288rpx;
} }
......
pages/pay/coupon-detail/coupon-detail.js
...@@ -88,9 +88,9 @@ Page({ ...@@ -88,9 +88,9 @@ Page({
submitOperation() { submitOperation() {
let that = this let that = this
wx.lin.showDialog({ wx.lin.showDialog({
type:"confirm", type: "confirm",
title:"", title: "",
content:"是否确认核销券码" , content: "是否确认核销券码",
success: (res) => { success: (res) => {
if (res.confirm) { if (res.confirm) {
console.log('用户点击确定') console.log('用户点击确定')
...@@ -116,15 +116,15 @@ Page({ ...@@ -116,15 +116,15 @@ Page({
data: { data: {
volumeId: that.data.couponDetail.volumeId, volumeId: that.data.couponDetail.volumeId,
}, },
success: function(res) { success: function (res) {
if (res.data.code * 1 == 200) { if (res.data.code * 1 == 200) {
wx.lin.showToast({ wx.lin.showToast({
image: '/image/success.png', image: '/image/success.png',
title: '核销成功', title: '核销成功',
}) })
setTimeout(()=>{ setTimeout(() => {
wx.navigateBack() wx.navigateBack()
},2000); }, 2000);
} else { } else {
wx.lin.showToast({ wx.lin.showToast({
image: '/image/error.png', image: '/image/error.png',
...@@ -133,7 +133,7 @@ Page({ ...@@ -133,7 +133,7 @@ Page({
} }
}, },
fail: function(err) { fail: function (err) {
wx.lin.showToast({ wx.lin.showToast({
image: '/image/error.png', image: '/image/error.png',
title: err.msg, title: err.msg,
......
pages/pay/order-detail/order-detail.js
...@@ -2,12 +2,14 @@ let App = getApp() ...@@ -2,12 +2,14 @@ let App = getApp()
Page({ Page({
data: { data: {
winToastText: '操作成功',
winToast: false,
isDoing: false,
showNotice: false, showNotice: false,
swiperCurrent: 0, swiperCurrent: 0,
showCodePopup: false, showCodePopup: false,
imageBase: App.globalData.appImageBase, imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase, resourcesBase: App.globalData.appResourcesBase,
shopInfo: {}, shopInfo: {},
orderType: 1, // 1 - 年卡/月卡，2 - 次票， 3 - SPA， 4 - 文创， 5 - 餐品， 6 - 活动， 7 - 观影 orderType: 1, // 1 - 年卡/月卡，2 - 次票， 3 - SPA， 4 - 文创， 5 - 餐品， 6 - 活动， 7 - 观影
...@@ -18,49 +20,17 @@ Page({ ...@@ -18,49 +20,17 @@ Page({
isFromUse: false, isFromUse: false,
winCode: false, winCode: false,
residuePayTime: "", //剩余支付时间 residuePayTime: "", //剩余支付时间
sealImgs: [{
type: 1, codeList: [],
url: App.globalData.appResourcesBase + 'sealOfOrder/ertongyingdi-2.png'
}], sealSrc: '',
sealTest: App.globalData.appResourcesBase + 'sealOfOrder/ertongyingdi-2.png', shopConfig: App.globalData.shopId,
sealBig: App.globalData.appResourcesBase + 'sealOfOrder/ertongyingdi-1.png', imgBasehost: App.globalData.appResourcesBase
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'
}
]
}, },
onLoad: function (options) { onLoad: function (options) {
let funcOrderInfo = this.data.orderInfo let funcOrderInfo = this.data.orderInfo
funcOrderInfo.id = options.id funcOrderInfo.id = options.id
this.setData({ this.setData({
...@@ -74,8 +44,108 @@ Page({ ...@@ -74,8 +44,108 @@ Page({
success: (result) => { success: (result) => {
this.queryOrderDetail() this.queryOrderDetail()
}, },
})
},
// 再次下单
onOrderAgain: function (event) {
let commodityType = this.data.orderInfo.commodityType
let shopAppId = wx.getStorageSync('shopInfoBuffer') ? wx.getStorageSync('shopInfoBuffer').appId : ""
wx.navigateTo({
url: `/pages/commodity/menu-food/menu-food?formPage=order&shopAppId=${shopAppId}&commodityType=${commodityType}`,
})
},
// 去支付
onOrderPay: function (event) {
// 数据校验不通过
let that = this
let wxRequest = this.data.orderInfo.wxRequest
// 待支付返回的wx支付参数
if (wxRequest) {
wx.requestPayment({
timeStamp: wxRequest.timeStamp,
nonceStr: wxRequest.nonceStr,
package: wxRequest.package,
signType: wxRequest.signType,
paySign: wxRequest.paySign,
success(res) {
// let state = `orderInfo.state`
// that.setData({
// [state]: 2,
// })
that.queryOrderDetail()
},
fail(res) {}
})
}
},
// 去评价
onOrderEvaluate: function (event) {
let item = JSON.stringify(this.data.orderInfo)
wx.navigateTo({
url: `/pages/pay/order-comment/order-comment?orderItem=${item}`,
})
},
// 删除订单&取消订单
onDelOrCancelOrder: function (event) {
// wx.lin.showDialog({
// type: "confirm",
// title: "",
// content: "是否确认核销券码",
// success: (res) => {
// if (res.confirm) {
// console.log('用户点击确定')
// that.doVolume()
// } else if (res.cancel) {
// console.log('用户点击取消')
// }
// }
// })
let type = event.currentTarget.dataset.type
let that = this
wx.showLoading({
title: '处理中',
mask: true
})
this.setData({
isDoing: true,
})
App.wxRequest({
url: '/api/v1/order/cancelOrder',
data: {
'orderId': this.data.orderInfo.id,
'type': type,
},
success: (response) => {
wx.hideLoading()
let winToastText = type == 1 ? '订单删除成功' : '订单取消成功'
that.setData({
isDoing: false,
winToast: true,
winToastText: winToastText
})
setTimeout(function () {
if (type == 1) {
// 删除操作
wx.redirectTo({
url: '/pages/mine/order/order',
})
} else {
// 取消操作
let state = `orderInfo.state`
that.setData({
isDoing: false,
[state]: -1
}) })
}
}, 2000)
}
})
}, },
// 使用须知 // 使用须知
handleNotice() { handleNotice() {
...@@ -148,9 +218,23 @@ Page({ ...@@ -148,9 +218,23 @@ Page({
'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 'officeName': funcResponse.officeName,
'wxRequest': funcResponse.wxRequest
}
// 设置印章
let shopName = funcResponse.officeName;
let shopFilter = this.data.shopConfig.filter(
item => {
return item.name.toLowerCase() == shopName.toLowerCase()
} }
)
funcOrderInfo.shopInfo = shopFilter[0]
console.log(shopFilter[0], '-----------shopFilter[0]------');
// 添加订单商品列表 // 添加订单商品列表
let funcCommodity = funcResponse.smOrderDetails let funcCommodity = funcResponse.smOrderDetails
for (let i = 0, l = funcCommodity.length; i < l; i++) { for (let i = 0, l = funcCommodity.length; i < l; i++) {
...@@ -158,7 +242,7 @@ Page({ ...@@ -158,7 +242,7 @@ Page({
'cover': funcCommodity[i].imgUrl, 'cover': funcCommodity[i].imgUrl,
'name': funcCommodity[i].name, // 名称 'name': funcCommodity[i].name, // 名称
'quantity': funcCommodity[i].number, // 数量 'quantity': funcCommodity[i].number, // 数量
'amount': funcCommodity[i].totalPrices, // 总价 'amount': funcCommodity[i].unitPrice, // 总价
'state': Number(funcCommodity[i].status), // 状态 'state': Number(funcCommodity[i].status), // 状态
'codeId': funcCommodity[i].volumeId, // 券码 'codeId': funcCommodity[i].volumeId, // 券码
} }
...@@ -207,16 +291,21 @@ Page({ ...@@ -207,16 +291,21 @@ Page({
}) })
}, },
// 弹出单张二维码 // 弹出单张二维码
onCouponCode: function (event) { onCouponCode: function (event) {
let funcOrderInfo = event.currentTarget.dataset.item let funcOrderInfo = event.currentTarget.dataset.item
wx.showLoading({
title: '加载中',
})
App.wxRequest({ App.wxRequest({
url: '/api/v1/volume/getVolume', url: '/api/v1/volume/getVolume',
data: { data: {
'volumeId': funcOrderInfo.codeId 'volumeId': funcOrderInfo.codeId
}, },
success: (response) => { success: (response) => {
wx.hideLoading({
success: (res) => {},
})
let funcResponse = response.data let funcResponse = response.data
let funcCodeInfo = { let funcCodeInfo = {
'codeNo': funcResponse.serialNumber, 'codeNo': funcResponse.serialNumber,
......
pages/pay/order-detail/order-detail.wxml
<navigation class="navigation" titleText="订单详情" color="#000000" background="#FFFFFF" backIcon="/image/back.png" bind:navBack="navBack"></navigation> <navigation class="navigation" titleText="订单详情" color="#000000" background="#FFFFFF" backIcon="/image/back.png"
bind:navBack="navBack"></navigation>
<view class="container"> <view class="container">
<!-- 订单状态 --> <!-- 订单状态 -->
...@@ -56,7 +57,7 @@ ...@@ -56,7 +57,7 @@
<text class="info-content-item-label"></text> <text class="info-content-item-label"></text>
<text class="info-content-item-describe">周一至周日 10:00 - 20:00</text> <text class="info-content-item-describe">周一至周日 10:00 - 20:00</text>
</view> </view>
<image class="seal-shot" src="{{sealTest}}"></image> <image class="seal-shot" src="{{imgBasehost+orderInfo.shopInfo.print}}"></image>
</view> </view>
</block> </block>
...@@ -72,14 +73,7 @@ ...@@ -72,14 +73,7 @@
<text class="info-content-item-label"></text> <text class="info-content-item-label"></text>
<text class="info-content-item-describe">周一至周日 10:00 - 20:00</text> <text class="info-content-item-describe">周一至周日 10:00 - 20:00</text>
</view> </view>
<!-- <view class="info-content-item row">
<text class="info-content-item-label">订单信息</text>
<text class="info-content-item-tip">儿童营地</text>
</view>
<view class="info-content-item row">
<text class="info-content-item-label"></text>
<text class="info-content-item-tip">18030303030</text>
</view> -->
<view class="info-content-item row"> <view class="info-content-item row">
<text class="info-content-item-label">订单信息</text> <text class="info-content-item-label">订单信息</text>
<text class="info-content-item-tip">{{orderInfo.contactName}}</text> <text class="info-content-item-tip">{{orderInfo.contactName}}</text>
...@@ -88,26 +82,24 @@ ...@@ -88,26 +82,24 @@
<text class="info-content-item-label"></text> <text class="info-content-item-label"></text>
<text class="info-content-item-tip">{{orderInfo.contactPhone}}</text> <text class="info-content-item-tip">{{orderInfo.contactPhone}}</text>
</view> </view>
<image wx:if="{{orderInfo.state!==2}}" class="seal-shot" src="{{imgBasehost+orderInfo.shopInfo.print}}"></image>
</view> </view>
<block wx:if="{{orderInfo.state===2}}"> <block wx:if="{{orderInfo.state===2}}">
<view class="info-line row con-b align-c"> <view class="info-line row con-b align-c">
<view class="info-line-point-left"></view> <view class="info-line-point-left"></view>
<view class="info-line-line"></view> <view class="info-line-line"></view>
<view class="info-line-point-right"></view> <view class="info-line-point-right"></view>
<image class="seal-long" src="{{sealBig}}"></image> <image class="seal-long" src="{{imgBasehost+orderInfo.shopInfo.printUse}}"></image>
</view> </view>
<view class="info-code col con-c align-c"> <view class="info-code col con-c align-c">
<text>{{'件餐品可用'}}</text> <text>{{'件商品可用'}}</text>
<button bindtap="onFastScan" class="row con-c align-c">一键扫码</button> <button bindtap="onFastScan" class="row con-c align-c">一键扫码</button>
<text>{{'2019.09.30 - 2020.12.30'}}</text> <text>{{'2019.09.30 - 2020.12.30'}}</text>
</view> </view>
</block> </block>
</block> </block>
<!-- 餐品 文创 门票-->
<block wx:if="{{orderInfo.commodityType === 5||orderInfo.commodityType === 4||orderInfo.commodityType === 3}}">
<!-- 餐品 -->
<block wx:if="{{orderInfo.commodityType === 5||orderInfo.commodityType === 4}}">
<view class="info-content col con-c {{ orderInfo.state!==2?'p-relative':'' }}"> <view class="info-content col con-c {{ orderInfo.state!==2?'p-relative':'' }}">
<view class="info-content-item row"> <view class="info-content-item row">
<text class="info-content-item-label">使用门店</text> <text class="info-content-item-label">使用门店</text>
...@@ -125,17 +117,19 @@ ...@@ -125,17 +117,19 @@
<text class="info-content-item-label"></text> <text class="info-content-item-label"></text>
<text class="info-content-item-tip">{{orderInfo.contactPhone}}</text> <text class="info-content-item-tip">{{orderInfo.contactPhone}}</text>
</view> </view>
<image wx:if="{{orderInfo.state!==2}}" class="seal-shot" src="{{sealTest}}"></image> <image wx:if="{{orderInfo.state!==2}}" class="seal-shot" src="{{imgBasehost+orderInfo.shopInfo.print}}"></image>
</view> </view>
<block wx:if="{{orderInfo.state===2}}"> <block wx:if="{{orderInfo.state===2}}">
<view class="info-line row con-b align-c"> <view class="info-line row con-b align-c">
<view class="info-line-point-left"></view> <view class="info-line-point-left"></view>
<view class="info-line-line"></view> <view class="info-line-line"></view>
<view class="info-line-point-right"></view> <view class="info-line-point-right"></view>
<image class="seal-long" src="{{sealBig}}"></image> <image class="seal-long" src="{{imgBasehost+orderInfo.shopInfo.printUse}}"></image>
</view> </view>
<view class="info-code col con-c align-c"> <view class="info-code col con-c align-c">
<text>{{'件餐品可用'}}</text> <text wx:if="{{orderInfo.commodityType === 5}}">{{'1件餐品可用'}}</text>
<text wx:if="{{orderInfo.commodityType === 4}}">{{'1件商品可用'}}</text>
<text wx:if="{{orderInfo.commodityType === 3}}">{{orderInfo.commodity.length}}张门票可用</text>
<button bindtap="onFastScan" class="row con-c align-c">一键扫码</button> <button bindtap="onFastScan" class="row con-c align-c">一键扫码</button>
<text>{{'2019.09.30 - 2020.12.30'}}</text> <text>{{'2019.09.30 - 2020.12.30'}}</text>
</view> </view>
...@@ -166,12 +160,14 @@ ...@@ -166,12 +160,14 @@
<text class="info-content-item-label"></text> <text class="info-content-item-label"></text>
<text class="info-content-item-tip">18030303030</text> <text class="info-content-item-tip">18030303030</text>
</view> </view>
<image wx:if="{{orderInfo.state!==2}}" class="seal-shot" src="{{imgBasehost+orderInfo.shopInfo.print}}"></image>
</view>
<block wx:if="{{orderInfo.state===2}}"> <block wx:if="{{orderInfo.state===2}}">
<view class="info-line row con-b align-c"> <view class="info-line row con-b align-c">
<view class="info-line-point-left"></view> <view class="info-line-point-left"></view>
<view class="info-line-line"></view> <view class="info-line-line"></view>
<view class="info-line-point-right"></view> <view class="info-line-point-right"></view>
<image class="seal-long" src="{{sealBig}}"></image> <image class="seal-long" src="{{imgBasehost+orderInfo.shopInfo.printUse}}"></image>
</view> </view>
<view class="info-code col con-c align-c"> <view class="info-code col con-c align-c">
<text>{{'张门票可用'}}</text> <text>{{'张门票可用'}}</text>
...@@ -179,7 +175,7 @@ ...@@ -179,7 +175,7 @@
<text>{{'2019.09.30 - 2020.12.30'}}</text> <text>{{'2019.09.30 - 2020.12.30'}}</text>
</view> </view>
</block> </block>
</view>
</block> </block>
<!-- 观影 --> <!-- 观影 -->
...@@ -202,13 +198,14 @@ ...@@ -202,13 +198,14 @@
<text class="info-content-item-label"></text> <text class="info-content-item-label"></text>
<text class="info-content-item-tip">18030303030</text> <text class="info-content-item-tip">18030303030</text>
</view> </view>
<image wx:if="{{orderInfo.state!==2}}" class="seal-shot" src="{{imgBasehost+orderInfo.shopInfo.print}}"></image>
</view> </view>
<block wx:if="{{orderInfo.state===2}}"> <block wx:if="{{orderInfo.state===2}}">
<view class="info-line row con-b align-c"> <view class="info-line row con-b align-c">
<view class="info-line-point-left"></view> <view class="info-line-point-left"></view>
<view class="info-line-line"></view> <view class="info-line-line"></view>
<view class="info-line-point-right"></view> <view class="info-line-point-right"></view>
<image class="seal-long" src="{{sealBig}}"></image> <image class="seal-long" src="{{imgBasehost+orderInfo.shopInfo.printUse}}"></image>
</view> </view>
<view class="info-code col con-c align-c"> <view class="info-code col con-c align-c">
<text>{{'张电影票可用'}}</text> <text>{{'张电影票可用'}}</text>
...@@ -251,7 +248,8 @@ ...@@ -251,7 +248,8 @@
</view> </view>
<view class="commodity-item-operation" wx:if="{{item.codeId}}"> <view class="commodity-item-operation" wx:if="{{item.codeId}}">
<!-- 状态(0已过期1带使用2已使用) --> <!-- 状态(0已过期1带使用2已使用) -->
<button wx:if="{{item.state==1}}" class="row con-c align-c" data-item="{{item}}" bindtap="onCouponCode">查看券码</button> <button wx:if="{{item.state==1}}" class="row con-c align-c" data-item="{{item}}"
bindtap="onCouponCode">查看券码</button>
<button wx:if="{{item.state==0}}" disabled class="row con-c align-c btn-disabled">已过期</button> <button wx:if="{{item.state==0}}" disabled class="row con-c align-c btn-disabled">已过期</button>
<button wx:if="{{item.state==2}}" disabled class="row con-c align-c btn-disabled">已使用</button> <button wx:if="{{item.state==2}}" disabled class="row con-c align-c btn-disabled">已使用</button>
</view> </view>
...@@ -274,8 +272,10 @@ ...@@ -274,8 +272,10 @@
<view class="tip-describe col"> <view class="tip-describe col">
<text>{{'订单编号：' +( orderInfo.tipOrderNo?orderInfo.tipOrderNo:"")}}</text> <text>{{'订单编号：' +( orderInfo.tipOrderNo?orderInfo.tipOrderNo:"")}}</text>
<text>{{'下单时间：' + (orderInfo.tipTimeSubmit?orderInfo.tipTimeSubmit:'')}}</text> <text>{{'下单时间：' + (orderInfo.tipTimeSubmit?orderInfo.tipTimeSubmit:'')}}</text>
<text wx:if="{{orderInfo.state !== 0 && orderInfo.state !== -1}}">{{'付款时间：' + (orderInfo.tipTimePay?orderInfo.tipTimePay:'')}}</text> <text
<text wx:if="{{orderInfo.state !== 0 && orderInfo.state !== -1}}">{{'获得积分：' + (orderInfo.tipIntegral?orderInfo.tipIntegral:'')}}</text> wx:if="{{orderInfo.state !== 0 && orderInfo.state !== -1}}">{{'付款时间：' + (orderInfo.tipTimePay?orderInfo.tipTimePay:'')}}</text>
<text
wx:if="{{orderInfo.state !== 0 && orderInfo.state !== -1}}">{{'获得积分：' + (orderInfo.tipIntegral?orderInfo.tipIntegral:'')}}</text>
</view> </view>
</view> </view>
</view> </view>
...@@ -283,7 +283,9 @@ ...@@ -283,7 +283,9 @@
<!-- 多张 扫码弹窗 --> <!-- 多张 扫码弹窗 -->
<l-popup show="{{showCodePopup}}" l-class="l-popup-bg"> <l-popup show="{{showCodePopup}}" l-class="l-popup-bg">
<view class="scan-code-wrapper col align-c"> <view class="scan-code-wrapper col align-c">
<view class="code-header">{{codeList.length}}件商品可用</view> <view class="code-header" wx:if="{{orderInfo.commodityType === 5}}">{{codeList.length}}件餐品可用</view>
<view class="code-header" wx:if="{{orderInfo.commodityType === 4}}">{{codeList.length}}件商品可用</view>
<view class="code-header" wx:if="{{orderInfo.commodityType === 3}}">{{codeList.length}}张门票可用</view>
<view class="code-tips">请将券码出示给门店核销人员</view> <view class="code-tips">请将券码出示给门店核销人员</view>
<swiper class="code-main" next-margin="64rpx" bindchange="swiperChange"> <swiper class="code-main" next-margin="64rpx" bindchange="swiperChange">
<swiper-item wx:for="{{codeList}}" wx:key="id"> <swiper-item wx:for="{{codeList}}" wx:key="id">
...@@ -295,7 +297,8 @@ ...@@ -295,7 +297,8 @@
<view class="code-num-wrapper row align-c con-a"> <view class="code-num-wrapper row align-c con-a">
<view class="code-num-title {{codeUsed ? 'code-used' : ''}}">券码{{index+1}}:</view> <view class="code-num-title {{codeUsed ? 'code-used' : ''}}">券码{{index+1}}:</view>
<view class="code-num {{codeUsed ? 'code-used' : ''}}">{{item.serialNumber}}</view> <view class="code-num {{codeUsed ? 'code-used' : ''}}">{{item.serialNumber}}</view>
<view class="num-copy" wx:if="{{!codeUsed}}" bindtap="setClipboard" data-code="{{item.serialNumber}}" data-index="{{index}}">复制</view> <view class="num-copy" wx:if="{{!codeUsed}}" bindtap="setClipboard" data-code="{{item.serialNumber}}"
data-index="{{index}}">复制</view>
</view> </view>
<view class="code-used-seal" wx:if="{{codeUsed}}"> <view class="code-used-seal" wx:if="{{codeUsed}}">
<image mode="widthFix" src="./image/used.png"></image> <image mode="widthFix" src="./image/used.png"></image>
...@@ -314,7 +317,7 @@ ...@@ -314,7 +317,7 @@
</view> </view>
</l-popup> </l-popup>
<!-- 二维码弹窗 --> <!--单个 二维码弹窗 -->
<view class="code-mask row con-c align-c" wx:if="{{winCode}}"> <view class="code-mask row con-c align-c" wx:if="{{winCode}}">
<view class="code col con-c align-c"> <view class="code col con-c align-c">
<view class="code-tip row con-c align-c"> <view class="code-tip row con-c align-c">
...@@ -338,6 +341,16 @@ ...@@ -338,6 +341,16 @@
</view> </view>
</view> </view>
</view> </view>
<!-- 底部按钮 -->
<view class="footer-btn row con-e" wx:if="{{orderInfo.state !== 2}}">
<!-- 状态(-1已取消，0未付款，1未发货，2待使用，3已使用，4已过期，5已发货，6已关闭/已评价) -->
<view class="delete-btn" bindtap="onDelOrCancelOrder" data-type='0' wx:if="{{orderInfo.state===0}}">取消订单</view>
<view class="order-btn" bindtap="onOrderPay" wx:if="{{orderInfo.state===0}}">去支付</view>
<view class="order-btn" bindtap="onOrderEvaluate" wx:if="{{orderInfo.state===3}}">去评价</view>
<view class="delete-btn" bindtap="onDelOrCancelOrder" data-type='1'
wx:if="{{orderInfo.state===4||orderInfo.state===-1||orderInfo.state===6}}">删除订单</view>
<view class="order-btn" bindtap="onOrderAgain" wx:if="{{orderInfo.state===-1}}">再次下单</view>
</view>
<!-- 使用须知 --> <!-- 使用须知 -->
<l-popup show="{{showNotice}}" content-align="bottom"> <l-popup show="{{showNotice}}" content-align="bottom">
...@@ -348,3 +361,7 @@ ...@@ -348,3 +361,7 @@
</scroll-view> </scroll-view>
</view> </view>
</l-popup> </l-popup>
<!-- 成功提示 -->
<l-toast l-image-class="toast-image" l-class="toast-bg" show="{{winToast}}" image="/image/success.png"
title="{{winToastText}}" duration="2000"></l-toast>
\ No newline at end of file
pages/pay/order-detail/order-detail.wxss
...@@ -791,7 +791,7 @@ ...@@ -791,7 +791,7 @@
} }
.footer-btn { .footer-btn {
padding: 32rpx 20rpx 0; padding: 32rpx 20rpx;
border-top: 1px solid #E2E7EF; border-top: 1px solid #E2E7EF;
} }
......
project.config.json
...@@ -21,19 +21,19 @@ ...@@ -21,19 +21,19 @@
"checkSiteMap": false, "checkSiteMap": false,
"uploadWithSourceMap": true, "uploadWithSourceMap": true,
"compileHotReLoad": false, "compileHotReLoad": false,
"useMultiFrameRuntime": true,
"useApiHook": true,
"babelSetting": { "babelSetting": {
"ignore": [], "ignore": [],
"disablePlugins": [], "disablePlugins": [],
"outputPath": "" "outputPath": ""
}, },
"useIsolateContext": true, "useIsolateContext": true,
"useCompilerModule": false, "useCompilerModule": true,
"userConfirmedUseCompilerModuleSwitch": false, "userConfirmedUseCompilerModuleSwitch": false,
"useMultiFrameRuntime": true,
"useApiHook": true,
"enableEngineNative": false,
"packNpmManually": false, "packNpmManually": false,
"packNpmRelationList": [] "packNpmRelationList": [],
"enableEngineNative": false
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "2.10.0", "libVersion": "2.10.0",
...@@ -201,6 +201,20 @@ ...@@ -201,6 +201,20 @@
"pathName": "pages/campsite/home/home", "pathName": "pages/campsite/home/home",
"query": "", "query": "",
"scene": null "scene": null
},
{
"id": 19,
"name": "pages/pay/order-detail/order-detail",
"pathName": "pages/pay/order-detail/order-detail",
"query": "id= 38f4a20175f444c899774ce379f94b83",
"scene": null
},
{
"id": -1,
"name": "pages/mine/order/order",
"pathName": "pages/mine/order/order",
"query": "",
"scene": null
} }
] ]
} }
......
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