新功能开发2
This commit is contained in:
parent
13d065abcd
commit
8ff6c9ad70
|
|
@ -357,6 +357,7 @@ export default {
|
|||
if(res.rows&&res.rows.length>0){
|
||||
this.menuList = res.rows;
|
||||
this.menuList.forEach(item => {
|
||||
if(item.mealtimeType==this.menuData.mealtimeType){
|
||||
item.typeList.forEach(detail => {
|
||||
detail.dishesList.forEach(food => {
|
||||
this.$set(food, 'mealtimeType', item.mealtimeType)
|
||||
|
|
@ -397,6 +398,7 @@ export default {
|
|||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
})
|
||||
//获取购物车
|
||||
this.getShoppingCartList()
|
||||
|
|
|
|||
|
|
@ -123,6 +123,7 @@ export default {
|
|||
stallId:"",
|
||||
stallName:"",
|
||||
totalPrice:0,
|
||||
totalPrice2:0,
|
||||
orderDate:"",
|
||||
shoppingCartList:[],
|
||||
// 详情页数据
|
||||
|
|
@ -164,7 +165,13 @@ export default {
|
|||
this.canteenName = options.canteenName
|
||||
this.stallId = options.stallId
|
||||
this.stallName = options.stallName
|
||||
if(this.stallId=='525115050604630016'){
|
||||
this.totalPrice = 8.00;
|
||||
// this.totalPrice2 = Number(options.totalPrice).toFixed(2)
|
||||
}else{
|
||||
this.totalPrice = Number(options.totalPrice).toFixed(2)
|
||||
// this.totalPrice2 = Number(options.totalPrice).toFixed(2)
|
||||
}
|
||||
this.orderDate = options.orderDate;
|
||||
this.shoppingCartList=JSON.parse(options.carList)
|
||||
console.log(this.shoppingCartList)
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
<view class="main_menu_name">{{ item.name }}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="codeBtn" v-if="!isShowBtn" @click="isShowBtn=true">
|
||||
<view class="codeBtn" v-if="!isShowBtn" @click="openCode">
|
||||
<view style="font-size: 36rpx;font-weight: 600;">出示二维码支付</view>
|
||||
</view>
|
||||
<view class="card-box" v-if="isShowBtn">
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
<view class="title">
|
||||
<view style="font-size: 44rpx;color: #333;font-weight: 600;">出示二维码支付</view>
|
||||
<!-- <view @click="isShowBtn=false" style="position: absolute;right: 30rpx;">X</view> -->
|
||||
<view @click="isShowBtn=false" style="position: absolute;right: 40rpx;top: 10rpx;">
|
||||
<view @click="isShowBtn=false" style="position: absolute;right: 40rpx;top: 6rpx;">
|
||||
<image src="../static/images/arrow2.png" style="width: 60rpx;height: 60rpx;"></image>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -148,6 +148,10 @@ export default {
|
|||
} else if (index === 2) {
|
||||
this.$router.push({ path: '/pages/index' })
|
||||
}
|
||||
},
|
||||
openCode(){
|
||||
this.refreshQrCode()
|
||||
this.isShowBtn=true
|
||||
},
|
||||
// 获取二维码
|
||||
async getOrderQRCodeData() {
|
||||
|
|
@ -155,7 +159,6 @@ export default {
|
|||
uni.setStorageSync("codeTime",res);
|
||||
this.qrCodeUrl = `xnzn{\"s\":1,\"y\":3,\"p\":\"${uni.getStorageSync('custId')}\",\"t\":\"${uni.getStorageSync('codeTime')}\"}`
|
||||
// console.log(res, '二维码信息--')
|
||||
|
||||
},
|
||||
refreshQrCode() {
|
||||
// 模拟刷新二维码
|
||||
|
|
|
|||
|
|
@ -192,7 +192,7 @@ export default {
|
|||
// 优惠金额
|
||||
discountAmount: '0.7',
|
||||
// 实付金额
|
||||
realAmount: '9.3',
|
||||
realAmount: '0',
|
||||
// 订单二维码
|
||||
qrCode: '',
|
||||
// 流水号
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>智慧后勤</title><script src=https://res.wx.qq.com/open/js/jweixin-1.1.0.js></script><script>document.addEventListener('DOMContentLoaded', function() {
|
||||
document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
|
||||
})</script><link rel=stylesheet href=./static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.0f4c3ff6.js></script><script src=./static/js/index.fe1d844a.js></script></body></html>
|
||||
})</script><link rel=stylesheet href=./static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.0f4c3ff6.js></script><script src=./static/js/index.54b63ecd.js></script></body></html>
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue