From 1246d2d218cb2c7d15be69c3ea7fdee6d738475a Mon Sep 17 00:00:00 2001
From: lukaijie <lukaijie@shopex.cn>
Date: Fri, 3 Jul 2026 14:32:48 +0800
Subject: [PATCH] [TBID:ECX-9138] chore: merge master changes for release

---
 .gitignore                                    |   2 +
 .husky/commit-msg                             |   2 +-
 README.md                                     |  19 ++
 commitlint.config.js                          |  12 +-
 src/api/common.js                             |  17 +-
 src/components/function/distributorSelect.vue |  20 +-
 src/components/related-upload/index.vue       |  13 +-
 src/components/sp-path-selector/config.js     |   2 +-
 .../GoodsPicker.country-code.test.mjs         |  10 +
 src/components/sp-picker-plus/GoodsPicker.vue |   2 +
 .../sp-picker/pickers/picker-wxapp.vue        |   2 +-
 src/consts/index.js                           |   3 +-
 src/i18n/locales/ar.json                      |  35 ++-
 src/i18n/locales/en.json                      |  35 ++-
 src/i18n/locales/zh-CN.json                   |  43 ++-
 src/router/routes/modules/setting.js          |  11 +
 src/router/src/route-setting.js               |   2 +-
 src/utils/src/utils.js                        |  23 ++
 src/view/base/currency/index.vue              | 192 +++++++------
 src/view/base/screen/openScreenAD.vue         |   1 -
 src/view/content/consts.js                    |   0
 src/view/content/soft-article-id.vue          |  24 +-
 src/view/content/soft-article.vue             |   2 +
 src/view/dealer/bspay_create_user.vue         |  33 ++-
 src/view/decorate/wgts/wgt_shop/index.vue     |   5 +-
 src/view/mall/aftersales/refundDetail.vue     |  22 +-
 .../refundList/components/order.vue           |  18 +-
 src/view/mall/goods/physical/list.vue         | 264 +++++++++++++-----
 .../mall/goods/physical/normalGoodsUpload.vue |   8 +-
 src/view/mall/marketing/distributor.vue       |  36 ++-
 .../mall/storeshop/store-shop.standard.vue    |  38 ++-
 src/view/mall/trade/list.vue                  |  36 ++-
 src/view/mall/trade/normalorders/list.vue     |  11 +-
 .../trade/order/detail/component/PayCard.vue  |  13 +-
 src/view/mall/trade/order/detail/index.vue    |  77 ++---
 src/view/marketing/employee/addGoods.vue      |  31 +-
 src/view/marketing/employee/purchase.vue      |   4 +-
 src/view/member/level.vue                     |   9 +-
 src/view/member/point/index.vue               |  15 +-
 src/view/merchant/store.vue                   |  31 +-
 .../application-center/shopex-appcenter.vue   |  19 +-
 src/views/applications/shuyun/crm-setting.vue |   4 +-
 .../systemConfig/extMiniLinkDetail.vue        |   1 -
 src/views/settings/systemConfig/payment.vue   | 162 ++++++++++-
 .../systemConfig/wxapp-customer-service.vue   |  76 +----
 45 files changed, 915 insertions(+), 470 deletions(-)
 create mode 100644 src/components/sp-picker-plus/GoodsPicker.country-code.test.mjs
 mode change 100755 => 100644 src/view/content/consts.js

diff --git a/.gitignore b/.gitignore
index f225c57..ca3b065 100755
--- a/.gitignore
+++ b/.gitignore
@@ -23,4 +23,6 @@ openspec/
 dist/
 .cursor/commit-summary/
 .codegraph/
+.cursor/skills/
 
+.understand-anything
\ No newline at end of file
diff --git a/.husky/commit-msg b/.husky/commit-msg
index fe4c17a..0bd658f 100755
--- a/.husky/commit-msg
+++ b/.husky/commit-msg
@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-npx --no-install commitlint --edit ""
+npx --no-install commitlint --edit "$1"
diff --git a/README.md b/README.md
index c899ec9..b0364e4 100755
--- a/README.md
+++ b/README.md
@@ -44,6 +44,25 @@ VUE_APP_LOCAL_DELIVERY_DIRVER=
 VUE_APP_DEFAULT_LANG=en
 ```
 
+### Cloud Deployment: Backend API Base URL
+
+When deploying to a server or cloud host, login fails until `VUE_APP_BASE_API` points at your **own** backend instead of the default.
+
+- **Which variable / file?** Set `VUE_APP_BASE_API` in `.env`, or in `.env.local` which overrides `.env` and is git-ignored (recommended for per-deployment values). If it is left empty the app falls back to `/`, so API calls hit the frontend host itself and login fails.
+- **Do I need the port?** Only when the backend is reached directly on a non-standard port — the PHP API listens on `8005` by default. Behind a domain proxied by Nginx on 80/443, omit the port.
+- **Rebuild after every change.** `VUE_APP_*` variables are baked into the static bundle at build time. After editing the env file you must re-run the build for the new address to take effect. Run the build from the project root (where `package.json` lives); inside a container, run it in that same directory.
+
+```shell
+# Behind a domain (Nginx on 80/443) — no port needed, end with /api
+VUE_APP_BASE_API=https://your-domain.com/api
+# Direct public IP on a non-standard port — include the port
+VUE_APP_BASE_API=http://1.2.3.4:8005/api
+
+# Rebuild after changing the value
+npm run build:b2c   # B2C
+npm run build:bbc   # B2B2C
+```
+
 ### Installation
 ```
 cd ECShopX_admin-frontend
