From 5de17429958343d0a6b751f65948ed2cb78d4885 Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Thu, 4 Dec 2025 10:36:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=B8=8E=E7=94=A8=E6=88=B7=E7=99=BB=E9=99=86=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/mall/member/user/UserDetail.vue            | 7 ++++++-
 yshop-drink-vue3/src/views/mall/member/user/index.vue    | 9 ++++++++-
 .../src/views/mall/order/storeOrder/index.vue            | 2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/yshop-drink-vue3/src/views/mall/member/user/UserDetail.vue b/yshop-drink-vue3/src/views/mall/member/user/UserDetail.vue
index 1c24a01..4238996 100644
--- a/yshop-drink-vue3/src/views/mall/member/user/UserDetail.vue
+++ b/yshop-drink-vue3/src/views/mall/member/user/UserDetail.vue
@@ -21,7 +21,12 @@
             <el-descriptions-item label="推广id">{{ DetailData.spreadUid }}</el-descriptions-item>
             <el-descriptions-item label="购买次数">{{ DetailData.payCount }}</el-descriptions-item>
             <el-descriptions-item label="下级人数">{{ DetailData.spreadCount }}</el-descriptions-item>
-            <el-descriptions-item label="登陆类型">{{ DetailData.loginType }}</el-descriptions-item>
+            <el-descriptions-item label="登陆类型">
+              <span v-if="DetailData.loginType == 'routine'">小程序</span>
+              <span v-else-if="DetailData.loginType == 'wechat'">公众号</span>
+              <span v-else-if="DetailData.loginType == 'h5'">H5</span>
+              <span v-else>未知</span>
+            </el-descriptions-item>
             <el-descriptions-item label="注册时间">{{ formatDate(DetailData.createTime) }}</el-descriptions-item>
           </el-descriptions>
         </el-tab-pane>
diff --git a/yshop-drink-vue3/src/views/mall/member/user/index.vue b/yshop-drink-vue3/src/views/mall/member/user/index.vue
index 2592977..9799316 100644
--- a/yshop-drink-vue3/src/views/mall/member/user/index.vue
+++ b/yshop-drink-vue3/src/views/mall/member/user/index.vue
@@ -71,7 +71,14 @@
         :formatter="dateFormatter"
       />
       <el-table-column label="用户余额" align="center" prop="nowMoney" />
-      <el-table-column label="用户登陆类型" align="center" prop="loginType" />
+      <el-table-column label="用户登陆类型" align="center" prop="loginType">
+        <template #default="scope">
+          <span v-if="scope.row.loginType == 'routine'">小程序</span>
+          <span v-else-if="scope.row.loginType == 'wechat'">公众号</span>
+          <span v-else-if="scope.row.loginType == 'h5'">H5</span>
+          <span v-else>未知</span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center">
         <template #default="scope">
           <div class="flex justify-center items-center">
diff --git a/yshop-drink-vue3/src/views/mall/order/storeOrder/index.vue b/yshop-drink-vue3/src/views/mall/order/storeOrder/index.vue
index e80a9ea..b37c3a8 100644
--- a/yshop-drink-vue3/src/views/mall/order/storeOrder/index.vue
+++ b/yshop-drink-vue3/src/views/mall/order/storeOrder/index.vue
@@ -11,7 +11,7 @@
         <el-radio-button label="0">未支付</el-radio-button>
         <el-radio-button label="1">制作中</el-radio-button>
         <el-radio-button label="2">待收货</el-radio-button>
-        <el-radio-button label="3">已收货/已取餐</el-radio-button>
+        <el-radio-button label="4">已收货/已取餐</el-radio-button>
         <!-- <el-radio-button label="4">交易完成</el-radio-button> -->
         <el-radio-button label="5">退款单</el-radio-button>
         <el-radio-button label="6">已删除</el-radio-button>