{{params.paymentMethod === 'ALIPAY' ? '支付宝支付' : '微信支付'}}
+ {{ payWayName }}支付
-
-
+
- 正在生成支付二维码...
+
+
+ {{ payError }}
+您可点击「重新支付」重试，或返回选择其他支付方式
+
-
+
支付成功后自动跳转，如未跳转请点击按钮手动跳转。。。
- 重新支付
+ 重新支付
支付成功
- ![]()
+ ![]()
@@ -26,7 +26,7 @@
- {{ item.goodsSku.goodsName }}
+ {{ itemGoodsName(item) }}
已有{{ item.commentNum || 0 }}人评价
@@ -70,6 +70,13 @@ export default {
this.getCate()
},
methods: {
+ /** 列表 API 返回 PointsGoods（thumbnail/goodsName 在顶层）；详情 API 才有 goodsSku */
+ itemThumbnail (item) {
+ return item?.goodsSku?.thumbnail || item?.thumbnail || ''
+ },
+ itemGoodsName (item) {
+ return item?.goodsSku?.goodsName || item?.goodsName || ''
+ },
getList () { // 获取列表
pointGoods(this.params).then(res => {
if (res.success) {
diff --git a/buyer/src/plugins/request.js b/buyer/src/plugins/request.js
index f175af91..d1ac4296 100644
--- a/buyer/src/plugins/request.js
+++ b/buyer/src/plugins/request.js
@@ -70,7 +70,6 @@ service.interceptors.request.use(
const accessToken = Storage.getItem("accessToken");
if (accessToken && (config.needToken || config.optionalToken)) {
- config.headers["accessToken"] = accessToken;
try {
const jwtData = JSON.parse(
decodeURIComponent(
@@ -80,12 +79,23 @@ service.interceptors.request.use(
)
)
);
- if (jwtData.exp < Math.round(new Date() / 1000)) {
- refresh({ response: { config } });
+ const expired = jwtData.exp < Math.round(new Date() / 1000);
+ if (expired) {
+ if (config.needToken) {
+ return refresh({ response: { config } });
+ }
+ // 公开接口：丢弃过期 token，匿名继续请求，避免浏览商品时被引导登录
+ Storage.removeItem("accessToken");
+ Storage.removeItem("refreshToken");
+ } else {
+ config.headers["accessToken"] = accessToken;
}
} catch {
Storage.removeItem("accessToken");
Storage.removeItem("refreshToken");
+ if (config.needToken) {
+ return refresh({ response: { config } });
+ }
}
}
diff --git a/buyer/src/utils/buyerLogin.js b/buyer/src/utils/buyerLogin.js
new file mode 100644
index 00000000..9a8ffe5a
--- /dev/null
+++ b/buyer/src/utils/buyerLogin.js
@@ -0,0 +1,59 @@
+/**
+ * 买家端登录态与商品详情跳转校验
+ *
+ * @author Mike
+ * @date 2026-08-05
+ */
+import storage from "@/plugins/storage";
+
+export function isBuyerLoggedIn() {
+ const rawUserInfo = storage.getItem("userInfo");
+ if (rawUserInfo) {
+ try {
+ return !!JSON.parse(rawUserInfo).username;
+ } catch {
+ return false;
+ }
+ }
+ return !!storage.getItem("accessToken");
+}
+
+export function parseInternalLink(url) {
+ const [path, search = ""] = url.split("?");
+ const query = {};
+ if (search) {
+ new URLSearchParams(search).forEach((value, key) => {
+ query[key] = value;
+ });
+ }
+ return { path, query };
+}
+
+export function isGoodsDetailPath(path) {
+ return path === "/goodsDetail";
+}
+
+export function redirectToLogin(router, location) {
+ router.push({
+ path: "/login",
+ query: {
+ rePath: location.path,
+ query: JSON.stringify(location.query || {}),
+ },
+ });
+}
+
+/** 内部链接跳转；访问商品详情前校验登录（首页装修、列表等共用） */
+export function openLink(url, router) {
+ if (!url) return;
+ if (url.charAt(0) !== "/") {
+ window.open(url, "_blank");
+ return;
+ }
+ const location = parseInternalLink(url);
+ if (!isBuyerLoggedIn() && isGoodsDetailPath(location.path)) {
+ redirectToLogin(router, location);
+ return;
+ }
+ window.open(router.resolve(url).href, "_blank");
+}
diff --git a/manager/src/views/order/order/orderDetail.vue b/manager/src/views/order/order/orderDetail.vue
index e0fb7a85..7c9b9e73 100644
--- a/manager/src/views/order/order/orderDetail.vue
+++ b/manager/src/views/order/order/orderDetail.vue
@@ -236,7 +236,6 @@
style="width: 100%"
>
-
+
返回
-
-
+
+ {{ failItem.row }}
+
+
+
+
+ {{ failItem.cardNo || "—" }}
+
+
+ 确定
@@ -204,6 +230,7 @@ import {
exportCardKey,
downloadImportTemplate,
} from "@/api/cardKey";
+import { getQueryGoodsIdGoodsList } from "@/api/goods";
import {
formatCardKeyStatus,
CARD_KEY_STATUS_TAG,
@@ -223,6 +250,8 @@ export default {
skuId: "",
goodsId: "",
goodsName: "",
+ skuOptions: [],
+ skuLoading: false,
statusTab: "ALL",
stats: null,
poolLocked: false,
@@ -271,6 +300,20 @@ export default {
];
},
},
+ watch: {
+ "$route.query": {
+ handler() {
+ const prevSkuId = this.skuId;
+ this.initFromRoute();
+ if (this.skuId && this.skuId !== prevSkuId) {
+ this.resetPoolViewState();
+ this.loadStats();
+ this.getList();
+ }
+ },
+ deep: true,
+ },
+ },
methods: {
formatStatus: formatCardKeyStatus,
statusTag(status) {
@@ -285,6 +328,65 @@ export default {
this.goodsId = q.goodsId || "";
this.goodsName = q.goodsName || "";
},
+ formatSkuOptionLabel(sku) {
+ if (!sku) return "";
+ const spec = sku.simpleSpecs || sku.sn || sku.id;
+ const qty =
+ sku.poolStock != null && sku.poolStock !== ""
+ ? sku.poolStock
+ : sku.quantity != null
+ ? sku.quantity
+ : "—";
+ return `${spec}（库存 ${qty}）`;
+ },
+ resetPoolViewState() {
+ this.statusTab = "ALL";
+ this.searchForm.pageNumber = 1;
+ this.searchForm.cardNo = "";
+ this.importRange = [];
+ this.poolLocked = false;
+ this.stats = null;
+ this.data = [];
+ this.total = 0;
+ },
+ /** 卡池变更后刷新 SKU 选择器中的可售库存（后端 syncSkuStock → quantity） */
+ refreshSkuOptionStock() {
+ if (!this.goodsId) return Promise.resolve();
+ return this.loadSkuOptions();
+ },
+ async loadSkuOptions() {
+ if (!this.goodsId) {
+ this.skuOptions = [];
+ return;
+ }
+ this.skuLoading = true;
+ try {
+ const res = await getQueryGoodsIdGoodsList(this.goodsId);
+ if (res.success) {
+ this.skuOptions = (res.result || []).filter((s) => !s.deleteFlag);
+ }
+ } catch {
+ this.skuOptions = [];
+ } finally {
+ this.skuLoading = false;
+ }
+ },
+ onSkuChange(newSkuId) {
+ if (!newSkuId) return;
+ this.skuId = newSkuId;
+ this.resetPoolViewState();
+ this.$router.replace({
+ path: this.$route.path,
+ query: {
+ ...this.$route.query,
+ skuId: newSkuId,
+ goodsId: this.goodsId,
+ goodsName: this.goodsName,
+ },
+ });
+ this.loadStats();
+ this.getList();
+ },
onStatusTabClick(tab) {
this.statusTab = tab.paneName;
this.searchForm.pageNumber = 1;
@@ -370,6 +472,7 @@ export default {
this.importResultVisible = true;
this.loadStats();
this.getList();
+ this.refreshSkuOptionStock();
} else {
this.checkPoolLocked(res);
}
@@ -407,6 +510,7 @@ export default {
this.addVisible = false;
this.loadStats();
this.getList();
+ this.refreshSkuOptionStock();
} else {
this.checkPoolLocked(res);
}
@@ -426,6 +530,7 @@ export default {
this.$Message.success("作废成功");
this.loadStats();
this.getList();
+ this.refreshSkuOptionStock();
}
});
},
@@ -445,8 +550,15 @@ export default {
this.exportLoading = false;
});
},
- init() {
+ async init() {
this.initFromRoute();
+ if (this.goodsId) {
+ await this.loadSkuOptions();
+ }
+ if (!this.skuId && this.skuOptions.length) {
+ this.onSkuChange(this.skuOptions[0].id);
+ return;
+ }
if (this.skuId) {
this.loadStats();
this.getList();
@@ -475,6 +587,18 @@ export default {
font-size: 14px;
}
+.pool-sku-select {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+}
+
+.pool-sku-label {
+ color: #606266;
+ font-size: 14px;
+ white-space: nowrap;
+}
+
.goods-tab {
:deep(.el-tabs__item) {
font-size: 14px;
diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue
index df7a6bb0..8bb67f9d 100644
--- a/seller/src/views/goods/goods-seller/goodsOperation.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperation.vue
@@ -1,58 +1,31 @@
-
diff --git a/seller/src/views/goods/goods-seller/goodsOperationSec.vue b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
index 7308bedf..bd110fd1 100644
--- a/seller/src/views/goods/goods-seller/goodsOperationSec.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
@@ -8,12 +8,37 @@
-
-
-
-
- 基本信息
-
- {{
- baseInfoForm.categoryName[0]
- }}
- > {{ baseInfoForm.categoryName[1] }}
- > {{ baseInfoForm.categoryName[2] }}
+
+
+
+
+
+
+
+
+ {{ item.label }}
+ {{ item.desc }}
+
+ {{ currentGoodsTypeDesc }}
+