更新

src/layout/duijiehui/duijiedetail.vue

@@ -12,11 +12,6 @@
             <el-form-item label="对接会标题">
               <el-input v-model="form.title"></el-input>
             </el-form-item>
-            <el-form-item label="直播房间">
-              <el-select v-model="form.roomname" placeholder="请选择">
-                <el-option v-for="item in roomidList" :key="item.name" :label="item.name" :value="item.name"> </el-option>
-              </el-select>
-            </el-form-item>
             <el-form-item label="开始时间">
               <el-date-picker v-model="form.start_time" type="datetime" placeholder="请选择开始时间" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm">
               </el-date-picker>
@@ -45,17 +40,14 @@
                 <el-option v-for="item in options" :key="item.code" :label="item.name" :value="item.code"> </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="简介">
-              <el-input type="textarea" v-model="form.desc"></el-input>
-            </el-form-item>
             <el-form-item label="负责人">
               <el-input v-model="form.adminuser" placeholder="请输入用户名"></el-input>
             </el-form-item>
             <el-form-item label="负责人手机号">
               <el-input v-model="form.phone" maxlength="11" placeholder="请输入手机号"> </el-input>
             </el-form-item>
-            <el-form-item label="密码">
-              <el-input v-model="form.passwd" placeholder="请输入密码" show-password></el-input>
+            <el-form-item label="简介">
+              <el-input type="textarea" v-model="form.desc"></el-input>
             </el-form-item>
             <el-form-item label="对接会视频">
               <upload :limit="1" :data="form.file_path" type="file_path" listType="" :url="'/files/imgpath/upload'" @upload="uploadSuccess"></upload>
@@ -73,7 +65,6 @@
 <script>
 import upload from '@/components/upload.vue';
 import { createNamespacedHelpers, mapState } from 'vuex';
