Merge branch 'gyq' of https://e.coding.net/g-cphe0354/pczhuomianduan/cashierdesktop into wwz

src/components/more.vue

@@ -1,21 +1,17 @@
 <template>
   <div class="drawerbox">
-    <el-drawer
-      size="60%"
-      :with-header="false"
-      direction="rtl"
-      v-model="dialogVisible"
-      style="padding: 0"
-    >
+    <el-drawer size="60%" :with-header="false" direction="rtl" v-model="dialogVisible" style="padding: 0">
       <div class="drawerbox_box">
         <div class="drawerbox_bo_top">
           <div class="drawerbox_bo_top_left">
-            <div class="drawerbox_bo_top_left_one">
+            <div class="drawerbox_bo_top_left_one" style="font-size: 24px;">
               {{ store.userInfo.shopName }}
             </div>
             <div class="drawerbox_bo_top_left_tow" style="margin-top: 10px">
-              收银员：{{ store.userInfo.userCode }}
-              <span style="color: #666">{{ store.userInfo.loginTime }}</span>
+              收银员：{{ store.userInfo.loginName }}
+            </div>
+            <div>
+              <span style="color: #666">{{ dayjs(store.userInfo.loginTime).format('YYYY-MM-DD HH:mm:ss') }}</span>
             </div>
           </div>
           <!-- <div class="drawerbox_bo_top_ring">
@@ -52,10 +48,7 @@
               </div>
               <div class="drawerbox_bo_box_icontext">叫号</div>
             </div>
-            <div
-              class="drawerbox_bo_box_itembox"
-              @click="router.push({ name: 'device_list' })"
-            >
+            <div class="drawerbox_bo_box_itembox" @click="router.push({ name: 'device_list' })">
               <div class="drawerbox_bo_box_icon">
                 <el-icon size="40">
                   <TurnOff />
@@ -100,6 +93,7 @@
 
 <script setup>
 import { ref } from "vue";
+import { dayjs } from 'element-plus'
 import { useRouter } from "vue-router";
 import { useUser } from "@/store/user.js";
 import screen from "@/components/screen.vue";