修改邀请加入页面功能和样式

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

@@ -342,6 +342,7 @@ import { setTimeout, clearTimeout } from 'timers';
             },
             //加入企业提交按钮
             Submission(){
+                this.$store.state.isloading = true;
                 let token = this.mytoken.token;
                 let qyname = this.$refs.lookupqyname.value.replace(/\s+/g, "");//企业名字
                 let username = this.$refs.lookupname.value.replace(/\s+/g, "");//姓名过滤空格
@@ -371,6 +372,7 @@ import { setTimeout, clearTimeout } from 'timers';
                         }
                     })
                     .then(res=>{
+                        this.$store.state.isloading = false;
                         if (res.data.success) {
                             this.$message.success('提交成功，待管理员批准加入');
                             // this.$store.state.ishongdian = true;//显示红点

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

@@ -43,6 +43,7 @@ p {
     color: #344A69;
     letter-spacing: 0;
     top: 60%;
+    line-height: 40px;
 }
 .text2 {
     font-family: PingFangSC-Regular;

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

@@ -19,8 +19,10 @@
 
         <img src="/static/img/beijing.png" alt="">
         <div class="centent">
-            <img src="/static/img/assets/logo@2x.png" alt="">
-            <p class="inv-logo">U企云服</p>
+            <div>
+                <img style="width:80px" src="/static/img/assets/logo@2x.png" alt="">
+                <span class="inv-logo">U企云服</span>
+            </div>
             <div class="inv-title">
                 <p>{{enterprise.username}}</p>
                 <p>
@@ -36,7 +38,7 @@
                 <span v-if="!isobtaincode" ref="obtaincode">{{time}}</span>
             </div>
             <input class="padding-left" type="text" ref="name" @blur="name" placeholder="请输入姓名">
-            <select class="role padding-left" ref="role" @blur="roles">
+            <select style="background-color: white;" 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>
@@ -70,10 +72,13 @@ import { setTimeout } from 'timers';
                 times:'',
                 istanchaung:false,
             }
+        },
+        computed: {
+            
         },
         created(){
             this.$store.state.isinvitation = false;
-            this.param();//获取页面参数
+            this.browserRedirect();
         },
         mounted(){
             this.$store.state.isinvitation = false;
@@ -82,6 +87,25 @@ import { setTimeout } from 'timers';
             this.$store.state.isinvitation = true
         },
         methods:{
+            browserRedirect() {
+                let url1 = window.location.href;
+                let param = url1.substring(url1.lastIndexOf('=')+1, url1.length);
+                var sUserAgent = navigator.userAgent.toLowerCase();
+                var bIsIpad = sUserAgent.match(/ipad/i) == "ipad";
+                var bIsIphoneOs = sUserAgent.match(/iphone os/i) == "iphone os";
+                var bIsMidp = sUserAgent.match(/midp/i) == "midp";
+                var bIsUc7 = sUserAgent.match(/rv:1.2.3.4/i) == "rv:1.2.3.4";
+                var bIsUc = sUserAgent.match(/ucweb/i) == "ucweb";
+                var bIsAndroid = sUserAgent.match(/android/i) == "android";
+                var bIsCE = sUserAgent.match(/windows ce/i) == "windows ce";
+                var bIsWM = sUserAgent.match(/windows mobile/i) == "windows mobile";
+                if (bIsIpad || bIsIphoneOs || bIsMidp || bIsUc7 || bIsUc || bIsAndroid || bIsCE || bIsWM) {
+                    // 移动端访问跳转到移动端页面
+                    window.location.href = 'invitation_mobile_join.html?param='+param
+                } else {
+                    this.param();//获取pc端页面参数
+                }
+            },
             //验证手机
             phone(){
                 let phone = this.$refs.phone.value;//手机 
@@ -168,7 +192,9 @@ import { setTimeout } from 'timers';
                 let name = this.$refs.name.value;//姓名
                 let roleid = this.$refs.role.value;//角色
                 if (!this.isphone) {
-                    this.$message.error('手机号码不能为空');
+                    this.$message.error({
+                        message: '手机号码不能为空'
+                        });
                 } else if (!this.isregphone){
                     this.$message.error('请输入正确的手机号码');
                 } else if (!this.isname) {
@@ -255,7 +281,10 @@ import { setTimeout } from 'timers';
                             this.role()
                         },800)
                     } else {
-                        this.$message.error(res.data.message);
+                        this.$message.error({
+                            message:res.data.message,
+                            center : true
+                            });
                         this.$router.push({path:'/failure'})
                     }
                 })
@@ -273,7 +302,7 @@ import { setTimeout } from 'timers';
     width: 100%;
 }
 .centent {
-    width: 352px;
+    width: 27rem;
     position: absolute;
     top: 50%;
     left: 50%;
@@ -285,6 +314,9 @@ import { setTimeout } from 'timers';
     font-size: 26px;
     color: #FFFFFF;
     letter-spacing: 3.25px;
+    display: inline-block;
+    position: relative;
+    bottom: -20px;
 }
 .padding-left {
     padding-left: 15px; 
@@ -295,7 +327,7 @@ import { setTimeout } from 'timers';
     opacity: 0.87;
     background: #FFFFFF;
     box-shadow: 0 2px 4px 0 #3C8EFF;
-    font-size: 15px;
+    font-size: 14px;
     border: 0;
     height: 40px;
     border-radius: 4px;
@@ -303,7 +335,7 @@ import { setTimeout } from 'timers';
 .inv-title {
     text-align: left;
     margin-top: 37px;
-    margin-bottom: 40px;
+    margin-bottom: 20px;
 }
 .inv-title > p{
     font-family: PingFangSC-Medium;
@@ -314,7 +346,7 @@ import { setTimeout } from 'timers';
     line-height: 30px;
 }
 .inv-title >p:nth-child(1) {
-    margin-bottom: 16px;
+    /* margin-bottom: 16px; */
 }
 .inv-text {
     font-family: PingFangSC-Regular;
@@ -332,12 +364,18 @@ import { setTimeout } from 'timers';
     width: 100%;
     margin-bottom: 39px;
     opacity: 0.87;
-    background: #FFFFFF;
     box-shadow: 0 2px 4px 0 #3C8EFF;
-    font-size: 15px;
+    font-size: 14px;
     border: 0;
     height: 40px;
     border-radius: 4px;
+    appearance:none;
+   -moz-appearance:none;
+   -webkit-appearance:none;
+   /*设置箭头*/
+   background: url(/static/img/TriangleCopy.png) no-repeat scroll right center transparent;
+   padding-right: 14px;
+   background-position-x: 95%;
 }
 .Verification {
     border: 0;
@@ -352,7 +390,7 @@ import { setTimeout } from 'timers';
 .Verification > input {
     width: 68%;
     border: 0;
-    font-size: 15px;
+    font-size: 14px;
     outline:none;
 }
 .Verification > span {

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

@@ -27,6 +27,10 @@ input::-webkit-input-placeholder {
     text-align: center !important;
     margin-top: 0px !important;
 }
+.el-message {
+    min-width: 240px !important;
+    height: 32px !important;
+}
 /* 弹窗 -----------------------------------------------*/
 .tanchuang {
     background-image: url('../img/qiye/tanchuang.png');

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

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