修复订单状态与用户登陆类型显示问题

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>

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">

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>