Browse Source

二维码获取方式修改

hy 7 years ago
parent
commit
f8c7a0e225

+ 2 - 1
frontend/saas-portal-web/static/css/invitation_mobile_join.css

@@ -4,7 +4,8 @@
 	box-sizing: border-box
 }
 body {
-	background: url("../img/invitation_background.png") no-repeat;
+    background-size: cover;
+    background-image: url(../img/invitation_background.png);
 	font-family: Microsoft YaHei, 微软雅黑, simhei;
 	font-size: 18px;
 	color:#333;	

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

@@ -278,8 +278,24 @@ Ext.define('saas.view.main.MainController', {
                                 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='+accountCenter+'&delay='+delay+'&companyName='+companyName)
+                                Ext.Ajax.request({  
+                                    url :'/api/commons/share/qrcode?basePath='+accountCenter+'&delay='+delay+'&companyName='+companyName,
+                                    timeout: 8000,  
+                                    headers:{
+                                        'Access-Control-Allow-Origin': '*',
+                                        'Authorization':  saas.util.State.get('session').token,
+                                        "Content-Type": 'application/json;charset=UTF-8'
+                                    },
+                                    method: 'GET',
+                                    responseType:'blob',
+                                    success: function(fp, o){
+                                        var url = URL.createObjectURL(fp.responseBlob);
+                                        f.setSrc(url)
+                                    },
+                                    failure: function (response, opts) {
+                                        saas.util.BaseUtil.showErrorToast('获取二维码失败');
+                                    }
+                                });
                             }
                         }
                     },{
@@ -306,10 +322,11 @@ Ext.define('saas.view.main.MainController', {
                         value:'暂无',
                         listeners:{
                             afterrender:function(f){
+                                var accountCenter = serverOptions.accountCenter;
                                 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,
+                                    url :'/api/commons/share/pc?basePath='+accountCenter+'&delay='+delay+'&companyName='+companyName,
                                     timeout: 8000,  
                                     async:false,
                                     headers:{