Revert "fix bug"

This reverts commit 3930f47b44e7957758d102bbfb4484e063b75d3b.

src/locales/en.ts

@@ -152,6 +152,7 @@ export default {
     tenantname: 'Tenant Name',
     username: 'User Name',
     password: 'Password',
+    userType: 'User Type',
     code: 'Verification Code',
     login: 'Login',
     relogin: 'Re-login',
@@ -1096,6 +1097,8 @@ export default {
     cashPayment: 'Cash',
     userName: 'User Name',
     phoneNumber: 'Phone number',
+    userType: 'User Type',
+    level: 'Level',
     pleaseEnterTheOrderNumber: 'Please enter the order number',
     pleaseEnterYourName: 'Please enter your name',
     pleaseEnterYourPhoneNumber: 'Please enter your phone number',
@@ -1227,6 +1230,7 @@ export default {
     userAccountCannotBeEmpty: 'User account cannot be empty',
     userNicknameCannotBeEmpty: 'Nickname cannot be empty',
     phoneNumberCannotBeEmpty: "User's mobile phone number cannot be empty",
+    userTypeCannotBeEmpty: "User's user type cannot be empty",
     phoneNumber1: 'Mobile phone number',
     selectMember: 'Select Member',
     select: 'Select',

src/locales/ja.ts

@@ -152,6 +152,7 @@ export default {
     tenantname: 'テナント名',
     username: 'ユーザー名',
     password: 'パスワード',
+    userType: 'ユーザータイプ',
     code: '確認コード',
     login: 'ログイン',
     relogin: '再ログイン',
@@ -1098,6 +1099,8 @@ export default {
     cashPayment: '現金支払い',
     userName: 'ユーザー名',
     phoneNumber: 'ユーザー電話番号',
+    userType: 'ユーザータイプ',
+    level: 'レベル',
     pleaseEnterTheOrderNumber: '注文番号を入力してください',
     pleaseEnterYourName: 'ユーザー名を入力してください',
     pleaseEnterYourPhoneNumber: 'ユーザー電話番号を入力してください',
@@ -1164,6 +1167,7 @@ export default {
     categoryNameCannotBeEmpty: '分類名は空にできません',
     personCountCannotBeEmpty: '人数は空にできません',
     categorySortCannotBeEmpty: '分類順序は空にできません',
+    userTypeCannotBeEmpty: "ユーザーのユーザータイプは空にすることはできません",
     wechatMiniProgram: '微信ミニプログラム',
     officialAccount: '公式アカウント',
     h5: 'H5',
@@ -1185,7 +1189,6 @@ export default {
     commissionAmount: '手数料金額',
     consecutiveSignInDays: '連続サインイン日数',
     loginIp: 'ログインIP',
-    level: 'レベル',
     promotionId: 'プロモーションID',
     purchaseCount: '購入回数',
     subordinateCount: '下位者数',

src/locales/zh-CN.ts

@@ -152,6 +152,7 @@ export default {
     tenantname: '租户名称',
     username: '用户名',
     password: '密码',
+    userType: '类型',
     code: '验证码',
     login: 'ログイン',
     relogin: '重新登录',
@@ -1098,6 +1099,8 @@ export default {
     cashPayment: '现金支付',
     userName: '用户姓名',
     phoneNumber: '用户电话',
+    userType: '用户类型',
+    level: '等级',
     pleaseEnterTheOrderNumber: '请输入订单号',
     pleaseEnterYourName: '请输入用户姓名',
     pleaseEnterYourPhoneNumber: '请输入用户电话',
@@ -1229,6 +1232,7 @@ export default {
     userAccountCannotBeEmpty: '用户账户不能为空',
     userNicknameCannotBeEmpty: '用户昵称不能为空',
     phoneNumberCannotBeEmpty: '用户手机号码不能为空',
+    userTypeCannotBeEmpty: '用户类型不能为空',
     phoneNumber1: '手机号码',
     selectMember: '选择会员',
     select: '选择',

src/views/mall/member/user/UserForm.vue

@@ -1,53 +1,58 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible">
-    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="100px" v-loading="formLoading">
-      <el-form-item label="用户账户" prop="username">
-        <el-input v-model="formData.username" placeholder="请输入用户账户" />
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item :label="t('mall.userAccount')" prop="username">
+        <el-input v-model="formData.username" :placeholder="t('mall.pleaseEnterUserAccount')" />
       </el-form-item>
-      <el-form-item label="用户昵称" prop="nickname">
-        <el-input v-model="formData.nickname" placeholder="请输入用户昵称" />
+      <el-form-item :label="t('mall.userNickname')" prop="nickname">
+        <el-input v-model="formData.nickname" :placeholder="t('mall.pleaseEnterUserNickname')" />
       </el-form-item>
-      <el-form-item label="手机号码" prop="mobile">
-        <el-input v-model="formData.mobile" placeholder="请输入手机号码" />
+      <el-form-item :label="t('mall.phoneNumber')" prop="mobile">
+        <el-input v-model="formData.mobile" :placeholder="t('mall.pleaseEnterPhoneNumber')" />
       </el-form-item>
-      <el-form-item label="类型" prop="userType">
+      <el-form-item :label="t('mall.userType')" prop="userType">
         <el-select v-model="formData.userType" placeholder="请选择" style="width: 240px">
           <el-option label="会员(面向 c 端，普通用户)" :value="1" />
           <el-option label="管理员(面向 b 端，管理后台)" :value="2" />
         </el-select>
       </el-form-item>
-      <el-form-item label="真实姓名" prop="realName">
-        <el-input v-model="formData.realName" placeholder="请输入真实姓名" />
+      <el-form-item :label="t('mall.realName')" prop="realName">
+        <el-input v-model="formData.realName" :placeholder="t('mall.pleaseEnterRealName')" />
       </el-form-item>
-      <el-form-item label="生日" prop="birthday">
-        <el-input v-model="formData.birthday" placeholder="请输入生日" />
+      <el-form-item :label="t('mall.birthday')" prop="birthday">
+        <el-input v-model="formData.birthday" :placeholder="t('mall.pleaseEnterBirthday')" />
       </el-form-item>
-      <el-form-item label="用户备注" prop="mark">
-        <el-input v-model="formData.mark" placeholder="请输入用户备注" />
+      <el-form-item :label="t('mall.userRemark')" prop="mark">
+        <el-input v-model="formData.mark" :placeholder="t('mall.pleaseEnterUserRemark')" />
       </el-form-item>
-      <el-form-item label="用户余额" prop="nowMoney">
-        <el-input v-model="formData.nowMoney" placeholder="请输入用户余额" />
+      <el-form-item :label="t('mall.userBalance')" prop="nowMoney">
+        <el-input v-model="formData.nowMoney" :placeholder="t('mall.pleaseEnterUserBalance')" />
       </el-form-item>
-      <el-form-item label="佣金金额" prop="brokeragePrice">
-        <el-input v-model="formData.brokeragePrice" placeholder="请输入佣金金额" />
+      <el-form-item :label="t('mall.commissionAmount')" prop="brokeragePrice">
+        <el-input v-model="formData.brokeragePrice" :placeholder="t('mall.pleaseEnterCommissionAmount')" />
       </el-form-item>
-      <el-form-item label="用户积分" prop="integral">
-        <el-input v-model="formData.integral" placeholder="请输入用户剩余积分" />
+      <el-form-item :label="t('mall.userPoints')" prop="integral">
+        <el-input v-model="formData.integral" :placeholder="t('mall.pleaseEnterUserRemainingPoints')" />
       </el-form-item>
-      <el-form-item label="等级" prop="level">
+      <el-form-item :label="t('mall.level')" prop="level">
         <el-input v-model="formData.level" placeholder="请输入等级" />
       </el-form-item>
-      
       <!-- <el-form-item label="是否为推广员" prop="isPromoter">
         <el-input v-model="formData.isPromoter" placeholder="请输入是否为推广员" />
       </el-form-item> -->
-      <el-form-item label="详细地址" prop="addres">
-        <el-input v-model="formData.addres" placeholder="请输入详细地址" />
+      <el-form-item :label="t('mall.detailedAddress')" prop="addres">
+        <el-input v-model="formData.addres" :placeholder="t('mall.pleaseEnterDetailedAddress')" />
       </el-form-item>
     </el-form>
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">{{t('common.confirm')}}</el-button>
+      <el-button @click="dialogVisible = false">{{t('common.cancel')}}</el-button>
     </template>
   </Dialog>
 </template>
@@ -94,10 +99,10 @@ const formData = ref({
   wxProfile: undefined
 })
 const formRules = reactive({
-  username: [{ required: true, message: '用户账户不能为空', trigger: 'blur' }],
-  nickname: [{ required: true, message: '用户昵称不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '佣手机号码不能为空', trigger: 'blur' }],
-  userType: [{ required: true, message: '用户类型', trigger: 'blur' }]
+  username: [{ required: true, message: t('mall.userAccountCannotBeEmpty'), trigger: 'blur' }],
+  nickname: [{ required: true, message: t('mall.userNicknameCannotBeEmpty'), trigger: 'blur' }],
+  mobile: [{ required: true, message: t('mall.phoneNumberCannotBeEmpty'), trigger: 'blur' }],
+  userType: [{ required: true, message: t('mall.userTypeCannotBeEmpty'), trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref