Browse Source

调整ui设计界面

jinsy 7 years ago
parent
commit
194e4666ba

+ 22 - 12
frontend/saas-portal-web/src/components/conenter/addgongsi.vue

@@ -12,10 +12,10 @@
                 </div>
                 </div>
                 <div class="qy-conent">
                 <div class="qy-conent">
                     <ul>
                     <ul>
-                        <li>
+                        <li style="margin: 0">
                             <span class="qy-biaoti"><span class="xingxing">*</span>公司名称</span>
                             <span class="qy-biaoti"><span class="xingxing">*</span>公司名称</span>
                             <input ref="qyname" @change= "spaceName" type="text">
                             <input ref="qyname" @change= "spaceName" type="text">
-                            <span ref="qyno" style="color:red"></span>
+                            <dir class="qy-Tips"><span ref="qyno" style="color:red"></span></dir>
                         </li>
                         </li>
                         <li>
                         <li>
                             <span class="qy-biaoti">所属行业</span>
                             <span class="qy-biaoti">所属行业</span>
@@ -41,13 +41,15 @@
                         </li>
                         </li>
                         <li style="height:70px;">
                         <li style="height:70px;">
                             <span class="qy-biaoti left">公司地址</span>
                             <span class="qy-biaoti left">公司地址</span>
-                            <div class="addbiaoqian" style="float: left;margin: 0;">
+                            <div class="addbiaoqian">
                                 <!-- <v-distpicker @province= 'qyprovince' @city= 'qycity' @area= 'qyarea'></v-distpicker> -->
                                 <!-- <v-distpicker @province= 'qyprovince' @city= 'qycity' @area= 'qyarea'></v-distpicker> -->
                                 <v-distpicker @selected= 'selected'></v-distpicker>
                                 <v-distpicker @selected= 'selected'></v-distpicker>
                                 <input ref="address" @change="address" :disabled="disabled" class="qy-xiangxi" type="text" placeholder="输入企业详细地址">
                                 <input ref="address" @change="address" :disabled="disabled" class="qy-xiangxi" type="text" placeholder="输入企业详细地址">
                                 
                                 
                             </div>
                             </div>
-                            <span ref="ress" style="color:red;margin-top: 40px;display: inline-block;"></span>
+                            <div class="qy-Tips left">
+                                <span ref="ress" style="color:red;margin-left:40px;"></span>
+                            </div>
                         </li>
                         </li>
                     </ul>
                     </ul>
                 </div>
                 </div>
@@ -58,16 +60,16 @@
                 </div>
                 </div>
                 <div class="qy-conent">
                 <div class="qy-conent">
                     <ul>
                     <ul>
-                        <li>
+                        <li style="margin:0">
                             <span class="qy-biaoti"><span class="xingxing">*</span>姓名</span>
                             <span class="qy-biaoti"><span class="xingxing">*</span>姓名</span>
                             <input @change= "yzusername" ref="name" type="text">
                             <input @change= "yzusername" ref="name" type="text">
-                            <span ref="usname" style="color:red"></span>
+                            <div class="qy-Tips Tips-buttom"><span ref="usname" style="color:red"></span></div>
                         </li>
                         </li>
                         <li><span class="qy-biaoti">手机号</span><span>{{mytoken.account.mobile}}</span></li>
                         <li><span class="qy-biaoti">手机号</span><span>{{mytoken.account.mobile}}</span></li>
-                        <li>
+                        <li style='margin:0'>
                             <span class="qy-biaoti">邮箱</span>
                             <span class="qy-biaoti">邮箱</span>
                             <input @change="email" ref="email" type="email">
                             <input @change="email" ref="email" type="email">
-                            <span style="color:red">{{Email}}</span>
+                            <div class="qy-Tips Tips-buttom"><span style="color:red">{{Email}}</span></div>
                         </li>
                         </li>
                     </ul>
                     </ul>
                 </div>
                 </div>
