Переглянути джерело

修改手机端登录的二维码信息 学校id@学校名称

刘洋 2 роки тому
батько
коміт
fc93e9e8ab
4 змінених файлів з 12 додано та 4 видалено
  1. 1 0
      .eslintrc.js
  2. 2 1
      .gitignore
  3. 1 0
      package.json
  4. 8 3
      src/components/MainLayout/MainLayout.vue

+ 1 - 0
.eslintrc.js

@@ -36,6 +36,7 @@ module.exports = {
     "@typescript-eslint/restrict-plus-operands": "off",
     "@typescript-eslint/restrict-template-expressions": "off",
     "@typescript-eslint/no-non-null-assertion": "off",
+    "@typescript-eslint/no-unused-vars": "off",
     // 一处使用hypen和一处不使用hypen,让字符搜索变得困难
     "vue/attribute-hyphenation": ["error", "never"],
     "vue/v-on-event-hyphenation": ["error", "never", { autofix: true }],

+ 2 - 1
.gitignore

@@ -28,4 +28,5 @@ dist-ssr
 src/types/components.d.ts
 src/types/auto-imports.d.ts
 
-.eslintrc-auto-import.json
+.eslintrc-auto-import.json
+package-lock.json

+ 1 - 0
package.json

@@ -31,6 +31,7 @@
     "copy-to-clipboard": "^3.3.2",
     "crypto-js": "^4.1.1",
     "face-api.js": "^0.22.2",
+    "js-base64": "^3.7.3",
     "js-md5": "^0.7.3",
     "lodash-es": "^4.17.21",
     "moment": "^2.29.3",

+ 8 - 3
src/components/MainLayout/MainLayout.vue

@@ -11,12 +11,17 @@ import QM_LOGO from "./qm-logo.png";
 import VueQrcode from "@chenfengyuan/vue-qrcode";
 import SiteMessageNotification from "@/features/SiteMessage/SiteMessageNotification.vue";
 import { MenuSubItem, getMenuDict, parseMapLine } from "./menuConfig";
-
+import { Base64 } from 'js-base64';
 const router = useRouter();
 const route = useRoute();
 
 const user = store.user;
-
+let qrcodeContent = computed(()=>{
+  let str = user.rootOrgId+'@'+user.rootOrgName;
+  let base64str = Base64.encode(str);
+  console.log('base64str:',base64str)
+  return base64str;
+})
 // computed
 const customMenuLogo = computed(() =>
   store.QECSConfig.IS_CUSTOM_MENU_LOGO
@@ -135,7 +140,7 @@ watch(
                 <n-tab-pane name="app" tab="下载云考APP">
                   <div class="qr-code">
                     <vue-qrcode
-                      :value="appDownloadUrl"
+                      :value="qrcodeContent"
                       :options="{ width: 200 }"
                     ></vue-qrcode>
                   </div>