Merge remote-tracking branch 'origin/dev' into dev

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

@@ -18,7 +18,7 @@
                     <ul>
                         <li style="margin: 0">
                             <span class="qy-biaoti"><span class="xingxing">*</span>公司名称</span>
-                            <input class="inpind" ref="qyname" @change= "spaceName" type="text">
+                            <input class="inpind" ref="qyname" @change= "spaceName" type="text" placeholder="请填写公司全称">
                             <dir class="qy-Tips"><span ref="qyno" style="color:red"></span></dir>
                         </li>
                         <li>
@@ -123,7 +123,7 @@ import { setTimeout } from 'timers';
             spaceName(){
                 let qyname = this.$refs.qyname.value.replace(/\s+/g, "");//公司名字过滤空格
                 if(qyname == ''){
-                    this.$refs.qyno.innerHTML = '企业名不能为空';
+                    this.$refs.qyno.innerHTML = '企业名字不能为空';
                 } else {
                     if (this.reg.test(qyname)) {
                         this.$refs.qyno.innerHTML = '不能包含非法字符';
@@ -157,7 +157,7 @@ import { setTimeout } from 'timers';
             yzusername(){
                 let name = this.$refs.name.value.replace(/\s+/g, "");//姓名过滤空格
                 if (name == '') {
-                    this.$refs.usname.innerHTML = '姓名不能为空'
+                    this.$refs.usname.innerHTML = '个人姓名不能为空'
                 } else {
                     if (this.reg.test(name)) {
                         this.$refs.usname.innerHTML = '不能包含非法字符'
@@ -172,7 +172,7 @@ import { setTimeout } from 'timers';
             address(){
                 let address = this.$refs.address.value.replace(/\s+/g, "");//过滤空格
                 if (address == '') {
-                    this.$refs.ress.innerHTML = '地址不能为空'
+                    this.$refs.ress.innerHTML = '企业地址不能为空'
                     this.isaddressname = false
                 } else {
                     this.isaddressname = true
@@ -223,8 +223,10 @@ import { setTimeout } from 'timers';
                 // console.log('邮箱',this.isemail)//邮箱正则
                 if (name == '') {
                     this.$refs.tjtishi.innerHTML = '个人姓名不能为空';
+                    this.remotxt()
                 } else if (qyname == '') {
                     this.$refs.tjtishi.innerHTML = '企业名字不能为空';
+                    this.remotxt()
                 } else {
                     switch (this.qymingzi && this.isaddress && this.isname && this.isspaceName && this.isemail && this.isaddressname) {
                         case this.qymingzi:
@@ -257,27 +259,38 @@ import { setTimeout } from 'timers';
                             })
                             this.$refs.tjtishi.innerHTML = '';
                         } else {
-                            this.$refs.tjtishi.innerHTML = '企业名字已在优软云注册';
+                            this.$refs.tjtishi.innerHTML = '该企业已在优软云注册';
+                            this.remotxt()
                         }
                         break;
                         case this.isaddressname:
                         this.$refs.tjtishi.innerHTML = '企业地址不能为空';
+                        this.remotxt()
                         break;
                         case this.isaddress:
                         this.$refs.tjtishi.innerHTML = '企业地址不能包含非法字符';
+                        this.remotxt()
                         break;
                         case this.isname:
                         this.$refs.tjtishi.innerHTML = '个人姓名不能包含非法字符';
+                        this.remotxt()
                         break;
                         case this.isspaceName:
                         this.$refs.tjtishi.innerHTML = '企业名字不能包含非法字符';
+                        this.remotxt()
                         break;
                         case this.isemail:
-                        this.$refs.tjtishi.innerHTML = '请输入正确邮箱';
+                        this.$refs.tjtishi.innerHTML = '请填写正确的邮箱';
+                        this.remotxt()
                         break;
                     }
                 }
             },
+            remotxt(){
+                setTimeout(()=>{
+                    this.$refs.tjtishi.innerHTML = ' ';
+                },3000)
+            },
             //获取省市区
             selected(data){
                 this.province = data.province.value;

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

@@ -85,51 +85,51 @@
       <!-- 特色 -->
       <section id="feature">
         <div class="container ts-worp">
-          <div class="section-title text-center">
+          <div class="section-title text-center" style="margin-bottom: 50px">
             <p class="ts-title">我们的特色</p>
             <p class="ts-text">云端部署 &nbsp;&nbsp; 轻量应用</p>
           </div>
           <!-- 1 -->
           <div class="ts-box">
-            <div class="ts-boximg">
-              <img style="margin-left: 18px;" src="/static/img/feature/mix1x.png" alt="">
+            <div>
+              <img class="left" src="/static/img/feature/for2x.png" alt="">
             </div>
             <div>
-              <img class="ts-img" src="/static/img/feature/blue1@2x.png" alt="">
+              <img class="right" src="/static/img/feature/onemin2x.png" alt="">
             </div>
           </div>
           <!-- 2 -->
-          <div class="ts-box">
+          <div class="ts-box ts-boxtow">
             <div>
-              <img class="ts-img" src="/static/img/feature/yellow2@2x.png" alt="">
+              <img class="left" src="/static/img/feature/towmin2x.png" alt="">
             </div>
-            <div class="ts-boximg">
-              <img style="float: right;" src="/static/img/feature/mix2x.png" alt="">
+            <div>
+              <img class="right" style="margin-right:20px; width:80%" src="/static/img/feature/three2x.png" alt="">
             </div>
           </div>
           <!-- 3 -->
-          <div class="ts-box">
-            <div class="ts-boximg">
-              <img src="/static/img/feature/mix3x.png" alt="">
+          <div class="ts-box" style="padding-bottom:0px">
+            <div>
+              <img class="left" style="width:88%" src="/static/img/feature/one2x.png" alt="">
             </div>
             <div>
-              <img class="ts-img" src="/static/img/feature/blue3@2x.png" alt="">
+              <img class="right" style="margin-top:-30%;" src="/static/img/feature/threemin2x.png" alt="">
             </div>
           </div>
           <!-- 4 -->
-          <div class="ts-box">
+          <div class="ts-box ts-boxtow ts-forbox" style="padding-bottom:0px">
             <div>
-              <img style="width:94%" class="ts-img" src="/static/img/feature/yellow4@2x.png" alt="">
+              <img class="left" style="margin-top:-39%;" src="/static/img/feature/formin2x.png" alt="">
             </div>
-            <div class="ts-boximg">
-              <img style="float: right;" src="/static/img/feature/mix4x.png" alt="">
+            <div>
+              <img class="right" style="margin-right:30px;" src="/static/img/feature/tow2x.png" alt="">
             </div>
           </div>
         </div>
       </section>
 
       <!-- Service section 功能-->
-      <section id="service">
+      <section id="service" style="padding-top: 0">
         <div class="container" style="position: relative;">
           <img class="gn-beijing" src="/static/img/gongneng/xu xian@3x.png" alt="">
           <div class="row">

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

@@ -151,17 +151,32 @@ main > section {
 }
 .ts-box {
     overflow: hidden;
-    position: relative;
-    padding: 150px 0;
-    width: 98%;
+    /* position: relative; */
+    padding: 100px 50px 100px 20px;
+    width: 100%;
+    display: table;
+    background: #F8FAFD;
 }
-.ts-boximg {
-    position: absolute;
-    top: 50px;
+.ts-boxtow {
+    padding: 100px 20px 100px 50px;
+    background: white;
+}
+.ts-box div {
+    display: table-cell;
+    vertical-align: middle;
+}
+.ts-box img {
+    width: 95%;
 }
-.ts-boximg img {
-    width: 65%;
+.ts-forbox img {
+    width: 100%;
 }
+/* .ts-imgmax {
+    width: 100%;
+}
+.ts-imgmin {
+    width: 100%;
+} */
 .ts-title {
     font-family: PingFangSC-Regular !important;
     color: #0D253E !important;
@@ -175,10 +190,6 @@ main > section {
 .right {
     float: right;
 }
-.ts-img {
-    width: 98%;
-    margin-left: 2%;
-}
 .right-text {
     text-align: right;
 }