Skip to content

J
jiedao-app-customer-new-master
Commit 48d635b6 authored by lizhan's avatar lizhan
Browse files
Options

📝 【TASK-20240815-02】TASK:语言信息补充完善

parent 4273bf12
Show whitespace changes
Inline Side-by-side
Showing with 210 additions and 78 deletions
src/pages/activity_detail/activity_detail.vue
View file @ 48d635b6
<template>
<view class="activity_detail">
<dHeader :title="'活动详情'"></dHeader>
<dHeader :title="detail.activity"></dHeader>
<view class="container">
<view class="img-box">
<image
class="img"
:src="locale === 'zh' ? detail.coverImageZh : detail.coverImageEn"
:src="locale === 'zh' ? detailInfo.coverImageZh : detailInfo.coverImageEn"
></image>
</view>
<view class="container-main">
<view class="activity-title">{{ locale === 'zh' ? detail.titleZh : detail.titleEn }}</view>
<view class="activity-remark" v-if="detail.extraRecommend">
<view class="activity-title">{{
locale === 'zh' ? detailInfo.titleZh : detailInfo.titleEn
}}</view>
<view class="activity-remark" v-if="detailInfo.extraRecommend">
{{
locale === 'zh'
? detail.extraRecommend.shareContentZh
: detail.extraRecommend.shareContentEn
? detailInfo.extraRecommend.shareContentZh
: detailInfo.extraRecommend.shareContentEn
}}
</view>
<view class="activity-cell">
<view class="cell-label">积分说明</view>
<view class="cell-label">{{ detail.illustrate }}</view>
<view class="cell-content">
<image class="cell-image" src="../../static/img/score_b.png"></image>
<view class="cell-text">{{ detail.getScoreOnce }}</view>
<view class="cell-text">{{ detailInfo.getScoreOnce }}</view>
</view>
</view>
<view class="activity-cell">
<view class="cell-label">累计最高积分</view>
<view class="cell-label">{{ detail.maxIntegral }}</view>
<view class="cell-content">
<image class="cell-image" src="../../static/img/score_b.png"></image>
<view class="cell-text">{{ detail.maxScoreTotal }}</view>
<view class="cell-text">{{ detailInfo.maxScoreTotal }}</view>
</view>
</view>
<view class="activity-cell">
<view class="cell-label">有效期</view>
<view class="cell-content"> {{ getTimeRange(detail.startTime, detail.endTime) }} </view>
<view class="cell-label">{{ detail.date }}</view>
<view class="cell-content">
{{ getTimeRange(detailInfo.startTime, detailInfo.endTime) }}
</view>
</view>
<view class="activity-cell">
<view class="cell-label">规则说明</view>
<view class="cell-content"> {{ locale === 'zh' ? detail.descZh : detail.descEn }} </view>
<view class="cell-label">{{ detail.rulesIllustrate }}</view>
<view class="cell-content">
{{ locale === 'zh' ? detailInfo.descZh : detailInfo.descEn }}
</view>
</view>
</view>
</view>
......@@ -53,7 +59,7 @@ export default {
data() {
return {
id: null,
detail: {}
detailInfo: {}
}
},
onLoad(route) {
......@@ -64,6 +70,9 @@ export default {
computed: {
locale() {
return this.$lang.locale
},
detail() {
return this.$lang.lang.detail
}
},
methods: {
......@@ -73,7 +82,7 @@ export default {
.post('/app-api/member/score-rule/get', { id: this.id })
.then(({ code, data }) => {
if (code === 0 && data) {
this.detail = data
this.detailInfo = data
}
})
},
......
src/pages/exchange_detail/exchange_detail.vue
View file @ 48d635b6
<template>
<view class="exchange_detail">
<dHeader :title="'兑换详情'"></dHeader>
<dHeader :title="detail.exchangeTitle"></dHeader>
<div class="container">
<div class="header">
<div class="header-image">
......@@ -8,72 +8,77 @@
</div>
<div class="header-content">
<div class="header-content-title">
{{ locale === 'zh' ? detail.statusZh : detail.statusEn }}
{{ locale === 'zh' ? detailInfo.statusZh : detailInfo.statusEn }}
</div>
<div class="header-content-text">
<view class="header-content-small">共计</view>{{ detail.totalCount }}积分
<view class="header-content-small">{{ detail.total }}</view
>{{ detailInfo.totalCount }}{{ detail.integral }}
</div>
</div>
</div>
<div class="nav">
<div class="nav-image">
<image class="img" :src="locale === 'zh' ? detail.imgZh : detail.imgEn"></image>
<image class="img" :src="locale === 'zh' ? detailInfo.imgZh : detailInfo.imgEn"></image>
</div>
<div class="nav-content">
<div class="nav-content-text">
{{ locale === 'zh' ? detail.rewardTitleZh : detail.rewardTitleEn }}
{{ locale === 'zh' ? detailInfo.rewardTitleZh : detailInfo.rewardTitleEn }}
</div>
<div class="nav-content-tag">
<div class="tag-image">
<image class="img" src="../../static/img/score_b.png"></image
>{{ detail.oncePointsRequire }}
>{{ detailInfo.oncePointsRequire }}
</div>
<view class="tag-text">共{{ detail.rewardCount }}件</view>
<view class="tag-text">
{{ detail.num(detailInfo.rewardCount) }}
</view>
</div>
</div>
</div>
<div class="main">
<div class="main-cell">
<div class="cell-label">活动时间</div>
<div class="cell-content">{{ getTimeRange(detail.startTime, detail.endTime) }}</div>
<div class="cell-label">{{ detail.activityTime }}</div>
<div class="cell-content">
{{ getTimeRange(detailInfo.startTime, detailInfo.endTime) }}
</div>
</div>
<div class="main-cell">
<div class="cell-label">活动网点</div>
<div class="cell-label">{{ detail.exchangeOutlets }}</div>
<div class="cell-content">
{{ locale === 'zh' ? detail.nodeTitleZh : detail.nodeTitleEn }}
{{ locale === 'zh' ? detailInfo.nodeTitleZh : detailInfo.nodeTitleEn }}
</div>
</div>
<div class="main-cell">
<div class="cell-label">兑换方式</div>
<div class="cell-label">{{ detail.exchangeType }}</div>
<div class="cell-content">
{{ locale === 'zh' ? detail.redeemTypeZh : detail.redeemTypeEn }}
{{ locale === 'zh' ? detailInfo.redeemTypeZh : detailInfo.redeemTypeEn }}
</div>
</div>
<template v-if="detail.redeemType != 1">
<template v-if="detailInfo.redeemType != 1">
<div class="main-cell">
<div class="cell-label">收货地址</div>
<div class="cell-label">{{ detail.address }}</div>
<div class="cell-content">
{{ detail.recipientName }}&ensp;+{{ detail.recipientPhoneNum }},
{{ detail.recipientAddress }}
<view class="red">地址提交后无法修改，如需修改地址请联系客服</view>
{{ detailInfo.recipientName }}&ensp;+{{ detailInfo.recipientPhoneNum }},
{{ detailInfo.recipientAddress }}
<view class="red">{{ detail.errorMsg }}</view>
</div>
</div>
<div class="main-cell">
<div class="cell-label">快递单号</div>
<div class="cell-content">{{ detail.expressNo }}</div>
<div class="cell-label">{{ detail.courierNum }}</div>
<div class="cell-content">{{ detailInfo.expressNo }}</div>
</div>
<div class="main-cell">
<div class="cell-label">快递公司</div>
<div class="cell-content">{{ detail.courierCompanyName }}</div>
<div class="cell-label">{{ detail.courierCompany }}</div>
<div class="cell-content">{{ detailInfo.courierCompanyName }}</div>
</div>
<div class="main-cell">
<div class="cell-label">快递日期</div>
<div class="cell-content">{{ formatDate(detail.expressDate) }}</div>
<div class="cell-label">{{ detail.courierTime }}</div>
<div class="cell-content">{{ formatDate(detailInfo.expressDate) }}</div>
</div>
</template>
<div class="main-cell">
<div class="cell-label">备注</div>
<div class="cell-content">{{ detail.remark }}</div>
<div class="cell-label">{{ detail.remark }}</div>
<div class="cell-content">{{ detailInfo.remark }}</div>
</div>
</div>
</div>
......@@ -89,7 +94,7 @@ export default {
data() {
return {
id: null,
detail: {}
detailInfo: {}
}
},
onLoad(route) {
......@@ -100,6 +105,9 @@ export default {
computed: {
locale() {
return this.$lang.locale
},
detail() {
return this.$lang.lang.detail
}
},
methods: {
......@@ -111,7 +119,7 @@ export default {
})
.then(({ code, data }) => {
if (code == 0 && data) {
this.detail = data
this.detailInfo = data
}
})
.catch((error) => {
......
src/pages/integral/components/gift.vue
View file @ 48d635b6
<template>
<view class="gift">
<view class="gift-remark">不同网点兑换积分不同</view>
<view class="gift-remark">{{ $lang.lang.integral.pointsRemark }}</view>
<view class="gift-select">
<view class="select-list">
<view class="list-item" v-for="(item, index) in netList" :key="index"
......@@ -17,7 +17,7 @@
@change="bindPickerChange"
@columnchange="bindColumnChange"
>
请选择网点
{{ $lang.lang.integral.outlets }}
<uni-icons class="list-icon" type="right" color="#B3B3B3" size="12"></uni-icons>
</picker>
</view>
......@@ -36,7 +36,7 @@
<view class="tag-text">{{ item.pointsRequire }}</view>
</view>
</view>
<view class="foot-tag">剩余{{ item.quantityRemain }}份</view>
<view class="foot-tag">{{ $lang.lang.integral.remainder(item.quantityRemain) }}</view>
</view>
<view class="gift-name">{{ locale === 'zh' ? item.titleZh : item.titleEn }}</view>
<view class="gift-menu">
......
src/pages/integral/integral.vue
View file @ 48d635b6
......@@ -23,19 +23,23 @@
<view class="classification">
<image class="classification-image" :src="levelIcon"></image>
<view class="log-menu">
<view class="menu-item" @click="toLog(0)">积分日志 &gt;</view>
<view class="menu-item" @click="toLog(1)">兑换日志 &gt;</view>
<view class="menu-item" @click="toLog(0)"
>{{ $lang.lang.integral.logPoints }}&ensp;&gt;</view
>
<view class="menu-item" @click="toLog(1)"
>{{ $lang.lang.integral.logExchange }}&ensp;&gt;</view
>
</view>
</view>
</view>
<view class="main">
<view class="main-nav">
<view class="nav-item" :class="{ 'nav-active1': navIndex === 0 }" @click="navIndex = 0"
>兑换礼品</view
>
<view class="nav-item" :class="{ 'nav-active2': navIndex === 1 }" @click="navIndex = 1"
>积分活动</view
>
<view class="nav-item" :class="{ 'nav-active1': navIndex === 0 }" @click="navIndex = 0">{{
$lang.lang.integral.redeemGifts
}}</view>
<view class="nav-item" :class="{ 'nav-active2': navIndex === 1 }" @click="navIndex = 1">{{
$lang.lang.integral.pointsCampaign
}}</view>
</view>
<view class="main-content">
<gift v-show="navIndex === 0" :userInfo="userInfo"></gift>
......
src/pages/log/exchange.vue
View file @ 48d635b6
<template>
<view>
<dHeader :title="'兑换日志'"></dHeader>
<dHeader :title="$lang.lang.log.logPoints"></dHeader>
<view class="container">
<view class="item" v-for="item in list" :key="item.id" @click="toDetail(item.id)">
<div class="item-title">兑换礼品</div>
<div class="item-title">{{ $lang.lang.log.redeemGifts }}</div>
<div class="item-box">
<div class="box-img">
<image
......@@ -57,7 +57,7 @@ export default {
try {
const memberId = this.$store.getters.id
const { code, data } = await this.$request.post('/app-api/reward/redeem/record/list', {
memberId: 68
memberId
})
if (code == 0 && data) {
this.list = data
......
src/pages/log/integral.vue
View file @ 48d635b6
<template>
<view>
<dHeader :title="'积分日志'"></dHeader>
<dHeader :title="$lang.lang.log.logExchange"></dHeader>
<view class="container">
<view class="item" v-for="(item, index) in list" :key="index">
<div class="item-title">{{ locale == 'zh' ? item.sourceTypeZh : item.sourceTypeEn }}</div>
......
src/pages/order_mail/order_mail.vue
View file @ 48d635b6
<template>
<view class="mail">
<dHeader :title="'确定订单'"></dHeader>
<dHeader :title="integral.orderMail"></dHeader>
<view class="container">
<view class="header">
<view
......@@ -52,18 +52,18 @@
<view class="tag-text">{{ orderInfo.pointsRequire }}</view>
</view>
</view>
<view class="foot-tag">剩余{{ orderInfo.quantityRemain }}份</view>
<view class="foot-tag">{{ integral.remainder(orderInfo.quantityRemain) }}</view>
</view>
<view class="gift-content">
<view class="gift-content-text">{{
locale === 'zh' ? orderInfo.titleZh : orderInfo.titleEn
}}</view>
<view class="gift-cell">
<view class="cell-label">兑换方式</view>
<view class="cell-label">{{ integral.redeemType }}</view>
<view class="cell-text">{{ handExchangeText(orderInfo.pickMethodList) }}</view>
</view>
<view class="gift-cell">
<view class="cell-label">活动时间</view>
<view class="cell-label">{{ integral.activityTime }}</view>
<view class="cell-text">2023-10-1至2024-11-01</view>
</view>
</view>
......@@ -73,9 +73,9 @@
</view>
</view>
<view class="main-footer">
<input class="inp" placeholder="请输入验证码" v-model="code" />
<input class="inp" :placeholder="integral.codePlaceloader" v-model="code" />
<view class="btn" @click="handleCode">{{
codeTime == 0 ? '获取验证码' : `${codeTime}s后可重新发送`
codeTime == 0 ? integral.code : integral.codeTimeText(codeTime)
}}</view>
</view>
</view>
......@@ -89,16 +89,16 @@
:inputBorder="false"
:maxlength="100"
v-model.trim="remark"
placeholder="请输入备注"
:placeholder="integral.remark"
>
</uni-easyinput>
<view class="placeholder">最多输入100字</view>
<view class="placeholder">{{ integral.textLength }}</view>
</view>
<view class="container-text">
已选{{ num }}件，合计积分：<view class="container-num">{{ total }}</view
>积分
{{ integral.totalScore(num) }}<view class="container-num">{{ total }}</view
>{{ integral.totalScore1 }}
</view>
<view class="container-btn" @click="bindSubmitOrder">提交订单</view>
<view class="container-btn" @click="bindSubmitOrder">{{ integral.orderMail }}</view>
<uni-popup ref="popup" type="bottom" border-radius="10px 10px 0 0" background-color="#fff">
<view class="popup-list">
<view
......@@ -125,7 +125,7 @@
</view>
<view class="popup-btn" @click="toAddressAdd">
<image class="img" src="../../static/img/address_add.png"></image>
<view class="text">新增收货地址</view>
<view class="text">{{ integral.addAddress }}</view>
</view>
</uni-popup>
</view>
......@@ -178,6 +178,9 @@ export default {
locale() {
return this.$lang.locale
},
integral() {
return this.$lang.lang.integral
},
// 计算总积分
total() {
if (this.orderInfo.pointsRequire) {
......@@ -303,13 +306,13 @@ export default {
bindSubmitOrder() {
if (!this.code) {
uni.showToast({
title: '请输入验证码',
title: this.integral.codePlaceloader,
icon: 'none'
})
return
}
uni.showLoading({
title: '加载中'
title: this.$lang.lang.notices.loading
})
this.submitOrder()
},
......@@ -336,7 +339,7 @@ export default {
})
} else {
uni.showToast({
title: '积分不足',
title: this.integral.totalScoreError,
icon: 'none'
})
}
......
src/static/lang/en.js
View file @ 48d635b6
......@@ -136,7 +136,7 @@ export default {
fullAddress: 'Please enter the detailed address',
fullAddressLength: 'Enter up to 100 words',
delAddress: 'Are you sure you want to delete the address?',
recommend: 'Please enter referral code (optional)'
recommend: 'Please enter referral code (optional)',
},
auth: {
auth: 'Real-name certification',
......@@ -392,6 +392,28 @@ export default {
remark: 'remark',
confirm: 'confirm'
},
detail: {
activity: 'Event Details',
illustrate: 'Points Description',
maxIntegral: 'Accumulate the highest number of points',
date: 'expiration date',
rulesIllustrate: "Rule Description",
total: "total",
integral: "integral",
num: (val) => {
return `'total ${val} pieces'`
},
exchangeTitle: "Redemption details",
activityTime: "Event time",
exchangeOutlets: 'Redemption outlets',
exchangeType: 'Redemption Method',
address: 'Delivery address',
courierNum: "The tracking number",
courierCompany: "Courier companies",
courierTime: "The date of delivery",
remark: "remark",
errorMsg: "The address cannot be modified after submission, if you need to modify the address, please contact customer service"
},
ecash: {
query: 'Exchange Rate Query',
china: 'China',
......@@ -465,7 +487,34 @@ export default {
info: 'my integral',
headerTitle: 'Honorable',
spend: 'redeemed points are',
available: 'The available credits are'
available: 'The available credits are',
logPoints: 'points log',
logExchange: 'exchange log',
redeemGifts: 'redeem gifts',
pointsCampaign: 'points campaign',
pointsRemark: 'Points can be redeemed differently at different outlets',
outlets: "Please select a location",
remainder: (val) => {
return `${val} servings remaining`
},
orderMail: 'Confirm the order',
code: 'Get a verification code',
codePlaceloader: "Please enter a verification code",
codeError: "The verification code is incorrect",
codeTimeText: (val) => {
return `${val} seconds to get it again`
},
remark: 'Please enter a comment',
submitOrder: 'Submit your order',
redeemType: 'Redemption Method',
activityTime: 'Event time',
textLength: 'Enter up to 100 words',
totalScore: (num) => {
return `selected ${num} pieces, total points:`
},
totalScore1: 'integral',
addAddress: 'new address for additional shipments',
totalScoreError: "Insufficient points"
},
levite: {
levite: 'warehousing notes'
......@@ -514,6 +563,11 @@ export default {
register: 'register',
close: 'close'
},
log: {
logPoints: 'points log',
logExchange: 'exchange log',
redeemGifts: 'gifts redeem',
},
msg: {
msg: 'message',
read: 'read',
......
src/static/lang/zh.js
View file @ 48d635b6
......@@ -135,7 +135,7 @@ export default {
fullAddress: '请输入详细地址',
fullAddressLength: '最多输入100字',
delAddress: '确定删除地址吗?',
recommend: '请输入推荐码（非必填）'
recommend: '请输入推荐码（非必填）',
},
auth: {
auth: '实名认证',
......@@ -387,6 +387,28 @@ export default {
remark: '备注',
confirm: '确定'
},
detail: {
activity: '活动详情',
illustrate: '积分说明',
maxIntegral: '累计最高积分',
date: '有效期',
rulesIllustrate: "规则说明",
total: "共计",
integral: "积分",
num: (val) => {
return `共${val}件`
},
exchangeTitle: "兑换详情",
activityTime: "活动时间",
exchangeOutlets: '兑换网点',
exchangeType: '兑换方式',
address: '收货地址',
courierNum: "快递单号",
courierCompany: "快递公司",
courierTime: "快递日期",
remark: "备注",
errorMsg: "地址提交后无法修改，如需修改地址请联系客服"
},
ecash: {
query: '汇率查询',
china: '中国',
......@@ -460,7 +482,34 @@ export default {
info: '我的积分',
headerTitle: '尊贵的',
spend: '已兑换积分为',
available: '可用积分为'
available: '可用积分为',
logPoints: '积分日志',
logExchange: '兑换日志',
redeemGifts: '兑换礼品',
pointsCampaign: '积分活动',
pointsRemark: '不同网点兑换积分不同',
outlets: '请选择网点',
remainder: (val) => {
return `剩余${val}份`
},
orderMail: '确定订单',
code: '获取验证码',
codePlaceloader: "请输入验证码",
codeError: "验证码错误",
codeTimeText: (val) => {
return `${val}秒后重新获取`
},
remark: '请输入备注',
submitOrder: '提交订单',
redeemType: '兑换方式',
activityTime: '活动时间',
textLength: '最多输入100字',
totalScore: (num) => {
return `已选${num}件，合计积分：`
},
totalScore1: '积分',
addAddress: '新增收货地址',
totalScoreError: "积分不足"
},
levite: {
levite: '入仓须知'
......@@ -509,6 +558,11 @@ export default {
register: '注册',
close: '关闭'
},
log: {
logPoints: '积分日志',
logExchange: '兑换日志',
redeemGifts: '礼品兑换',
},
msg: {
msg: '消息',
read: '已读',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment