From d0afa5fcb27512a16d845c3e280ba7697af6c2be Mon Sep 17 00:00:00 2001 From: lukaijie Date: Sat, 18 Jul 2026 14:49:11 +0800 Subject: [PATCH] [TBID:ECX-9355] chore: merge master changes for release --- .gitignore | 3 + src/i18n/lang/index.json | 163 ++------------------- src/layout/basic/layout-sidebar.vue | 2 +- src/view/mall/trade/shipping/templates.vue | 11 ++ 4 files changed, 29 insertions(+), 150 deletions(-) diff --git a/.gitignore b/.gitignore index ca3b065..fbe6872 100755 --- a/.gitignore +++ b/.gitignore @@ -20,9 +20,12 @@ release.* .npm-cache/_update-notifier-last-checked AGENTS.md openspec/ +openwiki/ dist/ .cursor/commit-summary/ .codegraph/ .cursor/skills/ +CLAUDE.md +.github .understand-anything \ No newline at end of file diff --git a/src/i18n/lang/index.json b/src/i18n/lang/index.json index f1f7b80..c611736 100644 --- a/src/i18n/lang/index.json +++ b/src/i18n/lang/index.json @@ -50687,11 +50687,6 @@ "ar": "", "zh-tw": "酷家樂案例庫" }, - "trsuf36": { - "zh-cn": "酷家乐案例库", - "en": "", - "ar": "" - }, "l8tmwvg": { "zh-cn": "请从左侧选择一个角色进行权限配置", "en": "", @@ -50704,11 +50699,6 @@ "ar": "", "zh-tw": "酷家樂實例" }, - "cey9325": { - "zh-cn": "酷家乐实例", - "en": "", - "ar": "" - }, "jprn7b6": { "zh-cn": "暂无权限数据", "en": "", @@ -50721,11 +50711,6 @@ "ar": "", "zh-tw": "酷家樂實例庫" }, - "tpy2fp6": { - "zh-cn": "酷家乐实例库", - "en": "", - "ar": "" - }, "paeh8nu": { "zh-cn": "当前角色的权限有未保存的更改，是否要放弃更改并选择其他角色？", "en": "", @@ -50738,11 +50723,6 @@ "ar": "", "zh-tw": "註冊導購:" }, - "abaiyt5": { - "zh-cn": "注册导购:", - "en": "", - "ar": "" - }, "d64c964": { "zh-cn": "放弃更改", "en": "", @@ -50755,11 +50735,6 @@ "ar": "", "zh-tw": "輸入導購手機號" }, - "dwa5vp7": { - "zh-cn": "输入导购手机号", - "en": "", - "ar": "" - }, "nb1hl46": { "zh-cn": "权限更新成功", "en": "", @@ -51036,8 +51011,8 @@ "ar": "", "zh-tw": "關聯成功" }, - "qdzb90h": { - "zh-cn": "该挂件与其他挂件互斥，无法同时添加", + "quba4h6": { + "zh-cn": "选择人群标签", "en": "", "ar": "", "zh-tw": "導航欄樣式" @@ -51048,14 +51023,14 @@ "ar": "", "zh-tw": "組件樣式" }, - "w77rwf6": { - "zh-cn": "优惠券状态：", + "3i94tc5": { + "zh-cn": "标签名称:", "en": "", "ar": "", "zh-tw": "邊距" }, - "xbx4055": { - "zh-cn": "优惠券状态", + "3v3iuw5": { + "zh-cn": "标签ID:", "en": "", "ar": "", "zh-tw": "組件內樣式" @@ -51066,8 +51041,8 @@ "ar": "", "zh-tw": "導航項區域設置" }, - "e73jd3": { - "zh-cn": "已失效", + "t8ceyb6": { + "zh-cn": "选择拼团活动", "en": "", "ar": "", "zh-tw": "人群設置" @@ -51816,20 +51791,20 @@ "ar": "", "zh-tw": "沒有搜索歷史" }, - "esqmb4": { - "zh-cn": " 平台 ", + "jdbtvp4": { + "zh-cn": "集合名称", "en": "", "ar": "", "zh-tw": "已售罄" }, - "pgihgd7": { - "zh-cn": " 发放优惠券 ", + "uig1vz6": { + "zh-cn": "选择活动集合", "en": "", "ar": "", "zh-tw": "文字顏色" }, - "4g6jqn6": { - "zh-cn": " 更换店铺 ", + "juxi1n7": { + "zh-cn": "请输入榜单名称", "en": "", "ar": "", "zh-tw": "按鈕圖" @@ -53754,116 +53729,6 @@ "ar": "", "zh-tw": " 鎖定縱橫比 " }, - "fr3hll9": { - "zh-cn": " 应退商品金额: ", - "en": "", - "ar": "" - }, - "cgbbxg9": { - "zh-cn": " 应退商品积分: ", - "en": "", - "ar": "" - }, - "qz3m3jc": { - "zh-cn": " 退款运费金额（¥）: ", - "en": "", - "ar": "" - }, - "j3ge53b": { - "zh-cn": " 退款运费（积分）: ", - "en": "", - "ar": "" - }, - "mljqs59": { - "zh-cn": " 退款商品金额: ", - "en": "", - "ar": "" - }, - "pwbwga9": { - "zh-cn": " 退款商品积分: ", - "en": "", - "ar": "" - }, - "piiw6p9": { - "zh-cn": " 实退商品金额: ", - "en": "", - "ar": "" - }, - "stb1uu9": { - "zh-cn": " 实退商品积分: ", - "en": "", - "ar": "" - }, - "pk9fjbc": { - "zh-cn": " > 生效，有效天数  ", - "en": "", - "ar": "" - }, - "rr2i50i": { - "zh-cn": " 按单个导购发放的用户领取数量限制 ", - "en": "", - "ar": "" - }, - "tuk3b66": { - "zh-cn": " 添加榜单 ", - "en": "", - "ar": "" - }, - "6nmw7d6": { - "zh-cn": " 创建人群 ", - "en": "", - "ar": "" - }, - "fxetgh5": { - "zh-cn": "客户数: ", - "en": "", - "ar": "" - }, - "gbe2": { - "zh-cn": " 人", - "en": "", - "ar": "" - }, - "vlgmxv7": { - "zh-cn": " 新建标签组 ", - "en": "", - "ar": "" - }, - "c6xrb47": { - "zh-cn": " - 角色权限", - "en": "", - "ar": "" - }, - "xsg1xx6": { - "zh-cn": "保存失败: ", - "en": "", - "ar": "" - }, - "c73xz3": { - "zh-cn": "使用 ", - "en": "", - "ar": "" - }, - "l4l5b0l": { - "zh-cn": " 拖拽或点击后粘贴图片（仅支持单张图片） ", - "en": "", - "ar": "" - }, - "antbyu5": { - "zh-cn": " 上一张 ", - "en": "", - "ar": "" - }, - "antyyd5": { - "zh-cn": " 下一张 ", - "en": "", - "ar": "" - }, - "aplgxm7": { - "zh-cn": " 锁定纵横比 ", - "en": "", - "ar": "" - }, "a3xlub5": { "zh-cn": "有效期至 ", "en": "", diff --git a/src/layout/basic/layout-sidebar.vue b/src/layout/basic/layout-sidebar.vue index 06e5b07..d14ba74 100755 --- a/src/layout/basic/layout-sidebar.vue +++ b/src/layout/basic/layout-sidebar.vue @@ -66,7 +66,7 @@ {{ menuDisplayName(item) }}{{ item.name }} diff --git a/src/view/mall/trade/shipping/templates.vue b/src/view/mall/trade/shipping/templates.vue index 3587eb4..95f7a3b 100755 --- a/src/view/mall/trade/shipping/templates.vue +++ b/src/view/mall/trade/shipping/templates.vue @@ -102,6 +102,17 @@ export default { const refName = refMap[this.activeName] return refName ? this.$refs[refName] : null }, + getActiveTabRef() { + const refMap = { + first: 'buyerTemplates', + second: 'weightTemplates', + third: 'numberTemplates', + fourth: 'priceTemplates', + fifth: 'volumeTemplates' + } + const refName = refMap[this.activeName] + return refName ? this.$refs[refName] : null + }, getList() { const ref = this.getActiveTabRef() if (ref && typeof ref.getShippingTemplatesList === 'function') {