修改邀请加入页面样式

frontend/saas-portal-web/src/components/conenter/addenterprise.vue

@@ -263,7 +263,7 @@ import { setTimeout, clearTimeout } from 'timers';
                                 this.companyId = null;
                                 this.isgsname = true;//公司是否存在
                             } else if (res.data.success == false && res.data.message == '公司不存在') {
-                                this.$refs.warningqyname.innerHTML = '<img style="width:14px" src="/static/img/warning.png" alt=""> 该企业不存在';
+                                this.$refs.warningqyname.innerHTML = '<img style="width:14px" src="/static/img/warning.png" alt=""> 企业或管理员不存在';
                                 this.islookup = false;
                                 this.isgsname = false;//公司是否存在 
                             } else {
@@ -348,42 +348,40 @@ import { setTimeout, clearTimeout } from 'timers';
                 if (qyname == '') {
                     this.$message.error('企业或管理员不能为空');
                 } else if(!this.isgsname) {
-                    this.$message.error('该企业不存在');
+                    this.$message.error('企业或管理员不存在');
+                } else if (!this.companyId) {
+                    this.$message.error('请选择要加入的企业');
+                } else if (this.admin == this.mytoken.account.realname) {
+                    this.$message.error('账号已在企业服务中，不能重复加入');
                 } else if (!this.isTestingname) {
                     this.$message.error('姓名不能为空');
                 } else if (!this.isregname) {
                     this.$message.error('姓名不能包含符号、数字等非法字符');
-                } else if (this.companyId){
-                    if (this.admin == this.mytoken.account.realname) {
-                        this.$message.error('账号已在企业服务中，不能重复加入');
-                    } else {
-                        this.$ajax({
-                            url: this.$url.api+'/api/account/accountCenter/company/join',
-                            method:'POST',
-                            data:{
-                                username:username,
-                                accountId:this.mytoken.account.id,
-                                companyId:this.companyId,
-                            },
-                            headers:{
-                                "Authorization":token,
-                            }
-                        })
-                        .then(res=>{
-                            if (res.data.success) {
-                                this.$message.success('提交成功，待管理员批准加入');
-                                // this.$store.state.ishongdian = true;//显示红点
-                                setTimeout(()=>{
-                                    this.$router.push({name:'company'});
-                                    document.documentElement.scrollTop = 0;
-                                },3000)
-                            } else {
-                                this.$message.error(res.data.message);
-                            }
-                        })
-                    }
                 } else {
-                    this.$message.error('请选择要加入的企业');
+                    this.$ajax({
+                        url: this.$url.api+'/api/account/accountCenter/company/join',
+                        method:'POST',
+                        data:{
+                            username:username,
+                            accountId:this.mytoken.account.id,
+                            companyId:this.companyId,
+                        },
+                        headers:{
+                            "Authorization":token,
+                        }
+                    })
+                    .then(res=>{
+                        if (res.data.success) {
+                            this.$message.success('提交成功，待管理员批准加入');
+                            // this.$store.state.ishongdian = true;//显示红点
+                            setTimeout(()=>{
+                                this.$router.push({name:'company'});
+                                document.documentElement.scrollTop = 0;
+                            },3000)
+                        } else {
+                            this.$message.error(res.data.message);
+                        }
+                    })
                 }
             },
             //验证公司详细地址

frontend/saas-portal-web/src/components/conenter/invitation.vue

@@ -1,5 +1,22 @@
 <template>
     <div class="invitation">
+        <div class="zhezhao" v-if="istanchaung"></div>
+        <div class="Popup" v-if="istanchaung">
+        <!-- <div class="Popup"> -->
+            <div class="shang">
+                <img src="/static/img/caidian2x.png" alt="">
+                <img src="/static/img/tijiao2x.png" alt="">
+                <img class="xs" @click="hidden" src="/static/img/assets/chahao.png" alt="">
+            </div>
+            <div class="zhong">
+                <p>欢迎你加入U企云服，立即畅享轻松工作！</p>
+                <p>新用户登录密码随后将发送短信通知请注意查收</p>
+            </div>
+            <div class="xia">
+                <button @click="gohome">立即访问</button>
+            </div>
+        </div>
+
         <img src="/static/img/beijing.png" alt="">
         <div class="centent">
             <img src="/static/img/assets/logo@2x.png" alt="">
