Uniapp/lucky_shop
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: 修复多页面语言包key路径错误问题

Browse Source 
统一修正所有页面中调用语言包时的路径命名，将短横线/下划线格式调整为正确的嵌套路径格式，确保语言文本可以正常加载
This commit is contained in:
ZF Sun
2026-07-03 17:02:43 +08:00
parent a27e3518da
commit 92e8823566
11 changed files with 129 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pages_goods/_components/goods-detail-view/detail.js
View File

@@ -299,7 +299,7 @@ export default {
//生成海报 //生成海报
getGoodsPoster() { getGoodsPoster() {
uni.showLoading({ uni.showLoading({
'title': this.$lang('detailView.posterGenerating') 'title': this.$lang('goods.detail.detailView.posterGenerating')
}) })
//活动海报信息 //活动海报信息
if (this.memberInfo && this.memberInfo.member_id) this.posterParams.source_member = this.memberInfo.member_id; if (this.memberInfo && this.memberInfo.member_id) this.posterParams.source_member = this.memberInfo.member_id;
@@ -365,12 +365,12 @@ export default {
filePath: res.tempFilePath, filePath: res.tempFilePath,
success: () => { success: () => {
this.$util.showToast({ this.$util.showToast({
title: this.$lang('detailView.saveSuccess') title: this.$lang('goods.detail.detailView.saveSuccess')
}); });
}, },
fail: (err) => { fail: (err) => {
this.$util.showToast({ this.$util.showToast({
title: this.$lang('detailView.saveFailed') title: this.$lang('goods.detail.detailView.saveFailed')
}); });
} }
}); });
@@ -378,7 +378,7 @@ export default {
}, },
fail: (err) => { fail: (err) => {
this.$util.showToast({ this.$util.showToast({
title: this.$lang('detailView.saveFailed') title: this.$lang('goods.detail.detailView.saveFailed')
}); });
} }
}); });
@@ -484,7 +484,7 @@ export default {
onTapDoc(pdf_url) { onTapDoc(pdf_url) {
if (!pdf_url) return; if (!pdf_url) return;
uni.showLoading({ uni.showLoading({
title: this.$lang('detailView.loading') title: this.$lang('goods.detail.detailView.loading')
}); });
let url = this.$util.img(pdf_url); let url = this.$util.img(pdf_url);
uni.downloadFile({ uni.downloadFile({
@@ -510,7 +510,7 @@ export default {
complete: (res) => { complete: (res) => {
if (res.statusCode === 404) { if (res.statusCode === 404) {
uni.showToast({ uni.showToast({
title: this.$lang('detailView.fileNotExist'), title: this.$lang('goods.detail.detailView.fileNotExist'),
icon: 'none' icon: 'none'
}); });
} }

54
pages_goods/_components/goods-detail-view/goods-detail-view.vue
View File

@@ -60,7 +60,7 @@
<!-- 配送 --> <!-- 配送 -->
<!-- @click="$refs.deliveryType.open()" --> <!-- @click="$refs.deliveryType.open()" -->
<view class="item delivery-type" v-if="goodsSkuDetail.is_virtual == 0"> <view class="item delivery-type" v-if="goodsSkuDetail.is_virtual == 0">
<view class="label">{{ $lang('send') }}</view> <view class="label">{{ $lang('goods.detail.send') }}</view>
<block v-if="deliveryType"> <block v-if="deliveryType">
<view class="box"> <view class="box">
<block v-for="(item, index) in deliveryType" :key="index"> <block v-for="(item, index) in deliveryType" :key="index">
@@ -72,7 +72,7 @@
<text class="iconfont icon-right"></text> <text class="iconfont icon-right"></text>
</block> </block>
<block v-else> <block v-else>
<view class="box">{{ $lang('detailView.notConfigured') }}</view> <view class="box">{{ $lang('goods.detail.detailView.notConfigured') }}</view>
</block> </block>
</view> </view>
@@ -96,7 +96,7 @@
<view class="item service" @click="openMerchantsServicePopup()" <view class="item service" @click="openMerchantsServicePopup()"
v-if="goodsSkuDetail.goods_service.length"> v-if="goodsSkuDetail.goods_service.length">
<view class="label">{{ $lang('detailView.serviceLabel') }}</view> <view class="label">{{ $lang('goods.detail.detailView.serviceLabel') }}</view>
<view class="list-wrap"> <view class="list-wrap">
<view class="item-wrap" v-for="(item, index) in goodsSkuDetail.goods_service" :key="index" <view class="item-wrap" v-for="(item, index) in goodsSkuDetail.goods_service" :key="index"
v-if="index < 3"> v-if="index < 3">
@@ -140,7 +140,7 @@
<view class="other-wrap"> <view class="other-wrap">
<view class="address" style="margin-left: 30rpx;"> <view class="address" style="margin-left: 30rpx;">
<view>{{ goodsSkuDetail.merchinfo.merch_name }}</view> <view>{{ goodsSkuDetail.merchinfo.merch_name }}</view>
<view style="font-size: 24rpx;color: #888;">{{ $lang('detailView.officialCertifiedMerchant') }}</view> <view style="font-size: 24rpx;color: #888;">{{ $lang('goods.detail.detailView.officialCertifiedMerchant') }}</view>
</view> </view>
</view> </view>
</view> </view>
@@ -153,7 +153,7 @@
<uni-popup ref="deliveryType" type="bottom"> <uni-popup ref="deliveryType" type="bottom">
<view class="deliverytype-popup-layer popup-layer"> <view class="deliverytype-popup-layer popup-layer">
<view class="head-wrap" @click="$refs.deliveryType.close()"> <view class="head-wrap" @click="$refs.deliveryType.close()">
<text>{{ $lang('detailView.deliveryTitle') }}</text> <text>{{ $lang('goods.detail.detailView.deliveryTitle') }}</text>
<text class="iconfont icon-close"></text> <text class="iconfont icon-close"></text>
</view> </view>
<scroll-view scroll-y class="type-body"> <scroll-view scroll-y class="type-body">
@@ -177,7 +177,7 @@
<uni-popup ref="merchantsServicePopup" type="bottom"> <uni-popup ref="merchantsServicePopup" type="bottom">
<view class="goods-merchants-service-popup-layer popup-layer"> <view class="goods-merchants-service-popup-layer popup-layer">
<view class="head-wrap" @click="closeMerchantsServicePopup()"> <view class="head-wrap" @click="closeMerchantsServicePopup()">
<text>{{ $lang('detailView.merchantsServiceTitle') }}</text> <text>{{ $lang('goods.detail.detailView.merchantsServiceTitle') }}</text>
<text class="iconfont icon-close"></text> <text class="iconfont icon-close"></text>
</view> </view>
<scroll-view scroll-y> <scroll-view scroll-y>
@@ -210,7 +210,7 @@
<uni-popup ref="storeListPopup" type="bottom"> <uni-popup ref="storeListPopup" type="bottom">
<view class="goods-merchants-service-popup-layer popup-layer store-list-wrap"> <view class="goods-merchants-service-popup-layer popup-layer store-list-wrap">
<view class="head-wrap" @click="closeStoreListPopup()"> <view class="head-wrap" @click="closeStoreListPopup()">
<text>{{ $lang('detailView.storeListTitle') }}</text> <text>{{ $lang('goods.detail.detailView.storeListTitle') }}</text>
<text class="iconfont icon-close"></text> <text class="iconfont icon-close"></text>
</view> </view>
<scroll-view scroll-y> <scroll-view scroll-y>
@@ -226,10 +226,10 @@
<view class="item-title"> <view class="item-title">
<text class="title">{{ item.store_name }}</text> <text class="title">{{ item.store_name }}</text>
<text class="distance color-base-text" v-if="item.distance"> <text class="distance color-base-text" v-if="item.distance">
{{ $lang('detailView.distance', { distance: item.distance > 1 ? item.distance + 'km' : item.distance * 1000 + 'm' }) }} {{ $lang('goods.detail.detailView.distance', { distance: item.distance > 1 ? item.distance + 'km' : item.distance * 1000 + 'm' }) }}
</text> </text>
</view> </view>
<view class="item-time" v-if="item.open_date">{{ $lang('detailView.businessHours', { time: item.open_date }) }} <view class="item-time" v-if="item.open_date">{{ $lang('goods.detail.detailView.businessHours', { time: item.open_date }) }}
</view> </view>
<view class="item-address">{{ item.full_address + item.address }}</view> <view class="item-address">{{ item.full_address + item.address }}</view>
</view> </view>
@@ -254,7 +254,7 @@
<view class="community-txt">{{ goodsSkuDetail.qr_data.community_describe }}</view> <view class="community-txt">{{ goodsSkuDetail.qr_data.community_describe }}</view>
</view> </view>
</view> </view>
<view class="community-btn" @click="onCommunity()">{{ $lang('detailView.addCommunity') }}</view> <view class="community-btn" @click="onCommunity()">{{ $lang('goods.detail.detailView.addCommunity') }}</view>
</view> </view>
<!-- 促销 --> <!-- 促销 -->
@@ -284,12 +284,12 @@
<!-- <view class="tit" :class="{ active: goodsEvaluate.content }"> --> <!-- <view class="tit" :class="{ active: goodsEvaluate.content }"> -->
<view> <view>
<text class="color-title font-size-base"> <text class="color-title font-size-base">
{{ $lang('detailView.evaluate') }} {{ $lang('goods.detail.detailView.evaluate') }}
<text class="font-size-base">({{ evaluateCount }})</text> <text class="font-size-base">({{ evaluateCount }})</text>
</text> </text>
<text class="evaluate-item-empty" v-if="!evaluateCount">{{ $lang('detailView.noEvaluate') }}</text> <text class="evaluate-item-empty" v-if="!evaluateCount">{{ $lang('goods.detail.detailView.noEvaluate') }}</text>
<view class="evaluate-item-empty" v-else> <view class="evaluate-item-empty" v-else>
<text class="font-size-tag">{{ $lang('detailView.viewAll') }}</text> <text class="font-size-tag">{{ $lang('goods.detail.detailView.viewAll') }}</text>
<text class="iconfont icon-right font-size-tag"></text> <text class="iconfont icon-right font-size-tag"></text>
</view> </view>
</view> </view>
@@ -336,7 +336,7 @@
<!-- 规格属性 --> <!-- 规格属性 -->
<view class="goods-attr" <view class="goods-attr"
v-if="goodsSkuDetail.goods_attr_format && goodsSkuDetail.goods_attr_format.length > 0"> v-if="goodsSkuDetail.goods_attr_format && goodsSkuDetail.goods_attr_format.length > 0">
<view class="title">{{ $lang('detailView.specAttrTitle') }}</view> <view class="title">{{ $lang('goods.detail.detailView.specAttrTitle') }}</view>
<view class="attr-wrap"> <view class="attr-wrap">
<block v-for="(item, index) in goodsSkuDetail.goods_attr_format" :key="index"> <block v-for="(item, index) in goodsSkuDetail.goods_attr_format" :key="index">
<view class="item" v-if="goodsAttrShow || (!goodsAttrShow && index < 4)"> <view class="item" v-if="goodsAttrShow || (!goodsAttrShow && index < 4)">
@@ -347,10 +347,10 @@
<view class="attr-action" v-if="goodsSkuDetail.goods_attr_format.length > 4" <view class="attr-action" v-if="goodsSkuDetail.goods_attr_format.length > 4"
@click="switchGoodsAttr"> @click="switchGoodsAttr">
<block v-if="!goodsAttrShow"> <block v-if="!goodsAttrShow">
{{ $lang('detailView.expand') }}<text class="iconfont icon-iconangledown"></text> {{ $lang('goods.detail.detailView.expand') }}<text class="iconfont icon-iconangledown"></text>
</block> </block>
<block v-else> <block v-else>
{{ $lang('detailView.collapse') }}<text class="iconfont icon-iconangledown-copy"></text> {{ $lang('goods.detail.detailView.collapse') }}<text class="iconfont icon-iconangledown-copy"></text>
</block> </block>
</view> </view>
</view> </view>
@@ -379,11 +379,11 @@
<img class="iconfont icon-file" :src="$util.img('public/static/img/file/file-pdf.svg')" /> <img class="iconfont icon-file" :src="$util.img('public/static/img/file/file-pdf.svg')" />
</view> </view>
<view class="pdf-info"> <view class="pdf-info">
<text class="pdf-name">{{ goodsSkuDetail.pdf_name || $lang('detailView.defaultDocName') }}</text> <text class="pdf-name">{{ goodsSkuDetail.pdf_name || $lang('goods.detail.detailView.defaultDocName') }}</text>
<text class="pdf-desc">{{ $lang('detailView.viewDocDetail') }}</text> <text class="pdf-desc">{{ $lang('goods.detail.detailView.viewDocDetail') }}</text>
</view> </view>
<view class="pdf-btn"> <view class="pdf-btn">
<text>{{ $lang('detailView.view') }}</text> <text>{{ $lang('goods.detail.detailView.view') }}</text>
</view> </view>
</view> </view>
</view> </view>
@@ -419,10 +419,10 @@
<view class="close iconfont icon-close" @click="closePosterPopup()"></view> <view class="close iconfont icon-close" @click="closePosterPopup()"></view>
</view> </view>
<!-- #ifdef MP || APP-PLUS --> <!-- #ifdef MP || APP-PLUS -->
<view class="save-btn" @click="saveGoodsPoster()">{{ $lang('detailView.saveImage') }}</view> <view class="save-btn" @click="saveGoodsPoster()">{{ $lang('goods.detail.detailView.saveImage') }}</view>
<!-- #endif --> <!-- #endif -->
<!-- #ifdef H5 --> <!-- #ifdef H5 -->
<view class="save-btn">{{ $lang('detailView.longPressToSave') }}</view> <view class="save-btn">{{ $lang('goods.detail.detailView.longPressToSave') }}</view>
<!-- #endif --> <!-- #endif -->
</view> </view>
</template> </template>
@@ -433,13 +433,13 @@
<view @touchmove.prevent.stop> <view @touchmove.prevent.stop>
<uni-popup ref="sharePopup" type="bottom" class="share-popup"> <uni-popup ref="sharePopup" type="bottom" class="share-popup">
<view> <view>
<view class="share-title">{{ $lang('detailView.shareTitle') }}</view> <view class="share-title">{{ $lang('goods.detail.detailView.shareTitle') }}</view>
<view class="share-content"> <view class="share-content">
<!-- #ifdef MP --> <!-- #ifdef MP -->
<view class="share-box"> <view class="share-box">
<button class="share-btn" :plain="true" open-type="share"> <button class="share-btn" :plain="true" open-type="share">
<view class="iconfont icon-share-friend"></view> <view class="iconfont icon-share-friend"></view>
<text>{{ $lang('detailView.shareToFriends') }}</text> <text>{{ $lang('goods.detail.detailView.shareToFriends') }}</text>
</button> </button>
</view> </view>
<!-- #endif --> <!-- #endif -->
@@ -448,7 +448,7 @@
<view class="share-box" v-if="goodsCircle"> <view class="share-box" v-if="goodsCircle">
<button class="share-btn" :plain="true" @click="openBusinessView"> <button class="share-btn" :plain="true" @click="openBusinessView">
<view class="iconfont icon-haowuquan"></view> <view class="iconfont icon-haowuquan"></view>
<text>{{ $lang('detailView.shareToGoodsCircle') }}</text> <text>{{ $lang('goods.detail.detailView.shareToGoodsCircle') }}</text>
</button> </button>
</view> </view>
<!-- #endif --> <!-- #endif -->
@@ -456,19 +456,19 @@
<view class="share-box" @click="openPosterPopup"> <view class="share-box" @click="openPosterPopup">
<button class="share-btn" :plain="true"> <button class="share-btn" :plain="true">
<view class="iconfont icon-pengyouquan"></view> <view class="iconfont icon-pengyouquan"></view>
<text>{{ $lang('detailView.generateSharePoster') }}</text> <text>{{ $lang('goods.detail.detailView.generateSharePoster') }}</text>
</button> </button>
</view> </view>
<!-- #ifdef H5 --> <!-- #ifdef H5 -->
<view class="share-box" @click="copyUrl"> <view class="share-box" @click="copyUrl">
<button class="share-btn" :plain="true"> <button class="share-btn" :plain="true">
<view class="iconfont icon-fuzhilianjie"></view> <view class="iconfont icon-fuzhilianjie"></view>
<text>{{ $lang('detailView.copyLink') }}</text> <text>{{ $lang('goods.detail.detailView.copyLink') }}</text>
</button> </button>
</view> </view>
<!-- #endif --> <!-- #endif -->
</view> </view>
<view class="share-footer" @click="closeSharePopup"><text>{{ $lang('detailView.cancelShare') }}</text></view> <view class="share-footer" @click="closeSharePopup"><text>{{ $lang('goods.detail.detailView.cancelShare') }}</text></view>
</view> </view>
</uni-popup> </uni-popup>
</view> </view>

4
pages_order/public/js/refundMethod.js
View File

@@ -7,8 +7,8 @@ export default {
*/ */
cancleRefund(order_goods_id, callback) { cancleRefund(order_goods_id, callback) {
uni.showModal({ uni.showModal({
content: this.$lang('order.refund.cancelRefundContent'), content: this.$lang('order.refund.refund.cancelRefundContent'),
cancelText: this.$lang('order.refund.cancelRefundCancelText'), cancelText: this.$lang('order.refund.refund.cancelRefundCancelText'),
cancelColor: '#898989', cancelColor: '#898989',
success: res => { success: res => {
if (res.confirm) { if (res.confirm) {

60
pages_promotion/point/detail.vue
View File

@@ -35,7 +35,7 @@
</view> </view>
<view class="group-wrap padding-top"> <view class="group-wrap padding-top">
<view class="goods-module-wrap"> <view class="goods-module-wrap">
<text class="price-symbol ">{{ pointInfo.point }}{{ $lang('detail.pointsSuffix') }}</text> <text class="price-symbol ">{{ pointInfo.point }}{{ $lang('point.detail.pointsSuffix') }}</text>
<template v-if="pointInfo.exchange_price != '0.00' && pointInfo.pay_type > 0"> <template v-if="pointInfo.exchange_price != '0.00' && pointInfo.pay_type > 0">
<text class="price-symbol ">+{{ $lang('common.currencySymbol') }}{{ pointInfo.exchange_price <text class="price-symbol ">+{{ $lang('common.currencySymbol') }}{{ pointInfo.exchange_price
}}</text> }}</text>
@@ -48,10 +48,10 @@
<view class="follow-and-share" <view class="follow-and-share"
v-if="pointInfo.stock_show == 1 || pointInfo.stock_show == undefined"> v-if="pointInfo.stock_show == 1 || pointInfo.stock_show == undefined">
<text class="color-tip" v-if="pointInfo.pointCoupon != 1">{{ $lang('detail.stockLabel') }}{{ pointInfo.stock }}{{ <text class="color-tip" v-if="pointInfo.pointCoupon != 1">{{ $lang('point.detail.stockLabel') }}{{ pointInfo.stock }}{{
pointInfo.stock >= 0 ? pointInfo.stock >= 0 ?
pointInfo.unit : '' }}</text> pointInfo.unit : '' }}</text>
<text class="color-tip" v-else>{{ $lang('detail.stockLabel') }}{{ $lang('detail.unlimitedStock') }}{{ pointInfo.stock >= 0 ? pointInfo.unit : '' }}</text> <text class="color-tip" v-else>{{ $lang('point.detail.stockLabel') }}{{ $lang('point.detail.unlimitedStock') }}{{ pointInfo.stock >= 0 ? pointInfo.unit : '' }}</text>
</view> </view>
</view> </view>
<view class="goods-module-wrap info"> <view class="goods-module-wrap info">
@@ -61,17 +61,17 @@
<text class="sku-name-wrap" v-else>{{ pointInfo.name }}</text> <text class="sku-name-wrap" v-else>{{ pointInfo.name }}</text>
</view> </view>
<view class="coupon-desc"> <view class="coupon-desc">
<view v-if="pointInfo.balance && pointInfo.balance > 0" class="color-tip">{{ $lang('detail.containsBalance', { balance: pointInfo.balance }) }}</view> <view v-if="pointInfo.balance && pointInfo.balance > 0" class="color-tip">{{ $lang('point.detail.containsBalance', { balance: pointInfo.balance }) }}</view>
<view v-if="pointInfo.coupon_type == 'random'" class="color-tip">{{ $lang('detail.noThresholdCoupon') }}</view> <view v-if="pointInfo.coupon_type == 'random'" class="color-tip">{{ $lang('point.detail.noThresholdCoupon') }}</view>
<view v-if="pointInfo.coupon_type == 'reward'" class="color-tip">{{ $lang('detail.fullReduction', { atLeast: pointInfo.at_least, money: pointInfo.money }) }}</view> <view v-if="pointInfo.coupon_type == 'reward'" class="color-tip">{{ $lang('point.detail.fullReduction', { atLeast: pointInfo.at_least, money: pointInfo.money }) }}</view>
<view v-if="pointInfo.coupon_type == 'discount'" class="color-tip"> <view v-if="pointInfo.coupon_type == 'discount'" class="color-tip">
{{ $lang('detail.fullAmount', { atLeast: pointInfo.at_least }) }} {{ $lang('point.detail.fullAmount', { atLeast: pointInfo.at_least }) }}
<text>{{ pointInfo.discount }}{{ $lang('detail.discountSuffix') }}</text> <text>{{ pointInfo.discount }}{{ $lang('point.detail.discountSuffix') }}</text>
</view> </view>
<view v-if="pointInfo.coupon_type == 'discount'" class="color-tip">{{ $lang('detail.maxDiscount', { limit: pointInfo.discount_limit }) }}</view> <view v-if="pointInfo.coupon_type == 'discount'" class="color-tip">{{ $lang('point.detail.maxDiscount', { limit: pointInfo.discount_limit }) }}</view>
<view class="time color-tip" v-if="pointInfo.coupon_type"> <view class="time color-tip" v-if="pointInfo.coupon_type">
{{ pointInfo.validity_type == 1 ? $lang('detail.validFromReceive', { days: pointInfo.fixed_term }) : {{ pointInfo.validity_type == 1 ? $lang('point.detail.validFromReceive', { days: pointInfo.fixed_term }) :
$lang('detail.validUntil', { time: $util.timeStampTurnTime(pointInfo.end_time) }) }} $lang('point.detail.validUntil', { time: $util.timeStampTurnTime(pointInfo.end_time) }) }}
</view> </view>
</view> </view>
</view> </view>
@@ -84,7 +84,7 @@
<view class="community-txt">{{ pointInfo.qr_data.community_describe }}</view> <view class="community-txt">{{ pointInfo.qr_data.community_describe }}</view>
</view> </view>
</view> </view>
<view class="community-btn" @click="onCommunity()">{{ $lang('detail.addCommunity') }}</view> <view class="community-btn" @click="onCommunity()">{{ $lang('point.detail.addCommunity') }}</view>
</view> </view>
<!-- 促销 --> <!-- 促销 -->
@@ -92,7 +92,7 @@
v-show="isCommunity"> v-show="isCommunity">
<view class="community-model-content" @click.stop> <view class="community-model-content" @click.stop>
<view class="community-model-content-radius"> <view class="community-model-content-radius">
<view>{{ $lang('detail.addCommunityTitle') }}</view> <view>{{ $lang('point.detail.addCommunityTitle') }}</view>
</view> </view>
<view class="community-model-content-draw" v-if="pointInfo.qr_data && pointInfo.qr_data.qr_img"> <view class="community-model-content-draw" v-if="pointInfo.qr_data && pointInfo.qr_data.qr_img">
<image :src="pointInfo.qr_data.qr_img != '' && pointInfo.qr_data.qr_state == 1 <image :src="pointInfo.qr_data.qr_img != '' && pointInfo.qr_data.qr_state == 1
@@ -100,7 +100,7 @@
: $util.img('public/uniapp/goods/detail_erweiImage.png') : $util.img('public/uniapp/goods/detail_erweiImage.png')
" mode="aspectFill" show-menu-by-longpress /> " mode="aspectFill" show-menu-by-longpress />
</view> </view>
<view class="community-model-content-text">{{ $lang('detail.addCommunityTip') }}</view> <view class="community-model-content-text">{{ $lang('point.detail.addCommunityTip') }}</view>
</view> </view>
<view class="community-model-close" @click.stop="onCloseCommunity()"><text <view class="community-model-close" @click.stop="onCloseCommunity()"><text
class="iconfont icon-close"></text> class="iconfont icon-close"></text>
@@ -111,7 +111,7 @@
<view class="newdetail margin-bottom"> <view class="newdetail margin-bottom">
<!-- 已选规格 --> <!-- 已选规格 -->
<view class="item selected-sku-spec" v-if="pointInfo.sku_spec_format" @click="exchange"> <view class="item selected-sku-spec" v-if="pointInfo.sku_spec_format" @click="exchange">
<view class="label">{{ $lang('detail.selectSpec') }}</view> <view class="label">{{ $lang('point.detail.selectSpec') }}</view>
<view class="box"> <view class="box">
<text v-for="(item, index) in pointInfo.sku_spec_format" :key="index">{{ item.spec_name <text v-for="(item, index) in pointInfo.sku_spec_format" :key="index">{{ item.spec_name
}}/{{ }}/{{
@@ -122,7 +122,7 @@
<view class="item goods-attribute" @click="openAttributePopup()" <view class="item goods-attribute" @click="openAttributePopup()"
v-if="pointInfo.goods_attr_format && pointInfo.goods_attr_format.length > 0"> v-if="pointInfo.goods_attr_format && pointInfo.goods_attr_format.length > 0">
<view class="label">{{ $lang('detail.attribute') }}</view> <view class="label">{{ $lang('point.detail.attribute') }}</view>
<view class="box"> <view class="box">
<text v-for="(item, index) in pointInfo.goods_attr_format" :key="index" <text v-for="(item, index) in pointInfo.goods_attr_format" :key="index"
v-if="index < 2">{{ v-if="index < 2">{{
@@ -137,7 +137,7 @@
<uni-popup ref="attributePopup" type="bottom"> <uni-popup ref="attributePopup" type="bottom">
<view class="goods-attribute-popup-layer popup-layer"> <view class="goods-attribute-popup-layer popup-layer">
<view class="head-wrap" @click="closeAttributePopup()"> <view class="head-wrap" @click="closeAttributePopup()">
<text>{{ $lang('detail.goodsAttribute') }}</text> <text>{{ $lang('point.detail.goodsAttribute') }}</text>
<text class="iconfont icon-close"></text> <text class="iconfont icon-close"></text>
</view> </view>
<scroll-view scroll-y class="goods-attribute-body"> <scroll-view scroll-y class="goods-attribute-body">
@@ -148,7 +148,7 @@
</view> </view>
</scroll-view> </scroll-view>
<view class="button-box"><button type="primary" <view class="button-box"><button type="primary"
@click="closeAttributePopup()">{{ $lang('detail.confirm') }}</button></view> @click="closeAttributePopup()">{{ $lang('point.detail.confirm') }}</button></view>
</view> </view>
</uni-popup> </uni-popup>
</view> </view>
@@ -157,7 +157,7 @@
<uni-popup ref="merchantsServicePopup" type="bottom"> <uni-popup ref="merchantsServicePopup" type="bottom">
<view class="goods-merchants-service-popup-layer popup-layer"> <view class="goods-merchants-service-popup-layer popup-layer">
<view class="head-wrap" @click="closeMerchantsServicePopup()"> <view class="head-wrap" @click="closeMerchantsServicePopup()">
<text>{{ $lang('detail.goodsService') }}</text> <text>{{ $lang('point.detail.goodsService') }}</text>
<text class="iconfont icon-close"></text> <text class="iconfont icon-close"></text>
</view> </view>
<scroll-view scroll-y> <scroll-view scroll-y>
@@ -171,7 +171,7 @@
</view> </view>
</scroll-view> </scroll-view>
<view class="button-box"><button type="primary" <view class="button-box"><button type="primary"
@click="closeMerchantsServicePopup()">{{ $lang('detail.confirm') }}</button></view> @click="closeMerchantsServicePopup()">{{ $lang('point.detail.confirm') }}</button></view>
</view> </view>
</uni-popup> </uni-popup>
</view> </view>
@@ -180,7 +180,7 @@
<!-- 详情 --> <!-- 详情 -->
<view class="goods-detail-tab"> <view class="goods-detail-tab">
<view class="detail-tab"> <view class="detail-tab">
<view class="tab-item">{{ $lang('detail.exchangeDetail') }}</view> <view class="tab-item">{{ $lang('point.detail.exchangeDetail') }}</view>
</view> </view>
<view class="detail-content"> <view class="detail-content">
@@ -188,7 +188,7 @@
<view class="goods-details" v-if="pointInfo.content"><rich-text <view class="goods-details" v-if="pointInfo.content"><rich-text
:nodes="pointInfo.content"></rich-text> :nodes="pointInfo.content"></rich-text>
</view> </view>
<view class="goods-details active" v-else>{{ $lang('detail.noExchangeDetail') }}</view> <view class="goods-details active" v-else>{{ $lang('point.detail.noExchangeDetail') }}</view>
</view> </view>
</view> </view>
</view> </view>
@@ -201,14 +201,14 @@
</view> </view>
<view class="detail-swap" @click="exchange()" :class="{ 'position-bottom': isIphoneX }" v-if="!isLogin"><button <view class="detail-swap" @click="exchange()" :class="{ 'position-bottom': isIphoneX }" v-if="!isLogin"><button
type="primary">{{ $lang('detail.loginToExchange') }}</button></view> type="primary">{{ $lang('point.detail.loginToExchange') }}</button></view>
<block v-else> <block v-else>
<view class="detail-swap" :class="{ 'position-bottom': isIphoneX }" v-if="pointInfo.stock == 0"><button <view class="detail-swap" :class="{ 'position-bottom': isIphoneX }" v-if="pointInfo.stock == 0"><button
disabled>{{ $lang('detail.insufficientStock') }}</button></view> disabled>{{ $lang('point.detail.insufficientStock') }}</button></view>
<view class="detail-swap" :class="{ 'position-bottom': isIphoneX }" v-else-if="enough"><button <view class="detail-swap" :class="{ 'position-bottom': isIphoneX }" v-else-if="enough"><button
disabled>{{ $lang('detail.insufficientPoints') }}</button></view> disabled>{{ $lang('point.detail.insufficientPoints') }}</button></view>
<view class="detail-swap" @click="exchange()" :class="{ 'position-bottom': isIphoneX }" v-else><button <view class="detail-swap" @click="exchange()" :class="{ 'position-bottom': isIphoneX }" v-else><button
type="primary" hover-class="none">{{ $lang('detail.exchange') }}</button></view> type="primary" hover-class="none">{{ $lang('point.detail.exchange') }}</button></view>
</block> </block>
<loading-cover ref="loadingCover"></loading-cover> <loading-cover ref="loadingCover"></loading-cover>
@@ -289,7 +289,7 @@ export default {
imageUrl = this.pointInfo.image; imageUrl = this.pointInfo.image;
break; break;
} }
title = this.$lang('detail.shareTitle', { point: this.pointInfo.point, title: title }); title = this.$lang('point.detail.shareTitle', { point: this.pointInfo.point, title: title });
imageUrl = this.$util.img(imageUrl); imageUrl = this.$util.img(imageUrl);
var route = this.$util.getCurrentShareRoute(this.memberInfo ? this.memberInfo.member_id : 0); var route = this.$util.getCurrentShareRoute(this.memberInfo ? this.memberInfo.member_id : 0);
var path = route.path; var path = route.path;
@@ -318,7 +318,7 @@ export default {
imageUrl = this.pointInfo.image; imageUrl = this.pointInfo.image;
break; break;
} }
title = this.$lang('detail.shareTitle', { point: this.pointInfo.point, title: title }); title = this.$lang('point.detail.shareTitle', { point: this.pointInfo.point, title: title });
imageUrl = this.$util.img(imageUrl); imageUrl = this.$util.img(imageUrl);
var route = this.$util.getCurrentShareRoute(this.memberInfo ? this.memberInfo.member_id : 0); var route = this.$util.getCurrentShareRoute(this.memberInfo ? this.memberInfo.member_id : 0);
var query = route.query; var query = route.query;
@@ -420,7 +420,7 @@ export default {
if (this.pointInfo.goods_spec_format) this.pointInfo.goods_spec_format = JSON.parse(this.pointInfo.goods_spec_format); if (this.pointInfo.goods_spec_format) this.pointInfo.goods_spec_format = JSON.parse(this.pointInfo.goods_spec_format);
} }
this.pointInfo.unit = this.pointInfo.unit || this.$lang('detail.unitPiece'); this.pointInfo.unit = this.pointInfo.unit || this.$lang('point.detail.unitPiece');
// 商品详情 // 商品详情
if (this.pointInfo.content) this.pointInfo.content = htmlParser(this.pointInfo.content); if (this.pointInfo.content) this.pointInfo.content = htmlParser(this.pointInfo.content);
@@ -454,7 +454,7 @@ export default {
*/ */
refreshGoodsSkuDetail(pointInfo) { refreshGoodsSkuDetail(pointInfo) {
Object.assign(this.pointInfo, pointInfo); Object.assign(this.pointInfo, pointInfo);
this.pointInfo.unit = this.pointInfo.unit || this.$lang('detail.unitPiece'); this.pointInfo.unit = this.pointInfo.unit || this.$lang('point.detail.unitPiece');
}, },
//服务 //服务
openMerchantsServicePopup() { openMerchantsServicePopup() {

28
pages_promotion/point/order_list.vue
View File

@@ -5,7 +5,7 @@
:id="statusItem.id" :data-current="statusIndex" @click="ontabtap"> :id="statusItem.id" :data-current="statusIndex" @click="ontabtap">
<text class="uni-tab-item-title" <text class="uni-tab-item-title"
:class="statusItem.status == orderStatus ? 'uni-tab-item-title-active color-base-text' : ''"> :class="statusItem.status == orderStatus ? 'uni-tab-item-title-active color-base-text' : ''">
{{ $lang('point.orderList.' + statusItem.nameKey) }} {{ $lang('point.order_list.' + statusItem.nameKey) }}
</text> </text>
</view> </view>
</view> </view>
@@ -16,10 +16,10 @@
<view class="order-item" v-for="(orderItem, orderIndex) in orderList" :key="orderIndex" <view class="order-item" v-for="(orderItem, orderIndex) in orderList" :key="orderIndex"
@click="detail(orderItem)"> @click="detail(orderItem)">
<view class="order-header"> <view class="order-header">
<text class="order-no">{{ $lang('point.orderList.orderNo') }}{{ orderItem.order_no }}</text> <text class="order-no">{{ $lang('point.order_list.orderNo') }}{{ orderItem.order_no }}</text>
<text class="status-name"> <text class="status-name">
{{ orderItem.order_status == 0 ? $lang('point.orderList.statusPendingPayment') : orderItem.order_status == 1 ? $lang('point.orderList.statusCompleted') : {{ orderItem.order_status == 0 ? $lang('point.order_list.statusPendingPayment') : orderItem.order_status == 1 ? $lang('point.order_list.statusCompleted') :
orderItem.order_status == -1 ? $lang('point.orderList.statusClosed') : '' }} orderItem.order_status == -1 ? $lang('point.order_list.statusClosed') : '' }}
</text> </text>
</view> </view>
<view class="order-body"> <view class="order-body">
@@ -46,7 +46,7 @@
<view class="goods-sub-section"> <view class="goods-sub-section">
<text class="goods-price"> <text class="goods-price">
<text class="price-style large">{{ orderItem.point }}</text> <text class="price-style large">{{ orderItem.point }}</text>
<text class="unit price-style small">{{ $lang('point.orderList.points') }}</text> <text class="unit price-style small">{{ $lang('point.order_list.points') }}</text>
<block v-if="orderItem.price > 0"> <block v-if="orderItem.price > 0">
+ +
<text class="unit price-style small">{{ <text class="unit price-style small">{{
@@ -69,20 +69,20 @@
<view class="order-footer"> <view class="order-footer">
<view class="order-action" v-if="orderItem.order_status == 0 && orderItem.type == 1"> <view class="order-action" v-if="orderItem.order_status == 0 && orderItem.type == 1">
<view class="order-box-btn font-size-tag" <view class="order-box-btn font-size-tag"
@click.stop="orderClose(orderItem.order_id, orderIndex)">{{ $lang('point.orderList.closeBtn') }}</view> @click.stop="orderClose(orderItem.order_id, orderIndex)">{{ $lang('point.order_list.closeBtn') }}</view>
<view class="order-box-btn color-base-bg color-base-border" <view class="order-box-btn color-base-bg color-base-border"
@click.stop="openChoosePayment(orderItem.out_trade_no, orderItem.price)">{{ $lang('point.orderList.payBtn') }}</view> @click.stop="openChoosePayment(orderItem.out_trade_no, orderItem.price)">{{ $lang('point.order_list.payBtn') }}</view>
</view> </view>
<view class="order-action" v-else> <view class="order-action" v-else>
<view class="order-box-btn font-size-tag">{{ $lang('point.orderList.viewDetails') }}</view> <view class="order-box-btn font-size-tag">{{ $lang('point.order_list.viewDetails') }}</view>
</view> </view>
</view> </view>
</view> </view>
</block> </block>
<block v-if="showEmpty && !orderList.length"> <block v-if="showEmpty && !orderList.length">
<view class="cart-empty"> <view class="cart-empty">
<ns-empty :isIndex="true" :emptyBtn="{ url: '/pages_promotion/point/list', text: $lang('point.orderList.goBrowse') }" <ns-empty :isIndex="true" :emptyBtn="{ url: '/pages_promotion/point/list', text: $lang('point.order_list.goBrowse') }"
:text="$lang('point.orderList.emptyText')"></ns-empty> :text="$lang('point.order_list.emptyText')"></ns-empty>
</view> </view>
</block> </block>
</block> </block>
@@ -115,7 +115,7 @@ export default {
setTimeout(() => { setTimeout(() => {
if (!this.addonIsExist.pointexchange) { if (!this.addonIsExist.pointexchange) {
this.$util.showToast({ this.$util.showToast({
title: this.$lang('point.orderList.merchantNotEnabled'), title: this.$lang('point.order_list.merchantNotEnabled'),
mask: true, mask: true,
duration: 2000 duration: 2000
}); });
@@ -181,8 +181,8 @@ export default {
}, },
orderClose(order_id, index) { orderClose(order_id, index) {
uni.showModal({ uni.showModal({
title: this.$lang('point.orderList.tip'), title: this.$lang('point.order_list.tip'),
content: this.$lang('point.orderList.confirmCloseExchange'), content: this.$lang('point.order_list.confirmCloseExchange'),
success: res => { success: res => {
if (res.confirm) { if (res.confirm) {
this.$api.sendRequest({ this.$api.sendRequest({
@@ -194,7 +194,7 @@ export default {
if (res.code >= 0) { if (res.code >= 0) {
this.orderList[index].order_status = -1; this.orderList[index].order_status = -1;
this.$util.showToast({ this.$util.showToast({
title: this.$lang('point.orderList.closeSuccess') title: this.$lang('point.order_list.closeSuccess')
}); });
this.$forceUpdate(); this.$forceUpdate();
} }

8
pages_tool/file-preview/file-preview.vue
View File

@@ -12,24 +12,24 @@
<!-- PDF 文件预览 --> <!-- PDF 文件预览 -->
<view v-if="fileType === 'pdf'" class="file-viewer"> <view v-if="fileType === 'pdf'" class="file-viewer">
<web-view v-if="fileUrl" :src="fileUrl"></web-view> <web-view v-if="fileUrl" :src="fileUrl"></web-view>
<view v-else class="error-message">{{ $lang('filePreview.fileUrlNotExist') }}</view> <view v-else class="error-message">{{ $lang('file-preview.file-preview.fileUrlNotExist') }}</view>
</view> </view>
<!-- Word 文件预览 --> <!-- Word 文件预览 -->
<view v-else-if="fileType === 'word'" class="file-viewer"> <view v-else-if="fileType === 'word'" class="file-viewer">
<web-view v-if="fileUrl" :src="fileUrl"></web-view> <web-view v-if="fileUrl" :src="fileUrl"></web-view>
<view v-else class="error-message">{{ $lang('filePreview.fileUrlNotExist') }}</view> <view v-else class="error-message">{{ $lang('file-preview.file-preview.fileUrlNotExist') }}</view>
</view> </view>
<!-- 视频文件预览 --> <!-- 视频文件预览 -->
<view v-else-if="fileType === 'video'" class="video-viewer"> <view v-else-if="fileType === 'video'" class="video-viewer">
<video v-if="fileUrl" :src="fileUrl" controls autoplay class="video-player"></video> <video v-if="fileUrl" :src="fileUrl" controls autoplay class="video-player"></video>
<view v-else class="error-message">{{ $lang('filePreview.videoUrlNotExist') }}</view> <view v-else class="error-message">{{ $lang('file-preview.file-preview.videoUrlNotExist') }}</view>
</view> </view>
<!-- 其他文件类型 --> <!-- 其他文件类型 -->
<view v-else class="file-viewer"> <view v-else class="file-viewer">
<view class="error-message">{{ $lang('filePreview.unsupportedFileType') }}</view> <view class="error-message">{{ $lang('file-preview.file-preview.unsupportedFileType') }}</view>
</view> </view>
</view> </view>
</view> </view>

2
pages_tool/goods/not_exist.vue
View File

@@ -2,7 +2,7 @@
<view class="page" :style="themeColor"> <view class="page" :style="themeColor">
<view class="closeBox"> <view class="closeBox">
<image :src="$util.img('public/uniapp/goods/not_exist.png')" mode="widthFix" show-menu-by-longpress></image> <image :src="$util.img('public/uniapp/goods/not_exist.png')" mode="widthFix" show-menu-by-longpress></image>
<text class="close-title">{{ $lang('goods.notExist.message') }}</text> <text class="close-title">{{ $lang('goods.not_exist.notExist.message') }}</text>
</view> </view>
</view> </view>
</template> </template>

32
pages_tool/member/apply_withdrawal.vue
View File

@@ -2,8 +2,8 @@
<view class="container" :style="themeColor"> <view class="container" :style="themeColor">
<view class="bank-account-wrap" @click="goAccount()"> <view class="bank-account-wrap" @click="goAccount()">
<view class="tx-wrap" v-if="bankAccountInfo.withdraw_type"> <view class="tx-wrap" v-if="bankAccountInfo.withdraw_type">
<text class="tx-to">{{ $lang('member.applyWithdrawal.withdrawTo') }}</text> <text class="tx-to">{{ $lang('member.apply_withdrawal.withdrawTo') }}</text>
<view class="tx-bank" v-if="bankAccountInfo.withdraw_type == 'wechatpay'">{{ $lang('member.applyWithdrawal.wechatDefaultWallet') }}</view> <view class="tx-bank" v-if="bankAccountInfo.withdraw_type == 'wechatpay'">{{ $lang('member.apply_withdrawal.wechatDefaultWallet') }}</view>
<view class="tx-bank" v-else>{{ bankAccountInfo.bank_account }}</view> <view class="tx-bank" v-else>{{ bankAccountInfo.bank_account }}</view>
<view class="tx-img" v-if="bankAccountInfo.withdraw_type == 'alipay'"> <view class="tx-img" v-if="bankAccountInfo.withdraw_type == 'alipay'">
<image :src="$util.img('public/uniapp/member/apply_withdrawal/alipay.png')" mode="widthFix" show-menu-by-longpress></image> <image :src="$util.img('public/uniapp/member/apply_withdrawal/alipay.png')" mode="widthFix" show-menu-by-longpress></image>
@@ -16,12 +16,12 @@
</image> </image>
</view> </view>
</view> </view>
<text class="tx-to" v-else>{{ $lang('member.applyWithdrawal.pleaseAddWithdrawMethod') }}</text> <text class="tx-to" v-else>{{ $lang('member.apply_withdrawal.pleaseAddWithdrawMethod') }}</text>
<view class="iconfont icon-right"></view> <view class="iconfont icon-right"></view>
</view> </view>
<view class="empty-box"></view> <view class="empty-box"></view>
<view class="withdraw-wrap"> <view class="withdraw-wrap">
<view class="withdraw-wrap-title">{{ $lang('member.applyWithdrawal.withdrawAmount') }}</view> <view class="withdraw-wrap-title">{{ $lang('member.apply_withdrawal.withdrawAmount') }}</view>
<view class="money-wrap"> <view class="money-wrap">
<text class="unit">{{ $lang('common.currencySymbol') }}</text> <text class="unit">{{ $lang('common.currencySymbol') }}</text>
<input type="digit" class="withdraw-money" v-model="withdrawMoney" /> <input type="digit" class="withdraw-money" v-model="withdrawMoney" />
@@ -31,21 +31,21 @@
</view> </view>
<view class="bootom"> <view class="bootom">
<view> <view>
<text class="color-tip">{{ $lang('member.applyWithdrawal.withdrawableBalance') }}{{ $lang('common.currencySymbol') }}{{ withdrawInfo.member_info.balance_money | moneyFormat }}</text> <text class="color-tip">{{ $lang('member.apply_withdrawal.withdrawableBalance') }}{{ $lang('common.currencySymbol') }}{{ withdrawInfo.member_info.balance_money | moneyFormat }}</text>
<text class="all-tx color-base-text" @click="allTx">{{ $lang('member.applyWithdrawal.withdrawAll') }}</text> <text class="all-tx color-base-text" @click="allTx">{{ $lang('member.apply_withdrawal.withdrawAll') }}</text>
</view> </view>
</view> </view>
<view class="desc"> <view class="desc">
<text>{{ $lang('member.applyWithdrawal.minWithdrawAndFeeTip', { min: $lang('common.currencySymbol') + (withdrawInfo.config.min | moneyFormat), rate: withdrawInfo.config.rate + '%' }) }}</text> <text>{{ $lang('member.apply_withdrawal.minWithdrawAndFeeTip', { min: $lang('common.currencySymbol') + (withdrawInfo.config.min | moneyFormat), rate: withdrawInfo.config.rate + '%' }) }}</text>
</view> </view>
</view> </view>
<view class="btn color-base-border ns-gradient-otherpages-member-widthdrawal-withdrawal" :class="{ disabled: withdrawMoney == '' || withdrawMoney == 0 }" @click="withdraw"> <view class="btn color-base-border ns-gradient-otherpages-member-widthdrawal-withdrawal" :class="{ disabled: withdrawMoney == '' || withdrawMoney == 0 }" @click="withdraw">
{{ $lang('member.applyWithdrawal.withdraw') }} {{ $lang('member.apply_withdrawal.withdraw') }}
</view> </view>
<view class="recoend" @click="toWithdrawal"> <view class="recoend" @click="toWithdrawal">
<view class="recoend-con">{{ $lang('member.applyWithdrawal.withdrawalRecords') }}</view> <view class="recoend-con">{{ $lang('member.apply_withdrawal.withdrawalRecords') }}</view>
</view> </view>
<loading-cover ref="loadingCover"></loading-cover> <loading-cover ref="loadingCover"></loading-cover>
</view> </view>
@@ -105,7 +105,7 @@
this.withdrawInfo = res.data; this.withdrawInfo = res.data;
if (this.withdrawInfo.config.is_use == 0) { if (this.withdrawInfo.config.is_use == 0) {
this.$util.showToast({ this.$util.showToast({
title: this.$lang('member.applyWithdrawal.withdrawalNotEnabled') title: this.$lang('member.apply_withdrawal.withdrawalNotEnabled')
}); });
setTimeout(() => { setTimeout(() => {
this.$util.redirectTo(this.$util.MEMBER_PAGE_URL); this.$util.redirectTo(this.$util.MEMBER_PAGE_URL);
@@ -135,19 +135,19 @@
verify() { verify() {
if (this.withdrawMoney == '' || this.withdrawMoney == 0 || isNaN(parseFloat(this.withdrawMoney))) { if (this.withdrawMoney == '' || this.withdrawMoney == 0 || isNaN(parseFloat(this.withdrawMoney))) {
this.$util.showToast({ this.$util.showToast({
title: this.$lang('member.applyWithdrawal.pleaseEnterWithdrawAmount') title: this.$lang('member.apply_withdrawal.pleaseEnterWithdrawAmount')
}); });
return false; return false;
} }
if (parseFloat(this.withdrawMoney) > parseFloat(this.withdrawInfo.member_info.balance_money)) { if (parseFloat(this.withdrawMoney) > parseFloat(this.withdrawInfo.member_info.balance_money)) {
this.$util.showToast({ this.$util.showToast({
title: this.$lang('member.applyWithdrawal.withdrawAmountExceedsBalance') title: this.$lang('member.apply_withdrawal.withdrawAmountExceedsBalance')
}); });
return false; return false;
} }
if (parseFloat(this.withdrawMoney) < parseFloat(this.withdrawInfo.config.min)) { if (parseFloat(this.withdrawMoney) < parseFloat(this.withdrawInfo.config.min)) {
this.$util.showToast({ this.$util.showToast({
title: this.$lang('member.applyWithdrawal.withdrawAmountBelowMinimum') title: this.$lang('member.apply_withdrawal.withdrawAmountBelowMinimum')
}); });
return false; return false;
} }
@@ -156,7 +156,7 @@
withdraw() { withdraw() {
if (!this.bankAccountInfo.withdraw_type) { if (!this.bankAccountInfo.withdraw_type) {
this.$util.showToast({ this.$util.showToast({
title: this.$lang('member.applyWithdrawal.pleaseAddWithdrawMethodFirst') title: this.$lang('member.apply_withdrawal.pleaseAddWithdrawMethodFirst')
}); });
return; return;
} }
@@ -187,7 +187,7 @@
success: res => { success: res => {
if (res.code >= 0) { if (res.code >= 0) {
this.$util.showToast({ this.$util.showToast({
title: this.$lang('member.applyWithdrawal.withdrawApplySuccess') title: this.$lang('member.apply_withdrawal.withdrawApplySuccess')
}); });
setTimeout(() => { setTimeout(() => {
this.$util.redirectTo( this.$util.redirectTo(
@@ -223,7 +223,7 @@
success: res => { success: res => {
if (res.code >= 0) { if (res.code >= 0) {
this.$util.showToast({ this.$util.showToast({
title: this.$lang('member.applyWithdrawal.withdrawApplySuccess') title: this.$lang('member.apply_withdrawal.withdrawApplySuccess')
}); });
setTimeout(() => { setTimeout(() => {
this.$util.redirectTo('/pages_tool/member/withdrawal', {}, this.$util.redirectTo('/pages_tool/member/withdrawal', {},

12
pages_tool/member/modify_face.vue
View File

@@ -11,16 +11,16 @@
<view class="opection-box"> <view class="opection-box">
<block v-if="newImg == ''"> <block v-if="newImg == ''">
<!-- #ifdef MP-ALIPAY --> <!-- #ifdef MP-ALIPAY -->
<button type="primary" @click="uploadFace()">{{$lang('member.modifyFace.clickToUpload')}}</button> <button type="primary" @click="uploadFace()">{{$lang('member.modify_face.clickToUpload')}}</button>
<!-- #endif --> <!-- #endif -->
<!-- #ifndef MP-ALIPAY --> <!-- #ifndef MP-ALIPAY -->
<button type="primary" @click="chooseImage()">{{$lang('member.modifyFace.clickToUpload')}}</button> <button type="primary" @click="chooseImage()">{{$lang('member.modify_face.clickToUpload')}}</button>
<!-- #endif --> <!-- #endif -->
</block> </block>
<block v-else> <block v-else>
<view class="opec"> <view class="opec">
<button size="mini" class="mini" type="primary" @click="save()">{{$lang('member.modifyFace.confirmSave')}}</button> <button size="mini" class="mini" type="primary" @click="save()">{{$lang('member.modify_face.confirmSave')}}</button>
<button size="mini" class="mini" type="primary" @click="chooseImage()">{{$lang('member.modifyFace.reupload')}}</button> <button size="mini" class="mini" type="primary" @click="chooseImage()">{{$lang('member.modify_face.reupload')}}</button>
</view> </view>
</block> </block>
</view> </view>
@@ -92,7 +92,7 @@ export default {
}, },
fail: () => { fail: () => {
this.$util.showToast({ this.$util.showToast({
title: this.$lang('member.modifyFace.uploadFailed') title: this.$lang('member.modify_face.uploadFailed')
}); });
} }
}); });
@@ -114,7 +114,7 @@ export default {
this.memberInfo.headimg = this.imgurl; this.memberInfo.headimg = this.imgurl;
this.$store.commit('setMemberInfo', this.memberInfo); this.$store.commit('setMemberInfo', this.memberInfo);
this.$util.showToast({ this.$util.showToast({
title: this.$lang('member.modifyFace.modifySuccess') title: this.$lang('member.modify_face.modifySuccess')
}); });
setTimeout(() => { setTimeout(() => {
this.$util.redirectTo('/pages_tool/member/info', {}, 'redirectTo'); this.$util.redirectTo('/pages_tool/member/info', {}, 'redirectTo');

20
pages_tool/member/withdrawal_detail.vue
View File

@@ -7,43 +7,43 @@
<!-- 状态0待审核1.待转账2已转账 -1拒绝' --> <!-- 状态0待审核1.待转账2已转账 -1拒绝' -->
<view class="item"> <view class="item">
<view class="line-wrap"> <view class="line-wrap">
<text class="label">{{ $lang('member.withdrawalDetail.currentStatus') }}</text> <text class="label">{{ $lang('member.withdrawal_detail.currentStatus') }}</text>
<text class="value">{{ detail.status_name }}</text> <text class="value">{{ detail.status_name }}</text>
</view> </view>
<view class="line-wrap"> <view class="line-wrap">
<text class="label">{{ $lang('member.withdrawalDetail.transactionNo') }}</text> <text class="label">{{ $lang('member.withdrawal_detail.transactionNo') }}</text>
<text class="value">{{ detail.withdraw_no }}</text> <text class="value">{{ detail.withdraw_no }}</text>
</view> </view>
<view class="line-wrap"> <view class="line-wrap">
<text class="label">{{ $lang('member.withdrawalDetail.serviceFee') }}</text> <text class="label">{{ $lang('member.withdrawal_detail.serviceFee') }}</text>
<text class="value">￥{{ detail.service_money }}</text> <text class="value">￥{{ detail.service_money }}</text>
</view> </view>
<view class="line-wrap"> <view class="line-wrap">
<text class="label">{{ $lang('member.withdrawalDetail.applyTime') }}</text> <text class="label">{{ $lang('member.withdrawal_detail.applyTime') }}</text>
<text class="value">{{ $util.timeStampTurnTime(detail.apply_time) }}</text> <text class="value">{{ $util.timeStampTurnTime(detail.apply_time) }}</text>
</view> </view>
<view class="line-wrap" v-if="detail.status"> <view class="line-wrap" v-if="detail.status">
<text class="label">{{ $lang('member.withdrawalDetail.auditTime') }}</text> <text class="label">{{ $lang('member.withdrawal_detail.auditTime') }}</text>
<text class="value">{{ $util.timeStampTurnTime(detail.audit_time) }}</text> <text class="value">{{ $util.timeStampTurnTime(detail.audit_time) }}</text>
</view> </view>
<view class="line-wrap" v-if="detail.bank_name"> <view class="line-wrap" v-if="detail.bank_name">
<text class="label">{{ $lang('member.withdrawalDetail.bankName') }}</text> <text class="label">{{ $lang('member.withdrawal_detail.bankName') }}</text>
<text class="value">{{ detail.bank_name }}</text> <text class="value">{{ detail.bank_name }}</text>
</view> </view>
<view class="line-wrap"> <view class="line-wrap">
<text class="label">{{ $lang('member.withdrawalDetail.receivingAccount') }}</text> <text class="label">{{ $lang('member.withdrawal_detail.receivingAccount') }}</text>
<text class="value">{{ detail.account_number }}</text> <text class="value">{{ detail.account_number }}</text>
</view> </view>
<view class="line-wrap" v-if="detail.status == -1 && detail.refuse_reason"> <view class="line-wrap" v-if="detail.status == -1 && detail.refuse_reason">
<text class="label">{{ $lang('member.withdrawalDetail.refuseReason') }}</text> <text class="label">{{ $lang('member.withdrawal_detail.refuseReason') }}</text>
<text class="value">{{ detail.refuse_reason }}</text> <text class="value">{{ detail.refuse_reason }}</text>
</view> </view>
<view class="line-wrap" v-if="detail.status == 2"> <view class="line-wrap" v-if="detail.status == 2">
<text class="label">{{ $lang('member.withdrawalDetail.transferTypeName') }}</text> <text class="label">{{ $lang('member.withdrawal_detail.transferTypeName') }}</text>
<text class="value">{{ detail.transfer_type_name }}</text> <text class="value">{{ detail.transfer_type_name }}</text>
</view> </view>
<view class="line-wrap" v-if="detail.status == 2"> <view class="line-wrap" v-if="detail.status == 2">
<text class="label">{{ $lang('member.withdrawalDetail.transferTime') }}</text> <text class="label">{{ $lang('member.withdrawal_detail.transferTime') }}</text>
<text class="value">{{ $util.timeStampTurnTime(detail.payment_time) }}</text> <text class="value">{{ $util.timeStampTurnTime(detail.payment_time) }}</text>
</view> </view>
</view> </view>

26
pages_tool/order/refund_batch.vue
View File

@@ -15,32 +15,32 @@
<view class="refund-form"> <view class="refund-form">
<view class="item-wrap" @click="openPopup('refundReasonPopup')"> <view class="item-wrap" @click="openPopup('refundReasonPopup')">
<view class="label">{{ $lang('order.refundBatch.form.refundReason') }}</view> <view class="label">{{ $lang('order.refund_batch.form.refundReason') }}</view>
<view class="cont reason"> <view class="cont reason">
<text class="color-tip" v-if="!refund_reason.length">{{ $lang('order.refundBatch.form.pleaseSelect') }}</text> <text class="color-tip" v-if="!refund_reason.length">{{ $lang('order.refund_batch.form.pleaseSelect') }}</text>
<text class="color-tip" v-else>{{ refund_reason }}</text> <text class="color-tip" v-else>{{ refund_reason }}</text>
</view> </view>
<text class="iconfont icon-right"></text> <text class="iconfont icon-right"></text>
</view> </view>
<view class="item-wrap"> <view class="item-wrap">
<view class="label">{{ $lang('order.refundBatch.form.refundType') }}</view> <view class="label">{{ $lang('order.refund_batch.form.refundType') }}</view>
<view class="cont color-base-text" v-if="refund_type == 1">{{ $lang('order.refundBatch.form.refundOnly') }}</view> <view class="cont color-base-text" v-if="refund_type == 1">{{ $lang('order.refund_batch.form.refundOnly') }}</view>
<view class="cont color-base-text" v-else>{{ $lang('order.refundBatch.form.returnRefund') }}</view> <view class="cont color-base-text" v-else>{{ $lang('order.refund_batch.form.returnRefund') }}</view>
</view> </view>
<view class="item-wrap"> <view class="item-wrap">
<view class="label">{{ $lang('order.refundBatch.form.refundAmount') }}</view> <view class="label">{{ $lang('order.refund_batch.form.refundAmount') }}</view>
<view class="cont color-base-text">{{ $lang('common.currencySymbol') }}{{ refund_data.refund_money }}</view> <view class="cont color-base-text">{{ $lang('common.currencySymbol') }}{{ refund_data.refund_money }}</view>
</view> </view>
</view> </view>
<view class="refund-form"> <view class="refund-form">
<view class="item-wrap"><view class="label active">{{ $lang('order.refundBatch.form.refundRemark') }}</view></view> <view class="item-wrap"><view class="label active">{{ $lang('order.refund_batch.form.refundRemark') }}</view></view>
<!-- #ifdef MP-WEIXIN --> <!-- #ifdef MP-WEIXIN -->
<textarea <textarea
v-if="!showText" v-if="!showText"
class="newText" class="newText"
:placeholder="$lang('order.refundBatch.form.remarkPlaceholder')" :placeholder="$lang('order.refund_batch.form.remarkPlaceholder')"
placeholder-class="color-tip font-size-tag" placeholder-class="color-tip font-size-tag"
:auto-height="true" :auto-height="true"
v-model="refund_remark" v-model="refund_remark"
@@ -49,7 +49,7 @@
<!-- #ifdef H5 --> <!-- #ifdef H5 -->
<textarea <textarea
class="newText" class="newText"
:placeholder="$lang('order.refundBatch.form.remarkPlaceholder')" :placeholder="$lang('order.refund_batch.form.remarkPlaceholder')"
@blur="textBlur()" @blur="textBlur()"
placeholder-class="color-tip font-size-tag" placeholder-class="color-tip font-size-tag"
:auto-height="true" :auto-height="true"
@@ -68,7 +68,7 @@
<uni-popup ref="refundReasonPopup" type="bottom" @change="change()"> <uni-popup ref="refundReasonPopup" type="bottom" @change="change()">
<view class="refund-reason-popup popup"> <view class="refund-reason-popup popup">
<view class="popup-header"> <view class="popup-header">
<view><text class="tit">{{ $lang('order.refundBatch.reasonPopup.title') }}</text></view> <view><text class="tit">{{ $lang('order.refund_batch.reasonPopup.title') }}</text></view>
<view class="align-right" @click="closePopup('refundReasonPopup')"><text class="iconfont icon-close"></text></view> <view class="align-right" @click="closePopup('refundReasonPopup')"><text class="iconfont icon-close"></text></view>
</view> </view>
<view class="popup-body"> <view class="popup-body">
@@ -82,7 +82,7 @@
</scroll-view> </scroll-view>
</view> </view>
<view class="popup-footer" :class="{ 'bottom-safe-area': isIphoneX }"> <view class="popup-footer" :class="{ 'bottom-safe-area': isIphoneX }">
<view class="confirm-btn color-base-bg" @click="closePopup('refundReasonPopup')">{{ $lang('order.refundBatch.reasonPopup.confirm') }}</view> <view class="confirm-btn color-base-bg" @click="closePopup('refundReasonPopup')">{{ $lang('order.refund_batch.reasonPopup.confirm') }}</view>
</view> </view>
</view> </view>
</uni-popup> </uni-popup>
@@ -164,7 +164,7 @@ export default {
this.refund_data = res.data; this.refund_data = res.data;
if (this.$refs.loadingCover) this.$refs.loadingCover.hide(); if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
} else { } else {
this.$util.showToast({ title: this.$lang('order.refundBatch.toast.noRefundInfo') }); this.$util.showToast({ title: this.$lang('order.refund_batch.toast.noRefundInfo') });
setTimeout(() => { setTimeout(() => {
this.$util.redirectTo('/pages_order/list'); this.$util.redirectTo('/pages_order/list');
}, 1000); }, 1000);
@@ -241,7 +241,7 @@ export default {
}, },
verify() { verify() {
if (this.refund_reason == '') { if (this.refund_reason == '') {
this.$util.showToast({ title: this.$lang('order.refundBatch.validate.pleaseSelectRefundReason') }); this.$util.showToast({ title: this.$lang('order.refund_batch.validate.pleaseSelectRefundReason') });
return false; return false;
} }
return true; return true;