liuyanpeng hace 1 año
padre
commit
2ed3152b39
Se han modificado 2 ficheros con 22 adiciones y 5 borrados
  1. 4 4
      package.json
  2. 18 1
      public/ssoLogin.html

+ 4 - 4
package.json

@@ -1,7 +1,7 @@
 {
   "name": "prodog-pc-client",
   "description": "Leanwo Prodog Client",
-  "version": "1.2.64",
+  "version": "1.2.65",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "ins": "npm install --registry=http://wuzhixin.vip:4873 -force",
@@ -17,8 +17,8 @@
     "ant-design-vue": "^4.2.1",
     "axios": "^0.19.2",
     "click-outside-vue3": "^4.0.1",
-    "client-base-v4": "^4.0.95",
-    "client-dic-v3": "^3.0.44",
+    "client-base-v4": "^4.0.96",
+    "client-dic-v3": "^3.0.46",
     "client-eam-v3": "^3.0.82",
     "client-role-v3": "^3.0.24",
     "client-sensor-v3": "^1.0.2",
@@ -28,7 +28,7 @@
     "dingtalk-jsapi": "^2.8.33",
     "js-cookie": "^2.2.1",
     "lodash": "^4.17.21",
-    "pc-component-v3": "^1.0.92",
+    "pc-component-v3": "^1.0.94",
     "qrcode": "^1.5.3",
     "select2": "^4.0.13",
     "select2-bootstrap-theme": "^0.1.0-beta.10",

+ 18 - 1
public/ssoLogin.html

@@ -76,8 +76,25 @@
             localStorage.setItem("#accountId", loginInfo.accountId);
             localStorage.setItem("#languageSelected", _self.languageId);
             localStorage.setItem("#LoginInfo", JSON.stringify(loginInfo));
-            window.location.href = _self.urlRoot + "#/desktop/dashboard";
+			if (_self.isMobile() === false) {
+              localStorage.setItem('allowSound', false);
+              window.location.href = _self.urlRoot + "#/desktop/dashboard";
+            } else  {
+              window.location.href = _self.urlRoot + "app.html#/desktop/appMenu";
+            }
+            //window.location.href = _self.urlRoot + "#/desktop/dashboard";
           },
+		  
+		   /**
+			* 判断当前的环境是手机端还是电脑端
+			*/
+		isMobile: function () {
+			if (window.navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i)) {
+				return true; // 移动端
+			} else {
+				return false; // PC端
+			}
+		},
 
           // 获取参数函数
           getQueryString: function () {