diff --git a/commitlint.config.js b/commitlint.config.js
index d256183..966ead2 100755
--- a/commitlint.config.js
+++ b/commitlint.config.js
@@ -1,11 +1,19 @@
 module.exports = {
   extends: ['@commitlint/config-conventional', 'cz'],
+  // 支持 GitLab 强制要求的 [TBID:ECX-xxxx] 前缀，后跟 type(scope)?: subject
+  parserPreset: {
+    parserOpts: {
+      headerPattern: /^\[TBID:[A-Za-z0-9]+-\d+\]\s+(\w+)(?:\(([^)]+)\))?\s*:?\s+(.+)$/,
+      headerCorrespondence: ['type', 'scope', 'subject']
+    }
+  },
   rules: {
     'type-enum': [
       2,
       'always',
       [
         'feature', // 新功能（feature）
+        'feat', // 新功能（简写，与历史提交兼容）
         'bug', // 此项特别针对bug号，用于向测试反馈bug列表的bug修改情况
         'fix', // 修补bug
         'ui', // 更新 ui
@@ -26,8 +34,8 @@ module.exports = {
     'type-case': [2, 'always', 'lower-case'],
     // <type> 不能为空
     'type-empty': [2, 'never'],
-    // <scope> 范围不能为空
-    'scope-empty': [2, 'never'],
+    // <scope> 可选（团队惯例多为 [TBID:xxx] type: subject，不写 scope）
+    'scope-empty': [0],
     // <scope> 范围格式
     'scope-case': [0],
     // <subject> 主要 message 不能为空
diff --git a/src/api/common.js b/src/api/common.js
index 53b9ca9..66a3499 100755
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -65,11 +65,22 @@ export function getFileBlob(url) {
       responseType: 'arraybuffer',
       headers: { Authorization: 'bearer ' + store.getters.token }
     })
-      .then((data) => {
-        resolve(data.data)
+      .then((response) => {
+        const contentType = response.headers['content-type'] || ''
+        if (contentType.includes('application/json') || contentType.includes('text/')) {
+          try {
+            const text = new TextDecoder().decode(response.data)
+            const err = JSON.parse(text)
+            reject(err.message || err.msg || text)
+          } catch {
+            reject('文件下载失败')
+          }
+          return
+        }
+        resolve(response.data)
       })
       .catch((error) => {
-        reject(error.toString())
+        reject(typeof error === 'string' ? error : error.toString())
       })
   })
 }
diff --git a/src/components/function/distributorSelect.vue b/src/components/function/distributorSelect.vue
index e371e73..c15ac83 100755
--- a/src/components/function/distributorSelect.vue
+++ b/src/components/function/distributorSelect.vue
@@ -12,14 +12,20 @@
     :before-close="cancelAction"
   >
     <!-- :show-close="isSynchronize?true:false" -->
-    <div style="margin-bottom: 15px">
+    <div style="margin-bottom: 15px; display: flex; gap: 10px">
       <el-input
         v-model="name"
         :placeholder="isSynchronize ? $t('f15fc38a.336865') : $t('f15fc38a.240fdb')"
         clearable
-      >
-        <el-button slot="append" icon="el-icon-search" @click="handleIconClick" />
-      </el-input>
+        @keyup.enter.native="handleIconClick"
+      />
+      <el-input
+        v-model="shop_code"
+        :placeholder="$t('a523b3a5.68f04a')"
+        clearable
+        @keyup.enter.native="handleIconClick"
+      />
+      <el-button icon="el-icon-search" @click="handleIconClick" />
     </div>
     <el-table
       v-if="storeVisible"
@@ -33,6 +39,7 @@
     >
       <el-table-column type="selection" :reserve-selection="true" width="50" />
       <el-table-column prop="name" :label="$t('f15fc38a.0d4934')" />
+      <el-table-column prop="shop_code" :label="$t('a523b3a5.f6d738')" width="120" />
       <el-table-column prop="contact" :label="$t('f15fc38a.52409d')" />
       <el-table-column prop="is_valid" :label="$t('f15fc38a.3fea7c')">
         <template slot-scope="scope">
@@ -136,6 +143,7 @@ export default {
         distribution_type: ''
       },
       name: '',
+      shop_code: '',
       selectRows: [],
       isFristLoad: true
     }
@@ -172,6 +180,8 @@ export default {
     initState() {
       this.isFristLoad = true
       this.storeData = []
+      this.name = ''
+      this.shop_code = ''
       // this.selectRows = []
       // this.params = {
       //   page: 1,
@@ -213,7 +223,9 @@ export default {
       this.getDistributor()
     },
     handleIconClick() {
+      this.params.page = 1
       this.params.name = this.name
+      this.params.shop_code = this.shop_code
       this.getDistributor()
     },
     toggleSelection(rows) {
diff --git a/src/components/related-upload/index.vue b/src/components/related-upload/index.vue
index 134c76a..ede10f4 100644
--- a/src/components/related-upload/index.vue
+++ b/src/components/related-upload/index.vue
@@ -22,7 +22,12 @@
 <template>
   <div>
     <div class="action-container">
-      <el-upload action="" :on-change="uploadHandleChange" :auto-upload="false" :show-file-list="false">
+      <el-upload
+        action=""
+        :on-change="uploadHandleChange"
+        :auto-upload="false"
+        :show-file-list="false"
+      >
         <el-button size="small" type="primary"> {{ $t('5f45d286.2c808b') }} </el-button>
       </el-upload>
       <el-button size="small" type="primary" @click="uploadHandleTemplate()">
@@ -156,7 +161,11 @@ export default {
         ...this.extraParams,
         file_type: this.fileType
       }
-      if (this.relatedId !== '' && this.relatedId !== null && typeof this.relatedId !== 'undefined') {
+      if (
+        this.relatedId !== '' &&
+        this.relatedId !== null &&
+        typeof this.relatedId !== 'undefined'
+      ) {
         params.relation_id = this.relatedId
       }
       return params
diff --git a/src/components/sp-path-selector/config.js b/src/components/sp-path-selector/config.js
index dc582b1..3d59a62 100644
--- a/src/components/sp-path-selector/config.js
+++ b/src/components/sp-path-selector/config.js
@@ -17,7 +17,7 @@ export const PATH_SELECTOR_TYPES = [
 ]
 
 export const PATH_SELECTOR_PLATFORM_TYPES = {
-  web: ['goods', 'sale_category', 'custom_page']
+  web: ['goods', 'sale_category', 'category', 'custom_page']
 }
 
 export function getPathSelectorTypes(platform) {
diff --git a/src/components/sp-picker-plus/GoodsPicker.country-code.test.mjs b/src/components/sp-picker-plus/GoodsPicker.country-code.test.mjs
new file mode 100644
index 0000000..f8d1749
--- /dev/null
+++ b/src/components/sp-picker-plus/GoodsPicker.country-code.test.mjs
@@ -0,0 +1,10 @@
+import assert from 'node:assert/strict'
+import { readFileSync } from 'node:fs'
+import test from 'node:test'
+
+const source = readFileSync(new URL('./GoodsPicker.vue', import.meta.url), 'utf8')
+
+test('GoodsPicker sends current country_code when searching goods', () => {
+  assert.match(source, /import\s+\{\s*getCurrentCountryCode\s*\}\s+from\s+['"]@\/i18n['"]/)
+  assert.match(source, /country_code:\s*getCurrentCountryCode\(\)/)
+})
diff --git a/src/components/sp-picker-plus/GoodsPicker.vue b/src/components/sp-picker-plus/GoodsPicker.vue
index fe3f9a7..f4ecaeb 100644
--- a/src/components/sp-picker-plus/GoodsPicker.vue
+++ b/src/components/sp-picker-plus/GoodsPicker.vue
@@ -40,6 +40,7 @@
 <script>
 import SpFormPlus from '@/components/sp-form-plus'
 import SpTable from '@/components/sp-table'
+import { getCurrentCountryCode } from '@/i18n'
 
 function normalizeProduct(row = {}) {
   return {
@@ -219,6 +220,7 @@ export default {
         item_type: 'normal',
         audit_status: 'approved',
         is_sku: false,
+        country_code: getCurrentCountryCode(),
         category: Array.isArray(category) ? category[category.length - 1] : category
       }
     },
diff --git a/src/components/sp-picker/pickers/picker-wxapp.vue b/src/components/sp-picker/pickers/picker-wxapp.vue
index e298968..237bdb6 100755
--- a/src/components/sp-picker/pickers/picker-wxapp.vue
+++ b/src/components/sp-picker/pickers/picker-wxapp.vue
@@ -60,7 +60,7 @@
       :other-config="{
         'max-height': 460
       }"
-      url="/wxexternalconfig/list"
+      url="/wxexternalconfigroutes/list"
       :fixed-row-action="true"
       :setting="{
         columns: [
diff --git a/src/consts/index.js b/src/consts/index.js
index 443f181..31b00ed 100755
--- a/src/consts/index.js
+++ b/src/consts/index.js
@@ -232,7 +232,8 @@ export const PAY_TYPE = {
   alipay_wap: i18n.t('e3a5dbf4.5a3c52'),
   alipay_qr: i18n.t('e3a5dbf4.e20bf0'),
   alipaymini: i18n.t('e3a5dbf4.42d922'),
-  localPay: i18n.t('e3a5dbf4.941a4a')
+  localPay: i18n.t('e3a5dbf4.941a4a'),
+  doumen_intl: i18n.t('822436ab.e37lpb')
 }
 
 export const PAY_STATUS = {
diff --git a/src/i18n/locales/ar.json b/src/i18n/locales/ar.json
index e5d4334..469a861 100644
--- a/src/i18n/locales/ar.json
+++ b/src/i18n/locales/ar.json
@@ -277,6 +277,8 @@
   "b2fe051e.3fea7c": "الحالة",
   "b2fe051e.7854b5": "تفعيل المتجر",
   "b2fe051e.710ad0": "تعطيل المتجر",
+  "b2fe051e.c8f21a": "تفعيل المتجر السحابي",
+  "b2fe051e.d9e32b": "تعطيل المتجر السحابي",
   "b2fe051e.d2b1c3": "مغلق",
   "b2fe051e.0044f6": "سحب المتجر",
   "b2fe051e.d1c357": "افتراضي",
@@ -337,7 +339,9 @@
   "b2fe051e.d08484": "يرجى اختيار وسوم المتجر",
   "b2fe051e.e27f17": "اكتمل الوسم",
   "b2fe051e.31ffeb": "تأكيد تفعيل المتجر؟",
+  "b2fe051e.e0f43c": "تأكيد تفعيل المتجر السحابي؟",
   "b2fe051e.3abe79": "بعد تعطيل المتجر، لا يمكن معالجة الطلبات ولا يمكن شراء المنتجات. تأكيد تعطيل المتجر؟",
+  "b2fe051e.f1a54d": "بعد تعطيل المتجر السحابي، لا يمكن معالجة الطلبات ولا يمكن شراء المنتجات. تأكيد تعطيل المتجر السحابي؟",
   "b2fe051e.c9d4e1": "بعد الإغلاق، سيتوقف هذا المتجر عن العمل ولا يمكن شراء المنتجات. تأكيد الإغلاق؟",
   "b2fe051e.b31c83": "بعد سحب المتجر، لا يمكن معالجة الطلبات ولا يمكن استرداد المتجر. تأكيد سحب المتجر؟",
   "b2fe051e.02d981": "إشعار",
@@ -2068,6 +2072,7 @@
   "822436ab.bb68ee": "Huifu",
   "822436ab.1d7dae": "وي تشات-يونيون باي",
   "822436ab.2d8019": "تحويل خارجي",
+  "822436ab.e37lpb": "دومين الدولي",
   "822436ab.a0cd4c": "مبلغ الاسترداد",
   "822436ab.9f68a8": " نقطة",
   "822436ab.ef5fb8": "وقت اكتمال الاسترداد",
@@ -2316,14 +2321,14 @@
   "3cdfcea1.55c61d": "المورّد المصدر",
   "3cdfcea1.491c0c": "تشغيل ذاتي",
   "3cdfcea1.6bf871": "سعر الوحدة (¥)",
-  "3cdfcea1.17b4aa": "سعر التسوية (¥)",
+  "3cdfcea1.17b4aa": "سعر التسوية",
   "3cdfcea1.066804": "سعر التكلفة (¥)",
   "3cdfcea1.ecd6be": "رسوم الضريبة (¥)",
   "3cdfcea1.5746e7": "الإجمالي الفرعي (¥)",
   "3cdfcea1.95f245": "إجمالي التكلفة الفرعي (¥)",
   "3cdfcea1.1f1eac": "إجمالي التسوية الفرعي (¥)",
   "3cdfcea1.5c7afc": "خصم العضوية (¥)",
-  "3cdfcea1.2ecbc8": "خصم النقاط (¥)",
+  "3cdfcea1.2ecbc8": "خصم النقاط",
   "3cdfcea1.aae045": "إجمالي الخصم (¥)",
   "3cdfcea1.f8d735": "سعر الصرف",
   "3cdfcea1.c3c7a1": "حالة الشحن",
@@ -2714,10 +2719,10 @@
   "c95ea121.53cc55": "المتجر المصدر",
   "c95ea121.2240cc": "وقت الطلب",
   "c95ea121.350fd3": "تصنيف الطلب",
-  "c95ea121.fddcee": "المبلغ المدفوع (¥)",
+  "c95ea121.fddcee": "المبلغ المدفوع",
   "c95ea121.d443a9": "خصم النقاط",
-  "c95ea121.17b4aa": "سعر التسوية (¥)",
-  "c95ea121.4dd437": "الشحن (¥)",
+  "c95ea121.17b4aa": "سعر التسوية",
+  "c95ea121.4dd437": "الشحن",
   "c95ea121.a03d7f": "حالة الفاتورة",
   "c95ea121.a32da1": "هاتف العميل",
   "c95ea121.c60b43": "دليل التسوق",
@@ -7258,6 +7263,7 @@
   "dc9cefd6.818fc4": "سعر السوق",
   "dc9cefd6.e29575": "سعر البيع",
   "dc9cefd6.2e2ce2": "سعر التكلفة",
+  "dc9cefd6.b8f2c1": "يتم حفظ سعر السوق وسعر البيع وسعر التكلفة تلقائيًا عند فقدان التركيز في حقل الإدخال. انقر حفظ في الأسفل لإرسال أسعار الأعضاء.",
   "dc9cefd6.4d9dd5": "عضو",
   "dc9cefd6.bc0883": "عضو VIP",
   "dc9cefd6.b20f18": "تعيين مخزون المنتج",
@@ -12917,9 +12923,9 @@
   "7c0967bc.2b6bc0": "إجراءات",
   "7c0967bc.95b351": "تعديل",
   "7c0967bc.2f4aad": "حذف",
-  "7c0967bc.7e9638": "اسم العملة (صيني كامل)",
+  "7c0967bc.7e9638": "الاسم الكامل للعملة",
   "7c0967bc.f84b1b": "اسم العملة (الاسم الصيني الكامل)، مثال: اليوان الصيني (CNY)",
-  "7c0967bc.928964": "اسم العملة (إنجليزي اختصار)",
+  "7c0967bc.928964": "رمز العملة",
   "7c0967bc.55f991": "اسم العملة (إنجليزي اختصار)، مثال: RMB",
   "7c0967bc.0875ef": "¥",
   "7c0967bc.e84cc3": "المنصة المناسبة",
@@ -12937,6 +12943,15 @@
   "7c0967bc.0007d1": "تم الحذف",
   "7c0967bc.2111cc": "تم الإلغاء",
   "7c0967bc.880692": "يوان صيني (¥)",
+  "7c0967bc.c3a8f1": "اختر العملة",
+  "7c0967bc.f9b2e4": "يرجى اختيار العملة",
+  "7c0967bc.a7d1c8": "هذه العملة موجودة بالفعل ولا يمكن إضافتها مرة أخرى",
+  "7c0967bc.b2e5f0": "يوان صيني",
+  "7c0967bc.c4f6a1": "دولار هونغ كونغ",
+  "7c0967bc.d5f7b2": "دولار أمريكي",
+  "7c0967bc.e8a1c0": "اليوان الصيني",
+  "7c0967bc.e8h1k0": "دولار هونغ كونغ",
+  "7c0967bc.e8u1s0": "الدولار الأمريكي",
   "72ab3c4c.43aa70": "أفضل معك",
   "72ab3c4c.a4e70f": "أدخل رمز التفعيل",
   "72ab3c4c.bdc807": "للشراء أو التجديد اتصل: 400-9213-522  QQ: 800058282",
@@ -17183,7 +17198,7 @@
   "3ec151aa.7aa562": "فرد (شخص قانوني)",
   "3ec151aa.d98e9d": "رقم البطاقة المصرفية",
   "3ec151aa.3d9865": "محافظة/مدينة البنك",
-  "3ec151aa.fb4d4e": "رمز البنك",
+  "3ec151aa.fb4d4e": "رمز الفرع المصرفي",
   "3ec151aa.80c6d8": "اسم الفرع",
   "3ec151aa.534a1d": "جوال البطاقة المصرفية",
   "3ec151aa.32734c": "نوع حساب التسوية",
@@ -21277,7 +21292,6 @@
   "35844927.d352ae": "حالة الموافقة",
   "35844927.d22bdd": "وقت الموافقة",
   "35844927.4985b0": "ملاحظات الموافقة",
-  "965e5755.f015a4": "خدمة أعضاء Yuanyuanke",
   "965e5755.060fc4": "تكوين مسارات صفحات البرنامج المصغر الخارجي للانتقال إلى البرامج المصغرة الخارجية.",
   "965e5755.7d5cc3": "يرجى إدخال اسم الصفحة",
   "965e5755.bee912": "استعلام",
@@ -22681,8 +22695,11 @@
   "027707af.459c3e": "يرجى اختيار فئة المتجر",
   "027707af.6d7cb8": "حالة المتجر",
   "027707af.3c751e": "تفعيل المتجر: المتاجر الجديدة مفعّلة افتراضيًا وتبيع عبر الإنترنت بشكل طبيعي.<br>تعطيل المتجر: غير متاح للبيع عبر الإنترنت؛ يظهر فقط في قائمة المتاجر القريبة على الجوال.<br>مغلق: يتوقف المتجر مؤقتًا عن العمل.<br>سحب المتجر: تم إلغاء المتجر، مخفي في الواجهة، ولا يمكن إعادة تفعيله بشكل طبيعي.",
+  "027707af.e0f43c": "تفعيل المتجر السحابي: المتاجر الجديدة مفعّلة افتراضيًا وتبيع عبر الإنترنت بشكل طبيعي.<br>تعطيل المتجر السحابي: غير متاح للبيع عبر الإنترنت؛ يظهر فقط في قائمة المتاجر القريبة على الجوال.<br>مغلق: يتوقف المتجر مؤقتًا عن العمل.<br>سحب المتجر: تم إلغاء المتجر، مخفي في الواجهة، ولا يمكن إعادة تفعيله بشكل طبيعي.",
   "027707af.7854b5": "تفعيل المتجر",
   "027707af.710ad0": "تعطيل المتجر",
+  "027707af.c8f21a": "تفعيل المتجر السحابي",
+  "027707af.d9e32b": "تعطيل المتجر السحابي",
   "027707af.d2b1c3": "مغلق",
   "027707af.0044f6": "سحب المتجر",
   "027707af.0581a1": "عرض دليل التسوق",
diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index 5d37610..c162a8b 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -277,6 +277,8 @@
   "b2fe051e.3fea7c": "Status",
   "b2fe051e.7854b5": "Enable Store",
   "b2fe051e.710ad0": "Disable Store",
+  "b2fe051e.c8f21a": "Enable Cloud Store",
+  "b2fe051e.d9e32b": "Disable Cloud Store",
   "b2fe051e.d2b1c3": "Closed",
   "b2fe051e.0044f6": "Withdraw Store",
   "b2fe051e.d1c357": "Is Default",
@@ -337,7 +339,9 @@
   "b2fe051e.d08484": "Please select store tags",
   "b2fe051e.e27f17": "Tagging completed",
   "b2fe051e.31ffeb": "Confirm to enable store?",
+  "b2fe051e.e0f43c": "Confirm to enable cloud store?",
   "b2fe051e.3abe79": "After disabling the store, orders cannot be processed and products cannot be purchased. Confirm to disable the store?",
+  "b2fe051e.f1a54d": "After disabling the cloud store, orders cannot be processed and products cannot be purchased. Confirm to disable the cloud store?",
   "b2fe051e.c9d4e1": "After closing, this store will suspend business and products cannot be purchased. Confirm to close?",
   "b2fe051e.b31c83": "After withdrawing the store, orders cannot be processed and the store cannot be recovered. Confirm to withdraw the store?",
   "b2fe051e.02d981": "Notice",
@@ -2068,6 +2072,7 @@
   "822436ab.bb68ee": "Huifu Pay",
   "822436ab.1d7dae": "WeChat Pay-UnionPay",
   "822436ab.2d8019": "Offline transfer",
+  "822436ab.e37lpb": "Doumen International",
   "822436ab.a0cd4c": "Refund amount",
   "822436ab.9f68a8": " pts",
   "822436ab.ef5fb8": "Refund complete time",
@@ -2316,14 +2321,14 @@
   "3cdfcea1.55c61d": "Source supplier",
   "3cdfcea1.491c0c": "Self-operated",
   "3cdfcea1.6bf871": "Unit price (¥)",
-  "3cdfcea1.17b4aa": "Settlement price (¥)",
+  "3cdfcea1.17b4aa": "Settlement price",
   "3cdfcea1.066804": "Cost price (¥)",
   "3cdfcea1.ecd6be": "Tax fee (¥)",
   "3cdfcea1.5746e7": "Subtotal (¥)",
   "3cdfcea1.95f245": "Cost subtotal (¥)",
   "3cdfcea1.1f1eac": "Settlement subtotal (¥)",
   "3cdfcea1.5c7afc": "Member discount (¥)",
-  "3cdfcea1.2ecbc8": "Points deduction (¥)",
+  "3cdfcea1.2ecbc8": "Points deduction",
   "3cdfcea1.aae045": "Total discount (¥)",
   "3cdfcea1.f8d735": "Currency rate",
   "3cdfcea1.c3c7a1": "Delivery status",
@@ -2714,10 +2719,10 @@
   "c95ea121.53cc55": "Source store",
   "c95ea121.2240cc": "Order time",
   "c95ea121.350fd3": "Order category",
-  "c95ea121.fddcee": "Amount paid (¥)",
+  "c95ea121.fddcee": "Amount paid",
   "c95ea121.d443a9": "Points deduction",
-  "c95ea121.17b4aa": "Settlement price (¥)",
-  "c95ea121.4dd437": "Freight (¥)",
+  "c95ea121.17b4aa": "Settlement price",
+  "c95ea121.4dd437": "Freight",
   "c95ea121.a03d7f": "Invoice status",
   "c95ea121.a32da1": "Customer phone",
   "c95ea121.c60b43": "Shopping guide",
@@ -7258,6 +7263,7 @@
   "dc9cefd6.818fc4": "Market price",
   "dc9cefd6.e29575": "Sale price",
   "dc9cefd6.2e2ce2": "Cost price",
+  "dc9cefd6.b8f2c1": "Market price, sale price, and cost price are saved automatically when the input loses focus. Click Save at the bottom to submit member prices.",
   "dc9cefd6.4d9dd5": "Member",
   "dc9cefd6.bc0883": "VIP member",
   "dc9cefd6.b20f18": "Set product stock",
@@ -12917,9 +12923,9 @@
   "7c0967bc.2b6bc0": "Actions",
   "7c0967bc.95b351": "Edit",
   "7c0967bc.2f4aad": "Delete",
-  "7c0967bc.7e9638": "Currency name (Chinese full)",
+  "7c0967bc.7e9638": "Currency full name",
   "7c0967bc.f84b1b": "Currency name (Chinese full), e.g. Chinese Yuan (CNY)",
-  "7c0967bc.928964": "Currency name (English abbr)",
+  "7c0967bc.928964": "Currency code",
   "7c0967bc.55f991": "Currency name (English abbr), e.g. RMB",
   "7c0967bc.0875ef": "¥",
   "7c0967bc.e84cc3": "Applicable platform",
@@ -12937,6 +12943,15 @@
   "7c0967bc.0007d1": "Deleted",
   "7c0967bc.2111cc": "Cancelled",
   "7c0967bc.880692": "CNY (¥)",
+  "7c0967bc.c3a8f1": "Select currency",
+  "7c0967bc.f9b2e4": "Please select a currency",
+  "7c0967bc.a7d1c8": "This currency already exists and cannot be added again",
+  "7c0967bc.b2e5f0": "CNY",
+  "7c0967bc.c4f6a1": "HKD",
+  "7c0967bc.d5f7b2": "USD",
+  "7c0967bc.e8a1c0": "Chinese Yuan",
+  "7c0967bc.e8h1k0": "Hong Kong Dollar",
+  "7c0967bc.e8u1s0": "US Dollar",
   "72ab3c4c.43aa70": "Better with you",
   "72ab3c4c.a4e70f": "Enter activation code",
   "72ab3c4c.bdc807": "For purchase or renewal contact: 400-9213-522  QQ: 800058282",
@@ -17185,7 +17200,7 @@
   "3ec151aa.7aa562": "Individual (legal person)",
   "3ec151aa.d98e9d": "Bank card number",
   "3ec151aa.3d9865": "Bank province/city",
-  "3ec151aa.fb4d4e": "Bank code",
+  "3ec151aa.fb4d4e": "Branch CNAPS code",
   "3ec151aa.80c6d8": "Branch name",
   "3ec151aa.534a1d": "Bank card mobile",
   "3ec151aa.32734c": "Settlement account type",
@@ -21279,7 +21294,6 @@
   "35844927.d352ae": "Approval status",
   "35844927.d22bdd": "Approval time",
   "35844927.4985b0": "Approval remarks",
-  "965e5755.f015a4": "Yuanyuanke member service",
   "965e5755.060fc4": "Configure external mini program page paths for jumping to external mini programs.",
   "965e5755.7d5cc3": "Please enter page name",
   "965e5755.bee912": "Query",
@@ -22682,8 +22696,11 @@
   "027707af.459c3e": "Please select a store category",
   "027707af.6d7cb8": "Store status",
   "027707af.3c751e": "Enable Store: New stores are enabled by default and sell normally online.<br>Disable Store: Not available for online sales; shown only in the mobile nearby-store list.<br>Closed: Store temporarily suspends business.<br>Withdraw Store: Store is voided, hidden on the storefront, and cannot be re-enabled normally.",
+  "027707af.e0f43c": "Enable Cloud Store: New stores are enabled by default and sell normally online.<br>Disable Cloud Store: Not available for online sales; shown only in the mobile nearby-store list.<br>Closed: Store temporarily suspends business.<br>Withdraw Store: Store is voided, hidden on the storefront, and cannot be re-enabled normally.",
   "027707af.7854b5": "Enable Store",
   "027707af.710ad0": "Disable Store",
+  "027707af.c8f21a": "Enable Cloud Store",
+  "027707af.d9e32b": "Disable Cloud Store",
   "027707af.d2b1c3": "Closed",
   "027707af.0044f6": "Withdraw Store",
   "027707af.0581a1": "Show shopping guide",
diff --git a/src/i18n/locales/zh-CN.json b/src/i18n/locales/zh-CN.json
index 56570ed..35705ad 100644
--- a/src/i18n/locales/zh-CN.json
+++ b/src/i18n/locales/zh-CN.json
@@ -277,6 +277,8 @@
   "b2fe051e.3fea7c": "状态",
   "b2fe051e.7854b5": "启用门店",
   "b2fe051e.710ad0": "禁用门店",
+  "b2fe051e.c8f21a": "启用云店",
+  "b2fe051e.d9e32b": "禁用云店",
   "b2fe051e.d2b1c3": "闭店",
   "b2fe051e.0044f6": "撤店",
   "b2fe051e.d1c357": "是否默认",
@@ -337,7 +339,9 @@
   "b2fe051e.d08484": "请选择店铺标签",
   "b2fe051e.e27f17": "打标签完成",
   "b2fe051e.31ffeb": "确定启用门店？",
+  "b2fe051e.e0f43c": "确定启用云店？",
   "b2fe051e.3abe79": "禁用门店后该店铺的订单将无法处理，同时如首页装修有该店铺或店铺商品将无法正常购买，请确认是否禁用门店？",
+  "b2fe051e.f1a54d": "禁用云店后该店铺的订单将无法处理，同时如首页装修有该店铺或店铺商品将无法正常购买，请确认是否禁用云店？",
   "b2fe051e.c9d4e1": "闭店后该门店将暂停营业，同时如首页装修有该店铺或店铺商品将无法正常购买，请确认是否闭店？",
   "b2fe051e.b31c83": "撤店后该店铺的订单将无法处理，同时如首页装修有该店铺或店铺商品将无法正常购买，且该店铺撤店后不可找回，请确认是否撤店？",
   "b2fe051e.02d981": "提示",
@@ -2068,6 +2072,7 @@
   "822436ab.bb68ee": "汇付支付",
   "822436ab.1d7dae": "微信支付-银联",
   "822436ab.2d8019": "线下转账",
+  "822436ab.e37lpb": "斗门国际",
   "822436ab.a0cd4c": "退款金额",
   "822436ab.9f68a8": "积分",
   "822436ab.ef5fb8": "退款完成时间",
@@ -2316,14 +2321,14 @@
   "3cdfcea1.55c61d": "来源供应商",
   "3cdfcea1.491c0c": "自营",
   "3cdfcea1.6bf871": "单价（¥）",
-  "3cdfcea1.17b4aa": "结算价（¥）",
+  "3cdfcea1.17b4aa": "结算价",
   "3cdfcea1.066804": "成本价（¥）",
   "3cdfcea1.ecd6be": "税费（¥）",
   "3cdfcea1.5746e7": "小计（¥）",
   "3cdfcea1.95f245": "成本小计（¥）",
   "3cdfcea1.1f1eac": "结算小计（¥）",
   "3cdfcea1.5c7afc": "会员折扣（¥）",
-  "3cdfcea1.2ecbc8": "积分抵扣（¥）",
+  "3cdfcea1.2ecbc8": "积分抵扣",
   "3cdfcea1.aae045": "总优惠（¥）",
   "3cdfcea1.f8d735": "货币汇率",
   "3cdfcea1.c3c7a1": "发货状态",
@@ -2714,10 +2719,10 @@
   "c95ea121.53cc55": "来源店铺",
   "c95ea121.2240cc": "下单时间",
   "c95ea121.350fd3": "订单分类",
-  "c95ea121.fddcee": "实付金额（¥）",
+  "c95ea121.fddcee": "实付金额",
   "c95ea121.d443a9": "积分抵扣",
-  "c95ea121.17b4aa": "结算价（¥）",
-  "c95ea121.4dd437": "运费（¥）",
+  "c95ea121.17b4aa": "结算价",
+  "c95ea121.4dd437": "运费",
   "c95ea121.a03d7f": "发票状态",
   "c95ea121.a32da1": "客户手机号",
   "c95ea121.c60b43": "导购",
@@ -7258,6 +7263,7 @@
   "dc9cefd6.818fc4": "市场价",
   "dc9cefd6.e29575": "销售价",
   "dc9cefd6.2e2ce2": "成本价",
+  "dc9cefd6.b8f2c1": "市场价、销售价、成本价在输入框失焦后自动保存；会员价需点击底部「保存」按钮提交。",
   "dc9cefd6.4d9dd5": "会员",
   "dc9cefd6.bc0883": "付费会员",
   "dc9cefd6.b20f18": "设置商品库存",
@@ -8656,7 +8662,7 @@
   "50c0b86d.95b351": "编辑",
   "50c0b86d.607e7a": "查看",
   "50c0b86d.ff6c6a": "终止",
-  "50c0b86d.3f6975": "删 除",
+  "50c0b86d.3f6975": "删除",
   "50c0b86d.08e705": "拼团名称",
   "50c0b86d.2af133": "商品类型",
   "50c0b86d.fcd4d7": "服务类商品",
@@ -10360,7 +10366,7 @@
   "f31a353f.95b351": "编辑",
   "f31a353f.607e7a": "查看",
   "f31a353f.ff6c6a": "终止",
-  "f31a353f.3f6975": "删 除",
+  "f31a353f.3f6975": "删除",
   "f31a353f.6ddd9b": "获取活动列表失败",
   "f31a353f.cc0663": "此操作将终止该活动, 是否继续?",
   "f31a353f.02d981": "提示",
@@ -12917,9 +12923,9 @@
   "7c0967bc.2b6bc0": "操作",
   "7c0967bc.95b351": "编辑",
   "7c0967bc.2f4aad": "删除",
-  "7c0967bc.7e9638": "货币名称（中文全名）",
+  "7c0967bc.7e9638": "货币全称",
   "7c0967bc.f84b1b": "货币名称（中文全名），例子：中国人民币",
-  "7c0967bc.928964": "货币名称（英文缩写）",
+  "7c0967bc.928964": "货币代码",
   "7c0967bc.55f991": "货币名称（英文缩写），例子：RMB",
   "7c0967bc.0875ef": "￥",
   "7c0967bc.e84cc3": "适用端",
@@ -12937,6 +12943,15 @@
   "7c0967bc.0007d1": "删除成功",
   "7c0967bc.2111cc": "已取消",
   "7c0967bc.880692": "人民币(￥)",
+  "7c0967bc.c3a8f1": "选择币种",
+  "7c0967bc.f9b2e4": "请选择币种",
+  "7c0967bc.a7d1c8": "该币种已存在，不允许重复添加",
+  "7c0967bc.b2e5f0": "人民币",
+  "7c0967bc.c4f6a1": "港币",
+  "7c0967bc.d5f7b2": "美元",
+  "7c0967bc.e8a1c0": "中国人民币",
+  "7c0967bc.e8h1k0": "香港港币",
+  "7c0967bc.e8u1s0": "美国美元",
   "72ab3c4c.43aa70": "超新星因你而更好",
   "72ab3c4c.a4e70f": "请输入激活码",
   "72ab3c4c.bdc807": "购买或续费产品请联系：400-9213-522     QQ: 800058282",
@@ -17192,7 +17207,7 @@
   "3ec151aa.7aa562": "对私法人",
   "3ec151aa.d98e9d": "银行卡号",
   "3ec151aa.3d9865": "开户行所在省市",
-  "3ec151aa.fb4d4e": "银行号",
+  "3ec151aa.fb4d4e": "支行联行号",
   "3ec151aa.80c6d8": "支行名称",
   "3ec151aa.534a1d": "银行卡绑定手机号",
   "3ec151aa.32734c": "结算银行账户类型",
@@ -21369,7 +21384,6 @@
   "35844927.d352ae": "审批状态",
   "35844927.d22bdd": "审批时间",
   "35844927.4985b0": "审批备注",
-  "965e5755.f015a4": "源源客会员服务",
   "965e5755.060fc4": "配置外部小程序页面路径，供跳转到外部小程序使用。",
   "965e5755.7d5cc3": "请输入页面名称",
   "965e5755.bee912": "查询",
@@ -22682,8 +22696,11 @@
   "027707af.459c3e": "请选择门店分类",
   "027707af.6d7cb8": "门店状态",
   "027707af.3c751e": "启用门店：创建店铺默认启用，为正常可售门店<br>禁用门店：为线上不可售门店，仅在移动端附近门店列表中展示<br>闭店：门店暂停营业<br>撤店：作废店铺，前端不展示，不可再正常启用",
+  "027707af.e0f43c": "启用云店：创建店铺默认启用，为正常可售云店<br>禁用云店：为线上不可售云店，仅在移动端附近门店列表中展示<br>闭店：门店暂停营业<br>撤店：作废店铺，前端不展示，不可再正常启用",
   "027707af.7854b5": "启用门店",
   "027707af.710ad0": "禁用门店",
+  "027707af.c8f21a": "启用云店",
+  "027707af.d9e32b": "禁用云店",
   "027707af.d2b1c3": "闭店",
   "027707af.0044f6": "撤店",
   "027707af.0581a1": "是否展示导购",
@@ -22852,7 +22869,7 @@
   "146b63bc.c1610a": "页脚链接 {index}",
   "c465399f.2f4aad": "删除",
   "732e5057.3b1083": "保存完成",
-  "738edee2.2f4aad": " 删 除 ",
+  "738edee2.2f4aad": "删除",
   "738edee2.8ee9f2": "菜单名称",
   "738edee2.95b351": "编辑",
   "7856f5b5.d7ec2d": "*商品标题",
@@ -22863,7 +22880,7 @@
   "80206cbf.be5fbb": " 保存 ",
   "80206cbf.ca3472": " 编辑菜单 ",
   "80206cbf.e83a25": "确认",
-  "e45f0be0.2f4aad": " 删 除 ",
+  "e45f0be0.2f4aad": "删除",
   "e45f0be0.95b351": "编辑",
   "f9eb643d.5f4112": " 回退 ",
   "fc8ead3c.12688a": "会员中心",
diff --git a/src/router/routes/modules/setting.js b/src/router/routes/modules/setting.js
index 28c5886..3b10b1f 100755
--- a/src/router/routes/modules/setting.js
+++ b/src/router/routes/modules/setting.js
@@ -670,6 +670,17 @@ const routes = [
           permissions: ['setting.systemsetting.kjlsetting']
         },
         component: () => import('@/views/settings/kujiale-setting')
+      },
+      {
+        name: `basecurrency`,
+        path: 'system-config/basecurrency',
+        meta: {
+          aliasName: 'basecurrency',
+          icon: 'icon-products',
+          title: i18n.t('b51bc270.f68fc6'),
+          permissions: ['setting.systemsetting.basecurrency']
+        },
+        component: () => import('@/view/base/currency/index')
       }
     ]
   }
diff --git a/src/router/src/route-setting.js b/src/router/src/route-setting.js
index ffff611..d7d2e13 100755
--- a/src/router/src/route-setting.js
+++ b/src/router/src/route-setting.js
@@ -400,7 +400,7 @@ export default {
     },
 
     {
-      path: 'basecurrency',
+      path: 'systemsetting/basecurrency',
       name: 'b51bc270.f68fc6',
       component: () => import('@/view/base/currency/index')
     },
diff --git a/src/utils/src/utils.js b/src/utils/src/utils.js
index ca85e07..b8277f5 100755
--- a/src/utils/src/utils.js
+++ b/src/utils/src/utils.js
@@ -13,6 +13,29 @@ export function formatPrice(price, thousandth = true, prefix = '¥', suffix = ''
   return `${prefix}${formattedPrice}${suffix}`
 }
 
+export function getCurrencySymbol(
+  row = {},
+  keys = ['cur_fee_symbol', 'curFeeSymbol', 'fee_symbol', 'feeSymbol']
+) {
+  for (const key of keys) {
+    if (row[key]) {
+      return row[key]
+    }
+  }
+  return '¥'
+}
+
+export function formatMoneyWithSymbol(amountInCents, symbol = '¥') {
+  if (amountInCents === null || amountInCents === undefined || amountInCents === '') {
+    return `${symbol}0.00`
+  }
+  const normalized = Number(amountInCents)
+  if (Number.isNaN(normalized)) {
+    return `${symbol}0.00`
+  }
+  return `${symbol}${(normalized / 100).toFixed(2)}`
+}
+
 export function formatNumber(price, thousandth = false) {
   let formattedPrice = price / 100
   if (thousandth && formattedPrice >= 1000) {
diff --git a/src/view/base/currency/index.vue b/src/view/base/currency/index.vue
index e629db1..83e04fa 100755
--- a/src/view/base/currency/index.vue
+++ b/src/view/base/currency/index.vue
@@ -18,10 +18,14 @@
       </el-col>
     </el-row>
     <el-table v-loading="loading" :data="currencyList" :height="wheight - 160">
-      <el-table-column prop="title" :label="$t('7c0967bc.dfeeea')" />
+      <el-table-column prop="title" :label="$t('7c0967bc.dfeeea')">
+        <template slot-scope="scope">
+          {{ getCurrencyTitle(scope.row.currency, scope.row.title) }}
+        </template>
+      </el-table-column>
       <el-table-column prop="currency" :label="$t('7c0967bc.64bc57')" />
       <el-table-column prop="symbol" :label="$t('7c0967bc.61134f')" />
-      <el-table-column prop="rate" :label="$t('7c0967bc.f8d735')" />
+      <!-- <el-table-column prop="rate" :label="$t('7c0967bc.f8d735')" /> -->
       <el-table-column prop="is_default" :label="$t('7c0967bc.69c562')">
         <template slot-scope="scope">
           <el-switch
@@ -33,9 +37,6 @@
       </el-table-column>
       <el-table-column :label="$t('7c0967bc.2b6bc0')">
         <template slot-scope="scope">
-          <el-button size="mini" @click="editAction(scope.$index, scope.row)">
-            {{ $t('7c0967bc.95b351') }}
-          </el-button>
           <el-button
             v-if="!scope.row.is_default"
             size="mini"
@@ -55,42 +56,40 @@
         @current-change="handleCurrentChange"
       />
     </div>
-    <!-- 添加、编辑标识-开始 -->
-    <el-dialog :title="editTitle" :visible.sync="editVisible" :before-close="handleCancel">
+    <!-- 添加货币-开始 -->
+    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" :before-close="handleCancel">
       <template>
         <el-form ref="form" :model="form" :rules="rules" class="demo-ruleForm" label-width="220px">
-          <el-form-item :label="$t('7c0967bc.7e9638')" prop="title">
+          <el-form-item :label="$t('7c0967bc.c3a8f1')" prop="selectedCurrency">
             <el-col :span="10">
-              <el-input v-model="form.title" required :placeholder="$t('7c0967bc.f84b1b')" />
+              <el-select
+                v-model="form.selectedCurrency"
+                :placeholder="$t('7c0967bc.f9b2e4')"
+                class="w-full"
+                @change="handleCurrencyChange"
+              >
+                <el-option
+                  v-for="item in currencyOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-col>
+          </el-form-item>
+          <el-form-item :label="$t('7c0967bc.7e9638')">
+            <el-col :span="10">
+              <el-input :value="selectedCurrencyTitle" disabled />
             </el-col>
           </el-form-item>
           <el-form-item :label="$t('7c0967bc.928964')" prop="currency">
             <el-col :span="10">
-              <el-input v-model="form.currency" required :placeholder="$t('7c0967bc.55f991')" />
+              <el-input v-model="form.currency" disabled />
             </el-col>
           </el-form-item>
           <el-form-item :label="$t('7c0967bc.61134f')" prop="symbol">
             <el-col :span="10">
-              <el-input v-model="form.symbol" required :placeholder="$t('7c0967bc.0875ef')" />
-            </el-col>
-          </el-form-item>
-          <el-form-item :label="$t('7c0967bc.f8d735')" prop="rate">
-            <el-col :span="10">
-              <el-input v-model="form.rate" required placeholder="1" />
-            </el-col>
-            <el-col v-if="form.rate && form.title" :span="10">
-              1 {{ form.title }}({{ form.symbol }}) = {{ form.rate }} {{ $t('7c0967bc.880692') }}
-            </el-col>
-            <el-col v-else-if="form.rate && form.currency" :span="10">
-              1 {{ form.currency }} = {{ form.rate }} RMB
-            </el-col>
-          </el-form-item>
-
-          <el-form-item :label="$t('7c0967bc.e84cc3')" prop="rate">
-            <el-col :span="10">
-              <el-radio v-model="form.use_platform" label="normal" value="normal">
-                {{ $t('7c0967bc.635670') }}
-              </el-radio>
+              <el-input v-model="form.symbol" disabled />
             </el-col>
           </el-form-item>
         </el-form>
@@ -104,14 +103,34 @@
 </template>
 <script>
 import { mapGetters } from 'vuex'
-import { Message } from 'element-ui'
 import {
   createCurrencyInfo,
   getCurrencytLists,
-  updateCurrencyInfo,
   deleteCurrencyInfo,
   setDefaultCurrency
 } from '../../../api/company'
+
+const CURRENCY_PRESET_META = {
+  CNY: {
+    titleKey: '7c0967bc.e8a1c0',
+    titleStore: '中国人民币',
+    currency: 'CNY',
+    symbol: '￥'
+  },
+  HKD: {
+    titleKey: '7c0967bc.e8h1k0',
+    titleStore: '香港港币',
+    currency: 'HKD',
+    symbol: 'HK$'
+  },
+  USD: {
+    titleKey: '7c0967bc.e8u1s0',
+    titleStore: '美国美元',
+    currency: 'USD',
+    symbol: '$'
+  }
+}
+
 export default {
   data() {
     return {
@@ -120,13 +139,13 @@ export default {
       inputVisible: false,
       inputStoreVisible: false,
       inputValue: '',
-      editVisible: false,
-      editTitle: '',
+      dialogVisible: false,
+      dialogTitle: '',
       form: {
+        selectedCurrency: '',
         symbol: '',
         currency: '',
-        title: '',
-        rate: '',
+        rate: 1,
         is_default: false,
         use_platform: 'normal'
       },
@@ -140,61 +159,69 @@ export default {
         pageSize: 20,
         currency: ''
       },
-      id: 0,
       rules: {
-        title: [{ required: true, message: this.$t('7c0967bc.02cc4f'), trigger: 'blur' }],
-        currency: [{ required: true, message: this.$t('7c0967bc.02cc4f'), trigger: 'blur' }],
-        symbol: [{ required: true, message: this.$t('7c0967bc.02cc4f'), trigger: 'blur' }],
-        rate: [{ required: true, message: this.$t('7c0967bc.02cc4f'), trigger: 'blur' }]
+        selectedCurrency: [
+          { required: true, message: this.$t('7c0967bc.f9b2e4'), trigger: 'change' }
+        ]
       }
     }
   },
   computed: {
-    ...mapGetters(['wheight'])
+    ...mapGetters(['wheight']),
+    currencyOptions() {
+      return [
+        { value: 'CNY', label: this.$t('7c0967bc.b2e5f0') },
+        { value: 'HKD', label: this.$t('7c0967bc.c4f6a1') },
+        { value: 'USD', label: this.$t('7c0967bc.d5f7b2') }
+      ]
+    },
+    selectedCurrencyTitle() {
+      const meta = CURRENCY_PRESET_META[this.form.selectedCurrency]
+      return meta ? this.$t(meta.titleKey) : ''
+    }
   },
   mounted() {
     this.getCurrencytListData()
   },
   methods: {
     handleCancel() {
-      this.editVisible = false
+      this.dialogVisible = false
+      this.form.selectedCurrency = ''
       this.form.symbol = ''
       this.form.currency = ''
-      this.form.title = ''
-      this.form.rate = ''
+      this.form.rate = 1
       this.form.is_default = false
-      this.id = ''
     },
     handleCurrentChange(page_num) {
       this.params.page = page_num
       this.getCurrencytListData()
     },
     addCurrency() {
-      // 添加物料弹框
-      this.editTitle = this.$t('7c0967bc.55f870')
-      this.editVisible = true
+      this.dialogTitle = this.$t('7c0967bc.55f870')
+      this.dialogVisible = true
+      this.form.selectedCurrency = ''
       this.form.symbol = ''
       this.form.currency = ''
-      this.form.title = ''
-      this.form.rate = ''
+      this.form.rate = 1
       this.form.is_default = false
-      this.id = ''
     },
-    editAction(index, row) {
-      // 编辑物料弹框
-      this.editTitle = this.$t('7c0967bc.1c519d')
-      this.editVisible = true
-      this.form.currency = row.currency
-      this.form.title = row.title
-      this.form.symbol = row.symbol
-      this.form.rate = row.rate
-      this.form.is_default = row.is_default
-      this.form.use_platform = 'normal'
-      this.id = row.id
+    getCurrencyTitle(currencyCode, fallbackTitle) {
+      const meta = CURRENCY_PRESET_META[currencyCode]
+      if (meta) {
+        return this.$t(meta.titleKey)
+      }
+      return fallbackTitle
+    },
+    handleCurrencyChange(value) {
+      const meta = CURRENCY_PRESET_META[value]
+      if (!meta) {
+        return
+      }
+      this.form.currency = meta.currency
+      this.form.symbol = meta.symbol
     },
     submitAction() {
-      // 提交物料
-      if (!this.form.currency || !this.form.title || !this.form.symbol || !this.form.rate) {
+      if (!this.form.selectedCurrency || !this.form.currency) {
         this.$message({
           type: 'error',
           message: this.$t('7c0967bc.d14d9c')
@@ -202,29 +229,30 @@ export default {
         return
       }
 
-      let reg = /^\d+(\.\d{1,4})?$/
-      if (!reg.test(this.form.rate)) {
+      const exists = this.currencyList.some((item) => item.currency === this.form.currency)
+      if (exists) {
         this.$message({
           type: 'error',
-          message: this.$t('7c0967bc.99589d')
+          message: this.$t('7c0967bc.a7d1c8')
         })
         return
       }
-      if (this.id) {
-        updateCurrencyInfo(this.id, this.form).then((response) => {
-          this.detailData = response.data.data
-          this.editVisible = false
-          this.getCurrencytListData()
-          this.handleCancel()
-        })
-      } else {
-        createCurrencyInfo(this.form).then((response) => {
-          this.detailData = response.data.data
-          this.editVisible = false
-          this.getCurrencytListData()
-          this.handleCancel()
-        })
+
+      const meta = CURRENCY_PRESET_META[this.form.selectedCurrency]
+      const payload = {
+        currency: meta.currency,
+        title: meta.titleStore,
+        symbol: meta.symbol,
+        rate: 1,
+        is_default: this.form.is_default,
+        use_platform: this.form.use_platform
       }
+
+      createCurrencyInfo(payload).then(() => {
+        this.dialogVisible = false
+        this.getCurrencytListData()
+        this.handleCancel()
+      })
     },
     dataSearch() {
       this.params.page = 1
diff --git a/src/view/base/screen/openScreenAD.vue b/src/view/base/screen/openScreenAD.vue
index d51713b..2e1f8b1 100755
--- a/src/view/base/screen/openScreenAD.vue
+++ b/src/view/base/screen/openScreenAD.vue
@@ -86,7 +86,6 @@
   </el-form-item> -->
         </el-form>
       </div>
-
     </el-card>
     <template slot="page-footer">
       <div class="text-center">
diff --git a/src/view/content/consts.js b/src/view/content/consts.js
old mode 100755
new mode 100644
diff --git a/src/view/content/soft-article-id.vue b/src/view/content/soft-article-id.vue
index 17ee065..397364b 100755
--- a/src/view/content/soft-article-id.vue
+++ b/src/view/content/soft-article-id.vue
@@ -42,8 +42,8 @@ export default {
         author: '',
         head_portrait: '',
         category_id: '',
-        region_id: [],
-        region_name: [],
+        regions_id: [],
+        regions: [],
         image_url: '',
         share_image_url: ''
       },
@@ -78,7 +78,7 @@ export default {
         },
         {
           label: this.$t('5815f596.9b711a'),
-          key: 'region_id',
+          key: 'regions_id',
           component: ({ key }, form) => {
             return (
               <div class='flex gap-2'>
@@ -136,14 +136,15 @@ export default {
     async getArticle() {
       const res = await this.$api.article.getArticleInfo(this.$route.query.id)
       if (res) {
+        const categoryId = res.category_id
         this.articleForm = {
           title: res.title,
           summary: res.summary,
           author: res.author,
           head_portrait: res.head_portrait,
-          category_id: res.category_id,
-          region_id: res.regions_id,
-          region_name: res.regions,
+          category_id: categoryId !== '' && categoryId != null ? Number(categoryId) : categoryId,
+          regions_id: res.regions_id,
+          regions: res.regions,
           image_url: res.image_url,
           share_image_url: res.share_image_url
         }
@@ -164,10 +165,11 @@ export default {
     },
     asyncToArticleTitle() {
       const title = this.articleForm.title.replace(/^\[(.+?)\]/g, '')
-      this.articleForm.title = `[${this.articleForm.region_name.join('')}]${title}`
+      this.articleForm.title = `[${this.articleForm.regions?.join('')}]${title}`
     },
-    handleRegionChange({ region_name }) {
-      this.articleForm.region_name = region_name
+    handleRegionChange(data) {
+      const { region_name } = data
+      this.articleForm.regions = region_name
     },
     async onSubmitTabList() {
       if (this.submitting) {
@@ -180,6 +182,10 @@ export default {
           article_type: 'bring',
           content: this.content
         }
+        if (!params.regions_id?.length) {
+          delete params.regions_id
+          delete params.regions
+        }
         if (this.$route.query.id) {
           await this.$api.article.updateArticle(this.$route.query.id, params)
           this.$message.success(this.$t('5815f596.6d2221'))
diff --git a/src/view/content/soft-article.vue b/src/view/content/soft-article.vue
index 0001bc4..1b26887 100755
--- a/src/view/content/soft-article.vue
+++ b/src/view/content/soft-article.vue
@@ -47,9 +47,11 @@
         <el-button icon="plus" type="primary" @click="handleCreateArticle">
           {{ $t('5f65b998.7bc00e') }}
         </el-button>
+        <!-- ECX-9136: 下线 AI 创作入口
         <el-button icon="plus" type="primary" @click="createArticleByAI">
           {{ $t('5f65b998.b956ea') }}
         </el-button>
+        -->
       </div>
 
       <el-tabs v-model="activeTab" type="card" @tab-click="onTabChange">
diff --git a/src/view/dealer/bspay_create_user.vue b/src/view/dealer/bspay_create_user.vue
index 13f8667..4d30cf4 100755
--- a/src/view/dealer/bspay_create_user.vue
+++ b/src/view/dealer/bspay_create_user.vue
@@ -48,8 +48,8 @@
                     <el-form-item :label="$t('3ec151aa.0202dc')" prop="license_validity_type">
                       <el-switch
                         v-model="form.license_validity_type"
-                        active-value="1"
-                        inactive-value="0"
+                        :active-value="1"
+                        :inactive-value="0"
                       />
                     </el-form-item>
                   </el-col>
@@ -136,8 +136,8 @@
                   <el-form-item :label="$t('3ec151aa.15ed38')" prop="legal_cert_validity_type">
                     <el-switch
                       v-model="form.legal_cert_validity_type"
-                      active-value="1"
-                      inactive-value="0"
+                      :active-value="1"
+                      :inactive-value="0"
                     />
                   </el-form-item>
                 </el-col>
@@ -226,9 +226,10 @@
                   <el-form-item
                     v-if="form.card_type == 0"
                     :label="$t('3ec151aa.fb4d4e')"
-                    prop="bank_code"
+                    prop="branch_code"
+                    required
                   >
-                    <el-input v-model="form.bank_code" />
+                    <el-input v-model="form.branch_code" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
@@ -331,8 +332,8 @@
                   <el-form-item :label="$t('3ec151aa.15ed38')" prop="cert_validity_type">
                     <el-switch
                       v-model="indvForm.cert_validity_type"
-                      active-value="1"
-                      inactive-value="0"
+                      :active-value="1"
+                      :inactive-value="0"
                     />
                   </el-form-item>
                 </el-col>
@@ -477,7 +478,7 @@ export default {
         // card_name: '', //银行卡对应的户名，若银行账户类型是对公，必须与企业名称一致,
         card_no: '', //银行卡号
         card_regions_id: '', // 银行卡开户省市id
-        bank_code: '', // 银行号
+        branch_code: '', // 支行联行号
         branch_name: '', // 支行名称
         // cert_no: '',// 持卡人身份证号必填
         // cert_validity_type: 0,// 持卡人身份证有效期类型
@@ -519,7 +520,7 @@ export default {
           message: '请选择开户行所在省市',
           trigger: 'change'
         },
-        // bank_code: [requiredRules('银行号'), MaxRules(40)],
+        branch_code: requiredRules('支行联行号'),
         // cert_no: [requiredRules('持卡人身份证号'), MaxRules(18)],
         // cert_begin_date: {
         //   required: true,
@@ -759,17 +760,29 @@ export default {
       if (this.user_type == 'ent') {
         this.form = await this.$api.bspay.getUserEnt()
         this.processed = '未填'
+        if (this.form.license_validity_type != null && this.form.license_validity_type !== '') {
+          this.form.license_validity_type = Number(this.form.license_validity_type)
+        }
+        if (this.form.legal_cert_validity_type != null && this.form.legal_cert_validity_type !== '') {
+          this.form.legal_cert_validity_type = Number(this.form.legal_cert_validity_type)
+        }
         this.form.license_regions_id = [
           this.form.reg_prov_id,
           this.form.reg_area_id,
           this.form.reg_district_id
         ]
         this.form.card_regions_id = [this.form.prov_id, this.form.area_id]
+        if (!this.form.branch_code && this.form.bank_code) {
+          this.form.branch_code = this.form.bank_code
+        }
         console.log('ent---------', this.form)
       } else {
         this.indvForm = await this.$api.bspay.getUserIndv()
         this.processed = '未填'
         this.activeName = 'indv'
+        if (this.indvForm.cert_validity_type != null && this.indvForm.cert_validity_type !== '') {
+          this.indvForm.cert_validity_type = Number(this.indvForm.cert_validity_type)
+        }
         this.indvForm.card_regions_id = [this.indvForm.prov_id, this.indvForm.area_id]
         console.log('indv---------', this.indvForm)
       }
diff --git a/src/view/decorate/wgts/wgt_shop/index.vue b/src/view/decorate/wgts/wgt_shop/index.vue
index 6654ffa..86979be 100644
--- a/src/view/decorate/wgts/wgt_shop/index.vue
+++ b/src/view/decorate/wgts/wgt_shop/index.vue
@@ -34,10 +34,7 @@
             class="product-item"
           >
             <div class="product-image">
-              <el-image
-                :src="productImage(product)"
-                alt="商品图片"
-              >
+              <el-image :src="productImage(product)" alt="商品图片">
                 <div slot="error" class="image-slot" />
               </el-image>
             </div>
diff --git a/src/view/mall/aftersales/refundDetail.vue b/src/view/mall/aftersales/refundDetail.vue
index a3f31d1..b17ad8b 100755
--- a/src/view/mall/aftersales/refundDetail.vue
+++ b/src/view/mall/aftersales/refundDetail.vue
@@ -38,11 +38,15 @@
         </el-row>
         <el-row>
           <el-col :span="3" class="col-3 content-right"> {{ $t('eb172bd4.030517') }} </el-col>
-          <el-col :span="20"> ￥{{ refundDetail.refund_fee / 100 }} </el-col>
+          <el-col :span="20">
+            {{ formatMoneyWithSymbol(refundDetail.refund_fee, refundCurrencySymbol) }}
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="3" class="col-3 content-right"> {{ $t('eb172bd4.bbdb6f') }} </el-col>
-          <el-col :span="20"> ￥{{ refundDetail.refunded_fee / 100 }} </el-col>
+          <el-col :span="20">
+            {{ formatMoneyWithSymbol(refundDetail.refunded_fee, refundCurrencySymbol) }}
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="3" class="col-3 content-right"> {{ $t('eb172bd4.886abd') }} </el-col>
@@ -128,7 +132,11 @@
         <el-row>
           <el-col :span="3" class="col-3 content-right"> {{ $t('eb172bd4.85df68') }} </el-col>
           <el-col :span="20">
-            {{ refundDetail.freight_type == 'cash' ? (refundDetail.freight / 100).toFixed(2) : 0 }}
+            {{
+              refundDetail.freight_type == 'cash'
+                ? formatMoneyWithSymbol(refundDetail.freight, refundCurrencySymbol)
+                : 0
+            }}
           </el-col>
         </el-row>
         <el-row>
@@ -153,6 +161,7 @@
             <span v-if="refundDetail.pay_type == 'ebuy'">{{ $t('eb172bd4.a2e703') }}</span>
             <span v-if="refundDetail.pay_type == 'point'">{{ $t('eb172bd4.accd19') }}</span>
             <span v-if="refundDetail.pay_type == 'pos'">{{ $t('eb172bd4.d37dec') }}</span>
+            <span v-if="refundDetail.pay_type == 'doumen_intl'">斗门国际</span>
           </el-col>
         </el-row>
         <el-row>
@@ -254,6 +263,7 @@ import {
   sendConfirm
 } from '../../../api/aftersales'
 import { i18n } from '@/i18n'
+import { formatMoneyWithSymbol, getCurrencySymbol } from '@/utils'
 export default {
   data() {
     return {
@@ -331,6 +341,11 @@ export default {
       ]
     }
   },
+  computed: {
+    refundCurrencySymbol() {
+      return getCurrencySymbol(this.refundDetail)
+    }
+  },
   mounted() {
     if (this.$route.query.refund_bn) {
       this.refund_bn = this.$route.query.refund_bn
@@ -339,6 +354,7 @@ export default {
     this.refundsInfo()
   },
   methods: {
+    formatMoneyWithSymbol,
     refundsInfo() {
       getRefundsDetail(this.refund_bn).then((response) => {
         let data = response.data.data
diff --git a/src/view/mall/aftersales/refundList/components/order.vue b/src/view/mall/aftersales/refundList/components/order.vue
index 9ac4012..7521b08 100755
--- a/src/view/mall/aftersales/refundList/components/order.vue
+++ b/src/view/mall/aftersales/refundList/components/order.vue
@@ -227,13 +227,13 @@
             <span v-if="scope.row.pay_type == 'hfpay'">{{ $t('822436ab.bb68ee') }}</span>
             <span v-if="scope.row.pay_type == 'chinaums'">{{ $t('822436ab.1d7dae') }}</span>
             <span v-if="scope.row.pay_type == 'offline_pay'">{{ $t('822436ab.2d8019') }}</span>
+            <span v-if="scope.row.pay_type == 'doumen_intl'">{{ $t('822436ab.e37lpb') }}</span>
           </template>
         </el-table-column>
         <el-table-column width="180" :label="$t('822436ab.a0cd4c')">
           <template slot-scope="scope">
             <div class="order-num mark">
-              <span class="cur">{{ scope.row.cur_fee_symbol }}</span
-              >{{ scope.row.refund_fee / 100 }}
+              {{ formatMoneyWithSymbol(scope.row.refund_fee, getCurrencySymbol(scope.row)) }}
             </div>
             <div v-if="scope.row.refund_point" class="order-num mark">
               {{ scope.row.refund_point }}{{ $t('822436ab.9f68a8') }}
@@ -248,7 +248,11 @@
         </el-table-column>
         <el-table-column width="180" :label="$t('822436ab.3034f2')">
           <template slot-scope="scope">
-            {{ scope.row.freight_type == 'cash' ? scope.row.freight / 100 : 0 }}
+            {{
+              scope.row.freight_type == 'cash'
+                ? formatMoneyWithSymbol(scope.row.freight, getCurrencySymbol(scope.row))
+                : 0
+            }}
           </template>
         </el-table-column>
         <el-table-column width="180" :label="$t('822436ab.ff5669')">
@@ -333,6 +337,7 @@ import { mapGetters } from 'vuex'
 import { exportRefundList } from '@/api/aftersales'
 import mixin, { pageMixin } from '@/mixins'
 import { i18n } from '@/i18n'
+import { formatMoneyWithSymbol, getCurrencySymbol } from '@/utils'
 export default {
   mixins: [mixin, pageMixin],
   data() {
@@ -475,6 +480,8 @@ export default {
     this.getJstErpSetting()
   },
   methods: {
+    formatMoneyWithSymbol,
+    getCurrencySymbol,
     handleDetail(row) {
       this.$router.push({
         path: this.matchRoutePath('detail'),
@@ -580,9 +587,10 @@ export default {
         })
       }
     },
-    async handleRefund({ order_id, refund_bn, refund_fee }) {
+    async handleRefund({ order_id, refund_bn, refund_fee, cur_fee_symbol }) {
       const { bank_account_name, bank_account_no, bank_name } =
         await this.$api.aftersales.getOfflineInfo({ order_id })
+      const symbol = cur_fee_symbol || '¥'
       this.refundForm = {
         order_id,
         refund_bn,
@@ -593,7 +601,7 @@ export default {
         refund_account_bank: bank_account_no,
         refund_account_no: bank_name,
         pay_type: 'offline_pay',
-        refund_fee: refund_fee / 100
+        refund_fee: `${symbol}${refund_fee / 100}`
       }
       this.refundDialog = true
     },
diff --git a/src/view/mall/goods/physical/list.vue b/src/view/mall/goods/physical/list.vue
index d83e9ef..061d303 100755
--- a/src/view/mall/goods/physical/list.vue
+++ b/src/view/mall/goods/physical/list.vue
@@ -150,79 +150,101 @@
       <SpDrawer
         v-model="showMemberPriceDrawer"
         :title="$t('dc9cefd6.fb2f7a')"
-        :width="800"
+        :width="1200"
         :confirm-text="$t('dc9cefd6.be5fbb')"
         @confirm="onSaveMemberPrice"
       >
-        <el-table v-loading="skuLoading" border :data="specItems" height="100%">
-          <el-table-column :label="$t('dc9cefd6.ea887b')" prop="item_spec_desc" min-width="120" />
-          <el-table-column :label="$t('dc9cefd6.818fc4')" prop="market_price" width="160">
-            <template slot-scope="scope">
-              <el-input-number
-                v-model="scope.row.market_price"
-                controls-position="right"
-                :min="0"
-                :precision="2"
-                style="width: 120px"
-                @change="updateGoodsSkuPrice(scope.row, 'market_price')"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column :label="$t('dc9cefd6.e29575')" width="160">
-            <template slot-scope="scope">
-              <el-input-number
-                v-model="scope.row.price"
-                controls-position="right"
-                :min="0"
-                :precision="2"
-                style="width: 120px"
-                @change="updateGoodsSkuPrice(scope.row, 'price')"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column :label="$t('dc9cefd6.2e2ce2')" width="160">
-            <template slot-scope="scope">
-              <el-input-number
-                v-model="scope.row.cost_price"
-                controls-position="right"
-                :min="0"
-                :precision="2"
-                style="width: 120px"
-                @change="updateGoodsSkuPrice(scope.row, 'cost_price')"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column :label="$t('dc9cefd6.4d9dd5')">
-            <el-table-column v-for="(item, index) in grade" :key="index" :label="item.grade_name">
-              <template slot-scope="scope">
-                <el-input-number
-                  v-model="scope.row.grade[index].mprice"
-                  controls-position="right"
-                  :min="0"
-                  :precision="2"
-                  style="width: 120px"
-                />
-              </template>
-            </el-table-column>
-          </el-table-column>
-          <el-table-column :label="$t('dc9cefd6.bc0883')">
+        <el-alert
+          class="mb-4"
+          type="info"
+          :closable="false"
+          show-icon
+          :title="$t('dc9cefd6.b8f2c1')"
+        />
+        <div class="member-price-drawer-table">
+          <el-table v-loading="skuLoading" border :data="specItems">
             <el-table-column
-              v-for="(item, index) in vipGrade"
-              :key="index"
-              :label="item.grade_name"
-            >
+              :label="$t('dc9cefd6.ea887b')"
+              prop="item_spec_desc"
+              min-width="140"
+              fixed
+            />
+            <el-table-column :label="$t('dc9cefd6.818fc4')" width="150" align="center">
               <template slot-scope="scope">
                 <el-input-number
-                  v-model="scope.row.vipGrade[index].mprice"
+                  v-model="scope.row.market_price"
+                  class="member-price-input"
                   controls-position="right"
                   :min="0"
                   :precision="2"
-                  style="width: 120px"
+                  @blur="updateGoodsSkuPrice(scope.row, 'market_price')"
                 />
               </template>
             </el-table-column>
-          </el-table-column>
-        </el-table>
+            <el-table-column :label="$t('dc9cefd6.e29575')" width="150" align="center">
+              <template slot-scope="scope">
+                <el-input-number
+                  v-model="scope.row.price"
+                  class="member-price-input"
+                  controls-position="right"
+                  :min="0"
+                  :precision="2"
+                  @blur="updateGoodsSkuPrice(scope.row, 'price')"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column :label="$t('dc9cefd6.2e2ce2')" width="150" align="center">
+              <template slot-scope="scope">
+                <el-input-number
+                  v-model="scope.row.cost_price"
+                  class="member-price-input"
+                  controls-position="right"
+                  :min="0"
+                  :precision="2"
+                  @blur="updateGoodsSkuPrice(scope.row, 'cost_price')"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column :label="$t('dc9cefd6.4d9dd5')" align="center">
+              <el-table-column
+                v-for="(item, index) in grade"
+                :key="`grade-${item.vip_grade_id || index}`"
+                :label="item.grade_name"
+                width="130"
+                align="center"
+              >
+                <template slot-scope="scope">
+                  <el-input-number
+                    v-model="scope.row.grade[index].mprice"
+                    class="member-price-input"
+                    controls-position="right"
+                    :min="0"
+                    :precision="2"
+                  />
+                </template>
+              </el-table-column>
+            </el-table-column>
+            <el-table-column :label="$t('dc9cefd6.bc0883')" align="center">
+              <el-table-column
+                v-for="(item, index) in vipGrade"
+                :key="`vip-${item.vip_grade_id || index}`"
+                :label="item.grade_name"
+                width="130"
+                align="center"
+              >
+                <template slot-scope="scope">
+                  <el-input-number
+                    v-model="scope.row.vipGrade[index].mprice"
+                    class="member-price-input"
+                    controls-position="right"
+                    :min="0"
+                    :precision="2"
+                  />
+                </template>
+              </el-table-column>
+            </el-table-column>
+          </el-table>
+        </div>
       </SpDrawer>
 
       <!-- 设置商品库存 -->
@@ -567,6 +589,7 @@ export default {
       showMemberPriceDrawer: false,
       showItemStoreDrawer: false,
       specItems: [],
+      specItemsSnapshot: {},
       storeItemsList: [],
       skuLoading: false,
       showItemSkuDrawer: false,
@@ -623,7 +646,7 @@ export default {
       saleCategoryDialog: false,
       saleCategoryForm: {
         item_id: [],
-        category_id: ''
+        category_id: []
       },
       saleCategoryFormList: [
         {
@@ -1533,22 +1556,28 @@ export default {
       this.skuLoading = true
       this.showMemberPriceDrawer = true
       const specItems = []
+      const specItemsSnapshot = {}
       const { list } = await this.$api.goods.getGoodsPrice(item_id)
       list.forEach((item) => {
+        const price = item.price / 100
+        const cost_price = item.cost_price / 100
+        const market_price = item.market_price / 100
         specItems.push({
           item_id: item.item_id,
           item_spec_desc: item.item_spec_desc || item.itemName,
           is_edit: false,
-          price: item.price / 100,
-          cost_price: item.cost_price / 100,
-          market_price: item.market_price / 100,
+          price,
+          cost_price,
+          market_price,
           grade: this.generatePrice(item.memberGrade.grade),
           vipGrade: this.generatePrice(item.memberGrade.vipGrade)
         })
+        specItemsSnapshot[item.item_id] = { price, cost_price, market_price }
       })
       this.grade = this.generatePrice(list[0].memberGrade.grade)
       this.vipGrade = this.generatePrice(list[0].memberGrade.vipGrade)
       this.specItems = specItems
+      this.specItemsSnapshot = specItemsSnapshot
       this.skuLoading = false
     },
     handleShow({ goods_id, itemName }) {
@@ -1611,7 +1640,6 @@ export default {
         item_id: this.currentId,
         mprice: ''
       }
-      console.log('specItems', this.specItems)
       let skus = {}
       this.specItems.forEach((item) => {
         let grade = {}
@@ -1673,9 +1701,66 @@ export default {
     onSelectionChange(selection) {
       this.selectionItems = selection
     },
-    changeCategory() {
+    getSaleCategoryIdsFromItem(item) {
+      if (Array.isArray(item.item_category) && item.item_category.length) {
+        return item.item_category.map((id) => Number(id))
+      }
+      if (Array.isArray(item.item_category_info) && item.item_category_info.length) {
+        return item.item_category_info.map((category) => Number(category.category_id))
+      }
+      return null
+    },
+    getSaleCategoryPaths(categories, targetIds) {
+      const normalizedTargetIds = targetIds.map((id) => Number(id))
+      const paths = {}
+
+      const findPath = (node, currentPath) => {
+        const categoryId = Number(node.category_id)
+        const newPath = [...currentPath, categoryId]
+        if (normalizedTargetIds.includes(categoryId)) {
+          paths[categoryId] = newPath
+        }
+        if (node.children?.length) {
+          node.children.forEach((child) => findPath(child, newPath))
+        }
+      }
+
+      categories.forEach((root) => findPath(root, []))
+      return normalizedTargetIds.map((id) => paths[id] || []).filter((path) => path.length)
+    },
+    async resolveSelectionSaleCategoryIds() {
+      const categoryIds = new Set()
+      const needFetchItemIds = []
+
+      this.selectionItems.forEach((item) => {
+        const itemCategoryIds = this.getSaleCategoryIdsFromItem(item)
+        if (itemCategoryIds) {
+          itemCategoryIds.forEach((id) => categoryIds.add(id))
+          return
+        }
+        needFetchItemIds.push(item.item_id)
+      })
+
+      if (needFetchItemIds.length) {
+        const details = await Promise.all(
+          needFetchItemIds.map((itemId) =>
+            this.$api.goods.getItemsDetail(itemId, {
+              operate_source: IS_SUPPLIER() ? 'supplier' : 'platform'
+            })
+          )
+        )
+        details.forEach((detail) => {
+          ;(detail.item_category || []).forEach((id) => categoryIds.add(Number(id)))
+        })
+      }
+
+      return [...categoryIds]
+    },
+    async changeCategory() {
       if (this.selectionItems.length > 0) {
         this.saleCategoryForm.item_id = this.selectionItems.map((item) => item.item_id)
+        const categoryIds = await this.resolveSelectionSaleCategoryIds()
+        this.saleCategoryForm.category_id = this.getSaleCategoryPaths(this.categoryList, categoryIds)
         this.saleCategoryDialog = true
       } else {
         this.$message.error(this.$t('dc9cefd6.ace302'))
@@ -2022,20 +2107,25 @@ export default {
         this.$message.error(this.$t('dc9cefd6.dd51ab'))
       }
     },
-    async updateGoodsSkuPrice({ item_id, price, cost_price, market_price }, priceType) {
-      const priceMap = {
-        price: price,
-        cost_price: cost_price,
-        market_price: market_price
+    async updateGoodsSkuPrice(row, priceType) {
+      const priceValue = row[priceType]
+      if (priceValue == null || priceValue === '' || Number.isNaN(Number(priceValue))) {
+        return
+      }
+      const original = this.specItemsSnapshot[row.item_id]
+      if (original && Number(original[priceType]) === Number(priceValue)) {
+        return
       }
       await this.$api.goods.updateGoodsInfo({
-        item_id,
-        [priceType]: priceMap[priceType],
+        item_id: row.item_id,
+        [priceType]: priceValue,
         operate_source: IS_SUPPLIER() ? 'supplier' : 'platform'
       })
+      if (this.specItemsSnapshot[row.item_id]) {
+        this.specItemsSnapshot[row.item_id][priceType] = priceValue
+      }
       this.$message.success(this.$t('dc9cefd6.33130f'))
     },
-
     async setWarningStore() {
       await this.$api.goods.getItemWarningStore({ store: this.warning_store })
       this.$refs['finder'].refresh()
@@ -2164,6 +2254,30 @@ export default {
 .page-code {
   text-align: center;
 }
+/* 设置价格抽屉：列宽与输入框对齐 */
+.member-price-drawer-table {
+  overflow-x: auto;
+
+  ::v-deep {
+    .el-table .cell {
+      padding: 8px;
+      line-height: normal;
+    }
+
+    .el-table td {
+      padding: 10px 0;
+    }
+
+    .member-price-input {
+      width: 100%;
+    }
+
+    .member-price-input.el-input-number.is-controls-right .el-input__inner {
+      padding-left: 8px;
+      padding-right: 42px;
+    }
+  }
+}
 .page-code-img {
   width: 200px;
   height: 200px;
diff --git a/src/view/mall/goods/physical/normalGoodsUpload.vue b/src/view/mall/goods/physical/normalGoodsUpload.vue
index 46dab85..94a3f5d 100755
--- a/src/view/mall/goods/physical/normalGoodsUpload.vue
+++ b/src/view/mall/goods/physical/normalGoodsUpload.vue
@@ -38,10 +38,7 @@ export default {
     RelatedUpload
   },
   data() {
-    const paneList = [
-      { name: 'upload_tb_items', label: i18n.t('5f45d286.f1968b') },
-      { name: 'normal_goods', label: i18n.t('5f45d286.9e6dce') }
-    ]
+    const paneList = [{ name: 'normal_goods', label: i18n.t('5f45d286.9e6dce') }]
 
     if (!IS_SUPPLIER()) {
       paneList.push({ name: 'employee_purchase_activity_items', label: i18n.t('5f45d286.4482b6') })
@@ -63,7 +60,8 @@ export default {
   },
   mounted() {
     const { file_type = 'normal_goods', relation_id = '' } = this.$route.query
-    this.activeName = file_type
+    const validNames = this.pane_list.map((item) => item.name)
+    this.activeName = validNames.includes(file_type) ? file_type : 'normal_goods'
     this.relatedId = relation_id
   },
   methods: {
diff --git a/src/view/mall/marketing/distributor.vue b/src/view/mall/marketing/distributor.vue
index 72173da..a2b5e20 100755
--- a/src/view/mall/marketing/distributor.vue
+++ b/src/view/mall/marketing/distributor.vue
@@ -396,12 +396,12 @@
             >
               <span v-if="scope.row.is_valid == 'true'" class="green">
                 <el-button type="success" size="mini" plain
-                  >{{ $t('b2fe051e.7854b5') }}<i class="el-icon-edit"
+                  >{{ storeStatusLabel('enable') }}<i class="el-icon-edit"
                 /></el-button>
               </span>
               <span v-else-if="scope.row.is_valid == 'false'" class="red">
                 <el-button type="danger" size="mini" plain
-                  >{{ $t('b2fe051e.710ad0') }}<i class="el-icon-edit"
+                  >{{ storeStatusLabel('disable') }}<i class="el-icon-edit"
                 /></el-button>
               </span>
               <span v-else-if="scope.row.is_valid == 'closed'" class="muted">
@@ -705,8 +705,8 @@
             v-model="editValidData.is_valid"
             @change="editValidSubmit"
           >
-            <el-radio label="true"> {{ $t('b2fe051e.7854b5') }} </el-radio>
-            <el-radio label="false"> {{ $t('b2fe051e.710ad0') }} </el-radio>
+            <el-radio label="true"> {{ storeStatusLabel('enable') }} </el-radio>
+            <el-radio label="false"> {{ storeStatusLabel('disable') }} </el-radio>
             <el-radio label="closed"> {{ $t('b2fe051e.d2b1c3') }} </el-radio>
             <el-radio label="delete"> {{ $t('b2fe051e.0044f6') }} </el-radio>
           </el-radio-group>
@@ -892,13 +892,6 @@ export default {
       is_distributor: false,
       dialogVisible: false,
       current: '', // 当前店铺id
-      isValidList: [
-        { name: this.$t('b2fe051e.a8b0c2'), value: undefined },
-        { name: this.$t('b2fe051e.7854b5'), value: 'true' },
-        { name: this.$t('b2fe051e.710ad0'), value: 'false' },
-        { name: this.$t('b2fe051e.d2b1c3'), value: 'closed' },
-        { name: this.$t('b2fe051e.0044f6'), value: 'delete' }
-      ],
       isOpenList: [
         { name: this.$t('b2fe051e.789372'), value: true },
         { name: this.$t('b2fe051e.70264a'), value: false }
@@ -1127,6 +1120,15 @@ export default {
       return (
         this.$store.getters.login_type === 'admin' || this.$store.getters.login_type === 'admin'
       )
+    },
+    isValidList() {
+      return [
+        { name: this.$t('b2fe051e.a8b0c2'), value: undefined },
+        { name: this.storeStatusLabel('enable'), value: 'true' },
+        { name: this.storeStatusLabel('disable'), value: 'false' },
+        { name: this.$t('b2fe051e.d2b1c3'), value: 'closed' },
+        { name: this.$t('b2fe051e.0044f6'), value: 'delete' }
+      ]
     }
   },
 
@@ -1146,6 +1148,14 @@ export default {
     this.getPaymentSubjectStatus()
   },
   methods: {
+    storeStatusLabel(type) {
+      const isCloudStore = this.VERSION_STANDARD()
+      const keyMap = {
+        enable: isCloudStore ? 'b2fe051e.c8f21a' : 'b2fe051e.7854b5',
+        disable: isCloudStore ? 'b2fe051e.d9e32b' : 'b2fe051e.710ad0'
+      }
+      return this.$t(keyMap[type])
+    },
     // 导入店铺
     uploadHandleChange(file, fileList) {
       this.$router.push({ path: this.matchRoutePath('storeupload') })
@@ -1574,9 +1584,9 @@ export default {
     editValidSubmit(val) {
       let msg = ''
       if (val === 'true') {
-        msg = this.$t('b2fe051e.31ffeb')
+        msg = this.$t(this.VERSION_STANDARD() ? 'b2fe051e.e0f43c' : 'b2fe051e.31ffeb')
       } else if (val === 'false') {
-        msg = this.$t('b2fe051e.3abe79')
+        msg = this.$t(this.VERSION_STANDARD() ? 'b2fe051e.f1a54d' : 'b2fe051e.3abe79')
       } else if (val === 'closed') {
         msg = this.$t('b2fe051e.c9d4e1')
       } else if (val === 'delete') {
diff --git a/src/view/mall/storeshop/store-shop.standard.vue b/src/view/mall/storeshop/store-shop.standard.vue
index 4af0616..995a948 100755
--- a/src/view/mall/storeshop/store-shop.standard.vue
+++ b/src/view/mall/storeshop/store-shop.standard.vue
@@ -619,32 +619,42 @@ export default {
       this.$message.success(this.$t('8c556aa3.a6cbc7'))
       this.$refs.finder.refresh(true)
     },
-    handleBatchDownload(val) {
+    async handleBatchDownload() {
       if (this.selectItems.length == 0) {
         return this.$message.error(this.$t('8c556aa3.20e46f'))
       }
       const zip = new JSZip()
-      const requests = []
       const { distributor_id } = this.searchParams
-      this.selectItems.forEach((item) => {
-        const url = `${this.BASE_API}/goods/distributionGoodsWxaCodeStream?item_id=${item.itemId}&distributor_id=${distributor_id}`
-        requests.push(getFileBlob(url))
-      })
-      Promise.all(requests).then((res) => {
-        res.forEach((file, index) => {
-          zip.file(`${this.selectItems[index].itemName}.png`, file, { binary: true })
-        })
-        zip.generateAsync({ type: 'blob' }).then((content) => {
-          FileSaver.saveAs(content, this.$t('8c556aa3.b9bca0'))
+      const results = await Promise.allSettled(
+        this.selectItems.map((item) => {
+          const url = `${this.BASE_API}/goods/distributionGoodsWxaCodeStream?item_id=${item.itemId}&distributor_id=${distributor_id}`
+          return getFileBlob(url).then((file) => ({ item, file }))
         })
+      )
+      let successCount = 0
+      results.forEach((result) => {
+        if (result.status === 'fulfilled') {
+          const { item, file } = result.value
+          zip.file(`${item.itemName}.png`, file, { binary: true })
+          successCount++
+        }
       })
+      if (!successCount) {
+        return this.$message.error(this.$t('8c556aa3.5fa802'))
+      }
+      const content = await zip.generateAsync({ type: 'blob' })
+      FileSaver.saveAs(content, this.$t('8c556aa3.b9bca0'))
+      if (successCount < this.selectItems.length) {
+        this.$message.warning(
+          `部分商品码下载失败（成功 ${successCount}/${this.selectItems.length}）`
+        )
+      }
     },
     async handleExport() {
       const exportParams = {
         ...this.searchParams,
         goods_ids: this.selectItems.map((item) => item.goods_id),
-        is_can_sale:
-          this.activeTab == 'second' ? true : this.activeTab == 'third' ? false : '_all',
+        is_can_sale: this.activeTab == 'second' ? true : this.activeTab == 'third' ? false : '_all',
         is_sku: true
       }
       const { status } = await this.$api.marketing.exportDistributorItems(exportParams)
diff --git a/src/view/mall/trade/list.vue b/src/view/mall/trade/list.vue
index a2d5ac0..b051aad 100755
--- a/src/view/mall/trade/list.vue
+++ b/src/view/mall/trade/list.vue
@@ -143,7 +143,7 @@
                         </div>
                       </div>
                       <div slot="reference" class="name-wrapper">
-                        {{ scope.row.discountFee / 100 }}{{ $t('35ec026d.c16655') }}
+                        {{ formatMoneyWithSymbol(scope.row.discountFee, getCurrencySymbol(scope.row)) }}
                       </div>
                     </el-popover>
                   </el-form-item>
@@ -183,6 +183,16 @@
             </el-table-column>
             <el-table-column :label="$t('35ec026d.a6d10d')" width="200">
               <template slot-scope="scope">
+                <div class="order-num">
+                  {{ scope.row.orderId }}
+                  <el-tooltip effect="dark" :content="$t('35ec026d.79d3ab')" placement="top-start">
+                    <i
+                      v-clipboard:copy="scope.row.orderId"
+                      v-clipboard:success="onCopySuccess"
+                      class="el-icon-document-copy"
+                    />
+                  </el-tooltip>
+                </div>
                 <div class="order-num">
                   <el-tooltip effect="dark" :content="$t('35ec026d.b58943')" placement="top-start">
                     <i class="el-icon-mobile" />
@@ -210,8 +220,7 @@
                   <span class="mark">{{ scope.row.payFee }} {{ $t('35ec026d.9f68a8') }}</span>
                 </div>
                 <div v-else>
-                  <span>￥</span>
-                  <span>{{ scope.row.payFee / 100 }}</span>
+                  <span>{{ formatMoneyWithSymbol(scope.row.payFee, getCurrencySymbol(scope.row)) }}</span>
                 </div>
               </template>
             </el-table-column>
@@ -253,13 +262,12 @@
                   <span>{{ scope.row.payFee }} {{ $t('35ec026d.9f68a8') }}</span>
                 </template>
                 <template v-else>
-                  <span v-if="scope.row.curPayFee"
-                    ><span class="cur">￥</span>{{ scope.row.curPayFee / 100 }}</span
-                  >
-                  <span v-else
-                    ><span class="cur">{{ scope.row.curFeeSymbol }}</span
-                    >{{ scope.row.totalFee / 100 }}</span
-                  >
+                  <span v-if="scope.row.curPayFee">{{
+                    formatMoneyWithSymbol(scope.row.curPayFee, getCurrencySymbol(scope.row))
+                  }}</span>
+                  <span v-else>{{
+                    formatMoneyWithSymbol(scope.row.totalFee, getCurrencySymbol(scope.row))
+                  }}</span>
                 </template>
               </template>
             </el-table-column>
@@ -271,8 +279,9 @@
             <el-table-column :label="$t('35ec026d.1138a9')">
               <template slot-scope="scope">
                 {{
-                  scope.row.self_delivery_fee &&
-                  scope.row.self_delivery_fee / 100 + $t('35ec026d.c16655')
+                  scope.row.self_delivery_fee
+                    ? formatMoneyWithSymbol(scope.row.self_delivery_fee, getCurrencySymbol(scope.row))
+                    : ''
                 }}
               </template>
             </el-table-column>
@@ -358,6 +367,7 @@
 import { mapGetters } from 'vuex'
 import mixin, { pageMixin } from '@/mixins'
 import { PAY_TYPE, DISTRIBUTION_TYPE } from '@/consts'
+import { formatMoneyWithSymbol, getCurrencySymbol } from '@/utils'
 
 export default {
   mixins: [mixin, pageMixin],
@@ -394,6 +404,8 @@ export default {
     this.fetchList()
   },
   methods: {
+    formatMoneyWithSymbol,
+    getCurrencySymbol,
     fitlerPayType(payChannel, payType) {
       return payChannel ? PAY_TYPE[payChannel] : PAY_TYPE[payType]
     },
diff --git a/src/view/mall/trade/normalorders/list.vue b/src/view/mall/trade/normalorders/list.vue
index 47ee9b6..e8e3f11 100755
--- a/src/view/mall/trade/normalorders/list.vue
+++ b/src/view/mall/trade/normalorders/list.vue
@@ -357,7 +357,7 @@
             header-align="center"
           >
             <template slot-scope="scope">
-              {{ (scope.row.total_fee / 100).toFixed(2) }}
+              {{ scope.row.fee_symbol || '¥' }}{{ (scope.row.total_fee / 100).toFixed(2) }}
             </template>
           </el-table-column>
           <el-table-column
@@ -368,7 +368,7 @@
             header-align="center"
           >
             <template slot-scope="scope">
-              {{ (scope.row.point_fee / 100).toFixed(2) }}
+              {{ scope.row.fee_symbol || '¥' }}{{ (scope.row.point_fee / 100).toFixed(2) }}
             </template>
           </el-table-column>
           <el-table-column
@@ -379,7 +379,7 @@
             header-align="center"
           >
             <template slot-scope="scope">
-              {{ (scope.row.cost_fee / 100).toFixed(2) }}
+              {{ scope.row.fee_symbol || '¥' }}{{ (scope.row.cost_fee / 100).toFixed(2) }}
             </template>
           </el-table-column>
           <el-table-column
@@ -389,7 +389,10 @@
             header-align="center"
           >
             <template slot-scope="scope">
-              {{ (scope.row.freight_fee / 100 + scope.row.freight_point_fee / 100).toFixed(2) }}
+              {{ scope.row.fee_symbol || '¥'
+              }}{{
+                (scope.row.freight_fee / 100 + scope.row.freight_point_fee / 100).toFixed(2)
+              }}
             </template>
           </el-table-column>
 
diff --git a/src/view/mall/trade/order/detail/component/PayCard.vue b/src/view/mall/trade/order/detail/component/PayCard.vue
index d9a5113..e7dea4a 100755
--- a/src/view/mall/trade/order/detail/component/PayCard.vue
+++ b/src/view/mall/trade/order/detail/component/PayCard.vue
@@ -88,15 +88,14 @@ export default {
       return `${this.orderInfo.fee_symbol}${(this.orderInfo.total_fee / 100).toFixed(2)}`
     },
     realTotalFilter() {
-      let returnValue = ''
+      const feeSymbol = this.orderInfo.fee_symbol || '¥'
       if (this.tradeInfo.payType === 'point') {
-        returnValue = `￥0`
-      } else if (this.tradeInfo.tradeState === 'NOTPAY') {
-        returnValue = `￥0`
-      } else {
-        returnValue = `${this.orderInfo.fee_symbol}${(this.orderInfo.total_fee / 100).toFixed(2)}`
+        return `${feeSymbol}0.00`
       }
-      return returnValue
+      if (this.tradeInfo.tradeState === 'NOTPAY') {
+        return `${feeSymbol}0.00`
+      }
+      return `${this.orderInfo.fee_symbol || '¥'}${(this.orderInfo.total_fee / 100).toFixed(2)}`
     },
     orderTotalFilter() {
       return `${this.orderInfo.fee_symbol}${
diff --git a/src/view/mall/trade/order/detail/index.vue b/src/view/mall/trade/order/detail/index.vue
index 597da2a..79fa3f3 100755
--- a/src/view/mall/trade/order/detail/index.vue
+++ b/src/view/mall/trade/order/detail/index.vue
@@ -150,12 +150,12 @@
             </el-table-column>
             <el-table-column prop="cost_price" :label="$t('3cdfcea1.17b4aa')" width="100">
               <template slot-scope="scope">
-                {{ (scope.row.cost_price / 100).toFixed(2) }}
+                {{ formatOrderMoney(scope.row.cost_price, scope.row.fee_symbol) }}
               </template>
             </el-table-column>
             <el-table-column prop="cost_price" :label="$t('3cdfcea1.066804')" width="100">
               <template slot-scope="scope">
-                {{ (scope.row.cost_price / 100).toFixed(2) }}
+                {{ formatOrderMoney(scope.row.cost_price, scope.row.fee_symbol) }}
               </template>
             </el-table-column>
             <el-table-column prop="num" :label="$t('3cdfcea1.0bf60b')" width="80" />
@@ -182,7 +182,7 @@
             </el-table-column>
             <el-table-column :label="$t('3cdfcea1.1f1eac')" width="120">
               <template slot-scope="scope">
-                {{ (scope.row.cost_fee / 100).toFixed(2) }}
+                {{ formatOrderMoney(scope.row.cost_fee, scope.row.fee_symbol) }}
               </template>
             </el-table-column>
             <el-table-column
@@ -196,12 +196,12 @@
             </el-table-column>
             <el-table-column :label="$t('3cdfcea1.2ecbc8')" width="120">
               <template slot-scope="scope">
-                {{ (scope.row.point_fee / 100).toFixed(2) }}
+                {{ formatOrderMoney(scope.row.point_fee, scope.row.fee_symbol) }}
               </template>
             </el-table-column>
             <el-table-column :label="$t('3cdfcea1.e95382')" width="120">
               <template slot-scope="scope">
-                {{ (scope.row.total_fee / 100).toFixed(2) }}
+                {{ formatOrderMoney(scope.row.total_fee, scope.row.fee_symbol) }}
               </template>
             </el-table-column>
             <el-table-column :label="$t('3cdfcea1.aae045')" width="100">
@@ -934,6 +934,13 @@ export default {
     this.getLogisticsList()
   },
   methods: {
+    formatOrderMoney(amount, feeSymbol) {
+      const symbol = feeSymbol || this.orderInfo?.fee_symbol || '¥'
+      if (amount === null || amount === undefined || amount === '') {
+        return `${symbol}0.00`
+      }
+      return `${symbol}${(Number(amount) / 100).toFixed(2)}`
+    },
     invoiceFilter(item) {
       return OPEN_STATUS_ARR.find((el) => el.value === item)?.title || ''
     },
@@ -1034,6 +1041,8 @@ export default {
         memberDiscount = `${100 - gradeInfo.privileges.discount}%`
       }
 
+      const feeSymbol = orderInfo.fee_symbol || '¥'
+
       this.orderInfo = {
         ...orderInfo,
         create_time: create_time ? moment(create_time * 1000).format('YYYY-MM-DD HH:mm:ss') : '',
@@ -1059,47 +1068,51 @@ export default {
               })
           : [],
         profit_type: PROFIT_TYPE[profit.profit_type],
-        profit_totalPrice: profit.total_fee ? `¥${profit.total_fee / 100}` : '￥0.00',
+        profit_totalPrice: profit.total_fee
+          ? this.formatOrderMoney(profit.total_fee, feeSymbol)
+          : this.formatOrderMoney(0, feeSymbol),
         ...tradeInfo,
         mobile: orderInfo.mobile,
         goodsPrice:
           orderInfo.order_type != 'bargain'
             ? orderInfo.item_fee
-              ? `¥${(orderInfo.item_fee / 100).toFixed(2)}`
-              : '￥0.00'
+              ? this.formatOrderMoney(orderInfo.item_fee, feeSymbol)
+              : this.formatOrderMoney(0, feeSymbol)
             : orderInfo.item_price
-            ? `¥${(orderInfo.item_price / 100).toFixed(2)}`
-            : '￥0.00',
+            ? this.formatOrderMoney(orderInfo.item_price, feeSymbol)
+            : this.formatOrderMoney(0, feeSymbol),
         freightFee:
           orderInfo.freight_fee || orderInfo.freight_point_fee
-            ? `¥${(
-                ((orderInfo.freight_fee || 0) + (orderInfo.freight_point_fee || 0)) /
-                100
-              ).toFixed(2)}`
-            : '￥0.00',
+            ? this.formatOrderMoney(
+                (orderInfo.freight_fee || 0) + (orderInfo.freight_point_fee || 0),
+                feeSymbol
+              )
+            : this.formatOrderMoney(0, feeSymbol),
         memberDiscountPrice: orderInfo.member_discount
-          ? `-¥${(orderInfo.member_discount / 100).toFixed(2)}`
-          : '￥0.00',
+          ? `-${this.formatOrderMoney(orderInfo.member_discount, feeSymbol)}`
+          : this.formatOrderMoney(0, feeSymbol),
         couponDiscount: orderInfo.coupon_discount
-          ? `-¥${(orderInfo.coupon_discount / 100).toFixed(2)}`
-          : '￥0.00',
+          ? `-${this.formatOrderMoney(orderInfo.coupon_discount, feeSymbol)}`
+          : this.formatOrderMoney(0, feeSymbol),
         totalDiscount: orderInfo.discount_fee
-          ? `-¥${(orderInfo.discount_fee / 100).toFixed(2)}`
-          : '￥0.00',
-        totalPrice: orderInfo.total_fee ? `¥${(orderInfo.total_fee / 100).toFixed(2)}` : '￥0.00',
-        pointFee: orderInfo.point_fee ? `¥${(orderInfo.point_fee / 100).toFixed(2)}` : '￥0.00',
+          ? `-${this.formatOrderMoney(orderInfo.discount_fee, feeSymbol)}`
+          : this.formatOrderMoney(0, feeSymbol),
+        totalPrice: orderInfo.total_fee
+          ? this.formatOrderMoney(orderInfo.total_fee, feeSymbol)
+          : this.formatOrderMoney(0, feeSymbol),
+        pointFee: orderInfo.point_fee
+          ? this.formatOrderMoney(orderInfo.point_fee, feeSymbol)
+          : this.formatOrderMoney(0, feeSymbol),
         realPrice: (() => {
-          let returnValue = ''
           if (tradeInfo.payType === 'point') {
-            returnValue = `￥0`
-          } else if (tradeInfo.tradeState === 'NOTPAY') {
-            returnValue = `￥0`
-          } else {
-            returnValue = orderInfo.total_fee
-              ? `¥${(orderInfo.total_fee / 100).toFixed(2)}`
-              : '￥0.00'
+            return this.formatOrderMoney(0, feeSymbol)
           }
-          return returnValue
+          if (tradeInfo.tradeState === 'NOTPAY') {
+            return this.formatOrderMoney(0, feeSymbol)
+          }
+          return orderInfo.total_fee
+            ? this.formatOrderMoney(orderInfo.total_fee, feeSymbol)
+            : this.formatOrderMoney(0, feeSymbol)
         })(),
         payTypeTxt: tradeInfo.payChannel
           ? PAY_TYPE[tradeInfo.payChannel]
diff --git a/src/view/marketing/employee/addGoods.vue b/src/view/marketing/employee/addGoods.vue
index 6b5c508..c4519a1 100755
--- a/src/view/marketing/employee/addGoods.vue
+++ b/src/view/marketing/employee/addGoods.vue
@@ -177,7 +177,11 @@
             </SpFilterFormItem>
             <div class="filter-row-break" />
             <SpFilterFormItem prop="shelf_status" :label="$t('d41d8cd9.3fea7c')">
-              <el-select v-model="queryForm.shelf_status" clearable :placeholder="$t('b7aea01d.a8b0c2')">
+              <el-select
+                v-model="queryForm.shelf_status"
+                clearable
+                :placeholder="$t('b7aea01d.a8b0c2')"
+              >
                 <el-option :label="$t('b7aea01d.4a5098')" :value="1" />
                 <el-option :label="$t('b7aea01d.d2379a')" :value="0" />
               </el-select>
@@ -460,17 +464,26 @@
               v-if="(scope.row.nospec == 'false' && scope.row.is_sku) || scope.row.nospec == 'true'"
               slot-scope="scope"
             >
-              <span>{{ Number(scope.row.shelf_status) === 1 ? $t('b7aea01d.4a5098') : $t('b7aea01d.d2379a') }}</span>
+              <span>{{
+                Number(scope.row.shelf_status) === 1 ? $t('b7aea01d.4a5098') : $t('b7aea01d.d2379a')
+              }}</span>
             </template>
           </el-table-column>
           <el-table-column fixed="left" :label="$t('2ff5650c.2b6bc0')" width="120px">
             <template slot-scope="scope">
               <el-button
-                v-if="!adminDisabled && ((scope.row.nospec == 'false' && scope.row.is_sku) || scope.row.nospec == 'true')"
+                v-if="
+                  !adminDisabled &&
+                  ((scope.row.nospec == 'false' && scope.row.is_sku) || scope.row.nospec == 'true')
+                "
                 type="text"
                 @click="toggleShelfStatus(scope.row)"
               >
-                {{ Number(scope.row.shelf_status) === 1 ? $t('b7aea01d.d2379a') : $t('b7aea01d.4a5098') }}
+                {{
+                  Number(scope.row.shelf_status) === 1
+                    ? $t('b7aea01d.d2379a')
+                    : $t('b7aea01d.4a5098')
+                }}
               </el-button>
             </template>
           </el-table-column>
@@ -815,14 +828,20 @@ export default {
         item['limit_fee'] = item.limit_fee / 100
         item['tid'] = ++tindex
         item['checked'] = false
-        item['shelf_status'] = item.shelf_status === undefined || item.shelf_status === null ? 1 : Number(item.shelf_status)
+        item['shelf_status'] =
+          item.shelf_status === undefined || item.shelf_status === null
+            ? 1
+            : Number(item.shelf_status)
         if (typeof item.spec_items != 'undefined') {
           item.spec_items.forEach((sitem) => {
             sitem['is_sku'] = true
             sitem['activity_price'] = sitem.activity_price / 100
             sitem['limit_fee'] = sitem.limit_fee / 100
             sitem['tid'] = ++tindex
-            sitem['shelf_status'] = sitem.shelf_status === undefined || sitem.shelf_status === null ? 1 : Number(sitem.shelf_status)
+            sitem['shelf_status'] =
+              sitem.shelf_status === undefined || sitem.shelf_status === null
+                ? 1
+                : Number(sitem.shelf_status)
           })
         }
       })
diff --git a/src/view/marketing/employee/purchase.vue b/src/view/marketing/employee/purchase.vue
index 774bf21..a8bd9a7 100755
--- a/src/view/marketing/employee/purchase.vue
+++ b/src/view/marketing/employee/purchase.vue
@@ -1414,7 +1414,9 @@ export default {
       return pageKeys.reduce((prev, pageKey) => {
         const pageConfig = config[pageKey]
         if (pageConfig && typeof pageConfig === 'object' && !Array.isArray(pageConfig)) {
-          prev[pageKey] = priceKeys.filter((k) => pageConfig[k] === 'true' || pageConfig[k] === true)
+          prev[pageKey] = priceKeys.filter(
+            (k) => pageConfig[k] === 'true' || pageConfig[k] === true
+          )
         } else if (Array.isArray(pageConfig)) {
           prev[pageKey] = pageConfig
         } else {
diff --git a/src/view/member/level.vue b/src/view/member/level.vue
index a49997a..952b71e 100755
--- a/src/view/member/level.vue
+++ b/src/view/member/level.vue
@@ -14,10 +14,7 @@
           <card-setting />
         </el-tab-pane> -->
         <el-tab-pane :label="$t('c5e8d16d.795682')" name="second">
-          <card-level
-            ref="cardLevel"
-            :shuyun-open-platform-enabled="shuyunOpenPlatformEnabled"
-          />
+          <card-level ref="cardLevel" :shuyun-open-platform-enabled="shuyunOpenPlatformEnabled" />
         </el-tab-pane>
         <el-tab-pane :label="$t('c5e8d16d.de2408')" name="thrid">
           <card-viplevel
@@ -109,9 +106,7 @@ export default {
         .then((res) => {
           const d = res.data && res.data.data ? res.data.data : {}
           const ok =
-            d.ok === true ||
-            d.status === true ||
-            (d.ok !== false && d.synced_count != null)
+            d.ok === true || d.status === true || (d.ok !== false && d.synced_count != null)
           if (ok) {
             const n = d.synced_count != null ? d.synced_count : 0
             this.$message.success(this.$t('c5e8d16d.8b6161', [n]))
diff --git a/src/view/member/point/index.vue b/src/view/member/point/index.vue
index 328c2c4..34961b2 100755
--- a/src/view/member/point/index.vue
+++ b/src/view/member/point/index.vue
@@ -30,10 +30,7 @@
           </el-tooltip>
         </el-form-item>
         <div>
-          <el-form-item
-            v-if="showPointGainBlock"
-            :label="$t('031f6b81.c5c99b')"
-          >
+          <el-form-item v-if="showPointGainBlock" :label="$t('031f6b81.c5c99b')">
             <el-radio-group v-model="form.access" @change="changeAccess">
               <el-radio label="order"> {{ $t('031f6b81.4c117f') }} </el-radio>
               <el-radio label="items"> {{ $t('031f6b81.9897d8') }} </el-radio>
@@ -71,10 +68,7 @@
               {{ $t('031f6b81.45f8c7') }}
             </p>
           </el-form-item>
-          <el-form-item
-            v-if="showPointGainBlock"
-            :label="$t('031f6b81.643445')"
-          >
+          <el-form-item v-if="showPointGainBlock" :label="$t('031f6b81.643445')">
             {{ $t('031f6b81.86f31c')
             }}<el-input
               v-model="form.gain_limit"
@@ -86,10 +80,7 @@
             />{{ $t('031f6b81.9f68a8') }}
             <div class="frm-tips">{{ $t('031f6b81.385b7a') }}</div>
           </el-form-item>
-          <el-form-item
-            v-if="showPointGainBlock"
-            :label="$t('031f6b81.d45a0c')"
-          >
+          <el-form-item v-if="showPointGainBlock" :label="$t('031f6b81.d45a0c')">
             {{ $t('031f6b81.c1a80c')
             }}<el-input
               v-model="form.gain_time"
diff --git a/src/view/merchant/store.vue b/src/view/merchant/store.vue
index de5629f..d25beb6 100755
--- a/src/view/merchant/store.vue
+++ b/src/view/merchant/store.vue
@@ -145,6 +145,10 @@ export default {
         value: 1
       })
     }
+    const isCloudStore = this.VERSION_STANDARD()
+    const storeStatusEnableKey = isCloudStore ? '027707af.c8f21a' : '027707af.7854b5'
+    const storeStatusDisableKey = isCloudStore ? '027707af.d9e32b' : '027707af.710ad0'
+    const storeStatusTipKey = isCloudStore ? '027707af.e0f43c' : '027707af.3c751e'
     return {
       form: {
         distribution_type: 0, // 店铺类型： 0=自营；1=加盟
@@ -452,12 +456,7 @@ export default {
                 <el-cascader v-model={value['regions_id']} class='regions' options={district} />
                 <el-input
                   v-model={value['address']}
-                  class={[
-                    'address',
-                    {
-                      'is-error': !value['address']
-                    }
-                  ]}
+                  class='address'
                   placeholder={this.$t('027707af.f375e0')}
                 />
                 <el-input
@@ -469,13 +468,6 @@ export default {
                 </el-button>
               </div>
             )
-          },
-          validator: (rule, value, callback) => {
-            if (!this.form.address) {
-              callback(new Error(this.$t('027707af.a95544')))
-            } else {
-              callback()
-            }
           }
         },
         {
@@ -486,10 +478,10 @@ export default {
           label: this.$t('027707af.6d7cb8'),
           key: 'is_valid',
           type: 'radio',
-          tip: this.$t('027707af.3c751e'),
+          tip: this.$t(storeStatusTipKey),
           options: [
-            { name: this.$t('027707af.7854b5'), label: 'true' },
-            { name: this.$t('027707af.710ad0'), label: 'false' },
+            { name: this.$t(storeStatusEnableKey), label: 'true' },
+            { name: this.$t(storeStatusDisableKey), label: 'false' },
             { name: this.$t('027707af.d2b1c3'), label: 'closed' },
             { name: this.$t('027707af.0044f6'), label: 'delete' }
           ],
@@ -742,13 +734,6 @@ export default {
     if (distributor_type === 'distributor_self' && !distributor_id) {
       this.form.is_delivery = true
     }
-    // 当distributor_self为1时，移除地理位置表单项的validator
-    if (distributor_type === 'distributor_self') {
-      const addressItem = this.formList.find((item) => item.key === 'address')
-      if (addressItem && addressItem.validator) {
-        delete addressItem.validator
-      }
-    }
     console.log(process.env.VUE_APP_LOCAL_DELIVERY_DIRVER)
     if (process.env.VUE_APP_LOCAL_DELIVERY_DIRVER == 'shansong') {
       this.getShansongInfo()
diff --git a/src/views/applications/application-center/shopex-appcenter.vue b/src/views/applications/application-center/shopex-appcenter.vue
index 0779fbc..beb0230 100644
--- a/src/views/applications/application-center/shopex-appcenter.vue
+++ b/src/views/applications/application-center/shopex-appcenter.vue
@@ -4,11 +4,7 @@
 -->
 
 <template>
-  <SpPage
-    v-loading="loading && viewMode !== 'iframe'"
-    class="user-center-page"
-    :no-sticky="true"
-  >
+  <SpPage v-loading="loading && viewMode !== 'iframe'" class="user-center-page" :no-sticky="true">
     <div v-if="viewMode === 'goods'" v-loading="loading" class="appcenter-embed">
       <div class="appcenter-workspace">
         <div class="appcenter-tabs appcenter-tabs--no-user">
@@ -18,10 +14,7 @@
         </div>
 
         <div class="appcenter-tab-panel active">
-          <div
-            v-if="!loading && goodsList.length === 0"
-            class="appcenter-empty"
-          >
+          <div v-if="!loading && goodsList.length === 0" class="appcenter-empty">
             {{ pageInfo.empty_text || '暂无可展示应用' }}
           </div>
           <div v-else class="appcenter-items appcenter-layout-grid">
@@ -39,10 +32,7 @@
                   <span>价格：¥{{ formatPrice(item.goods?.price) }}</span>
                 </div>
               </div>
-              <form
-                class="appcenter-buy-form"
-                @submit.prevent="handleAppClick(item)"
-              >
+              <form class="appcenter-buy-form" @submit.prevent="handleAppClick(item)">
                 <button
                   type="submit"
                   class="appcenter-action"
@@ -218,8 +208,7 @@ export default {
     async fetchAppcenterUrl() {
       const urlResponse = await getAppcenterUrl()
       const urlData = urlResponse?.data?.data
-      const url =
-        (typeof urlData === 'string' ? urlData : '') || urlData?.url || ''
+      const url = (typeof urlData === 'string' ? urlData : '') || urlData?.url || ''
       if (!url) {
         throw new Error('获取应用中心地址失败')
       }
diff --git a/src/views/applications/shuyun/crm-setting.vue b/src/views/applications/shuyun/crm-setting.vue
index 7cb5fc0..1291b46 100644
--- a/src/views/applications/shuyun/crm-setting.vue
+++ b/src/views/applications/shuyun/crm-setting.vue
@@ -101,8 +101,8 @@ export default {
         data.app_id != null && data.app_id !== ''
           ? data.app_id
           : data.app_key != null && data.app_key !== ''
-            ? data.app_key
-            : ''
+          ? data.app_key
+          : ''
       this.form.app_id = id == null ? '' : String(id)
       const masked =
         data.app_secret_masked != null && String(data.app_secret_masked).trim() !== ''
diff --git a/src/views/settings/systemConfig/extMiniLinkDetail.vue b/src/views/settings/systemConfig/extMiniLinkDetail.vue
index 9245a0b..aaa3375 100644
--- a/src/views/settings/systemConfig/extMiniLinkDetail.vue
+++ b/src/views/settings/systemConfig/extMiniLinkDetail.vue
@@ -7,7 +7,6 @@
   <div class="extMiniLinkDetail">
     <el-card class="elCard">
       <div slot="header">
-        <h3>{{ $t('965e5755.f015a4') }}</h3>
         <h5>{{ $t('965e5755.060fc4') }}</h5>
       </div>
       <div class="search">
diff --git a/src/views/settings/systemConfig/payment.vue b/src/views/settings/systemConfig/payment.vue
index 2f58e5a..7f6b04d 100644
--- a/src/views/settings/systemConfig/payment.vue
+++ b/src/views/settings/systemConfig/payment.vue
@@ -259,6 +259,14 @@ export default {
           icon: require('@/assets/pay_logo/paypal.png'),
           enabled: false,
           isShow: true
+        },
+        {
+          name: 'doumen_intl',
+          title: '斗门国际',
+          descriptionKey: '10d92d52.ed7207',
+          icon: '',
+          enabled: false,
+          isShow: true
         }
       ],
 
@@ -269,7 +277,8 @@ export default {
         chinaumspay: {},
         offline_pay: {},
         bspay: {},
-        paypal: {}
+        paypal: {},
+        doumen_intl: {}
       },
       publicKeyDialogForm: {
         rsa_public_key: ''
@@ -340,6 +349,10 @@ export default {
       // PayPal
       return this.getPaypalFormItems()
     },
+    doumenIntlFormItems() {
+      // 斗门国际
+      return this.getDoumenIntlFormItems()
+    },
     accountsSetting() {
       return {
         columns: [
@@ -443,7 +456,8 @@ export default {
         'adapay',
         'offline_pay',
         'bspay',
-        'paypal'
+        'paypal',
+        'doumen_intl'
       ]
 
       for (const payType of paymentTypes) {
@@ -508,7 +522,8 @@ export default {
         chinaumspay: this.getChinaumspayFormItems(),
         offline_pay: this.getOfflineFormItems(),
         bspay: this.getBspayFormItems(),
-        paypal: this.getPaypalFormItems()
+        paypal: this.getPaypalFormItems(),
+        doumen_intl: this.getDoumenIntlFormItems()
       }
 
       return formConfigs[payType] || []
@@ -1059,6 +1074,67 @@ export default {
       ]
     },
 
+    // 斗门国际表单配置
+    getDoumenIntlFormItems() {
+      const formData = this.paymentForms.doumen_intl || {}
+      const maskedSecret = this.isMaskedSecret(formData['X-SecretKey'])
+      return [
+        {
+          fieldName: 'group1',
+          label: '基础配置',
+          component: 'group'
+        },
+        {
+          fieldName: 'X-AccessCode',
+          label: 'X-AccessCode',
+          component: 'input',
+          value: formData['X-AccessCode'] || '',
+          componentProps: {
+            placeholder: '请输入 X-AccessCode',
+            style: 'width: 300px'
+          }
+        },
+        {
+          fieldName: 'X-SecretKey',
+          label: 'X-SecretKey',
+          component: 'input',
+          value: maskedSecret ? '' : formData['X-SecretKey'] || '',
+          componentProps: {
+            type: 'password',
+            placeholder: maskedSecret
+              ? `${formData['X-SecretKey']}（留空则不修改）`
+              : '请输入 X-SecretKey',
+            style: 'width: 300px'
+          }
+        },
+        {
+          fieldName: 'appId',
+          label: 'appId',
+          component: 'input',
+          value: formData.appId || '',
+          componentProps: {
+            placeholder: '请输入 appId',
+            style: 'width: 300px'
+          }
+        },
+        {
+          fieldName: 'return_url',
+          label: 'return_url',
+          component: 'input',
+          formItemClass: 'w-3/4',
+          value: formData.return_url || '',
+          componentProps: {
+            placeholder: '请输入支付完成跳转地址',
+            style: 'width: 600px'
+          }
+        }
+      ]
+    },
+
+    isMaskedSecret(value) {
+      return typeof value === 'string' && value.startsWith('****')
+    },
+
     // PayPal表单配置
     getPaypalFormItems() {
       const formData = this.paymentForms.paypal || {}
@@ -1111,10 +1187,46 @@ export default {
       ]
     },
 
+    isDoumenIntlEnabled() {
+      const doumenItem = this.allPaymentList.find((item) => item.name === 'doumen_intl')
+      return !!(doumenItem && doumenItem.enabled)
+    },
+
     // 处理支付平台开关切换
-    handleTogglePayment(paymentItem) {
+    async handleTogglePayment(paymentItem) {
+      const newEnabled = paymentItem.enabled
+
+      if (newEnabled && paymentItem.name !== 'doumen_intl' && this.isDoumenIntlEnabled()) {
+        this.$message.warning('请先关闭斗门国际收银台')
+        paymentItem.enabled = false
+        return
+      }
+
+      if (newEnabled && paymentItem.name === 'doumen_intl') {
+        try {
+          await this.$confirm(
+            '请确认是否启用斗门国际收银台，启用会默认关闭其他支付方式',
+            '提示',
+            {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }
+          )
+        } catch {
+          paymentItem.enabled = false
+          return
+        }
+      }
+
       this.$set(this.paymentForms[paymentItem.name], 'is_open', paymentItem.enabled)
-      this.savePaymentConfig(paymentItem.name)
+
+      try {
+        await this.savePaymentConfig(paymentItem.name)
+      } catch (error) {
+        paymentItem.enabled = !newEnabled
+        this.$set(this.paymentForms[paymentItem.name], 'is_open', paymentItem.enabled)
+      }
     },
 
     // 强制刷新表单数据
@@ -1127,6 +1239,23 @@ export default {
       await this.savePaymentConfig(payType)
     },
 
+    extractApiErrorMessage(error, fallback) {
+      const data = error?.response?.data
+      if (typeof data === 'string' && data) {
+        return data
+      }
+      if (data?.message) {
+        return data.message
+      }
+      if (data?.error?.message) {
+        return data.error.message
+      }
+      if (error?.message) {
+        return error.message
+      }
+      return fallback
+    },
+
     // 保存支付配置
     async savePaymentConfig(payType) {
       this.loading = true
@@ -1154,12 +1283,33 @@ export default {
           delete params.cert_key_name
           delete params.cert_key_url
         }
+        if (payType === 'doumen_intl') {
+          const secretKey = params['X-SecretKey']
+          if (!secretKey || this.isMaskedSecret(secretKey)) {
+            params['X-SecretKey'] = ''
+          }
+        }
+
+        if (
+          payType !== 'doumen_intl' &&
+          params.is_open === 'true' &&
+          this.isDoumenIntlEnabled()
+        ) {
+          throw new Error('请先关闭斗门国际收银台')
+        }
 
         await this.$api.trade.setPaymentSetting(params)
+
+        if (payType === 'doumen_intl' && params.is_open === 'true') {
+          await this.loadAllPaymentConfigs()
+        }
+
         this.$message.success(this.$t('10d92d52.3b1083'))
       } catch (error) {
-        this.$message.error(this.$t('10d92d52.6de920'))
+        const message = this.extractApiErrorMessage(error, this.$t('10d92d52.6de920'))
+        this.$message.error(message)
         console.error('保存支付配置失败:', error)
+        throw error
       } finally {
         this.loading = false
       }
diff --git a/src/views/settings/systemConfig/wxapp-customer-service.vue b/src/views/settings/systemConfig/wxapp-customer-service.vue
index 3e4cd70..bbf15ee 100644
--- a/src/views/settings/systemConfig/wxapp-customer-service.vue
+++ b/src/views/settings/systemConfig/wxapp-customer-service.vue
@@ -5,24 +5,9 @@
 
 <template>
   <SpPage>
-    <div v-loading="loading" class="container">
+    <div class="container">
       <SpPlatformTip v-if="!VERSION_SHUYUN()" />
 
-      <div class="section-white switch-row">
-        <div class="switch-label">{{ $t('91deb7ee.107a88') }}</div>
-        <el-switch
-          v-model="form.show_float"
-          :active-value="1"
-          :inactive-value="0"
-          :active-text="$t('91deb7ee.cc42dd')"
-          :inactive-text="$t('91deb7ee.b15d91')"
-          active-color="#13ce66"
-          inactive-color="#ccc"
-          @change="onSwitchChange"
-        />
-        <span class="switch-tip">{{ $t('91deb7ee.a87a90') }}</span>
-      </div>
-
       <div class="info">
         <div class="text">
           <img :src="normal" class="img" />
@@ -54,53 +39,16 @@
 </template>
 
 <script>
-import { getWorkWechatConfig, setWorkWechatConfig } from '@/api/wechat'
-
 const normal = require(`@/assets/img/ecshopx/1-Normal.png`)
 const wechat = require(`@/assets/img/ecshopx/kefu.png`)
 export default {
   data() {
     return {
       normal,
-      wechat,
-      loading: false,
-      configData: {},
-      form: {
-        show_float: 0
-      }
+      wechat
     }
   },
-  mounted() {
-    this.getConfig()
-  },
   methods: {
-    getConfig() {
-      this.loading = true
-      getWorkWechatConfig()
-        .then((res) => {
-          console.log(res)
-          const data = res.data?.data || {}
-          this.configData = { ...data }
-          if (typeof data.show_float !== 'undefined') {
-            this.form.show_float = Number(data.show_float) ? 1 : 0
-          }
-        })
-        .finally(() => {
-          this.loading = false
-        })
-    },
-    onSwitchChange(val) {
-      const params = { ...this.configData, show_float: val }
-      setWorkWechatConfig(params)
-        .then(() => {
-          this.configData = { ...params }
-          this.$message({ type: 'success', message: this.$t('91deb7ee.3b1083') })
-        })
-        .catch(() => {
-          this.$message({ type: 'error', message: this.$t('91deb7ee.6de920') })
-          this.form.show_float = val === 1 ? 0 : 1
-        })
-    },
     handleConfig() {
       location.href = 'https://mp.weixin.qq.com/wxamp/wakf'
     }
@@ -114,26 +62,6 @@ export default {
     font-size: 16px;
     color: #3d4355;
   }
-  .switch-row {
-    display: flex;
-    align-items: center;
-    flex-wrap: wrap;
-    gap: 12px;
-    margin-top: 16px;
-    padding: 16px;
-    background: #fff;
-    border: 1px solid #e8e8e8;
-    border-radius: 2px;
-    .switch-label {
-      font-size: 14px;
-      color: #3d4355;
-      font-weight: 500;
-    }
-    .switch-tip {
-      font-size: 12px;
-      color: #909399;
-    }
-  }
   .info {
     height: 60px;
     background: #f2fbff;