guhongwei 4 gadi atpakaļ
vecāks
revīzija
da73ba7bb8

+ 1 - 1
src/layout/live/head.vue

@@ -16,7 +16,7 @@
                 type="text"
                 class="userCenter"
                 @click="stnmae"
-                v-if="user.role == '2' || user.role == '3' || user.role == '4' || user.role == '5' || user.role == '6' || user.role == '7' || user.role == '8'"
+                v-if="user.role == '3' || user.role == '4' || user.role == '5' || user.role == '6' || user.role == '7' || user.role == '8'"
               >
                 个人中心
               </button>

+ 14 - 14
src/layout/login/loginMain.vue

@@ -9,7 +9,7 @@
               <el-col :span="24">
                 <el-form ref="form" :model="form" label-width="120px">
                   <el-form-item label="房间号&手机号">
-                    <el-input v-model="form.phone" placeholder="请输入用户/手机号" :minlength="11" :maxlength="11"></el-input>
+                    <el-input v-model="form.room_phone" placeholder="请输入用户/手机号" :minlength="11" :maxlength="11"></el-input>
                   </el-form-item>
                   <el-form-item label="登录密码">
                     <el-input v-model="form.passwd" placeholder="请输入登录密码" show-password></el-input>
@@ -64,33 +64,33 @@
                   <el-form-item label="用户类别" prop="role">
                     <el-radio-group v-model="forms.role">
                       <el-radio label="7">临时用户</el-radio>
-                      <el-radio label="2">个人</el-radio>
-                      <el-radio label="3">机构管理员</el-radio>
+                      <el-radio label="4">个人</el-radio>
+                      <el-radio label="5">机构管理员</el-radio>
                       <el-radio label="6">专家</el-radio>
                     </el-radio-group>
                   </el-form-item>
-                  <el-form-item label="身份证号" prop="cardnumber" v-if="forms.role == '2' || forms.role == '3' || forms.role == '6'">
+                  <el-form-item label="身份证号" prop="cardnumber" v-if="forms.role == '4' || forms.role == '5' || forms.role == '6'">
                     <el-input v-model="forms.cardnumber" placeholder="请输入身份证号" :minlength="18" :maxlength="18"></el-input>
                   </el-form-item>
-                  <el-form-item label="邮箱" prop="email" v-if="forms.role == '2' || forms.role == '3' || forms.role == '6'">
+                  <el-form-item label="邮箱" prop="email" v-if="forms.role == '4' || forms.role == '5' || forms.role == '6'">
                     <el-input v-model="forms.email" placeholder="请输入邮箱"></el-input>
                   </el-form-item>
-                  <el-form-item label="地址" prop="addr" v-if="forms.role == '2' || forms.role == '3' || forms.role == '6'">
+                  <el-form-item label="地址" prop="addr" v-if="forms.role == '4' || forms.role == '5' || forms.role == '6'">
                     <el-input v-model="forms.addr" placeholder="请输入地址"></el-input>
                   </el-form-item>
-                  <el-form-item label="头像图片" prop="img_path" v-if="forms.role == '2' || forms.role == '3' || forms.role == '6'">
+                  <el-form-item label="头像图片" prop="img_path" v-if="forms.role == '4' || forms.role == '5' || forms.role == '6'">
                     <upload :limit="1" :data="forms.img_path" type="img_path" :url="'/files/imgpath/upload'" @upload="uploadSuccess"></upload>
                   </el-form-item>
-                  <el-form-item label="身份证正面" v-if="forms.role == '2' || forms.role == '3'" prop="cardfile_a">
+                  <el-form-item label="身份证正面" v-if="forms.role == '4' || forms.role == '5'" prop="cardfile_a">
                     <upload :limit="1" :data="forms.cardfile_a" type="cardfile_a" :url="'/files/cardfilea/upload'" @upload="uploadSuccess"></upload>
                   </el-form-item>
-                  <el-form-item label="身份证背面" v-if="forms.role == '2' || forms.role == '3'" prop="cardfile_b">
+                  <el-form-item label="身份证背面" v-if="forms.role == '4' || forms.role == '5'" prop="cardfile_b">
                     <upload :limit="1" :data="forms.cardfile_b" type="cardfile_b" :url="'/files/cardfileb/upload'" @upload="uploadSuccess"></upload>
                   </el-form-item>
