校验&联调

1dd4084f · Yuanzhao.dai · 66facfa2 · 1dd4084f · 1dd4084f · 1dd4084f
--- a/config/index.js
+++ b/config/index.js
@@ -33,9 +33,13 @@ module.exports = {
        //     }
        // },
        context: [ //代理路径
-            '/test'
+            /*'/test'*/
+            '/registers',
+            '/mobiles',
+            '/login'
        ],
-        proxypath: 'http://localhost:9000',
+        //proxypath: 'http://localhost:9000',
+        proxypath: 'https://dev-saas.yunqueyi.com/web/',
        cssSourceMap: true
    }
 }
--- a/src/assets/image/err-icon.svg
+++ b/src/assets/image/err-icon.svg
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
+    <title>Shape</title>
+    <desc>Created with Sketch.</desc>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="切图" transform="translate(-462.000000, -267.000000)" fill="#FB5B52">
+            <path d="M471,267 C466.028906,267 462,271.028906 462,276 C462,280.971094 466.028906,285 471,285 C475.971094,285 480,280.971094 480,276 C480,271.028906 475.971094,267 471,267 L471,267 Z M475.236328,279.362695 C475.457812,279.580664 475.461328,279.935742 475.245117,280.158984 L475.245117,280.158984 C475.027148,280.380469 474.67207,280.383984 474.448828,280.167773 L471,276.7875 L467.551172,280.166016 C467.329687,280.383984 466.972852,280.380469 466.754883,280.157227 L466.754883,280.157227 C466.536914,279.935742 466.54043,279.578906 466.763672,279.360937 L470.19668,276 L466.763672,272.637305 C466.542188,272.419336 466.538672,272.064258 466.754883,271.841016 L466.754883,271.841016 C466.972852,271.619531 467.32793,271.616016 467.551172,271.832227 L471,275.2125 L474.448828,271.833984 C474.670313,271.616016 475.027148,271.619531 475.245117,271.842773 L475.245117,271.842773 C475.463086,272.064258 475.45957,272.421094 475.236328,272.639063 L471.80332,276 L475.236328,279.362695 L475.236328,279.362695 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
--- a/src/utils/mixins.js
+++ b/src/utils/mixins.js
@@ -153,18 +153,16 @@ module.exports = {
                data: para
            })
        },
-        // 通用saas-GET请求
-        saasGET(api, para, callback,str) {
+        // saas-GET请求
+        saasGET(api, para) {
          // para.token = para.token || this.token || "343BCABC890349ACAF357FA79122F9FE"
-          let url = api + this.getUrlPara(para)
-          url = encodeURI(url);
          return fetch({
            headers: {
-              sysCode: 9
+              sysCode: 9,
            },
-            url: getSaasDomain(url),
+            url: api,
            method: 'get',
-            data: para
+            params: para
          })
        },

@@ -188,7 +186,34 @@ module.exports = {
                data: para
            })
        },
