From 7fdc17fc707859ffbdf1fbe761fd69d8e605f3e2 Mon Sep 17 00:00:00 2001
From: chenwei <timeless646@163.com>
Date: Fri, 6 Sep 2024 17:42:47 +0800
Subject: [PATCH] 微信支付以及订单修改，统一订单状态

---
 frontend/app-user/api/member.js               |   2 +-
 frontend/app-user/common/config.js            |  11 ++++++-----
 frontend/app-user/pages/home/placeOrder.vue   |  40 +++++++++++++++++-----------------------
 frontend/app-user/pages/order/order.vue       | 772 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 frontend/app-user/pages/order/orderDetail.vue |  10 +++++++---
 frontend/app-user/utils/enums.js              |  65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 493 insertions(+), 407 deletions(-)
 create mode 100644 frontend/app-user/utils/enums.js

diff --git a/frontend/app-user/api/member.js b/frontend/app-user/api/member.js
index 04e8a90..46256bc 100644
--- a/frontend/app-user/api/member.js
+++ b/frontend/app-user/api/member.js
@@ -75,7 +75,7 @@ export function getwDdDetail(params) {
 //创建订单
 export function savewDd(data) {
 	return request({
-		url: '/user/order/payment/add',
+		url: '/user/order/add',
 		method: 'post',
 		data: data
 	})
diff --git a/frontend/app-user/common/config.js b/frontend/app-user/common/config.js
index 7d45ead..ec77a93 100644
--- a/frontend/app-user/common/config.js
+++ b/frontend/app-user/common/config.js
@@ -1,16 +1,17 @@
 module.exports = {
 	// baseUrl: 'http://192.168.0.48:60011/api', //lst本地
-	// baseUrl: 'http://123.60.140.65:60011/api',// 会员端ip
-	baseUrl: 'https://lpg.ip-server.cn/api', //会员端线上
+	baseUrl: 'http://m8wgk2.natappfree.cc/api', // 会员端ip
+	// baseUrl: 'https://lpg.ip-server.cn/api', //会员端线上
 	gaodeMapKey: "ec36eed040d5dad959e19711b83905d6", //高德逆地址解析key
 	// 超时
 	timeout: 30000,
 	// 禁用 Cookie 等信息
 	withCredentials: false,
 	isOpenTokenExpiration: false, //token过期弹窗
-	appid:'wxb619394476ca1888',
+	appid: 'wxb619394476ca1888',
 	header: {
 		//租户ID
 		'tenant-id': 1
-	}
-}
\ No newline at end of file
+	},
+
+}
diff --git a/frontend/app-user/pages/home/placeOrder.vue b/frontend/app-user/pages/home/placeOrder.vue
index 0a8f36e..19a1475 100644
--- a/frontend/app-user/pages/home/placeOrder.vue
+++ b/frontend/app-user/pages/home/placeOrder.vue
@@ -106,13 +106,10 @@
 </template>
 
 <script>
-import {
-  mergeRecursive
-} from "@/utils/ruoyi";
+import {mergeRecursive} from "@/utils/ruoyi";
 import storage from '@/utils/storage'
-import {
-  mapGetters
-} from 'vuex'
+import {mapGetters} from 'vuex'
+import {dd_zflx, dd_fkfs, dd_psfs, dd_zffs, dd_ddly, sys_sf} from "@/utils/enums";
 
 export default {
   components: {},
@@ -125,13 +122,13 @@ export default {
         // fPsdz: "",
         // fQyid: "",
         // fCzid: "",
-        ddly: "线上下单",
+        ddly: dd_ddly.XSXD.code,
         zffs: "",
-        psfs: "配送",
+        psfs: dd_psfs.PS.code,
         mjly: "",
         hydzId: "",
-        ddlx: "配送",
-        sfhy: "是",
+        ddlx: null,
+        sfhy: sys_sf.Y.code,
         xqList: [],
         zflx: "",
         openId: null
@@ -253,28 +250,25 @@ export default {
         return false
       }
       this.$modal.confirm('确认提交订单？', '提示').then(async () => {
-        // console.log("提交数据", this.orderBody);
-        // uni.navigateTo({
-        // 	url:"/pages/home/orderSuccessful"
-        // })
         console.log('支付---------》')
         let rData = {};
         // 判断环境
-        // #ifdef H5
-        this.orderBody.zffs = '微信';
-        this.orderBody.zflx = 'JSAPI';
-        this.orderBody.openId = uni.getStorageSync('openId');
+        //#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";
         console.log('H5环境---------》')
         console.log('H5环境rData---------》', this.orderBody)
-        // #endif
+        //#endif
 
-        // #ifdef APP-PLUS
-        this.orderBody.zffs = '微信';
-        this.orderBody.zflx = 'APP';
+        //#ifdef APP-PLUS
+        this.orderBody.zffs = dd_zffs.WX_PAY.code;
+        this.orderBody.zflx = dd_zflx.APP.code;
         console.log('app环境rData---------》', this.orderBody)
         uni.$u.toast('APP暂不支持在线下单，请前往微信公众号进行在线下单。');
         return false
-        // #endif
+        //#endif
         console.log('orderBody---------》', this.orderBody)
         const result = await this.$api.memberApi.savewDd(this.orderBody);
         let {
diff --git a/frontend/app-user/pages/order/order.vue b/frontend/app-user/pages/order/order.vue
index fb99bf9..ef0583d 100644
--- a/frontend/app-user/pages/order/order.vue
+++ b/frontend/app-user/pages/order/order.vue
@@ -1,399 +1,421 @@
 <template>
-	<view class="container">
-		<Navbar title="订单" />
-		<u-sticky bgColor="#fff">
-			<u-tabs :current="current" :list="statusList" :is-scroll="false" lineColor="#EA5707"
-				:activeStyle="activeStyle" :itemStyle="itemStyle" @change="tabChange"></u-tabs>
-		</u-sticky>
-		<view v-for="(item,index) in orderCardList" :key="item.id">
-			<view class="orderCard" @click="goOrderDetaPage(item)">
-				<view class="flex justify-between align-center">
-					<view class="flex align-center w80" @click.stop="goStorePage(item)">
-						<!--            <u-icon name="/static/images/home/shopTitle.png" size="20"></u-icon>-->
-						<view
-							:style="{ backgroundImage: 'url(/static/images/home/shopTitle.png)', backgroundSize:'100% 100%',width:'20px',height:'20px', backgroundRepeat: 'no-repeat'}">
-						</view>
-						<view class="margin-left-xs overflow-one-lines">
-							{{item.fCzmc}}
-						</view>
-					</view>
-					<view class="themeColor">
-						{{item.fDdzt}}
-					</view>
-				</view>
-				<u-divider></u-divider>
-				<!--        ${$assignKeys(index)}-->
-				<view v-for="(ddxpItem,index) of item.ddxqList" :key="`${$assignKeys(ddxpItem.id)}`"
-					class="flex justify-between margin-top">
-					<view class="" style="min-width: 80px;min-height: 80px">
-						<u-image width="80px" height="80px"
-							:src="ddxpItem.fTp?ddxpItem.fTp:'/static/images/gas-icon/gasicon.png'"></u-image>
-					</view>
-					<view class="w60 flex flex-direction  justify-between margin-left-sm">
-						<view class="overflow-one-lines">
-							{{ddxpItem.fSpmc}}
-						</view>
-						<view class="text-sm text-gray overflow-one-lines">
-							规格8：{{ddxpItem.fMs}}
-						</view>
-						<view class="text-lg text-bold overflow-one-lines">
-							￥{{ddxpItem.fDj}}
-						</view>
-					</view>
-					<view class="flex flex-wrap justify-end">
-						<view v-if="item.fPsfs" :class="[item.fPsfs=='自提'?'ztSty':'psSty','psfsSty']">
-							{{item.fPsfs}}
-						</view>
-						<view class="flex align-end">X{{ddxpItem.fSl}}</view>
-					</view>
-				</view>
-				<u-divider></u-divider>
-				<view class="flex margin-top-lg">
-					<view class="text-gray overflow-one-lines">
-						订单编号：{{item.fDddh}}
-					</view>
-				</view>
-				<view class="flex margin-top-sm">
-					<view class="text-gray">
-						备注信息：{{item.fMjly}}
-					</view>
-				</view>
-				<view class="flex margin-top-lg margin-bottom-lg justify-end  ">
-					<view class="text-gray">
-						<!-- 共{{pageForm.ddxqList.length}}件商品 -->
-						合计：
-					</view>
-					<view class="themeColor  overflow-one-lines">
-						￥{{item.fDdje}}
-					</view>
-				</view>
-				<view class="flex justify-end">
-					<view class="margin-left-sm" v-if="item.fDdzt =='待配送' " @click.stop="goGasCancel(item)">
-						<u-button shape="circle" color="">取消订单</u-button>
-					</view>
-				</view>
-			</view>
-			<!--			<orderCard  :orderitem="item"  @orderCancel="cancelOrderLoad"></orderCard>-->
-		</view>
-		<u-empty mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png"
-			v-if="!orderCardList.length &&!loading "></u-empty>
-		<u-loadmore :status="status" marginTop="20" height="10" marginBottom="10"
-			v-if="orderCardList.length>0 && !loading" />
-		<u-loading-icon text="加载中" style="display: flex;align-items: center; margin-top: 100px;"
-			:show="loading"></u-loading-icon>
+  <view class="container">
+    <Navbar title="订单"/>
+    <u-sticky bgColor="#fff">
+      <u-tabs :current="current" :list="statusList" :is-scroll="false" lineColor="#EA5707"
+              :activeStyle="activeStyle" :itemStyle="itemStyle" @change="tabChange"></u-tabs>
+    </u-sticky>
+    <view v-for="(item,index) in orderCardList" :key="item.id">
+      <view class="orderCard" @click="goOrderDetaPage(item)">
+        <view class="flex justify-between align-center">
+          <view class="flex align-center w80" @click.stop="goStorePage(item)">
+            <!--            <u-icon name="/static/images/home/shopTitle.png" size="20"></u-icon>-->
+            <view
+                :style="{ backgroundImage: 'url(/static/images/home/shopTitle.png)', backgroundSize:'100% 100%',width:'20px',height:'20px', backgroundRepeat: 'no-repeat'}">
+            </view>
+            <view class="margin-left-xs overflow-one-lines">
+              {{ item.fCzmc }}
+            </view>
+          </view>
+          <view class="themeColor">
+            {{ ddDdzt.get(item.fDdzt) }}
+          </view>
+        </view>
+        <u-divider></u-divider>
+        <!--        ${$assignKeys(index)}-->
+        <view v-for="(ddxpItem,index) of item.ddxqList" :key="`${$assignKeys(ddxpItem.id)}`"
+              class="flex justify-between margin-top">
+          <view class="" style="min-width: 80px;min-height: 80px">
+            <u-image width="80px" height="80px"
+                     :src="ddxpItem.fTp?ddxpItem.fTp:'/static/images/gas-icon/gasicon.png'"></u-image>
+          </view>
+          <view class="w60 flex flex-direction  justify-between margin-left-sm">
+            <view class="overflow-one-lines">
+              {{ ddxpItem.fSpmc }}
+            </view>
+            <view class="text-sm text-gray overflow-one-lines">
+              规格8：{{ ddxpItem.fMs }}
+            </view>
+            <view class="text-lg text-bold overflow-one-lines">
+              ￥{{ ddxpItem.fDj }}
+            </view>
+          </view>
+          <view class="flex flex-wrap justify-end">
+            <view v-if="item.fPsfs" :class="[item.fPsfs=='1'?'ztSty':'psSty','psfsSty']">
+              {{ ddPsfs.get(item.fPsfs) }}
+            </view>
+            <view class="flex align-end">X{{ ddxpItem.fSl }}</view>
+          </view>
+        </view>
+        <u-divider></u-divider>
+        <view class="flex margin-top-lg">
+          <view class="text-gray overflow-one-lines">
+            订单编号：{{ item.fDddh }}
+          </view>
+        </view>
+        <view class="flex margin-top-sm">
+          <view class="text-gray">
+            备注信息：{{ item.fMjly }}
+          </view>
+        </view>
+        <view class="flex margin-top-lg margin-bottom-lg justify-end  ">
+          <view class="text-gray">
+            <!-- 共{{pageForm.ddxqList.length}}件商品 -->
+            合计：
+          </view>
+          <view class="themeColor  overflow-one-lines">
+            ￥{{ item.fDdje }}
+          </view>
+        </view>
+        <view class="flex justify-end">
+          <view class="margin-left-sm" v-if="item.fDdzt =='201' || item.fDdzt =='202' || item.fDdzt =='203' "
+                @click.stop="goGasCancel(item)">
+            <u-button shape="circle" color="">取消订单</u-button>
+          </view>
+        </view>
+      </view>
+      <!--			<orderCard  :orderitem="item"  @orderCancel="cancelOrderLoad"></orderCard>-->
+    </view>
+    <u-empty mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png"
+             v-if="!orderCardList.length &&!loading "></u-empty>
+    <u-loadmore :status="status" marginTop="20" height="10" marginBottom="10"
+                v-if="orderCardList.length>0 && !loading"/>
+    <u-loading-icon text="加载中" style="display: flex;align-items: center; margin-top: 100px;"
+                    :show="loading"></u-loading-icon>
 
-		<!-- app不支持$route -->
-		<!-- <TabBar :currentPagePath="this.$route.meta.pagePath"></TabBar> -->
-		<TabBar :currentPagePath="'pages/order/order'"></TabBar>
-	</view>
+    <!-- app不支持$route -->
+    <!-- <TabBar :currentPagePath="this.$route.meta.pagePath"></TabBar> -->
+    <TabBar :currentPagePath="'pages/order/order'"></TabBar>
+  </view>
 </template>
 
 <script>
-	import login from '../../api/login';
-	import orderCard from './components/orderCard.vue'
-	export default {
-		components: {
-			orderCard
-		},
-		props: {
+import login from '../../api/login';
+import orderCard from './components/orderCard.vue'
+import {dd_zflx, dd_fkfs, dd_psfs, dd_zffs, dd_ddly, sys_sf, dd_ddzt} from "@/utils/enums";
 
-		},
-		data() {
-			return {
-				loading: false,
-				activeStyle: {
-					'color': '#EA5707',
-					'fontSize': '16px',
-					'fontWeight': 'bold'
-				},
-				itemStyle: {
-					'width': '75px',
-					'height': '60px',
-				},
-				orderCardList: [],
-				pageParams: {
-					currentPage: 1,
-					size: 10,
-					currentZt: ''
-				},
-				status: "loadmore",
-				current: 0,
-				// current:'全部',
-				statusList: [{
-					name: '全部',
-					id: '全部'
-				}, {
-					name: '待付款',
-					id: 1
-				}, {
-					name: '待配送',
-					id: 2
-				}, {
-					name: '配送中',
-					id: 3
-				}, {
-					name: '已完成',
-					id: 4
-				}, ],
-				total: null,
-			}
-		},
-		computed: {
+export default {
+  components: {
+    orderCard
+  },
+  props: {},
+  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])),
+      loading: false,
+      activeStyle: {
+        'color': '#EA5707',
+        'fontSize': '16px',
+        'fontWeight': 'bold'
+      },
+      itemStyle: {
+        'width': '75px',
+        'height': '60px',
+      },
+      orderCardList: [],
+      pageParams: {
+        currentPage: 1,
+        size: 10,
+        currentZt: ''
+      },
+      status: "loadmore",
+      current: 0,
+      // current:'全部',
+      statusList: [{
+        name: '全部',
+        id: '全部'
+      }, {
+        name: '待付款',
+        id: 1
+      }, {
+        name: '待配送',
+        id: 2
+      }, {
+        name: '配送中',
+        id: 3
+      }, {
+        name: '已完成',
+        id: 4
+      },],
+      total: null,
+    }
+  },
+  computed: {},
+  onPullDownRefresh() {
+    this.orderCardList = [];
+    this.pageParams.currentPage = 1;
+    //调用获取数据方法
+    this.getOrderList()
+    setTimeout(() => {
+      //结束下拉刷新
+      uni.stopPullDownRefresh();
+    }, 500);
+  },
+  onReachBottom() {
+    let allTotal = this.pageParams.currentPage * this.pageParams.size
+    if (allTotal < this.total) {
+      //当前条数小于总条数 则增加请求页数
+      this.pageParams.currentPage++;
+      this.status = 'loading';
+      setTimeout(() => {
+        this.getOrderList()
+      }, 500)
+    } else {
+      this.status = 'nomore'
+      // console.log('已加载全部数据')
+    }
+  },
+  mounted() {
+    this.getDictOrder();
+    // this.getOrderList();
+  },
+  async onLoad(options) {
+    console.log('options=====', options)
+    await this.getOrderList();
 
-		},
-		onPullDownRefresh() {
-			this.orderCardList = [];
-			this.pageParams.currentPage = 1;
-			//调用获取数据方法
-			this.getOrderList()
-			setTimeout(() => {
-				//结束下拉刷新
-				uni.stopPullDownRefresh();
-			}, 500);
-		},
-		onReachBottom() {
-			let allTotal = this.pageParams.currentPage * this.pageParams.size
-			if (allTotal < this.total) {
-				//当前条数小于总条数 则增加请求页数
-				this.pageParams.currentPage++;
-				this.status = 'loading';
-				setTimeout(() => {
-					this.getOrderList()
-				}, 500)
-			} else {
-				this.status = 'nomore'
-				// console.log('已加载全部数据')
-			}
-		},
-		mounted() {
-			this.getDictOrder();
-			// this.getOrderList();
-		},
-		async onLoad(options) {
-			console.log('options=====', options)
-			await this.getOrderList();
+    uni.$on('onload', status => {
+      console.log("onload刷新", status);
+      if (status) {
+        this.getOrderList()
+      }
+    });
 
-			uni.$on('onload', status => {
-				console.log("onload刷新", status);
-				if (status) {
-					this.getOrderList()
-				}
-			});
+  },
+  async onShow() {
+    const orderCardType = uni.getStorageSync('orderCardType');
+    console.log("当前", this.pageParams.currentZt);
+    let isChange = this.pageParams.currentZt === orderCardType; //记录状态是否发生改变
+    if (orderCardType) {
+      // this.pageParams.currentZt = orderCardType;
+      switch (orderCardType) {
+        case '全部':
+          this.current = 0;
+          this.pageParams.currentZt=null;
+          break;
+        case '待配送':
+          this.current = 1;
+          this.pageParams.currentZt='202';
+          break;
+        case '配送中':
+          this.current = 2;
+          this.pageParams.currentZt='203';
+          break;
+        case '已完成':
+          this.pageParams.currentZt='204';
+          break;
+        case '已取消':
+          this.pageParams.currentZt='207';
+          break;
+      }
+      console.log('打印orderCardType', orderCardType);
+    } else {
+      this.current = 0;
+      this.pageParams.currentZt = '';
+    }
+    this.pageParams.currentPage = 1;
+    if (!isChange) { //如果状态发生改变后刷新
+      await this.getOrderList();
+    }
+  },
+  methods: {
+    //用户取消订单
+    async goGasCancel(val) {
+      let paramsData = {
+        ddid: val.id
+      };
+      this.$modal.confirm('确认取消订单？', '提示').then(async () => {
+        let cancelOrderResult = await this.$api.orderApi.cancelOrder(paramsData);
+        if (cancelOrderResult.code == 200) {
+          this.$modal.msgSuccess('订单取消成功!');
+          this.getOrderList();
+        } else {
+          this.$modal.msgError('会员信息修改失败!');
+        }
+      }).catch(() => {
+        console.log("取消");
+      });
 
-		},
-		async onShow() {
-			const orderCardType = uni.getStorageSync('orderCardType');
-			console.log("当前", this.pageParams.currentZt);
-			let isChange = this.pageParams.currentZt === orderCardType; //记录状态是否发生改变
-			if (orderCardType) {
-				this.pageParams.currentZt = orderCardType;
-				switch (orderCardType) {
-					case '全部':
-						this.current = 0;
-						break;
-					case '待配送':
-						this.current = 1;
-						break;
-					case '配送中':
-						this.current = 2;
-						break;
-				}
-				console.log('打印orderCardType', orderCardType);
-			} else {
-				this.current = 0;
-				this.pageParams.currentZt = '';
-			}
-			this.pageParams.currentPage = 1;
-			if (!isChange) { //如果状态发生改变后刷新
-				await this.getOrderList();
-			}
-		},
-		methods: {
-			//用户取消订单
-			async goGasCancel(val) {
-				let paramsData = {
-					ddid: val.id
-				};
-				this.$modal.confirm('确认取消订单？', '提示').then(async () => {
-					let cancelOrderResult = await this.$api.orderApi.cancelOrder(paramsData);
-					if (cancelOrderResult.code == 200) {
-						this.$modal.msgSuccess('订单取消成功!');
-						this.getOrderList();
-					} else {
-						this.$modal.msgError('会员信息修改失败!');
-					}
-				}).catch(() => {
-					console.log("取消");
-				});
+    },
+    goStorePage(val) {
+      let czid = val.fCzid;
+      console.log('打印czid', czid)
+      uni.navigateTo({
+        url: "/pages/home/storeDetails?czid=" + czid
+      })
+    },
+    goGasDetailPage() {
+      uni.navigateTo({
+        url: "/pages/home/gasDetail"
+      })
+    },
+    goOrderDetaPage(val) {
+      // console.log('打印this.pageForm.id', this.pageForm);
+      uni.navigateTo({
+        url: `/pages/order/orderDetail?id=${val.id}`
+      })
+    },
+    cancelOrderLoad() {
+      this.getOrderList();
+    },
+    async getDictOrder() {
+      let query = [{
+        key: 'NAME_',
+        value: '订单状态'
+      }]
+      console.log(query);
+      let queryJson = JSON.stringify(query);
+      console.log(queryJson);
+      const result = await this.$api.dictApi.getDict(queryJson, 'ztyd');
+      let {
+        rows
+      } = result;
+      let statusArray = [];
+      statusArray = rows.length > 0 ? rows.map((item) => {
+        return {
+          name: item.NAME_,
+          id: item.NAME_
+        }
+      }) : [];
+      statusArray.unshift({
+        name: '全部',
+        id: '全部'
+      });
+      this.statusList = statusArray;
+      console.log('大于this.statusList', this.statusList);
 
-			},
-			goStorePage(val) {
-				let czid = val.fCzid;
-				console.log('打印czid', czid)
-				uni.navigateTo({
-					url: "/pages/home/storeDetails?czid=" + czid
-				})
-			},
-			goGasDetailPage() {
-				uni.navigateTo({
-					url: "/pages/home/gasDetail"
-				})
-			},
-			goOrderDetaPage(val) {
-				// console.log('打印this.pageForm.id', this.pageForm);
-				uni.navigateTo({
-					url: `/pages/order/orderDetail?id=${val.id}`
-				})
-			},
-			cancelOrderLoad() {
-				this.getOrderList();
-			},
-			async getDictOrder() {
-				let query = [{
-					key: 'NAME_',
-					value: '订单状态'
-				}]
-				console.log(query);
-				let queryJson = JSON.stringify(query);
-				console.log(queryJson);
-				const result = await this.$api.dictApi.getDict(queryJson, 'ztyd');
-				let {
-					rows
-				} = result;
-				let statusArray = [];
-				statusArray = rows.length > 0 ? rows.map((item) => {
-					return {
-						name: item.NAME_,
-						id: item.NAME_
-					}
-				}) : [];
-				statusArray.unshift({
-					name: '全部',
-					id: '全部'
-				});
-				this.statusList = statusArray;
-				console.log('大于this.statusList', this.statusList);
+    },
+    async getOrderList() {
+      this.loading = true;
+      let params = {
+        current: this.pageParams.currentPage,
+        size: 10,
+      }
 
-			},
-			async getOrderList() {
-				this.loading = true;
-				let params = {
-					current: this.pageParams.currentPage,
-					size: 10,
-				}
-				if (this.pageParams.currentZt) {
-					if (this.pageParams.currentZt == '全部') {
-						params.zt = '';
-					} else {
-						params.zt = this.pageParams.currentZt;
-					}
-				}
-				// setTimeout(async()=>{
-				let result = await this.$api.orderApi.getOrderList(params);
-				let {
-					code,
-					value
-				} = result;
-				// let { current, records,size,total} = value;
-				// this.orderCardList = records;
-				if (code == 200) {
-					let {
-						current,
-						records,
-						size,
-						total
-					} = value;
-					let allTotal = this.pageParams.currentPage * this.pageParams.size
-					this.total = total;
-					const newlist = records;
-					if (this.pageParams.currentPage === 1) {
-						this.orderCardList = newlist;
-					} else {
-						this.orderCardList.push(...newlist)
-					}
-					if (this.orderCardList.length < allTotal) {
-						this.status = 'nomore'
-					}
-					this.orderCardList.map(async (item) => {
-						item.ddxqList.map(async (vitem) => {
-							let JsonParse = JSON.parse(vitem.fTp);
-							let images = await this.$getPhotoUrl(JsonParse[0].response.fileId);
-							vitem.fTp = images;
-							this.$forceUpdate();
-						});
-						this.$forceUpdate();
-					});
-					this.loading = false;
-					// this.orderCardList =JSON.parse(JSON.stringify(this.orderCardList));
-					console.log('打印this.orderCardList', this.orderCardList)
-				}
 
-				// },2000)
-				// let queryJson = JSON.stringify(params);
+        switch (this.pageParams.currentZt) {
+          case '全部':
+            params.zt=null;
+            break;
+          case '待配送':
+            params.zt='202';
+            break;
+          case '配送中':
+            params.zt='203';
+            break;
+          case '已完成':
+            params.zt='204';
+            break;
+          case '已取消':
+            params.zt='207';
+            break;
+        }
+      // setTimeout(async()=>{
+      let result = await this.$api.orderApi.getOrderList(params);
+      let {
+        code,
+        value
+      } = result;
+      // let { current, records,size,total} = value;
+      // this.orderCardList = records;
+      if (code == 200) {
+        let {
+          current,
+          records,
+          size,
+          total
+        } = value;
+        let allTotal = this.pageParams.currentPage * this.pageParams.size
+        this.total = total;
+        const newlist = records;
+        if (this.pageParams.currentPage === 1) {
+          this.orderCardList = newlist;
+        } else {
+          this.orderCardList.push(...newlist)
+        }
+        if (this.orderCardList.length < allTotal) {
+          this.status = 'nomore'
+        }
+        this.orderCardList.map(async (item) => {
+          item.ddxqList.map(async (vitem) => {
+            let JsonParse = JSON.parse(vitem.fTp);
+            let images = await this.$getPhotoUrl(JsonParse[0].response.fileId);
+            vitem.fTp = images;
+            this.$forceUpdate();
+          });
+          this.$forceUpdate();
+        });
+        this.loading = false;
+        // this.orderCardList =JSON.parse(JSON.stringify(this.orderCardList));
+        console.log('打印this.orderCardList', this.orderCardList)
+      }
 
-			},
-			tabChange(e) {
-				this.current = e.index;
-				this.pageParams.currentZt = e.name;
-				this.pageParams.currentPage = 1;
-				this.orderCardList = [];
-				this.getOrderList();
-			},
-			openScan() {
-				this.$refs.scanCode.open();
-			},
-			close() {
-				this.$refs.scanCode.close();
-			}
-		}
-	}
+      // },2000)
+      // let queryJson = JSON.stringify(params);
+
+    },
+    tabChange(e) {
+      this.current = e.index;
+      this.pageParams.currentZt = e.name;
+      this.pageParams.currentPage = 1;
+      this.orderCardList = [];
+      this.getOrderList();
+    },
+    openScan() {
+      this.$refs.scanCode.open();
+    },
+    close() {
+      this.$refs.scanCode.close();
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
-	.container {
-		padding-bottom: 60px;
+.container {
+  padding-bottom: 60px;
 
-		// background-color: #f1f1f1 !important;
-		::v-deep.u-tabbar__placeholder {
-			display: none;
+  // background-color: #f1f1f1 !important;
+  ::v-deep.u-tabbar__placeholder {
+    display: none;
 
-		}
-	}
+  }
+}
 
-	.tabCss {
-		// font-weight: ;
-	}
+.tabCss {
+  // font-weight: ;
+}
 </style>
 <style lang="scss" scoped>
-	.orderCard {
-		margin: 10px;
-		padding: 10px;
-		background: #fff;
-		border-radius: 15px;
+.orderCard {
+  margin: 10px;
+  padding: 10px;
+  background: #fff;
+  border-radius: 15px;
 
-		.psfsSty {
-			width: 70px;
-			height: 23px;
-			border-radius: 5px;
-			text-align: center;
-			line-height: 23px;
-			font-size: 12px;
-		}
+  .psfsSty {
+    width: 70px;
+    height: 23px;
+    border-radius: 5px;
+    text-align: center;
+    line-height: 23px;
+    font-size: 12px;
+  }
 
-		.ztSty {
-			font-family: "苹方 中等", 苹方, sans-serif;
-			font-weight: 400;
-			font-style: normal;
-			color: rgb(0, 174, 170);
-			background-color: #e6f7f7;
-		}
+  .ztSty {
+    font-family: "苹方 中等", 苹方, sans-serif;
+    font-weight: 400;
+    font-style: normal;
+    color: rgb(0, 174, 170);
+    background-color: #e6f7f7;
+  }
 
-		.psSty {
-			font-family: "苹方 中等", 苹方, sans-serif;
-			font-weight: 400;
-			font-style: normal;
-			color: rgb(255, 165, 0);
-			background-color: #fff6e6;
-		}
-	}
-</style>
\ No newline at end of file
+  .psSty {
+    font-family: "苹方 中等", 苹方, sans-serif;
+    font-weight: 400;
+    font-style: normal;
+    color: rgb(255, 165, 0);
+    background-color: #fff6e6;
+  }
+}
+</style>
diff --git a/frontend/app-user/pages/order/orderDetail.vue b/frontend/app-user/pages/order/orderDetail.vue
index df9a4aa..173daff 100644
--- a/frontend/app-user/pages/order/orderDetail.vue
+++ b/frontend/app-user/pages/order/orderDetail.vue
@@ -3,10 +3,10 @@
 		<Navbar title="订单详情" :canBack="true"></Navbar>
 		<view class="topTitleCss">
 			<view class="text-xxl text-bold">
-				{{detailForm.fDdzt}}
+				{{ddDdzt.get(detailForm.fDdzt)}}
 			</view>
       <view class="text-gray text-lg margin-top">
-        订单完成时间：{{ detailForm.fSjwcsj?detailForm.fSjwcsj:detailForm.fDdzt==='待配送'? "等待配送中":detailForm==='已取消'?'已取消':detailForm.fDdzt }}
+        订单完成时间：{{ detailForm.fSjwcsj?detailForm.fSjwcsj:detailForm.fDdzt==='203'? "等待配送中":detailForm==='207'?'已取消':ddDdzt.get(detailForm.fDdzt) }}
       </view>
 		</view>
 		<view class="orderCard">
@@ -138,7 +138,7 @@
 						提取方式
 					</view>
 					<view class="flex justify-end w70">
-            {{detailForm.fPsfs}}
+            {{ ddPsfs.get(detailForm.fPsfs) }}
 					</view>
 				</view>
 			</view>
@@ -147,6 +147,8 @@
 </template>
 
 <script>
+import {dd_zflx, dd_fkfs, dd_psfs, dd_zffs, dd_ddly, sys_sf, dd_ddzt} from "@/utils/enums";
+
 	export default {
 		components: {},
 		props: {
@@ -154,6 +156,8 @@
 		},
 		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])),
 				detailForm:{
 					ddxq:[],
 					fCzmc:'',
diff --git a/frontend/app-user/utils/enums.js b/frontend/app-user/utils/enums.js
new file mode 100644
index 0000000..29db899
--- /dev/null
+++ b/frontend/app-user/utils/enums.js
@@ -0,0 +1,65 @@
+export const sys_sf = {
+    Y: {code: '1', info: '是'},
+    N: {code: '0', info: '否'}
+};
+
+/**
+ * 订单来源枚举
+ */
+export const dd_ddly = {
+    XSXD: {code: '1', info: '线上下单'},
+    WDPS: {code: '2', info: '无单配送'},
+    BZXD: {code: '3', info: '帮助下单'}
+};
+
+/**
+ * 付款方式枚举
+ */
+export const dd_fkfs = {
+    CASH_ON_DELIVERY: {code: '1', info: '货到付款'},
+    ONLINE_PAYMENT: {code: '2', info: '在线支付'}
+};
+
+/**
+ * 配送方式枚举
+ */
+export const dd_psfs = {
+    PS: {code: '1', info: '配送'},
+    ZT: {code: '2', info: '自提'}
+};
+
+
+/**
+ * 付款方式枚举
+ */
+export const dd_zffs = {
+    CASH: {code: 'CASH', info: '现金支付'},
+    WX_PAY: {code: 'WX_PAY', info: '微信支付'},
+    ALI_PAY: {code: 'ALI_PAY', info: '支付宝支付'}
+};
+
+
+/**
+ * 支付场景枚举
+ */
+export const dd_zflx = {
+    APP: {code: 'APP', info: '移动应用内的支付场景'},
+    NATIVE: {code: 'NATIVE', info: '线下消费场景'},
+    JSAPI: {code: 'JSAPI', info: '公众号内或者微信内的网页支付'},
+    MWEB: {code: 'MWEB', info: '手机浏览器中的支付场景'}
+};
+
+
+export const dd_ddzt = {
+    CREATED: {code: '201', info: '待支付'},
+    PAID: {code: '202', info: '待配送'},
+    SHIPPED: {code: '203', info: '配送中'},
+    COMPLETED: {code: '204', info: '已完成'},
+    CANCELLED: {code: '205', info: '取消中'},
+    REFUNDING: {code: '206', info: '退款中'},
+    REFUNDED: {code: '207', info: '已取消'}
+};
+
+
+
+
--
libgit2 0.21.2