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

frontend/saas-web/app/view/core/query/QueryGridPanel.scss

@@ -3,7 +3,7 @@
     .x-querygrid-code-column {
 
         .x-grid-cell-inner {
-            color: #53b0f3;
+            color: #3e80f6;
             cursor: pointer;
         }
     }

frontend/saas-web/app/view/home/infoCardList/InfoList.scss

@@ -6,7 +6,6 @@
     .x-code-column {
 
         .x-grid-cell-inner {
-            text-decoration: underline;
             color: #3E80F6;
             cursor: pointer;
         }

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

@@ -67,10 +67,10 @@ Ext.define('saas.view.main.Main', {
                 },
                 {
                     margin:'0 3 0 6',
-                    iconCls:'x-fa fa-share-alt-square',
+                    iconCls:'x-fa fa-share-square',
                     cls:'sa-nav-button',
                     ui: 'header',
-                    tooltip: '企业分享',
+                    tooltip: '邀请同事',
                     handler:'shareCompany'
                 },
                 {

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

@@ -244,10 +244,10 @@ Ext.define('saas.view.main.MainController', {
         //打开分享窗口
         var win = Ext.create('Ext.window.Window', {  
             cls:'x-window-dbfind', 
-            height: 385,
-            width: 350,
+            height: 415,
+            width: 550,
             modal:true,
-            title: '分享企业',
+            title: '邀请同事',
             bodyPadding: 10,
             constrain: true,
             closable: true,
@@ -257,7 +257,7 @@ Ext.define('saas.view.main.MainController', {
                 xtype:'tabpanel',
                 cls:'x-tab-shareTab',
                 items:[{
-                    title:'二维码分享',
+                    title:'二维码邀请',
                     xtype:'panel',
                     layout: {
                         type: 'vbox',
@@ -267,7 +267,7 @@ Ext.define('saas.view.main.MainController', {
                         width:180,
                         height:180,
                         xtype: 'image',
-                        margin:'35 0 0 0',
+                        margin:'25 0 0 0',
                         padding:'5',
                         style:'border: 1px solid #000;',
                         src:'resources/images/default/basePhoto.png',
@@ -276,17 +276,20 @@ Ext.define('saas.view.main.MainController', {
                         listeners:{
                             afterrender:function(f){
                                 var serverOptions = Ext.manifest.server;
-                                var delay = 15;//天
+                                var delay = 1;//天
                                 var basePath = serverOptions.basePath.https?serverOptions.basePath.https:serverOptions.basePath;
-                                f.setSrc('/api/commons/share/qrcode?basePath='+basePath)
+                                f.setSrc('/api/commons/share/qrcode?basePath='+basePath+'&delay='+delay)
                             }
                         }
                     },{
                         xtype:'displayfield',
                         value:'扫描二维码分享至微信/QQ'
+                    },{
+                        xtype:'displayfield',
+                        value:'(分享后'+'<font style="color:#ff0000;">24小时</font>'+'内有效)'
                     }]
                 },{
-                    title:'链接分享',
+                    title:'链接邀请',
                     xtype:'panel',
                     layout: {
                         type: 'vbox',
@@ -298,8 +301,8 @@ Ext.define('saas.view.main.MainController', {
                         value:'复制以下链接分享给好友'
                     },{
                         xtype:'textfield',
-                        width:200,
-                        value:'https://www.usoftchina.com?admin=false&_noc=0'
+                        width:500,
+                        value:'https://saas.usoftchina.com?admin=false&_noc=0'
                     },{
                         margin:'10 0 0 0',
                         width:110,
@@ -319,6 +322,10 @@ Ext.define('saas.view.main.MainController', {
                             document.body.removeChild(target);
                             saas.util.BaseUtil.showSuccessToast('复制链接成功');
                         }
+                    },{
+                        margin:'10 0 0 0',
+                        xtype:'displayfield',
+                        value:'(分享后'+'<font style="color:#ff0000;">24小时</font>'+'内有效)'
                     }]
                 }]
             }]