-                  <el-form-item label="组织机构图片" v-if="forms.role == '3'" prop="img_qy">
+                  <el-form-item label="组织机构图片" v-if="forms.role == '5'" prop="img_qy">
                     <upload :limit="1" :data="forms.img_qy" type="img_qy" :url="'/files/imgqy/upload'" @upload="uploadSuccess"></upload>
                   </el-form-item>
-                  <template v-if="forms.role == '3'">
+                  <template v-if="forms.role == '5'">
                     <el-form-item label="机构类型" prop="institution_type">
                       <el-input v-model="forms.institution_type" placeholder="请输入机构类型"></el-input>
                     </el-form-item>
@@ -104,10 +104,10 @@
                       <el-input v-model="forms.institution_nature" placeholder="请输入机构性质"></el-input>
                     </el-form-item>
                   </template>
-                  <el-form-item label="办公电话" v-if="forms.role == '2' || forms.role == '3'" prop="office_phone">
+                  <el-form-item label="办公电话" v-if="forms.role == '4' || forms.role == '5'" prop="office_phone">
                     <el-input v-model="forms.office_phone" placeholder="请输入办公电话"></el-input>
                   </el-form-item>
-                  <el-form-item label="所属行业" v-if="forms.role == '2' || forms.role == '3'" prop="profession">
+                  <el-form-item label="所属行业" v-if="forms.role == '4' || forms.role == '5'" prop="profession">
                     <el-input v-model="forms.profession" placeholder="请输入所属行业"></el-input>
                   </el-form-item>
                   <el-form-item label="性别" v-if="forms.role == '6'" prop="gender">
@@ -146,7 +146,7 @@
                   <el-form-item label="从事专业" v-if="forms.role == '6'" prop="professional">
                     <el-input v-model="forms.professional" placeholder="请输入从事专业"></el-input>
                   </el-form-item>
-                  <el-form-item label="个人简历" v-if="forms.role == '2' || forms.role == '6'" prop="resume">
+                  <el-form-item label="个人简历" v-if="forms.role == '4' || forms.role == '6'" prop="resume">
                     <el-input type="textarea" v-model="forms.resume" placeholder="请输入个人简介"></el-input>
                   </el-form-item>
                   <el-form-item label="项目" v-if="forms.role == '6'" prop="project">

+ 1 - 1
src/views/newlogin.vue

