refactor: 统一调整多页面的语言包key命名风格
1. 将会员购买卡片页的提示语语言包key从customerService.tip替换为统一命名 2. 修正diy文章组件、取消状态页、积分商品列表页的语言包key大小写和路径问题 3. 统一积分商品列表页的多语言调用路径,简化冗余的key前缀
This commit is contained in:
@@ -90,12 +90,12 @@
|
|||||||
<!-- 查看更多(仅非滚动模式显示) -->
|
<!-- 查看更多(仅非滚动模式显示) -->
|
||||||
<view class="view-more" v-if="viewMore.support && viewMore.control && list.length > 0"
|
<view class="view-more" v-if="viewMore.support && viewMore.control && list.length > 0"
|
||||||
:style="viewMoreStyle" @tap.stop="toListPage">
|
: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" />
|
<uni-icons type="arrowright" size="12" :color="viewMore.color" />
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
<view v-if="list.length === 0 && !loading" class="empty-placeholder">
|
<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>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
<view class="flex-item input-wrap" @tap.stop="search()">
|
<view class="flex-item input-wrap" @tap.stop="search()">
|
||||||
<input class="uni-input" maxlength="50" v-model="keyword" confirm-type="search" @confirm="search()"
|
<input class="uni-input" maxlength="50" v-model="keyword" confirm-type="search" @confirm="search()"
|
||||||
@tap.stop="search()"
|
@tap.stop="search()"
|
||||||
:placeholder="$lang('goods_list.searchPlaceholder')" />
|
:placeholder="$lang('searchPlaceholder')" />
|
||||||
<text class="iconfont icon-sousuo3" @tap.stop="search()"></text>
|
<text class="iconfont icon-sousuo3" @tap.stop="search()"></text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
@@ -14,10 +14,10 @@
|
|||||||
<!-- 排序 -->
|
<!-- 排序 -->
|
||||||
<view class="sort-wrap">
|
<view class="sort-wrap">
|
||||||
<view class="comprehensive-wrap" :class="{ 'color-base-text': order === '' }" @click="sortTabClick('')">
|
<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>
|
||||||
<view class="price-wrap" @click="sortTabClick('point')">
|
<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-wrap">
|
||||||
<view class="iconfont icon-shangsanjiao-copy"
|
<view class="iconfont icon-shangsanjiao-copy"
|
||||||
:class="{ 'color-base-text': priceOrder === 'asc' && order === 'point' }"></view>
|
:class="{ 'color-base-text': priceOrder === 'asc' && order === 'point' }"></view>
|
||||||
@@ -26,7 +26,7 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="price-wrap" @click="sortTabClick('create_time')">
|
<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-wrap">
|
||||||
<view class="iconfont icon-shangsanjiao-copy"
|
<view class="iconfont icon-shangsanjiao-copy"
|
||||||
:class="{ 'color-base-text': priceOrder === 'asc' && order === 'create_time' }"></view>
|
:class="{ 'color-base-text': priceOrder === 'asc' && order === 'create_time' }"></view>
|
||||||
@@ -35,7 +35,7 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view :class="{ 'color-base-text': order === 'screen' }" class="screen-wrap">
|
<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 @click="sortTabClick('screen')" class="iconfont-wrap">
|
||||||
<view class="iconfont icon-shaixuan color-tip"></view>
|
<view class="iconfont icon-shaixuan color-tip"></view>
|
||||||
</view>
|
</view>
|
||||||
@@ -59,7 +59,7 @@
|
|||||||
<view class="lineheight-clear">
|
<view class="lineheight-clear">
|
||||||
<view class="discount-price">
|
<view class="discount-price">
|
||||||
<text class="unit ">{{ item.point }}</text>
|
<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">
|
<block v-if="item.price > 0 && item.pay_type > 0">
|
||||||
<text class="unit font-size-tag">+</text>
|
<text class="unit font-size-tag">+</text>
|
||||||
<text class="unit font-size-tag">{{ $lang('common.currencySymbol')
|
<text class="unit font-size-tag">{{ $lang('common.currencySymbol')
|
||||||
@@ -72,7 +72,7 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="pro-info" v-if="item.stock_show">
|
<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>
|
item.stock }}</view>
|
||||||
<view class="sale font-size-activity-tag color-tip" @click="toDetail(item)">
|
<view class="sale font-size-activity-tag color-tip" @click="toDetail(item)">
|
||||||
<!-- <button type="primary" size="mini">立即兑换</button> -->
|
<!-- <button type="primary" size="mini">立即兑换</button> -->
|
||||||
@@ -83,7 +83,7 @@
|
|||||||
</view>
|
</view>
|
||||||
<view class="empty" v-if="goodsList.length == 0">
|
<view class="empty" v-if="goodsList.length == 0">
|
||||||
<ns-empty :isIndex="false"
|
<ns-empty :isIndex="false"
|
||||||
:text="$lang('goods_list.noGoods')"></ns-empty>
|
:text="$lang('noGoods')"></ns-empty>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</block>
|
</block>
|
||||||
@@ -91,25 +91,25 @@
|
|||||||
|
|
||||||
<!-- 筛选弹出框 -->
|
<!-- 筛选弹出框 -->
|
||||||
<uni-drawer :visible="showScreen" mode="right" @close="showScreen = false" class="screen-wrap">
|
<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>
|
<scroll-view scroll-y>
|
||||||
<!-- 价格筛选项 -->
|
<!-- 价格筛选项 -->
|
||||||
<view class="item-wrap">
|
<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">
|
<view class="price-wrap">
|
||||||
<input class="uni-input" type="digit" v-model="minPoint"
|
<input class="uni-input" type="digit" v-model="minPoint"
|
||||||
:placeholder="$lang('goods_list.minPlaceholder')" />
|
:placeholder="$lang('minPlaceholder')" />
|
||||||
<view class="h-line"></view>
|
<view class="h-line"></view>
|
||||||
<input class="uni-input" type="digit" v-model="maxPoint"
|
<input class="uni-input" type="digit" v-model="maxPoint"
|
||||||
:placeholder="$lang('goods_list.maxPlaceholder')" />
|
:placeholder="$lang('maxPlaceholder')" />
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<!-- 分类筛选项 -->
|
<!-- 分类筛选项 -->
|
||||||
<view class="category-list-wrap">
|
<view class="category-list-wrap">
|
||||||
<text class="first">{{ $lang('goods_list.allCategories') }}</text>
|
<text class="first">{{ $lang('allCategories') }}</text>
|
||||||
<view class="class-box">
|
<view class="class-box">
|
||||||
<view @click="selectedCategory('')" class="list-wrap"><text
|
<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"
|
<view @click="selectedCategory(item.category_id)" v-for="(item, index) in categoryList"
|
||||||
:key="index" class="list-wrap">
|
:key="index" class="list-wrap">
|
||||||
<text
|
<text
|
||||||
@@ -120,8 +120,8 @@
|
|||||||
</view>
|
</view>
|
||||||
</scroll-view>
|
</scroll-view>
|
||||||
<view class="footer" :class="{ 'safe-area': isIphoneX }">
|
<view class="footer" :class="{ 'safe-area': isIphoneX }">
|
||||||
<button type="default" class="footer-box" @click="resetData">{{ $lang('goods_list.reset') }}</button>
|
<button type="default" class="footer-box" @click="resetData">{{ $lang('reset') }}</button>
|
||||||
<button type="primary" class="footer-box1" @click="screenData">{{ $lang('goods_list.confirm') }}</button>
|
<button type="primary" class="footer-box1" @click="screenData">{{ $lang('confirm') }}</button>
|
||||||
</view>
|
</view>
|
||||||
</uni-drawer>
|
</uni-drawer>
|
||||||
|
|
||||||
@@ -283,26 +283,26 @@ export default {
|
|||||||
// }
|
// }
|
||||||
if (!Number(this.maxPoint) && this.maxPoint) {
|
if (!Number(this.maxPoint) && this.maxPoint) {
|
||||||
this.$util.showToast({
|
this.$util.showToast({
|
||||||
title: this.$lang('goods_list.pleaseEnterMaxPrice')
|
title: this.$lang('pleaseEnterMaxPrice')
|
||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (Number(this.minPoint) < 0 || Number(this.maxPoint) < 0) {
|
if (Number(this.minPoint) < 0 || Number(this.maxPoint) < 0) {
|
||||||
this.$util.showToast({
|
this.$util.showToast({
|
||||||
title: this.$lang('goods_list.priceCannotBeLessThanZero')
|
title: this.$lang('priceCannotBeLessThanZero')
|
||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (this.minPoint != '' && Number(this.minPoint) > Number(this.maxPoint) && this.maxPoint) {
|
if (this.minPoint != '' && Number(this.minPoint) > Number(this.maxPoint) && this.maxPoint) {
|
||||||
|
|
||||||
this.$util.showToast({
|
this.$util.showToast({
|
||||||
title: this.$lang('goods_list.minCannotBeGreaterThanMax')
|
title: this.$lang('minCannotBeGreaterThanMax')
|
||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (this.maxPoint != '' && Number(this.maxPoint) < Number(this.minPoint)) {
|
if (this.maxPoint != '' && Number(this.maxPoint) < Number(this.minPoint)) {
|
||||||
this.$util.showToast({
|
this.$util.showToast({
|
||||||
title: this.$lang('goods_list.maxCannotBeLessThanMin')
|
title: this.$lang('maxCannotBeLessThanMin')
|
||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,16 +5,16 @@
|
|||||||
<view class="cancelstatus-box">
|
<view class="cancelstatus-box">
|
||||||
<view class="cancelstatus-box-sort color-base-bg">1</view>
|
<view class="cancelstatus-box-sort color-base-bg">1</view>
|
||||||
<view class="cancelstatus-box-con">
|
<view class="cancelstatus-box-con">
|
||||||
<view class="cancelstatus-box-name">{{ $lang('member.cancelStatus.step1Name') }}</view>
|
<view class="cancelstatus-box-name">{{ $lang('member.cancelstatus.step1Name') }}</view>
|
||||||
<view class="cancelstatus-box-info">{{ $lang('member.cancelStatus.step1Desc') }}</view>
|
<view class="cancelstatus-box-info">{{ $lang('member.cancelstatus.step1Desc') }}</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="cancelstatus-box-line color-base-bg"></view>
|
<view class="cancelstatus-box-line color-base-bg"></view>
|
||||||
</view>
|
</view>
|
||||||
<view class="cancelstatus-box">
|
<view class="cancelstatus-box">
|
||||||
<view class="cancelstatus-box-sort color-base-bg">2</view>
|
<view class="cancelstatus-box-sort color-base-bg">2</view>
|
||||||
<view class="cancelstatus-box-con">
|
<view class="cancelstatus-box-con">
|
||||||
<view class="cancelstatus-box-name">{{ $lang('member.cancelStatus.step2Name') }}</view>
|
<view class="cancelstatus-box-name">{{ $lang('member.cancelstatus.step2Name') }}</view>
|
||||||
<view class="cancelstatus-box-info">{{ $lang('member.cancelStatus.step2Desc') }}</view>
|
<view class="cancelstatus-box-info">{{ $lang('member.cancelstatus.step2Desc') }}</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="cancelstatus-box-line color-base-bg" :class="{ 'opacity-4': state == 0 }"></view>
|
<view class="cancelstatus-box-line color-base-bg" :class="{ 'opacity-4': state == 0 }"></view>
|
||||||
</view>
|
</view>
|
||||||
@@ -23,14 +23,14 @@
|
|||||||
3
|
3
|
||||||
</view>
|
</view>
|
||||||
<view class="cancelstatus-box-con">
|
<view class="cancelstatus-box-con">
|
||||||
<view class="cancelstatus-box-name">{{ $lang('member.cancelStatus.step3Name') }}</view>
|
<view class="cancelstatus-box-name">{{ $lang('member.cancelstatus.step3Name') }}</view>
|
||||||
<view class="cancelstatus-box-info">{{ $lang('member.cancelStatus.step3Desc') }}</view>
|
<view class="cancelstatus-box-info">{{ $lang('member.cancelstatus.step3Desc') }}</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="cancelstatus-btn" v-if="state == 0">
|
<view class="cancelstatus-btn" v-if="state == 0">
|
||||||
<button type="primary" @click="back">{{ $lang('member.cancelStatus.back') }}</button>
|
<button type="primary" @click="back">{{ $lang('member.cancelstatus.back') }}</button>
|
||||||
<button class="color-base-bg" @click="revoke">{{ $lang('member.cancelStatus.revokeApplication') }}</button>
|
<button class="color-base-bg" @click="revoke">{{ $lang('member.cancelstatus.revokeApplication') }}</button>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
@@ -81,8 +81,8 @@
|
|||||||
},
|
},
|
||||||
revoke() {
|
revoke() {
|
||||||
uni.showModal({
|
uni.showModal({
|
||||||
title: this.$lang('member.cancelStatus.riskTip'),
|
title: this.$lang('member.cancelstatus.riskTip'),
|
||||||
content: this.$lang('member.cancelStatus.revokeConfirm'),
|
content: this.$lang('member.cancelstatus.revokeConfirm'),
|
||||||
confirmColor: '#000000',
|
confirmColor: '#000000',
|
||||||
success: res => {
|
success: res => {
|
||||||
if (res.confirm) {
|
if (res.confirm) {
|
||||||
|
|||||||
@@ -350,7 +350,7 @@ export default {
|
|||||||
create() {
|
create() {
|
||||||
if (this.memberInfo.member_level_type && this.memberInfo.member_level != this.currCard.level_id) {
|
if (this.memberInfo.member_level_type && this.memberInfo.member_level != this.currCard.level_id) {
|
||||||
uni.showModal({
|
uni.showModal({
|
||||||
title: this.$lang('common.tip'),
|
title: this.$lang('customerService.tip'),
|
||||||
content: this.$lang('cardOverrideConfirm'),
|
content: this.$lang('cardOverrideConfirm'),
|
||||||
success: res => {
|
success: res => {
|
||||||
if (res.confirm) {
|
if (res.confirm) {
|
||||||
|
|||||||
Reference in New Issue
Block a user