@@ -114,7 +116,7 @@ import VDistpicker from 'v-distpicker'
                     this.$refs.qyno.innerHTML = '企业名不能为空';
                     this.$refs.qyno.innerHTML = '企业名不能为空';
                 } else {
                 } else {
                     if (this.reg.test(qyname)) {
                     if (this.reg.test(qyname)) {
-                        this.$refs.qyno.innerHTML = '包含非法字符';
+                        this.$refs.qyno.innerHTML = '不能包含非法字符';
                         this.isspaceName = false;
                         this.isspaceName = false;
                     } else {
                     } else {
                         this.$refs.qyno.innerHTML = '';
                         this.$refs.qyno.innerHTML = '';
@@ -148,7 +150,7 @@ import VDistpicker from 'v-distpicker'
                     this.$refs.usname.innerHTML = '姓名不能为空'
                     this.$refs.usname.innerHTML = '姓名不能为空'
                 } else {
                 } else {
                     if (this.reg.test(name)) {
                     if (this.reg.test(name)) {
-                        this.$refs.usname.innerHTML = '包含非法字符'
+                        this.$refs.usname.innerHTML = '不能包含非法字符'
                         this.isname = false
                         this.isname = false
                     } else {
                     } else {
                         this.$refs.usname.innerHTML = ''
                         this.$refs.usname.innerHTML = ''
@@ -163,7 +165,7 @@ import VDistpicker from 'v-distpicker'
                     this.$refs.ress.innerHTML = '地址不能为空'
                     this.$refs.ress.innerHTML = '地址不能为空'
                 } else {
                 } else {
                     if (this.reg.test(address)) {
                     if (this.reg.test(address)) {
-                        this.$refs.ress.innerHTML = '包含非法字符'
+                        this.$refs.ress.innerHTML = '不能包含非法字符'
                         this.isaddress = false
                         this.isaddress = false
                     } else {
                     } else {
                         this.$refs.ress.innerHTML = ''
                         this.$refs.ress.innerHTML = ''
@@ -222,7 +224,6 @@ import VDistpicker from 'v-distpicker'
                         this.$refs.tjtishi.innerHTML = ''
                         this.$refs.tjtishi.innerHTML = ''
                     }, 3000);
                     }, 3000);
                 }
                 }
-                
             },
             },
             //获取省市区
             //获取省市区
             selected(data){
             selected(data){
@@ -267,4 +268,13 @@ import VDistpicker from 'v-distpicker'
 .addbiaoqian>>>.distpicker-address-wrapper select {
 .addbiaoqian>>>.distpicker-address-wrapper select {
     height: 30px;
     height: 30px;
 }
 }
+.qy-Tips {
+    margin: 0;
+    text-align: left;
+    height: 26px;
+    margin-left: 16%;
+}
+.Tips-buttom {
+    margin-left: 22%;
+}
 </style>
 </style>

+ 1 - 1
frontend/saas-portal-web/src/components/conenter/enterprise.vue

@@ -48,7 +48,7 @@
                 </div>
                 </div>
     <!-- 个人信息------------------------------------------------------------------- -->
     <!-- 个人信息------------------------------------------------------------------- -->
                 <div :class= "{gsqiye:nowindex == 1}">
                 <div :class= "{gsqiye:nowindex == 1}">
-                    <div class="over gr-worp" style="margin-bottom: 30px;">
+                    <div class="over gr-worp" style="margin-bottom: 30px;margin-top: 60px;">
                         <div class="left gr-left">
                         <div class="left gr-left">
                             <img src="../../../static/img/qiye/yonghu@2x.png" alt="">
                             <img src="../../../static/img/qiye/yonghu@2x.png" alt="">
                         </div>
                         </div>

+ 2 - 2
frontend/saas-portal-web/src/components/conenter/home.vue

@@ -53,7 +53,7 @@
           <img @click="closeModal" class="tc-on shut"
           <img @click="closeModal" class="tc-on shut"
                src="/static/img/qiye/chahao.png" alt="">
                src="/static/img/qiye/chahao.png" alt="">
         </div>
         </div>
-        <iframe id="iframe" width="430" height="474" :src="ssoPage"></iframe>
+        <iframe id="iframe" width="430" height="504" :src="ssoPage"></iframe>
         <iframe hidden :src="setTokenPage"></iframe>
         <iframe hidden :src="setTokenPage"></iframe>
       </div>
       </div>
 
 
@@ -135,7 +135,7 @@
         <div class="container" style="position: relative;">
         <div class="container" style="position: relative;">
           <img class="gn-beijing" src="/static/img/gongneng/xu xian@3x.png" alt="">
           <img class="gn-beijing" src="/static/img/gongneng/xu xian@3x.png" alt="">
           <div class="row">
           <div class="row">
-            <div class="section-title text-center">
+            <div class="section-title text-center" style="margin-bottom: 80px;">
               <p class="ts-title">我们的功能</p>
               <p class="ts-title">我们的功能</p>
             </div>
             </div>
             <div class="gn-hei">
             <div class="gn-hei">

+ 11 - 4
frontend/saas-portal-web/src/components/conenter/qiyexiangxi.vue

@@ -99,7 +99,7 @@
                         <li>
                         <li>
                             <span class="qy-biaoti">邮箱</span>
                             <span class="qy-biaoti">邮箱</span>
                             <input @change="email" ref="email" type="text" value="">
                             <input @change="email" ref="email" type="text" value="">
-                            <span style="color:red">{{Email}}</span>
+                            <dir class="qy-Tips"><span style="color:red">{{Email}}</span></dir>
                         </li>
                         </li>
                     </ul>
                     </ul>
                 </div>
                 </div>
@@ -154,10 +154,11 @@
             },
             },
             // 保存修改
             // 保存修改
             baocunxiugai(){
             baocunxiugai(){
-                if (this.isemail) {
+                let qyindustry = this.$refs.qyindustry.value;//所属行业
+                if (this.isemail && qyindustry!='') {
                     let email = this.$refs.email.value;
                     let email = this.$refs.email.value;
                     let qyname = this.content.name;//公司名字
                     let qyname = this.content.name;//公司名字
-                    let qyindustry = this.$refs.qyindustry.value;//所属行业
+                    // let qyindustry = this.$refs.qyindustry.value;//所属行业
                     let address = this.content.address;//公司详细地址
                     let address = this.content.address;//公司详细地址
                     let companyId = this.content.id;
                     let companyId = this.content.id;
                     let name = this.content.realname;//名字
                     let name = this.content.realname;//名字
@@ -188,7 +189,7 @@
                         // console.log("请求失败",err)
                         // console.log("请求失败",err)
                     })
                     })
                 } else {
                 } else {
-                    this.$refs.Tips.innerHTML= "请填写正确的邮箱"
+                    this.$refs.Tips.innerHTML= "请填写正确的邮箱或选择行业"
                     // this.isTipsmail = true;
                     // this.isTipsmail = true;
                     setTimeout(()=>{
                     setTimeout(()=>{
                         this.$refs.Tips.innerHTML= ""
                         this.$refs.Tips.innerHTML= ""
@@ -223,4 +224,10 @@
     color: red;
     color: red;
     height: 20px;
     height: 20px;
 }
 }
+.qy-Tips {
+    margin: 0;
+    text-align: left;
+    height: 26px;
+    margin-left: 16%;
+}
 </style>
 </style>

+ 11 - 5
frontend/saas-portal-web/static/css/gongsi.css

@@ -223,12 +223,14 @@
     color: #ffffff;
     color: #ffffff;
 }
 }
 .addbiaoqian {
 .addbiaoqian {
-    width: 71%;
-    float: right;
-    margin-right: 102px;
+    width: 59%;
+    /* float: right;
+    margin-right: 102px; */
+    float: left;
+    margin-left: 4px;
 }
 }
 .qy-xiangxi {
 .qy-xiangxi {
-    width: 84% !important;
+    width: 100% !important;
     margin-top: 10px;
     margin-top: 10px;
     font-size: 12px;
     font-size: 12px;
     padding-left: 10px;
     padding-left: 10px;
@@ -248,9 +250,13 @@
 .gr-worp div {
 .gr-worp div {
     width: 50%;
     width: 50%;
 }
 }
+.gr-left {
+    text-align: center;
+    line-height: 290px;
+}
 .gr-left img {
 .gr-left img {
     width: 189px;
     width: 189px;
-    margin: 49px 88px 69px 186px
+    /* margin: 49px 88px 69px 186px */
 }
 }
 .gr-right li {
 .gr-right li {
     list-style: none;
     list-style: none;

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

@@ -115,13 +115,13 @@ main > section {
 
 
 .box{
 .box{
     width: 430px;
     width: 430px;
-    height: 474px;
+    height: 504px;
     position: fixed;
     position: fixed;
     background:white;
     background:white;
-    top: 55%;
+    top: 50%;
     left:50%;
     left:50%;
     margin-left: -215px;
     margin-left: -215px;
-    margin-top: -237px;
+    margin-top: -252px;
     z-index: 10001;
     z-index: 10001;
 }
 }