Home Explore Help
Register Sign In
usoft
/
saas-platform
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

修改已知bug

jinsy 7 years ago
parent
29a6e0e077
commit
af5d3f4b14
12 changed files with 102 additions and 71 deletions
Split View Show Diff Stats
  1. 11 5
      frontend/saas-portal-web/index.html
  2. 25 13
      frontend/saas-portal-web/src/components/conenter/addgongsi.vue
  3. 17 13
      frontend/saas-portal-web/src/components/conenter/company.vue
  4. 5 1
      frontend/saas-portal-web/src/components/conenter/enterprise.vue
  5. 1 2
      frontend/saas-portal-web/src/components/conenter/home.vue
  6. 34 29
      frontend/saas-portal-web/src/components/conenter/qiyexiangxi.vue
  7. 6 6
      frontend/saas-portal-web/src/components/footer/footer.vue
  8. 2 2
      frontend/saas-portal-web/static/css/main.css
  9. BIN
      frontend/saas-portal-web/static/img/assets/beijing2x.png
  10. BIN
      frontend/saas-portal-web/static/img/banner@3x@2x.png
  11. BIN
      frontend/saas-portal-web/static/img/logo.png
  12. 1 0
      frontend/saas-portal-web/static/js/mains.js

+ 11 - 5
frontend/saas-portal-web/index.html
View File 

@@ -6,10 +6,16 @@
 
     <!-- meta character set -->
 
 		<!-- Always force latest IE rendering engine or request Chrome Frame -->
 
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
-		<!-- Meta Description -->
 
-        <meta name="description" content="Blue One Page Creative HTML5 Template">
 
-        <meta name="keywords" content="one page, single page, onepage, responsive, parallax, creative, business, html5, css3, css3 animation">
 
-        <meta name="author" content="Themefisher">
 
+    <!-- Meta Description -->
 
+        <!-- 网站主要内容 -->
 
+        <meta name="description" content="SAAS、软件及服务、云ERP、进销存、企业管理、电子行业、任务管理、寻源管理、资金管理、甘特图、项目管理、找供应商、电子元器件、贸易、贸易版、贸易版ERP">
 
+        <!-- 网页关键词 -->
 
+        <meta name="keywords" content="SAAS、软件及服务、云ERP、进销存、企业管理、电子行业、任务管理、寻源管理、资金管理、甘特图、项目管理、找供应商、电子元器件、贸易、贸易版、贸易版ERP">
 
+        <!-- 网页制作作者 -->
 
+        <meta name="author" content="优软科技">
 
+        <meta name="Robots" content="all|index|follow">
 
+        
+        <link rel="icon" type="image/x-icon" href="./static/img/logo.png"/>
 
 
         <link rel="stylesheet" href="./static/css/animate.css">
 
         <link rel="stylesheet" href="./static/css/bootstrap.min.css">
 
@@ -36,7 +42,7 @@
 
 
         <script src="./static/js/sockjs.min.js"></script>
 
         <script src="./static/js/stomp.min.js"></script>
 
-    <title>saas</title>
 
+    <title>优企云服</title>
 
   </head>
 
   <body>
 
     <div id="app"></div>

+ 25 - 13
frontend/saas-portal-web/src/components/conenter/addgongsi.vue
View File 

@@ -14,12 +14,13 @@
 
                     <ul>
 
                         <li style="margin: 0">
 
                             <span class="qy-biaoti"><span class="xingxing">*</span>公司名称</span>
 
-                            <input ref="qyname" @change= "spaceName" type="text">
 
+                            <input class="inpind" ref="qyname" @change= "spaceName" type="text">
 
                             <dir class="qy-Tips"><span ref="qyno" style="color:red"></span></dir>
 
                         </li>
 
                         <li>
 
                             <span class="qy-biaoti">所属行业</span>
 
-                            <select ref="qyindustry" style="width:59%;height: 30px" name="selectAge" id="selectAge">   
+                            <select ref="qyindustry" style="width:59%;height: 30px;padding-left:5px" name="selectAge" id="selectAge">   
+                                <option value="">请选择所属行业</option>
 
                                 <option value="贸易零售">贸易零售</option>
 
                                 <option value="制造加工">制造加工</option>
 
                                 <option value="服务业">服务业</option>
 
@@ -40,7 +41,7 @@
 
                             </select>
 
                         </li>
 
                         <li style="height:70px;">
 
-                            <span class="qy-biaoti left">公司地址</span>
 
+                            <span class="qy-biaoti left"><span class="xingxing">*</span>公司地址</span>
 
                             <div class="addbiaoqian">
 
                                 <!-- <v-distpicker @province= 'qyprovince' @city= 'qycity' @area= 'qyarea'></v-distpicker> -->
 
                                 <v-distpicker @selected= 'selected'></v-distpicker>
 
@@ -62,13 +63,13 @@
 
                     <ul>
 
                         <li style="margin:0">
 
                             <span class="qy-biaoti"><span class="xingxing">*</span>姓名</span>
 
-                            <input @change= "yzusername" ref="name" type="text">
 
+                            <input class="inpind" @change= "yzusername" ref="name" type="text">
 
                             <div class="qy-Tips Tips-buttom"><span ref="usname" style="color:red"></span></div>
 
                         </li>
 
                         <li><span class="qy-biaoti">手机号</span><span>{{mytoken.account.mobile}}</span></li>
 
                         <li style='margin:0'>
 
                             <span class="qy-biaoti">邮箱</span>
 
-                            <input @change="email" ref="email" type="email">
 
+                            <input class="inpind" @change="email" ref="email" type="email">
 
                             <div class="qy-Tips Tips-buttom"><span style="color:red">{{Email}}</span></div>
 
                         </li>
 
                     </ul>
 
@@ -93,7 +94,7 @@ import VDistpicker from 'v-distpicker'
 
                 isaddress: false,//公司地址验证
 
                 isname: false,//姓名验证
 
                 isspaceName: false,//公司名验证
 
-                isemail: false,//邮箱
 
+                isemail: true,//验证邮箱
 
                 disabled: true
 
             }
 
         },
 
@@ -133,7 +134,7 @@ import VDistpicker from 'v-distpicker'
 
                             if (res.data.data.success) {
 
                                 this.qymingzi = true;
 
                             } else {
 
-                                this.$refs.qyno.innerHTML = '企业已注册';
 
+                                this.$refs.qyno.innerHTML = '该企业已在优软云注册';
 
                                 this.qymingzi = false
 
                             }
 
                         })
 
@@ -176,12 +177,17 @@ import VDistpicker from 'v-distpicker'
 
             email(){
 
                 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.isemail = false
 
-                } else {
 
+                if (email == '') {
 
+                    this.isemail = true;
 
                     this.Email = ''
 
-                    this.isemail = true
 
+                } else {
 
+                    if (!reg.test(email)) {
 
+                        this.Email = '请填写正确的邮箱';
 
+                        this.isemail = false
 
+                    } else {
 
+                        this.Email = '';
 
+                        this.isemail = true;
 
+                    }
 
                 }
 
             },
 
             //保存
 
