fix: BUG

src/api/auth.js

@@ -19,7 +19,7 @@ export async function login(data) {
 // 获取用户信息
 export function getUserInfo() {
     return request({
-        url: '/uc/user/current',
+        url: '/uc/user/current/employee',
         method: 'get',
     });
 }

src/layouts/components/profile.vue

@@ -2,7 +2,7 @@
     <div class="layout-profile">
         <el-avatar :src="userInfo?.avatar" />
         <el-dropdown :opts="opts">
-            <span>{{ userInfo?.nickname || userInfo?.username }}</span>
+            <span>{{ userInfo?.employeeName }}</span>
         </el-dropdown>
     </div>
 </template>

src/views/operation/limit/index.vue

@@ -99,7 +99,9 @@
     });
     // 添加/编辑
     const handleCreate = (row) => {
+        if (row) {
             row.time = [row.activityStartTime, row.activityEndTime];
+        }
         Object.assign(
             formState.form,
             row || {
@@ -199,14 +201,10 @@
                             <ElButton type="text" onClick={() => handleUpdateProduct(row)}>
                                 设置商品
                             </ElButton>
-                            <ElButton type="text" disabled={row.activityState !== 1} onClick={() => handleCreate(row)}>
+                            <ElButton type="text" onClick={() => handleCreate(row)}>
                                 编辑
                             </ElButton>
-                            <ElButton
+                            <ElButton type="text" onClick={() => handleRemove([row])}>
-                                type="text"
-                                disabled={row.activityState === 2}
-                                onClick={() => handleRemove([row])}
-                            >
                                 删除
                             </ElButton>
                         </div>

src/views/operation/limit/time.vue

@@ -157,18 +157,10 @@
                 slots: {
                     default: ({ row }) => (
                         <div>
-                            <ElButton
+                            <ElButton type="text" onClick={() => handleUpdate(row)}>
-                                disabled={row.state === 2 && !row.edit}
-                                type="text"
-                                onClick={() => handleUpdate(row)}
-                            >
                                 {row.edit ? '保存' : '编辑'}
                             </ElButton>
-                            <ElButton
+                            <ElButton type="text" onClick={() => handleRemove([row])}>
-                                disabled={row.state === 2 && !row.edit}
-                                type="text"
-                                onClick={() => handleRemove([row])}
-                            >
                                 删除
                             </ElButton>
                         </div>

src/views/sales/service/detail.vue

@@ -68,9 +68,9 @@
                     <el-form-item label="申请时间">
                         {{ state.detail.applyTime }}
                     </el-form-item>
-                    <el-form-item label="用户账号">
+                    <!-- <el-form-item label="用户账号">
                         {{ state.detail.userId }}
-                    </el-form-item>
+                    </el-form-item> -->
                     <el-form-item label="联系人">
                         {{ state.detail.userNickName }}
                     </el-form-item>
@@ -223,6 +223,7 @@
                         <h3>退货物流</h3>
                         <el-form label-width="120px">
                             <el-form-item label="物流信息">
+                                <template v-if="state.detail.refundLogistics">
                                     <span>
                                         {{ state.detail.refundLogistics?.companyName }}
                                     </span>
@@ -230,6 +231,8 @@
                                         {{ state.detail.refundLogistics?.trackingNo }}
                                     </span>
                                     <el-button type="text" @click="handleTrack">查看</el-button>
+                                </template>
+                                <span v-else>暂无</span>
                             </el-form-item>
                             <el-form-item label="退款说明">
                                 {{ state.detail.handleReturnLog?.problemDescribe }}

src/views/system/customer/index.vue

@@ -124,26 +124,11 @@
                 prop: 'source',
                 width: 160,
             },
-            {
-                label: '更新时间',
-                prop: 'updateTime',
-                width: 180,
-            },
-            {
-                label: '更新人',
-                prop: 'updateUser',
-                width: 180,
-            },
             {
                 label: '注册时间',
                 prop: 'createTime',
                 width: 180,
             },
-            {
-                label: '创建人',
-                prop: 'createUser',
-                width: 160,
-            },
             {
                 label: '是否启用',
                 width: 100,