Browse Source

修改功能bug

jinsy 7 years ago
parent
commit
c1a7e5f98e

+ 37 - 24
frontend/saas-portal-web/src/components/conenter/addgongsi.vue

@@ -6,7 +6,7 @@
                 <div class="qy-title" style="position: relative;">
                     <span>完善企业信息</span>
                     <div class="qy-anniu">
-                        <span @click= "Preservation" class="qy-xiugai dianji" style="left: 0">保存</span>
+                        <span @click= "Preservation" class="qy-xiugai dianji" style="left: -2px">保存</span>
                         <span @click= "tjquxiao" class="qy-quxiao xs">取消</span>
                     </div>
                 </div>
@@ -19,18 +19,32 @@
                         </li>
                         <li>
                             <span class="qy-biaoti">所属行业</span>
-                            <select ref="qyindustry" style="width:71%" name="selectAge" id="selectAge">   
-                                <option value="贸易类">贸易类</option>   
-                                <option value="制造类">制造类</option>   
+                            <select ref="qyindustry" style="width:59%;height: 30px" name="selectAge" id="selectAge">   
+                                <option value="贸易零售">贸易零售</option>
+                                <option value="制造加工">制造加工</option>
+                                <option value="服务业">服务业</option>
+                                <option value="教育">教育</option>
+                                <option value="信息传媒">信息传媒</option>
+                                <option value="金融">金融</option>
+                                <option value="高新科技">高新科技</option>
+                                <option value="电子商务">电子商务</option>
+                                <option value="互联网">互联网</option>
+                                <option value="医疗服务">医疗服务</option>
+                                <option value="艺术娱乐">艺术娱乐</option>
+                                <option value="地产建筑">地产建筑</option>
+                                <option value="公共服务">公共服务</option>
+                                <option value="开采冶金">开采冶金</option>
+                                <option value="交通仓储">交通仓储</option>
+                                <option value="农林牧渔">农林牧渔</option>
                                 <option value="其他">其他</option>   
                             </select>
                         </li>
-                        <li style="height:60px;">
+                        <li style="height:70px;">
                             <span class="qy-biaoti left">公司地址</span>
                             <div class="addbiaoqian" style="float: left;margin: 0;">
                                 <!-- <v-distpicker @province= 'qyprovince' @city= 'qycity' @area= 'qyarea'></v-distpicker> -->
                                 <v-distpicker @selected= 'selected'></v-distpicker>
-                                <input ref="address" @change="address" class="qy-xiangxi" type="text" placeholder="输入企业详细地址">
+                                <input ref="address" @change="address" :disabled="disabled" class="qy-xiangxi" type="text" placeholder="输入企业详细地址">
                                 
                             </div>
                             <span ref="ress" style="color:red;margin-top: 40px;display: inline-block;"></span>
@@ -73,11 +87,12 @@ import VDistpicker from 'v-distpicker'
                 qymingzi: false,//企业名是否注册
                 Email: '',
                 mytoken: JSON.parse(localStorage.getItem('app-state-session')),//本地储存的用户信息
