bonus
/
jyy-smart-canteen-h5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

测试问题修改，部分退单时订单详情

This commit is contained in:
zzyuan 2025-06-12 14:41:57 +08:00
parent ee17a52912
commit 92192e6a95
11 changed files with 90 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.js
View File

@ -4,9 +4,9 @@ module.exports = {
// baseUrl: 'http://192.168.0.39:21995', // baseUrl: 'http://192.168.0.39:21995',
// #ifdef H5 // #ifdef H5
// baseUrl: '/canteen/dev-api', // baseUrl: '/canteen/dev-api',
baseUrl: '/dev-api', // baseUrl: '/dev-api',
// baseUrl: 'http://192.168.0.244:38380',//测试 // baseUrl: 'http://192.168.0.244:38380',//测试
// baseUrl: 'http://192.168.0.244:48380',//测试 baseUrl: 'http://192.168.0.244:48380',//测试
// baseUrl: 'http://192.168.0.244:58580',//测试 // baseUrl: 'http://192.168.0.244:58580',//测试
// baseUrl: 'http://192.168.2.82:58080',//张天强 // baseUrl: 'http://192.168.2.82:58080',//张天强
// baseUrl: 'http://192.168.2.69:58080',//董高文 // baseUrl: 'http://192.168.2.69:58080',//董高文

2
pages/advanceOrder/dishDetail.vue
View File

@ -2,7 +2,7 @@
<page-meta :page-font-size="fontValue+'px'" :root-font-size="fontValue+'px'"></page-meta> <page-meta :page-font-size="fontValue+'px'" :root-font-size="fontValue+'px'"></page-meta>
<view> <view>
<view class="image-box"> <view class="image-box">
<image style="width: 100%;height: 100%;" :src="dashesData.dishesImgUrl"></image> <image style="width: 100%;height: 100%;" :src="dashesData.imageUrl"></image>
</view> </view>
<view class="menuContent"> <view class="menuContent">
<view class="menuInfo"> <view class="menuInfo">

14
pages/advanceOrder/orderDetails.vue
View File

@ -3,7 +3,7 @@
<view class="page"> <view class="page">
<h3>配送方式</h3> <h3>配送方式</h3>
<div class="appraise" @click="showPicker = true"> <div class="appraise" @click="showPicker = true">
<div>{{ detailData.orderState }}</div> <div>{{ detailData.deliveryTypeStr }}</div>
<div class="flex appraise-right"> <div class="flex appraise-right">
<u-icon name="arrow-right" size="12" /> <u-icon name="arrow-right" size="12" />
</div> </div>
@ -108,7 +108,8 @@ export default {
// 详情页数据 // 详情页数据
detailData: { detailData: {
// 订单状态 // 订单状态
orderState: '自取外带', deliveryType: 1,
deliveryTypeStr: '自取外带',
// 订单来源 // 订单来源
orderSource: '预订餐', orderSource: '预订餐',
// 餐厅名称 // 餐厅名称
@ -133,8 +134,8 @@ export default {
value: '1' value: '1'
}, },
{ {
label: '堂食', label: '自取堂食',
value: '2' value: '5'
} }
] ]
] ]
@ -167,7 +168,8 @@ export default {
confirm(e) { confirm(e) {
console.log('?? ~ confirm ~ value:', e) console.log('?? ~ confirm ~ value:', e)
this.showPicker = false this.showPicker = false
this.detailData.orderState = e.value[0].label this.detailData.deliveryType = e.value[0].value
this.detailData.deliveryTypeStr = e.value[0].label
}, },
getNowFormatDate() { getNowFormatDate() {
let date = new Date() let date = new Date()
@ -216,6 +218,8 @@ export default {
"payType": 1, "payType": 1,
"sourceType": 7, "sourceType": 7,
"isOnline": 1, "isOnline": 1,
"deliveryType": this.detailData.deliveryType,
"remark": this.detailData.remark,
"orderList":orderList "orderList":orderList
} }
console.log(param) console.log(param)

162
pages/feedback/index.vue
View File

@ -1,21 +1,6 @@
<template> <template>
<page-meta :page-font-size="fontValue+'px'" :root-font-size="fontValue+'px'"></page-meta> <page-meta :page-font-size="fontValue+'px'" :root-font-size="fontValue+'px'"></page-meta>
<view class="feedback-page"> <view class="feedback-page">
<!-- 问题类型选择 -->
<!-- <view class="type-section">
<text class="section-title">您想反馈的问题类型</text>
<view class="tab-box">
<view
v-for="(item, index) in tabList"
:key="index"
class="tab-item"
:class="{ active: currentTab === index }"
@click="currentTab = index"
>
{{ item }}
</view>
</view>
</view> -->
<!-- 反馈内容 --> <!-- 反馈内容 -->
<view class="content-box"> <view class="content-box">
@ -115,8 +100,7 @@ import { getToken } from '@/utils/auth'
export default { export default {
data() { data() {
return { return {
fontValue:uni.getStorageSync('fontSize') || 8, fontValue:uni.getStorageSync('fontSize') || 8,
tabList: ['优化建议', '功能问题', '其他'],
carteenName:"", carteenName:"",
showCarteen:false, showCarteen:false,
actions:[{name:"1"}], actions:[{name:"1"}],
@ -274,102 +258,68 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.feedback-page { .feedback-page {
height:94vh; height:94vh;
// background-color: #f8f8f8; overflow-y: auto;
// background-color: #f8f8f8;
.type-section { .content-box {
background-color: #ffffff; margin-top: 20rpx;
padding: 30rpx 30rpx 20rpx; padding: 20rpx;
.section-title { .border-box{
font-size: 28rpx; background-color: #ffffff;
color: #333333; padding: 16rpx;
margin-bottom: 20rpx; border-radius: 8px;
font-weight: 550; height:auto;
display: block; }
}
}
.tab-box { .word-count {
display: flex; position: absolute;
.tab-item { right: 20rpx;
flex: 1; bottom: 20rpx;
text-align: center; font-size: 24rpx;
font-size: 28rpx; color: #999999;
color: #666666; }
padding: 16rpx 0; }
position: relative;
border: 1px solid rgba(15,39,75,0.4);;
margin-right: 20rpx;
border-radius: 2px;
&.active { .upload-box {
color: #333333; margin-top: 30rpx;
background-color: #fff2ef;
border: 1px solid #FF6816;
} .upload-btn {
} width: 160rpx;
} height: 160rpx;
background-color: #f7f8fa;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
border-radius: 8rpx;
.upload-text {
font-size: 24rpx;
color: #666666;
margin-top: 10rpx;
}
}
}
.content-box { .contact-box {
margin-top: 20rpx; margin-top: 40rpx;
padding: 20rpx; background-color: #ffffff;
padding: 20rpx 16rpx 16rpx 16rpx;
border-radius: 8px;
.border-box{ .contact-title {
background-color: #ffffff; font-size: 28rpx;
padding: 16rpx; color: #333333;
border-radius: 8px; margin-bottom: 20rpx;
height:92vh; }
} }
.word-count { .submit-btn {
position: absolute; padding: 20rpx 30rpx;
right: 20rpx; margin-top: 20px;
bottom: 20rpx; }
font-size: 24rpx;
color: #999999;
}
}
.upload-box {
margin-top: 30rpx;
.upload-btn {
width: 160rpx;
height: 160rpx;
background-color: #f7f8fa;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
border-radius: 8rpx;
.upload-text {
font-size: 24rpx;
color: #666666;
margin-top: 10rpx;
}
}
}
.contact-box {
margin-top: 40rpx;
background-color: #ffffff;
padding: 20rpx 16rpx 16rpx 16rpx;
border-radius: 8px;
.contact-title {
font-size: 28rpx;
color: #333333;
margin-bottom: 20rpx;
}
}
.submit-btn {
padding: 20rpx 30rpx;
margin-top: 20px;
}
} }
::v-deep .u-textarea { ::v-deep .u-textarea {

2
pages/index.vue
View File

@ -246,7 +246,7 @@ export default {
res.forEach(item=>{ res.forEach(item=>{
this.bannerList.push(item.imgUrl) this.bannerList.push(item.imgUrl)
}) })
console.log(this.bannerList) // console.log(this.bannerList)
}, },
async getBaseSettingByKey() { async getBaseSettingByKey() {

10
pages/mine/me/healthInformation.vue
View File

@ -201,11 +201,11 @@ export default {
calculateBMI() { calculateBMI() {
// if (this.form.height && this.form.weight) { if (this.form.height && this.form.weight) {
// const heightInMeters = this.form.height / 100 const heightInMeters = this.form.height / 100
// const bmi = (this.form.weight / (heightInMeters * heightInMeters)).toFixed(1) const bmi = (this.form.weight / (heightInMeters * heightInMeters)).toFixed(1)
// this.form.bmi = bmi this.form.bmi = bmi
// } }
}, },
showSelector(selector) { showSelector(selector) {
this.currentSelector = selector; this.currentSelector = selector;

2
pages/weeklyMenu/menuDetail.vue
View File

@ -2,7 +2,7 @@
<page-meta :page-font-size="fontValue+'px'" :root-font-size="fontValue+'px'"></page-meta> <page-meta :page-font-size="fontValue+'px'" :root-font-size="fontValue+'px'"></page-meta>
<view> <view>
<view class="image-box"> <view class="image-box">
<image style="width: 100%;height: 100%;" :src="dashesData.dishesImgUrl"></image> <image style="width: 100%;height: 100%;" :src="dashesData.imageUrl"></image>
<!-- <image style="width: 100%;height: 100%;" src="../../static/images/code.png"></image> --> <!-- <image style="width: 100%;height: 100%;" src="../../static/images/code.png"></image> -->
</view> </view>
<view class="menuContent"> <view class="menuContent">

26
pages/work/details.vue
View File

@ -42,16 +42,16 @@
</view> </view>
</view> </view>
<view> <view>
<view style="color: red;" v-if="detailData.orderState==3&&detailData.payState==3">已退款</view> <view style="color: red;" v-if="item.refundAmount>0&&detailData.payState==3">已退款</view>
<view style="color: red;" v-if="detailData.orderState==3&&detailData.payState==4">已取消</view> <view style="color: red;" v-if="item.refundAmount>0&&detailData.payState==4">已取消</view>
<view style="color: red;" v-if="detailData.orderState==3">￥{{ (item.salePrice/100).toFixed(2) }}</view> <view style="color: red;" v-if="item.refundAmount>0">￥{{ (item.refundAmount/100).toFixed(2) }}</view>
<view v-else>￥{{ (item.salePrice/100).toFixed(2) }}</view> <view v-if="item.realAmount-item.refundAmount>0">￥{{ ((item.realAmount-item.refundAmount)/100).toFixed(2) }}</view>
</view> </view>
</view> </view>
</view> </view>
<view class="flex justify-between m-8 bt"> <view class="flex justify-between m-8 bt">
订单金额 订单金额
<view>￥{{ (detailData.realAmount/100).toFixed(2) }}</view> <view>￥{{ (detailData.payableAmount/100).toFixed(2) }}</view>
</view> </view>
<view class="flex justify-between m-8 bt"> <view class="flex justify-between m-8 bt">
配送费 配送费
@ -69,22 +69,22 @@
优惠金额 优惠金额
<view style="color: red;">-￥{{ ((detailData.realAmount-detailData.payableAmount)/100).toFixed(2) }}</view> <view style="color: red;">-￥{{ ((detailData.realAmount-detailData.payableAmount)/100).toFixed(2) }}</view>
</view> </view>
<view class="flex justify-between m-8 bt" v-if="detailData.orderState==3||detailData.orderState==4"> <view class="flex justify-between m-8 bt" v-if="detailData.refundAmount>0">
退款金额 退款金额
<view>￥{{ (detailData.refundAmount/100).toFixed(2) }}</view> <view style="color: red;">-￥{{ (detailData.refundAmount/100).toFixed(2) }}</view>
</view> </view>
<u-line v-if="detailData.orderState==1||detailData.orderState==2"/> <u-line v-if="detailData.orderState==1||detailData.orderState==2"/>
<view class="flex justify-between m-8 realAmount" v-if="detailData.orderState==1||detailData.orderState==2"> <view class="flex justify-between m-8 realAmount" v-if="detailData.orderState==1||detailData.orderState==2">
实付金额 实付金额
<view>￥{{ (detailData.realAmount/100).toFixed(2) }}</view> <view>￥{{ ((detailData.payableAmount-detailData.refundAmount)/100).toFixed(2) }}</view>
</view> </view>
</view> </view>
<view class="order"> <view class="order">
<view class="flex justify-between m-8 bt fs26" style="align-items: center;"> <view class="flex justify-between m-8 bt fs26" style="align-items: center;">
配送方式 配送方式
<view>{{ detailData.consigneeAddress ||'-'}}</view> <view>{{ detailData.deliveryTypeName ||'-'}}</view>
</view> </view>
<view class="flex justify-between m-8 fs26" style="align-items: center;"> <view class="flex justify-between m-8 fs26" style="align-items: center;">
备注 备注
@ -216,6 +216,7 @@ export default {
} }
this.$modal.confirm('确定退单吗？').then(() => { this.$modal.confirm('确定退单吗？').then(() => {
refundOrderApi(param).then((res) => { refundOrderApi(param).then((res) => {
console.log(res)
if(res.code==200){ if(res.code==200){
uni.showToast({ uni.showToast({
title: "操作成功", title: "操作成功",
@ -230,12 +231,7 @@ export default {
icon: 'none' icon: 'none'
}) })
} }
}).catch((res)=>{ }).catch((err)=>{})
uni.showToast({
title: res.msg,
icon: 'none'
})
})
}) })
}, },
//评价按钮 //评价按钮

2
pages/work/evaluateCenter.vue
View File

@ -159,7 +159,7 @@ export default {
pageNum: this.pageNum, pageNum: this.pageNum,
pageSize: this.pageSize, pageSize: this.pageSize,
commentState:"2", commentState:"2",
orderStateList:[1,2], orderStateList:[2],
searchValue: "", searchValue: "",
} }
if(this.startDate&&this.endDate){ if(this.startDate&&this.endDate){

2
pages/work/index.vue
View File

@ -378,7 +378,7 @@ export default {
if(index==1){ if(index==1){
this.commentState="2" this.commentState="2"
this.orderState="" this.orderState=""
this.orderStateList = [1,2] this.orderStateList = [2]
this.payState="" this.payState=""
this.orderRefundState="" this.orderRefundState=""
}else if(index==2){ }else if(index==2){

4
utils/request.js
View File

@ -116,9 +116,9 @@ const request = config => {
} }
// res = JSON.parse(decryptCBC(res.data)) // res = JSON.parse(decryptCBC(res.data))
// console.log('?? ~ request.js ~ line 100 ~ res', res) // console.log('?? ~ request.js ~ line 100 ~ res', res)
const code = res.data.code || 200 const code = res.code || 200
// console.log('?? ~ ~ code', code) // console.log('?? ~ ~ code', code)
const msg = errorCode[code] || res.data.msg || errorCode['default'] const msg = errorCode[code] || res.msg || errorCode['default']
// console.log('?? ~ ~ msg', msg) // console.log('?? ~ ~ msg', msg)
if (code === 401) { if (code === 401) {
showConfirm('登录状态已过期，您可以继续留在该页面，或者重新登录?').then(res => { showConfirm('登录状态已过期，您可以继续留在该页面，或者重新登录?').then(res => {