Merge branch 'master' of http://git.cc-lotus.info/service-platform/web-test into master

src/layout/login/webLogin.vue

@@ -9,7 +9,13 @@
               <el-col :span="24">
                 <el-form ref="form" :model="form" label-width="120px">
                   <el-form-item label="用户名" prop="phone">
-                    <el-input type="phone" v-model="form.phone" autocomplete="off" placeholder="请输入手机号/统一社会信用代码"></el-input>
+                    <el-tooltip class="item" effect="light" placement="right" :value="true" :manual="true">
+                      <template slot="content">
+                        <p style="font-weight:bold;">个人账号用户名为<span style="color:#ff0000;">手机号</span></p>
+                        <p style="font-weight:bold;">机构用户名为<span style="color:#ff0000;">统一社会信用代码</span></p>
+                      </template>
+                      <el-input type="phone" v-model="form.phone" autocomplete="off" placeholder="请输入手机号/统一社会信用代码"></el-input>
+                    </el-tooltip>
                   </el-form-item>
                   <el-form-item label="登录密码">
                     <el-input v-model="form.passwd" placeholder="请输入登录密码" show-password></el-input>

src/views/superAdminCenter/adminUser/index.vue

@@ -59,8 +59,7 @@ export default {
       total: 0,
 
       formFields: [
-        // { label: '机构代码或邀请码', model: 'code' },
-        // { label: '机构代码或邀请码', model: 'code', options: { disabled: true } },
+        { label: '机构代码或邀请码', model: 'code' },
         { label: '所属管理员', model: 'pid', type: 'select' },
         { label: '姓名', model: 'name' },
         { label: '机构名称', model: 'deptname' },
@@ -89,11 +88,9 @@ export default {
     },
     // 添加
     toAdd() {
-      this.formFields.push({ label: '机构代码或邀请码', model: 'code' });
       this.dialog = true;
     },
     toEdit({ data }) {
-      this.formFields.push({ label: '机构代码或邀请码', model: 'code', options: { disabled: true } });
       this.$set(this, 'form', data);
       this.dialog = true;
       this.dialogIsNew = false;