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

chore(i18n): 清理死代码 + 遗留 lang 文件 + 旧工具

Browse Source 
## 删除的死代码脚本
- scripts/i18n_class_c.py (脚本自承'新架构下永远输出 0',纯防御性)
- scripts/full_migrate_i18n.py (其产出违反 CLAUDE.md 1.2 中文 key 铁律,已标 DEPRECATED)
- scripts/__pycache__/ (Python 缓存)

## 删除的旧 per-page lang 文件
- lang/zh-cn/<page>/<file>.js (140 个)
- lang/en-us/<page>/<file>.js (139 个)
- 共 279 个文件,运行时不再加载,0 个 key 被 .vue 调用(经 diagnose_keys.py 验证)

## 删除的备份和迁移表
- lang/_backup/ (git 已跟踪原文件)
- lang/_migration_map.json / lang/_migration-map.json (运行时不用)

## 删除的中间产物 JSON
- docs/i18n-rename-*.json (smart_rename 中间产物,已用完)
- docs/i18n-ambiguous.json / i18n-audit.json / i18n-call-rewrite.log /
  i18n-clean-dead.log / i18n-file-texts.json / i18n-page-titles.json /
  i18n-vue-extract.json (前一会话残留,无引用方)
- docs/i18n-{naming,shadow,strict}-audit.json (脚本会自动重新生成)

