feat: 优化细节

src/app/shop/admin/marketing/group/edit.vue

@@ -31,6 +31,7 @@
         <el-form-item :label="t('modules.marketing.countdownEnd')" prop="content.countdownTime">
           <el-select v-model="form.model.content.countdownTime"
             :placeholder="t('modules.marketing.selectCountdownTime')" style="width: 100%">
+            <el-option :label="t('modules.marketing.oneHour')" :value="1"></el-option>
             <el-option :label="t('modules.marketing.twelveHours')" :value="12"></el-option>
             <el-option :label="t('modules.marketing.twentyFourHours')" :value="24"></el-option>
             <el-option :label="t('modules.marketing.fortyEightHours')" :value="48"></el-option>

src/app/shop/admin/order/order/index.vue

@@ -475,7 +475,7 @@ function openUserDetail(uid) {
     useModal(
       UserDetail,
       {
-        title: t('modules.user.editUser'),
+        title: t('modules.user.userDetail'),
         type: 'edit',
         id: uid,
       },

src/app/shop/admin/user/list/detail.vue

@@ -20,7 +20,7 @@
                 <div class="avatar-section">
                   <el-image :src="state.userDetail.headPic || '/static/images/shop/avatar.png'"
                     style="width: 60px; height: 60px; border-radius: 8px" fit="cover" />
-                  <div class="user-name">{{ state.userDetail.nickname || '--' }}
+                  <div class="user-name">{{ state.userDetail.name || '--' }}
                     <span class="user-level ml-4px">V{{ state.userDetail.vipLevel || t('modules.user.noLevel') }}</span>
                   </div>
                 </div>
@@ -486,7 +486,7 @@ const state = reactive({
 const initBasicInfoTableData = () => {
   state.basicInfoTableData = [
     {
-      field1: state.userDetail.userNo || '--', // 用户ID
+      field1: state.userDetail.id || '--', // 用户ID
       field2: getStatusText('user', state.userDetail.status) || '--', // 状态
       field3: state.userDetail.name || '--', // 昵称
       field4: state.userDetail.bank || '--', // 收款银行

src/app/shop/admin/user/list/edit.vue

@@ -6,8 +6,8 @@
         <el-form-item :label="t('modules.user.userPhone')" prop="phoneNo">
           <el-input v-model="form.model.phoneNo" :placeholder="t('form.inputUserPhone')"></el-input>
         </el-form-item>
-        <el-form-item :label="t('modules.user.userNickname')" prop="nickname">
-          <el-input v-model="form.model.nickname" :placeholder="t('form.inputUserNickname')"></el-input>
+        <el-form-item :label="t('modules.user.username')" prop="name">
+          <el-input v-model="form.model.name" :placeholder="t('form.inputUsername')"></el-input>
         </el-form-item>
 
         <el-form-item :label="t('modules.user.userAvatar')" prop="headPic">
@@ -78,7 +78,7 @@ const props = defineProps({
 let formRef = ref(null);
 const form = reactive({
   model: {
-    nickname: '',
+    name: '',
     phoneNo: '',
     headPic: [],
     bank: '',
@@ -90,7 +90,7 @@ const form = reactive({
     memo: '',
   },
   rules: {
-    // nickname: [{ required: true, message: '请填写用户昵称', trigger: 'blur' }],
+    // name: [{ required: true, message: '请填写用户昵称', trigger: 'blur' }],
     phoneNo: [{ required: true, message: '请填写手机号', trigger: 'blur' }],
     // headPic: [{ required: true, message: '请上传用户头像', trigger: 'change' }],
     hasLogin: [{ required: true, message: '请设置登录权限', trigger: 'change' }],

src/locales/en-US/index.json

@@ -274,7 +274,6 @@
     "sms": "SMS",
     "bannerAd": "Banner",
     "data": "Data",
-    "dataReport": "Reports",
     "dataReport": "Data Reports",
     "finance": "Finance",
     "recharge": "Recharge",
@@ -1066,7 +1065,8 @@
       "detailedAddress": "Detailed Address",
       "isDefault": "Is Default",
       "defaultAddress": "Default Address",
-      "normalAddress": "Normal Address"
+      "normalAddress": "Normal Address",
+      "username": "User name"
     },
     "goods": {
       "goodsList": "Goods List",
@@ -1570,6 +1570,7 @@
       "tenPersonGroup": "10 Person Group",
       "twentyPersonGroup": "20 Person Group",
       "selectCountdownTime": "Select countdown time",
+      "oneHour": "1 Hour",
       "twelveHours": "12 Hours",
       "twentyFourHours": "24 Hours",
       "fortyEightHours": "48 Hours",

src/locales/zh-CN/index.json

@@ -275,7 +275,6 @@
     "bannerAd": "广告位",
     "data": "数据",
     "dataReport": "数据报表",
-    "dataReport": "数据报表",
     "finance": "财务",
     "recharge": "充值",
     "withdraw": "提款",
@@ -1063,7 +1062,8 @@
       "detailedAddress": "详细地址",
       "isDefault": "是否默认",
       "defaultAddress": "默认地址",
-      "normalAddress": "普通地址"
+      "normalAddress": "普通地址",
+      "username": "用户名"
     },
     "goods": {
       "goodsList": "商品列表",
@@ -1571,6 +1571,7 @@
       "tenPersonGroup": "10人团",
       "twentyPersonGroup": "20人团",
       "selectCountdownTime": "请选择开团倒计时结束",
+      "oneHour": "1小时",
       "twelveHours": "12小时",
       "twentyFourHours": "24小时",
       "fortyEightHours": "48小时",