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

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/service/impl/AccountCenterServiceImpl.java

@@ -166,7 +166,7 @@ public class AccountCenterServiceImpl implements AccountCenterService {
                         ssoUserSpace.getRegAddress(),
                         false,
                         false,
-                        ssoUserSpace.getSpaceUU()!=null ? ssoUserSpace.getSpaceUU().toString() : "0",
+                        ssoUserSpace.getSpaceUU()!=null ? ssoUserSpace.getSpaceUU() : 0,
                         ssoUserSpace.getAdmin()!=null ? ssoUserSpace.getAdmin().getVipName() : null,
                         0L,
                         ssoUserSpace.getProfession(),

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

@@ -87,8 +87,7 @@ import { log } from 'util';
         },
         methods:{
             browserRedirect() {
-                let url1 = window.location.href;
-                let param = url1.substring(url1.lastIndexOf('=')+1, url1.length);
+                let param = this.getUrlParam('param');
                 var sUserAgent = navigator.userAgent.toLowerCase();
                 var bIsIpad = sUserAgent.match(/ipad/i) == "ipad";
                 var bIsIphoneOs = sUserAgent.match(/iphone os/i) == "iphone os";
@@ -251,10 +250,16 @@ import { log } from 'util';
                     }
                 })
             },
+            getUrlParam(name){   
+                var reg=new RegExp("(^|&)"+name+"=([^&]*)(&|$)");   
+                var index = window.location.href.indexOf('?')
+                var r=window.location.href.substr(index+1).match(reg);   
+                if  (r!=null)   return decodeURI(r[2]); 
+                return   null;   
+            },
             //同步获取页面参数
             param: async function () {
-                let url1 = window.location.href;
-                let param = url1.substring(url1.lastIndexOf('=')+1, url1.length);
+                let param = this.getUrlParam('param');
                 let data = await this.$ajax({
                     url: this.$url.api+"/api/commons/share/valid/param?param="+param,
                     method:'POST',

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

@@ -206,10 +206,10 @@
                 <!-- <button style="position: absolute;" class="expand_icon" type="button" ></button> -->
                 <button class="btn-submit" style="border-radius: 30px;width: 80%;      margin-top: 40px;   font-size: 18px; height: 47px;" type="button" id="joinBtn" onclick="join();">提 交</button>
             </div>
-            <div class="x-join-bottom" style=" display:table-cell;font-size:12px;font-height:14px;vertical-align:middle;text-align:center;   height: 50px;">
+            <!-- <div class="x-join-bottom" style=" display:table-cell;font-size:12px;font-height:14px;vertical-align:middle;text-align:center;   height: 50px;">
                 <span class="x-bottom-text">U企云服 | 电子行业企业管理云端方案</span>
                 <span class="x-bottom-text" style="    margin-top: 2px;">深圳市优软科技有限公司</span>
-            </div>
+            </div> -->
             <div class="x-join-error" hidden>
                 </br></br></br></br>
                 <span id="error_code" style="padding:0 0 0 5px;color: #2f2c27;">访问链接已失效</span>

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

@@ -11,14 +11,18 @@ select{
     background-origin: content-box;
     background: url(../img/assets/expand.png) no-repeat scroll right center transparent;
 }
+html,body{
+    height: 100%;
+    width: 100%;
+}
 body {
     background-repeat: no-repeat;
     background-position: center;
-    background-attachment: fixed;
+    height: 100%;
     z-index: -1;
     width: 100%;
     background-size: cover;
-    background-image: url(../img/invitation_background.png);
+    background-image: url(../img/invitation_join_background.png);
 	font-family: Microsoft YaHei, 微软雅黑, simhei;
 	font-size: 18px;
 	color:#333;	

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

@@ -365,7 +365,7 @@ Ext.define('saas.view.main.MainController', {
                                     success: function(response, o){
                                         var res = Ext.decode(response.responseText);
                                         var url = res.data;
-                                        f.setValue(url)
+                                        f.setValue(url + '&_noc=1')
                                     },
                                     failure: function (response, opts) {
                                         saas.util.BaseUtil.showErrorToast('获取分享地址失败');