From 28230fe3afce55f4882a9d0326bd01444556bab0 Mon Sep 17 00:00:00 2001
From: admin <>
Date: Fri, 12 Apr 2024 17:03:48 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E6=B6=88=E6=81=AF=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pagesLogin/message/index.vue | 29 +++++++++++++++++++++++------
 src/pagesReceive/pricing.vue     |  2 +-
 src/utils/enum.ts                |  8 ++++++++
 3 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/src/pagesLogin/message/index.vue b/src/pagesLogin/message/index.vue
index 3a64af8..60af04c 100644
--- a/src/pagesLogin/message/index.vue
+++ b/src/pagesLogin/message/index.vue
@@ -10,7 +10,7 @@
     :height="0"
     :isLoading="pageList.isLoading"
   >
-    <view class="msg-box">
+    <view class="msg-box" v-if="pageList.list.length > 0">
       <view class="u-page">
         <u-list>
           <u-list-item v-for="(item, index) in pageList.list" :key="index">
@@ -37,6 +37,7 @@
 <script setup lang="ts">
 import PageView from "@/components/PageView/index.vue";
 import { MessageApi } from "@/services";
+import { MsgType } from "@/utils/enum";
 const pageList: PageResult<any> = reactive({
   isLoading: false,
   noMoreData: false,
@@ -81,16 +82,33 @@ const getList = (v?: boolean) => {
   });
 };
 
-const handleItem = (item:any) => {
+const handleItem = (item: any) => {
   if (item.status === 0) {
-    MessageApi.readNotice({ids: [item.id]}).then(res => {
+    MessageApi.readNotice({ ids: [item.id] }).then((res) => {
       if (res.code === 200) {
         resetPageList();
         getList();
       }
-    })
+    });
   }
-}
+  if (MsgType.ToBePriced === item.msgType) {
+      uni.navigateTo({
+        url: "/pagesReceive/pricing?scaleStatus=0", // 要跳转到的页面路径
+      });
+    } else if (MsgType.ToBeReview === item.msgType) {
+      uni.navigateTo({
+        url: "/pagesReceive/payReview?scaleStatus=2", // 要跳转到的页面路径
+      });
+    } else if (MsgType.ToBeShipment === item.msgType) {
+      uni.navigateTo({
+        url: "/pagesShipment/shipmenting?scaleStatus=0", // 要跳转到的页面路径
+      });
+    } else if (MsgType.ToBeShipmentReview === item.msgType) {
+      uni.navigateTo({
+        url: "/pagesShipment/shipmentSettlement?scaleStatus=2", // 要跳转到的页面路径
+      });
+    }
+};
 onMounted(() => {
   getList();
 });
@@ -99,7 +117,6 @@ onMounted(() => {
 .msg-box {
   background: #f8f8f8;
   width: 100%;
-  height: 100%;
   .title {
     font-size: 28rpx;
     font-family: Source Han Sans CN;
diff --git a/src/pagesReceive/pricing.vue b/src/pagesReceive/pricing.vue
index de3c28e..fcd0c95 100644
--- a/src/pagesReceive/pricing.vue
+++ b/src/pagesReceive/pricing.vue
@@ -95,7 +95,7 @@ const handleModal = (v: boolean, id: number) => {
   deleteId.value = id;
 };
 const handleScenePhoto = (imagesId: number) => {
-  uni.redirectTo({
+  uni.navigateTo({
     url: `/pagesScenePhoto/index?orderType=1&id=${imagesId}&imagesType=1`, // 要跳转到的页面路径
   });
 };
diff --git a/src/utils/enum.ts b/src/utils/enum.ts
index 020b2a0..fbc8221 100644
--- a/src/utils/enum.ts
+++ b/src/utils/enum.ts
@@ -94,4 +94,12 @@ export enum TimeRange {
   Month = 3,
   Year = 4,
   Custom = 5
+}
+
+// 消息跳转类型 0=收货待定价1=收货待审核2=待出库3=出库审核
+export enum MsgType {
+  ToBePriced = 0,
+  ToBeReview = 1,
+  ToBeShipment = 2,
+  ToBeShipmentReview = 3
 }
\ No newline at end of file