From 0506cbccc1e6d85a120b5dacf0fb54b9854442c4 Mon Sep 17 00:00:00 2001
From: chenghuan <chenghuanv587@qq.com>
Date: Fri, 27 Mar 2026 11:50:22 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=AE=A2=E5=8D=95=E6=A8=A1=E5=9D=97):=20?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=94=AF=E4=BB=98=E5=95=86=E6=88=B7=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E5=92=8C=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改支付商户相关表单项的标签，从“微信支付商户”更改为“支付商户”，以提高表述准确性
- 在订单详情中添加支付商户的显示逻辑，根据不同的支付商户值显示相应的名称 (众妙、灵枢)
---
 src/views/modules/order/buyorderdetail.vue           | 2 ++
 src/views/modules/shop/curriculum.vue                | 4 ++--
 src/views/modules/shop/shopproduct-add-or-update.vue | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/order/buyorderdetail.vue b/src/views/modules/order/buyorderdetail.vue
index 864c048..820459d 100644
--- a/src/views/modules/order/buyorderdetail.vue
+++ b/src/views/modules/order/buyorderdetail.vue
@@ -100,6 +100,8 @@
            
             <span>IOS内购</span>
           </span>
+          <span v-if="orderDetails.payMerchant == 0">(众妙)</span>
+          <span v-if="orderDetails.payMerchant == 1">(灵枢)</span>
         </li> 
 
         <li
diff --git a/src/views/modules/shop/curriculum.vue b/src/views/modules/shop/curriculum.vue
index e257ba3..d5a0e40 100644
--- a/src/views/modules/shop/curriculum.vue
+++ b/src/views/modules/shop/curriculum.vue
@@ -174,7 +174,7 @@
             <el-radio :label="0">否</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="微信支付商户" prop="payMerchant">
+        <el-form-item label="支付商户" prop="payMerchant">
           <el-radio-group v-model="dataForm.payMerchant">
             <el-radio :label="0">众妙之门</el-radio>
             <el-radio :label="1">灵枢教育科技</el-radio>
@@ -288,7 +288,7 @@ export default {
         // format: '', // 开本
         isFreeMail: 1, // 是否包邮
         isVipPrice: 1,  //是否vip
-        payMerchant: 0, // 微信支付商户
+        payMerchant: 0, // 支付商户
         // pageNum: '',
         // quality: '', // 内文用纸
         isNew: 0,
diff --git a/src/views/modules/shop/shopproduct-add-or-update.vue b/src/views/modules/shop/shopproduct-add-or-update.vue
index 3521b85..48cf741 100644
--- a/src/views/modules/shop/shopproduct-add-or-update.vue
+++ b/src/views/modules/shop/shopproduct-add-or-update.vue
@@ -224,7 +224,7 @@
             <el-radio :label="0">否</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="微信支付商户" prop="payMerchant">
+        <el-form-item label="支付商户" prop="payMerchant">
           <el-radio-group v-model="dataForm.payMerchant">
             <el-radio :label="0">众妙之门</el-radio>
             <el-radio :label="1">灵枢教育科技</el-radio>
@@ -332,7 +332,7 @@ export default {
         // format: '', // 开本
         isFreeMail: 1, // 是否包邮
         isVipPrice: 0,  //是否vip
-        payMerchant: 0, // 微信支付商户
+        payMerchant: 0, // 支付商户
         // pageNum: '',
         // quality: '', // 内文用纸
         isNew: 0,
@@ -641,7 +641,7 @@ export default {
               isFreeMail: this.dataForm.isFreeMail,
               isVipPrice: this.dataForm.isVipPrice,
               isNew: this.dataForm.isNew,
-              payMerchant: this.dataForm.payMerchant, // 微信支付商户
+              payMerchant: this.dataForm.payMerchant, // 支付商户
               // 'pageNum': this.dataForm.pageNum,
               // 'quality': this.dataForm.quality, // 内文用纸
               productStock: this.dataForm.productStock, // 库存