-                // reg: new RegExp("[`~!@#$^&*()=+-|{}':;',\\[\\].<>/?~!@#¥……&*()——|{}【】‘;:”“'。,、?]"),
-                reg: new RegExp(/[\@\#\$\%\&\*!\¥]/),
+                reg: new RegExp(/[\@\#\$\%\&\*!\¥]/),//非法字符
                 isaddress: false,//公司地址验证
                 isname: false,//姓名验证
                 isspaceName: false,//公司名验证
+                isemail: false,//邮箱
+                disabled: true
             }
         },
         components:{
@@ -160,9 +175,11 @@ import VDistpicker from 'v-distpicker'
                 let reg = new RegExp("^[a-z0-9A-Z]+[- | a-z0-9A-Z . _]+@([a-z0-9A-Z]+(-[a-z0-9A-Z]+)?\\.)+[a-z]{2,}$"); 
                 let email = this.$refs.email.value;//邮箱
                 if (!reg.test(email)) {
-                    this.Email = '邮箱格式错误'
+                    this.Email = '请填写正确的邮箱'
+                    this.isemail = false
                 } else {
                     this.Email = ''
+                    this.isemail = true
                 }
             },
             //保存
@@ -176,11 +193,11 @@ import VDistpicker from 'v-distpicker'
                 let token = String(mytoken.token);
                 let uu = mytoken.account.uu;
                 let mobile = mytoken.account.mobile;//手机号
-                let company = {'name':qyname,'address':address};
+                let company = {'name':qyname,'address':address,'type':qyindustry};
                 let account = {'realname':name,'email':email,'mobile':mobile, 'uu':uu}
-                if (name != '' && qyname != '' && this.qymingzi && this.isaddress && this.isname && this.isspaceName) {
+                if (name != '' && qyname != '' && this.qymingzi && this.isaddress && this.isname && this.isspaceName && this.isemail) {
                     this.$ajax({
-                        url: this.$url.api+"/api/account/accountCenter/companyAccount/save",//http://192.168.253.31:8560
+                        url: this.rul.api+"/api/account/accountCenter/companyAccount/save",//http://192.168.253.31:8560
                         method: 'post',
                         data: {
                             companyRegDTO:company,
@@ -207,17 +224,12 @@ import VDistpicker from 'v-distpicker'
                 }
                 
             },
-            //获取省
-            qyprovince(sheng){
-                this.province = sheng.value;
-            },
-            //市
-            qycity(shi){
-                this.city = shi.value;
-            },
-            //区
-            qyarea(qu){
-                this.area = qu.value;
+            //获取省市区
+            selected(data){
+                this.province = data.province.value;
+                this.city = data.city.value;
+                this.area = data.area.value;
+                this.disabled= false
             },
         }
     }
@@ -236,6 +248,7 @@ import VDistpicker from 'v-distpicker'
     border-bottom: 0;
     padding-bottom: 1px;
     border-radius: 4px 4px 0 0;
+    /* margin-top: -30px; */
 }
 .tj-up li {
     margin-bottom: 26px;
@@ -249,7 +262,7 @@ import VDistpicker from 'v-distpicker'
     margin-bottom: 26px;
 }
 .tj-down div:nth-child(2) {
-    margin-bottom: 100px;
+    margin-bottom: 70px;
 }
 .addbiaoqian>>>.distpicker-address-wrapper select {
     height: 30px;

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

@@ -56,7 +56,7 @@
       </div>
     </div>
 
-        <div class="gs-qiyebox" ref="qiyebox">
+        <div class="gs-qiyebox" ref="qiyebox" style="margin-top: 70px;">
             <!-- 点击查看企业详情 -->
             <div v-for="(d , i) in arr " :key="i" class="gs-xiangqing xs">
                 <div class="left gs-xqleft" @click= "getEnterpriseInfo(d)">
@@ -122,7 +122,7 @@
             let token = String(mytoken.token);
             //企业列表
             this.$ajax({
-                    url: this.$url.api+"/api/account/accountCenter/company/list",
+                    url: this.rul.api+"/api/account/accountCenter/company/list",
                     method: 'get',
                     params: {
                         mobile: mytoken.account.mobile

+ 31 - 9
frontend/saas-portal-web/src/components/conenter/qiyexiangxi.vue

@@ -24,7 +24,7 @@
                 <div class="qy-conent">
                     <ul>
                         <li><span class="qy-biaoti">公司名称</span><span>{{content.name}}</span></li>
-                        <li><span class="qy-biaoti">所属行业</span><span></span></li>
+                        <li><span class="qy-biaoti">所属行业</span><span>{{content.type}}</span></li>
                         <li><span class="qy-biaoti">公司地址</span><span>{{content.address}}</span></li>
                     </ul>
                 </div>
@@ -60,7 +60,26 @@
                         </li>
                         <li>
                             <span class="qy-biaoti">所属行业</span>
-                            <span></span>
+                            <select ref="qyindustry" style="width:59%;height: 30px" name="selectAge" id="selectAge">   
+                                <option value="">请选择所属行业</option>
+                                <option value="贸易零售">贸易零售</option>
+                                <option value="制造加工">制造加工</option>
+                                <option value="服务业">服务业</option>
+                                <option value="教育">教育</option>
+                                <option value="信息传媒">信息传媒</option>
+                                <option value="金融">金融</option>
+                                <option value="高新科技">高新科技</option>
+                                <option value="电子商务">电子商务</option>
+                                <option value="互联网">互联网</option>
+                                <option value="医疗服务">医疗服务</option>
+                                <option value="艺术娱乐">艺术娱乐</option>
+                                <option value="地产建筑">地产建筑</option>
+                                <option value="公共服务">公共服务</option>
+                                <option value="开采冶金">开采冶金</option>
+                                <option value="交通仓储">交通仓储</option>
+                                <option value="农林牧渔">农林牧渔</option>
+                                <option value="其他">其他</option>   
+                            </select>
                         </li>
                         <li>
                             <span class="qy-biaoti">公司地址</span>
@@ -79,7 +98,7 @@
                         <li><span class="qy-biaoti">手机号</span><span>{{mytoken.account.mobile}}</span></li>
                         <li>
                             <span class="qy-biaoti">邮箱</span>
-                            <input @input="email" ref="email" type="text" value="">
+                            <input @change="email" ref="email" type="text" value="">
                             <span style="color:red">{{Email}}</span>
                         </li>
                     </ul>
@@ -121,7 +140,8 @@
                 let reg = new RegExp("^[a-z0-9A-Z]+[- | a-z0-9A-Z . _]+@([a-z0-9A-Z]+(-[a-z0-9A-Z]+)?\\.)+[a-z]{2,}$"); 
                 let email = this.$refs.email.value;//邮箱
                 if (!reg.test(email)) {
-                    this.Email = '邮箱格式错误'
+                    this.Email = '请填写正确的邮箱'
+                    this.isemail = false
                 } else {
                     this.Email = '',
                     this.isemail = true
@@ -137,15 +157,16 @@
                 if (this.isemail) {
                     let email = this.$refs.email.value;
                     let qyname = this.content.name;//公司名字
+                    let qyindustry = this.$refs.qyindustry.value;//所属行业
                     let address = this.content.address;//公司详细地址
                     let companyId = this.content.id;
                     let name = this.content.realname;//名字
                     let mobile = this.mytoken.account.mobile;//手机号
                     let uu = this.content.uu;
-                    let company = {'name':qyname,'address':address, 'id':companyId};
+                    let company = {'name':qyname,'address':address, 'id':companyId, 'type':qyindustry};
                     let account = {'realname':name,'email':email,'mobile':mobile, 'uu':uu};
                     this.$ajax({
-                        url: this.$url.api+"/api/account/accountCenter/companyAccount/update",//http://192.168.253.31:8560
+                        url: this.rul.api+"/api/account/accountCenter/companyAccount/update",//http://192.168.253.31:8560
                         method: 'post',
                         data: {
                             companyRegDTO:company,
@@ -156,17 +177,18 @@
                         }
                     })
                     .then(res=>{
-                        console.log("请求成功",res)
+                        // console.log("请求成功",res)
                         if (res.data.success) {
                             document.documentElement.scrollTop = 0;
                             this.xiugai = true;
+                            this.content.type = qyindustry
                         };
                     })
                     .catch(err=>{
-                        console.log("请求失败",err)
+                        // console.log("请求失败",err)
                     })
                 } else {
-                    this.$refs.Tips.innerHTML= "邮箱格式错误"
+                    this.$refs.Tips.innerHTML= "请填写正确的邮箱"
                     // this.isTipsmail = true;
                     setTimeout(()=>{
                         this.$refs.Tips.innerHTML= ""

+ 9 - 7
frontend/saas-portal-web/static/css/gongsi.css

@@ -73,7 +73,7 @@
 
 /* 主体 */
 .gs-worp {
-    width: 68%;
+    width: 55%;
     margin: 0 auto;
     font-size: 14px;
     color: #243A52;
@@ -99,6 +99,7 @@
 }
 .gsqiye {
     display: block !important;
+    margin-top: -30px;
 }
 .gs-xiangqing {
     height: 112px;
@@ -190,7 +191,7 @@
     color: #1E88F5;
     text-align: center;
     position: relative;
-    padding: 6px 33px;
+    padding: 6px 26px;
     font-size: 14px;
 }
 .xingxing {
@@ -199,11 +200,11 @@
 .qy-anniu {
     position: absolute;
     top: 0;
-    right: 100px;
+    right: 40px;
 }
 .qy-conent input {
     border: 1px solid #1E88F5;
-    width: 71%;
+    width: 59%;
 }
 .tj-biaoqian {
     border: 1px dashed #7CBAFA;
@@ -227,8 +228,8 @@
     margin-right: 102px;
 }
 .qy-xiangxi {
-    width: 100% !important;
-    margin-top: 8px;
+    width: 84% !important;
+    margin-top: 10px;
 }
 .tj-bqleft {
     float: left;
@@ -302,6 +303,7 @@
     box-shadow: 0 20px 60px 8px #F4F8FC;
     border-radius: 4px;
     margin-bottom: 25px;
+    /* margin-top: -30px; */
 }
 .qy-title {
     background: #F4F8FC;
@@ -320,7 +322,7 @@
     text-align: center;
     position: relative;
     left: 200px;
-    padding: 6px 33px;
+    padding: 6px 26px;
     background: #1E88F5;
     border-radius: 2px;
 }