From 9df955e8d694018e17c4d4550f9fa9ced6d76035 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Wed, 25 May 2022 17:52:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 layouts/module/header/HeaderCategory.vue | 4 ++--
 plugins/axios.js                         | 3 ++-
 plugins/axiosTk.js                       | 4 +++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/layouts/module/header/HeaderCategory.vue b/layouts/module/header/HeaderCategory.vue
index 727bcf9..1157eb5 100644
--- a/layouts/module/header/HeaderCategory.vue
+++ b/layouts/module/header/HeaderCategory.vue
@@ -99,8 +99,8 @@ export default {
   methods: {
     getList(id) {
       let list = this.list.filter((item) => item.id == id);
-      console.log(`list[0]?.list`, list[0]?.list);
-      return list[0]?.list;
+      // console.log(`list[0]?.list`, list[0]?.list);
+      return list[0]?.list || [];
     },
     // 获取热门分类信息
     async getCategroyData() {
diff --git a/plugins/axios.js b/plugins/axios.js
index 2df9ace..054eaca 100644
--- a/plugins/axios.js
+++ b/plugins/axios.js
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-03 23:04:45
  * @LastEditors: ch
- * @LastEditTime: 2022-05-09 09:49:53
+ * @LastEditTime: 2022-05-25 17:48:31
  * @Description: file content
  */
 let axios = null
@@ -31,6 +31,7 @@ export default function({app, $axios, req}) {
 		return Promise.reject({message:'请求出错'});
 		
 	});
+	$axios.defaults.timeout = 3000;
 	axios = $axios;
 }
 export { axios }
\ No newline at end of file
diff --git a/plugins/axiosTk.js b/plugins/axiosTk.js
index acdf289..0c89bbb 100644
--- a/plugins/axiosTk.js
+++ b/plugins/axiosTk.js
@@ -2,12 +2,14 @@
  * @Author: ch
  * @Date: 2022-05-04 17:11:07
  * @LastEditors: ch
- * @LastEditTime: 2022-05-10 14:30:24
+ * @LastEditTime: 2022-05-25 17:48:35
  * @Description: file content
  */
 let axiosTk = null;
 export default function ({$axios, store, route}, inject) {
 	const $axiosTk = $axios.create();
+
+	$axiosTk.defaults.timeout = 3000;
 	$axiosTk.onRequest( config =>{
 		if(!store.state.token){
 			location.href = '/';

From 49e78efda899d856f6effa85fc7745c3fcc6660b Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Thu, 26 May 2022 10:41:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?IM=E6=94=B6=E8=B4=A7=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/img/account/im/system.png | Bin 0 -> 972 bytes
 pages/account/index/message.vue  |  49 ++++++++++++++++++++++---------
 pages/goods/detail/_id.vue       |   1 -
 3 files changed, 35 insertions(+), 15 deletions(-)
 create mode 100644 assets/img/account/im/system.png

diff --git a/assets/img/account/im/system.png b/assets/img/account/im/system.png
new file mode 100644
index 0000000000000000000000000000000000000000..d21a4aa7b971c00c34f4a264baa4c4a12c4b5026
GIT binary patch
literal 972
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j3?$ucQqzDGV{wqX6T`Z5GB1Ig2?0JKu0Z<c
z&70S*UAuet?*04sA>_S#_kfH$ckTd5AVB6q1R)|2SqKRifir;OKm#8>eE9hB<7dyF
zy?F8B)vH%;-n@DD?%jtEA3lBh^ySN!Z{NOs|Ni~w&!4}4|Ni^;@Bjb*g=Sq60J=%8
zB*-tAK}1qcL)YBRJ2fl6q+{}oMawsCJ9zrS)%y?LfBE?@>UdNH0|V0mPZ!6KjC)6C
z-7H(=AkcQOm!oUJqK*q4$pW%Y`~TnWO*XPDT)ir9)~x?gKmGEzMvDd79{>D2aL$s*
zX=;Tg-))zt&%APgH~FJW;S0Vq0&bVLGHjXGcT4EaNv{P_zHh`j9_k3Iq;6iQrzF6|
zRbsGBU*xHF{;b&?sjBO4&5h;I)fLJ6Vj()q>v+g9pDh=9T3+b8YU}=PVc#dHyVcRR
zVYBGkt)&UaqSbgbs+q4RwiGU8$d=4)Rm_c_=UuPdlll2opKhz8u60H8k#I|~wy#GH
z@dRC-@a1CEq_^)juH;_iTlYae<d~z^O@aFA=kYn4`mJIWCheH=<XZTp+PClbPq4kJ
zeE$f~BI%AFlCdnYj!a)$MV{`Q7=HDtVt5SK%eBwjqyB{ii)y{Uw@l)Pv$A~2t%q*^
z@3YPpFngslf2HQddcS=N+G|s5UiHYHeRVo?VNcM$u-@F8%YV;G>hW^Qn(%pkoMLv<
z)~1ld*4y^os%Y6bea5*D>})&!o|P6+^1dS0{;U08t<HnCR&fs=qq0ehxPH0RoIHQ~
z&YJwj?>o{h4VEl)ytgplVj8<q-9?E_ZFY|o?LK<6oRIm_Uwp?kkY(q_ouZ}uofD*e
zQXAeIZkzN@v2$t}zvtRD)gH%~6L0EGYfj&JDDe9P4nu7>h2kR)QjI@4R+=+?6j+|h
z@<`#`b&e(NEJA7uhGIf98(Ja?(wQD5C1yFd?m3*OB~cI_a)OU<$H6O!?lGqXy=4!m
zWcV)%v7E+o@MTP$MxbbgmAj|USJObxjis+wZHr3W@IyiV+h!%jwQmY{+2?t=Cas7#
zaIukP)zTG@rhN)rrR%bE#WI!n%{D6*?f#^&_rgl0@ZBli*B|{CnIC!Tg$*y`ylZU!
zliQZwJ#yLNaVFy@6XVKTn{0T~=7m`XU!I>{)0i&MoVlbW-J&h?OnYWRXXcl#?2a=B
cEbhqH@BH&p=sIIJFx4}7y85}Sb4q9e04fysJOBUy

