Merge branch 'product' of http://git.mes123.com/zhouyx/mes-ui into product

npm-shrinkwrap.json

@@ -1744,7 +1744,7 @@
       "dependencies": {
         "ajv": {
           "version": "5.5.2",
-          "resolved": "https://registry.npm.taobao.org/ajv/download/ajv-5.5.2.tgz?cache=0&sync_timestamp=1597480760804&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-5.5.2.tgz",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
           "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
           "dev": true,
           "optional": true,
@@ -1776,7 +1776,7 @@
         },
         "cross-spawn": {
           "version": "5.1.0",
-          "resolved": "https://registry.npm.taobao.org/cross-spawn/download/cross-spawn-5.1.0.tgz?cache=0&sync_timestamp=1590421014780&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcross-spawn%2Fdownload%2Fcross-spawn-5.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
           "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
           "dev": true,
           "optional": true,
@@ -1856,7 +1856,7 @@
         },
         "fast-deep-equal": {
           "version": "1.1.0",
-          "resolved": "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-1.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
           "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
           "dev": true,
           "optional": true
@@ -1894,7 +1894,7 @@
         },
         "json-schema-traverse": {
           "version": "0.3.1",
-          "resolved": "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.3.1.tgz",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
           "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
           "dev": true,
           "optional": true
@@ -1964,7 +1964,7 @@
         },
         "yallist": {
           "version": "2.1.2",
-          "resolved": "https://registry.npm.taobao.org/yallist/download/yallist-2.1.2.tgz",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
           "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
           "dev": true,
           "optional": true
@@ -4938,7 +4938,7 @@
       "dependencies": {
         "commander": {
           "version": "2.14.1",
-          "resolved": "http://r.cnpmjs.org/commander/download/commander-2.14.1.tgz",
+          "resolved": "https://registry.npm.taobao.org/commander/download/commander-2.14.1.tgz?cache=0&sync_timestamp=1595168224685&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.14.1.tgz",
           "integrity": "sha1-IjUSPjevjKPGXfRbAm29NXsBuao="
         }
       }
@@ -5467,7 +5467,7 @@
     },
     "crc-32": {
       "version": "1.2.0",
-      "resolved": "http://r.cnpmjs.org/crc-32/download/crc-32-1.2.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/crc-32/download/crc-32-1.2.0.tgz",
       "integrity": "sha1-yy224puIUI4y2d0OwWk+e0Ghggg=",
       "requires": {
         "exit-on-epipe": "~1.0.1",
@@ -7364,7 +7364,7 @@
     },
     "exit-on-epipe": {
       "version": "1.0.1",
-      "resolved": "http://r.cnpmjs.org/exit-on-epipe/download/exit-on-epipe-1.0.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/exit-on-epipe/download/exit-on-epipe-1.0.1.tgz",
       "integrity": "sha1-C92S6H1ShdJn2qgXHQ6wYVlolpI="
     },
     "expand-brackets": {
@@ -8015,7 +8015,7 @@
     },
     "frac": {
       "version": "1.1.2",
-      "resolved": "http://r.cnpmjs.org/frac/download/frac-1.1.2.tgz",
+      "resolved": "https://registry.npm.taobao.org/frac/download/frac-1.1.2.tgz",
       "integrity": "sha1-PXT39keMiKG1AgMG10fcYxPHTQs="
     },
     "fragment-cache": {
@@ -15087,7 +15087,7 @@
     },
     "printj": {
       "version": "1.1.2",
-      "resolved": "http://r.cnpmjs.org/printj/download/printj-1.1.2.tgz",
+      "resolved": "https://registry.npm.taobao.org/printj/download/printj-1.1.2.tgz",
       "integrity": "sha1-2Q3rKXWoufYA+zoclOP0xTx4oiI="
     },
     "private": {
@@ -20540,7 +20540,7 @@
     },
     "script-loader": {
       "version": "0.7.2",
-      "resolved": "http://r.cnpmjs.org/script-loader/download/script-loader-0.7.2.tgz",
+      "resolved": "https://registry.npm.taobao.org/script-loader/download/script-loader-0.7.2.tgz",
       "integrity": "sha1-IBbbb4byX1z1baOJFdgzeLsWa6c=",
       "dev": true,
       "requires": {
@@ -21128,7 +21128,7 @@
     },
     "ssf": {
       "version": "0.10.3",
-      "resolved": "http://r.cnpmjs.org/ssf/download/ssf-0.10.3.tgz",
+      "resolved": "https://registry.npm.taobao.org/ssf/download/ssf-0.10.3.tgz",
       "integrity": "sha1-jq4fwpyQpVLnkhII+BiS1vd6yys=",
       "requires": {
         "frac": "~1.1.2"
@@ -23778,7 +23778,7 @@
     },
     "wmf": {
       "version": "1.0.2",
-      "resolved": "http://r.cnpmjs.org/wmf/download/wmf-1.0.2.tgz",
+      "resolved": "https://registry.npm.taobao.org/wmf/download/wmf-1.0.2.tgz",
       "integrity": "sha1-fRnWIQcaCMK9xrfmiKnENSmMwto="
     },
     "word-wrap": {
@@ -23933,7 +23933,7 @@
     },
     "xlsx": {
       "version": "0.15.6",
-      "resolved": "http://r.cnpmjs.org/xlsx/download/xlsx-0.15.6.tgz",
+      "resolved": "https://registry.npm.taobao.org/xlsx/download/xlsx-0.15.6.tgz?cache=0&sync_timestamp=1597272342311&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fxlsx%2Fdownload%2Fxlsx-0.15.6.tgz",
       "integrity": "sha1-Rh+EHW2eoag3XizSRr8jrs4IodU=",
       "requires": {
         "adler-32": "~1.2.0",
@@ -23948,7 +23948,7 @@
       "dependencies": {
         "commander": {
           "version": "2.17.1",
-          "resolved": "http://r.cnpmjs.org/commander/download/commander-2.17.1.tgz",
+          "resolved": "https://registry.npm.taobao.org/commander/download/commander-2.17.1.tgz?cache=0&sync_timestamp=1595168224685&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.17.1.tgz",
           "integrity": "sha1-vXerfebelCBc6sxy8XFtKfIKd78="
         }
       }

store/admin/account.js

@@ -22,13 +22,15 @@ export const actions = {
     dispatch
   }, {
     username = '',
-    password = ''
+    password = '',
+    tenantcode=''
   } = {}) {
     return new Promise((resolve, reject) => {
       // 开始请求登录接口
       AccountLogin({
           username,
-          password
+          password,
+          tenantcode
         })
         .then(async res => {
           // 设置 cookie 一定要存 uuid 和 token 两个 cookie
@@ -85,7 +87,7 @@ export const actions = {
       sessionStorage.clear();
       localStorage.clear();
       //util.cookies.set('tenantCode', res.result.tenantCode );
-      $nuxt.$router.push("/account/login?tenant="+util.cookies.get('tenantCode'));
+      $nuxt.$router.push("/account/login");
     }
 
     if (confirm) {