From 0374220d9d79c9ca5d8375f749094a46788484f8 Mon Sep 17 00:00:00 2001
From: zpc <zpc1131@gamil.com>
Date: Thu, 12 Mar 2026 20:56:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=B8=BA=E4=B8=AD=E6=96=87=20&=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=95=86=E5=93=81Banner=E5=9B=BE=E5=92=8C=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 权益中心领取优惠券/任务奖励提示改为中文'领取成功'
- 后端action端点返回中文消息(回收成功/发货申请成功/支付成功等)
- 商城兑换成功提示改为'兑换成功'并优化加载闪烁
- 商城确认订单弹窗使用封面图
- 后台商品编辑/新增Banner图保存修复(|| undefined → || null)
---
 honey_box/package/mine/equity.vue             |  2 +-
 honey_box/pages/mall/detail.vue               | 44 ++++++++++++++++---
 honey_box/pages/user/index.vue                |  4 +-
 .../admin-web/src/api/business/goods.ts       | 10 ++---
 .../goods/components/GoodsAddDialog.vue       | 10 ++---
 .../goods/components/GoodsEditDialog.vue      | 10 ++---
 .../Controllers/CouponController.cs           |  2 +-
 .../Controllers/TaskController.cs             |  2 +-
 .../Controllers/WarehouseController.cs        |  4 +-
 9 files changed, 60 insertions(+), 28 deletions(-)