literal 0
HcmV?d00001

diff --git a/pages/account/index/message.vue b/pages/account/index/message.vue
index e4d63d2..49a907e 100644
--- a/pages/account/index/message.vue
+++ b/pages/account/index/message.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-04 17:48:12
  * @LastEditors: ch
- * @LastEditTime: 2022-05-04 17:53:11
+ * @LastEditTime: 2022-05-26 10:38:16
  * @Description: file content
 -->
 
@@ -13,28 +13,27 @@
       <section class="section">
         <div
           class="section__item flex"
-          v-for="item in socketMsgData"
+          v-for="item in msgData"
           :key="item.id"
+          @click="handleDetail(item)"
         >
           <img
             class="section__item-img"
-            src="https://img1.baidu.com/it/u=3384796346,381674655&fm=253&fmt=auto&app=138&f=JPEG?w=889&h=500"
+            :src="item.payload.productImageUrls ? item.payload.productImageUrls[0] : require('@/assets/img/account/im/system.png')"
             alt="消息通知"
           />
           <div class="section__item-content flex flex-column">
             <div class="section__item-content--title flex">
-              <span>{{ JSON.parse(item.payload).title || `` }}</span>
-              <span class="section__item-content--time">{{
-                item.createTimeStamp
-              }}</span>
+              <span>{{ item.payload.title || `` }}</span>
+              <span class="section__item-content--time">{{item.createTimeStamp}}</span>
             </div>
             <div class="section__item-content--txt">
-              {{ JSON.parse(item.payload).content || `` }}
+              {{ item.payload.content || `` }}
             </div>
           </div>
         </div>
         <UiEmpty
-          v-if="!socketMsgData.length"
+          v-if="!msgData.length"
           desc="暂无消息通知"
           :icon="require('@/assets/img/account/order/empty.png')"
         >
@@ -44,20 +43,42 @@
   </div>
 </template>
 <script>
-import { mapState } from "vuex";
+// import { mapState } from "vuex";
 import UiEmpty from "@/components/UiEmpty.vue";
+import {FormatDate} from '@/plugins/utils'
 export default {
   components: { UiEmpty },
   data() {
     return {};
   },
   computed: {
-    ...mapState(["token", "socketMsgData"]),
+    msgData(){
+      return this.$store.state.socketMsgData.map(i => {
+        i.payload = JSON.parse(i.payload);
+        i.createTimeStamp = FormatDate(i.createTimeStamp, 'mm-dd hh:ii:ss')
+        return i;
+      }).reverse();
+    },
+    // ...mapState(["token", "socketMsgData"]),
   },
   mounted() {
     console.log(`socketMsgData`, this.$store.state);
   },
-  methods: {},
+  methods: {
+    
+		/**
+		 * 点击详情跳转
+		 */
+		handleDetail(item){
+			if(['orderPay','orderDelivery','orderCancel'].includes(item.payload.customType)){
+				this.$router.push(`/account/order/detail?id=${item.payload.primaryId}`)
+			}else if(['refundFail','refundSuccess'].includes(item.payload.customType)){
+				this.$message.warning('请在移动端查看售后详情~');
+			}else if(item.payload.linkJump){
+					window.location.href = item.payload.linkJump;
+			}
+		}
+  },
 };
 </script>
 <style lang="scss" scoped>
@@ -87,8 +108,8 @@ export default {
       margin-bottom: 20px;
 
       &-img {
-        width: 110px;
-        height: 110px;
+        width: 50px;
+        height: 50px;
         margin-right: 20px;
       }
 
diff --git a/pages/goods/detail/_id.vue b/pages/goods/detail/_id.vue
index e4ce614..8f0356f 100644
--- a/pages/goods/detail/_id.vue
+++ b/pages/goods/detail/_id.vue
@@ -495,7 +495,6 @@ export default {
         num: this.curBuyNum,
         activityType: 1,
       };
-      console.log(query);
       this.$router.push({
         path: "/order/submit",
         query,