From 92192e6a953a99522e1c04162956a025791fee28 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Thu, 12 Jun 2025 14:41:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C=E9=83=A8=E5=88=86=E9=80=80=E5=8D=95=E6=97=B6?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.js                           |   4 +-
 pages/advanceOrder/dishDetail.vue   |   2 +-
 pages/advanceOrder/orderDetails.vue |  14 ++-
 pages/feedback/index.vue            | 162 ++++++++++------------------
 pages/index.vue                     |   2 +-
 pages/mine/me/healthInformation.vue |  10 +-
 pages/weeklyMenu/menuDetail.vue     |   2 +-
 pages/work/details.vue              |  26 ++---
 pages/work/evaluateCenter.vue       |   2 +-
 pages/work/index.vue                |   2 +-
 utils/request.js                    |   4 +-
 11 files changed, 90 insertions(+), 140 deletions(-)

diff --git a/config.js b/config.js
index 7d3c335..7730e30 100644
--- a/config.js
+++ b/config.js
@@ -4,9 +4,9 @@ module.exports = {
   // baseUrl: 'http://192.168.0.39:21995',
   // #ifdef  H5
   // baseUrl: '/canteen/dev-api',
-  baseUrl: '/dev-api',
+  // baseUrl: '/dev-api',
   // 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.2.82:58080',//张天强
   // baseUrl: 'http://192.168.2.69:58080',//董高文
diff --git a/pages/advanceOrder/dishDetail.vue b/pages/advanceOrder/dishDetail.vue
index 95f1952..76d5430 100644
--- a/pages/advanceOrder/dishDetail.vue
+++ b/pages/advanceOrder/dishDetail.vue
@@ -2,7 +2,7 @@
 	<page-meta :page-font-size="fontValue+'px'" :root-font-size="fontValue+'px'"></page-meta>
 	<view>
 		<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 class="menuContent">
 			<view class="menuInfo">
diff --git a/pages/advanceOrder/orderDetails.vue b/pages/advanceOrder/orderDetails.vue
index 52804dd..874c662 100644
--- a/pages/advanceOrder/orderDetails.vue
+++ b/pages/advanceOrder/orderDetails.vue
@@ -3,7 +3,7 @@
   <view class="page">
     <h3>配送方式</h3>
     <div class="appraise" @click="showPicker = true">
-      <div>{{ detailData.orderState }}</div>
+      <div>{{ detailData.deliveryTypeStr }}</div>
       <div class="flex appraise-right">
         <u-icon name="arrow-right" size="12" />
       </div>
@@ -108,7 +108,8 @@ export default {
       // 详情页数据
       detailData: {
         // 订单状态
-        orderState: '自取外带',
+        deliveryType: 1,
+        deliveryTypeStr: '自取外带',
         // 订单来源
         orderSource: '预订餐',
         // 餐厅名称
@@ -133,8 +134,8 @@ export default {
             value: '1'
           },
           {
-            label: '堂食',
-            value: '2'
+            label: '自取堂食',
+            value: '5'
           }
         ]
       ]
@@ -167,7 +168,8 @@ export default {
     confirm(e) {
       console.log('?? ~ confirm ~ value:', e)
       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() {
 	  let date = new Date()
@@ -216,6 +218,8 @@ export default {
 				"payType": 1,
 				"sourceType": 7,
 				"isOnline": 1,
+				"deliveryType": this.detailData.deliveryType,
+				"remark": this.detailData.remark,
 				"orderList":orderList
 			}
 			console.log(param)
diff --git a/pages/feedback/index.vue b/pages/feedback/index.vue
index 7fadba5..9ebc216 100644
--- a/pages/feedback/index.vue
+++ b/pages/feedback/index.vue
@@ -1,21 +1,6 @@
 <template>
 	<page-meta :page-font-size="fontValue+'px'" :root-font-size="fontValue+'px'"></page-meta>
-  <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="feedback-page"> 
 
     <!-- 反馈内容 -->
     <view class="content-box">
@@ -115,8 +100,7 @@ import { getToken } from '@/utils/auth'
 export default {
   data() {
     return {
-	  fontValue:uni.getStorageSync('fontSize') || 8,
-      tabList: ['优化建议', '功能问题', '其他'],
+	  fontValue:uni.getStorageSync('fontSize') || 8, 
 	  carteenName:"",
 	  showCarteen:false,
 	  actions:[{name:"1"}],
@@ -274,102 +258,68 @@ export default {
 
 <style lang="scss" scoped>
 .feedback-page {
-  height:94vh;
-  // background-color: #f8f8f8; 
+	height:94vh;
+	overflow-y: auto;
+	// background-color: #f8f8f8;
 
-  .type-section {
-    background-color: #ffffff;
-    padding: 30rpx 30rpx 20rpx;
+	.content-box {
+		margin-top: 20rpx; 
+		padding: 20rpx;
 
-    .section-title {
-      font-size: 28rpx;
-      color: #333333;
-      margin-bottom: 20rpx;
-      font-weight: 550;
-      display: block;
-    }
-  }
+		.border-box{
+			background-color: #ffffff;
+			padding: 16rpx;
+			border-radius: 8px;
+			height:auto;
+		}
 
-  .tab-box {
-    display: flex; 
-    .tab-item {
-      flex: 1;
-      text-align: center;
-      font-size: 28rpx;
-      color: #666666;
-      padding: 16rpx 0;
-      position: relative;
-      border: 1px solid rgba(15,39,75,0.4);;
-      margin-right: 20rpx;
-      border-radius: 2px;
+		.word-count {
+			position: absolute;
+			right: 20rpx;
+			bottom: 20rpx;
+			font-size: 24rpx;
+			color: #999999;
+		}
+	}
 
-      &.active {
-        color: #333333;
-        background-color: #fff2ef;
-        border: 1px solid #FF6816;
+	.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;
+			}
+		}
+	}
 
-  .content-box {
-    margin-top: 20rpx; 
-    padding: 20rpx;
+	.contact-box {
+		margin-top: 40rpx;
+		background-color: #ffffff;
+		padding: 20rpx 16rpx 16rpx 16rpx;
+		border-radius: 8px;
 
-    .border-box{
-      background-color: #ffffff;
-      padding: 16rpx;
-      border-radius: 8px;
-	  height:92vh;
-    }
+		.contact-title {
+			font-size: 28rpx;
+			color: #333333;
+			margin-bottom: 20rpx;
+		}
+	}
 
-    .word-count {
-      position: absolute;
-      right: 20rpx;
-      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;
-  }
+	.submit-btn {
+		padding: 20rpx 30rpx;
+		margin-top: 20px;
+	}
 }
 
 ::v-deep .u-textarea {
diff --git a/pages/index.vue b/pages/index.vue
index 0021d30..4e59787 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -246,7 +246,7 @@ export default {
 		  res.forEach(item=>{
 			  this.bannerList.push(item.imgUrl)
 		  })
-		  console.log(this.bannerList)
+		  // console.log(this.bannerList)
 		},
 		
 		async getBaseSettingByKey() {
diff --git a/pages/mine/me/healthInformation.vue b/pages/mine/me/healthInformation.vue
index 1a37509..9d8e7a7 100644
--- a/pages/mine/me/healthInformation.vue
+++ b/pages/mine/me/healthInformation.vue
@@ -201,11 +201,11 @@ export default {
 	  
 	  
     calculateBMI() {
-      // if (this.form.height && this.form.weight) {
-      //   const heightInMeters = this.form.height / 100
-      //   const bmi = (this.form.weight / (heightInMeters * heightInMeters)).toFixed(1)
-      //   this.form.bmi = bmi
-      // }
+      if (this.form.height && this.form.weight) {
+        const heightInMeters = this.form.height / 100
+        const bmi = (this.form.weight / (heightInMeters * heightInMeters)).toFixed(1)
+        this.form.bmi = bmi
+      }
     },
     showSelector(selector) {
       this.currentSelector = selector;
diff --git a/pages/weeklyMenu/menuDetail.vue b/pages/weeklyMenu/menuDetail.vue
index 2b7e2a6..d8d17c8 100644
--- a/pages/weeklyMenu/menuDetail.vue
+++ b/pages/weeklyMenu/menuDetail.vue
@@ -2,7 +2,7 @@
 	<page-meta :page-font-size="fontValue+'px'" :root-font-size="fontValue+'px'"></page-meta>
 	<view>
 		<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> -->
 		</view>
 		<view class="menuContent">
diff --git a/pages/work/details.vue b/pages/work/details.vue
index 43f4d98..a5dc35d 100644
--- a/pages/work/details.vue
+++ b/pages/work/details.vue
@@ -42,16 +42,16 @@
             </view>
           </view>
           <view>
-			  <view style="color: red;" v-if="detailData.orderState==3&&detailData.payState==3">已退款</view>
-			  <view style="color: red;" v-if="detailData.orderState==3&&detailData.payState==4">已取消</view>
-			  <view style="color: red;" v-if="detailData.orderState==3">￥{{ (item.salePrice/100).toFixed(2) }}</view>
-			  <view  v-else>￥{{ (item.salePrice/100).toFixed(2) }}</view>
+			  <view style="color: red;" v-if="item.refundAmount>0&&detailData.payState==3">已退款</view>
+			  <view style="color: red;" v-if="item.refundAmount>0&&detailData.payState==4">已取消</view>
+			  <view style="color: red;" v-if="item.refundAmount>0">￥{{ (item.refundAmount/100).toFixed(2) }}</view>
+			  <view v-if="item.realAmount-item.refundAmount>0">￥{{ ((item.realAmount-item.refundAmount)/100).toFixed(2) }}</view>
 		  </view>
         </view>
       </view>
 	  <view class="flex justify-between m-8 bt">
 	    订单金额
-	    <view>￥{{ (detailData.realAmount/100).toFixed(2) }}</view>
+	    <view>￥{{ (detailData.payableAmount/100).toFixed(2) }}</view>
 	  </view>
       <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> 
-	  <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>
 	  
       <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>￥{{ (detailData.realAmount/100).toFixed(2) }}</view>
+        <view>￥{{ ((detailData.payableAmount-detailData.refundAmount)/100).toFixed(2) }}</view>
       </view>
     </view>
 	
 	<view class="order">
 		<view class="flex justify-between m-8 bt fs26" style="align-items: center;">
 		  配送方式
-		  <view>{{ detailData.consigneeAddress ||'-'}}</view>
+		  <view>{{ detailData.deliveryTypeName ||'-'}}</view>
 		</view>
 		<view class="flex justify-between m-8 fs26" style="align-items: center;">
 		  备注
@@ -216,6 +216,7 @@ export default {
 			}
 			this.$modal.confirm('确定退单吗？').then(() => {
 				refundOrderApi(param).then((res) => {
+					console.log(res)
 					if(res.code==200){
 						uni.showToast({
 						  title: "操作成功",
@@ -230,12 +231,7 @@ export default {
 						  icon: 'none'
 						}) 
 					}
-				}).catch((res)=>{
-						uni.showToast({
-						  title: res.msg,
-						  icon: 'none'
-						}) 
-				}) 
+				}).catch((err)=>{}) 
 			}) 
 		},
 		//评价按钮
diff --git a/pages/work/evaluateCenter.vue b/pages/work/evaluateCenter.vue
index 6fcfc27..f993d30 100644
--- a/pages/work/evaluateCenter.vue
+++ b/pages/work/evaluateCenter.vue
@@ -159,7 +159,7 @@ export default {
 				pageNum: this.pageNum,
 				pageSize: this.pageSize,  
 				commentState:"2", 
-				orderStateList:[1,2],   
+				orderStateList:[2],   
 				searchValue: "", 
 			}
 			if(this.startDate&&this.endDate){
diff --git a/pages/work/index.vue b/pages/work/index.vue
index 0f3d420..bcb0ee3 100644
--- a/pages/work/index.vue
+++ b/pages/work/index.vue
@@ -378,7 +378,7 @@ export default {
 			if(index==1){
 				this.commentState="2"
 				this.orderState=""
-				this.orderStateList = [1,2]
+				this.orderStateList = [2]
 				this.payState=""
 				this.orderRefundState=""
 			}else if(index==2){
diff --git a/utils/request.js b/utils/request.js
index abd4fa6..836448a 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -116,9 +116,9 @@ const request = config => {
         }
         // res = JSON.parse(decryptCBC(res.data))
         // console.log('?? ~ request.js ~ line 100 ~ res', res)
-        const code = res.data.code || 200
+        const code = res.code || 200
         // 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)
         if (code === 401) {
           showConfirm('登录状态已过期，您可以继续留在该页面，或者重新登录?').then(res => {