From c3956f7bcde2d616fb9ba9ce048772b424bcd2af Mon Sep 17 00:00:00 2001
From: ZF sun <34314687@qq.com>
Date: Mon, 29 Jun 2026 13:57:30 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=BB=9F=E4=B8=80=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=A4=9A=E9=A1=B5=E9=9D=A2=E7=9A=84=E8=AF=AD=E8=A8=80?=
 =?UTF-8?q?=E5=8C=85key=E5=91=BD=E5=90=8D=E9=A3=8E=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 将会员购买卡片页的提示语语言包key从customerService.tip替换为统一命名
2. 修正diy文章组件、取消状态页、积分商品列表页的语言包key大小写和路径问题
3. 统一积分商品列表页的多语言调用路径，简化冗余的key前缀
---
 components-diy/diy-article.vue       |  4 +--
 pages_promotion/point/goods_list.vue | 40 ++++++++++++++--------------
 pages_tool/member/cancelstatus.vue   | 20 +++++++-------
 pages_tool/member/card_buy.vue       |  2 +-
 4 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/components-diy/diy-article.vue b/components-diy/diy-article.vue
index e856fac..e2594fa 100644
--- a/components-diy/diy-article.vue
+++ b/components-diy/diy-article.vue
@@ -90,12 +90,12 @@
 					<!-- 查看更多(仅非滚动模式显示) -->
 					<view class="view-more" v-if="viewMore.support && viewMore.control && list.length > 0"
 						:style="viewMoreStyle" @tap.stop="toListPage">
-						<text>{{ viewMore.text || $lang('components-diy.diy-article.viewMore') }}</text>
+						<text>{{ viewMore.text || $lang('components-diy.diyArticle.viewMore') }}</text>
 						<uni-icons type="arrowright" size="12" :color="viewMore.color" />
 					</view>
 				</template>
 				<view v-if="list.length === 0 && !loading" class="empty-placeholder">
-					<text class="empty-text">{{ $lang('components-diy.diy-article.noArticles') }}</text>
+					<text class="empty-text">{{ $lang('components-diy.diyArticle.noArticles') }}</text>
 				</view>
 			</view>
 		</view>
diff --git a/pages_promotion/point/goods_list.vue b/pages_promotion/point/goods_list.vue
index 36beb76..3ea89ca 100644
--- a/pages_promotion/point/goods_list.vue
+++ b/pages_promotion/point/goods_list.vue
@@ -6,7 +6,7 @@
 				<view class="flex-item input-wrap" @tap.stop="search()">
 					<input class="uni-input" maxlength="50" v-model="keyword" confirm-type="search" @confirm="search()"
 						@tap.stop="search()"
-						:placeholder="$lang('goods_list.searchPlaceholder')" />
+						:placeholder="$lang('searchPlaceholder')" />
 					<text class="iconfont icon-sousuo3" @tap.stop="search()"></text>
 				</view>
 			</view>
@@ -14,10 +14,10 @@
 			<!-- 排序 -->
 			<view class="sort-wrap">
 				<view class="comprehensive-wrap" :class="{ 'color-base-text': order === '' }" @click="sortTabClick('')">
-					<text :class="{ 'color-base-text': order === '' }">{{ $lang('goods_list.comprehensive') }}</text>
+					<text :class="{ 'color-base-text': order === '' }">{{ $lang('comprehensive') }}</text>
 				</view>
 				<view class="price-wrap" @click="sortTabClick('point')">
-					<text :class="{ 'color-base-text': order === 'point' }">{{ $lang('goods_list.points') }}</text>
+					<text :class="{ 'color-base-text': order === 'point' }">{{ $lang('points') }}</text>
 					<view class="iconfont-wrap">
 						<view class="iconfont icon-shangsanjiao-copy"
 							:class="{ 'color-base-text': priceOrder === 'asc' && order === 'point' }"></view>
@@ -26,7 +26,7 @@
 					</view>
 				</view>
 				<view class="price-wrap" @click="sortTabClick('create_time')">
-					<text :class="{ 'color-base-text': order === 'create_time' }">{{ $lang('goods_list.newArrival') }}</text>
+					<text :class="{ 'color-base-text': order === 'create_time' }">{{ $lang('newArrival') }}</text>
 					<view class="iconfont-wrap">
 						<view class="iconfont icon-shangsanjiao-copy"
 							:class="{ 'color-base-text': priceOrder === 'asc' && order === 'create_time' }"></view>
@@ -35,7 +35,7 @@
 					</view>
 				</view>
 				<view :class="{ 'color-base-text': order === 'screen' }" class="screen-wrap">
