From 2ad0ea51bd71aab95c8ae44d759e6c22e18cf7b8 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Sun, 29 Dec 2024 23:39:44 +0800
Subject: [PATCH] uu

---
 common/messageNotice/socket.js |  7 ++++---
 pages/warehousing/detail.vue   | 11 ++++-------
 pages/warehousing/list.vue     |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/common/messageNotice/socket.js b/common/messageNotice/socket.js
index aff24b4..7b8ad87 100644
--- a/common/messageNotice/socket.js
+++ b/common/messageNotice/socket.js
@@ -64,9 +64,9 @@ export const createSocketMessage = ({ userInfo })=> {
 	});
 }
 
-// #ifdef APP-PLUS
-// 监听plusready事件  
+
 export const pushAddEventListenerInit = ()=> {
+	// #ifdef APP-PLUS
 	// 监听 消息栏的点击事件
 	plus.push.addEventListener('click', function(msg = {}){
 		// 分析msg.payload处理业务逻辑 
@@ -86,8 +86,9 @@ export const pushAddEventListenerInit = ()=> {
 		// }
 		console.log("notice msg-- clickPath ", msg?.payload?.clickPath)
 	}, false );
+	// #endif
 }
-// #endif
+
 
 export const createSysMessage = (opt = {})=> {
 	showToast(`${opt.title}  ${opt.content}`)
diff --git a/pages/warehousing/detail.vue b/pages/warehousing/detail.vue
index bc64e8e..4df69e3 100644
--- a/pages/warehousing/detail.vue
+++ b/pages/warehousing/detail.vue
@@ -130,7 +130,7 @@
 						</view>
 						<view class="dt-item font-28">
 							<view>
-								<text class="pr-20 clr-sub">同行快:</text>
+								<text class="pr-20 clr-sub">同行快递:</text>
 								<text class="">{{item.prepareInExpress}}</text>
 							</view>
 							<view>
@@ -167,7 +167,7 @@
 							</u-row>
 						</view>
 					</view>
-					<u-row justify="end">
+					<!-- <u-row justify="end">
 						<view style="display: inline-block;white-space: nowrap;" class="mt-10 pb-30">
 							<u-row>
 								<u-button v-if="item.confirmStatus!=1" @click="handleDialogClick(feedModal)" shape="circle" :plain="true"
@@ -180,7 +180,7 @@
 								
 							</u-row>					
 						</view>
-					</u-row>
+					</u-row> -->
 					
 				</view>
 			</template>
@@ -292,13 +292,10 @@
 				let sres = await saveNetFile(res)
 			},
 			async confirmJinCang(inNo) {
-				let confirmStatus = '2' // 部分入仓
 				if(!inNo) {
-					confirmStatus = '1' // 全部入仓
 					inNo = this.billInfo.inNo
 				}
-				let res = await apiService.cusConfirmWsIn({ inNo, confirmStatus, _loading: true })
-				this.initData()
+				this.goto(`deliveryDeal/storage?inNo=${inNo}`)
 			},
 		}
 	}
diff --git a/pages/warehousing/list.vue b/pages/warehousing/list.vue
index 183942e..6cfcc04 100644
--- a/pages/warehousing/list.vue
+++ b/pages/warehousing/list.vue
@@ -82,7 +82,7 @@
 											<u-col span="4" justify="center" align="center"
 												custom-style="text-align: center;">
 												<image style="width: 70rpx;height: 14rpx;"
-													:src="getCdnUrl('search/toline.png')">
+													:src="getCdnUrl('post/toline.png')">
 												</image>
 											</u-col>
 											<u-col span="4">