Browse Source

添加query-string方法

Michael Wang 4 năm trước cách đây
mục cha
commit
f8773ca867

+ 1 - 0
package.json

@@ -26,6 +26,7 @@
     "js-cookie": "^2.2.1",
     "lodash-es": "^4.17.15",
     "moment": "^2.27.0",
+    "query-string": "^6.13.1",
     "register-service-worker": "^1.7.1",
     "vue": "^2.6.11",
     "vue-awesome": "^4.1.0",

+ 3 - 0
src/constant/constants.js

@@ -5,3 +5,6 @@ if (!localStorage.getItem("deviceId")) {
   localStorage.setItem("deviceId", Math.random() + "-" + Date.now());
 }
 export const DEVICE_ID = localStorage.getItem("deviceId");
+
+export const ORG_CODE =
+  process.env.VUE_APP_ORG_CODE || window.location.hostname.split(".")[0];

+ 15 - 8
src/features/Login/Login.vue

@@ -1,9 +1,6 @@
 <template>
   <div class="user-login">
-    <div
-      class="user-login-bg"
-      :style="{ 'background-image': `url(${backgroundImage})` }"
-    ></div>
+    <div class="user-login-bg"></div>
     <div class="content-wrapper">
       <h2 class="slogan">
         欢迎使用 <br />
@@ -92,15 +89,15 @@
 
 <script>
 import { LOGIN_BY_USERNAME } from "../../store/action-types";
-// import BasicContainer from "@/samples/BasicContainer/BasicContainer";
-const backgroundImage =
-  "https://img.alicdn.com/tfs/TB1zsNhXTtYBeNjy1XdXXXXyVXa-2252-1500.png";
+import { ORG_CODE } from "../../constant/constants";
+import { object2QueryString } from "../../utils/utils";
+
 export default {
   // components: { BasicContainer },
   name: "Login",
   data() {
     return {
-      backgroundImage: backgroundImage,
+      schoolLogo: "",
       user: {
         username: "",
         password: "",
@@ -108,6 +105,15 @@ export default {
       },
     };
   },
+  async created() {
+    const res = await this.$http.get(
+      "/api/admin/sys/org/queryByOrgCode?" +
+        object2QueryString({
+          name: ORG_CODE,
+        })
+    );
+    this.schoolLogo = res.data.data.logo;
+  },
   methods: {
     async submitBtn() {
       this.$refs["form"].validate(async (valid) => {
@@ -145,6 +151,7 @@ export default {
     right: 0;
     bottom: 0;
     background-size: cover;
+    background-image: url(./login-bg.png);
   }
   .el-checkbox__label {
     color: #999;

BIN
src/features/Login/login-bg.png


+ 1 - 3
src/plugins/axiosApp.js

@@ -6,11 +6,9 @@ import cachingGet from "./axiosCache";
 import { notifyInvalidTokenThrottled } from "./axiosNotice";
 import { getToken, removeToken } from "../auth/auth";
 import axiosRetry from "axios-retry";
-import { DEVICE_ID } from "@/constant/constants";
+import { PLATFORM, DEVICE_ID } from "@/constant/constants";
 import { Notification } from "element-ui";
 
-const PLATFORM = "web";
-
 // Full config:  https://github.com/axios/axios#request-config
 // axios.defaults.baseURL = process.env.BASE_URL || process.env.apiUrl || '';
 // axios.defaults.headers.common['Authorization'] = AUTH_TOKEN;

+ 5 - 0
src/utils/utils.js

@@ -1,5 +1,6 @@
 import { YYYYMMDDHHmmss } from "@/constant/constants";
 import moment from "moment";
+import queryString from "query-string";
 
 export function dateFormatForAPI(date) {
   return moment(date).format(YYYYMMDDHHmmss);
@@ -22,3 +23,7 @@ export function errorLog(message, { stack = "", code = "" }) {
     code && "code: " + code,
   ]);
 }
+
+export function object2QueryString(obj) {
+  return queryString.stringify(obj);
+}

+ 19 - 0
yarn.lock

@@ -9131,6 +9131,15 @@ query-string@^4.1.0:
     object-assign "^4.1.0"
     strict-uri-encode "^1.0.0"
 
+query-string@^6.13.1:
+  version "6.13.1"
+  resolved "https://registry.npm.taobao.org/query-string/download/query-string-6.13.1.tgz?cache=0&sync_timestamp=1591853352562&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fquery-string%2Fdownload%2Fquery-string-6.13.1.tgz#d913ccfce3b4b3a713989fe6d39466d92e71ccad"
+  integrity sha1-2RPM/OO0s6cTmJ/m05Rm2S5xzK0=
+  dependencies:
+    decode-uri-component "^0.2.0"
+    split-on-first "^1.0.0"
+    strict-uri-encode "^2.0.0"
+
 querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
@@ -10099,6 +10108,11 @@ spdy@^4.0.2:
     select-hose "^2.0.0"
     spdy-transport "^3.0.0"
 
+split-on-first@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.npm.taobao.org/split-on-first/download/split-on-first-1.1.0.tgz#f610afeee3b12bce1d0c30425e76398b78249a5f"
+  integrity sha1-9hCv7uOxK84dDDBCXnY5i3gkml8=
+
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
@@ -10211,6 +10225,11 @@ strict-uri-encode@^1.0.0:
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
   integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
 
+strict-uri-encode@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npm.taobao.org/strict-uri-encode/download/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546"
+  integrity sha1-ucczDHBChi9rFC3CdLvMWGbONUY=
+
 string-argv@0.3.1:
   version "0.3.1"
   resolved "https://registry.npm.taobao.org/string-argv/download/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da"