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

refactor: 统一项目内国际化key的命名空间格式

Browse Source 
本次提交对全项目的国际化调用进行了规范化重构：
1. 为中文/英文语言包新增了avatar和gender的别名映射，兼容旧有headImg/sex写法
2. 修正了lang.js中的注释路径错误
3. 将所有页面和组件内的$lang调用从短路径改为带业务模块前缀的完整命名空间路径，例如将$lang('title')改为$lang('article.list.title')
4. 优化了i18n-lazy.js的注释说明，补充了正确的key命名格式示例
5. 统一了分销、订单、会员等模块的国际化key层级，确保所有语言调用路径一致
This commit is contained in:
ZF Sun
2026-07-04 09:24:35 +08:00
parent 92e8823566
commit 783c10fc62
98 changed files with 1543 additions and 1530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
pages_promotion/fenxiao/apply.vue
View File

@@ -13,7 +13,7 @@
<view class="image" :class="fenXiaoAgreement.agreement.img ? '' : 'color-base-bg'">
<image v-if="fenXiaoAgreement.agreement.img" class="apply-adv" :src="$util.img(fenXiaoAgreement.agreement.img)" mode="widthFix" style="width: 100%;" show-menu-by-longpress/>
<view class="bg ns-gradient-otherpages-fenxiao-apply-apply-bg" v-else>
<view class="bg-title"><text>{{ $lang('pleaseFillApplyInfo') }}</text></view>
<view class="bg-title"><text>{{ $lang('fenxiao.apply.pleaseFillApplyInfo') }}</text></view>
<view class="bg-img">
<image :src="$util.img('public/uniapp/fenxiao/apply/edit.png')" mode="scaleToFill" show-menu-by-longpress></image>
</view>
@@ -24,44 +24,44 @@
<view class="app-info">
<view class="info">
<view class="apply-item">
<view class="title">{{ $lang('inviter') }}</view>
<text class="shuru">{{ sourceMemberInfo.fenxiao_name || $lang('none') }}</text>
<view class="title">{{ $lang('fenxiao.apply.inviter') }}</view>
<text class="shuru">{{ sourceMemberInfo.fenxiao_name || $lang('fenxiao.apply.none') }}</text>
</view>
<view class="apply-item">
<view class="title">{{ fenxiaoWords.fenxiao_name }}{{ $lang('nameLabel') }}</view>
<input class="input" type="text" maxlength="30" :placeholder="$lang('namePlaceholder', { name: fenxiaoWords.fenxiao_name })" v-model="formData.fenXiaoName" placeholder-class="pla-cla" />
<view class="title">{{ fenxiaoWords.fenxiao_name }}{{ $lang('fenxiao.apply.nameLabel') }}</view>
<input class="input" type="text" maxlength="30" :placeholder="$lang('fenxiao.apply.namePlaceholder', { name: fenxiaoWords.fenxiao_name })" v-model="formData.fenXiaoName" placeholder-class="pla-cla" />
</view>
<view class="apply-item">
<view class="title">{{ $lang('mobile') }}</view>
<input class="input" type="number" :placeholder="$lang('mobilePlaceholder')" maxlength="11" v-model="formData.mobile" placeholder-class="pla-cla" />
<view class="title">{{ $lang('fenxiao.apply.mobile') }}</view>
<input class="input" type="number" :placeholder="$lang('fenxiao.apply.mobilePlaceholder')" maxlength="11" v-model="formData.mobile" placeholder-class="pla-cla" />
</view>
<view class="apply-xy" v-if="isAgreement" @click="ckeckedRuler()">
<view class="iconfont" :class="isChecked ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'">
</view>
{{ $lang('haveReadAndUnderstand') }}
<text class="color-base-text" @click.stop="openPopup">{{ $lang('applyAgreement', { name: fenxiaoWords.fenxiao_name }) }}</text>
{{ $lang('fenxiao.apply.haveReadAndUnderstand') }}
<text class="color-base-text" @click.stop="openPopup">{{ $lang('fenxiao.apply.applyAgreement', { name: fenxiaoWords.fenxiao_name }) }}</text>
</view>
<view class="apply-btn">
<button @click="applyFenXiao" class="color-base-bg">{{ $lang('applyBecome', { name: fenxiaoWords.fenxiao_name }) }}</button>
<button @click="applyFenXiao" class="color-base-bg">{{ $lang('fenxiao.apply.applyBecome', { name: fenxiaoWords.fenxiao_name }) }}</button>
</view>
</view>
</view>
<view class="apply-message-wrap" v-if="fenxiaoConfig.fenxiao_condition == 2 || fenxiaoConfig.fenxiao_condition == 3">
<view class="apply-message">
<view class="apply-message-title color-base-bg-before">{{ $lang('applyConditionTitle') }}</view>
<view class="apply-message-title color-base-bg-before">{{ $lang('fenxiao.apply.applyConditionTitle') }}</view>
<text class="apply-message-info font-size-goods-tag" v-if="fenxiaoConfig.fenxiao_condition == 2">
{{ $lang('conditionConsumeCount', { name: fenxiaoWords.fenxiao_name, count: fenxiaoConfig.consume_count }) }}
{{ $lang('fenxiao.apply.conditionConsumeCount', { name: fenxiaoWords.fenxiao_name, count: fenxiaoConfig.consume_count }) }}
</text>
<text class="apply-message-info font-size-goods-tag" v-if="fenxiaoConfig.fenxiao_condition == 3">
{{ $lang('conditionConsumeMoney', { name: fenxiaoWords.fenxiao_name, money: fenxiaoConfig.consume_money }) }}
{{ $lang('fenxiao.apply.conditionConsumeMoney', { name: fenxiaoWords.fenxiao_name, money: fenxiaoConfig.consume_money }) }}
</text>
</view>
</view>
<view class="app-info-list" v-if="fenxiaoConfig.fenxiao_condition == 4">
<view class="apply-message">
<view class="apply-message-title color-base-bg-before">{{ $lang('applyConditionTitle') }}</view>
<text class="apply-message-info font-size-goods-tag">{{ $lang('conditionBuyGoods', { name: fenxiaoWords.fenxiao_name }) }}</text>
<view class="apply-message-title color-base-bg-before">{{ $lang('fenxiao.apply.applyConditionTitle') }}</view>
<text class="apply-message-info font-size-goods-tag">{{ $lang('fenxiao.apply.conditionBuyGoods', { name: fenxiaoWords.fenxiao_name }) }}</text>
</view>
<view class="goods-list" v-for="(item, index) in goodsList" :key="index" @click="toDetail(item)">
<view class="goods-img">
@@ -79,7 +79,7 @@
</view>
</view>
<view class="content-lists" v-if="isShow" @click="onOpen()">
{{ isOpen ? $lang('expandMore') : $lang('collapse') }}
{{ isOpen ? $lang('fenxiao.apply.expandMore') : $lang('fenxiao.apply.collapse') }}
<text class="iconfont icon-unfold" style="font-weight: bold;" v-if="isOpen"></text>
<text class="iconfont icon-fold" v-else></text>
</view>
@@ -89,16 +89,16 @@
<view class="empty" v-else-if="basicsConfig.is_apply == 0" style="margin-top:40rpx;">
<block v-if="fenxiaoConfig.fenxiao_condition == 2 || fenxiaoConfig.fenxiao_condition == 3">
<image :src="$util.img('public/uniapp/fenxiao/index/no-fenxiao.png')" mode="widthFix" show-menu-by-longpress></image>
<text v-if="fenxiaoConfig.fenxiao_condition == 2">{{ $lang('conditionConsumeCount', { name: fenxiaoWords.fenxiao_name, count: fenxiaoConfig.consume_count }) }}</text>
<text v-if="fenxiaoConfig.fenxiao_condition == 2">{{ $lang('fenxiao.apply.conditionConsumeCount', { name: fenxiaoWords.fenxiao_name, count: fenxiaoConfig.consume_count }) }}</text>
<text v-if="fenxiaoConfig.fenxiao_condition == 3">
{{ $lang('conditionConsumeMoney', { name: fenxiaoWords.fenxiao_name, money: fenxiaoConfig.consume_money | moneyFormat }) }}
{{ $lang('fenxiao.apply.conditionConsumeMoney', { name: fenxiaoWords.fenxiao_name, money: fenxiaoConfig.consume_money | moneyFormat }) }}
</text>
</block>
<view class="apply-wrap" v-if="fenxiaoConfig.fenxiao_condition == 4">
<view class="app-info-list">
<view class="apply-message">
<view class="apply-message-title color-base-bg-before">{{ $lang('becomeConditionTitle') }}</view>
<text class="apply-message-info font-size-goods-tag">{{ $lang('becomeConditionBuyGoods', { name: fenxiaoWords.fenxiao_name }) }}</text>
<view class="apply-message-title color-base-bg-before">{{ $lang('fenxiao.apply.becomeConditionTitle') }}</view>
<text class="apply-message-info font-size-goods-tag">{{ $lang('fenxiao.apply.becomeConditionBuyGoods', { name: fenxiaoWords.fenxiao_name }) }}</text>
</view>
<view class="goods-list" v-for="(item, index) in goodsList" :key="index" @click="toDetail(item)">
<view class="goods-img">
@@ -114,7 +114,7 @@
</view>
</view>
<view class="content-lists" v-if="isShow" @click="onOpen()">
{{ isOpen ? $lang('expandMore') : $lang('collapse') }}
{{ isOpen ? $lang('fenxiao.apply.expandMore') : $lang('fenxiao.apply.collapse') }}
<text class="iconfont icon-unfold" style="font-weight: bold;" v-if="isOpen"></text>
<text class="iconfont icon-fold" v-else></text>
</view>
@@ -123,15 +123,15 @@
</view>
<view class="empty" v-else>
<image :src="$util.img('public/uniapp/fenxiao/index/no-fenxiao.png')" mode="widthFix" show-menu-by-longpress></image>
<text>{{ $lang('notFenxiao') }}</text>
<text>{{ $lang('fenxiao.apply.notFenxiao') }}</text>
</view>
</view>
<view class="empty" v-else>
<image :src="$util.img('public/uniapp/fenxiao/index/no-fenxiao.png')" mode="widthFix" show-menu-by-longpress></image>
<text v-if="status == 1">{{ $lang('applyPending', { name: fenxiaoWords.fenxiao_name }) }}</text>
<text v-if="status == 1">{{ $lang('fenxiao.apply.applyPending', { name: fenxiaoWords.fenxiao_name }) }}</text>
<block v-else-if="status == -1">
<text>{{ $lang('applyRejected', { name: fenxiaoWords.fenxiao_name }) }}</text>
<view class="again-btn color-base-bg" @click="againApply">{{ $lang('reapply') }}</view>
<text>{{ $lang('fenxiao.apply.applyRejected', { name: fenxiaoWords.fenxiao_name }) }}</text>
<view class="again-btn color-base-bg" @click="againApply">{{ $lang('fenxiao.apply.reapply') }}</view>
</block>
</view>
<view @touchmove.prevent v-if="fenXiaoAgreement.document">
@@ -162,8 +162,8 @@
isShow: true,
isIphoneX: false,
// 推荐人信息
sourceMemberInfo: {
fenxiao_name: ''
sourceMemberInfo: {
fenxiao_name: ''
},
formData: {
fenXiaoName: '',
@@ -191,7 +191,7 @@
setTimeout( () => {
if (!this.addonIsExist.fenxiao) {
this.$util.showToast({
title: this.$lang('merchantNotOpenFenxiao'),
title: this.$lang('fenxiao.apply.merchantNotOpenFenxiao'),
mask: true,
duration: 2000
});
@@ -207,7 +207,7 @@
async onShow() {
this.isIphoneX = this.$util.uniappIsIPhoneX();
if (this.fenxiaoWords && this.fenxiaoWords.fenxiao_name) this.$langConfig.title(this.fenxiaoWords.fenxiao_name + this.$lang('applySuffix'));
if (this.fenxiaoWords && this.fenxiaoWords.fenxiao_name) this.$langConfig.title(this.fenxiaoWords.fenxiao_name + this.$lang('fenxiao.apply.applySuffix'));
if (this.storeToken) {
this.applyStatus();
@@ -275,7 +275,7 @@
if (!this.fenXiaoValidata()) return;
if (this.isAgreement && !this.isChecked) {
this.$util.showToast({
title: this.$lang('pleaseReadAndCheckAgreement')
title: this.$lang('fenxiao.apply.pleaseReadAndCheckAgreement')
});
return;
}
@@ -326,22 +326,22 @@
closePopup() {
this.$refs.applyPopup.close();
},
fenXiaoValidata() {
let rule = [{
name: 'fenXiaoName',
checkType: 'required',
errorMsg: this.$lang('pleaseEnterName', { name: this.fenxiaoWords.fenxiao_name })
},
{
name: 'mobile',
checkType: 'required',
errorMsg: this.$lang('pleaseEnterMobile')
},
{
name: 'mobile',
checkType: 'phoneno',
errorMsg: this.$lang('pleaseEnterValidMobile')
}
fenXiaoValidata() {
let rule = [{
name: 'fenXiaoName',
checkType: 'required',
errorMsg: this.$lang('fenxiao.apply.pleaseEnterName', { name: this.fenxiaoWords.fenxiao_name })
},
{
name: 'mobile',
checkType: 'required',
errorMsg: this.$lang('fenxiao.apply.pleaseEnterMobile')
},
{
name: 'mobile',
checkType: 'phoneno',
errorMsg: this.$lang('fenxiao.apply.pleaseEnterValidMobile')
}
];
var checkRes = validate.check(this.formData, rule);
if (checkRes) {

12
pages_promotion/fenxiao/child_fenxiao.vue
View File

@@ -16,20 +16,20 @@
<view v-if="item.level_name" class="title color-base-border color-base-text">{{
item.level_name }}</view>
</view>
<view class="color-tip font-size-goods-tag">{{ $lang('joinTime') }}{{
<view class="color-tip font-size-goods-tag">{{ $lang('fenxiao.child_fenxiao.joinTime') }}{{
$util.timeStampTurnTime(item.bind_fenxiao_time).substring(0, 10) }}</view>
</view>
<view class="consume-info">
<view><text>{{ item.one_child_fenxiao_num + item.one_child_num }}</text>{{ $lang('peopleUnit') }}</view>
<view><text>{{ item.order_num }}</text>{{ $lang('orderUnit') }}</view>
<view><text>{{ item.order_money | moneyFormat }}</text>{{ $lang('currencyUnit') }}</view>
<view><text>{{ item.one_child_fenxiao_num + item.one_child_num }}</text>{{ $lang('fenxiao.child_fenxiao.peopleUnit') }}</view>
<view><text>{{ item.order_num }}</text>{{ $lang('fenxiao.child_fenxiao.orderUnit') }}</view>
<view><text>{{ item.order_money | moneyFormat }}</text>{{ $lang('fenxiao.child_fenxiao.currencyUnit') }}</view>
</view>
</view>
</view>
</view>
</view>
<block v-if="teamList.length == 0 && emptyShow">
<ns-empty :text="$lang('noData')" :isIndex="false"></ns-empty>
<ns-empty :text="$lang('fenxiao.child_fenxiao.noData')" :isIndex="false"></ns-empty>
</block>
</block>
</mescroll-uni>
@@ -54,7 +54,7 @@ export default {
setTimeout(() => {
if (!this.addonIsExist.fenxiao) {
this.$util.showToast({
title: this.$lang('merchantNotOpenFenxiao'),
title: this.$lang('fenxiao.child_fenxiao.merchantNotOpenFenxiao'),
mask: true,
duration: 2000
});

28
pages_promotion/fenxiao/goods_list.vue
View File

@@ -9,7 +9,7 @@
<view class="uni-scroll-view-content">
<!-- #endif -->
<view class="quick-nav-item" :class="{ selected: categoryId == 0 }"
@click="changeCategory(0)">{{ $lang('all') }}</view>
@click="changeCategory(0)">{{ $lang('fenxiao.goods_list.all') }}</view>
<view class="quick-nav-item" v-for="item in categoryList" :key="item.category_id"
:class="{ selected: categoryId == item.category_id }"
@click="changeCategory(item.category_id)">
@@ -39,24 +39,24 @@
</view>
<view class="goods-share" @click.stop="shareFn('goods', index)">
<text class="icondiy icon-system-share"></text>
<text class="txt" v-if="!is_fenxiao">{{ $lang('share') }}</text>
<text class="txt" v-else>{{ $lang('earnCommission', { money: item.commission_money }) }}</text>
<text class="txt" v-if="!is_fenxiao">{{ $lang('fenxiao.goods_list.share') }}</text>
<text class="txt" v-else>{{ $lang('fenxiao.goods_list.earnCommission', { money: item.commission_money }) }}</text>
</view>
</view>
</view>
</view>
<view class="empty" v-if="goodsList.length == 0">
<ns-empty :isIndex="false" :text="$lang('noGoods')" textColor="#fff"></ns-empty>
<ns-empty :isIndex="false" :text="$lang('fenxiao.goods_list.noGoods')" textColor="#fff"></ns-empty>
</view>
</view>
</block>
</mescroll-uni>
<view class="active-btn" v-if="goodsList.length">
<!-- #ifdef MP -->
<button class="share-btn" :plain="true" open-type="share">{{ $lang('shareFriends') }}</button>
<button class="share-btn" :plain="true" open-type="share">{{ $lang('fenxiao.goods_list.shareFriends') }}</button>
<text class="tag">|</text>
<!-- #endif -->
<text class="btn" @click="shareFn('fenxiao')">{{ $lang('generatePoster') }}</text>
<text class="btn" @click="shareFn('fenxiao')">{{ $lang('fenxiao.goods_list.generatePoster') }}</text>
</view>
<loading-cover ref="loadingCover"></loading-cover>
@@ -64,13 +64,13 @@
<view @touchmove.prevent.stop>
<uni-popup ref="sharePopup" type="bottom" class="share-popup">
<view>
<view class="share-title">{{ $lang('shareTitle') }}</view>
<view class="share-title">{{ $lang('fenxiao.goods_list.shareTitle') }}</view>
<view class="share-content">
<!-- #ifdef MP -->
<view class="share-box">
<button class="share-btn" :plain="true" open-type="share">
<view class="iconfont icon-share-friend"></view>
<text>{{ $lang('shareToFriends') }}</text>
<text>{{ $lang('fenxiao.goods_list.shareToFriends') }}</text>
</button>
</view>
<!-- #endif -->
@@ -79,7 +79,7 @@
<view class="share-box" v-if="goodsCircle">
<button class="share-btn" :plain="true" @click="openBusinessView">
<view class="iconfont icon-haowuquan"></view>
<text>{{ $lang('shareToGoodsCircle') }}</text>
<text>{{ $lang('fenxiao.goods_list.shareToGoodsCircle') }}</text>
</button>
</view>
<!-- #endif -->
@@ -87,19 +87,19 @@
<view class="share-box" @click="openPosterPopup">
<button class="share-btn" :plain="true">
<view class="iconfont icon-pengyouquan"></view>
<text>{{ $lang('generateSharePoster') }}</text>
<text>{{ $lang('fenxiao.goods_list.generateSharePoster') }}</text>
</button>
</view>
<!-- #ifdef H5 -->
<view class="share-box" @click="copyUrl">
<button class="share-btn" :plain="true">
<view class="iconfont icon-fuzhilianjie"></view>
<text>{{ $lang('copyLink') }}</text>
<text>{{ $lang('fenxiao.goods_list.copyLink') }}</text>
</button>
</view>
<!-- #endif -->
</view>
<view class="share-footer" @click="closeSharePopup"><text>{{ $lang('cancelShare') }}</text></view>
<view class="share-footer" @click="closeSharePopup"><text>{{ $lang('fenxiao.goods_list.cancelShare') }}</text></view>
</view>
</uni-popup>
</view>
@@ -112,10 +112,10 @@
<image :src="$util.img(poster)" show-menu-by-longpress />
</view>
<!-- #ifdef MP || APP-PLUS -->
<view class="save" @click="saveGoodsPoster()">{{ $lang('saveImage') }}</view>
<view class="save" @click="saveGoodsPoster()">{{ $lang('fenxiao.goods_list.saveImage') }}</view>
<!-- #endif -->
<!-- #ifdef H5 -->
<view class="save">{{ $lang('longPressSaveImage') }}</view>
<view class="save">{{ $lang('fenxiao.goods_list.longPressSaveImage') }}</view>
<!-- #endif -->
</view>
<view class="close iconfont icon-close" @click="closePosterPopup()"></view>

94
pages_promotion/fenxiao/index.vue
View File

@@ -18,8 +18,8 @@
:src="$util.img('public/uniapp/fenxiao/index/commissionFission-level.png')"
alt="" class="level-icon">{{ info.level_name }}</p>
</view>
<view class="recommend">{{ $lang('superiorAgent') }}：{{ info.parent_name ? info.parent_name : $lang('headquarters') }}</view>
<view class="recommend">{{ $lang('invitedSuccess', { count: teamNum.num }) }}<text class="iconfont icon-right"
<view class="recommend">{{ $lang('fenxiao.index.superiorAgent') }}：{{ info.parent_name ? info.parent_name : $lang('fenxiao.index.headquarters') }}</view>
<view class="recommend">{{ $lang('fenxiao.index.invitedSuccess', { count: teamNum.num }) }}<text class="iconfont icon-right"
style="font-size: 24rpx;"></text></view>
</view>
<!-- <view class="promote-rules font-size-tag" @click="$util.redirectTo('/pages_promotion/fenxiao/promote')">
@@ -40,10 +40,10 @@
<view class="fenxiao-index-allmoney">
<view class="allmoney-top-money">
<view class="allmoney-top">
<view class="font-size-sub">{{ $lang('withdrawable', { withdraw: fenxiaoWords.withdraw }) }}</view>
<view class="font-size-sub">{{ $lang('fenxiao.index.withdrawable', { withdraw: fenxiaoWords.withdraw }) }}</view>
<view class="withdrawal-record"
@click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_list')">
{{ $lang('withdrawDetail') }}
{{ $lang('fenxiao.index.withdrawDetail') }}
<text class="iconfont icon-right"></text>
</view>
</view>
@@ -61,18 +61,18 @@
</view> -->
<view class="allmoney-all-wrap"
@click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_list')">
<view class="title">{{ $lang('withdrawing') }}<text class="iconfont icon-right"
<view class="title">{{ $lang('fenxiao.index.withdrawing') }}<text class="iconfont icon-right"
style="font-size: 24rpx;"></text></view>
<view class="money price-font">{{ info.account_withdraw_apply | moneyFormat }}</view>
</view>
<view class="allmoney-all-wrap"
@click="$util.redirectTo('/pages_promotion/fenxiao/order', { type: 1 })">
<view class="title">{{ $lang('pendingDeposit') }}<text class="iconfont icon-right"
<view class="title">{{ $lang('fenxiao.index.pendingDeposit') }}<text class="iconfont icon-right"
style="font-size: 24rpx;"></text></view>
<view class="money price-font">{{ info.in_progress_money | moneyFormat }}</view>
</view>
</view>
<view class="withdraw-btn" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_apply')">{{ $lang('withdraw') }}
<view class="withdraw-btn" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_apply')">{{ $lang('fenxiao.index.withdraw') }}
</view>
</view>
@@ -90,8 +90,8 @@
</image>
</view>
<view class="info">
<view class="title">{{ $lang('myFans') }}</view>
<view class="desc">{{ $lang('invitedUsers') }}</view>
<view class="title">{{ $lang('fenxiao.index.myFans') }}</view>
<view class="desc">{{ $lang('fenxiao.index.invitedUsers') }}</view>
</view>
</view>
<view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_list')">
@@ -100,8 +100,8 @@
</image>
</view>
<view class="info">
<view class="title">{{ fenxiaoWords.withdraw + $lang('detail') }}</view>
<view class="desc">{{ $lang('totalAccumulated', { account: fenxiaoWords.account, symbol: $lang('common.currencySymbol'), amount: info.total_commission | moneyFormat }) }}
<view class="title">{{ fenxiaoWords.withdraw + $lang('fenxiao.index.detail') }}</view>
<view class="desc">{{ $lang('fenxiao.index.totalAccumulated', { account: fenxiaoWords.account, symbol: $lang('common.currencySymbol'), amount: info.total_commission | moneyFormat }) }}
</view>
</view>
</view>
@@ -111,8 +111,8 @@
</image>
</view>
<view class="info">
<view class="title">{{ fenxiaoWords.concept + $lang('order') }}</view>
<view class="desc">{{ fenxiaoWords.concept + $lang('orderDetail') }}</view>
<view class="title">{{ fenxiaoWords.concept + $lang('fenxiao.index.order') }}</view>
<view class="desc">{{ fenxiaoWords.concept + $lang('fenxiao.index.orderDetail') }}</view>
</view>
</view>
@@ -121,8 +121,8 @@
<image :src="$util.img('public/uniapp/fenxiao/index/friend.png')" mode="widthFix" show-menu-by-longpress></image>
</view>
<view class="info">
<view class="title">{{ $lang('myInviteCode') }}</view>
<view class="desc">{{ $lang('inviteFriendsEarnRewards') }}</view>
<view class="title">{{ $lang('fenxiao.index.myInviteCode') }}</view>
<view class="desc">{{ $lang('fenxiao.index.inviteFriendsEarnRewards') }}</view>
</view>
</view>
<!-- <view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/promote')">
@@ -211,8 +211,8 @@
<ns-copyright></ns-copyright>
<view class="empty" v-if="!info.fenxiao_id > 0 && showEmpty">
<image :src="$util.img('public/uniapp/fenxiao/index/no-fenxiao.png')" mode="widthFix" show-menu-by-longpress></image>
<text>{{ $lang('notFenxiaoYet', { name: fenxiaoWords.fenxiao_name }) }}</text>
<view @click="$util.redirectTo('/pages_promotion/fenxiao/apply')" class="color-base-bg">{{ $lang('joinNow') }}</view>
<text>{{ $lang('fenxiao.index.notFenxiaoYet', { name: fenxiaoWords.fenxiao_name }) }}</text>
<view @click="$util.redirectTo('/pages_promotion/fenxiao/apply')" class="color-base-bg">{{ $lang('fenxiao.index.joinNow') }}</view>
</view>
<loading-cover ref="loadingCover"></loading-cover>
<ns-login ref="login"></ns-login>
@@ -220,7 +220,7 @@
<uni-popup ref="taskPopup" type="bottom">
<view class="task-popup popup-layer" v-if="levelInfo">
<view class="head-wrap">
<text>{{ $lang('quickUpgradeTips') }}</text>
<text>{{ $lang('fenxiao.index.quickUpgradeTips') }}</text>
<text class="iconfont icon-close" @click="$refs.taskPopup.close()"></text>
</view>
<view class="body-wrap">
@@ -228,7 +228,7 @@
<text class="subordinate-consumption">
{{ item.title }}
<text class="iconfont icon-wenhao" @click="openTips(item)"></text>
<text class="incomplete">{{ item.progress == 100 ? $lang('completed') : $lang('incomplete') }}</text>
<text class="incomplete">{{ item.progress == 100 ? $lang('completed') : $lang('fenxiao.index.incomplete') }}</text>
</text>
<view class="circle">
<progress :percent="item.progress" activeColor="#E7B667" stroke-width="4" />
@@ -236,7 +236,7 @@
<text class="zero">{{ item.value }}</text>
<text>/{{ item.condition }}</text>
<text class="to-complete-box" @click="$util.redirectTo('/pages_promotion/fenxiao/promote')">
<text class="to-complete">{{ item.progress == 100 ? $lang('completed') : $lang('goComplete') }}</text>
<text class="to-complete">{{ item.progress == 100 ? $lang('completed') : $lang('fenxiao.index.goComplete') }}</text>
</text>
</view>
</view>
@@ -246,12 +246,12 @@
<uni-popup type="bottom" ref="tips">
<view class="popup">
<view class="popup-header">
<text class="tit">{{ $lang('tip') }}</text>
<text class="tit">{{ $lang('fenxiao.index.tip') }}</text>
<text class="iconfont icon-close" @click="$refs.tips.close()"></text>
</view>
<view class="popup-body">
<view>{{ tips }}</view>
<view v-if="levelInfo">{{ levelInfo.upgrade_type == 1 ? $lang('anyConditionUpgrade') : $lang('allConditionsUpgrade') }}</view>
<view v-if="levelInfo">{{ levelInfo.upgrade_type == 1 ? $lang('fenxiao.index.anyConditionUpgrade') : $lang('fenxiao.index.allConditionsUpgrade') }}</view>
</view>
</view>
</uni-popup>
@@ -295,7 +295,7 @@ export default {
return;
}
if (this.fenxiaoWords && this.fenxiaoWords.concept) this.$langConfig.title(this.fenxiaoWords.concept + this.$lang('center'));
if (this.fenxiaoWords && this.fenxiaoWords.concept) this.$langConfig.title(this.fenxiaoWords.concept + this.$lang('fenxiao.index.center'));
this.checkFenxiaoIsStart();
this.getTemplateId();
@@ -305,7 +305,7 @@ export default {
setTimeout(() => {
if (!this.addonIsExist.fenxiao) {
this.$util.showToast({
title: this.$lang('merchantNotOpenFenxiao'),
title: this.$lang('fenxiao.index.merchantNotOpenFenxiao'),
mask: true,
duration: 2000
});
@@ -346,7 +346,7 @@ export default {
this.getFenxiaoDetail();
} else {
this.$util.showToast({
title: this.$lang('merchantNotOpenFenxiao'),
title: this.$lang('fenxiao.index.merchantNotOpenFenxiao'),
mask: true,
duration: 2000
});
@@ -366,7 +366,7 @@ export default {
if (res.data) {
if (res.data.status == -1) {
this.$util.showToast({
title: this.$lang('fenxiaoFrozen')
title: this.$lang('fenxiao.index.fenxiaoFrozen')
});
setTimeout(() => {
this.$util.redirectTo(this.$util.MEMBER_PAGE_URL);
@@ -474,9 +474,9 @@ export default {
if (level.one_fenxiao_order_num > 0) {
let task = {
title: this.$lang('subordinateConsumption'),
desc: this.$lang('subordinateOrderCount', { count: level.one_fenxiao_order_num }),
tips: this.$lang('subordinateOrderCountTip'),
title: this.$lang('fenxiao.index.subordinateConsumption'),
desc: this.$lang('fenxiao.index.subordinateOrderCount', { count: level.one_fenxiao_order_num }),
tips: this.$lang('fenxiao.index.subordinateOrderCountTip'),
condition: level.one_fenxiao_order_num,
value: this.info.one_fenxiao_order_num,
progress: parseFloat(this.info.one_fenxiao_order_num) > parseFloat(level.one_fenxiao_order_num) ?
@@ -488,9 +488,9 @@ export default {
}
if (level.one_fenxiao_total_order > 0) {
let task = {
title: this.$lang('subordinateConsumption'),
desc: this.$lang('subordinateOrderAmount', { amount: this.moneyFormat(level.one_fenxiao_total_order) }),
tips: this.$lang('subordinateOrderAmountTip'),
title: this.$lang('fenxiao.index.subordinateConsumption'),
desc: this.$lang('fenxiao.index.subordinateOrderAmount', { amount: this.moneyFormat(level.one_fenxiao_total_order) }),
tips: this.$lang('fenxiao.index.subordinateOrderAmountTip'),
condition: this.moneyFormat(level.one_fenxiao_total_order),
value: this.info.one_fenxiao_total_order,
progress: parseFloat(this.info.one_fenxiao_total_order) > parseFloat(level.one_fenxiao_total_order) ?
@@ -502,9 +502,9 @@ export default {
}
if (level.one_fenxiao_order_money > 0) {
let task = {
title: this.$lang('subordinateConsumption'),
desc: this.$lang('subordinateCommissionAmount', { account: this.fenxiaoWords.account, amount: this.moneyFormat(level.one_fenxiao_order_money) }),
tips: this.$lang('subordinateCommissionAmountTip', { account: this.fenxiaoWords.account }),
title: this.$lang('fenxiao.index.subordinateConsumption'),
desc: this.$lang('fenxiao.index.subordinateCommissionAmount', { account: this.fenxiaoWords.account, amount: this.moneyFormat(level.one_fenxiao_order_money) }),
tips: this.$lang('fenxiao.index.subordinateCommissionAmountTip', { account: this.fenxiaoWords.account }),
condition: this.moneyFormat(level.one_fenxiao_order_money),
value: this.info.one_fenxiao_order_money,
progress: parseFloat(this.info.one_fenxiao_order_money) > parseFloat(level.one_fenxiao_order_money) ?
@@ -516,9 +516,9 @@ export default {
}
if (level.order_num > 0) {
let task = {
title: this.$lang('selfConsumption'),
desc: this.$lang('selfOrderCount', { count: level.order_num }),
tips: this.$lang('selfOrderCountTip'),
title: this.$lang('fenxiao.index.selfConsumption'),
desc: this.$lang('fenxiao.index.selfOrderCount', { count: level.order_num }),
tips: this.$lang('fenxiao.index.selfOrderCountTip'),
condition: level.order_num,
value: this.info.order_num,
progress: parseFloat(this.info.order_num) > parseFloat(level.order_num) ? 100 : ((parseFloat(this.info.order_num) / parseFloat(level.order_num)) * 100).toFixed(2)
@@ -528,9 +528,9 @@ export default {
}
if (level.order_money > 0) {
let task = {
title: this.$lang('selfConsumption'),
desc: this.$lang('selfOrderAmount', { amount: this.moneyFormat(level.order_money) }),
tips: this.$lang('selfOrderAmountTip'),
title: this.$lang('fenxiao.index.selfConsumption'),
desc: this.$lang('fenxiao.index.selfOrderAmount', { amount: this.moneyFormat(level.order_money) }),
tips: this.$lang('fenxiao.index.selfOrderAmountTip'),
condition: this.moneyFormat(level.order_money),
value: this.info.order_money,
progress: parseFloat(this.info.order_money) > parseFloat(level.order_money) ?
@@ -542,9 +542,9 @@ export default {
}
if (level.one_child_num > 0) {
let task = {
title: this.$lang('inviteFriends'),
desc: this.$lang('inviteFriendCount', { count: level.one_child_num }),
tips: this.$lang('inviteFriendCountTip'),
title: this.$lang('fenxiao.index.inviteFriends'),
desc: this.$lang('fenxiao.index.inviteFriendCount', { count: level.one_child_num }),
tips: this.$lang('fenxiao.index.inviteFriendCountTip'),
condition: level.one_child_num,
value: this.info.one_child_num,
progress: parseFloat(this.info.one_child_num) > parseFloat(level.one_child_num) ?
@@ -556,9 +556,9 @@ export default {
}
if (level.one_child_fenxiao_num > 0) {
let task = {
title: this.$lang('inviteFriends'),
desc: this.$lang('inviteFenxiaoCount', { count: level.one_child_fenxiao_num }),
tips: this.$lang('inviteFenxiaoCountTip'),
title: this.$lang('fenxiao.index.inviteFriends'),
desc: this.$lang('fenxiao.index.inviteFenxiaoCount', { count: level.one_child_fenxiao_num }),
tips: this.$lang('fenxiao.index.inviteFenxiaoCountTip'),
condition: level.one_child_fenxiao_num,
value: this.info.one_child_fenxiao_num,
progress: parseFloat(this.info.one_child_fenxiao_num) > parseFloat(level.one_child_fenxiao_num) ?

60
pages_promotion/fenxiao/level.vue
View File

@@ -17,15 +17,15 @@
</view>
<view class="level-rate">
<view class="rate-item" v-if="config.level > 0">
<view class="title">{{ $lang('firstLevelCommissionRate') }}</view>
<view class="title">{{ $lang('fenxiao.level.firstLevelCommissionRate') }}</view>
<view class="rate">{{ item.one_rate }}<text class="percentage">%</text></view>
</view>
<view class="rate-item" v-if="config.level > 1">
<view class="title">{{ $lang('secondLevelCommissionRate') }}</view>
<view class="title">{{ $lang('fenxiao.level.secondLevelCommissionRate') }}</view>
<view class="rate">{{ item.two_rate }}<text class="percentage">%</text></view>
</view>
<view class="rate-item" v-if="config.level > 2">
<view class="title">{{ $lang('thirdLevelCommissionRate') }}</view>
<view class="title">{{ $lang('fenxiao.level.thirdLevelCommissionRate') }}</view>
<view class="rate">{{ item.three_rate }}<text class="percentage">%</text></view>
</view>
</view>
@@ -40,7 +40,7 @@
<view class="level-condition" v-if="levelInfo">
<view class="condition-title">
<view class="title">{{ $lang('quickUpgradeTips') }}</view>
<view class="title">{{ $lang('fenxiao.level.quickUpgradeTips') }}</view>
<view class="rate price-font">
<text class="complete">{{ levelInfo.complete > levelInfo.task_num ? levelInfo.task_num : levelInfo.complete }}</text>
<text class="num">/{{ levelInfo.task_num }}</text>
@@ -54,7 +54,7 @@
<text class="iconfont icon-wenxiao" @click="openTips(item)"></text>
</view>
<view class="status" :class="{'complete': item.progress == 100}">
{{ item.progress == 100 ? $lang('completed') : $lang('incomplete') }}</view>
{{ item.progress == 100 ? $lang('completed') : $lang('fenxiao.level.incomplete') }}</view>
</view>
<view class="progress">
<progress :percent="item.progress" activeColor="#E7B667" stroke-width="4" />
@@ -73,12 +73,12 @@
<uni-popup type="bottom" ref="tips">
<view class="popup">
<view class="popup-header">
<text class="tit">{{ $lang('tip') }}</text>
<text class="tit">{{ $lang('fenxiao.level.tip') }}</text>
<text class="iconfont icon-close" @click="$refs.tips.close()"></text>
</view>
<view class="popup-body">
<view>{{ tips }}</view>
<view v-if="levelInfo">{{ levelInfo.upgrade_type == 1 ? $lang('anyConditionUpgrade') : $lang('allConditionsUpgrade') }}</view>
<view v-if="levelInfo">{{ levelInfo.upgrade_type == 1 ? $lang('fenxiao.level.anyConditionUpgrade') : $lang('fenxiao.level.allConditionsUpgrade') }}</view>
</view>
</view>
</uni-popup>
@@ -114,9 +114,9 @@
if (level.one_fenxiao_order_num > 0) {
let task = {
title: this.$lang('subordinateConsumption'),
desc: this.$lang('subordinateOrderCount', { count: level.one_fenxiao_order_num }),
tips: this.$lang('subordinateOrderCountTip', { count: level.one_fenxiao_order_num }),
title: this.$lang('fenxiao.level.subordinateConsumption'),
desc: this.$lang('fenxiao.level.subordinateOrderCount', { count: level.one_fenxiao_order_num }),
tips: this.$lang('fenxiao.level.subordinateOrderCountTip', { count: level.one_fenxiao_order_num }),
condition: level.one_fenxiao_order_num,
value: this.fenxiaoInfo.one_fenxiao_order_num,
progress: parseFloat(this.fenxiaoInfo.one_fenxiao_order_num) > parseFloat(level.one_fenxiao_order_num) ? 100 : (parseFloat(this.fenxiaoInfo.one_fenxiao_order_num) / parseFloat(level.one_fenxiao_order_num) * 100).toFixed(2)
@@ -126,9 +126,9 @@
}
if (level.one_fenxiao_total_order > 0) {
let task = {
title: this.$lang('subordinateConsumption'),
desc: this.$lang('subordinateOrderAmount', { amount: this.moneyFormat(level.one_fenxiao_total_order) }),
tips: this.$lang('subordinateOrderAmountTip', { amount: this.moneyFormat(level.one_fenxiao_total_order) }),
title: this.$lang('fenxiao.level.subordinateConsumption'),
desc: this.$lang('fenxiao.level.subordinateOrderAmount', { amount: this.moneyFormat(level.one_fenxiao_total_order) }),
tips: this.$lang('fenxiao.level.subordinateOrderAmountTip', { amount: this.moneyFormat(level.one_fenxiao_total_order) }),
condition: this.moneyFormat(level.one_fenxiao_total_order),
value: this.fenxiaoInfo.one_fenxiao_total_order,
progress: parseFloat(this.fenxiaoInfo.one_fenxiao_total_order) > parseFloat(level.one_fenxiao_total_order) ? 100 : (parseFloat(this.fenxiaoInfo.one_fenxiao_total_order) / parseFloat(level.one_fenxiao_total_order) * 100)
@@ -139,9 +139,9 @@
}
if (level.one_fenxiao_order_money > 0) {
let task = {
title: this.$lang('subordinateConsumption'),
desc: this.$lang('subordinateCommissionAmount', { amount: this.moneyFormat(level.one_fenxiao_order_money) }),
tips: this.$lang('subordinateCommissionAmountTip', { amount: this.moneyFormat(level.one_fenxiao_order_money) }),
title: this.$lang('fenxiao.level.subordinateConsumption'),
desc: this.$lang('fenxiao.level.subordinateCommissionAmount', { amount: this.moneyFormat(level.one_fenxiao_order_money) }),
tips: this.$lang('fenxiao.level.subordinateCommissionAmountTip', { amount: this.moneyFormat(level.one_fenxiao_order_money) }),
condition: this.moneyFormat(level.one_fenxiao_order_money),
value: this.fenxiaoInfo.one_fenxiao_order_money,
progress: parseFloat(this.fenxiaoInfo.one_fenxiao_order_money) > parseFloat(level.one_fenxiao_order_money) ? 100 : (parseFloat(this.fenxiaoInfo.one_fenxiao_order_money) / parseFloat(level.one_fenxiao_order_money) * 100)
@@ -152,9 +152,9 @@
}
if (level.order_num > 0) {
let task = {
title: this.$lang('selfConsumption'),
desc: this.$lang('selfOrderCount', { count: level.order_num }),
tips: this.$lang('selfOrderCountTip', { count: level.order_num }),
title: this.$lang('fenxiao.level.selfConsumption'),
desc: this.$lang('fenxiao.level.selfOrderCount', { count: level.order_num }),
tips: this.$lang('fenxiao.level.selfOrderCountTip', { count: level.order_num }),
condition: level.order_num,
value: this.fenxiaoInfo.order_num,
progress: parseFloat(this.fenxiaoInfo.order_num) > parseFloat(level.order_num) ? 100 : (parseFloat(this.fenxiaoInfo.order_num) / parseFloat(level.order_num) * 100).toFixed(2)
@@ -164,9 +164,9 @@
}
if (level.order_money > 0) {
let task = {
title: this.$lang('selfConsumption'),
desc: this.$lang('selfOrderAmount', { amount: this.moneyFormat(level.order_money) }),
tips: this.$lang('selfOrderAmountTip', { amount: this.moneyFormat(level.order_money) }),
title: this.$lang('fenxiao.level.selfConsumption'),
desc: this.$lang('fenxiao.level.selfOrderAmount', { amount: this.moneyFormat(level.order_money) }),
tips: this.$lang('fenxiao.level.selfOrderAmountTip', { amount: this.moneyFormat(level.order_money) }),
condition: this.moneyFormat(level.order_money),
value: this.fenxiaoInfo.order_money,
progress: parseFloat(this.fenxiaoInfo.order_money) > parseFloat(level.order_money) ? 100 : (parseFloat(this.fenxiaoInfo.order_money) / parseFloat(level.order_money) * 100).toFixed(2)
@@ -176,9 +176,9 @@
}
if (level.one_child_num > 0) {
let task = {
title: this.$lang('inviteFriends'),
desc: this.$lang('inviteFriendCount', { count: level.one_child_num }),
tips: this.$lang('inviteFriendCountTip', { count: level.one_child_num }),
title: this.$lang('fenxiao.level.inviteFriends'),
desc: this.$lang('fenxiao.level.inviteFriendCount', { count: level.one_child_num }),
tips: this.$lang('fenxiao.level.inviteFriendCountTip', { count: level.one_child_num }),
condition: level.one_child_num,
value: this.fenxiaoInfo.one_child_num,
progress: parseFloat(this.fenxiaoInfo.one_child_num) > parseFloat(level.one_child_num) ? 100 : (parseFloat(this.fenxiaoInfo.one_child_num) / parseFloat(level.one_child_num) * 100).toFixed(2)
@@ -188,9 +188,9 @@
}
if (level.one_child_fenxiao_num > 0) {
let task = {
title: this.$lang('inviteFriends'),
desc: this.$lang('inviteFenxiaoCount', { count: level.one_child_fenxiao_num }),
tips: this.$lang('inviteFenxiaoCountTip', { count: level.one_child_fenxiao_num }),
title: this.$lang('fenxiao.level.inviteFriends'),
desc: this.$lang('fenxiao.level.inviteFenxiaoCount', { count: level.one_child_fenxiao_num }),
tips: this.$lang('fenxiao.level.inviteFenxiaoCountTip', { count: level.one_child_fenxiao_num }),
condition: level.one_child_fenxiao_num,
value: this.fenxiaoInfo.one_child_fenxiao_num,
progress: parseFloat(this.fenxiaoInfo.one_child_fenxiao_num) > parseFloat(level.one_child_fenxiao_num) ? 100 : (parseFloat(this.fenxiaoInfo.one_child_fenxiao_num) / parseFloat(level.one_child_fenxiao_num) * 100).toFixed(2)
@@ -208,7 +208,7 @@
setTimeout( () => {
if (!this.addonIsExist.fenxiao) {
this.$util.showToast({
title: this.$lang('merchantNotOpenFenxiao'),
title: this.$lang('fenxiao.level.merchantNotOpenFenxiao'),
mask: true,
duration: 2000
});
@@ -218,7 +218,7 @@
}
},1000);
if (this.fenxiaoWords && this.fenxiaoWords.fenxiao_name) this.$langConfig.title(this.fenxiaoWords.fenxiao_name + this.$lang('levelSuffix'));
if (this.fenxiaoWords && this.fenxiaoWords.fenxiao_name) this.$langConfig.title(this.fenxiaoWords.fenxiao_name + this.$lang('fenxiao.level.levelSuffix'));
if (this.storeToken) {
this.getFenxiaoInfo();

22
pages_promotion/fenxiao/order.vue
View File

@@ -14,10 +14,10 @@
@click="toDetail(orderItem.fenxiao_order_id)">
<view class="order-header">
<text class="site-name font-size-base">{{ orderItem.order_no }}</text>
<text class="status-name color-base-text" v-if="orderItem.is_refund == 1">{{ $lang('statusRefunded') }}</text>
<text class="status-name color-base-text" v-if="orderItem.is_refund == 1">{{ $lang('fenxiao.order.statusRefunded') }}</text>
<text class="status-name color-text-green"
v-else-if="orderItem.is_settlement == 1">{{ $lang('statusSettled') }}</text>
<text class="status-name color-text-orange" v-else>{{ $lang('statusPendingSettlement') }}</text>
v-else-if="orderItem.is_settlement == 1">{{ $lang('fenxiao.order.statusSettled') }}</text>
<text class="status-name color-text-orange" v-else>{{ $lang('fenxiao.order.statusPendingSettlement') }}</text>
</view>
<view class="order-body">
@@ -30,7 +30,7 @@
<view class="top-wrap">
<view class="goods-name font-size-base">{{ orderItem.sku_name }}</view>
<view>
<text class="color-tip">{{ $lang('earnPrefix') }}{{ fenxiaoWords.account }}</text>
<text class="color-tip">{{ $lang('fenxiao.order.earnPrefix') }}{{ fenxiaoWords.account }}</text>
<text class="price-color price-style small">{{
$lang('common.currencySymbol') }}</text>
<text class="price-color price-style large">{{
@@ -66,7 +66,7 @@
<text class="color-base-text">{{ $lang('common.currencySymbol') }}{{ orderItem.commission }}</text> -->
</view>
<view class="total">
<text>{{ $lang('totalLabel') }}</text>
<text>{{ $lang('fenxiao.order.totalLabel') }}</text>
<text class="price-color">{{ $lang('common.currencySymbol') }}</text>
<text class="price-color font-size-toolbar">{{
parseFloat(orderItem.real_goods_money).toFixed(2).split(".")[0] }}</text>
@@ -78,13 +78,13 @@
</view>
</view>
<view class="cart-empty">
<ns-empty :text="$lang('noOrders')" :isIndex="false"
<ns-empty :text="$lang('fenxiao.order.noOrders')" :isIndex="false"
v-if="selectId == 0 && orderList.length == 0 && emptyShow"></ns-empty>
<ns-empty :text="$lang('noPendingSettlementOrders')" :isIndex="false"
<ns-empty :text="$lang('fenxiao.order.noPendingSettlementOrders')" :isIndex="false"
v-if="selectId == 1 && orderList.length == 0 && emptyShow"></ns-empty>
<ns-empty :text="$lang('noSettledOrders')" :isIndex="false"
<ns-empty :text="$lang('fenxiao.order.noSettledOrders')" :isIndex="false"
v-if="selectId == 2 && orderList.length == 0 && emptyShow"></ns-empty>
<ns-empty :text="$lang('noRefundedOrders')" :isIndex="false"
<ns-empty :text="$lang('fenxiao.order.noRefundedOrders')" :isIndex="false"
v-if="selectId == 3 && orderList.length == 0 && emptyShow"></ns-empty>
</view>
</view>
@@ -142,7 +142,7 @@ export default {
setTimeout(() => {
if (!this.addonIsExist.fenxiao) {
this.$util.showToast({
title: this.$lang('merchantNotOpenFenxiao'),
title: this.$lang('fenxiao.order.merchantNotOpenFenxiao'),
mask: true,
duration: 2000
});
@@ -152,7 +152,7 @@ export default {
}
}, 1000);
if (this.fenxiaoWords && this.fenxiaoWords.concept) this.$langConfig.title(this.fenxiaoWords.concept + this.$lang('orderSuffix'));
if (this.fenxiaoWords && this.fenxiaoWords.concept) this.$langConfig.title(this.fenxiaoWords.concept + this.$lang('fenxiao.order.orderSuffix'));
if (!this.storeToken) {
this.redirectTologin('/pages_promotion/fenxiao/order');

24
pages_promotion/fenxiao/order_detail.vue
View File

@@ -4,11 +4,11 @@
<view class="order-detail-box">
<view class="header">
<view class="title">
<text>{{ $lang('totalItems', { count: orderData.num }) }}</text>
<text>{{ $lang('fenxiao.order_detail.totalItems', { count: orderData.num }) }}</text>
</view>
<text class="color-base-text font-size-tag" v-if="orderData.is_refund == 1">{{ $lang('statusRefunded') }}</text>
<text class="color-base-text font-size-tag" v-else-if="orderData.is_settlement == 1">{{ $lang('statusSettled') }}</text>
<text class="color-base-text font-size-tag" v-else>{{ $lang('statusPendingSettlement') }}</text>
<text class="color-base-text font-size-tag" v-if="orderData.is_refund == 1">{{ $lang('fenxiao.order_detail.statusRefunded') }}</text>
<text class="color-base-text font-size-tag" v-else-if="orderData.is_settlement == 1">{{ $lang('fenxiao.order_detail.statusSettled') }}</text>
<text class="color-base-text font-size-tag" v-else>{{ $lang('fenxiao.order_detail.statusPendingSettlement') }}</text>
</view>
<view class="detail-body">
<view class="detail-body-box">
@@ -37,27 +37,27 @@
<view class="detail-footer">
<text></text>
<text>
<text>{{ $lang('totalLabel') }}</text>
<text>{{ $lang('fenxiao.order_detail.totalLabel') }}</text>
<text class="price-color total">{{ $lang('common.currencySymbol') }}{{ orderData.real_goods_money }}</text>
</text>
</view>
</view>
<view class="order-detail-box commission">
<view class="header">
<view class="title color-base-bg-before"><text>{{ $lang('commissionDetail') }}</text></view>
<view class="title color-base-bg-before"><text>{{ $lang('fenxiao.order_detail.commissionDetail') }}</text></view>
<text class="color-base-text">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</text>
</view>
<view class="detail-content">
<view class="order-info-item">
<text class="tit">{{ $lang('orderNo') }}</text>
<text class="tit">{{ $lang('fenxiao.order_detail.orderNo') }}</text>
<text>{{ orderData.order_no }}</text>
</view>
<view class="order-info-item">
<text class="tit">{{ $lang('commissionLevel') }}</text>
<text>{{ $lang('levelText', { level: orderData.commission_level }) }}</text>
<text class="tit">{{ $lang('fenxiao.order_detail.commissionLevel') }}</text>
<text>{{ $lang('fenxiao.order_detail.levelText', { level: orderData.commission_level }) }}</text>
</view>
<view class="order-info-item">
<text class="tit">{{ $lang('commissionAmount') }}</text>
<text class="tit">{{ $lang('fenxiao.order_detail.commissionAmount') }}</text>
<text class="price-color font-size-toolbar">
<text class="font-size-goods-tag">{{ $lang('common.currencySymbol') }}</text>
{{ parseFloat(orderData.commission).toFixed(2).split(".")[0] }}
@@ -100,7 +100,7 @@ export default {
setTimeout( () => {
if (!this.addonIsExist.fenxiao) {
this.$util.showToast({
title: this.$lang('merchantNotOpenFenxiao'),
title: this.$lang('fenxiao.order_detail.merchantNotOpenFenxiao'),
mask: true,
duration: 2000
});
@@ -131,7 +131,7 @@ export default {
this.orderData = res.data;
} else {
this.$util.showToast({
title: this.$lang('orderInfoNotFound')
title: this.$lang('fenxiao.order_detail.orderInfoNotFound')
});
setTimeout(() => {
this.$util.redirectTo('/pages_promotion/fenxiao/order', {}, 'redirectTo');

16
pages_promotion/fenxiao/promote.vue
View File

@@ -10,16 +10,16 @@
<image class="money-bg" :src="$util.img('public/uniapp/fenxiao/promote/money.png')"
mode="aspectFill"></image>
<view class="content">
{{ $lang('totalEarnings') }}
{{ $lang('fenxiao.promote.totalEarnings') }}
<text class="money-text">{{ detailData.total_commission }}</text>
{{ $lang('currencyUnit') }}
{{ $lang('fenxiao.promote.currencyUnit') }}
</view>
</view>
</view>
<view class="earnings-body">
<view class="earnings-tab">
<text :class="{ active: tabIndex == 0 }" @click="tabCut(0)">{{ $lang('invitedFriends') }}</text>
<text :class="{ active: tabIndex == 1 }" @click="tabCut(1)">{{ $lang('orderedFriends') }}</text>
<text :class="{ active: tabIndex == 0 }" @click="tabCut(0)">{{ $lang('fenxiao.promote.invitedFriends') }}</text>
<text :class="{ active: tabIndex == 1 }" @click="tabCut(1)">{{ $lang('fenxiao.promote.orderedFriends') }}</text>
</view>
<scroll-view scroll-y="true" class="earnings-content-wrap" @scrolltolower="getTeam()">
<view class="earnings-list" v-if="promote.list.length">
@@ -32,7 +32,7 @@
</view>
</view>
</view>
<view class="earnings-empty" v-else>{{ $lang('noInvitedFriends') }}</view>
<view class="earnings-empty" v-else>{{ $lang('fenxiao.promote.noInvitedFriends') }}</view>
</scroll-view>
</view>
</view>
@@ -41,9 +41,9 @@
mode="aspectFit" show-menu-by-longpress></image>
<view class="content" v-if="promoteContent.content"><rich-text
:nodes="promoteContent.content"></rich-text></view>
<view class="rules-empty" v-else>{{ $lang('noActivityRules') }}</view>
<view class="rules-empty" v-else>{{ $lang('fenxiao.promote.noActivityRules') }}</view>
</view>
<view class="active-btn"><button type="primary" @click="toPoster()">{{ $lang('inviteFriends') }}</button></view>
<view class="active-btn"><button type="primary" @click="toPoster()">{{ $lang('fenxiao.promote.inviteFriends') }}</button></view>
<ns-copyright></ns-copyright>
<ns-login ref="login"></ns-login>
<loading-cover ref="loadingCover"></loading-cover>
@@ -79,7 +79,7 @@ export default {
setTimeout(() => {
if (!this.addonIsExist.fenxiao) {
this.$util.showToast({
title: this.$lang('merchantNotOpenFenxiao'),
title: this.$lang('fenxiao.promote.merchantNotOpenFenxiao'),
mask: true,
duration: 2000
});

24
pages_promotion/fenxiao/promote_code.vue
View File

@@ -11,22 +11,22 @@
</swiper>
<!-- #ifdef H5 -->
<view class="tips">{{ $lang('longPressTip') }}</view>
<view class="tips">{{ $lang('fenxiao.promote_code.longPressTip') }}</view>
<!-- #endif -->
<!-- #ifdef MP -->
<view class="btn color-base-bg color-base-border" @click="save">{{ $lang('savePoster') }}</view>
<view class="btn color-base-bg color-base-border" @click="save">{{ $lang('fenxiao.promote_code.savePoster') }}</view>
<!-- #endif -->
<uni-popup ref="popupDialog" :custom="true" :mask-click="false">
<view class="dialog-popup">
<view class="title">{{ $lang('dialogTitle') }}</view>
<view class="message">{{ $lang('authDeniedMessage') }}</view>
<view class="title">{{ $lang('fenxiao.promote_code.dialogTitle') }}</view>
<view class="message">{{ $lang('fenxiao.promote_code.authDeniedMessage') }}</view>
<view class="action-wrap">
<view @click="closeDialog">{{ $lang('cancel') }}</view>
<view @click="closeDialog">{{ $lang('fenxiao.promote_code.cancel') }}</view>
<view>
<button type="default" open-type="openSetting" @opensetting="closeDialog"
hover-class="none">{{ $lang('authorizeNow') }}</button>
hover-class="none">{{ $lang('fenxiao.promote_code.authorizeNow') }}</button>
</view>
</view>
</view>
@@ -95,7 +95,7 @@ export default {
filePath: res.tempFilePath,
success: () => {
this.$util.showToast({
title: this.$lang('saveSuccess')
title: this.$lang('fenxiao.promote_code.saveSuccess')
});
},
fail: res => {
@@ -104,20 +104,20 @@ export default {
this.$refs.popupDialog.open();
} else {
this.$util.showToast({
title: this.$lang('saveFail')
title: this.$lang('fenxiao.promote_code.saveFail')
});
}
}
});
} else {
this.$util.showToast({
title: this.$lang('downloadFail')
title: this.$lang('fenxiao.promote_code.downloadFail')
});
}
},
fail: res => {
this.$util.showToast({
title: this.$lang('downloadFail')
title: this.$lang('fenxiao.promote_code.downloadFail')
});
}
});
@@ -136,7 +136,7 @@ export default {
});
} catch {
this.$util.showToast({
title: this.$lang('posterGenerateFail')
title: this.$lang('fenxiao.promote_code.posterGenerateFail')
});
}
},
@@ -149,7 +149,7 @@ export default {
setTimeout(() => {
if (!this.addonIsExist.fenxiao) {
this.$util.showToast({
title: this.$lang('merchantNotOpenFenxiao'),
title: this.$lang('fenxiao.promote_code.merchantNotOpenFenxiao'),
mask: true,
duration: 2000
});

10
pages_promotion/fenxiao/public/js/goods_list.js
View File

@@ -22,7 +22,7 @@ export default {
setTimeout(() => {
if (!this.addonIsExist.fenxiao) {
this.$util.showToast({
title: this.$lang('merchantNotOpenFenxiao'),
title: this.$lang('fenxiao.goods_list.merchantNotOpenFenxiao'),
mask: true,
duration: 2000
});
@@ -48,7 +48,7 @@ export default {
return;
}
if (this.fenxiaoWords && this.fenxiaoWords.concept) this.$langConfig.title(this.fenxiaoWords.concept + this.$lang('center'));
if (this.fenxiaoWords && this.fenxiaoWords.concept) this.$langConfig.title(this.fenxiaoWords.concept + this.$lang('fenxiao.goods_list.center'));
this.is_fenxiao = Boolean(this.memberInfo.is_fenxiao);
},
methods: {
@@ -157,7 +157,7 @@ export default {
//生成海报
getGoodsPoster() {
uni.showLoading({
'title': this.$lang('posterGenerating')
'title': this.$lang('fenxiao.goods_list.posterGenerating')
});
let url = "";
let data = {};
@@ -204,12 +204,12 @@ export default {
filePath: res.tempFilePath,
success: () => {
this.$util.showToast({
title: this.$lang('saveSuccess')
title: this.$lang('fenxiao.goods_list.saveSuccess')
});
},
fail: () => {
this.$util.showToast({
title: this.$lang('saveFail')
title: this.$lang('fenxiao.goods_list.saveFail')
});
}
});

28
pages_promotion/fenxiao/ranking_list.vue
View File

@@ -16,9 +16,9 @@
</view>
<view class="withdrawal"
@click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_apply')"
v-if="type == 'profit'">{{ $lang('clickToWithdraw') }}</view>
v-if="type == 'profit'">{{ $lang('fenxiao.ranking_list.clickToWithdraw') }}</view>
<view class="withdrawal" @click="$util.redirectTo('/pages_promotion/fenxiao/team')"
v-if="type == 'invited_num'">{{ $lang('myTeam') }}</view>
v-if="type == 'invited_num'">{{ $lang('fenxiao.ranking_list.myTeam') }}</view>
</view>
</view>
</view>
@@ -30,8 +30,8 @@
<text class="iconfont icon-fenxiao"></text>
</view>
<view class="all-money-tit-wrap">
<text class="all-money-tit">{{ $lang('distributionCommission') }}</text>
<text class="all-money-num">{{ $lang('todayCommission', { amount: info.today_commission }) }}</text>
<text class="all-money-tit">{{ $lang('fenxiao.ranking_list.distributionCommission') }}</text>
<text class="all-money-num">{{ $lang('fenxiao.ranking_list.todayCommission', { amount: info.today_commission }) }}</text>
</view>
</view>
</view>
@@ -41,8 +41,8 @@
<text class="iconfont icon-baixingbeng"></text>
</view>
<view class="all-money-tit-wrap">
<text class="all-money-tit">{{ $lang('commissionRanking') }}</text>
<text class="all-money-num">{{ $lang('rankingTip', { ranking: ranking }) }}</text>
<text class="all-money-tit">{{ $lang('fenxiao.ranking_list.commissionRanking') }}</text>
<text class="all-money-num">{{ $lang('fenxiao.ranking_list.rankingTip', { ranking: ranking }) }}</text>
</view>
</view>
</view>
@@ -54,8 +54,8 @@
<text class="iconfont icon-huodongtuiyan"></text>
</view>
<view class="all-money-tit-wrap">
<text class="all-money-tit">{{ $lang('promotionCount') }}</text>
<text class="all-money-num">{{ $lang('promotionPeople', { count: info.one_child_num }) }}</text>
<text class="all-money-tit">{{ $lang('fenxiao.ranking_list.promotionCount') }}</text>
<text class="all-money-num">{{ $lang('fenxiao.ranking_list.promotionPeople', { count: info.one_child_num }) }}</text>
</view>
</view>
</view>
@@ -65,15 +65,15 @@
<text class="iconfont icon-baixingbeng"></text>
</view>
<view class="all-money-tit-wrap">
<text class="all-money-tit" v-if="type == 'invited_num'">{{ $lang('promotionRanking') }}</text>
<text class="all-money-num">{{ $lang('rankingTip', { ranking: ranking }) }}</text>
<text class="all-money-tit" v-if="type == 'invited_num'">{{ $lang('fenxiao.ranking_list.promotionRanking') }}</text>
<text class="all-money-num">{{ $lang('fenxiao.ranking_list.rankingTip', { ranking: ranking }) }}</text>
</view>
</view>
</view>
</view>
<view class="title-rakn-text" v-if="type == 'profit'">{{ $lang('commissionRanking') }}</view>
<view class="title-rakn-text" v-if="type == 'invited_num'">{{ $lang('promotionRanking') }}</view>
<view class="title-rakn-text" v-if="type == 'profit'">{{ $lang('fenxiao.ranking_list.commissionRanking') }}</view>
<view class="title-rakn-text" v-if="type == 'invited_num'">{{ $lang('fenxiao.ranking_list.promotionRanking') }}</view>
<view class="ranking-list">
<view class="ranking-item" v-for="(item, index) in list" :key="index">
@@ -87,13 +87,13 @@
</view>
<view class="price-font price-style" v-if="type == 'profit'">
￥{{ item.total_commission | moneyFormat }}</view>
<view class="price-font price-style" v-if="type == 'invited_num'">{{ $lang('promotionPeople', { count: item.child_num }) }}
<view class="price-font price-style" v-if="type == 'invited_num'">{{ $lang('fenxiao.ranking_list.promotionPeople', { count: item.child_num }) }}
</view>
</view>
</view>
</block>
<block v-if="list.length == 0 && emptyShow">
<ns-empty :text="$lang('noData')" :isIndex="false"></ns-empty>
<ns-empty :text="$lang('fenxiao.ranking_list.noData')" :isIndex="false"></ns-empty>
</block>
</view>
</mescroll-uni>

14
pages_promotion/fenxiao/relation.vue
View File

@@ -7,10 +7,10 @@
@click="toDetail(orderItem.fenxiao_order_id)">
<view class="order-header">
<text class="site-name font-size-base">{{ orderItem.order_no }}</text>
<text class="status-name color-base-text" v-if="orderItem.is_refund == 1">{{ $lang('statusRefunded') }}</text>
<text class="status-name color-base-text" v-if="orderItem.is_refund == 1">{{ $lang('fenxiao.relation.statusRefunded') }}</text>
<text class="status-name color-text-green"
v-else-if="orderItem.is_settlement == 1">{{ $lang('statusSettled') }}</text>
<text class="status-name color-text-orange" v-else>{{ $lang('statusPendingSettlement') }}</text>
v-else-if="orderItem.is_settlement == 1">{{ $lang('fenxiao.relation.statusSettled') }}</text>
<text class="status-name color-text-orange" v-else>{{ $lang('fenxiao.relation.statusPendingSettlement') }}</text>
</view>
<view class="order-body">
@@ -23,7 +23,7 @@
<view class="top-wrap">
<view class="goods-name font-size-base">{{ orderItem.sku_name }}</view>
<view>
<text class="color-tip">{{ $lang('earnPrefix') }}{{ fenxiaoWords.account }}</text>
<text class="color-tip">{{ $lang('fenxiao.relation.earnPrefix') }}{{ fenxiaoWords.account }}</text>
<text class="price-color font-size-goods-tag">{{
$lang('common.currencySymbol') }}</text>
<text class="price-color font-size-toolbar">{{ orderItem.commission
@@ -53,7 +53,7 @@
<text class="color-base-text">{{ $lang('common.currencySymbol') }}{{ orderItem.commission }}</text> -->
</view>
<view class="total">
<text>{{ $lang('totalLabel') }}</text>
<text>{{ $lang('fenxiao.relation.totalLabel') }}</text>
<text class="price-color">{{ $lang('common.currencySymbol') }}</text>
<text class="font-size-toolbar price-color">{{ orderItem.real_goods_money }}</text>
</view>
@@ -61,7 +61,7 @@
</view>
</view>
</view>
<view class="cart-empty"><ns-empty :text="$lang('noOrders')" :isIndex="false"
<view class="cart-empty"><ns-empty :text="$lang('fenxiao.relation.noOrders')" :isIndex="false"
v-if="orderList.length == 0 && emptyShow"></ns-empty></view>
</view>
</mescroll-uni>
@@ -93,7 +93,7 @@ export default {
}
},
onShow() {
if (this.fenxiaoWords && this.fenxiaoWords.concept) this.$langConfig.title(this.fenxiaoWords.concept + this.$lang('orderSuffix'));
if (this.fenxiaoWords && this.fenxiaoWords.concept) this.$langConfig.title(this.fenxiaoWords.concept + this.$lang('fenxiao.relation.orderSuffix'));
},
methods: {
//获得列表数据

20
pages_promotion/fenxiao/team.vue
View File

@@ -25,21 +25,21 @@
<view class="title color-base-border color-base-text">{{
fenxiaoWords.fenxiao_name }}</view>
</view>
<view class="color-tip font-size-goods-tag">{{ $lang('joinTime') }}{{
<view class="color-tip font-size-goods-tag">{{ $lang('fenxiao.team.joinTime') }}{{
$util.timeStampTurnTime(item.bind_fenxiao_time).substring(0, 10) }}</view>
</view>
<view class="consume-info">
<view>
<text>{{ item.one_child_num }}</text>
{{ $lang('peopleUnit') }}
{{ $lang('fenxiao.team.peopleUnit') }}
</view>
<view>
<text>{{ item.order_num }}</text>
{{ $lang('orderUnit') }}
{{ $lang('fenxiao.team.orderUnit') }}
</view>
<view>
<text>{{ item.order_money | moneyFormat }}</text>
{{ $lang('currencyUnit') }}
{{ $lang('fenxiao.team.currencyUnit') }}
</view>
</view>
</block>
@@ -50,21 +50,21 @@
<text>{{ item.nickname }}</text>
</view>
</view>
<view class="color-tip font-size-goods-tag">{{ $lang('joinTime') }}{{
<view class="color-tip font-size-goods-tag">{{ $lang('fenxiao.team.joinTime') }}{{
$util.timeStampTurnTime(item.bind_fenxiao_time).substring(0, 10) }}</view>
</view>
<view class="consume-info">
<view>
<text>0</text>
{{ $lang('peopleUnit') }}
{{ $lang('fenxiao.team.peopleUnit') }}
</view>
<view>
<text>{{ item.order_num }}</text>
{{ $lang('orderUnit') }}
{{ $lang('fenxiao.team.orderUnit') }}
</view>
<view>
<text>{{ item.order_money | moneyFormat }}</text>
{{ $lang('currencyUnit') }}
{{ $lang('fenxiao.team.currencyUnit') }}
</view>
</view>
</block>
@@ -72,7 +72,7 @@
</view>
</view>
</view>
<block v-if="teamList.length == 0 && emptyShow"><ns-empty :text="$lang('noData')" :isIndex="false"></ns-empty>
<block v-if="teamList.length == 0 && emptyShow"><ns-empty :text="$lang('fenxiao.team.noData')" :isIndex="false"></ns-empty>
</block>
</block>
</mescroll-uni>
@@ -108,7 +108,7 @@ export default {
setTimeout(() => {
if (!this.addonIsExist.fenxiao) {
this.$util.showToast({
title: this.$lang('merchantNotOpenFenxiao'),
title: this.$lang('fenxiao.team.merchantNotOpenFenxiao'),
mask: true,
duration: 2000
});

36
pages_promotion/fenxiao/withdraw_apply.vue
View File

@@ -2,8 +2,8 @@
<view class="container" :style="themeColor">
<view class="bank-account-wrap" @click="goAccount()">
<view class="tx-wrap" v-if="bankAccountInfo.withdraw_type && !isBalance">
<text class="tx-to">{{ $lang('withdrawTo') }}</text>
<view class="tx-bank" v-if="bankAccountInfo.withdraw_type == 'wechatpay'">{{ $lang('wechatDefaultWallet') }}</view>
<text class="tx-to">{{ $lang('fenxiao.withdraw_apply.withdrawTo') }}</text>
<view class="tx-bank" v-if="bankAccountInfo.withdraw_type == 'wechatpay'">{{ $lang('fenxiao.withdraw_apply.wechatDefaultWallet') }}</view>
<view class="tx-bank" v-else>{{ bankAccountInfo.bank_account }} </view>
<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>
@@ -16,10 +16,10 @@
</image>
</view>
</view>
<text class="tx-to" v-else-if="!isBalance">{{ $lang('pleaseAddWithdrawAccount') }}</text>
<text class="tx-to" v-else-if="!isBalance">{{ $lang('fenxiao.withdraw_apply.pleaseAddWithdrawAccount') }}</text>
<view class="tx-wrap" v-else="isBalance">
<text class="tx-to">{{ $lang('withdrawTo') }}</text>
<view class="tx-bank">{{ $lang('balance') }}</view>
<text class="tx-to">{{ $lang('fenxiao.withdraw_apply.withdrawTo') }}</text>
<view class="tx-bank">{{ $lang('fenxiao.withdraw_apply.balance') }}</view>
<view class="tx-img">
<image :src="$util.img('public/uniapp/member/apply_withdrawal/tixian.png')" mode="widthFix" show-menu-by-longpress></image>
</view>
@@ -28,7 +28,7 @@
</view>
<view class="empty-box"></view>
<view class="withdraw-wrap">
<view class="withdraw-wrap-title">{{ $lang('withdrawAmountLabel') }}</view>
<view class="withdraw-wrap-title">{{ $lang('fenxiao.withdraw_apply.withdrawAmountLabel') }}</view>
<view class="money-wrap">
<text class="unit">{{ $lang('common.currencySymbol') }}</text>
<input type="digit" class="withdraw-money" v-model="withdrawMoney" />
@@ -38,14 +38,14 @@
</view>
<view class="bottom">
<view>
<text class="color-tip">{{ $lang('withdrawableAmountLabel') }}{{ $lang('common.currencySymbol') }}{{ withdrawInfo.account | moneyFormat }}</text>
<text class="all-tx color-base-text" @click="allTx">{{ $lang('withdrawAll') }}</text>
<text class="color-tip">{{ $lang('fenxiao.withdraw_apply.withdrawableAmountLabel') }}{{ $lang('common.currencySymbol') }}{{ withdrawInfo.account | moneyFormat }}</text>
<text class="all-tx color-base-text" @click="allTx">{{ $lang('fenxiao.withdraw_apply.withdrawAll') }}</text>
</view>
</view>
<view class="desc">
<text v-if="withdrawConfigInfo.withdraw > 0">{{ $lang('minWithdrawAmountTip', { symbol: $lang('common.currencySymbol'), min: withdrawConfigInfo.withdraw | moneyFormat }) }}</text>
<text v-if="withdrawConfigInfo.max > 0">{{ $lang('maxWithdrawAmountTip', { symbol: $lang('common.currencySymbol'), max: (withdrawConfigInfo.max > withdrawInfo.account ? withdrawInfo.account : withdrawConfigInfo.max) | moneyFormat }) }}</text>
<text>{{ $lang('serviceFeeTip', { rate: withdrawConfigInfo.withdraw_rate + '%' }) }}</text>
<text v-if="withdrawConfigInfo.withdraw > 0">{{ $lang('fenxiao.withdraw_apply.minWithdrawAmountTip', { symbol: $lang('common.currencySymbol'), min: withdrawConfigInfo.withdraw | moneyFormat }) }}</text>
<text v-if="withdrawConfigInfo.max > 0">{{ $lang('fenxiao.withdraw_apply.maxWithdrawAmountTip', { symbol: $lang('common.currencySymbol'), max: (withdrawConfigInfo.max > withdrawInfo.account ? withdrawInfo.account : withdrawConfigInfo.max) | moneyFormat }) }}</text>
<text>{{ $lang('fenxiao.withdraw_apply.serviceFeeTip', { rate: withdrawConfigInfo.withdraw_rate + '%' }) }}</text>
</view>
</view>
@@ -56,7 +56,7 @@
<view class="grace-page-footer page-btm" style="z-index: 999999; background: rgb(255, 255, 255); padding-bottom: 0px;" @click="withdraw">
<view data-v-800ec5da="" class="collectionBorder">
<button data-v-800ec5da="" class="renren-btn do false middle">{{ $lang('withdrawBtn') }}</button>
<button data-v-800ec5da="" class="renren-btn do false middle">{{ $lang('fenxiao.withdraw_apply.withdrawBtn') }}</button>
</view>
</view>
@@ -175,7 +175,7 @@
verify() {
if (this.withdrawMoney == '' || this.withdrawMoney < 0 || isNaN(parseFloat(this.withdrawMoney))) {
this.$util.showToast({
title: this.$lang('pleaseEnterWithdrawAmount')
title: this.$lang('fenxiao.withdraw_apply.pleaseEnterWithdrawAmount')
});
return false;
}
@@ -186,14 +186,14 @@
}
if (parseFloat(this.withdrawMoney) > 0 && (parseFloat(this.withdrawMoney) > parseFloat(money))) {
this.$util.showToast({
title: this.$lang('withdrawAmountExceeds')
title: this.$lang('fenxiao.withdraw_apply.withdrawAmountExceeds')
});
return false;
}
if (parseFloat(this.withdrawMoney) > 0 && (parseFloat(this.withdrawMoney) < parseFloat(this
.withdrawConfigInfo.withdraw))) {
this.$util.showToast({
title: this.$lang('withdrawAmountBelowMin')
title: this.$lang('fenxiao.withdraw_apply.withdrawAmountBelowMin')
});
return false;
}
@@ -202,7 +202,7 @@
withdraw() {
if (!this.bankAccountInfo.withdraw_type && !this.isBalance) {
this.$util.showToast({
title: this.$lang('pleaseAddWithdrawMethod')
title: this.$lang('fenxiao.withdraw_apply.pleaseAddWithdrawMethod')
});
return;
}
@@ -235,7 +235,7 @@
success: res => {
if (res.code >= 0) {
this.$util.showToast({
title: this.$lang('withdrawApplySuccess')
title: this.$lang('fenxiao.withdraw_apply.withdrawApplySuccess')
});
setTimeout(() => {
this.$util.redirectTo('/pages_promotion/fenxiao/withdraw_list', {},
@@ -270,7 +270,7 @@
success: res => {
if (res.code >= 0) {
this.$util.showToast({
title: this.$lang('withdrawApplySuccess')
title: this.$lang('fenxiao.withdraw_apply.withdrawApplySuccess')
});
setTimeout(() => {
this.$util.redirectTo('/pages_promotion/fenxiao/withdraw_list', {},

12
pages_promotion/fenxiao/withdraw_list.vue
View File

@@ -8,9 +8,9 @@
<view class="detailed-item" v-for="(item, index) in withdrawList" :key="index"
@click="toDetail(item.id)">
<view class="info">
<view class="event">{{ item.transfer_type == 'balance' && $lang('transferTypeBalance') ||
item.transfer_type == 'alipay' && $lang('transferTypeAlipay') || item.transfer_type == 'bank' && $lang('transferTypeBank') ||
item.transfer_type =='wechatpay'&& $lang('transferTypeWechatpay') }}</view>
<view class="event">{{ item.transfer_type == 'balance' && $lang('fenxiao.withdraw_list.transferTypeBalance') ||
item.transfer_type == 'alipay' && $lang('fenxiao.withdraw_list.transferTypeAlipay') || item.transfer_type == 'bank' && $lang('fenxiao.withdraw_list.transferTypeBank') ||
item.transfer_type =='wechatpay'&& $lang('fenxiao.withdraw_list.transferTypeWechatpay') }}</view>
<view>
<text class="time">{{ $util.timeStampTurnTime(item.create_time) }}</text>
</view>
@@ -25,7 +25,7 @@
</view>
</block>
<block v-else>
<ns-empty :isIndex="false" :text="$lang('noWithdrawRecords')"></ns-empty>
<ns-empty :isIndex="false" :text="$lang('fenxiao.withdraw_list.noWithdrawRecords')"></ns-empty>
</block>
</view>
</mescroll-uni>
@@ -65,7 +65,7 @@ export default {
setTimeout(() => {
if (!this.addonIsExist.fenxiao) {
this.$util.showToast({
title: this.$lang('merchantNotOpenFenxiao'),
title: this.$lang('fenxiao.withdraw_list.merchantNotOpenFenxiao'),
mask: true,
duration: 2000
});
@@ -75,7 +75,7 @@ export default {
}
}, 1000);
if (this.fenxiaoWords && this.fenxiaoWords.withdraw) this.$langConfig.title(this.fenxiaoWords.withdraw + this.$lang('detailSuffix'));
if (this.fenxiaoWords && this.fenxiaoWords.withdraw) this.$langConfig.title(this.fenxiaoWords.withdraw + this.$lang('fenxiao.withdraw_list.detailSuffix'));
if (!this.storeToken) {
this.redirectTologin('/pages_promotion/fenxiao/withdraw_list');

20
pages_promotion/fenxiao/withdrawal_detail.vue
View File

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