From c53149d15b0675a2ec2cf9b21f130e194396077e Mon Sep 17 00:00:00 2001
From: miaojiale <1123971748@qq.com>
Date: Mon, 22 Jan 2024 09:07:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E9=93=BE=E6=8E=A5H5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/axios/api/index.js      |  3 +++
 src/axios/request/http.js   |  3 +++
 src/pages/questionnaire.vue | 13 ++++++---
 src/router/index.js         | 54 +++++++++++++++++--------------------
 4 files changed, 40 insertions(+), 33 deletions(-)

diff --git a/src/axios/api/index.js b/src/axios/api/index.js
index 03841f9..70f6c61 100644
--- a/src/axios/api/index.js
+++ b/src/axios/api/index.js
@@ -42,5 +42,8 @@ export const API = {
   // 提交问卷
   setQuestionnaire: (data) => {
     return post(`/disease-data/questionnaire`, data)
+  },
+  login: (data) => {
+    return get(`/cloud-auth/oauth/token?grant_type=client_credentials`, data)
   }
 }
diff --git a/src/axios/request/http.js b/src/axios/request/http.js
index 5847311..319b694 100644
--- a/src/axios/request/http.js
+++ b/src/axios/request/http.js
@@ -28,6 +28,9 @@ axios.interceptors.request.use(
   (config) => {
     config.data = config.data
     config.headers["user-cookie"] = localStorage.getItem("vd_token")
+    if (config.url.includes("oauth/token")) {
+      config.headers["Authorization"] = `Bearer YXBwOmNsb3VkX2FwcA==`
+    }
     return config
   },
   (error) => {
diff --git a/src/pages/questionnaire.vue b/src/pages/questionnaire.vue
index ec0e5d2..87412ee 100644
--- a/src/pages/questionnaire.vue
+++ b/src/pages/questionnaire.vue
@@ -18,6 +18,7 @@
 <script>
 import VForm from "@/components/FormComponents"
 export default {
+  name: "questionnaire",
   components: { VForm },
   data() {
     return {
@@ -37,6 +38,11 @@ export default {
     }
   },
   methods: {
+    login() {
+      this.$API.login().then((res) => {
+        console.log(res)
+      })
+    },
     getPatientInfo() {
       let params = {
         idCard: 111111111,
@@ -58,9 +64,9 @@ export default {
       this.$API.getQuestionnaireList().then((res) => {
         if (res.code == 1) {
           this.forms = [...res.data]
-          this.forms.map((e) => {
-            e.rules = [{ required: true, trigger: "blur", message: "该项必传" }]
-          })
+          // this.forms.map((e) => {
+          //   e.rules = [{ required: true, trigger: "blur", message: "该项必传" }]
+          // })
 
           this.forms.push({
             type: "button",
@@ -119,6 +125,7 @@ export default {
     }
   },
   created() {
+    this.login()
     this.getPatientInfo()
     this.getQuestionList()
   },
diff --git a/src/router/index.js b/src/router/index.js
index c743ade..9a5013d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,18 +1,18 @@
-import Vue from "vue";
-import Router from "vue-router";
-Vue.use(Router);
+import Vue from "vue"
+import Router from "vue-router"
+Vue.use(Router)
 //登录 注册 激活
 const page = [
   {
     path: "/",
-    // redirect: "/feedback" //调试
-  },
-  {
-    path: "/login",
-    meta: { index: 1, keepAlive: false },
-    name: "login",
-    component: () => import("@/pages/login")
+    redirect: "/questionnaire" //调试
   },
+  // {
+  //   path: "/login",
+  //   meta: { index: 1, keepAlive: false },
+  //   name: "login",
+  //   component: () => import("@/pages/login")
+  // },
   {
     path: `/feedback/:dataId`,
     meta: { index: 2, keepAlive: false },
@@ -20,44 +20,38 @@ const page = [
     component: () => import("@/pages/feedback")
   },
   {
-    path: `/questionnaire/:dataId`,
+    path: `/questionnaire/:id`,
     meta: { index: 2, keepAlive: false },
     name: "questionnaire",
     component: () => import("@/pages/questionnaire")
   }
-];
+]
 
 const router = new Router({
   // scrollBehavior: () => ({
   //   y: 0
   // }),
   routes: [...page]
-});
+})
 
 router.beforeEach((to, from, next) => {
-  if (from.meta.keepAlive) {
-    const $wrapper = document.querySelector(".list_content"); // 列表的外层容器 注意找到滚动的盒子
-    const scrollTop = $wrapper ? $wrapper.scrollTop : 0;
-    // console.log("scrollTop=", scrollTop);
-    from.meta.scrollTop = scrollTop;
-  }
-  next();
-});
+  next()
+})
 // 解决编程式路由往同一地址跳转时会报错的情况
-const originalPush = Router.prototype.push;
-const originalReplace = Router.prototype.replace;
+const originalPush = Router.prototype.push
+const originalReplace = Router.prototype.replace
 
 // push
 Router.prototype.push = function push(location, onResolve, onReject) {
   if (onResolve || onReject)
-    return originalPush.call(this, location, onResolve, onReject);
-  return originalPush.call(this, location).catch((err) => err);
-};
+    return originalPush.call(this, location, onResolve, onReject)
+  return originalPush.call(this, location).catch((err) => err)
+}
 
 //replace
 Router.prototype.replace = function push(location, onResolve, onReject) {
   if (onResolve || onReject)
-    return originalReplace.call(this, location, onResolve, onReject);
-  return originalReplace.call(this, location).catch((err) => err);
-};
-export default router;
+    return originalReplace.call(this, location, onResolve, onReject)
+  return originalReplace.call(this, location).catch((err) => err)
+}
+export default router
-- 
2.22.0