@@ -219,7 +225,7 @@ import VDistpicker from 'v-distpicker'
 
                         // console.log("请求失败",err)
 
                     })
 
                 } else {
 
-                    this.$refs.tjtishi.innerHTML = '企业名称或姓名不能为空或包含有非法字符'
 
+                    this.$refs.tjtishi.innerHTML = '企业名称,地址,姓名不能为空或包含有非法字符'
 
                     setTimeout(() => {
 
                         this.$refs.tjtishi.innerHTML = ''
 
                     }, 3000);
 
@@ -268,6 +274,9 @@ import VDistpicker from 'v-distpicker'
 
 .addbiaoqian>>>.distpicker-address-wrapper select {
 
     height: 30px;
 
 }
 
+.addbiaoqian>>>.distpicker-address-wrapper {
 
+    width: 110%
 
+}
 
 .qy-Tips {
 
     margin: 0;
 
     text-align: left;
 
@@ -277,4 +286,7 @@ import VDistpicker from 'v-distpicker'
 
 .Tips-buttom {
 
     margin-left: 22%;
 
 }
 
+.inpind {
 
+    padding-left: 10px;
 
+}
 
 </style>

+ 17 - 13
frontend/saas-portal-web/src/components/conenter/company.vue
View File 

@@ -1,7 +1,7 @@
 
 <template>
 
   <div>
 
     <!-- 遮罩 -->
 
-    <div class="zhezhao" v-if="issetDefault || isOpensaas || isNoopen"></div>
 
+    <div class="zhezhao" v-if="issetDefault || isOpensaas || isNoopen || isokopensaas"></div>
 
     <!-- 设置默认弹窗 -->
 
     <div class="tanchuang szmoren" v-if="issetDefault">
 
       <div class="over"><img @click="guanbitc" class="right xs" src="/static/img/qiye/chahao.png" alt=""></div>
 
@@ -33,12 +33,12 @@
 
       </div>
 
     </div>
 
     <!-- 该企业已开通服务弹窗 -->
 
-    <div class="tanchuang qy-yikaitong" style="display: none">
 
+    <div class="tanchuang qy-yikaitong" v-if="isokopensaas">
 
       <div class="over"><img @click="guanbitc" class="right xs" src="/static/img/qiye/chahao.png" alt=""></div>
 
       <div>
 
         <div class="tc-okkaitong"><span>该企业已开通服务，联系管理员邀请加入</span></div>
 
         <div class="tc-context">
 
-          <!-- <p><span>管理员：</span><span>{{arr[0].admin}}</span></p> -->
 
+          <p><span>管理员：</span><span>{{arr[0].admin}}</span></p>
 
           <p><span>管理员手机号：</span><span>{{mytoken.account.mobile}}</span></p>
 
           <p><span>管理员邮箱：</span><span></span></p>
 
         </div>
 
@@ -73,7 +73,7 @@
 
                     </div>
 
                     <div>
 
                         <span v-if = "d.default_" class="gs-btn2 gs-btn3">默认企业</span>
 
-                        <span v-else @click="showDefaultWin(i)" class="gs-btn2 xs">设为默认</span>
 
+                        <span v-if="d.saas_" @click="showDefaultWin(i)" class="gs-btn2 xs">设为默认</span>
 
                     </div>
 
                 </div>
 
             </div>
 
@@ -94,12 +94,12 @@
 
                 issetDefault: false,//设置默认
 
                 isOpensaas: false,//开通saas弹窗
 
                 isNoopen: false,//开通10个不能继续开通
 
+                isokopensaas: false,//已开通服务
 
                 index:0,
 
                 saasid:null,
 
                 saasindex:0,
 
                 ktsass: true,//开通saas
 
                 isDefault: true,//开通默认
 
-                comdata: this.$store.state.data,//登录成功后的本地数据
 
                 isAutoLogin: this.$store.state.isAutoLogin,
 
                 mytoken: JSON.parse(localStorage.getItem('app-state-session')),//本地储存的用户信息
 
                 arr: []//企业列表信息
 
@@ -189,13 +189,13 @@
 
             },
 
             //进入服务
 
             selectServe(id){
 
-                let token = this.mytoken.token;
 
+                let token1 = this.mytoken.token;
 
                 const frame = window.frames[window.frames.length - 1];
 
                 this.$ajax({
 
                     url: this.$url.api+'/api/auth/switch/company?companyId='+id,
 
                     method :'get',
 
                     headers: {
 
-                        "Authorization":token
 
+                        "Authorization":token1
 
                     }
 
                 })
 
                 .then(res=>{
 
@@ -242,7 +242,7 @@
 
                 let account = {'realname':name,'email':email,'mobile':mobile, 'uu':uu}
 
                 // let id = this.saasid;
 
                 this.$ajax({
 
-                    url: this.$url.api+"/api/account/accountCenter/companyAccount/save",
 
+                    url: "http://192.168.253.31:8560/api/account/accountCenter/companyAccount/save",
 
                     method: 'post',
 
                     data: {
 
                         companyRegDTO:company,
 
@@ -254,20 +254,23 @@
 
                     }
 
                 })
 
                 .then(res=>{
 
-                    console.log('请求成功',res)
 
-                    if (res.data.data.success) {
 
+                    // console.log('请求成功',res)
 
+                    if (res.data.success) {
 
                         this.ktsass = false;
 
+                    } else {
 
+                        this.isokopensaas = true;
 
                     }
 
                 })
 
                 .catch(err=>{
 
-                    console.log('请求失败',err)
 
+                    // console.log('请求失败',err)
 
                 })
 
             },
 
             //进入saas服务
 
             showServeWin(){
 
                 let id = this.saasid;
 
                 this.isOpensaas = false;
 
-                this.$options.methods.selectServe(id)
 
+                // this.$options.methods.selectServe(id);
 
+                this.selectServe(id)
 
             },
 
             //查看企业详情
 
             getEnterpriseInfo(d){
 
@@ -283,7 +286,8 @@
 
             guanbitc(){
 
                 this.issetDefault = false;
 
                 this.isOpensaas = false;
 
-                this.isNoopen = false
 
+                this.isNoopen = false;
 
+                this.isokopensaas = false
 
             },
 
             //没有内容也要有一定的高度
 
             boxheight(){

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

@@ -105,6 +105,7 @@
 
 
 <script>
 
 import Session from '@/utils/session'
 
+import { setTimeout } from 'timers';
 
     export default {
 
         data(){
 
             return{
 
@@ -133,10 +134,13 @@ import Session from '@/utils/session'
 
             },
 
             //退出
 
             loginout(){
 
+                this.$router.push({path:'/name'});
 
+                this.loginout2()
 
+            },
 
+            loginout2(){
 
                 const frame = window.frames[window.frames.length - 1]
 
                 frame.postMessage('', '*')
 
                 Session.remove()
 
-                this.$router.push({name:'name'});
 
             } 
         },
 
     }

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

@@ -87,8 +87,7 @@
 
                  data-slice1-scale="2" data-slice2-scale="2">
 
               <div class="mask-overly"></div>
 
               <div class="bg-img slider-1">
 
-                <!-- <img src="/static/img/assets/beijing2x.png" alt=""> -->
 
-                <img src="../../../static/img/gongneng/Group 32.png" alt="">
 
+                <img src="/static/img/banner@3x@2x.png" alt="">
 
               </div>
 
               <!-- 首页内容 -->
 
               <div class="my-text">

+ 34 - 29
frontend/saas-portal-web/src/components/conenter/qiyexiangxi.vue
View File 

@@ -1,17 +1,5 @@
 
 <template>
 
     <div>
 
-        <!-- 遮罩 -->
 
-        <div class="zhezhao" v-if="isId"></div>
 
-        <!-- 不是管理员不能修改企业信息 -->
 
-        <div class="tanchuang nokaitong" v-if="isId">
 
-            <div class="over"><img @click="guanbitc" class="right xs" src="/static/img/qiye/chahao.png" alt=""></div>
 
-            <div>
 
-                <div class="tc-conent"><img src="/static/img/qiye/buneng kaitong@1x.png" alt=""></div>
 
-                <div class="tc-text">
 
-                <p>您不是管理员不能修改企业信息</p>
 
-                </div>
 
-            </div>
 
-        </div>
 
         <span class="Tips" ref="Tips"></span>
 
         <!-- 企业详细信息 -->
 
         <div v-if="xiugai">
 
@@ -19,7 +7,7 @@
 
                 <div class="qy-title">
 
                     <span><img @click= "gobick" style="float: left;padding: 20px; cursor:pointer" src="../../../static/img/fanhui.png" alt=""></span>
 
                     <span>企业基本信息</span>
 
-                    <span @click="xiugaiqiye" class="qy-xiugai dianji">修改</span>
 
+                    <span v-if="isxiugaiId" @click="xiugaiqiye" class="qy-xiugai dianji">修改</span>
 
                 </div>
 
                 <div class="qy-conent">
 
                     <ul>
 
@@ -118,33 +106,50 @@
 
                 Email: '',
 
                 mytoken: JSON.parse(localStorage.getItem('app-state-session')),//本地储存的用户信息
 
                 isId: false,
 
-                isemail: false,//正则邮箱
 
+                isemail: true,//正则邮箱
 
+                isxiugaiId: false
 
             }
 
         },
 
         mounted(){
 
-
 
+            //不是管理员隐藏修改按钮
 
+            if (this.content.adminId == this.mytoken.account.id) {
 
+                this.isxiugaiId = true;
 
+            } else {
 
+                this.isxiugaiId = false
 
+            }
 
         },
 
-        methods: {//修改企业信息
 
-            xiugaiqiye(){
 
-                if (this.content.adminId == this.mytoken.account.id) { //如果不是管理员不能修改企业信息
 
-                    document.documentElement.scrollTop = 0;
 
-                    this.xiugai = false;
 
-                } else {
 
-                    this.isId = true
 
+        methods: {
 
+            selects(){
 
+                let selects = this.$refs.qyindustry
 
+                let options = selects.options
 
+                for (let i = 0; i < options.length; i++) {
 
+                    if (options[i].innerHTML == this.content.type) {
 
+                        options[i].selected = true
 
+                    }
 
                 }
 
             },
 
-            guanbitc(){
 
-                this.isId = false
 
+            //修改企业信息
 
+            xiugaiqiye(){
 
+                document.documentElement.scrollTop = 0;
 
+                this.xiugai = false;
 
+                setTimeout(()=>{
 
+                    this.selects()
 
+                },10)
 
             },
 
             email(){ //验证邮箱
 
                 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.isemail = false
 
-                } else {
 
-                    this.Email = '',
 
+                if (email == '') {
 
+                    this.Email = ''
 
                     this.isemail = true
 
+                } else {
 
+                    if (!reg.test(email)) {
 
+                        this.Email = '请填写正确的邮箱'
 
+                        this.isemail = false
 
+                    } else {
 
+                        this.Email = ''
 
+                        this.isemail = true
 
+                    }
 
                 }
 
             },
 
             // 取消修改

+ 6 - 6
frontend/saas-portal-web/src/components/footer/footer.vue
View File 

@@ -22,10 +22,10 @@
 
 						</ul>
 
 						<ul>
 
 							<li><span>产品</span></li>
 
-							<li><a href="#">u企云服</a></li>
 
-							<li><a href="https://mall.usoftchina.com/" target="_blank">u软商城</a></li>
 
-							<li><a href="https://fin.yitoa-fintech.com/" target="_blank">u智融</a></li>
 
-							<li><a href="https://zb.usoftchina.com/" target="_blank">u创客</a></li>
 
+							<li><a href="#">U企云服</a></li>
 
+							<li><a href="https://mall.usoftchina.com/" target="_blank">U软商城</a></li>
 
+							<li><a href="https://fin.yitoa-fintech.com/" target="_blank">U智融</a></li>
 
+							<li><a href="https://zb.usoftchina.com/" target="_blank">U创客</a></li>
 
 						</ul>
 
 					</div>
 
 					
@@ -55,8 +55,8 @@
 
 		<div class="friend-link">
 
 			<ul>
 
 				<li><span>常用链接：</span></li>
 
-				<li><a href="https://uas.usoftchina.com/" target="_blank">uas官网</a></li>
 
-				<li><a href="https://www.usoftchina.com/" target="_blank">u软云</a></li>
 
+				<li><a href="https://uas.usoftchina.com/" target="_blank">UAS官网</a></li>
 
+				<li><a href="https://www.usoftchina.com/" target="_blank">U软云</a></li>
 
 				<li><a href="http://www.yitoa.com/" target="_blank">英唐官网</a></li>
 
 			</ul>
 
 		</div>

+ 2 - 2
frontend/saas-portal-web/static/css/main.css
View File 

@@ -308,7 +308,7 @@ main > section {
 
 /* 首页内容 ..........................................*/
 
 .my-text {
 
     position: absolute;
 
-    top: 76%;
 
+    top: 64%;
 
     left: 7%;
 
 }
 
 .my-tiyan {
 
@@ -961,7 +961,7 @@ h1.navbar-brand {
 
 }
 
 .slider-1 img{
 
     width: 100%;
 
-    /* height: 100%; */
 
+    height: 100%;
 
 }
 
 .sl-slider-wrapper {
 
     width: 100%;

BIN
frontend/saas-portal-web/static/img/assets/beijing2x.png
View File


BIN
frontend/saas-portal-web/static/img/banner@3x@2x.png
View File


BIN
frontend/saas-portal-web/static/img/logo.png
View File


+ 1 - 0
frontend/saas-portal-web/static/js/mains.js
View File 

@@ -123,6 +123,7 @@ $(document).ready(function(){
 
 
     $(window).resize(function(){
 
         $('#home-slider, #slider, .sl-slider, .sl-content-wrapper').css('height',slideHeight);
 
+        $(".slider-1 img").css("height",slideHeight)
 
     });
 
     // $(window).resize(function(){'use strict',
 
     //     $('#home-slider, #slider, .sl-slider, .sl-content-wrapper').css('height',slideHeight);