@@ -8,18 +25,18 @@
                 <p>{{enterprise.username}}</p>
                 <p>
                     <span class="inv-text">邀请您加入</span>
-                    <span>{{enterprise.companyName}}</span>
-                    <span class="inv-text">SAAS服务</span>
+                    <span class="inv-text">{{enterprise.companyName}}</span>
+                    <!-- <span class="inv-text">SAAS服务</span> -->
                 </p>
             </div>
-            <input type="text" ref="phone" @blur="phone" placeholder="请输入手机号">
+            <input class="padding-left" type="text" ref="phone" @blur="phone" placeholder="请输入手机号">
             <div class="Verification">
-                <input type="text" ref="Verification" @change="validCode" placeholder="请输入验证码">
+                <input class="padding-left" type="text" ref="Verification" @change="validCode" placeholder="请输入验证码">
                 <span v-if="isobtaincode" class="xs" @click="Obtaincode">获取验证码</span>
                 <span v-if="!isobtaincode" ref="obtaincode">{{time}}</span>
             </div>
-            <input type="text" ref="name" @blur="name" placeholder="请输入姓名">
-            <select class="role" ref="role" @blur="roles">
+            <input class="padding-left" type="text" ref="name" @blur="name" placeholder="请输入姓名">
+            <select class="role padding-left" ref="role" @blur="roles">
                 <option value="" disabled selected hidden>岗位角色</option>
                 <option v-for="(d,i) in arr" :key="i" :value=d.id>{{d.name}}</option>
             </select>
@@ -27,7 +44,7 @@
         </div>
         <div class="bottom">
             <p>U企云服|电子行业企业管理云端解决方案</p>
-            <p>版权所有：深圳市优软科技有限公司 Copyright @ 2017 All Rights Reserved</p>
+            <p>深圳市优软科技有限公司</p>
         </div>
     </div>
 </template>
@@ -51,6 +68,7 @@ import { setTimeout } from 'timers';
                 arr:[],
                 roleId:'',
                 times:'',
+                istanchaung:false,
             }
         },
         created(){
@@ -58,7 +76,7 @@ import { setTimeout } from 'timers';
             this.param();//获取页面参数
         },
         mounted(){
-            
+            this.$store.state.isinvitation = false;
         },
         destroyed(){
             this.$store.state.isinvitation = true
@@ -178,16 +196,17 @@ import { setTimeout } from 'timers';
                     })
                     .then(res=>{
                         if (res.data.success) {
-                            this.$message.success('提交成功，3秒后自动跳转...');
-                            setTimeout(()=>{
-                                this.$router.push({path: '/home'});
-                            },3000)
+                            this.istanchaung = true;
                         } else {
                             this.$message.error(res.data.message);
                         }
                     })
                 }
             },
+            // 跳转首页
+            gohome(){
+                this.$router.push({path: '/home'});
+            },
             //倒计时
             settime(){
                 this.times = setTimeout(()=>{
@@ -241,6 +260,10 @@ import { setTimeout } from 'timers';
                     }
                 })
             },
+            //关闭弹窗
+            hidden(){
+                this.istanchaung = false;
+            },
         }
     }
 </script>
@@ -263,16 +286,19 @@ import { setTimeout } from 'timers';
     color: #FFFFFF;
     letter-spacing: 3.25px;
 }
