调试接口

frontend/saas-portal-web/package-lock.json

@@ -13059,6 +13059,14 @@
       "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
       "dev": true
     },
+    "v-distpicker": {
+      "version": "1.0.20",
+      "resolved": "https://registry.npmjs.org/v-distpicker/-/v-distpicker-1.0.20.tgz",
+      "integrity": "sha512-98YB+Kmh+8kuqfnELOuRVabz9KwoM9q9fVdwqbds3uh/mudiKN6f/IThCQLmSiXa7fQajuCs1I2l0meXreeBTA==",
+      "requires": {
+        "vue": "^2.5.17"
+      }
+    },
     "validate-npm-package-license": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
@@ -13240,6 +13248,11 @@
       "integrity": "sha512-x3LV3wdmmERhVCYy3quqA57NJW7F3i6faas++pJQWtknWT+n7k30F4TVdHvCLn48peTJFRvCpxs3UuFPqgeELg==",
       "dev": true
     },
+    "vuex": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.0.1.tgz",
+      "integrity": "sha512-wLoqz0B7DSZtgbWL1ShIBBCjv22GV5U+vcBFox658g6V0s4wZV9P4YjCNyoHSyIBpj1f29JBoNQIqD82cR4O3w=="
+    },
     "w3c-hr-time": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz",

frontend/saas-portal-web/package.json

