1. 管理员删除的bug

2. 会员信息修改的bug

Author: doramart

app/controller/manage/adminUser.js

@@ -2,7 +2,7 @@
  * @Author: doramart 
  * @Date: 2019-06-20 18:55:40 
  * @Last Modified by: doramart
- * @Last Modified time: 2019-11-24 12:12:53
+ * @Last Modified time: 2020-01-21 23:41:43
  */
 const Controller = require('egg').Controller;
 const {
@@ -215,8 +215,23 @@ class AdminUserController extends Controller {
             service
         } = this;
         try {
-            let targetIds = ctx.query.ids;
-            await ctx.service.adminUser.safeDelete(ctx, targetIds);
+            let targetId = ctx.query.ids;
+            // TODO 目前只针对删除单一管理员逻辑
+            let oldUser = await ctx.service.adminUser.item(ctx, {
+                query: {
+                    _id: targetId
+                }
+            });
+            let leftAdminUser = await ctx.service.adminUser.count();
+            if (!_.isEmpty(oldUser)) {
+                if (oldUser._id === ctx.session.adminUserInfo._id ||
+                    leftAdminUser == 1) {
+                    throw new Error("当前场景不允许删除该管理员用户");
+                }
+            } else {
+                throw new Error(ctx.__('validate_error_params'));
+            }
+            await ctx.service.adminUser.removes(ctx, targetId);
             ctx.helper.renderSuccess(ctx);
 
         } catch (err) {

backstage/adminUser/src/views/adminUser/userForm.vue

@@ -275,6 +275,7 @@ export default {
         ],
         comments: [
           {
+            required: true,
             message: this.$t("validate.inputNull", {
               label: this.$t("adminUser.lb_comments")
             }),
@@ -319,7 +320,7 @@ export default {
       return (isJPG || isPNG || isGIF) && isLt2M;
     },
     confirm() {
-      this.$store.dispatch("hideAdminUserForm");
+      this.$store.dispatch("adminUser/hideAdminUserForm");
     },
     submitForm(formName) {
       this.$refs[formName].validate(valid => {
@@ -345,8 +346,8 @@ export default {
             // 新增
             addAdminUser(params).then(result => {
               if (result.status === 200) {
-                this.$store.dispatch("hideAdminUserForm");
-                this.$store.dispatch("getAdminUserList");
+                this.$store.dispatch("adminUser/hideAdminUserForm");
+                this.$store.dispatch("adminUser/getAdminUserList");
                 this.$message({
                   message: this.$t("main.addSuccess"),
                   type: "success"

backstage/contentCategory/src/views/contentCategory/categoryForm.vue

@@ -141,6 +141,7 @@ export default {
         ],
         comments: [
           {
+            required: true,
             message: this.$t("validate.inputNull", {
               label: this.$t("main.comments_label")
             }),

backstage/contentTags/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "adminresource",
+  "name": "contenttags",
   "version": "0.1.0",
   "private": true,
   "scripts": {

backstage/dist/adminUser/js/app.js

@@ -16,7 +16,7 @@
           <div
             v-if="scope.row.countryCode&&scope.row.phoneNum"
           >{{scope.row.countryCode + ' ' + scope.row.phoneNum}}</div>
-          <div v-else-if="scope.row.deviceId">{{scope.row.deviceId}}</div>
+          <div v-else-if="scope.row.phoneNum">{{scope.row.phoneNum}}</div>
           <div v-else></div>
         </template>
       </el-table-column>

backstage/dist/contentCategory/js/app.js

@@ -48,10 +48,10 @@
           ></el-switch>
         </el-form-item>
         <el-form-item :label="$t('regUser.phoneNum')" prop="phoneNum">
-          <el-input size="small" v-model.number="dialogState.formData.phoneNum"></el-input>
+          <el-input size="small" v-model="dialogState.formData.phoneNum"></el-input>
         </el-form-item>
         <el-form-item :label="$t('regUser.email')" prop="email">
-          <el-input size="small" v-model="dialogState.formData.email"></el-input>
+          <el-input :disabled="true" size="small" v-model="dialogState.formData.email"></el-input>
         </el-form-item>
         <el-form-item :label="$t('regUser.comments')" prop="comments">
           <el-input size="small" type="textarea" v-model="dialogState.formData.comments"></el-input>