From 824f3c49013bb3a853a1c489f787879027579b72 Mon Sep 17 00:00:00 2001
From: duanshuwen <duanshuwen@gogpay.cn>
Date: Fri, 1 Aug 2025 11:29:03 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AD=97=E4=BD=93=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/components/GoodsInfo/index.vue    |   2 +-
 .../components/GoodsInfo/styles/index.scss    |   4 +-
 .../components/OrderStatusInfo/index.vue      |  68 +++++++++++++++---
 pages/order/components/TopNavBar/index.vue    |   9 +--
 .../components/TopNavBar/styles/index.scss    |  10 ---
 pages/order/detail.vue                        |   9 ++-
 pages/order/images/back.png                   | Bin 311 -> 0 bytes
 pages/order/styles/detail.scss                |  15 ++--
 static/fonts/iconfont.css                     |  10 ++-
 static/fonts/iconfont.ttf                     | Bin 1924 -> 1964 bytes
 10 files changed, 83 insertions(+), 44 deletions(-)
 delete mode 100644 pages/order/images/back.png

diff --git a/pages/order/components/GoodsInfo/index.vue b/pages/order/components/GoodsInfo/index.vue
index 09284a6..73d4b78 100644
--- a/pages/order/components/GoodsInfo/index.vue
+++ b/pages/order/components/GoodsInfo/index.vue
@@ -46,4 +46,4 @@ defineProps({
 
 <style scoped lang="scss">
 @import "./styles/index.scss";
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/order/components/GoodsInfo/styles/index.scss b/pages/order/components/GoodsInfo/styles/index.scss
index 1f4ca7c..4b73fbc 100644
--- a/pages/order/components/GoodsInfo/styles/index.scss
+++ b/pages/order/components/GoodsInfo/styles/index.scss
@@ -28,7 +28,7 @@
 }
 
 .goods-image {
-    background-color: pink;
+  background-color: pink;
   width: 65px;
   height: 65px;
   border-radius: 8px;
@@ -74,4 +74,4 @@
 .service-quantity {
   font-size: 12px;
   color: #666;
-}
\ No newline at end of file
+}
diff --git a/pages/order/components/OrderStatusInfo/index.vue b/pages/order/components/OrderStatusInfo/index.vue
index 117f331..ddbdf25 100644
--- a/pages/order/components/OrderStatusInfo/index.vue
+++ b/pages/order/components/OrderStatusInfo/index.vue
@@ -4,17 +4,52 @@
       <uni-icons
         class="status-icon"
         fontFamily="ZhiNian"
-        type="iconshizhong"
-        size="30"
-      ></uni-icons>
-      <text class="status-text">已取消</text>
+        size="20"
+        color="#fff"
+      >
+        {{ "&#xe600;" }}
+      </uni-icons>
+      <!-- 订单状态 -->
+      <text class="status-text">{{ statusText }}</text>
     </view>
-    <view class="status-description"> 您已取消待支付的订单 </view>
+    <view class="status-description">{{ statusDescription }}</view>
   </view>
 </template>
 
 <script setup>
-import { defineProps } from "vue";
+import { defineProps, computed } from "vue";
+
+// 订单状态配置映射
+const ORDER_STATUS_CONFIG = {
+  0: {
+    text: "待支付",
+    description: "请尽快完成支付",
+  },
+  1: {
+    text: "待确认",
+    description: "商家正在确认您的订单",
+  },
+  2: {
+    text: "待使用",
+    description: "预订成功，订单待使用",
+  },
+  3: {
+    text: "已取消",
+    description: "订单已取消",
+  },
+  4: {
+    text: "退款中",
+    description: "商家退款正在处理中，请耐心等待",
+  },
+  5: {
+    text: "已退款",
+    description: "款项预计1-7个工作日退回至原支付账户",
+  },
+  6: {
+    text: "已完成",
+    description: "订单已完成，感谢您的使用",
+  },
+};
 
 const props = defineProps({
   orderData: {
@@ -25,13 +60,30 @@ const props = defineProps({
       paySerialNumber: "",
       payWay: "", // 支付方式 0-微信 1-支付宝 2-云闪付
       payAmt: "",
-      orderStatus: "0", // 订单状态 0-待支付 1-待确认 2-待使用 3-已取消 4-退款中 5-已关闭 6-已完成
+      orderStatus: "0", // 订单状态 0-待支付 1-待确认 2-待使用 3-已取消 4-退款中 5-已退款 6-已完成
       orderType: "0", // 0-酒店订单, 1-门票订单, 2-餐饮
     }),
   },
 });
+
+// 当前状态配置
+const currentStatusConfig = computed(() => {
+  return (
+    ORDER_STATUS_CONFIG[props.orderData.orderStatus] || ORDER_STATUS_CONFIG["0"]
+  );
+});
+
+// 状态文本
+const statusText = computed(() => {
+  return currentStatusConfig.value.text;
+});
+
+// 状态描述
+const statusDescription = computed(() => {
+  return currentStatusConfig.value.description;
+});
 </script>
 
 <style scoped>
 @import "./styles/index.scss";
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/order/components/TopNavBar/index.vue b/pages/order/components/TopNavBar/index.vue
index a160644..92c086a 100644
--- a/pages/order/components/TopNavBar/index.vue
+++ b/pages/order/components/TopNavBar/index.vue
@@ -2,11 +2,8 @@
   <view class="top-nav-bar" :style="{ paddingTop: statusBarHeight + 'px' }">
     <view class="nav-content">
       <view class="nav-left" @click="goBack">
-        <image
-          class="back-icon"
-          src="@/static/back.png"
-          mode="aspectFit"
-        ></image>
+        <uni-icons class="icon-back" type="left" size="20" color="#333">
+        </uni-icons>
       </view>
       <view class="nav-center">
         <slot name="title">
@@ -57,4 +54,4 @@ const goBack = () => {
 
 <style scoped>
 @import "./styles/index.scss";
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/order/components/TopNavBar/styles/index.scss b/pages/order/components/TopNavBar/styles/index.scss
index cdc929d..1b92fb4 100644
--- a/pages/order/components/TopNavBar/styles/index.scss
+++ b/pages/order/components/TopNavBar/styles/index.scss
@@ -1,12 +1,9 @@
-
-
 .nav-content {
   display: flex;
   align-items: center;
   height: 40px;
   box-sizing: border-box;
   padding-top: 8px;
-
 }
 
 .nav-left {
@@ -17,11 +14,6 @@
   height: 30px;
 }
 
-.back-icon {
-  width: 16px;
-  height: 16px;
-}
-
 .nav-center {
   flex: 1;
   display: flex;
@@ -34,5 +26,3 @@
   color: #333;
   text-align: center;
 }
-
-
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index bd303f5..9f5468d 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="order-detail-wrapper">
-    <image class="icon-back" src="./images/back.png" />
+    <uni-icons type="left" size="20" color="#fff" @click="goBack" />
 
     <OrderStatusInfo :orderData="orderData" />
     <OrderQrcode size="132" unit="px" :val="orderData.orderId" />
@@ -29,6 +29,13 @@ onLoad(async ({ orderId }) => {
   orderData.value = res.data;
   console.log(res);
 });
+
+// 返回上一页
+const goBack = () => {
+  uni.navigateBack({
+    delta: 1,
+  });
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/pages/order/images/back.png b/pages/order/images/back.png
deleted file mode 100644
index d7133cebad6a5a8d9f469fd7d97cbedb8eaa4fee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 311
zcmV-70m%M|P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px#@kvBMR7gv;maz^2K@f(&zu`4Rr{^J5NO%b)jY6-Z@*18-D;g3Vo?zsXldKDF
zXP2$-=9~HQ&)$iQV`fcY4orZtq(ilwGU{VyTVPt&*hrfF3}9wEU{n^o0WC@QY=D_H
zfKAZ(3Ft|>ytCm}RMAot?@QW$Qtbk~(bD<U`4bog@M;OCi3Nmdsny~Fq-co(<Y<Wn
zBx|V!nArkYl@FeQZe3bjG5tHB=*GKHt_ezj>q>9~o-h0@reQ}px?(puSyvPwN0$qb
zlCBhhOP3q)MORzWHT#qKC0%Pt#UIAYNuD5B#w9QShLVm|zyt0uj2Wac8i)V@002ov
JPDHLkV1lIXf9n7M

diff --git a/pages/order/styles/detail.scss b/pages/order/styles/detail.scss
index f83ed61..7948c99 100644
--- a/pages/order/styles/detail.scss
+++ b/pages/order/styles/detail.scss
@@ -1,12 +1,7 @@
 .order-detail-wrapper {
-   background: url('./images/header_bg.png');
-   background-position: 0 0;
-   background-size: 100% 242px;
-   background-repeat: no-repeat;
-   padding: 60px 15px;
+  background: url("./images/header_bg.png");
+  background-position: 0 0;
+  background-size: 100% 242px;
+  background-repeat: no-repeat;
+  padding: 60px 15px;
 }
-
-.icon-back {
-   height: 16px;
-   width: 16px;
-}
\ No newline at end of file
diff --git a/static/fonts/iconfont.css b/static/fonts/iconfont.css
index f8e8077..30ca297 100644
--- a/static/fonts/iconfont.css
+++ b/static/fonts/iconfont.css
@@ -1,19 +1,17 @@
 @font-face {
   font-family: "ZhiNian"; /* Project id 4988933 */
-  src: url("iconfont.ttf?t=1753966564544") format("truetype");
+  src: url("/static/fonts/iconfont.ttf") format("truetype");
 }
 
 .ZhiNian {
   font-family: "ZhiNian" !important;
   font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
 }
 
-.iconyoujiantou:before {
-  content: "\e678";
+.zn-food:before {
+  content: "\e607";
 }
 
-.iconshizhong:before {
+.zn-clock:before {
   content: "\e600";
 }
diff --git a/static/fonts/iconfont.ttf b/static/fonts/iconfont.ttf
index a555f9802244f157b2652c16decc728ff0e8eedf..176d41b9a777f684298ee8b6f5ca415a21c4a14c 100644
GIT binary patch
delta 404
zcmZqSU&B8^DaqqH0|R3Z0|P@sa&BTlO4^09K>iOPZcERpOjAvWKgGbn+yUfI$Vg30
z(P?JT0jhlf#AX>l0rvaM%|P}ZAXdr9EvevP`2QcM_6?BFlarsE$l$?nVq%Mu2CD=E
z15<QCesRg2mlvHG7}!fdCNMAp&2ISLz!1X%)c5~C3**FdQYtp@`6S}`ZN4&avj7z_
zFg)3KPaH-A6*aIhGB-}<VLZ&pKKTNp64U?xlfN)Ja<YRge#Y>OeX|{tIb%ILkORaZ
z8^8eQ4hCkJZUzYk4Uj(sMa1P8#l?)w?HJ9?Ow{!l)zy^P`54*RR7I6V<(NbjO@I=n
z%BGB_ilQ3oeKGMD;$!;MHISH0zQzujw*MGxGaZZ>)Bm1fY{&pBQAAP$X4V-?vw0La
iI23rWNgMz3H8$S-l(~bMpCv6nKZP|J7*yFHX956`?r{_V

delta 378
zcmX9&Jxjw-6umbuH8z%H5i8Pyl%he3I!KBr7R5pLZVGMeS1N5&XbP!IBNTCPu=F2v
z?x1uPl!~LJo0~Xjad1>{O1!ZT&VA?HbKbqLC%5G5$jRXW0A2w=I#brF`IXT#>0iP{
zq14FV4?ea4*d^(-p3}0ibMuL^Zv<7RhVaT-#P0}Ey=+<mB9#525-1rN4c6hN-HIsu
zCjfU;HEQPYB^Ch?_9>A7q}jG>!!hqY10LGLh3KM_6H@Z_56n!u@3-?=&z;<Ej|Z0Q
z1n?29&IltMK<68G{g&$jjA3l`cepq<EfNH8!~dawc--wVjwK;T#>N^hE#oRq%?ABc
z=F~W<2~-&(#|utMRzfn`jxC223A+N%A==C*iUM{e3@eh;befV9M$Z&QpSOh3`~iDl
ed$8G$@(mUg8%F)Ks8vj(K3&s`XSz`-Q0@;MR$4g#