修改

.env.dev

@@ -5,7 +5,7 @@ ENV = 'development'
 VUE_APP_TITLE = 爱思系统
 
 # 爱思系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.100.249:48080'
+VUE_APP_BASE_API = 'http://192.168.100.213:48080'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/api/system/tenant.js

@@ -19,6 +19,23 @@ export function createTenant(data) {
     data: data
   })
 }
+// 加入租户
+export function joinTenant(data) {
+  return request({
+    url: '/system/tenant/join',
+    method: 'post',
+    data: data
+  })
+}
+
+// 切换租户
+export function changeTenant(data) {
+  return request({
+    url: '/system/tenant/change',
+    method: 'put',
+    data: data
+  })
+}
 
 // 更新租户
 export function updateTenant(data) {

src/views/index.vue

@@ -199,8 +199,8 @@
           <el-form-item label="企业/团队名称" prop="name" v-if="corpTitle == '创建'">
             <el-input v-model="form.name" placeholder='请输入你的企业/团队名称'></el-input>
           </el-form-item>
-          <el-form-item label="邀请链接" prop="url" v-if="corpTitle == '加入'">
-            <el-input v-model="form.url" placeholder='请输入你的邀请链接'></el-input>
+          <el-form-item label="邀请码" prop="tenantId" v-if="corpTitle == '加入'">
+            <el-input v-model="form.tenantId" placeholder='请输入你的邀请码'></el-input>
           </el-form-item>
           <el-button size="small" type="primary" style="text-align: center;width: 100%;margin-top: 10px;"
             @click="submitForm('ruleForm')">
@@ -236,6 +236,7 @@
 
 <script>
 import { getUnreadNotifyMessageList } from "@/api/system/notify/message";
+import { createTenant, joinTenant,changeTenant } from "@/api/system/tenant";
 import router from '@/router'
 import store from '@/store'
 import Homebar from '@/layout/components/Homebar'
@@ -282,17 +283,17 @@ export default {
       hasCorp:true,
       corpTitle: '',
       form: {
-        type: 1,
+        type:1,
         name: '',
-        url: '',
+        tenantId: '',
       },
       rules: {
         name: [
           { required: true, message: '请输入你的企业/团队名称', trigger: 'blur' },
           // { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
         ],
-        url: [
-          { required: true, message: '请输入你的邀请链接', trigger: 'blur' },
+        tenantId: [
+          { required: true, message: '请输入你的邀请码', trigger: 'blur' },
         ],
       },
       // 遮罩层
@@ -340,6 +341,9 @@ export default {
     //切换企业
     changeTeam(val){
       console.log(val);
+      changeTenant({tenantId:val.id}).then(response => {
+              this.$modal.msgSuccess("切换成功");
+            });
     },
      // 菜单选择事件
      handleSelect(item) {
@@ -418,7 +422,18 @@ export default {
     submitForm(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          alert('submit!');
+          console.log(this.form);
+          if(this.corpTitle=='创建'){
+            createTenant({status:0,name:this.form.name}).then(response => {
+              this.$modal.msgSuccess("创建成功");
+            });
+          }
+          else{
+            joinTenant({tenantId:this.form.tenantId}).then(response => {
+              this.$modal.msgSuccess("加入成功");
+            });
+          }
+          
         } else {
           console.log('error submit!!');
           return false;

src/views/system/companyInfo/index.vue

@@ -42,10 +42,10 @@
                   <div class="info-item">
                     <span class="item-name">CorpID</span>
                     <span class="item-value">
-                      <span>667936e871255a463e3e9186</span>
-                      <i class="el-icon-document-copy" style="cursor: pointer;
+                      <span>{{ codeStr }}</span>
+                      <i class="el-icon-document-copy copy-btn" style="cursor: pointer;
     font-size: 16px;
-    margin-left: 16px;" @click="copy()"></i>
+    margin-left: 16px;"></i>
                     </span>
                   </div>
                 </div>
@@ -61,12 +61,14 @@
 
 <script>
 import { getAreaByIp, getAreaTree } from "@/api/system/area";
-
+import { updateTenant } from "@/api/system/tenant";
+import ClipboardJS from 'clipboard'
 export default {
   components: {
   },
   data() {
     return {
+      codeStr:'667936e871255a463e3e9186',
       showComp: false,
       companyName: 'sunny',
       newCompanyName: '',
@@ -96,21 +98,31 @@ export default {
   created() {
     this.getList();
   },
-  methods: {
-    copy(){
-        document.execCommand("Copy"); // 执行浏览器复制命令
+  mounted() {
+    const clipboard = new ClipboardJS('.copy-btn', {
+      text: trigger => {
         this.$message({
           message: '复制成功',
           type: 'success'
         });
-      },
+        return this.codeStr;
+      }
+    })
+    clipboard.on('error', e => {
+      this.$message.error('复制失败')
+    })
+  },
+  methods: {
     editComp() {
       this.showComp = true;
       this.newCompanyName = this.companyName;
     },
     saveComp() {
-      this.showComp = false;
-      this.companyName = this.newCompanyName;
+      updateTenant({name:this.newCompanyName}).then(response => {
+        this.showComp = false;
+        this.companyName = this.newCompanyName;
+        this.$modal.msgSuccess("修改成功");
+      });
     },
     /** 查询列表 */
     getList() {