-        
+        // 通用saas-POST请求
+        saasPOST(api, para, cType) {
+          // para.token = para.token || this.token || "343BCABC890349ACAF357FA79122F9FE"
+          let header = {}
+          if(cType) {
+            header['Content-Type'] = cType;
+          }
+          return fetch({
+            headers: {
+              sysCode: 9,
+              ...header
+            },
+            url: api,
+            method: 'post',
+            data: para
+          })
+        },
+      // 通用saas-PUT请求
+      saasPUT(api, para) {
+        return fetch({
+          headers: {
+            sysCode: 9,
+          },
+          url: api,
+          method: 'put',
+          data: para
+        })
+      },
        // 从html参数
        getUrlKey(name) {
            if (decodeURIComponent && location.href) {
@@ -197,6 +222,7 @@ module.exports = {
                return null
            }
        },
+
        getUrlSearch(url, name) {
            if (typeof name == 'undefined') {
                name = url

--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -271,23 +271,29 @@ const detectOS = () => {

 // 获取用户浏览器信息
 const getBrowser = () => {
-    // let OsObject = "未知";
-    // if (navigator.userAgent.indexOf("MSIE") > 0) {
-    //     return "IE";
-    // }
-    // if (navigator.userAgent.indexOf("Firefox") > 0) {
-    //     return "Firefox";
-    // }
-    // if (navigator.userAgent.indexOf("Chrome") > 0) {
-    //     return "Chrome";
-    // }
-    // if (navigator.userAgent.indexOf("Safari") > 0) {
-    //     return "Safari";
-    // }
-    // if (navigator.userAgent.indexOf("Gecko") > 0) {
-    //     return "Gecko";
-    // }
-    return navigator.userAgent;
+    let OsObject = "未知";
+    if (navigator.userAgent.indexOf("MSIE") > 0 && navigator.userAgent.indexOf("compatible") > -1) { //<ie11
+      return "IE";
+    }
+    if (navigator.userAgent.indexOf("Trident") > 0 && navigator.userAgent.indexOf("rv:11.0") > -1) { //ie11
+      return "IE";
+    }
+    if (navigator.userAgent.indexOf("Firefox") > 0) {
+      return "Firefox";
+    }
+    if (navigator.userAgent.indexOf("Chrome") > 0) {
+      return "Chrome";
+    }
+    if (navigator.userAgent.indexOf("Safari") > 0) {
+      return "Safari";
+    }
+    if (navigator.userAgent.indexOf("Gecko") > 0) {
+      return "Firefox";
+    }
+    if (navigator.userAgent.indexOf("360") > 0) {
+      return "360";
+    }
+    return OsObject;
 };

 const GetLocalIPAddress = () => {
@@ -306,7 +312,7 @@ const GetLocalIPAddress = () => {

 // 获取用户终端信息
 const getTerminalType = () => {
-    let brow = "未知";
+    let brow = "unknown";
    // alert(navigator.userAgent);
    if (navigator.userAgent.indexOf('iPad') > -1) {
        // alert("iPad");
@@ -315,25 +321,25 @@ const getTerminalType = () => {
    if (navigator.userAgent.indexOf('Android') > -1
        || navigator.userAgent.indexOf('Linux') > -1) {
        // alert("Android");
-        return brow = "android手机";
+        return brow = "android";
    }
    if (navigator.userAgent.indexOf('iPhone') > -1
    // || navigator.userAgent.indexOf('Mac') > -1
    ) {
        // alert("iPhone");
-        return brow = "iPhone手机";
+        return brow = "iPhone";
    }
    if (navigator.userAgent.indexOf('Trident') > -1) {
        // alert("Trident");
-        return brow = "电脑";
+        return brow = "PC";
    }
    if (navigator.userAgent.indexOf('Presto') > -1) {
        // alert("Presto");
-        return brow = "电脑";
+        return brow = "PC";
    }
    if (navigator.userAgent.indexOf('Chrome') > -1) {
        // alert("Chrome");
-        return brow = "电脑";
+        return brow = "PC";
    }
    if (navigator.userAgent.indexOf('AppleWebKit') > -1) {
        // alert("AppleWebKit");
@@ -342,7 +348,7 @@ const getTerminalType = () => {
    if (navigator.userAgent.indexOf('Gecko') > -1
        && navigator.userAgent.indexOf('KHTML') == -1) {
        // alert("Gecko");
-        return brow = "电脑";
+        return brow = "PC";
    }
    if (navigator.userAgent.indexOf("Mac OS X") > -1) {
        // alert("ios");
@@ -350,7 +356,7 @@ const getTerminalType = () => {
    }
    if (navigator.userAgent.indexOf('Safari') == -1) {
        // alert("Safari");
-        return brow = "电脑";
+        return brow = "PC";
    }
    return brow;
 };
@@ -449,6 +455,17 @@ export const ssoLogin2 = () => { //单独部署不走saas端登录
  initEnvironment();
 };

+
+export const getDeviceInfo = () => { //系统信息，获取验证码时有用到
+  return {
+    device_brand: localStorage.getItem('terminalType'),
+    device_type: 1,
+    system_level: localStorage.getItem('OS'),
+    device_ip: localStorage.getItem('ipAddress'),
+    browser_ver: localStorage.getItem('browser')
+  }
+};
+
 //单点登录--end

 //退出登录,跳转到登录页面

--- a/src/views/login.vue
+++ b/src/views/login.vue