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

applications/money/money-server/src/main/resources/mapper/StatsinfoMapper.xml

@@ -39,9 +39,9 @@
                 #{si_yearmonth,jdbcType=INTEGER},
             </if>
             <if test="si_amount_pay != null" >
-                select sum(pd_amount) from paybalancedet left join paybalance on pd_pbid=pb_id
+                (select sum(pd_amount) from paybalancedet left join paybalance on pd_pbid=pb_id
                 where paybalance.companyId= #{companyid,jdbcType=INTEGER}
-                and pd_ym=#{si_yearmonth,jdbcType=INTEGER} and pb_statuscode='AUDITED',
+                and pd_ym=#{si_yearmonth,jdbcType=INTEGER} and pb_statuscode='AUDITED'),
             </if>
             <if test="si_amount_otherpay != null" >
                 (select sum(os_amount) from othspendings RIGHT JOIN othspendingsdetail on os_id = osd_osid

base-servers/auth/auth-server/src/main/java/com/usoftchina/saas/auth/controller/AuthController.java

@@ -64,7 +64,7 @@ public class AuthController {
     @Value("${auth.header:Authorization}")
     private String authHeader;
 
-    @Value("${auth.expire:18000}")
+    @Value("${auth.expire:1800000}")
     private int expire;
 
     @Value("${auth.max-errors:5}")

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

@@ -56,7 +56,7 @@
       </div>
     </div>
 
-        <div class="gs-qiyebox" ref="qiyebox" style="margin-top: 70px;">
+        <div class="gs-qiyebox" ref="qiyebox" style="margin-top: 70px;" :class="isheigh ? 'heigh' : ''">
             <!-- 点击查看企业详情 -->
             <div v-for="(d , i) in arr " :key="i" class="gs-xiangqing xs">
                 <div class="left gs-xqleft" @click= "getEnterpriseInfo(d)">
@@ -102,7 +102,8 @@
                 isDefault: true,//开通默认
                 isAutoLogin: this.$store.state.isAutoLogin,
                 mytoken: JSON.parse(localStorage.getItem('app-state-session')),//本地储存的用户信息
-                arr: []//企业列表信息
+                arr: [],//企业列表信息
+                isheigh:true//是否添加默认高度
             }
         },
         computed :{
@@ -256,8 +257,8 @@
                 .then(res=>{
                     // console.log('请求成功',res)
                     if (res.data.success) {
-                        this.ktsass = false;
                         this.saasid = res.data.data
+                        this.ktsass = false;
                     } else {
                         this.isokopensaas = true;
                     }
@@ -268,7 +269,6 @@
             },
             //进入saas服务
             showServeWin(){
-                debugger
                 let id = this.saasid;
                 this.isOpensaas = false;
                 // this.$options.methods.selectServe(id);
@@ -294,10 +294,10 @@
             //没有内容也要有一定的高度
             boxheight(){
                 let H = this.$refs.qiyebox.offsetHeight;
-                if (H < 300) {
-                    this.$refs.qiyebox.style.height = 500+'px';
+                if (H < 400) {
+                    this.isheigh = true
                 } else {
-                    this.$refs.qiyebox.style.height = '';
+                    this.isheigh = false
                 }
             },
         }
@@ -305,5 +305,7 @@
 </script>
 
 <style scoped>
-
+.heigh {
+    height: 500px;
+}
 </style>

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

@@ -88,6 +88,8 @@
               <div class="mask-overly"></div>
               <div class="bg-img slider-1">
                 <img src="/static/img/banner@2x@2x.png" alt="">
+                <!-- <img src="/static/img/banner@3x@2x.png" alt=""> -->
+                <!-- <img src="/static/img/banner.png" alt=""> -->
               </div>
               <!-- 首页内容 -->
               <div class="my-text">
@@ -114,7 +116,7 @@
           <!-- 1 -->
           <div class="ts-box">
             <div class="ts-boximg">
-              <img src="/static/img/feature/illustration1@2x.png" alt="">
+              <img style="margin-left: 18px;" src="/static/img/feature/mix1x.png" alt="">
             </div>
             <div>
               <img class="ts-img" src="/static/img/feature/blue1@2x.png" alt="">
@@ -125,14 +127,14 @@
             <div>
               <img class="ts-img" src="/static/img/feature/yellow2@2x.png" alt="">
             </div>
-            <div class="ts-boximg" style="right:0">
-              <img src="/static/img/feature/illustration2@2x.png" alt="">
+            <div class="ts-boximg">
+              <img style="float: right;" src="/static/img/feature/mix2x.png" alt="">
             </div>
           </div>
           <!-- 3 -->
           <div class="ts-box">
             <div class="ts-boximg">
-              <img src="/static/img/feature/illustration3@2x.png" alt="">
+              <img src="/static/img/feature/mix3x.png" alt="">
             </div>
             <div>
               <img class="ts-img" src="/static/img/feature/blue3@2x.png" alt="">
@@ -141,10 +143,10 @@
           <!-- 4 -->
           <div class="ts-box">
             <div>
-              <img class="ts-img" src="/static/img/feature/yellow4@2x.png" alt="">
+              <img style="width:94%" class="ts-img" src="/static/img/feature/yellow4@2x.png" alt="">
             </div>
-            <div class="ts-boximg" style="right:0">
-              <img src="/static/img/feature/illustration4@2x.png" alt="">
+            <div class="ts-boximg">
+              <img style="float: right;" src="/static/img/feature/mix4x.png" alt="">
             </div>
           </div>
         </div>

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

@@ -337,10 +337,14 @@ main > section {
     /* margin-top: 50px; */
     position: relative;
     padding: 150px 0;
+    width: 98%;
 }
 .ts-boximg {
     position: absolute;
-    top: 40px;
+    top: 50px;
+}
+.ts-boximg img {
+    width: 65%;
 }
 .ts-lefttext p {
     text-align: right;
@@ -359,7 +363,8 @@ main > section {
     float: right;
 }
 .ts-img {
-    width: 100%;
+    width: 98%;
+    margin-left: 2%;
 }
 .right-text {
     text-align: right;

frontend/saas-web/app.json

@@ -296,6 +296,7 @@
         },
         "server": {
             "accountCenter":"https://saas.usoftchina.com",
+            "accountEnterprise":"https://saas.usoftchina.com/#/enterprise",
             "basePath": "https://saas-api.usoftchina.com",
             "urlPattern": "^\/api\/"
         }
@@ -307,6 +308,7 @@
     "testing": {
         "server": {
             "accountCenter":"http://192.168.0.181:8000",
+            "accountEnterprise":"http://192.168.0.181:8000/#/enterprise",
             "basePath": {
                 "https": "https://saas-api-dev.usoftchina.com:5443",
                 "http": "http://192.168.0.181:8560"
@@ -324,6 +326,7 @@
         },
         "server": {
             "accountCenter":"http://192.168.0.181:8000",
+            "accountEnterprise":"http://192.168.0.181:8000/#/enterprise",
             "basePath": {
                 "https": "https://saas-api-dev.usoftchina.com:5443",
                 "http": "http://192.168.0.181:8560"

frontend/saas-web/app/Application.scss

@@ -231,9 +231,9 @@ body.launching {
   background: #E5F7FF;
   border-right: 1px solid #ABDAFF;
 
-  &:last-child {
-    border: none;
-  }
+  // &:last-child {
+  //   border: none;
+  // }
 }
 
 .x-column-header-text-inner {

frontend/saas-web/app/view/main/Main.js

@@ -78,15 +78,13 @@ Ext.define('saas.view.main.Main', {
                         cls:'x-main-menu sa-nav-menu',
                         items: [{
                             text: '新手导航',
-                            //fa-comment-o sa-userGuite
                             iconCls:'x-fa sa-navicon fa-comment-o',
                             handler:function(){
                                saas.util.BaseUtil.openTab('sys-guide-formpanel','新手导航', 'sys-guide-formpanel-nav');
                             }
-                        },{
+                        }/* ,{
                             text: '用户手册',
                             hidden:true,
-                            //fa-address-book-o sa-userBook
                             iconCls:'x-fa sa-navicon  fa-address-book-o',
                             handler:function(){
                                 window.open('http://www.usoftchina.com','_blank');
@@ -97,7 +95,7 @@ Ext.define('saas.view.main.Main', {
                             handler:function(){
                                 window.open('http://www.usoftchina.com','_blank');
                             }
-                        },{
+                        } */,{
                             text: '客服热线',
                             iconCls:'x-fa fa-phone sa-navicon',
                             menu:{
@@ -141,7 +139,7 @@ Ext.define('saas.view.main.Main', {
                             text: '账户中心',
                             iconCls:'x-fa fa-user-o sa-navicon',
                             handler:function(){
-                                window.open(Ext.manifest.server.accountCenter,'_blank');
+                                window.open(Ext.manifest.server.accountEnterprise,'_blank');
                             }
                         },{  
                             text: '意见反馈',

frontend/saas-web/app/view/money/payBalance/FormPanelController.js

@@ -205,7 +205,6 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
             saas.util.BaseUtil.showErrorToast(form.invalidText);
             return false;
         }
-        debugger
         var sum_pd_amount = store1.sum('pd_amount'); // 付款金额合计
         var pb_discounts = viewModel.get('pb_discounts'); // 折扣金额
         var sum_pbd_nowbalance = store2.sum('pbd_nowbalance'); // 本次核销金额合计