Ver Fonte

Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

rainco há 7 anos atrás
pai
commit
e57ad4c9a8

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

@@ -20,7 +20,7 @@
                         </li>
                         <li>
                             <span class="qy-biaoti">所属行业</span>
-                            <select ref="qyindustry" style="width:30%;height: 32px;padding-left:5px" name="selectAge" id="selectAge">   
+                            <select ref="qyindustry" style="width:35%;height: 32px;padding-left:5px" name="selectAge" id="selectAge">   
                                 <option value="">请选择所属行业</option>
                                 <option value="贸易零售">贸易零售</option>
                                 <option value="制造加工">制造加工</option>
@@ -92,7 +92,7 @@
                         <!-- </li> -->
                         <li>
                             <span class="qy-biaoti"><span class="xingxing marght">*</span>姓<span style="width:2em;display: inline-block;"></span>名</span>
-                            <input @blur.prevent="Testingname" class="inpind" maxlength="5" type="text" ref="lookupname" placeholder="输入真实姓名,待管理员审核">
+                            <input @blur.prevent="Testingname" class="inpind" type="text" ref="lookupname" placeholder="输入真实姓名,待管理员审核">
                             <span class="warning" ref="warningname"></span>
                         </li>
                         <li>
@@ -122,7 +122,7 @@ import { setTimeout, clearTimeout } from 'timers';
                 Email: '',
                 mytoken: Session.get(),//本地储存的用户信息
                 reg: new RegExp(/[\@\#\$\%\&\*!!\¥]/),//非法字符
-                regname:new RegExp(/[\@\#\$\%\&\*!!\¥0-9a-zA-Z]/),//非法字符加数字加英文
+                regname:new RegExp(/[\@\#\$\%\&\*!!\¥0-9]/),//非法字符加数字
                 isaddress: false,//公司地址验证
                 isaddressname: false,//公司地址是否为空
                 isname: true,//姓名验证
@@ -261,7 +261,7 @@ import { setTimeout, clearTimeout } from 'timers';
                 } else {
                     this.isTestingname = true;
                     if (this.regname.test(name)) {
-                        this.$refs.warningname.innerHTML = '<img style="width:14px" src="/static/img/warning.png" alt=""> 姓名不能包含符号、数字、英文等非法字符';
+                        this.$refs.warningname.innerHTML = '<img style="width:14px" src="/static/img/warning.png" alt=""> 姓名不能包含符号、数字等非法字符';
                         this.isregname = false;
                     } else {
                         this.$refs.warningname.innerHTML = '<img style="width:14px" src="/static/img/ok.png" alt="">';
@@ -532,7 +532,7 @@ import { setTimeout, clearTimeout } from 'timers';
 }
 .qy-mobile {
     display: inline-block;
-    width: 30%;
+    width: 35%;
     text-align: left;
 }
 .qy-anniu > span {

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

@@ -58,7 +58,7 @@
       </div>
     </div>
 
-        <div class="gs-qiyebox over" ref="qiyebox" :class="isheigh ? 'heigh' : ''">
+        <div class="gs-qiyebox over" ref="qiyebox" :class="isheigh ? 'heigh' : ''" style="padding-bottom: 50px;">
             <div class="gs-xiangqing dotted">
                 <router-link to="/addenterprise">
                     <div class="gs-tianja" @click= "addEnterprise">
@@ -396,6 +396,7 @@
     background-image: url(/static/img/list.png);
     background-position-x: 50%;
     background-position-y: 84%;
+    background-size: 157%;
 }
 .green:hover {
     background: #2da74a;
@@ -406,4 +407,7 @@
 .tc-context > p {
     font-size: 14px;
 }
+.el-dropdown {
+    line-height: 25px;
+}
 </style>

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

@@ -48,7 +48,7 @@
                         </li>
                         <li>
                             <span class="qy-biaoti">所属行业</span>
-                            <select ref="qyindustry" style="width:30%;height: 32px" name="selectAge" id="selectAge">   
+                            <select ref="qyindustry" style="width:35%;height: 32px" name="selectAge" id="selectAge">   
                                 <option value="">请选择所属行业</option>
                                 <option value="贸易零售">贸易零售</option>
                                 <option value="制造加工">制造加工</option>

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

@@ -6,7 +6,9 @@
             <ul>
                 <li class="profile">
                 <span>
-                    <img style="width: 64px;margin-top: -3px;" src="/static/img/xiaologo@2x.png" alt="">
+                    <a href="https://www.usoftchina.com/" target="_blank" rel="noopener noreferrer" style="color:white">
+                        <img style="width: 18px;margin-top: -3px;" src="/static/img/xiaologo.png" alt="">优软云
+                    </a>
                 </span>
                     <span class="user-info">
                         <span id="user-info">{{mytoken.realname || mytoken.username}} | </span>
@@ -36,52 +38,26 @@
                 <li><router-link to="/home"><a @click="setTurnHome"><span style="color: white">首页</span></a></router-link></li>
                 <li><a href="#" @click="feature"><span>特色</span></a></li>
                 <li><a href="#" @click="service"><span>功能</span></a></li>
+                <!-- <router-link to="/invitation"><a ><span style="color: white">邀请</span></a></router-link> -->
                 <li>
-                <el-dropdown trigger="hover" size="mini" placement='bottom-start'>
-                    <a><span style="color:white;font-size: 16px">帮助中心</span></a>
-                    <el-dropdown-menu slot="dropdown">
-                        <el-dropdown-item>
-                            <span @click="navproblem">常见问题</span>
-                        </el-dropdown-item>
-                    </el-dropdown-menu>
-                </el-dropdown>
+                    <el-menu  
+                    class="el-menu-demo" 
+                    mode="horizontal" 
+                    background-color="#1C1F48"
+                    text-color="#fff"
+                    active-text-color ='#fff'
+                    @select="handleSelect">
+                        <el-submenu index="1">
+                            <template slot="title">帮助中心</template>
+                            <el-menu-item index="1-1">常见问题</el-menu-item>
+                        </el-submenu>
+                    </el-menu>
                 </li>
                 <li><a href="https://uas.usoftchina.com/about" target="_blank"><span>关于我们</span></a></li>
             </ul>
             </div>
             </div>
         </div>
-        <!-- <div id="navigation" class="navbar-inverse navbar-fixed-top animated-header">
-        <div class="container">
-            <div class="navbar-header">
-                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-                    <span class="sr-only">Toggle navigation</span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                </button>
-                <h1 class="navbar-brand">
-                    <a href="#">
-                        <img class="logo-img" src="/static/img/assets/dalogo@2x_1.png" alt="">
-                    </a>
-                </h1>
-            </div>
-            <div class="collapse navbar-collapse navbar-right" role="navigation">
-                <ul id="nav" class="nav navbar-nav menu">
-                    <li><router-link to="/home"><a href="#" @click="setTurnHome"><span style="color: white">首页</span></a></router-link></li>
-                    <li><a href="https://uas.usoftchina.com/about" target="_blank"><span>关于我们</span></a></li>
-                    <li style="margin-left:30px;margin-top: 13px;cursor: pointer;">
-                        <span style="color:#fff;font-size: 16px;">
-                            <img style="width: 20px;" src="/static/img/assets/denglu3x.png" alt="">
-                            {{mytoken.realname || mytoken.username}}
-                        </span>
-                        <span style="color:#fff;" @click="loginout">【退出】</span>
-                    </li>
-                </ul>
-            </div>
-        </div>
-        </div> -->
-
         <iframe hidden :src="setTokenPage"></iframe>
         <div class="gs-worp">
             <!-- 顶部tab -->
@@ -194,9 +170,9 @@
                                     <span>{{d.admin}}</span>
                                     <span>{{d.adminMobile}}</span>
                                 </span>
-                                <span v-if='d.status == 0'>未通过</span>
-                                <span v-else-if='d.status == 1'>已批准</span>
-                                <span v-else-if='d.status == 2'>待批准</span>
+                                <span v-if='d.status == 0' style="color: #FF3900;">未通过</span>
+                                <span v-else-if='d.status == 1' style="color: #3CC600;">已通过</span>
+                                <span v-else-if='d.status == 2' style="color: #1E88F5;">待批准</span>
                                 <span><button v-if="d.status == 0" @click="Rejoin(i)" class="news-btn">重新加入</button></span>
                             </li>
                             <li v-if="!isnews" class="wushuju">
@@ -207,7 +183,7 @@
                         <div v-if="isnews" class="my-pagination">
                             <el-pagination
                                 background
-                                :page-size="10"
+                                :page-size= size
                                 @current-change="handleCurrentChange"
                                 layout="prev, pager, next"
                                 :total= listtotal>
@@ -244,13 +220,14 @@ import { setTimeout } from 'timers';
                 arr: [],//分页数据
                 list:[],//全部数据
                 listtotal:1,
-                size: 1000,//每页显示数量
+                size: 10,//每页显示数量
             }
         },
         mounted(){
             let phone = this.mytoken.mobile.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');
             this.mobile = phone;
             this.boxheight();
+            $("#navigation").removeClass("animated-header");
         },
         watch:{
             arr:function(){
@@ -284,14 +261,14 @@ import { setTimeout } from 'timers';
                     }];
                     // tab切换到消息的时候获取申请列表
                     this.$store.state.isloading = true;
-                    let _this = this
+                    let _this = this;
                     $.ajax({
                         url: this.$url.api+'/api/commons/remind/apply/list',
                         type: "GET",
                         data:{
                             condition:JSON.stringify(param),
                             number:1,
-                            size:this.size
+                            size:1000
                         },
                         headers:{
                             'Access-Control-Allow-Origin':'*',
@@ -301,19 +278,20 @@ import { setTimeout } from 'timers';
                         success:function(res){
                             _this.$store.state.isloading = false;
                             if (res.success) {
+                                // _this.list = res.data.list;
                                 _this.list = [];
                                 let list2 = [];
                                 list2 = res.data.list;
                                 for (let i = 0; i < list2.length; i++) {
                                     for (let j = i + 1; j < list2.length; j++) {
-                                        if(list2[i].companyName == list2[j].companyName && list2[i].status == 0){
-                                            j = ++i;
+                                        if(list2[i].companyName == list2[j].companyName && list2[j].status == 0){
+                                            list2.splice(j,1)
                                         }
                                     }
                                     _this.list.push(list2[i])
                                 }
                                 _this.listtotal = _this.list.length;
-                                _this.pagingtion(1,10);
+                                _this.pagingtion(1,_this.size);
                                 // _this.$store.state.ishongdian = false;//红点
                             }
                         }
@@ -349,7 +327,7 @@ import { setTimeout } from 'timers';
             // 分页
             handleCurrentChange(val) {
                 document.documentElement.scrollTop = 0;
-                this.pagingtion(val,10);
+                this.pagingtion(val,this.size);
             },
             //分页函数
             pagingtion(min,max){
@@ -434,19 +412,26 @@ import { setTimeout } from 'timers';
                     })
                 }
             },
+            //ele常见问题
+            handleSelect(){
+                this.navproblem();
+            },
             //常见问题
             navproblem(){
                 this.$router.push({name: 'Home', params: {isporblem: false}})
                 this.$store.commit('problemfalse');
                 document.documentElement.scrollTop = 0;
+                this.setTurnHome();
             },
             // 特色
             feature(){
-                this.$router.push({name: 'Home', params: {isfeature: 700}})
+                this.$router.push({name: 'Home', params: {isfeature: 700}});
+                this.setTurnHome();
             },
             //功能
             service(){
-                this.$router.push({name: 'Home', params: {isfeature: 3550}})
+                this.$router.push({name: 'Home', params: {isfeature: 3550}});
+                this.setTurnHome();
             },
             gohome(e){
                 this.$store.commit('problemtrue')
@@ -476,6 +461,24 @@ import { setTimeout } from 'timers';
 .gsqiye div:last-child {
     margin-bottom: 100px;
 }
+
+
+.el-menu-demo {
+    border-bottom: 0;
+}
+.el-menu-demo >>> div {
+    font-size: 16px !important;
+    background: #1C1F48;
+}
+.el-menu-demo >>> .el-submenu__title:hover {
+    background: #1C1F48 !important;
+}
+.el-menu-demo >>> .el-submenu__title {
+    padding: 0px 0px 0px 10px;
+    height: 48px;
+    line-height: 48px;
+    border-bottom: 2px solid #409EFF;
+}
 .modifyname {
     margin-left: 80px;
     font-family: PingFangSC-Regular;
@@ -611,7 +614,7 @@ import { setTimeout } from 'timers';
     padding: 100px 0px;
 }
 .wushuju > img {
-    width: 18%
+    width: 11%
 }
 .wushuju > p {
     font-family: PingFangSC-Regular;

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

@@ -5,14 +5,18 @@
           <ul>
             <li class="login" v-if="!account" style="margin-left: 30px;">
               <span>
-                <img style="width: 64px;margin-top: -3px;" src="/static/img/xiaologo@2x.png" alt="">
+                <a href="https://www.usoftchina.com/" target="_blank" rel="noopener noreferrer" style="color:white">
+                  <img style="width: 18px;margin-top: -3px;" src="/static/img/xiaologo.png" alt="">优软云
+                </a>
               </span>
-              <span @click="login"><img src="/static/img/assets/denglu3x.png" alt="">登录  &nbsp;</span>
+              <span @click="login">&nbsp;&nbsp;&nbsp; <img src="/static/img/assets/denglu3x.png" alt="">登录  &nbsp;&nbsp;&nbsp;</span>
               <span @click="register"><img src="/static/img/assets/zhuce3x.png" alt="">注册</span>
             </li>
             <li class="profile" v-if="account">
               <span>
-                <img style="width: 64px;margin-top: -3px;" src="/static/img/xiaologo@2x.png" alt="">
+                <a href="https://www.usoftchina.com/" target="_blank" rel="noopener noreferrer" style="color:white">
+                  <img style="width: 18px;margin-top: -3px;" src="/static/img/xiaologo.png" alt="">优软云
+                </a>
               </span>
 							<span class="user-info">
 								<span id="user-info">{{account.realname || account.username}} | </span>
@@ -46,14 +50,18 @@
             </li>
             <li><a href="#service"><span>功能</span></a></li>
             <li>
-              <el-dropdown trigger="hover" size="mini" placement='bottom-start'>
-                <a><span style="color:white;font-size: 16px">帮助中心</span></a>
-                  <el-dropdown-menu slot="dropdown">
-                      <el-dropdown-item>
-                          <span @click="navproblem">常见问题</span>
-                      </el-dropdown-item>
-                  </el-dropdown-menu>
-              </el-dropdown>
+              <el-menu  
+              class="el-menu-demo" 
+              mode="horizontal" 
+              background-color="#1C1F48"
+              text-color="#fff"
+              active-text-color ='#fff'
+              @select="handleSelect">
+                  <el-submenu index="1">
+                      <template slot="title">帮助中心</template>
+                      <el-menu-item index="1-1">常见问题</el-menu-item>
+                  </el-submenu>
+              </el-menu>
             </li>
             <li><a href="https://uas.usoftchina.com/about" target="_blank"><span>关于我们</span></a></li>
           </ul>
@@ -149,7 +157,7 @@
       </section>
 
       <!-- Service section 功能-->
-      <section id="service" style="padding-top: 0">
+      <section id="service" style="padding-top: 0px">
         <div class="container" style="position: relative;">
           <img class="gn-beijing" src="/static/img/gongneng/xu xian@3x.png" alt="">
           <div class="row">
@@ -283,7 +291,7 @@
       } else {
         this.isproblem = this.$route.params.isporblem
       };
-      let token;
+      let token = '';
       if(localStorage.getItem('app-state-session')){
         token = Session.getToken();
       }
@@ -319,6 +327,7 @@
       })
     },
     mounted() {
+      $("#navigation").removeClass("animated-header");
       this.clientId = Math.random().toString(36).substr(2)
       // 从本地加载已经登录的信息
       this.account = Session.getAccount()
@@ -453,6 +462,10 @@
           }
         }
       },
+      //ele常见问题
+      handleSelect(){
+        this.navproblem();
+      },
       //常见问题
       navproblem(){
         this.$store.commit('problemfalse');
@@ -476,7 +489,24 @@
 .navbar-inverse {
   padding: 0px;
 }
-
+/* ele常见问题 */
+.el-menu-demo {
+    border-bottom: 0;
+}
+.el-menu-demo >>> div {
+    font-size: 16px !important;
+    background: #1C1F48;
+    border-bottom: 0 !important;
+}
+.el-menu-demo >>> .el-submenu__title:hover {
+    background: #1C1F48 !important;
+}
+.el-menu-demo >>> .el-submenu__title {
+    padding: 0px 0px 0px 10px;
+    height: 48px;
+    line-height: 48px;
+    border-bottom: 0 !important;
+}
 /* 体验 */
 .tiyan {
   position: fixed;

+ 3 - 3
frontend/saas-portal-web/src/components/conenter/invitation.vue

@@ -50,7 +50,7 @@ import { setTimeout } from 'timers';
                 enterprise:[],
                 arr:[],
                 roleId:'',
-                times:''
+                times:'',
             }
         },
         created(){
@@ -221,8 +221,8 @@ import { setTimeout } from 'timers';
             },
             //获取页面参数
             param(){
-                let url = window.location.search;
-                let param = url.substring(url.lastIndexOf('=')+1, url.length);
+                let url1 = window.location.href;
+                let param = url1.substring(url1.lastIndexOf('=')+1, url1.length);
                 this.$ajax({
                     url: this.$url.api+"/api/commons/share/valid/param",
                     method:'POST',

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

@@ -16,6 +16,10 @@
 .over {
     overflow: hidden;
 }
+/* ele常见问题 ---------------------- */
+.el-menu--popup {
+    min-width: 120px !important;
+}
 /* 弹窗 -----------------------------------------------*/
 .tanchuang {
     background-image: url('../img/qiye/tanchuang.png');
@@ -235,7 +239,7 @@
 }
 .qy-conent input {
     border: 1px solid #1E88F5;
-    width: 30%;
+    width: 35%;
     height: 32px;
 }
 .tj-biaoqian {

+ 5 - 6
frontend/saas-portal-web/static/css/main.css

@@ -71,7 +71,7 @@ main > section {
     background-color: #0aa6bd;
 }
 .logo-img {
-    width: 100px;
+    width: 90px;
     margin-top: 2px;
 }
 /* 顶部导航 */
@@ -166,7 +166,7 @@ main > section {
     width: 100%;
     padding: 0;
     margin: 0;
-    margin-top: 100px;
+    padding-top: 100px;
 }
 .ts-box {
     overflow: hidden;
@@ -494,11 +494,10 @@ main > section {
          -o-transition: all 0.8s ease 0s;
             transition: all 0.8s ease 0s;
 
-    background-color: rgba(0, 0, 0, 0.77);
-    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-    /* padding: 5px 0; */
+    /* background-color: rgba(0, 0, 0, 0.77); */
+    /* box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); */
+    background: #1C1F48;
 }
-
 #navigation.animated-header {
     padding: 10px 0;
 }

+ 2 - 1
frontend/saas-portal-web/static/js/mains.js

@@ -58,10 +58,11 @@ $(document).ready(function(){
         if ($(window).scrollTop() > 10) {
             $(".navbar-brand a").css("color","#fff");
             $("#navigation").addClass("animated-header");
-            
+            $(".el-menu--popup-bottom-start").css("margin-top","15px")
         } else {
             $(".navbar-brand a").css("color","inherit");
             $("#navigation").removeClass("animated-header");
+            $(".el-menu--popup-bottom-start").css("margin-top","5px")
         }
     });
 

+ 3 - 3
frontend/saas-web/app/view/document/customer/FormPanel.js

@@ -235,8 +235,8 @@ Ext.define('saas.view.document.customer.FormPanel', {
         detnoColumn: 'cc_detno',
         showCount: false,
         deleteDetailUrl:'/api/document/customer/deletecontact',
-        // height:145,
-        // emptyRows: 3,
+        // minHeight:145,
+        emptyRows: 3,
         columns : [
             {
                 text : "ID", 
@@ -301,7 +301,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
         showCount: false,
         deleteDetailUrl:'/api/document/customer/deleteaddress',
         // height:145,
-        // emptyRows: 3,
+        emptyRows: 3,
         columns : [
             {
                 text : "ID", 

+ 1 - 1
frontend/saas-web/app/view/main/MainController.js

@@ -131,7 +131,7 @@ Ext.define('saas.view.main.MainController', {
         Ext.Ajax.request({  
             url :'/api/commons/remind/apply/list',
             timeout: 8000,  
-            async:false,
+            async:true,
             headers:{
                 'Access-Control-Allow-Origin': '*',
                 'Authorization':  saas.util.State.get('session').token,