diff --git a/honey_box/package/mine/equity.vue b/honey_box/package/mine/equity.vue
index 19adb0f7..3da7deda 100644
--- a/honey_box/package/mine/equity.vue
+++ b/honey_box/package/mine/equity.vue
@@ -275,7 +275,7 @@
 					const res = await receiveTaskReward(item.id);
 					if (res.status == 1) {
 						this.$c.toast({
-							title: res.msg,
+							title: '领取成功',
 							duration: 500,
 							success: () => {
 								this.getData()
diff --git a/honey_box/pages/mall/detail.vue b/honey_box/pages/mall/detail.vue
index 72855089..d0c434cc 100644
--- a/honey_box/pages/mall/detail.vue
+++ b/honey_box/pages/mall/detail.vue
@@ -95,7 +95,7 @@
 					<view class="rule-close" @click="$refs.orderPop.close()">✕</view>
 				</view>
 				<view class="order-card">
-					<image :src="orderData.goods.imgurl_detail || orderData.goods.imgurl"
+					<image :src="orderData.goods.imgurl"
 						style="width: 190rpx; height: 190rpx; border-radius: 10rpx; flex-shrink: 0;" mode="aspectFill"></image>
 					<view class="order-card-info">
 						<text class="hang1" style="font-size: 28rpx; color: #333;">{{ orderData.goods.title }}</text>
@@ -152,6 +152,7 @@
 <script>
 import { calcMallOrderMoney, createOrder, createMallOrder } from '@/common/server/order.js';
 import { getGoodsDetail } from '@/common/server/goods.js';
+import RequestManager from '@/common/request.js';
 
 export default {
 	data() {
@@ -237,6 +238,36 @@ export default {
 			}
 		},
 
+		// 静默刷新详情，不显示"加载中"提示
+		async silentLoadDetail() {
+			try {
+				const detailRes = await RequestManager.get('/goods_detail', { goods_id: this.goodsId }, false);
+				if (detailRes.status == 1 && detailRes.data) {
+					this.goodsInfo = detailRes.data.goods || detailRes.data;
+				}
+			} catch (e) {
+				console.log('静默刷新商品详情失败', e);
+			}
+			const token = uni.getStorageSync('token');
+			if (token) {
+				try {
+					const res = await RequestManager.post('/mall_ordermoney', {
+						prize_num: 1,
+						goods_id: this.goodsId,
+						num: 1,
+					}, false);
+					if (res.status == 1) {
+						this.orderData = res.data;
+						if (res.data.goods) {
+							this.goodsInfo = { ...this.goodsInfo, ...res.data.goods };
+						}
+					}
+				} catch (e) {
+					console.log('静默刷新支付信息失败', e);
+				}
+			}
+		},
+
 		onBuy() {
 			const token = uni.getStorageSync('token');
 			if (!token) {
@@ -324,16 +355,17 @@ export default {
 					const status = await this.$platform.pay({ data: res.data.res }, this);
 					if (status == 'success') {
 						this.$c.msg('兑换成功');
-						// 延迟刷新，避免与成功提示冲突
+						// 静默刷新，避免出现"加载中"提示
 						setTimeout(() => {
-							this.loadDetail();
+							this.silentLoadDetail();
 						}, 1600);
 					}
 				} else {
-					// 失败时立即刷新
-					this.$c.msg(res.msg);
+					// 兑换成功（积分/货币直接扣除，无需微信支付）
+					this.$c.msg('兑换成功');
+					// 静默刷新，避免出现"加载中"提示
 					setTimeout(() => {
-						this.loadDetail();
+						this.silentLoadDetail();
 					}, 1600);
 				}
 			}
diff --git a/honey_box/pages/user/index.vue b/honey_box/pages/user/index.vue
index 92c4e994..8132e599 100644
--- a/honey_box/pages/user/index.vue
+++ b/honey_box/pages/user/index.vue
@@ -268,7 +268,7 @@
 
 				if (res.status == 1) {
 					this.$c.toast({
-						title: res.msg,
+						title: '领取成功',
 						duration: 500,
 						success: () => {
 							this.$c.to({
@@ -293,7 +293,7 @@
 				const res = await receiveTaskReward(item.id);
 				if (res.status == 1) {
 					this.$c.toast({
-						title: res.msg,
+						title: '领取成功',
 						duration: 500,
 						success: () => {
 							this.getdata()
diff --git a/server/HoneyBox/src/HoneyBox.Admin/admin-web/src/api/business/goods.ts b/server/HoneyBox/src/HoneyBox.Admin/admin-web/src/api/business/goods.ts
index 83fea282..259f2721 100644
--- a/server/HoneyBox/src/HoneyBox.Admin/admin-web/src/api/business/goods.ts
+++ b/server/HoneyBox/src/HoneyBox.Admin/admin-web/src/api/business/goods.ts
@@ -89,7 +89,7 @@ export interface GoodsCreateRequest {
   type: number
   imgUrl: string
   imgUrlDetail: string
-  imgUrlBanner?: string
+  imgUrlBanner?: string | null
   stock: number
   sort: number
   dailyLimit: number
@@ -99,12 +99,12 @@ export interface GoodsCreateRequest {
   showIs: number
   couponIs: number
   couponPro: number
-  flwStartTime?: string
-  flwEndTime?: string
-  openTime?: string
+  flwStartTime?: string | null
+  flwEndTime?: string | null
+  openTime?: string | null
   choujiangXianzhi?: number
   categoryId: number
-  goodsDescribe?: string
+  goodsDescribe?: string | null
   newIs: number
   isShouZhe: number
   rageIs: number
diff --git a/server/HoneyBox/src/HoneyBox.Admin/admin-web/src/views/business/goods/components/GoodsAddDialog.vue b/server/HoneyBox/src/HoneyBox.Admin/admin-web/src/views/business/goods/components/GoodsAddDialog.vue
index 785997c3..127eb6f2 100644
--- a/server/HoneyBox/src/HoneyBox.Admin/admin-web/src/views/business/goods/components/GoodsAddDialog.vue
+++ b/server/HoneyBox/src/HoneyBox.Admin/admin-web/src/views/business/goods/components/GoodsAddDialog.vue
@@ -615,7 +615,7 @@ const handleSubmit = async () => {
       type: formData.type,
       imgUrl: formData.imgUrl,
       imgUrlDetail: formData.imgUrlDetail,
-      imgUrlBanner: formData.imgUrlBanner || undefined,
+      imgUrlBanner: formData.imgUrlBanner || null,
       stock: formData.stock,
       sort: formData.sort,
       dailyLimit: formData.dailyLimit,
@@ -625,12 +625,12 @@ const handleSubmit = async () => {
       showIs: formData.showIs,
       couponIs: formData.couponIs,
       couponPro: formData.couponPro,
-      flwStartTime: formData.flwStartTime || undefined,
-      flwEndTime: formData.flwEndTime || undefined,
-      openTime: formData.openTime || undefined,
+      flwStartTime: formData.flwStartTime || null,
+      flwEndTime: formData.flwEndTime || null,
+      openTime: formData.openTime || null,
       choujiangXianzhi: formData.choujiangXianzhi,
       categoryId: formData.categoryId,
-      goodsDescribe: formData.goodsDescribe || undefined,
+      goodsDescribe: formData.goodsDescribe || null,
       newIs: formData.newIs,
       isShouZhe: formData.isShouZhe,
       rageIs: formData.rageIs,
diff --git a/server/HoneyBox/src/HoneyBox.Admin/admin-web/src/views/business/goods/components/GoodsEditDialog.vue b/server/HoneyBox/src/HoneyBox.Admin/admin-web/src/views/business/goods/components/GoodsEditDialog.vue
index 11cba8dd..b73a0421 100644
--- a/server/HoneyBox/src/HoneyBox.Admin/admin-web/src/views/business/goods/components/GoodsEditDialog.vue
+++ b/server/HoneyBox/src/HoneyBox.Admin/admin-web/src/views/business/goods/components/GoodsEditDialog.vue
@@ -617,7 +617,7 @@ const handleSubmit = async () => {
       type: formData.type,
       imgUrl: formData.imgUrl,
       imgUrlDetail: formData.imgUrlDetail,
-      imgUrlBanner: formData.imgUrlBanner || undefined,
+      imgUrlBanner: formData.imgUrlBanner || null,
       stock: formData.stock,
       sort: formData.sort,
       dailyLimit: formData.dailyLimit,
@@ -627,12 +627,12 @@ const handleSubmit = async () => {
       showIs: formData.showIs,
       couponIs: formData.couponIs,
       couponPro: formData.couponPro,
-      flwStartTime: formData.flwStartTime || undefined,
-      flwEndTime: formData.flwEndTime || undefined,
-      openTime: formData.openTime || undefined,
+      flwStartTime: formData.flwStartTime || null,
+      flwEndTime: formData.flwEndTime || null,
+      openTime: formData.openTime || null,
       choujiangXianzhi: formData.choujiangXianzhi,
       categoryId: formData.categoryId,
-      goodsDescribe: formData.goodsDescribe || undefined,
+      goodsDescribe: formData.goodsDescribe || null,
       newIs: formData.newIs,
       isShouZhe: formData.isShouZhe,
       rageIs: formData.rageIs,
diff --git a/server/HoneyBox/src/HoneyBox.Api/Controllers/CouponController.cs b/server/HoneyBox/src/HoneyBox.Api/Controllers/CouponController.cs
index 9088f834..2b6b7154 100644
--- a/server/HoneyBox/src/HoneyBox.Api/Controllers/CouponController.cs
+++ b/server/HoneyBox/src/HoneyBox.Api/Controllers/CouponController.cs
@@ -178,7 +178,7 @@ public class CouponController : ControllerBase
             }
 
             var result = await _couponService.ClaimCouponAsync(userId.Value, request.Id);
-            return ApiResponse<ClaimCouponResponse>.Success(result);
+            return ApiResponse<ClaimCouponResponse>.Success(result, "领取成功");
         }
         catch (InvalidOperationException ex)
         {
diff --git a/server/HoneyBox/src/HoneyBox.Api/Controllers/TaskController.cs b/server/HoneyBox/src/HoneyBox.Api/Controllers/TaskController.cs
index 0f1ff7a2..8fed3be0 100644
--- a/server/HoneyBox/src/HoneyBox.Api/Controllers/TaskController.cs
+++ b/server/HoneyBox/src/HoneyBox.Api/Controllers/TaskController.cs
@@ -86,7 +86,7 @@ public class TaskController : ControllerBase
             }
 
             var result = await _taskService.ClaimTaskRewardAsync(userId.Value, request.TaskListId);
-            return ApiResponse<ClaimTaskRewardResponse>.Success(result);
+            return ApiResponse<ClaimTaskRewardResponse>.Success(result, "领取成功");
         }
         catch (InvalidOperationException ex)
         {
diff --git a/server/HoneyBox/src/HoneyBox.Api/Controllers/WarehouseController.cs b/server/HoneyBox/src/HoneyBox.Api/Controllers/WarehouseController.cs
index b97384bb..9882bc92 100644
--- a/server/HoneyBox/src/HoneyBox.Api/Controllers/WarehouseController.cs
+++ b/server/HoneyBox/src/HoneyBox.Api/Controllers/WarehouseController.cs
@@ -106,7 +106,7 @@ public class WarehouseController : ControllerBase
             }
 
             var result = await _warehouseService.RecoveryPrizesAsync(userId.Value, request);
-            return ApiResponse<RecoveryResultDto>.Success(result);
+            return ApiResponse<RecoveryResultDto>.Success(result, "回收成功");
         }
         catch (InvalidOperationException ex)
         {
@@ -171,7 +171,7 @@ public class WarehouseController : ControllerBase
             }
 
             var result = await _warehouseService.SendPrizesAsync(userId.Value, request);
-            return ApiResponse<SendResultDto>.Success(result);
+            return ApiResponse<SendResultDto>.Success(result, "发货申请成功");
         }
         catch (InvalidOperationException ex)
         {