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

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/controller/ShareController.java

@@ -66,6 +66,22 @@ public class ShareController {
         }
     }
 
+    /**
+     * 生成分享链接
+     * @param basePath
+     * @param companyName
+     * @param delay
+     * @return
+     */
+    @GetMapping("/pc")
+    public Result getPcUrl(String basePath, String companyName, @RequestParam(value = "delay", defaultValue = "1")Long delay){
+        Long companyId = BaseContextHolder.getCompanyId();
+        String username = BaseContextHolder.getUserName();
+        String params = "username=" + username + "&companyId=" + companyId + "&timestamp=" + new Date().getTime() + "&delay=" + delay + "&companyName=" + companyName;
+        String encodeParams = new String(UrlBase64.encode(params.getBytes()));
+        return Result.success(basePath + "/#/invitation" + "?param=" + encodeParams);
+    }
+
     /**
      * 将前台传入的encode参数decode并校验,返回给前端
      * @param param

frontend/saas-portal-web/src/pages/invitation_mobile_join/invitation_mobile_join.html

@@ -17,6 +17,16 @@
         <link href="../../../static/css/toast.style.css" rel="stylesheet">
         <script type="text/javascript">
             $(document).ready(function(){ 
+                $( "#dialog-message" ).dialog({
+                    autoOpen : false, 
+                    modal: true,
+                    buttons: {
+                        "知道了": function() {
+                            $( this ).dialog( "close" );
+                        }
+                    }
+                });
+                document.getElementById('dialog-message').hidden = false;
                 //解析密文
                 var param = getUrlParam('param');
                 var companyId = 0;
@@ -100,8 +110,7 @@
                         },
                         success: function(data){
                             if(data.success){
-                                addToast("验证码已发送到手机，请查收","success");
-                                settime();
+                                $( "#dialog-message" ).dialog('open');
                             }else{
                                 addToast(data.message,"error");
                             }
@@ -194,5 +203,15 @@
             </br></br></br></br>
             <span id="error_code" style="padding:0 0 0 5px;color: #2f2c27;">访问链接已失效</span>
         </div>
+        <div id="dialog-message" hidden>
+            <p style="font-size: 15px;">
+                提交成功，欢迎你加入U企云服，通过https://saas.usoftchina.com访问U企云服，立即畅享轻松工作！
+            </p>
+            </br>
+            <p style="font-size: 13px;    color: #999;">
+                新用户登录密码随后将发送短信通知<br>
+                请注意查收
+            </p>
+        </div>
     </body>
 </html>

frontend/saas-portal-web/static/css/jquery-ui.css

@@ -159,6 +159,8 @@ button.ui-button-icons-only {
 	line-height: normal;
 }
 .ui-button-text-only .ui-button-text {
+	color: #2781c3;
+    margin-top: -6px;
 	padding: .4em 1em;
 }
 .ui-button-icon-only .ui-button-text,
@@ -402,6 +404,7 @@ button.ui-button::-moz-focus-inner {
 	position: relative;
 }
 .ui-dialog .ui-dialog-title {
+	height: 10px;
 	float: left;
 	margin: .1em 0;
 	white-space: nowrap;
@@ -426,6 +429,7 @@ button.ui-button::-moz-focus-inner {
 	overflow: auto;
 }
 .ui-dialog .ui-dialog-buttonpane {
+	height: 55px;
 	text-align: left;
 	border-width: 1px 0 0 0;
 	background-image: none;
@@ -433,9 +437,14 @@ button.ui-button::-moz-focus-inner {
 	padding: .3em 1em .5em .4em;
 }
 .ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
-	float: right;
+	height: 36px;
+    text-align: center;
 }
 .ui-dialog .ui-dialog-buttonpane button {
+	border: none;
+    background: unset;
+	font-size: 18px;
+    height: 26px;
 	margin: .5em .4em .5em 0;
 	cursor: pointer;
 }
@@ -484,8 +493,8 @@ button.ui-button::-moz-focus-inner {
 }
 .ui-menu .ui-menu-item a.ui-state-focus,
 .ui-menu .ui-menu-item a.ui-state-active {
-	font-weight: normal;
-	margin: -1px;
+	/* font-weight: normal;
+	margin: -1px; */
 }
 
 .ui-menu .ui-state-disabled {
@@ -805,8 +814,6 @@ body .ui-tooltip {
 	color: #222222;
 }
 .ui-widget-header {
-	border: 1px solid #aaaaaa;
-	background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x;
 	color: #222222;
 	font-weight: bold;
 }
@@ -816,11 +823,9 @@ body .ui-tooltip {
 
 /* Interaction states
 ----------------------------------*/
-.ui-state-default,
-.ui-widget-content .ui-state-default,
 .ui-widget-header .ui-state-default {
-	border: 1px solid #d3d3d3;
-	background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x;
+	border: 1px solid #fff;
+	background: #ffffff url(../img/assets/chahao.png) no-repeat;
 	font-weight: normal;
 	color: #555555;
 }
@@ -849,8 +854,8 @@ body .ui-tooltip {
 .ui-state-focus a:hover,
 .ui-state-focus a:link,
 .ui-state-focus a:visited {
-	color: #212121;
-	text-decoration: none;
+	/* color: #212121;
+	text-decoration: none; */
 }
 .ui-state-active,
 .ui-widget-content .ui-state-active,
@@ -941,7 +946,7 @@ body .ui-tooltip {
 }
 .ui-state-hover .ui-icon,
 .ui-state-focus .ui-icon {
-	background-image: url(images/ui-icons_454545_256x240.png);
+	/* background-image: url(img/ui-icons_454545_256x240.png); */
 }
 .ui-state-active .ui-icon {
 	background-image: url(images/ui-icons_454545_256x240.png);

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

@@ -220,7 +220,7 @@ Ext.define('saas.view.main.MainController', {
             var win = Ext.create('Ext.window.Window', {  
                 cls:'x-window-dbfind', 
                 height: nowHeight,
-                width: '50%',
+                width: '45%',
                 modal:true,
                 title: '加入邀请',
                 bodyPadding: 10,
@@ -271,14 +271,15 @@ Ext.define('saas.view.main.MainController', {
                         padding:'5',
                         style:'border: 1px solid #000;',
                         src:'resources/images/default/basePhoto.png',
-                        //src: (serverOptions.basePath.https?serverOptions.basePath.https:serverOptions.basePath) + '/api/file/download?path='+signet,
                         name:'QRcode',
                         listeners:{
                             afterrender:function(f){
+                                var companyName = document.getElementsByClassName('x-main-master')[0].getElementsByClassName('x-btn-inner x-btn-inner-header-small')[0].innerText;
                                 var serverOptions = Ext.manifest.server;
                                 var delay = 1;//天
+                                var accountCenter = serverOptions.accountCenter;
                                 var basePath = serverOptions.basePath.https?serverOptions.basePath.https:serverOptions.basePath;
-                                f.setSrc(basePath+'/api/commons/share/qrcode?basePath='+basePath+'&delay='+delay)
+                                f.setSrc(basePath+'/api/commons/share/qrcode?basePath='+accountCenter+'&delay='+delay+'&companyName='+companyName)
                             }
                         }
                     },{
@@ -302,7 +303,32 @@ Ext.define('saas.view.main.MainController', {
                     },{
                         xtype:'textfield',
                         width:500,
-                        value:'https://saas.usoftchina.com?admin=false&_noc=0'
+                        value:'暂无',
+                        listeners:{
+                            afterrender:function(f){
+                                var companyName = document.getElementsByClassName('x-main-master')[0].getElementsByClassName('x-btn-inner x-btn-inner-header-small')[0].innerText;
+                                var delay = 1;
+                                Ext.Ajax.request({  
+                                    url :'http://192.168.253.31:8560/api/commons/share/pc?basePath='+window.location.origin+'&delay='+delay+'&companyName='+companyName,
+                                    timeout: 8000,  
+                                    async:false,
+                                    headers:{
+                                        'Access-Control-Allow-Origin': '*',
+                                        'Authorization':  saas.util.State.get('session').token,
+                                        "Content-Type": 'application/json;charset=UTF-8'
+                                    },
+                                    method: 'GET',
+                                    success: function(fp, o){
+                                        var res = Ext.decode(fp.responseText);
+                                        var url = fp.data;
+                                        f.setValue(url)
+                                    },
+                                    failure: function (response, opts) {
+                                        saas.util.BaseUtil.showErrorToast('获取分享地址失败');
+                                    }
+                                });
+                            }
+                        }
                     },{
                         margin:'10 0 0 0',
                         width:110,