-const { mapActions: room } = createNamespacedHelpers('room');
 export default {
   name: 'columnDetail',
   props: {
@@ -84,19 +75,10 @@ export default {
   components: {
     upload,
   },
-  data: () => ({
-    roomidList: [],
-  }),
-  created() {
-    this.searchInfo();
-  },
+  data: () => ({}),
+  created() {},
   computed: {},
   methods: {
-    ...room(['query']),
-    async searchInfo() {
-      const res = await this.query();
-      this.$set(this, `roomidList`, res.data);
-    },
     onSubmit() {
       this.$emit('submitDate', { data: this.form, id: this.form.id });
     },
@@ -107,7 +89,6 @@ export default {
       this.$emit('placesubmit', { value });
     },
     uploadSuccess({ type, data }) {
-      console.log(type, data);
       this.$set(this.form, `${type}`, data.uri);
     },
   },

src/layout/layout-part/newmenu.vue

@@ -67,7 +67,7 @@ export default {
     ...mapActions(['toGetMenu', 'logout']),
     async search() {
       if (!this.user.uid) return;
-      if (this.user.role == '1') {
+      if (this.user.role == '0') {
         this.menu.push(
           index,
           menu,

src/layout/user/vipForm.vue

@@ -24,11 +24,6 @@
           <el-form-item label="头像图片" prop="img_path">
             <upload :limit="1" :data="form.img_path" type="img_path" :url="'/files/imgpath/upload'" @upload="uploadSuccess"></upload>
           </el-form-item>
-          <!-- <el-form-item label="用户类别" prop="role">
-            <el-radio-group v-model="form.role">
-              <el-radio label="8">vip用户</el-radio>
-            </el-radio-group>
-          </el-form-item> -->
           <el-form-item label="简介" v-if="form.role == '6'" prop="resume">
             <el-input v-model="form.remark" placeholder="请输入备注"></el-input>
           </el-form-item>
@@ -105,10 +100,7 @@ export default {
       if (this.isNew) {
         data.status = '1';
         data.code = this.user.code;
-        data.status = '1';
-        data.role = '8';
-        console.log(data);
-
+        data.role = '2';
         res = await this.create(data);
         msg = '用户创建成功';
       } else {

src/main.js

@@ -3,7 +3,7 @@ import App from './App.vue';
 import router from './router';
 import store from './store';
 import '@/plugins/element.js';
-import '@/plugins/vant';
+// import '@/plugins/vant';
 import '@/plugins/axios';
 import '@/plugins/check-res';
 import '@/plugins/meta';

src/views/adminUser/detail.vue

@@ -54,7 +54,7 @@ export default {
       let msg;
       if (this.isNew) {
         data.pid = this.user.uid;
-        data.role = '4';
+        data.role = '1';
         res = await this.create(data);
         msg = '创建成功';
       } else {

src/views/adminUser/index.vue

@@ -21,6 +21,8 @@ import topInfo from '@/layout/public/top.vue';
 import dataTable from '@/components/data-table.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: users } = createNamespacedHelpers('users');
+const { mapActions: authUser } = createNamespacedHelpers('authUser');
+
 export default {
   name: 'index',
   props: {},
@@ -58,6 +60,7 @@ export default {
   },
   methods: {
     ...users(['query', 'fetch', 'create', 'update', 'delete']),
+    ...authUser({ authUserDelete: 'delete' }),
     async search({ skip = 0, limit = 10, ...info } = {}) {
       const res = await this.query({ skip, limit, pid: this.user.uid, ...info });
       if (this.$checkRes(res)) {
@@ -70,7 +73,8 @@ export default {
     },
     async toDelete({ data }) {
       const res = await this.delete(data.id);
-      if (this.$checkRes(res, '删除成功', res.errmsg || '删除失败')) this.search();
+      const arr = await this.authUserDelete(data.id);
+      if (this.$checkRes(arr, '删除成功', res.errmsg || '删除失败')) this.search();
     },
   },
   computed: {

src/views/duijiehui/detail.vue

@@ -78,19 +78,18 @@ export default {
       } else {
         data.user_id = this.user.uid;
         data.is_allowed = '1';
-        const authUserList = await this.authUserQuery();
-        let r = authUserList.data.some(f => f.phone == data.phone);
-        if (r) {
-          this.$message({
-            message: '手机号已经被注册，请重新输入',
-            type: 'warning',
-          });
-        } else {
-          let res = await this.livecreate(data);
-          this.$checkRes(res, '添加成功', '添加失败');
-        }
+        console.log(data);
+        this.$alert(`${data.user_id}`, '成功', {
+          dangerouslyUseHTMLString: true,
+          type: 'success',
+          center: true,
+        });
+        // let res = await this.livecreate(data);
+        // if (this.$checkRes(res)) {
+        //   this.$checkRes(res, '添加成功', '添加失败');
+        // }
       }
-      this.$router.push({ path: '/duijiehui/index' });
+      // this.$router.push({ path: '/duijiehui/index' });
     },
   },
 };

src/views/permission/index.vue

@@ -54,7 +54,7 @@ export default {
       drawerIsNew: true,
       opera: [
         {
-          label: '编辑',
+          label: '分配权限',
           icon: 'el-icon-edit',
           method: 'edit',
         },
@@ -88,7 +88,7 @@ export default {
     ...role({ getRoleList: 'query' }),
     ...loginMenu(['toGetMenu']),
     async search({ skip = 0, limit = 10, ...info } = {}) {
-      const res = await this.query({ skip, limit, role: '4', pid: this.user.uid, ...info });
+      const res = await this.query({ skip, limit, role: '1', pid: this.user.uid, ...info });
       if (this.$checkRes(res)) {
         this.$set(this, `list`, res.data);
         this.$set(this, `total`, res.total);
@@ -129,13 +129,11 @@ export default {
       this.drawerIsNew = true;
     },
     async getOtherList() {
-      if (this.user.role == '1') {
+      if (this.user.role == '0') {
         const res = await this.getRoleList({ id: this.user.uid });
-        console.log(res);
         if (this.$checkRes(res)) this.$set(this, `menuList`, res.data.reverse());
-      } else if (this.user.role == '4') {
+      } else if (this.user.role == '1') {
         const res = await this.toGetMenu({ id: this.user.uid });
-        console.log(res);
         if (this.$checkRes(res)) this.$set(this, `menuList`, res.data.menus.reverse());
       }
     },

src/views/user/index.vue

@@ -20,6 +20,7 @@ import topInfo from '@/layout/public/top.vue';
 import dataTable from '@/components/data-table.vue';
 import { mapActions, mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: users } = createNamespacedHelpers('users');
+const { mapActions: authUser } = createNamespacedHelpers('authUser');
 const { mapActions: exportuser } = createNamespacedHelpers('exportuser');
 export default {
   name: 'index',
@@ -57,11 +58,11 @@ export default {
   methods: {
     ...users(['query', 'delete', 'update', 'userquery']),
     ...exportuser({ exportuserQuery: 'query' }),
+    ...authUser({ authUserDelete: 'delete' }),
     async search({ skip = 0, limit = 10, pid = '', ...info } = {}) {
       if (this.user.code.length == 3) {
         const res = await this.userquery({ skip, limit, pid, ...info });
         if (this.$checkRes(res)) {
-          console.log(res);
           this.$set(this, `list`, res.data);
           this.$set(this, `total`, res.total);
         }
@@ -78,7 +79,8 @@ export default {
     },
     async toDelete({ data }) {
       const res = await this.delete(data.id);
-      if (this.$checkRes(res, '删除成功', res.errmsg || '删除失败')) this.search();
+      const arr = await this.authUserDelete(data.id);
+      if (this.$checkRes(arr, '删除成功', res.errmsg || '删除失败')) this.search();
     },
   },
   computed: {

src/views/vip/index.vue

@@ -20,7 +20,6 @@ import topInfo from '@/layout/public/top.vue';
 import dataTable from '@/components/data-table.vue';
 import { mapActions, mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: users } = createNamespacedHelpers('users');
-// const { mapActions: exportuser } = createNamespacedHelpers('exportuser');
 export default {
   name: 'index',
   props: {},
@@ -45,8 +44,7 @@ export default {
     fields: [
       { label: '姓名', prop: 'name', filter: 'input' },
       { label: '电话', prop: 'phone', filter: 'input' },
-      { label: '用戶类型', prop: 'role', format: i => (i == '2' ? '个人用户' : i == '3' ? '企业用户' : i == '6' ? '专家' : i == 8 ? 'vip用户' : '临时用户') },
-
+      { label: '用戶类型', prop: 'role', format: i => (i == '2' ? 'vip用户' : '无法识别') },
       { label: '状态', prop: 'status', format: i => (i == '1' ? '审核通过' : '') },
     ],
     list: [],
@@ -60,9 +58,8 @@ export default {
 
     async search({ skip = 0, limit = 10, ...info } = {}) {
       if (this.user.code.length == 3) {
-        const res = await this.query({ skip, limit, role: '8', ...info });
+        const res = await this.query({ skip, limit, role: '2', ...info });
         if (this.$checkRes(res)) {
-          console.log(res);
           this.$set(this, `list`, res.data);
           this.$set(this, `total`, res.total);
         }