@@ -14,8 +14,10 @@
   },
   "dependencies": {
     "axios": "^0.18.0",
+    "v-distpicker": "^1.0.20",
     "vue": "^2.5.2",
-    "vue-router": "^3.0.1"
+    "vue-router": "^3.0.1",
+    "vuex": "^3.0.1"
   },
   "devDependencies": {
     "autoprefixer": "^7.1.2",

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

@@ -1,9 +1,10 @@
 <template>
     <div>
+        <span class="tjtishi" ref="tjtishi"></span>
         <div>
-            <div class="gs-worp qy-worp" style="width: 100%">
+            <div class="gs-worp qy-worp tj-up">
                 <div class="qy-title" style="position: relative;">
-                    <span>企业基本信息</span>
+                    <span>完善企业信息</span>
                     <div class="qy-anniu">
                         <span @click= "Preservation" class="qy-xiugai dianji" style="left: 0">保存</span>
                         <span @click= "tjquxiao" class="qy-quxiao xs">取消</span>
@@ -13,32 +14,29 @@
                     <ul>
                         <li>
                             <span class="qy-biaoti"><span class="xingxing">*</span>公司名称</span>
-                            <input type="text">
+                            <input ref="qyname" @input= "spaceName" type="text">
+                            <span ref="qyno" style="color:red"></span>
                         </li>
                         <li>
-                            <span class="qy-biaoti"><span class="xingxing">*</span>营业执照</span>
-                            <input type="text">
+                            <span class="qy-biaoti">所属行业</span>
+                            <select ref="qyindustry" style="width:71%" name="selectAge" id="selectAge">   
+                                <option value="飞飞公司">飞飞公司</option>   
+                                <option value="飞飞公司">飞飞公司</option>   
+                                <option value="飞飞公司">飞飞公司</option>   
+                            </select>
                         </li>
                         <li style="height:60px;">
-                            <span class="qy-biaoti"><span class="xingxing">*</span>注册地址</span>
+                            <span class="qy-biaoti">公司地址</span>
                             <div class="addbiaoqian">
-                                <input type="text">
-                                <input class="qy-xiangxi" type="text" placeholder="输入企业详细地址">
+                                <v-distpicker @province= 'qyprovince'
+                                              @city= 'qycity'
+                                              @area= 'qyarea'
+                                >
+                                </v-distpicker>
+                                <input ref="address" class="qy-xiangxi" type="text" placeholder="输入企业详细地址">
                             </div>
                         </li>
-                        <li>
-                            <span class="qy-biaoti">官方地址</span>
-                            <select style="width:71%" name="selectAge" id="selectAge">   
-                                <option value="1">飞飞公司</option>   
-                                <option value="2">飞飞公司</option>   
-                                <option value="3">飞飞公司</option>   
-                            </select>
-                        </li>
-                        <li>
-                            <span class="qy-biaoti">所属行业</span>
-                            <input type="text">
-                        </li>
-                        <li>
+                        <!-- <li>
                             <span class="qy-biaoti">公司标签</span>
                             <div class="addbiaoqian">
                                 <span v-if= "tjbiaoqian" class="tj-biaoqian">暂无标签</span>
@@ -48,19 +46,26 @@
                                 <input type="text" ref="biaoqian" name="" id="biaoqian" placeholder="请输入小于等于10个字符">
                                 <span @click= "addbiaoqian" class="dianji">添加标签</span>
                             </div>
-                        </li>
+                        </li> -->
                     </ul>
                 </div>
             </div>
-            <div class="gs-worp qy-worp" style="width: 100%">
+            <div class="gs-worp qy-worp tj-down">
                 <div class="qy-title">
-                    <span>管理员信息</span>
+                    <span>完善个人信息</span>
                 </div>
                 <div class="qy-conent">
                     <ul>
-                        <li><span class="qy-biaoti">姓名</span><span>飞飞有限公司</span></li>
-                        <li><span class="qy-biaoti">手机号</span><span>飞飞有限公司</span></li>
-                        <li><span class="qy-biaoti">邮箱</span><input type="text"></li>
+                        <li>
+                            <span class="qy-biaoti"><span class="xingxing">*</span>姓名</span>
+                            <input @input= "yzusername" ref="name" type="text">
+                            <span ref="usname" style="color:red"></span>
+                        </li>
+                        <li><span class="qy-biaoti">手机号</span><span>{{mytoken.account.mobile}}</span></li>
+                        <li>
+                            <span class="qy-biaoti">邮箱</span>
+                            <input ref="email" type="email">
+                        </li>
                     </ul>
                 </div>
             </div>
@@ -69,15 +74,30 @@
 </template>
 
 <script>
+import VDistpicker from 'v-distpicker'
     export default {
         data(){
             return {
                 tjbiaoqian:true,//标签切换
                 biaoqian:[],//标签数组
+                province:'',//省
+                city:'',//市
+                area:'',//区
+                qymingzi: '',
+                mytoken: JSON.parse(localStorage.getItem('app-state-session'))//本地储存的用户信息
             }
         },
+        components:{
+            VDistpicker
+        },
         mounted(){
-
+            this.$ajax.get('../../../static/data.json')
+            .then(res=>{
+                // console.log('请求成功',res.data);
+            })
+            .catch(err=>{
+                // console.log('请求失败',err);
+            });
         },
         methods: {
             //取消添加企业
@@ -85,10 +105,89 @@
                 document.documentElement.scrollTop = 0;
                 this.$router.push({name:'company',}); 
             },
+            //测试企业名称
+            spaceName(){
+                let qyname = this.$refs.qyname.value;//公司名字
+                if(qyname == ''){
+                    this.$refs.qyno.innerHTML = '企业名不能为空';
+                } else {
+                    this.$refs.qyno.innerHTML = '';
+                    this.$ajax.get("http://192.168.253.12:32323/"+`?spaceName=${qyname}`)
+                    .then(res=>{
+                        console.log(res);
+                        this.qymingzi = on;
+                        console.log(this.qymingzi)
+                    })
+                    .catch(err=>{
+                        console.log(err);
+                        this.$refs.qyno.innerHTML = '企业已注册';
+                    })
+                }
+            },
+            //验证个人姓名
+            yzusername(){
+                let name = this.$refs.name.value;//个人姓名
+                if (name == '') {
+                    this.$refs.usname.innerHTML = '姓名不能为空'
+                } else {
+                    this.$refs.usname.innerHTML = ''
+                }
+            },
             //保存
             Preservation(){
-                document.documentElement.scrollTop = 0;
-                this.$router.push({name:'company',}); 
+                let qyname = this.$refs.qyname.value;//公司名字
+                let qyindustry = this.$refs.qyindustry.value;//所属行业
+                let address = this.province+this.city+this.area+this.$refs.address.value;//公司详细地址
+                let name = this.$refs.name.value;//个人姓名
+                let email = this.$refs.email.value;//邮箱
+                // let mobile = this.$store.state.data.mobile;//手机号
+                let mytoken = JSON.parse(localStorage.getItem('app-state-session'));
+                let token = String(mytoken.token);
+                let uu = mytoken.account.uu;
+                let mobile = mytoken.account.mobile;//手机号
+                let company = {'name':qyname,'address':address};
+                let account = {'realname':name,'email':email,'mobile':mobile, 'uu':uu}
+                if (name != '' && qyname != '') {
+                    this.$ajax({
+                        url:"http://192.168.253.31:8560/api/account/accountCenter/companyAccount/save",
+                        method: 'post',
+                        data: {
+                            companyRegDTO:company,
+                            accountRegDTO:account,
+                            type: 0
+                        },
+                        headers: {
+                            "Authorization":token,
+                        }
+                    })
+                    .then(res=>{
+                        console.log("请求成功"+res)
+                        document.documentElement.scrollTop = 0;
+                        // this.$router.push({name:'company', params:{company:company,account:account}});
+                        this.$router.push({name:'company'})
+                    })
+                    .catch(err=>{
+                        console.log("请求失败"+err)
+                    })
+                } else {
+                    this.$refs.tjtishi.innerHTML = '企业名称或姓名不能为空'
+                    setTimeout(() => {
+                        this.$refs.tjtishi.innerHTML = ''
+                    }, 2000);
+                }
+                
+            },
+            //获取省
+            qyprovince(sheng){
+                this.province = sheng.value;
+            },
+            //市
+            qycity(shi){
+                this.city = shi.value;
+            },
+            //区
+            qyarea(qu){
+                this.area = qu.value;
             },
             //添加标签
             addbiaoqian(){
@@ -102,5 +201,34 @@
 </script>
 
 <style scoped>
-
+.tjtishi {
+    color: red;
+    display: block;
+    text-align: center;
+    height: 20px;
+}
+.tj-up {
+    width: 100%;
+    margin-bottom: 0px;
+    border-bottom: 0;
+    padding-bottom: 1px;
+    border-radius: 4px 4px 0 0;
+}
+.tj-up li {
+    margin-bottom: 26px;
+}
+.tj-down {
+    width: 100%;
+    border-top: 0;
+    margin-bottom: 100px;
+}
+.tj-down li {
+    margin-bottom: 26px;
+}
+.tj-down div:nth-child(2) {
+    margin-bottom: 100px;
+}
+.addbiaoqian>>>.distpicker-address-wrapper select {
+    height: 30px;
+}
 </style>

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

@@ -61,19 +61,20 @@
             <div v-for="(d , i) in arr " :key="i" class="gs-xiangqing xs">
                 <div class="left gs-xqleft" @click= "chakanxq">
                     <div class="gs-lefttext">
-                        <p class="gs-qynema"><span>企业名称：</span>{{d.name}}</p>
-                        <p><span>管理员：</span>飞飞飞飞</p>
-                        <p><span>开通日期：</span>{{d.time}}</p>
+                        <p class="gs-qynema"><span>企业名称：</span>{{d.address}}</p>
+                        <p><span>管理员：</span>{{d.name}}</p>
+                        <p v-if= "d.time"><span>开通日期：</span>{{d.time}}</p>
                     </div>
                 </div>
                 <div class="right gs-xqright">
                     <div class="gs-border">
-                        <span v-if="d.kaitong" class="gs-btn1 dianji">进入服务</span>
+                        <span v-if= "d.saas_" class="gs-btn1 dianji" @click="jinru(d.id)">进入服务</span>
                         <span v-else @click= "kaitong" class="gs-btn1 kaitong xs">开通服务</span>
                     </div>
                     <div>
-                        <span v-if = "d.moren" class="gs-btn2 gs-btn3">默认企业</span>
-                        <span v-else @click= "szmoren" class="gs-btn2 xs">设为默认</span>
+                        <span v-if = "d.default_" class="gs-btn2 gs-btn3">默认企业</span>
+                        <span v-else @click="szmoren(i)" class="gs-btn2 xs">设为默认</span>
+                        
                     </div>
                 </div>
             </div>
@@ -91,50 +92,97 @@
         data(){
             return {
                 biaoqian: [],//标签数组
+                index:0,
                 ktsass: true,//开通sass
                 moren: true,//开通默认
-                arr: [
-                    { name:"公司", time:"2018年11月20", kaitong: true, moren: true},
-                    { name:"df公司", time:"2018年11月23", kaitong: false, moren: false},
-                    { name:"fdf公司", time:"2018年11月24", kaitong: true, moren: false},
-                ]
+                comdata: this.$store.state.data,//登录成功后的本地数据
+                mytoken: JSON.parse(localStorage.getItem('app-state-session')),//本地储存的用户信息
+                arr: []//企业列表信息
             }
         },
         mounted(){
             this.boxheight();
+            // console.log("我是子路由的"+this.comdata)
+            this.addqy();
+            let mytoken = JSON.parse(localStorage.getItem('app-state-session'));
+            let token = String(mytoken.token);
+            // console.log(mytoken.account)
+            this.$ajax({
+                    url:"http://192.168.253.31:8560/api/account/accountCenter/company/list",
+                    method: 'get',
+                    params: {
+                        mobile: mytoken.account.mobile
+                    },
+                    headers: {
+                        "Authorization":token,
+                        "Content-Type":"application/x-www-form-urlencoded"
+                    }
+                })
+                .then(res=>{
+                    this.arr = res.data.data
+                    // console.log(res.data.data)
+                })
+                .catch(err=>{
+                    console.log("请求失败",err)
+                })
         },
         methods: {
-            //没有内容也要有一定的高度
-            boxheight(){
-                let H = $(".gs-qiyebox").height();
-                if (H <= 500) {
-                    $(".gs-qiyebox").css("height",'500px')
-                } else {
-                    $(".gs-qiyebox").css("height",'')
-                }
-            },
-            //添加企业
-            tianjia(){
-                document.documentElement.scrollTop = 0;
-            },
-             //添加企业标签
-            addbiaoqian(){
-                this.biaoqian.push(this.$refs.biaoqian.value)
-                this.tjbiaoqian = false;
-            },
-            //关闭弹窗
-            guanbitc(){
-                $(".tanchuang").css("display","none");
-                $(".zhezhao").css("display","none");
-            },
             //设置默认弹窗
-            szmoren(){
+            szmoren(i){
+                this.index = i;
                 $(".szmoren").css("display","block");
                 $(".zhezhao").css("display","block");
             },
             //确认默认
             addmoren(){
-                this.moren = false;
+                let i = this.index;
+                let token = this.mytoken.token;
+                this.$ajax({
+                    url:'http://192.168.253.31:8560/api/account/accountCenter/bind/defaultCompany',
+                    method: 'post',
+                    data:{
+                        companyId: this.arr[i].id,
+                        accountId: this.mytoken.account.id
+                    },
+                    headers: {
+                        "Authorization":token,
+                        // "Content-Type":'application/x-www-form-urlencoded'
+                    }
+                })
+                .then(res=>{
+                    // console.log('请求成功',res);
+                    this.moren = false;
+                })
+                .catch(err=>{
+                    console.log('请求失败',err);
+                });
+                
+            },
+            //进入服务
+            jinru(id){
+                let token = this.mytoken.token;
+                this.$ajax({
+                    url: 'http://192.168.253.31:8560/api/auth/switch/company?companyId='+id,
+                    method :'get',
+                    headers: {
+                        "Authorization":token,
+                    }
+                })
+                .then(res=>{
+                    let mytoken = res.data.data.token;
+                    let session=JSON.parse(localStorage.getItem('app-state-session'));
+                    session.account.companyId=id;
+                    session.span = session.timestamp - new Date().getTime();
+                    session.token=mytoken;
+                    debugger
+                    localStorage.setItem('app-state-session',JSON.stringify(session));
+                    window.location.href = 'http://192.168.0.181';
+                    console.log('请求成功',res)
+                })
+                .catch(err=>{
+                    console.log('请求失败',err)
+                })
+            
             },
             //开通sass
             kaitong(){
@@ -154,7 +202,33 @@
             chakanxq(){
                 document.documentElement.scrollTop = 0;
                 this.$router.push({name:'details',});
-            }
+            },
+             //添加企业
+            tianjia(){
+                document.documentElement.scrollTop = 0;
+            },
+            addqy(){
+
+            },
+             //添加企业标签
+            addbiaoqian(){
+                this.biaoqian.push(this.$refs.biaoqian.value)
+                this.tjbiaoqian = false;
+            },
+            //关闭弹窗
+            guanbitc(){
+                $(".tanchuang").css("display","none");
+                $(".zhezhao").css("display","none");
+            },
+            //没有内容也要有一定的高度
+            boxheight(){
+                let H = $(".gs-qiyebox").height();
+                if (H <= 500) {
+                    $(".gs-qiyebox").css("height",'500px')
+                } else {
+                    $(".gs-qiyebox").css("height",'')
+                }
+            },
         }
     }
 </script>

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

@@ -22,12 +22,11 @@
                     <li><a href="#"><span>特色</span></a></li>
                     <!-- <li><router-link to="/enterprise"><a href="#"><span>特色</span></a></router-link></li> -->
                     <li><a href="#"><span>功能</span></a></li>
-                    <li><a href="#"><span>帮助中心</span></a></li>
-                    <li><a href="#"><span>联系我们</span></a></li>
-                    <!-- <li class="login">
-                        <span class="btn1"><img src="../../../static/img/assets/denglu3x.png" alt="">登录  &nbsp;</span>
-                        <span class="register"><img src="../../../static/img/assets/zhuce3x.png" alt="">注册</span>
-                    </li> -->
+                    <li><a href="https://uas.usoftchina.com/about" target="_blank"><span>关于我们</span></a></li>
+                    <li>
+                        <a href="#"><span class="">{{mytoken.realname}}</span></a>
+                        <a href=""><span class="">账户中心</span></a>
+                    </li>
                 </ul>
             </div>
         </div>
@@ -56,16 +55,16 @@
                         <div class="left gr-right">
                             <ul>
                                 <li>
-                                    <span>用户名</span><span>分分分你</span>
+                                    <span>姓名</span><span>{{mytoken.realname}}</span>
                                 </li>
                                 <li>
-                                    <span>UU号</span><span>分分分你</span>
+                                    <span>UU号</span><span>{{mytoken.uu}}</span>
                                 </li>
                                 <li>
-                                    <span>邮箱</span><span>分分分你</span>
+                                    <span>邮箱</span><span>{{mytoken.email}}</span>
                                 </li>
                                 <li>
-                                    <span>手机号</span><span>分分分你</span>
+                                    <span>手机号</span><span>{{mytoken.mobile}}</span>
                                 </li>
                             </ul>
                         </div>
@@ -110,7 +109,8 @@
             return{
                 nowindex: 0,//tab切换
                 tianjiaqiye: true,//添加企业切换
-                mydata: this.$route.query.mydata,
+                mytoken: JSON.parse(localStorage.getItem('app-state-session')).account,//本地储存的用户信息
+                mydata: this.$route.query.mydata,//登录成功传递的数据
                 tab: [
                     {name: '企业信息'},
                     {name: '个人信息'},
@@ -119,7 +119,8 @@
             }
         },
         mounted(){
-            console.log(this.mydata)
+            // console.log("我是父路由的"+this.mydata);
+            // console.log(this.mydata)
         },
         components: {
             

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

@@ -1,6 +1,6 @@
 <template>
     <div>
-		<div id="navigation" class="navbar-inverse navbar-fixed-top animated-header">
+		<div id="navigation" class="navbar-inverse navbar-fixed-top animated-header" style="padding: 3px;">
         <div class="container">
             <div class="navbar-header">
                 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
@@ -21,8 +21,7 @@
                     <!-- <li><a href="#feature"><span>特色</span></a></li> -->
                     <li @click= "home"><router-link to="/enterprise"><a href="#"><span>特色</span></a></router-link></li>
                     <li><a href="#service"><span>功能</span></a></li>
-                    <li><a href="#prototype"><span>帮助中心</span></a></li>
-                    <li><a href="#prototype"><span>联系我们</span></a></li>
+                    <li><a href="https://uas.usoftchina.com/about" target="_blank"><span>关于我们</span></a></li>
                     <li class="login">
                         <!-- <span class="btn1"><img src="../../../static/img/assets/denglu3x.png" alt="">登录  &nbsp;</span>
                         <span class="register"><img src="../../../static/img/assets/zhuce3x.png" alt="">注册</span> -->
@@ -40,16 +39,13 @@
 			<!-- 遮罩 -->
 			<div class="zhezhao"></div>   
 			<div id="box" class="box">
-				<div>
-					<img @click="tcon" class="tc-on xs" style="float: right;padding: 10px" src="../../../static/img/qiye/chahao.png" alt="">
-				</div>
+				<img @click="tcon" class="tc-on tc-guanbi" style="position: absolute;top:10px;right:10px" src="../../../static/img/qiye/chahao.png" alt="">
 				<iframe width="430" height="440"></iframe>
 			</div>
-		<!-- 登录嵌套 -->
-			<!-- <iframe id="box" class="qiantao qiantaodl" src="http://10.1.51.91:3001/sassLogin?appId=sp&returnURL=https://www.usoftchina.com"></iframe> -->
-		<!-- 注册嵌套 -->
-			<!-- <iframe id="box-zc" class="qiantao" src="http://10.1.51.91:3001/sassLogin/register?appId=sp&returnURL=https://www.usoftchina.com "></iframe> -->
-			
+			<div class="box tiyan" >
+				<img @click="tcon" class="tc-on tc-guanbi" style="position: absolute;top:10px;right:10px" src="../../../static/img/qiye/chahao.png" alt="">
+				fdsfdfdf
+			</div>
 <!--Home Slider==================================== -->
 		<section id="home-slider">
             <div id="slider" class="sl-slider-wrapper"> 
@@ -62,7 +58,8 @@
                         </div>
 						<!-- 首页内容 -->
 						<div class="my-text">
-							<button class='my-tiyan'>立即体验</button> 
+							
+							<button @click="tiyan" class='my-tiyan dianji'>立即体验</button> 
 						</div>
 						<div class="slide-caption">
                         	<div class="caption-content"></div>
@@ -73,7 +70,6 @@
 		</section>
 		
     <!-- End Home SliderEnd==================================== -->
-			
 			<!-- 特色 -->
 			<section id="feature">
 				<div class="container ts-worp">
@@ -311,7 +307,12 @@
 			home(){
                 document.documentElement.scrollTop = 0;
 			},
-			btn1(){
+			tiyan(){ //体验
+				console.log(123)
+				$(".tiyan").css("display","block");
+				$(".zhezhao").css("display","block");
+			},
+			btn1(){ //登录
 				var Store = (function(){
 					var storeKey = 'app-state', store = window.localStorage;
 					return {
@@ -418,6 +419,7 @@
 								// 登录成功跳转到企业设置
 								console.log("跳转前");
 								me.$router.push({path:'/enterprise',query: {mydata :account}});
+								me.$store.state.data = account;
 								console.log("跳转后"); 
 							} else {
 								//如果开通过sass直接跳转到sass页面
@@ -443,7 +445,8 @@
 			tcon(){
 				$('#box-zc').css('display','none');
 				$('#box').css('display','none');
-				$(".zhezhao").css("display","none")
+				$(".zhezhao").css("display","none");
+				$(".tiyan").css("display","none");
 			},
 			zdtoken(){
 				var Store = (function(){
@@ -535,5 +538,14 @@
 </script>
 
 <style scoped>
-
+.tc-guanbi {
+	cursor: pointer;
+}
+.tiyan {
+	display: none;
+	width: 400px;
+	height: 200px;
+	margin-left: -200px;
+    margin-top: -100px;
+}
 </style>

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

@@ -11,11 +11,9 @@
                 <div class="qy-conent">
                     <ul>
                         <li><span class="qy-biaoti">公司名称</span><span>飞飞有限公司</span></li>
-                        <li><span class="qy-biaoti">营业执照号</span><span>飞飞有限公司</span></li>
-                        <li><span class="qy-biaoti">注册地址</span><span>飞飞有限公司</span></li>
-                        <li><span class="qy-biaoti">官方地址</span><span>飞飞有限公司</span></li>
                         <li><span class="qy-biaoti">所属行业</span><span>飞飞有限公司</span></li>
-                        <li><span class="qy-biaoti">营业范围</span><span class="qy-biaoqian">飞飞标签</span><span class="qy-biaoqian">飞飞标签</span></li>
+                        <li><span class="qy-biaoti">公司地址</span><span>飞飞有限公司</span></li>
+                        <!-- <li><span class="qy-biaoti">营业范围</span><span class="qy-biaoqian">飞飞标签</span><span class="qy-biaoqian">飞飞标签</span></li> -->
                     </ul>
                 </div>
             </div>
@@ -26,7 +24,7 @@
                 <div class="qy-conent">
                     <ul>
                         <li><span class="qy-biaoti">姓名</span><span>飞飞有限公司</span></li>
-                        <li><span class="qy-biaoti">手机号</span><span>飞飞有限公司</span></li>
+                        <li><span class="qy-biaoti">手机号</span><span>1588888888888</span></li>
                         <li><span class="qy-biaoti">邮箱</span><span>飞飞有限公司</span></li>
                     </ul>
                 </div>
@@ -49,16 +47,16 @@
                             <span>飞飞有限公司</span>
                         </li>
                         <li>
-                            <span class="qy-biaoti"><span class="xingxing">*</span>营业执照</span>
+                            <span class="qy-biaoti">所属行业</span>
                             <span>飞飞有限公司</span>
                         </li>
-                        <li style="height:60px;">
-                            <span class="qy-biaoti"><span class="xingxing">*</span>注册地址</span>
+                        <li>
+                            <span class="qy-biaoti">公司地址</span>
                             <span>飞飞有限公司</span>
                         </li>
-                        <li>
-                            <span class="qy-biaoti">官方地址</span>
-                            <input type="text">
+                        <!-- <li style="height:60px;">
+                            <span class="qy-biaoti"><span class="xingxing">*</span>注册地址</span>
+                            <span>飞飞有限公司</span>
                         </li>
                         <li>
                             <span class="qy-biaoti">所属行业</span>
@@ -77,11 +75,7 @@
                                     <input style="100%" type="text" placeholder="飞飞公司" />
                                 </div>
                             </div>
-                            <!-- <div class="tj-gsbiaoqian">
-                                <input type="text" ref="biaoqian" name="" id="biaoqian" placeholder="请输入小于等于10个字符">
-                                <span @click= "addbiaoqian" class="dianji">添加标签</span>
-                            </div> -->
-                        </li>
+                        </li> -->
                     </ul>
                 </div>
             </div>
@@ -121,7 +115,6 @@
             xiugaiqiye(){
                 document.documentElement.scrollTop = 0;
                 this.xiugai = false;
-                // this.$router.push({name:'modify'});
             },
             // 取消修改
             quxiaoxiugai(){

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

@@ -1,301 +0,0 @@
-<template>  
-    <div class="submit">      
-        <div class="dialog-mask"></div>      
-        <div class="dialog-box">        
-            <div class="dialog-box__top">          
-                <h5 class="title bg__white">提交</h5>          
-                <span class="el-icon-close button button__close" @click="close_()"></span>        
-            </div>        
-                <div class="dialog-box__content">          
-                    <div class="dialog-box__content_title clearfix">            
-                        <div><span class="gray_font">审批处理人：</span><span class="black_font">{{lastAprOpinion.createdBy}}</span></div>            
-                        <div><span class="gray_font">审批结论：</span><span class="black_font">{{lastAprOpinion.opinionResultCode}}</span></div>            
-                        <div><span class="gray_font">否决原因：</span><span class="black_font">{{lastAprOpinion.rejectReasonCode}}</span></div>            
-                        <div><span class="gray_font ">备注：</span><span class="black_font">{{lastAprOpinion.opinionTxt}}</span></div>            
-                        <div><span class="gray_font">提交时间：</span><span class="black_font margin_right">{{lastAprOpinion.createdDate}}</span><span class="black_font">{{lastAprOpinion.createdDate}}</span></div>          
-                </div>          
-                <div class="product-content-title">            
-                    <div>              
-                        <span class="blue_boder"></span>审批结果            
-                    </div>            
-                    <div>              
-                        <el-radio-group v-model="submitResults">                
-                            <el-radio :label="0">同意</el-radio>                
-                            <el-radio :label="1">否定</el-radio>              
-                            </el-radio-group>            
-                    </div>            
-                    <div class="product-content-title_deny" v-show="submitResults">              
-                        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-position="top" label-width="100px" class="demo-ruleForm" hide-required-asterisk>                
-                            <el-form-item label="否定类型" prop="region" class="negation">                  
-                                <el-select class="form__select" v-model="ruleForm.region" placeholder="请选择" @change="changeValueB">                    
-                                    <el-option  v-for="item in patchClassCode"                  
-                                    :key="item.configCode"                  
-                                    :label="item.configTitle"                  
-                                    :value="item.configCode">
-                                    </el-option>                  
-                                </el-select>                
-                            </el-form-item>                
-                            <el-form-item label="否决原因" prop="desc" class="cause">                  
-                                <el-select class="form__select" v-model="ruleForm.desc" placeholder="请选择" @change="getRejectReasonCode">                    
-                                    <el-option  v-for="item in patchClassCodeB"                  
-                                    :key="item.configCode"                  
-                                    :label="item.configTitle"                  
-                                    :value="item.configCode">
-                                    </el-option>                  
-                                </el-select>               
-                            </el-form-item>              
-                        </el-form>            
-                    </div>            
-                    <span class="blue_boder"></span>            
-                    备注          
-                </div>          
-                <textarea v-model="lastAprOpinion.opinionTxt" onkeyup="this.value = this.value.substring(0,200)"></textarea>        
-            </div>        
-            <el-button type="primary" @click="alert_submitB()">提交</el-button>      
-        </div>      
-        <!-- 提交否决弹窗 -->      
-        <submitB v-if="alertSubmitB" @clsoe_windowAlert='close_submitB' @close_AB='close_AB' :submitResults="submitResults" :submitOper="submitOper" :opinionTxt="lastAprOpinion.opinionTxt" :rejectReasonCode="rejectReasonCode"/>  
-    </div>
-</template>
-<script>
-    // import submitB from "../submitB"; 
-    // 提交否决弹窗import {aprAudApi} from "../../js/server.js";  
-    export default {    
-        data() {      
-            return {        
-                lastAprOpinion: [],        
-                patchClassCode: [],        
-                patchClassCodeB: [],        
-                rejectReasonCode: [],        
-                valueA: '',        
-                valueB: '',        
-                indexNum: 0,        
-                submitResults: 0,        
-                alertSubmitB: false,        
-                submitOper: [],        
-                ruleForm: {          
-                    region: '',          
-                    desc: ''        
-                },        
-                rules: {          
-                    region: [            
-                        { required: true, 
-                            message: '否定类型不能为空', 
-                            trigger: 'change' 
-                        }          
-                    ],          
-                    desc: [            
-                            { required: true, 
-                            message: '否决原因不能为空', 
-                            trigger: 'change' 
-                            }          
-                        ]        
-                    }      
-                };    
-            },    
-            computed: {      
-                sendOpinionResultCode() {        
-                    if (this.submitResults) {          
-                        return 'D';        
-                    } else {          
-                        return 'P';        
-                    }      
-                }    
-            },    
-            methods: {      
-                getRejectReasonCode() {        
-                    this.rejectReasonCode.splice(0, 1, this.ruleForm.desc);        
-                    console.log(this.rejectReasonCode);      
-                },      
-                changeValueB() {        
-                    this.ruleForm.desc = '';        
-                    for (let i = 0; i < this.patchClassCode.length; i++) {          
-                        if (this.patchClassCode[i].configCode === this.ruleForm.region) {            
-                            this.indexNum = i;            
-                            break;          
-                        }        
-                    }        
-                    this.patchClassCodeB = this.patchClassCode[this.indexNum].childList;      
-                },      
-                getReason(data) {        
-                    return new Promise((resolve, reject) => {          
-                        this.$MyFetch.get(aprAudApi.taskDetail.OperationConfig, data)          
-                        .then((data = {}) => {            
-                            resolve(data);          
-                        })          
-                        .catch(err => {            
-                            console.log(err);          
-                        });        
-                    });      
-                },      
-                getTreeValue() {        
-                    var query = {          
-                        configType: 'reject_reason'        
-                        };        
-                        this.getReason(query)        
-                        .then((data) => {          
-                            this.patchClassCode = data;          
-                            console.log(this.patchClassCode, '联动数据');        
-                        })        
-                        .catch(err => {          
-                            console.log(err);        
-                        });      
-                },      
-                            
-                submitdata() {         
-                    let data = {            
-                        "opinionResultCode": this.sendOpinionResultCode,            
-                        "opinionTxt": this.lastAprOpinion.opinionTxt,            
-                        "rejectReasonCode": this.rejectReasonCode          
-                    };          
-                    this.$MyFetch.post(`${aprAudApi.taskDetail.submitOper}/${this.$route.params.id}`, data)          
-                    .then((data = {}) => {            
-                        this.submitOper = data;            
-                        console.log(this.submitOper, '一次提交成功');          
-                        })          
-                    .catch(err => {            
-                        console.log('提交失败', err);          
-                        });      
-                },      
-                close_AB() {        
-                    this.close_();        
-                    this.alertSubmitB = false;      
-                },      
-                close_() {        
-                    this.$emit("clsoe_windowAlert");      
-                },      
-                alert_submitB() {        
-                    if (this.submitResults) {          
-                        this.$refs['ruleForm'].validate((valid) => {          
-                            if (valid) {            
-                                this.submitdata();            
-                                this.alertSubmitB = true;          
-                            } else {            
-                                console.log('error submit!!');            
-                                return false;          
-                            }        
-                        });                
-                        //  let data = {                
-                            //   "opinionResultCode": 'D',                
-                            //   "opinionTxt": this.lastAprOpinion.opinionTxt,                
-                            //   "rejectReasonCode": [this.lastAprOpinion.rejectReasonCode]               
-                            // };                
-                            // this.$MyFetch.post(`${aprAudApi.taskDetail.submitOper}/${this.$route.params.id}`, data)                
-                            // .then((data = {}) => {                
-                                //   console.log(data, '提交表格数据');                
-                                // })                
-                            // .catch(err => {                
-                                //   console.log('提交失败', err.code);                
-                                // });                
-                                // this.$options.methods.close_();              
-                                // } else {                
-                                //     this.submitdata();                
-                                // let data = {                
-                                    //   "opinionResultCode": 'P',                
-                                    //   "opinionTxt": this.lastAprOpinion.opinionTxt,                
-                                    //   "rejectReasonCode": [this.lastAprOpinion.rejectReasonCode]                
-                                    // };                
-                                    // this.$MyFetch.post(`${aprAudApi.taskDetail.submitOper}/${this.$route.params.id}`, data)                
-                                    // .then((data = {}) => {                
-                                        //   console.log(data, '提交表格数据');                
-                                        // })                
-                                        // .catch(err => {                
-                                            //   console.log('提交失败', err.code);                
-                                            // });                
-                                            this.alertSubmitB = true;              
-                                            }        
-                                            console.log(this.submitResults);      
-                                            },      
-                                            close_submitB() {        
-                                                this.alertSubmitB = false;      
-                                                }    
-                                            },    
-                                            created() {       
-                                                this.$MyFetch.get(`${aprAudApi.taskDetail.submitPage}/${this.$route.params.id}`)        
-                                                .then((data = {}) => {          
-                                                    this.lastAprOpinion = data.lastAprOpinion;          
-                                                    // console.log(data, '进来就有');        
-                                                    })        
-                                                    .catch(err => {          
-                                                        console.log(err);        
-                                                    });        
-                                                    this.getTreeValue();    
-                                                    },    
-                                                    components: {      
-                                                        submitB    
-                                                        }  
-                                                    };
-</script>
-
-<style lang="less" scoped>  
-.submit{    
-    .dialog-box{      
-        font-size: 14px;      
-        line-height: 20px;      
-        width: 946px;      
-        height: 706px;      
-        .el-button {          
-            width: 200px;          
-            height: 40px;        
-        }      
-        .black_font{        
-            color: #151515;      
-        }      
-        .gray_font{        
-            color: #999999;      
-        }      
-        .dialog-box__top{       
-             box-shadow: 0 1px 6px 0 rgba(239,239,239,0.74);        
-             .title{          
-                 font-weight: bold;  
-            }      
-        }     
-        .dialog-box__content{        
-            max-height: 470px;       
-            overflow: auto;        
-            margin: 30px;        
-        .dialog-box__content_title{          
-            border-bottom: 1px solid #E5E5E5;          
-            > div {            
-                float: left;            
-                margin: 0 80px 20px 0;            
-        .margin_right{   
-            margin-right: 10px;            
-            }          
-        }       
-        }       
-        .blue_boder{            
-            border: 1px solid #538BF1;            
-            margin-right: 10px;          
-        }        
-        .product-content-title{          
-            font-size: 14px;          
-            color: #333333;         
-            text-align: left;          
-            line-height: 50px;          
-            .product-content-title_deny{            
-                border: 1px solid #E9E9E9;            
-                box-shadow: 0 2px 6px 0 rgba(0,0,0,0.08);            
-                border-radius: 4px;            
-                padding: 10px;            
-            .negation{             
-                margin-right: 500px;            
-            }            
-            .cause{              
-                .form__select{                
-                    width: 846px;              
-                }            
-            }          
-            }        
-            }        
-            > textarea {          
-                border: 1px solid #E5E5E5;          
-                border-radius: 4px;          
-                resize: none;          
-                width: 850px;          
-                height: 102px;        
-            }      
-            }    
-            }  
-            }
-</style>

frontend/saas-portal-web/src/components/footer/footer.vue

@@ -17,22 +17,15 @@
 						</ul>
 						<ul>
 							<li><span>公司</span></li>
-							<li><a href="#">关于我们</a></li>
-							<li><a href="#">企业文化</a></li>
-							<li><a href="https://www.usoftchina.com/contact">联系我们</a></li>
+							<li><a href="https://uas.usoftchina.com/about" target="_blank">关于我们</a></li>
+							<!-- <li><a href="#">企业文化</a></li> -->
 						</ul>
-						<!-- <ul>
-							<li><span>闯客网</span></li>
-							<li><a href="https://www.uuzcc.com/article/detail/13260.html">需求发布流程</a></li>
-							<li><a href="https://www.uuzcc.com/article/detail/13457.html">认证流程</a></li>
-							<li><a href="https://www.uuzcc.com/article/detail/13456.html">服务商规则</a></li>
-						</ul> -->
 						<ul>
 							<li><span>产品</span></li>
-							<li><a class="no-link">u企云服</a></li>
-							<li><a class="no-link">u软商城</a></li>
-							<li><a href="#">u智融</a></li>
-							<li><a href="#">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>
 					
@@ -62,9 +55,9 @@
 		<div class="friend-link">
 			<ul>
 				<li><span>常用链接：</span></li>
-				<li><a href="#">uas官网</a></li>
-				<li><a href="#">u软云</a></li>
-				<li><a href="#">英唐官网</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>
     </div>

frontend/saas-portal-web/src/main.js

@@ -5,13 +5,16 @@ import Vue from 'vue'
 import App from './App'
 import router from './router'
 import Axios from 'axios'
+import store from './store'
 
+Vue.prototype.$ajax = Axios;
 Vue.config.productionTip = false
 
 /* eslint-disable no-new */
 new Vue({
   el: '#app',
   router,
+  store,
   components: { App },
   template: '<App/>'
 })

frontend/saas-portal-web/src/store/index.js

@@ -0,0 +1,14 @@
+import Vue  from 'vue'
+import Vuex from 'vuex'
+Vue.use(Vuex)
+
+export default new Vuex.Store({
+    state:{
+        data: [],
+    },
+    mutations:{
+         setId(state ,  id) {
+             state.id = id   
+         }
+    }
+})

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

@@ -32,7 +32,7 @@
     top: 50%;
     left: 50%;
     transform: translate(-50%, -50%); 
-    z-index: 10;
+    z-index: 10001;
     border: 1px solid black;
     padding: 16px;
     text-align: center
@@ -135,9 +135,13 @@
 .gs-xqleft {
     width: 70%;
     height: 100%;
+    position: relative;
 }
 .gs-lefttext {
-    padding: 20px 80px;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-100%,-50%);
 }
 .gs-xqright {
     width: 30%;
@@ -305,8 +309,8 @@
     background: #F4F8FC;
     border-radius: 3px 3px 0 0;
     text-align: center;
-    height: 70px;
-    line-height: 70px;
+    height: 60px;
+    line-height: 60px;
     font-size: 16px;
     font-weight: 600;
 }
@@ -323,11 +327,11 @@
     border-radius: 2px;
 }
 .qy-conent {
-    padding: 50px 0 0 20px;
+    padding: 30px 0 0 20px;
 }
 .qy-conent li{
     list-style: none;
-    margin-bottom: 40px;
+    margin-bottom: 30px;
 }
 .qy-biaoti {
     font-family: PingFangSC-Medium;

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

@@ -80,8 +80,8 @@ main > section {
 }
 .logo-img {
     width: 123px;
-    height: 53px;
-    margin-top: -6px;
+    height: 50px;
+    margin-top: -4px;
 }
 /* 遮罩 */
 .zhezhao {
@@ -93,7 +93,7 @@ main > section {
     width: 100%;
     background: #000;
     opacity: 0.8;
-    z-index: 5;
+    z-index: 10000;
 }
 /* 登录弹窗 */
 /* input {
@@ -139,7 +139,7 @@ main > section {
     left:50%;
     margin-left: -215px;
     margin-top: -220px;
-    z-index: 10;
+    z-index: 10001;
 }
 .box-zc {
     height: 450px;
@@ -321,8 +321,8 @@ main > section {
 /* 首页内容 ..........................................*/
 .my-text {
     position: absolute;
-    top: 448px;
-    left: 100px;
+    top: 70%;
+    left: 7%;
     /* z-index: 5; */
     /* width: 468px;
     height: 300px; */

frontend/saas-portal-web/static/data.json

@@ -0,0 +1,7 @@
+{ "gsdata": [
+    { "Name": "飞飞公司", "lastName":"McLaughlin", "email": "aaaa" },
+    
+    { "Name": "ff飞飞公司", "lastName":"Hunter", "email": "bbbb"},
+    
+    { "Name": "中兴公司", "lastName":"Harold", "email": "cccc" }
+]}

frontend/saas-portal-web/static/js/mains.js

@@ -352,7 +352,7 @@ $(document).ready(function(){
             $("#navigation").removeClass("animated-header");
         } else {
             $(".navbar-brand a").css("color","inherit");
-            $("#navigation").addClass("animated-header");
+            // $("#navigation").addClass("animated-header");
         }
     });
 	
@@ -365,9 +365,9 @@ $(document).ready(function(){
     
     $('#home-slider, #slider, .sl-slider, .sl-content-wrapper').css('height',slideHeight);
 
-    $(window).resize(function(){'use strict',
-        $('#home-slider, #slider, .sl-slider, .sl-content-wrapper').css('height',slideHeight);
-    });
+    // $(window).resize(function(){'use strict',
+    //     $('#home-slider, #slider, .sl-slider, .sl-content-wrapper').css('height',slideHeight);
+    // });