From 9ac8c3d1a460a5c64f718542973b815c49274e95 Mon Sep 17 00:00:00 2001
From: chenwei <timeless646@163.com>
Date: Mon, 9 Sep 2024 09:26:29 +0800
Subject: [PATCH] 订单相关状态修改

---
 frontend/app-user/main.js                              |  2 +-
 frontend/app-user/pages/home/placeOrder.vue            |  4 ++--
 frontend/app-user/pages/order/components/orderCard.vue | 17 ++++++++++-------
 frontend/app-user/pages/order/orderDetail.vue          |  2 +-
 frontend/app-user/utils/enums.js                       |  4 ++--
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/frontend/app-user/main.js b/frontend/app-user/main.js
index fb32627..b8f57ac 100644
--- a/frontend/app-user/main.js
+++ b/frontend/app-user/main.js
@@ -96,4 +96,4 @@ export function createApp() {
 		app
 	}
 }
-// #endif
\ No newline at end of file
+// #endif
diff --git a/frontend/app-user/pages/home/placeOrder.vue b/frontend/app-user/pages/home/placeOrder.vue
index 19a1475..7e97cff 100644
--- a/frontend/app-user/pages/home/placeOrder.vue
+++ b/frontend/app-user/pages/home/placeOrder.vue
@@ -256,8 +256,8 @@ export default {
         //#ifdef H5
         this.orderBody.zffs = dd_zffs.WX_PAY.code;
         this.orderBody.zflx = dd_zflx.JSAPI.code;
-        // this.orderBody.openId = uni.getStorageSync('openId');
-        this.orderBody.openId = "oH7LG54_Y49mVunw2FLXzUCxHWlM";
+        this.orderBody.openId = uni.getStorageSync('openId');
+        // this.orderBody.openId = "oH7LG54_Y49mVunw2FLXzUCxHWlM";
         console.log('H5环境---------》')
         console.log('H5环境rData---------》', this.orderBody)
         //#endif
diff --git a/frontend/app-user/pages/order/components/orderCard.vue b/frontend/app-user/pages/order/components/orderCard.vue
index 6720b29..059444a 100644
--- a/frontend/app-user/pages/order/components/orderCard.vue
+++ b/frontend/app-user/pages/order/components/orderCard.vue
@@ -9,7 +9,7 @@
 				</view>
 			</view>
 			<view class="themeColor">
-				{{pageForm.fDdzt}}
+        {{ddDdzt.get(pageForm.fDdzt)}}
 			</view>
 		</view>
 		<u-divider></u-divider>
@@ -19,7 +19,7 @@
 			</view>
 			<view class="w60 flex flex-direction  justify-between margin-left-sm">
 				<view class="overflow-one-lines">
-					{{item.fSpmc}}
+					{{ddPsfs.get(item.fSpmc)}}
 				</view>
 				<view class="text-sm text-gray overflow-one-lines">
 					规格：{{item.fMs}}
@@ -55,7 +55,7 @@
 			</view>
 		</view>
 		<view class="flex justify-end">
-      <view class="margin-left-sm" v-if="pageForm.fDdzt =='待配送' " @click.stop="goGasCancel">
+      <view class="margin-left-sm" v-if="pageForm.fDdzt =='202' " @click.stop="goGasCancel">
         <u-button shape="circle" color="">取消订单</u-button>
       </view>
 <!--			<view class="margin-left-sm" @click.stop="goGasDetailPage">-->
@@ -73,6 +73,7 @@
 
 <script>
 	import {cancelOrder} from "../../../api/order";
+  import {dd_zflx, dd_fkfs, dd_psfs, dd_zffs, dd_ddly, sys_sf, dd_ddzt} from "@/utils/enums";
 
   export default {
 		components: {},
@@ -86,10 +87,12 @@
 		},
 		data() {
 			return {
+        ddDdzt: new Map(Object.values(dd_ddzt).map(item => [item.code, item.info])),
+        ddPsfs: new Map(Object.values(dd_psfs).map(item => [item.code, item.info])),
 				pageForm: {
 					fCzmc: '',
-					fDdzt: '待付款',
-					fDddh: 'A2011100221001',
+					fDdzt: '201',
+					fDddh: '',
 					ddxqList: [],
 					fSpmc: '',
 					fGg: '',
@@ -124,7 +127,7 @@
           let cancelOrderResult = await this.$api.orderApi.cancelOrder(paramsData);
           if(cancelOrderResult.code ==200){
             this.$modal.msgSuccess('订单取消成功!');
-            this.pageForm.fDdzt ='已取消';
+            this.pageForm.fDdzt ='207';
             this.$emit('orderCancel');
           }else {
             this.$modal.msgError('会员信息修改失败!');
@@ -194,4 +197,4 @@
 			background-color: #fff6e6;
 		}
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/frontend/app-user/pages/order/orderDetail.vue b/frontend/app-user/pages/order/orderDetail.vue
index 173daff..2f502ed 100644
--- a/frontend/app-user/pages/order/orderDetail.vue
+++ b/frontend/app-user/pages/order/orderDetail.vue
@@ -29,7 +29,7 @@
 					</view>
 					<view class="w60 flex flex-direction  justify-between margin-left-xs">
 						<view class="overflow-one-lines">
-							{{item.fSpmc}}
+							{{ddPsfs.get(item.fSpmc)}}
 						</view>
 						<view class="text-sm text-gray overflow-one-lines">
 							规格：{{item.fMs}}
diff --git a/frontend/app-user/utils/enums.js b/frontend/app-user/utils/enums.js
index 29db899..7d73fe5 100644
--- a/frontend/app-user/utils/enums.js
+++ b/frontend/app-user/utils/enums.js
@@ -16,8 +16,8 @@ export const dd_ddly = {
  * 付款方式枚举
  */
 export const dd_fkfs = {
-    CASH_ON_DELIVERY: {code: '1', info: '货到付款'},
-    ONLINE_PAYMENT: {code: '2', info: '在线支付'}
+    HDFK: {code: '1', info: '货到付款'},
+    ZXZF: {code: '2', info: '在线支付'}
 };
 
 /**
--
libgit2 0.21.2