@@ -56,7 +56,7 @@ export default {
     },
     // 注册
     async submitRegisters({ data }) {
-      if (data.role == '24' || data.role == '5') {
+      if (data.role == '2' || data.role == '5') {
         let res = await this.userCreate(data);
         let msg = `注册成功,等待管理员审核,方可登录`;
         this.$checkRes(res, msg);

+ 16 - 16
src/views/userCenter/basicInfo/index.vue

@@ -21,33 +21,33 @@
             <el-form-item label="用户类别" prop="role">
               <el-radio-group v-model="form.role">
                 <el-radio label="7" disabled>临时用户</el-radio>
-                <el-radio label="2">个人</el-radio>
-                <el-radio label="3">机构用户</el-radio>
+                <el-radio label="4">个人</el-radio>
+                <el-radio label="5">机构用户</el-radio>
                 <el-radio label="6">专家</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item label="身份证号" prop="cardnumber" v-if="form.role == '2' || form.role == '3' || form.role == '6'">
+            <el-form-item label="身份证号" prop="cardnumber" v-if="form.role == '4' || form.role == '5' || form.role == '6'">
               <el-input v-model="form.cardnumber" placeholder="请输入身份证号" :minlength="18" :maxlength="18"></el-input>
             </el-form-item>
-            <el-form-item label="邮箱" prop="email" v-if="form.role == '2' || form.role == '3' || form.role == '6'">
+            <el-form-item label="邮箱" prop="email" v-if="form.role == '4' || form.role == '5' || form.role == '6'">
               <el-input v-model="form.email" placeholder="请输入邮箱"></el-input>
             </el-form-item>
-            <el-form-item label="地址" prop="addr" v-if="form.role == '2' || form.role == '3' || form.role == '6'">
+            <el-form-item label="地址" prop="addr" v-if="form.role == '4' || form.role == '5' || form.role == '6'">
               <el-input v-model="form.addr" placeholder="请输入地址"></el-input>
             </el-form-item>
-            <el-form-item label="头像图片" prop="img_path" v-if="form.role == '2' || form.role == '3' || form.role == '6'">
+            <el-form-item label="头像图片" prop="img_path" v-if="form.role == '4' || form.role == '5' || form.role == '6'">
               <upload :limit="1" :data="form.img_path" type="img_path" :url="'/files/imgpath/upload'" @upload="uploadSuccess"></upload>
             </el-form-item>
-            <el-form-item label="身份证正面" v-if="form.role == '2' || form.role == '3'" prop="cardfile_a">
+            <el-form-item label="身份证正面" v-if="form.role == '4' || form.role == '5'" prop="cardfile_a">
               <upload :limit="1" :data="form.cardfile_a" type="cardfile_a" :url="'/files/cardfilea/upload'" @upload="uploadSuccess"></upload>
             </el-form-item>
-            <el-form-item label="身份证背面" v-if="form.role == '2' || form.role == '3'" prop="cardfile_b">
+            <el-form-item label="身份证背面" v-if="form.role == '4' || form.role == '5'" prop="cardfile_b">
               <upload :limit="1" :data="form.cardfile_b" type="cardfile_b" :url="'/files/cardfileb/upload'" @upload="uploadSuccess"></upload>
             </el-form-item>
-            <el-form-item label="组织机构图片" v-if="form.role == '3'" prop="img_qy">
+            <el-form-item label="组织机构图片" v-if="form.role == '5'" prop="img_qy">
               <upload :limit="1" :data="form.img_qy" type="img_qy" :url="'/files/imgqy/upload'" @upload="uploadSuccess"></upload>
             </el-form-item>
-            <template v-if="form.role == '3'">
+            <template v-if="form.role == '5'">
               <el-form-item label="机构类型" prop="institution_type">
                 <el-input v-model="form.institution_type" placeholder="请输入机构类型"></el-input>
               </el-form-item>
@@ -61,10 +61,10 @@
                 <el-input v-model="form.institution_nature" placeholder="请输入机构性质"></el-input>
               </el-form-item>
             </template>
-            <el-form-item label="办公电话" v-if="form.role == '2' || form.role == '3'" prop="office_phone">
+            <el-form-item label="办公电话" v-if="form.role == '4' || form.role == '5'" prop="office_phone">
               <el-input v-model="form.office_phone" placeholder="请输入办公电话"></el-input>
             </el-form-item>
-            <el-form-item label="所属行业" v-if="form.role == '2' || form.role == '3'" prop="profession">
+            <el-form-item label="所属行业" v-if="form.role == '4' || form.role == '5'" prop="profession">
               <el-input v-model="form.profession" placeholder="请输入所属行业"></el-input>
             </el-form-item>
             <el-form-item label="性别" v-if="form.role == '6'" prop="gender">
@@ -103,7 +103,7 @@
             <el-form-item label="从事专业" v-if="form.role == '6'" prop="professional">
               <el-input v-model="form.professional" placeholder="请输入从事专业"></el-input>
             </el-form-item>
-            <el-form-item label="个人简历" v-if="form.role == '2' || form.role == '6'" prop="resume">
+            <el-form-item label="个人简历" v-if="form.role == '4' || form.role == '6'" prop="resume">
               <el-input type="textarea" v-model="form.resume" placeholder="请输入个人简介"></el-input>
             </el-form-item>
             <el-form-item label="项目" v-if="form.role == '6'" prop="project">
@@ -128,7 +128,7 @@
             </el-form-item>
             <el-form-item>
               <el-button type="primary" @click="authSubmit" v-if="form.status == '0' || form.status == '3'">提交认证</el-button>
-              <el-button type="primary" @click="upgradeSubmit" v-if="user.role == '2'">升级用户</el-button>
+              <el-button type="primary" @click="upgradeSubmit" v-if="user.role == '4'">升级用户</el-button>
               <el-button type="primary" @click="onSubmit">提交修改</el-button>
             </el-form-item>
           </el-form>
@@ -235,7 +235,7 @@ export default {
     ...market(['fetch', 'update']),
     ...expertsuser({ expertsuserFetch: 'fetch', expertsuserUpdate: 'update', expertsuserUpgrade: 'upgrade' }),
     async searchInfo() {
-      if (this.user.role == '2' || this.user.role == '3' || this.user.role == '7') {
+      if (this.user.role == '4' || this.user.role == '5' || this.user.role == '7') {
         let res = await this.fetch(this.user.userid);
         if (res.errcode === 0) {
           this.$set(this, `form`, res.data);
@@ -248,7 +248,7 @@ export default {
       }
     },
     async onSubmit() {
-      if (this.form.role == '2' || this.form.role == '3' || this.form.role == '7') {
+      if (this.form.role == '4' || this.form.role == '5' || this.form.role == '7') {
         let res;
         let msg;
         res = await this.update(this.form);