From af06861fc933975860f245d38724ba4ef56ed64b Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Fri, 10 Jun 2022 11:02:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9uuid=E4=B8=8D=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue | 3 +--
 plugins/axios.js      | 9 +++++++--
 plugins/axiosTk.js    | 9 +++++++--
 store/index.js        | 2 +-
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 1ca706e..6b528b7 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-03 22:14:16
  * @LastEditors: ch
- * @LastEditTime: 2022-06-01 09:36:44
+ * @LastEditTime: 2022-06-10 10:26:51
  * @Description: file content
 -->
 <template>
@@ -104,7 +104,6 @@ export default {
         location : AD_LOCATION.HOME_BANNER
       });
        bannerList = bannerList || [];
-       console.log('bannerList', bannerList);
       
 
     return {
diff --git a/plugins/axios.js b/plugins/axios.js
index 7fba6dd..62df444 100644
--- a/plugins/axios.js
+++ b/plugins/axios.js
@@ -4,13 +4,18 @@
  * @Author: ch
  * @Date: 2022-05-03 23:04:45
  * @LastEditors: ch
- * @LastEditTime: 2022-06-09 19:21:46
+ * @LastEditTime: 2022-06-10 11:01:12
  * @Description: file content
  */
+let axios = null;
+import { UUID_KEY } from "@/constants";
 import { CreatUuid } from "@/plugins/utils";
-let axios = null
 export default function ({ app, $axios, store, req }) {
 	let uuid = store.state.uuid;
+	if (!uuid && req.headers.cookie) {
+		uuid = req.headers.cookie.split(';').find(i => i.includes(UUID_KEY));
+		uuid = uuid.replace(`${UUID_KEY}=`,'')
+	}
 	if (!uuid) {
 		uuid = CreatUuid(16, 2);
 		store.commit('setUUID', uuid);
diff --git a/plugins/axiosTk.js b/plugins/axiosTk.js
index 1ce02df..cd4a07c 100644
--- a/plugins/axiosTk.js
+++ b/plugins/axiosTk.js
@@ -2,14 +2,19 @@
  * @Author: ch
  * @Date: 2022-05-04 17:11:07
  * @LastEditors: ch
- * @LastEditTime: 2022-06-09 19:22:06
+ * @LastEditTime: 2022-06-10 11:01:21
  * @Description: file content
  */
 import { CreatUuid } from "@/plugins/utils";
+import { UUID_KEY } from "@/constants";
 let axiosTk = null;
-export default function ({$axios, store, route}, inject) {
+export default function ({$axios, store, route, req}, inject) {
 	const $axiosTk = $axios.create();
 	let uuid = store.state.uuid;
+	if (!uuid && req.headers.cookie) {
+		uuid = req.headers.cookie.split(';').find(i => i.includes(UUID_KEY));
+		uuid = uuid.replace(`${UUID_KEY}=`,'')
+	}
 	if (!uuid) {
 		uuid = CreatUuid(16, 2);
 		store.commit('setUUID', uuid);
diff --git a/store/index.js b/store/index.js
index da41569..dcbc806 100644
--- a/store/index.js
+++ b/store/index.js
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-04 20:35:20
  * @LastEditors: ch
- * @LastEditTime: 2022-06-10 10:03:32
+ * @LastEditTime: 2022-06-10 10:56:09
  * @Description: file content
  */
 import { TOKEN_KEY,UUID_KEY } from "@/constants";