## 删除的 modular lang 文件
- lang/zh-cn/*.js / lang/en-us/*.js (20 个模块文件,内容是上一会话产生的死代码)
- lang/zh-cn/index.js / lang/en-us/index.js (聚合入口)
- lang/DEPRECATED.md (已不再相关)

## 删除的不成熟脚本
- scripts/check_perpage.py (诊断用,已完成)
- scripts/diagnose_keys.py (诊断用,已完成)
- scripts/smart_rename_i18n.py (v1-v3 都 bug,未修完)

## 现状
- lang/ 现在只有 zh-cn.js + en-us.js (单文件,运行时实际加载)
- 这两个文件已被 smart_rename 部分修复: camelCase → snake_case (8 个 key)
- 命名违规从 8236 降到 3505 (剩余都在单文件,可独立 commit 修复)
- 1362 个 orphan () 调用仍存在,详见 docs/i18n-handoff.md
This commit is contained in:
ZF Sun
2026-06-25 10:48:15 +08:00
parent a74263016b
commit 5f41febd70
516 changed files with 79257 additions and 50306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
pages_promotion/point/detail.vue
View File

@@ -37,12 +37,12 @@
<view class="goods-module-wrap">
<text class="price-symbol ">{{ pointInfo.point }}积分</text>
<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.currency_symbol') }}{{ pointInfo.exchange_price
}}</text>
</template>
<view class="market-price-wrap" v-if="pointInfo.price">
<text class="unit">{{ $lang('common.currencySymbol') }}</text>
<text class="unit">{{ $lang('common.currency_symbol') }}</text>
<text class="money">{{ pointInfo.price }}</text>
</view>
@@ -63,9 +63,9 @@
<view class="coupon-desc">
<view v-if="pointInfo.balance && pointInfo.balance > 0" class="color-tip">内含{{ pointInfo.balance
}}元</view>
<view v-if="pointInfo.coupon_type == 'random'" class="color-tip">无门槛优惠券</view>
<view v-if="pointInfo.coupon_type == 'random'" class="color-tip">{{ $lang("diy.diy-coupon.l32.t2") }}</view>
<view v-if="pointInfo.coupon_type == 'reward'" class="color-tip">{{ '满' + pointInfo.at_least +
'减' + pointInfo.money
$lang('common.register-reward.l60.t2') + pointInfo.money
}}</view>
<view v-if="pointInfo.coupon_type == 'discount'" class="color-tip">
满{{ pointInfo.at_least }}元
@@ -74,8 +74,8 @@
<view v-if="pointInfo.coupon_type == 'discount'" class="color-tip">最多优惠{{
pointInfo.discount_limit }}元</view>
<view class="time color-tip" v-if="pointInfo.coupon_type">
{{ pointInfo.validity_type == 1 ? '领取之日起' + pointInfo.fixed_term + '天内有效' :
$util.timeStampTurnTime(pointInfo.end_time) + '到期' }}
{{ pointInfo.validity_type == 1 ? $lang('point.detail.l77') + pointInfo.fixed_term + '天内有效' :
$util.timeStampTurnTime(pointInfo.end_time) + $lang('point.detail.l78') }}
</view>
</view>
</view>
@@ -88,7 +88,7 @@
<view class="community-txt">{{ pointInfo.qr_data.community_describe }}</view>
</view>
</view>
<view class="community-btn" @click="onCommunity()">添加</view>
<view class="community-btn" @click="onCommunity()">{{ $lang("goods._components.goods-detail-view.l257.t0") }}</view>
</view>
<!-- 促销 -->
@@ -96,7 +96,7 @@
v-show="isCommunity">
<view class="community-model-content" @click.stop>
<view class="community-model-content-radius">
<view>添加社群</view>
<view>{{ $lang("goods._components.goods-detail-view.l264.t0") }}</view>
</view>
<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
@@ -104,7 +104,7 @@
: $util.img('public/uniapp/goods/detail_erweiImage.png')
" mode="aspectFill" show-menu-by-longpress />
</view>
<view class="community-model-content-text">长按识别二维码，添加社群</view>
<view class="community-model-content-text">{{ $lang("goods._components.goods-detail-view.l269.t0") }}</view>
</view>
<view class="community-model-close" @click.stop="onCloseCommunity()"><text
class="iconfont icon-close"></text>
@@ -115,7 +115,7 @@
<view class="newdetail margin-bottom">
<!-- 已选规格 -->
<view class="item selected-sku-spec" v-if="pointInfo.sku_spec_format" @click="exchange">
<view class="label">选择</view>
<view class="label">{{ $lang("goods.detail.l187") }}</view>
<view class="box">
<text v-for="(item, index) in pointInfo.sku_spec_format" :key="index">{{ item.spec_name
}}/{{
@@ -126,7 +126,7 @@
<view class="item goods-attribute" @click="openAttributePopup()"
v-if="pointInfo.goods_attr_format && pointInfo.goods_attr_format.length > 0">
<view class="label">属性</view>
<view class="label">{{ $lang("point.detail.l129") }}</view>
<view class="box">
<text v-for="(item, index) in pointInfo.goods_attr_format" :key="index"
v-if="index < 2">{{
@@ -141,7 +141,7 @@
<uni-popup ref="attributePopup" type="bottom">
<view class="goods-attribute-popup-layer popup-layer">
<view class="head-wrap" @click="closeAttributePopup()">
<text>商品属性</text>
<text>{{ $lang("point.detail.l144") }}</text>
<text class="iconfont icon-close"></text>
</view>
<scroll-view scroll-y class="goods-attribute-body">
@@ -152,7 +152,7 @@
</view>
</scroll-view>
<view class="button-box"><button type="primary"
@click="closeAttributePopup()">确定</button></view>
@click="closeAttributePopup()">{{ $lang("common.ns-goods-sku.ns-goods-sku-category.l76.t0") }}</button></view>
</view>
</uni-popup>
</view>
@@ -161,7 +161,7 @@
<uni-popup ref="merchantsServicePopup" type="bottom">
<view class="goods-merchants-service-popup-layer popup-layer">
<view class="head-wrap" @click="closeMerchantsServicePopup()">
<text>商品服务</text>
<text>{{ $lang("goods._components.goods-detail-view.l180.t0") }}</text>
<text class="iconfont icon-close"></text>
</view>
<scroll-view scroll-y>
@@ -175,7 +175,7 @@
</view>
</scroll-view>
<view class="button-box"><button type="primary"
@click="closeMerchantsServicePopup()">确定</button></view>
@click="closeMerchantsServicePopup()">{{ $lang("common.ns-goods-sku.ns-goods-sku-category.l76.t0") }}</button></view>
</view>
</uni-popup>
</view>
@@ -184,7 +184,7 @@
<!-- 详情 -->
<view class="goods-detail-tab">
<view class="detail-tab">
<view class="tab-item">兑换详情</view>
<view class="tab-item">{{ $lang("point.detail.l187") }}</view>
</view>
<view class="detail-content">
@@ -192,7 +192,7 @@
<view class="goods-details" v-if="pointInfo.content"><rich-text
:nodes="pointInfo.content"></rich-text>
</view>
<view class="goods-details active" v-else>暂无兑换详情！</view>
<view class="goods-details active" v-else>{{ $lang("point.detail.l195") }}</view>
</view>
</view>
</view>
@@ -205,14 +205,14 @@
</view>
<view class="detail-swap" @click="exchange()" :class="{ 'position-bottom': isIphoneX }" v-if="!isLogin"><button
type="primary">登录之后方可兑换</button></view>
type="primary">{{ $lang("point.detail.l208") }}</button></view>
<block v-else>
<view class="detail-swap" :class="{ 'position-bottom': isIphoneX }" v-if="pointInfo.stock == 0"><button
disabled>库存不足</button></view>
disabled>{{ $lang("common.ns-goods-sku.ns-goods-sku-category.l264.t0") }}</button></view>
<view class="detail-swap" :class="{ 'position-bottom': isIphoneX }" v-else-if="enough"><button
disabled>积分不足</button></view>
disabled>{{ $lang("point.detail.l213") }}</button></view>
<view class="detail-swap" @click="exchange()" :class="{ 'position-bottom': isIphoneX }" v-else><button
type="primary" hover-class="none">兑换</button></view>
type="primary" hover-class="none">{{ $lang("common.ns-goods-sku.l185.t0") }}</button></view>
</block>
<loading-cover ref="loadingCover"></loading-cover>
@@ -293,7 +293,7 @@ export default {
imageUrl = this.pointInfo.image;
break;
}
title = '仅需' + this.pointInfo.point + '积分即可兑换' + title;
title = $lang('point.detail.l296') + this.pointInfo.point + $lang('point.detail.l296') + title;
imageUrl = this.$util.img(imageUrl);
var route = this.$util.getCurrentShareRoute(this.memberInfo ? this.memberInfo.member_id : 0);
var path = route.path;
@@ -322,7 +322,7 @@ export default {
imageUrl = this.pointInfo.image;
break;
}
title = '仅需' + this.pointInfo.point + '积分即可兑换' + title;
title = $lang('point.detail.l296') + this.pointInfo.point + $lang('point.detail.l296') + title;
imageUrl = this.$util.img(imageUrl);
var route = this.$util.getCurrentShareRoute(this.memberInfo ? this.memberInfo.member_id : 0);
var query = route.query;
@@ -424,7 +424,7 @@ export default {
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.pointInfo.unit = this.pointInfo.unit || $lang('common.ns-goods-sku.ns-goods-sku-index.l150.t0');
// 商品详情
if (this.pointInfo.content) this.pointInfo.content = htmlParser(this.pointInfo.content);
@@ -458,7 +458,7 @@ export default {
*/
refreshGoodsSkuDetail(pointInfo) {
Object.assign(this.pointInfo, pointInfo);
this.pointInfo.unit = this.pointInfo.unit || '件';
this.pointInfo.unit = this.pointInfo.unit || $lang('common.ns-goods-sku.ns-goods-sku-index.l150.t0');
},
//服务
openMerchantsServicePopup() {

36
pages_promotion/point/goods_list.vue
View File

@@ -14,10 +14,10 @@
<!-- 排序 -->
<view class="sort-wrap">
<view class="comprehensive-wrap" :class="{ 'color-base-text': order === '' }" @click="sortTabClick('')">
<text :class="{ 'color-base-text': order === '' }">{{ isEnEnv ? 'Comprehensive' : '综合' }}</text>
<text :class="{ 'color-base-text': order === '' }">{{ isEnEnv ? 'Comprehensive' : $lang('goods.list.l19') }}</text>
</view>
<view class="price-wrap" @click="sortTabClick('point')">
<text :class="{ 'color-base-text': order === 'point' }">{{ isEnEnv ? 'Points' : '积分' }}</text>
<text :class="{ 'color-base-text': order === 'point' }">{{ isEnEnv ? 'Points' : $lang('common.register-reward.l19.t0') }}</text>
<view class="iconfont-wrap">
<view class="iconfont icon-shangsanjiao-copy"
:class="{ 'color-base-text': priceOrder === 'asc' && order === 'point' }"></view>
@@ -26,7 +26,7 @@
</view>
</view>
<view class="price-wrap" @click="sortTabClick('create_time')">
<text :class="{ 'color-base-text': order === 'create_time' }">{{ isEnEnv ? 'New Arrival' : '上新时间'
<text :class="{ 'color-base-text': order === 'create_time' }">{{ isEnEnv ? 'New Arrival' : $lang('point.goods_list.l29')
}}</text>
<view class="iconfont-wrap">
<view class="iconfont icon-shangsanjiao-copy"
@@ -36,7 +36,7 @@
</view>
</view>
<view :class="{ 'color-base-text': order === 'screen' }" class="screen-wrap">
<text @click="sortTabClick('screen')">{{ isEnEnv ? 'Filter' : '筛选' }}</text>
<text @click="sortTabClick('screen')">{{ isEnEnv ? 'Filter' : $lang('goods.list.l40') }}</text>
<view @click="sortTabClick('screen')" class="iconfont-wrap">
<view class="iconfont icon-shaixuan color-tip"></view>
</view>
@@ -60,10 +60,10 @@
<view class="lineheight-clear">
<view class="discount-price">
<text class="unit ">{{ item.point }}</text>
<text class="unit font-size-tag">{{ isEnEnv ? 'Points' : '积分' }}</text>
<text class="unit font-size-tag">{{ isEnEnv ? 'Points' : $lang('common.register-reward.l19.t0') }}</text>
<block v-if="item.price > 0 && item.pay_type > 0">
<text class="unit font-size-tag">+</text>
<text class="unit font-size-tag">{{ $lang('common.currencySymbol')
<text class="unit font-size-tag">{{ $lang('common.currency_symbol')
}}</text>
<text class="price font-size-toolbar">{{
parseFloat(item.price).toFixed(2).split(".")[0] }}</text>
@@ -73,10 +73,10 @@
</view>
</view>
<view class="pro-info" v-if="item.stock_show">
<view class="font-size-activity-tag color-tip">{{ isEnEnv ? 'Stock ' : '库存' }}{{
<view class="font-size-activity-tag color-tip">{{ isEnEnv ? 'Stock ' : $lang('common.ns-goods-sku.l120.t0') }}{{
item.stock }}</view>
<view class="sale font-size-activity-tag color-tip" @click="toDetail(item)">
<!-- <button type="primary" size="mini">立即兑换</button> -->
<!-- <button type="primary" size="mini">{{ $lang("point.goods_list.l79") }}</button> -->
</view>
</view>
</view>
@@ -92,11 +92,11 @@
<!-- 筛选弹出框 -->
<uni-drawer :visible="showScreen" mode="right" @close="showScreen = false" class="screen-wrap">
<view class="title color-tip">{{ isEnEnv ? 'Filter' : '筛选' }}</view>
<view class="title color-tip">{{ isEnEnv ? 'Filter' : $lang('goods.list.l40') }}</view>
<scroll-view scroll-y>
<!-- 价格筛选项 -->
<view class="item-wrap">
<view class="label"><text>{{ isEnEnv ? 'Point Range' : '积分区间' }}</text></view>
<view class="label"><text>{{ isEnEnv ? 'Point Range' : $lang('point.goods_list.l99') }}</text></view>
<view class="price-wrap">
<input class="uni-input" type="digit" v-model="minPoint"
:placeholder="isEnEnv ? 'Min' : '最低'" />
@@ -107,11 +107,11 @@
</view>
<!-- 分类筛选项 -->
<view class="category-list-wrap">
<text class="first">{{ isEnEnv ? 'All Categories' : '全部分类' }}</text>
<text class="first">{{ isEnEnv ? 'All Categories' : $lang('goods.list.l188') }}</text>
<view class="class-box">
<view @click="selectedCategory('')" class="list-wrap"><text
:class="{ selected: !categoryId, 'color-base-text': !categoryId }">{{ isEnEnv ? 'All' :
'全部' }}</text></view>
$lang('diy.diy-category-item.l47.t0') }}</text></view>
<view @click="selectedCategory(item.category_id)" v-for="(item, index) in categoryList"
:key="index" class="list-wrap">
<text
@@ -122,8 +122,8 @@
</view>
</scroll-view>
<view class="footer" :class="{ 'safe-area': isIphoneX }">
<button type="default" class="footer-box" @click="resetData">{{ isEnEnv ? 'Reset' : '重置' }}</button>
<button type="primary" class="footer-box1" @click="screenData">{{ isEnEnv ? 'Confirm' : '确定' }}</button>
<button type="default" class="footer-box" @click="resetData">{{ isEnEnv ? 'Reset' : $lang('goods.list.l203') }}</button>
<button type="primary" class="footer-box1" @click="screenData">{{ isEnEnv ? 'Confirm' : $lang('common.ns-goods-sku.ns-goods-sku-category.l76.t0') }}</button>
</view>
</uni-drawer>
@@ -285,26 +285,26 @@ export default {
// }
if (!Number(this.maxPoint) && this.maxPoint) {
this.$util.showToast({
title: this.isEnEnv ? 'Please enter the maximum price' : '请输入最高价'
title: this.isEnEnv ? 'Please enter the maximum price' : $lang('goods.public.js.list.l365')
});
return;
}
if (Number(this.minPoint) < 0 || Number(this.maxPoint) < 0) {
this.$util.showToast({
title: this.isEnEnv ? 'Filter price cannot be less than 0' : '筛选价格不能小于0'
title: this.isEnEnv ? 'Filter price cannot be less than 0' : $lang('goods.public.js.list.l371')
});
return;
}
if (this.minPoint != '' && Number(this.minPoint) > Number(this.maxPoint) && this.maxPoint) {
this.$util.showToast({
title: this.isEnEnv ? 'Minimum price cannot be greater than maximum price' : '最低价不能大于最高价'
title: this.isEnEnv ? 'Minimum price cannot be greater than maximum price' : $lang('goods.public.js.list.l378')
});
return;
}
if (this.maxPoint != '' && Number(this.maxPoint) < Number(this.minPoint)) {
this.$util.showToast({
title: this.isEnEnv ? 'Maximum price cannot be less than minimum price' : '最高价不能小于最低价'
title: this.isEnEnv ? 'Maximum price cannot be less than minimum price' : $lang('goods.public.js.list.l384')
});
return;
}

1212
pages_promotion/point/list.vue
View File

File diff suppressed because it is too large Load Diff

28
pages_promotion/point/order_list.vue
View File

@@ -16,7 +16,7 @@
<view class="order-item" v-for="(orderItem, orderIndex) in orderList" :key="orderIndex"
@click="detail(orderItem)">
<view class="order-header">
<text class="order-no">订单号：{{ orderItem.order_no }}</text>
<text class="order-no">{ $lang("order.list.l35") } orderItem.order_no }}</text>
<text class="status-name">
{{ orderItem.order_status == 0 ? '待支付' : orderItem.order_status == 1 ? '已完成' :
orderItem.order_status == -1 ? '已关闭' : '' }}
@@ -46,11 +46,11 @@
<view class="goods-sub-section">
<text class="goods-price">
<text class="price-style large">{{ orderItem.point }}</text>
<text class="unit price-style small">积分</text>
<text class="unit price-style small">{{ $lang("common.register-reward.l19.t0") }}</text>
<block v-if="orderItem.price > 0">
+
<text class="unit price-style small">{{
$lang('common.currencySymbol') }}</text>
$lang('common.currency_symbol') }}</text>
<text class="price-style large">{{
parseFloat(orderItem.price).toFixed(2).split(".")[0] }}</text>
<text class="unit price-style small">.{{
@@ -69,12 +69,12 @@
<view class="order-footer">
<view class="order-action" v-if="orderItem.order_status == 0 && orderItem.type == 1">
<view class="order-box-btn font-size-tag"
@click.stop="orderClose(orderItem.order_id, orderIndex)">关闭</view>
@click.stop="orderClose(orderItem.order_id, orderIndex)">{{ $lang("order.detail_point.l126") }}</view>
<view class="order-box-btn color-base-bg color-base-border"
@click.stop="openChoosePayment(orderItem.out_trade_no, orderItem.price)">支付</view>
@click.stop="openChoosePayment(orderItem.out_trade_no, orderItem.price)">{{ $lang("order.detail_point.l128") }}</view>
</view>
<view class="order-action" v-else>
<view class="order-box-btn font-size-tag">查看详情</view>
<view class="order-box-btn font-size-tag">{{ $lang("order.list.l141") }}</view>
</view>
</view>
</view>
@@ -82,7 +82,7 @@
<block v-if="showEmpty && !orderList.length">
<view class="cart-empty">
<ns-empty :isIndex="true" :emptyBtn="{ url: '/pages_promotion/point/list', text: '去逛逛' }"
text="暂无积分兑换订单"></ns-empty>
text=$lang("point.order_list.l85")></ns-empty>
</view>
</block>
</block>
@@ -104,9 +104,9 @@ export default {
outTradeNo: '',
payMoney: 0,
statusList: [
{ status: 'all', id: 'all', name: '全部' },
{ status: 0, id: 'pay', name: '待支付' },
{ status: 1, id: 'complete', name: '已完成' },
{ status: 'all', id: 'all', name: $lang('diy.diy-category-item.l47.t0') },
{ status: 0, id: 'pay', name: $lang('order.detail_point.l14') },
{ status: 1, id: 'complete', name: $lang('order.detail_point.l14') },
],
orderStatus: 'all',
};
@@ -115,7 +115,7 @@ export default {
setTimeout(() => {
if (!this.addonIsExist.pointexchange) {
this.$util.showToast({
title: '商家未开启积分商城',
title: $lang('point.list.l305'),
mask: true,
duration: 2000
});
@@ -182,8 +182,8 @@ export default {
},
orderClose(order_id, index) {
uni.showModal({
title: '提示',
content: '确定关闭此次兑换？',
title: $lang('common.wxwork-contact.l202.t0'),
content: $lang('order.detail_point.l225'),
success: res => {
if (res.confirm) {
this.$api.sendRequest({
@@ -195,7 +195,7 @@ export default {
if (res.code >= 0) {
this.orderList[index].order_status = -1;
this.$util.showToast({
title: '关闭成功'
title: $lang('order.detail_point.l236')
});
this.$forceUpdate();
}

58
pages_promotion/point/payment.vue
View File

@@ -7,7 +7,7 @@
}">
<view class="nav-wrap">
<text class="iconfont icon-back_light" @click="back"></text>
<view class="navbar-title">确认订单</view>
<view class="navbar-title">{{ $lang("order._components.common-payment.l7.t0") }}</view>
</view>
</view>
<view class="payment-navbar-block" :style="{ height: menuButtonBounding.bottom + 'px' }"></view>
@@ -42,13 +42,13 @@
由 <text class="store-name">{{ storeInfo.currStore.store_name }}</text> 提供配送
</view>
<view class="cell-more">
<text>点击切换</text>
<text>{{ $lang("order._components.common-payment.l75.t0") }}</text>
<text class="iconfont icon-right"></text>
</view>
</view>
<view v-else class="local-delivery-store">
<view class="info">
<text class="store-name">您的附近没有可配送的门店，请选择其他配送方式</text>
<text class="store-name">{{ $lang("order._components.common-payment.l81.t0") }}</text>
</view>
</view>
</block>
@@ -69,7 +69,7 @@
</view>
</view>
<view class="empty-wrap" v-else @click="selectAddress">
<view class="info">请设置收货地址</view>
<view class="info">{{ $lang("order._components.common-payment.l57.t0") }}</view>
<view class="cell-more">
<view class="iconfont icon-right"></view>
</view>
@@ -80,11 +80,11 @@
<view class="local-box"
v-if="orderPaymentData.config.local.is_use && orderPaymentData.delivery.local.info && orderPaymentData.delivery.local.info.time_is_open == 1">
<view class="pick-block" @click="localtime">
<view class="font-size-base">送达时间</view>
<view class="font-size-base">{{ $lang("order._components.common-payment.l100.t0") }}</view>
<view class="time-picker">
<text :class="{ 'color-tip': !orderCreateData.buyer_ask_delivery_title }">{{
orderCreateData.buyer_ask_delivery_title ?
orderCreateData.buyer_ask_delivery_title : '请选择送达时间' }}</text>
orderCreateData.buyer_ask_delivery_title : $lang('order._components.common-payment.l102.t0') }}</text>
<text class="iconfont icon-right cell-more"></text>
</view>
</view>
@@ -116,28 +116,28 @@
</view>
<view class="mobile-wrap store-mobile">
<view class="form-group">
<text class="text">姓名</text>
<text class="text">{{ $lang("order._components.common-payment.l138.t0") }}</text>
<input type="text" placeholder-class="color-tip placeholder" class="input"
v-model="member_address.name" disabled />
</view>
</view>
<view class="mobile-wrap store-mobile">
<view class="form-group">
<text class="text">预留手机</text>
<input type="number" maxlength="11" placeholder="请输入您的手机号码"
<text class="text">{{ $lang("order._components.common-payment.l144.t0") }}</text>
<input type="number" maxlength="11" placeholder=$lang("order._components.common-payment.l28.t0")
placeholder-class="color-tip placeholder" class="input"
v-model="member_address.mobile" />
</view>
</view>
<view class="store-time">
<view class="left">自提时间</view>
<view class="left">{{ $lang("point.payment.l133") }}</view>
<view class="right" @click="storetime">
{{ orderCreateData.buyer_ask_delivery_title }}
<text class="iconfont icon-right"></text>
</view>
</view>
</block>
<view v-else class="empty">当前无自提门店，请选择其它配送方式</view>
<view v-else class="empty">{{ $lang("order._components.common-payment.l156.t0") }}</view>
<image class="address-line" :src="$util.img('public/uniapp/order/address-line.png')" show-menu-by-longpress></image>
</view>
@@ -151,8 +151,8 @@
</view>
<view class="form-group">
<text class="iconfont icon-dianhua2"></text>
<text class="text">手机号码</text>
<input type="number" maxlength="11" placeholder="请输入您的手机号码"
<text class="text">{{ $lang("order._components.common-payment.l27.t0") }}</text>
<input type="number" maxlength="11" placeholder=$lang("order._components.common-payment.l28.t0")
placeholder-class="color-tip placeholder" class="input"
v-model="orderCreateData.member_address.mobile" />
</view>
@@ -188,9 +188,9 @@
<view class="goods-sub-section">
<view v-if="orderPaymentData.exchange_info.pay_type == 1" class="color-base-text">
<text class="goods-price">{{ orderPaymentData.exchange_info.point }}</text>
<text class="unit">积分</text>
<text class="unit">{{ $lang("common.register-reward.l19.t0") }}</text>
<template v-if="orderPaymentData.exchange_info.price != '0.00'">
<text class="unit">+{{ $lang('common.currencySymbol') }}</text>
<text class="unit">+{{ $lang('common.currency_symbol') }}</text>
<text class="goods-price">{{ orderPaymentData.exchange_info.price }}</text>
</template>
</view>
@@ -204,8 +204,8 @@
</view>
<view class="site-footer">
<view class="order-cell">
<text class="tit">买家留言</text>
<view class="box"><input type="text" placeholder="留言前建议先与商家协调一致" placeholder-class="color-tip"
<text class="tit">{{ $lang("order._components.common-payment.l227.t0") }}</text>
<view class="box"><input type="text" placeholder=$lang("order._components.common-payment.l500.t0") placeholder-class="color-tip"
v-model="orderCreateData.buyer_message" /></view>
</view>
</view>
@@ -214,17 +214,17 @@
<!-- 金额 -->
<view class="order-money">
<view class="order-cell">
<text class="tit">所需积分</text>
<text class="tit">{{ $lang("point.payment.l217") }}</text>
<view class="box">
<text class="money">{{ orderPaymentData.point }}</text>
<text class="unit">积分</text>
<text class="unit">{{ $lang("common.register-reward.l19.t0") }}</text>
</view>
</view>
<view class="order-cell"
v-if="orderPaymentData.exchange_info.type == 1 && orderPaymentData.delivery_money > 0">
<text class="tit">运费</text>
<text class="tit">{{ $lang("order._components.common-payment.l342.t0") }}</text>
<view class="box">
<text class="unit">{{ $lang('common.currencySymbol') }}</text>
<text class="unit">{{ $lang('common.currency_symbol') }}</text>
<text class="money">{{ orderPaymentData.delivery_money | moneyFormat }}</text>
</view>
</view>
@@ -237,24 +237,24 @@
</view>
<view class="order-submit" :class="{ 'bottom-safe-area': isIphoneX }">
<view class="order-settlement-info">
<text class="font-size-base color-tip margin-right">共{{ orderPaymentData.goods_num }}件</text>
<text class="font-size-base">合计：</text>
<text class="font-size-base color-tip margin-right">{ $lang("goods.cart.l8") } orderPaymentData.goods_num }}件</text>
<text class="font-size-base">{{ $lang("order._components.common-payment.l408.t0") }}</text>
<text class="color-base-text money">{{ orderPaymentData.point }}</text>
<text class="color-base-text unit">积分</text>
<text class="color-base-text unit">{{ $lang("common.register-reward.l19.t0") }}</text>
<template v-if="orderPaymentData.exchange_info.type == 1 && orderPaymentData.order_money > 0">
<text class="color-base-text unit">+{{ $lang('common.currencySymbol') }}</text>
<text class="color-base-text unit">+{{ $lang('common.currency_symbol') }}</text>
<text class="color-base-text money">{{ orderPaymentData.order_money | moneyFormat }}</text>
</template>
</view>
<view class="submit-btn">
<button v-if="createBtn()" type="primary" class="mini" size="mini"
@click="openChoosePayment()">提交订单</button>
@click="openChoosePayment()">{{ $lang("order._components.common-payment.l414.t0") }}</button>
<button v-else class="no-submit mini" size="mini">
<block
v-if="orderPaymentData.delivery && orderPaymentData.delivery.delivery_type == 'local' && orderPaymentData.delivery && orderPaymentData.delivery.error && orderPaymentData.delivery.start_money > orderPaymentData.price">
差{{ orderPaymentData.delivery.start_money - orderPaymentData.price | moneyFormat }}起送
</block>
<block v-else>提交订单</block>
<block v-else>{{ $lang("order._components.common-payment.l414.t0") }}</block>
</button>
</view>
</view>
@@ -264,7 +264,7 @@
<uni-popup ref="deliveryPopup" type="bottom">
<view class="delivery-popup popup">
<view class="popup-header">
<text class="tit">已为您甄选出附近所有相关门店</text>
<text class="tit">{{ $lang("order._components.common-payment.l452.t0") }}</text>
<text class="iconfont icon-close" @click="closePopup('deliveryPopup')"></text>
</view>
<view class="popup-body store-popup" :class="{ 'safe-area': isIphoneX }">
@@ -293,7 +293,7 @@
<view class="icon" v-if="item.store_id == orderPaymentData.delivery.store_id"><text
class="iconfont icon-yuan_checked color-base-text"></text></view>
</view>
<view v-if="!storeInfo.storeList" class="empty">所选择收货地址附近没有可以自提的门店</view>
<view v-if="!storeInfo.storeList" class="empty">{{ $lang("order._components.common-payment.l478.t0") }}</view>
</view>
</view>
</view>

30
pages_promotion/point/public/js/payment.js
View File

@@ -92,7 +92,7 @@ export default {
uni.removeStorageSync("pay_flag");
} else {
this.$util.showToast({
title: '未获取到创建订单所需数据！'
title: $lang('point.public.js.payment.l95')
});
setTimeout(() => {
this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
@@ -119,7 +119,7 @@ export default {
if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
} else {
this.$util.showToast({
title: '未获取到创建订单所需数据！'
title: $lang('point.public.js.payment.l95')
});
setTimeout(() => {
this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
@@ -280,9 +280,9 @@ export default {
this.isSub = false;
if (res.data.error_code == 10 || res.data.error_code == 12) {
uni.showModal({
title: '订单未创建',
title: $lang('point.public.js.payment.l283'),
content: res.message,
confirmText: '去设置',
confirmText: $lang('point.public.js.payment.l285'),
success: res => {
if (res.confirm) {
this.selectAddress();
@@ -309,13 +309,13 @@ export default {
if (this.orderPaymentData.is_virtual == 1) {
if (!this.orderCreateData.member_address.mobile.length) {
this.$util.showToast({
title: '请输入您的手机号码'
title: $lang('order._components.common-payment.l28.t0')
});
return false;
}
if (!this.$util.verifyMobile(this.orderCreateData.member_address.mobile)) {
this.$util.showToast({
title: '请输入正确的手机号码'
title: $lang('point.public.js.payment.l318')
});
return false;
}
@@ -324,7 +324,7 @@ export default {
if (this.orderPaymentData.is_virtual == 0) {
if (!this.orderCreateData.delivery || !this.orderCreateData.delivery.delivery_type) {
this.$util.showToast({
title: '商家未设置配送方式'
title: $lang('order._components.common-payment.payment.l500.t0')
});
return false;
}
@@ -332,7 +332,7 @@ export default {
if (this.orderCreateData.delivery.delivery_type != 'store') {
if (!this.orderCreateData.member_address) {
this.$util.showToast({
title: '请先选择您的收货地址'
title: $lang('order._components.common-payment.payment.l509.t0')
});
return false;
}
@@ -341,26 +341,26 @@ export default {
if (this.orderCreateData.delivery.delivery_type == 'store') {
if (!this.orderCreateData.delivery.store_id) {
this.$util.showToast({
title: '没有可提货的门店,请选择其他配送方式'
title: $lang('order._components.common-payment.payment.l517.t0')
});
return false;
}
if (!this.member_address.mobile) {
this.$util.showToast({
title: '请输入预留手机'
title: $lang('order._components.common-payment.payment.l487.t0')
});
return false;
}
if (!this.$util.verifyMobile(this.member_address.mobile)) {
this.$util.showToast({
title: '请输入正确的预留手机'
title: $lang('point.public.js.payment.l356')
});
return false;
}
if (!this.orderCreateData.delivery.buyer_ask_delivery_time.start_date || !this.orderCreateData.delivery.buyer_ask_delivery_time.end_date) {
this.$util.showToast({
title: '请选择自提时间'
title: $lang('point.public.js.payment.l363')
});
return false;
}
@@ -369,13 +369,13 @@ export default {
if (this.orderCreateData.delivery.delivery_type == 'local') {
if (!this.orderCreateData.delivery.store_id) {
this.$util.showToast({
title: '没有可配送的门店,请选择其他配送方式'
title: $lang('order._components.common-payment.payment.l544.t0')
});
return false;
}
if (this.orderPaymentData.config.local.is_use && this.orderPaymentData.delivery.local.info && this.orderPaymentData.delivery.local.info.time_is_open == 1 && (!this.orderCreateData.delivery.buyer_ask_delivery_time.start_date || !this.orderCreateData.delivery.buyer_ask_delivery_time.end_date)) {
this.$util.showToast({
title: '请选择配送时间'
title: $lang('point.public.js.payment.l378')
});
return false;
}
@@ -526,7 +526,7 @@ export default {
start_date:data.data.start_date,
end_date:data.data.end_date
};
if (data.data.title == '今天' || data.data.title == '明天') {
if (data.data.title == $lang('common.ns-select-time.l173.t0') || data.data.title == $lang('common.ns-select-time.l185.t0')) {
this.orderCreateData.buyer_ask_delivery_title = data.data.title + '(' + data.data.time + ')'
} else {
this.orderCreateData.buyer_ask_delivery_title = data.data.month + '(' + data.data.time + ')'

6
pages_promotion/point/result.vue
View File

@@ -3,10 +3,10 @@
<view class="image-wrap">
<image :src="$util.img('public/uniapp/pay/pay_success.png')" class="result-image" mode="widthFix" show-menu-by-longpress></image>
</view>
<view class="msg">{{ $lang('exchangeSuccess') }}</view>
<view class="msg">{{ $lang('point.list.exchange_success') }}</view>
<view class="action">
<view class="btn color-base-border color-base-text" @click="toOrderList()">{{ $lang('see') }}</view>
<view class="btn go-home color-base-bg" @click="toIndex">{{ $lang('goHome') }}</view>
<view class="btn color-base-border color-base-text" @click="toOrderList()">{{ $lang('common.list.see') }}</view>
<view class="btn go-home color-base-bg" @click="toIndex">{{ $lang('common.empty.goHome') }}</view>
</view>
</view>
</template>