-					<text @click="sortTabClick('screen')">{{ $lang('goods_list.filter') }}</text>
+					<text @click="sortTabClick('screen')">{{ $lang('filter') }}</text>
 					<view @click="sortTabClick('screen')" class="iconfont-wrap">
 						<view class="iconfont icon-shaixuan color-tip"></view>
 					</view>
@@ -59,7 +59,7 @@
 								<view class="lineheight-clear">
 									<view class="discount-price">
 										<text class="unit ">{{ item.point }}</text>
-										<text class="unit  font-size-tag">{{ $lang('goods_list.points') }}</text>
+										<text class="unit  font-size-tag">{{ $lang('points') }}</text>
 										<block v-if="item.price > 0 && item.pay_type > 0">
 											<text class="unit  font-size-tag">+</text>
 											<text class="unit  font-size-tag">{{ $lang('common.currencySymbol')
@@ -72,7 +72,7 @@
 									</view>
 								</view>
 								<view class="pro-info" v-if="item.stock_show">
-									<view class="font-size-activity-tag color-tip">{{ $lang('goods_list.stock') }}{{
+									<view class="font-size-activity-tag color-tip">{{ $lang('stock') }}{{
 										item.stock }}</view>
 									<view class="sale font-size-activity-tag color-tip" @click="toDetail(item)">
 										<!-- <button type="primary" size="mini">立即兑换</button> -->
@@ -83,7 +83,7 @@
 					</view>
 					<view class="empty" v-if="goodsList.length == 0">
 						<ns-empty :isIndex="false"
-							:text="$lang('goods_list.noGoods')"></ns-empty>
+							:text="$lang('noGoods')"></ns-empty>
 					</view>
 				</view>
 			</block>
@@ -91,25 +91,25 @@
 
 		<!-- 筛选弹出框 -->
 		<uni-drawer :visible="showScreen" mode="right" @close="showScreen = false" class="screen-wrap">
-			<view class="title color-tip">{{ $lang('goods_list.filter') }}</view>
+			<view class="title color-tip">{{ $lang('filter') }}</view>
 			<scroll-view scroll-y>
 				<!-- 价格筛选项 -->
 				<view class="item-wrap">
-					<view class="label"><text>{{ $lang('goods_list.pointRange') }}</text></view>
+					<view class="label"><text>{{ $lang('pointRange') }}</text></view>
 					<view class="price-wrap">
 						<input class="uni-input" type="digit" v-model="minPoint"
-							:placeholder="$lang('goods_list.minPlaceholder')" />
+							:placeholder="$lang('minPlaceholder')" />
 						<view class="h-line"></view>
 						<input class="uni-input" type="digit" v-model="maxPoint"
-							:placeholder="$lang('goods_list.maxPlaceholder')" />
+							:placeholder="$lang('maxPlaceholder')" />
 					</view>
 				</view>
 				<!-- 分类筛选项 -->
 				<view class="category-list-wrap">
-					<text class="first">{{ $lang('goods_list.allCategories') }}</text>
+					<text class="first">{{ $lang('allCategories') }}</text>
 					<view class="class-box">
 						<view @click="selectedCategory('')" class="list-wrap"><text
-								:class="{ selected: !categoryId, 'color-base-text': !categoryId }">{{ $lang('goods_list.all') }}</text></view>
+								:class="{ selected: !categoryId, 'color-base-text': !categoryId }">{{ $lang('all') }}</text></view>
 						<view @click="selectedCategory(item.category_id)" v-for="(item, index) in categoryList"
 							:key="index" class="list-wrap">
 							<text
@@ -120,8 +120,8 @@
 				</view>
 			</scroll-view>
 			<view class="footer" :class="{ 'safe-area': isIphoneX }">
-				<button type="default" class="footer-box" @click="resetData">{{ $lang('goods_list.reset') }}</button>
-				<button type="primary" class="footer-box1" @click="screenData">{{ $lang('goods_list.confirm') }}</button>
+				<button type="default" class="footer-box" @click="resetData">{{ $lang('reset') }}</button>
+				<button type="primary" class="footer-box1" @click="screenData">{{ $lang('confirm') }}</button>
 			</view>
 		</uni-drawer>
 
@@ -283,26 +283,26 @@ export default {
 				// }
 				if (!Number(this.maxPoint) && this.maxPoint) {
 					this.$util.showToast({
-						title: this.$lang('goods_list.pleaseEnterMaxPrice')
+						title: this.$lang('pleaseEnterMaxPrice')
 					});
 					return;
 				}
 				if (Number(this.minPoint) < 0 || Number(this.maxPoint) < 0) {
 					this.$util.showToast({
-						title: this.$lang('goods_list.priceCannotBeLessThanZero')
+						title: this.$lang('priceCannotBeLessThanZero')
 					});
 					return;
 				}
 				if (this.minPoint != '' && Number(this.minPoint) > Number(this.maxPoint) && this.maxPoint) {
 
 					this.$util.showToast({
-						title: this.$lang('goods_list.minCannotBeGreaterThanMax')
+						title: this.$lang('minCannotBeGreaterThanMax')
 					});
 					return;
 				}
 				if (this.maxPoint != '' && Number(this.maxPoint) < Number(this.minPoint)) {
 					this.$util.showToast({
-						title: this.$lang('goods_list.maxCannotBeLessThanMin')
+						title: this.$lang('maxCannotBeLessThanMin')
 					});
 					return;
 				}
diff --git a/pages_tool/member/cancelstatus.vue b/pages_tool/member/cancelstatus.vue
index 4695bcb..425f372 100644
--- a/pages_tool/member/cancelstatus.vue
+++ b/pages_tool/member/cancelstatus.vue
@@ -5,16 +5,16 @@
 				<view class="cancelstatus-box">
 					<view class="cancelstatus-box-sort color-base-bg">1</view>
 					<view class="cancelstatus-box-con">
-						<view class="cancelstatus-box-name">{{ $lang('member.cancelStatus.step1Name') }}</view>
-						<view class="cancelstatus-box-info">{{ $lang('member.cancelStatus.step1Desc') }}</view>
+						<view class="cancelstatus-box-name">{{ $lang('member.cancelstatus.step1Name') }}</view>
+					<view class="cancelstatus-box-info">{{ $lang('member.cancelstatus.step1Desc') }}</view>
 					</view>
 					<view class="cancelstatus-box-line color-base-bg"></view>
 				</view>
 				<view class="cancelstatus-box">
 					<view class="cancelstatus-box-sort color-base-bg">2</view>
 					<view class="cancelstatus-box-con">
-						<view class="cancelstatus-box-name">{{ $lang('member.cancelStatus.step2Name') }}</view>
-						<view class="cancelstatus-box-info">{{ $lang('member.cancelStatus.step2Desc') }}</view>
+						<view class="cancelstatus-box-name">{{ $lang('member.cancelstatus.step2Name') }}</view>
+					<view class="cancelstatus-box-info">{{ $lang('member.cancelstatus.step2Desc') }}</view>
 					</view>
 					<view class="cancelstatus-box-line color-base-bg" :class="{ 'opacity-4': state == 0 }"></view>
 				</view>
@@ -23,14 +23,14 @@
 						3
 					</view>
 					<view class="cancelstatus-box-con">
-						<view class="cancelstatus-box-name">{{ $lang('member.cancelStatus.step3Name') }}</view>
-						<view class="cancelstatus-box-info">{{ $lang('member.cancelStatus.step3Desc') }}</view>
+						<view class="cancelstatus-box-name">{{ $lang('member.cancelstatus.step3Name') }}</view>
+					<view class="cancelstatus-box-info">{{ $lang('member.cancelstatus.step3Desc') }}</view>
 					</view>
 				</view>
 			</view>
 			<view class="cancelstatus-btn" v-if="state == 0">
-				<button type="primary" @click="back">{{ $lang('member.cancelStatus.back') }}</button>
-				<button class="color-base-bg" @click="revoke">{{ $lang('member.cancelStatus.revokeApplication') }}</button>
+				<button type="primary" @click="back">{{ $lang('member.cancelstatus.back') }}</button>
+				<button class="color-base-bg" @click="revoke">{{ $lang('member.cancelstatus.revokeApplication') }}</button>
 			</view>
 		</view>
 	</view>
@@ -81,8 +81,8 @@
 			},
 			revoke() {
 				uni.showModal({
-					title: this.$lang('member.cancelStatus.riskTip'),
-					content: this.$lang('member.cancelStatus.revokeConfirm'),
+					title: this.$lang('member.cancelstatus.riskTip'),
+					content: this.$lang('member.cancelstatus.revokeConfirm'),
 					confirmColor: '#000000',
 					success: res => {
 						if (res.confirm) {
diff --git a/pages_tool/member/card_buy.vue b/pages_tool/member/card_buy.vue
index 56c2e8f..f29ed12 100644
--- a/pages_tool/member/card_buy.vue
+++ b/pages_tool/member/card_buy.vue
@@ -350,7 +350,7 @@ export default {
 		create() {
 			if (this.memberInfo.member_level_type && this.memberInfo.member_level != this.currCard.level_id) {
 				uni.showModal({
-					title: this.$lang('common.tip'),
+					title: this.$lang('customerService.tip'),
 					content: this.$lang('cardOverrideConfirm'),
 					success: res => {
 						if (res.confirm) {