-
+.padding-left {
+    padding-left: 15px; 
+}
 .centent > input {
     width: 100%;
-    margin-bottom: 16px;
-    opacity: 0.95;
+    margin-bottom: 11px;
+    opacity: 0.87;
     background: #FFFFFF;
     box-shadow: 0 2px 4px 0 #3C8EFF;
     font-size: 15px;
-    padding: 3px 0px 3px 5px;
     border: 0;
+    height: 40px;
+    border-radius: 4px;
 }
 .inv-title {
     text-align: left;
@@ -285,6 +311,7 @@ import { setTimeout } from 'timers';
     color: #FFFFFF;
     letter-spacing: 2.25px;
     text-shadow: 0 2px 4px #1B5099;
+    line-height: 30px;
 }
 .inv-title >p:nth-child(1) {
     margin-bottom: 16px;
@@ -296,30 +323,41 @@ import { setTimeout } from 'timers';
     background: #004CE0;
     width: 100%;
     border: 0;
-    height: 36px;
+    height: 40px;
+    border-radius: 4px;
+    color: #FFFFFF;
+    letter-spacing: 1.75px;
 }
 .role {
     width: 100%;
-    margin-bottom: 32px;
-    padding: 3px 0px;
+    margin-bottom: 39px;
+    opacity: 0.87;
+    background: #FFFFFF;
+    box-shadow: 0 2px 4px 0 #3C8EFF;
+    font-size: 15px;
+    border: 0;
+    height: 40px;
+    border-radius: 4px;
 }
 .Verification {
     border: 0;
-    opacity: 0.95;
+    opacity: 0.87;
     background: #FFFFFF;
     box-shadow: 0 2px 4px 0 #3C8EFF;
-    margin-bottom: 16px;
+    margin-bottom: 11px;
+    height: 40px;
+    line-height: 38px;
+    border-radius: 4px;
 }
 .Verification > input {
     width: 68%;
     border: 0;
     font-size: 15px;
-    padding: 3px 0px 3px 5px;
+    outline:none;
 }
 .Verification > span {
     width: 30%;
     display: inline-block;
-    border-left: 1px solid #2F86FE;
     font-family: PingFangSC-Regular;
     font-size: 12px;
     color: #2F86FE;
@@ -337,4 +375,68 @@ import { setTimeout } from 'timers';
     color: #666666;
     letter-spacing: 2px;
 }
+/* 弹窗 */
+.Popup {
+    width: 428px;
+    height: 235px;
+    background: #FFFFFF;
+    border-radius: 2px;
+    position: fixed;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    z-index: 10001;
+    text-align: center;
+    padding: 24px;
+}
+.shang {
+    height: 30%;
+    position: relative;
+}
+.shang > img {
+    position: absolute;
+}
+.shang > img:nth-child(1){
+    top: 15px;
+    left: 34%;
+    width: 124px;
+}
+.shang > img:nth-child(2){
+    top: 18px;
+    left: 38%;
+    width: 101px;
+}
+.shang > img:nth-child(3){
+    top: 0px;
+    right: 0px;
+}
+.zhong {
+    height: 50%;
+    line-height: 36px;
+}
+.zhong > p:nth-child(1) {
+    font-family: PingFangSC-Regular;
+    font-size: 14px;
+    color: #333333;
+    letter-spacing: 1.75px;
+}
+.zhong > p:nth-child(2) {
+    font-family: PingFangSC-Regular;
+    font-size: 12px;
+    color: #666666;
+    letter-spacing: 1.5px;
+}
+.xia {
+    height: 20%;
+}
+.xia > button {
+    background: #207CFF;
+    border-radius: 2px;
+    font-family: PingFangSC-Regular;
+    font-size: 14px;
+    color: #FFFFFF;
+    letter-spacing: 1.75px;
+    padding: 6px 16px;
+    border: 0;
+}
 </style>

frontend/saas-portal-web/static/css/main.css

@@ -101,7 +101,7 @@ main > section {
     height: 100%;
     width: 100%;
     background: #000;
-    opacity: 0.3;
+    opacity: 0.5;
     z-index: 10000;
 }
 /* 登录弹窗 */