From dc11555f6f612de0589bce23c7b6613df093402f Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Wed, 27 Mar 2024 11:50:45 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=99=9A=E6=8B=9F=E5=B8=81=E5=80=9F=E5=8F=A3?=
=?UTF-8?q?=E8=BF=9E=E8=B0=83=202024.3.26=20sws?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
i18n_tools.config.js | 2 +-
lang/en.json | 18 +-
lang/zh.json | 16 +-
pages.json | 739 ++++++++++--------
pages/plugins/coin/detail/detail.vue | 31 +-
.../coin/recharge-detail/recharge-detail.css | 14 +
.../coin/recharge-detail/recharge-detail.vue | 395 ++++++++++
.../coin/recharge-pay/recharge-pay.css | 77 ++
.../coin/recharge-pay/recharge-pay.vue | 320 ++++++++
pages/plugins/coin/recharge/recharge.css | 17 +
pages/plugins/coin/recharge/recharge.vue | 344 ++++----
pages/plugins/coin/user/user.vue | 3 +
12 files changed, 1447 insertions(+), 529 deletions(-)
create mode 100644 pages/plugins/coin/recharge-detail/recharge-detail.css
create mode 100644 pages/plugins/coin/recharge-detail/recharge-detail.vue
create mode 100644 pages/plugins/coin/recharge-pay/recharge-pay.css
create mode 100644 pages/plugins/coin/recharge-pay/recharge-pay.vue
diff --git a/i18n_tools.config.js b/i18n_tools.config.js
index e7228c6b..d8fbdb9e 100644
--- a/i18n_tools.config.js
+++ b/i18n_tools.config.js
@@ -8,5 +8,5 @@ module.exports = {
filename: 'zh', // 输出的文件名,默认为 zh_cn
extname: 'json', // 输出的文件后缀名默认为 js ,支持json和js(js格式为 module.exports = {} 或 export default {}),
// langList: ['en', 'spa', 'cht'] // 翻译目标语言列表,默认是 ['en'] 具体语种请自行查看。注意:使用不同的翻译接口,需要更换对应的语言编码,腾讯翻译、火山翻译、谷歌翻译语言编码大致相同,百度要特别注意,与上述3种翻译有不同的语言编码
- langList: ['en', 'spa', 'cht'] // 翻译目标语言列表,默认是 ['en'] 具体语种请自行查看。注意:使用不同的翻译接口,需要更换对应的语言编码,腾讯翻译、火山翻译、谷歌翻译语言编码大致相同,百度要特别注意,与上述3种翻译有不同的语言编码
+ langList: ['en'] // 翻译目标语言列表,默认是 ['en'] 具体语种请自行查看。注意:使用不同的翻译接口,需要更换对应的语言编码,腾讯翻译、火山翻译、谷歌翻译语言编码大致相同,百度要特别注意,与上述3种翻译有不同的语言编码
}
\ No newline at end of file
diff --git a/lang/en.json b/lang/en.json
index 9c29be12..48d75af4 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -74,7 +74,7 @@
"article-category": "All articles",
"article-detail": "Article details",
"setup": "set up",
- "password": "password modify",
+ "password": "password modify",
"personal": "personal data",
"logout": "Account cancellation",
"plugins-seckill-index": "Limited time flash sale",
@@ -190,7 +190,9 @@
"plugins-coin-transaction-detail": "Transaction details",
"plugins-coin-withdrawal-detail": "Withdrawal details",
"plugins-coin-convert-detail": "Conversion details",
- "plugins-coin-collection": "Collection"
+ "plugins-coin-collection": "Collection",
+ "plugins-coin-recharge-pay": "Recharge payment",
+ "plugins-coin-recharge-detail": "Recharge details"
},
"login": {
"login": {
@@ -237,9 +239,9 @@
"s665h5": "Obtain verification code",
"jw378f": "Authorized User Information",
"np9177": "Bind phone",
- "tgsa4d": "Bind email",
- "876tdf": "Bind account",
- "87yui2": "Bind successful",
+ "tgsa4d": "Bind email",
+ "876tdf": "Bind account",
+ "87yui2": "Bind successful",
"158yg2": "Login with mobile verification code",
"r329eu": "Email verification code login",
"39hn6v": "Account password registration",
@@ -323,7 +325,7 @@
"setup": {
"x81v6d": "Replace phone",
"j6skqh": "Click to replace",
- "dfg4wf": "Click to bind",
+ "dfg4wf": "Click to bind",
"r7jz13": "update language",
"42mba7": "Address",
"5eltza": "Click to manage",
@@ -339,7 +341,7 @@
"07o10b": "Please bind your phone first",
"nwt4o1": "Please log in first",
"utnr7g": "Service phone",
- "87ytgh": "Unbind"
+ "87ytgh": "Unbind"
}
},
"article-category": {
@@ -1705,7 +1707,7 @@
"3eqv71": "Please go to the mini program to use the complete service",
"08cg8y": "The customer service address is incorrect",
"0gwt7z": "Clear successful",
- "87yghj": "Logout successful",
+ "87yghj": "Logout successful",
"di6v5t": "Please obtain authorization first",
"nu5058": "Geographic location selection is not supported!",
"4v6q86": "No location selected"
diff --git a/lang/zh.json b/lang/zh.json
index 26ca7c48..33faa14d 100644
--- a/lang/zh.json
+++ b/lang/zh.json
@@ -78,7 +78,7 @@
"article-detail": "文章详情",
"setup": "设置",
"personal": "个人资料",
- "password": "密码修改",
+ "password": "密码修改",
"logout": "账号注销",
"plugins-seckill-index": "限时秒杀",
"plugins-coupon-index": "领券中心",
@@ -187,6 +187,7 @@
"plugins-ordergoodsform-order": "商品表单",
"plugins-coin-user": "虚拟币",
"plugins-coin-recharge": "充值",
+ "plugins-coin-recharge-pay": "充值支付",
"plugins-coin-convert": "转换",
"plugins-coin-withdrawal": "提现",
"plugins-coin-detail": "明细",
@@ -194,6 +195,7 @@
"plugins-coin-transaction-detail": "交易明细",
"plugins-coin-withdrawal-detail": "提现明细",
"plugins-coin-convert-detail": "转换明细",
+ "plugins-coin-recharge-detail": "充值明细",
"plugins-coin-collection": "收款"
},
"login": {
@@ -240,9 +242,9 @@
"s665h5": "获取验证码",
"jw378f": "授权用户信息",
"np9177": "绑定手机",
- "tgsa4d": "绑定邮箱",
- "876tdf": "绑定账户",
- "87yui2": "绑定成功",
+ "tgsa4d": "绑定邮箱",
+ "876tdf": "绑定账户",
+ "87yui2": "绑定成功",
"158yg2": "手机验证码登录",
"r329eu": "邮箱验证码登录",
"39hn6v": "账号密码注册",
@@ -319,7 +321,7 @@
"setup": {
"x81v6d": "更换手机",
"j6skqh": "点击更换",
- "dfg4wf": "点击绑定",
+ "dfg4wf": "点击绑定",
"r7jz13": "修改语言",
"42mba7": "地址管理",
"5eltza": "点击管理",
@@ -335,7 +337,7 @@
"07o10b": "请先绑定手机",
"nwt4o1": "请先登录",
"utnr7g": "客服电话有误",
- "87ytgh": "解绑"
+ "87ytgh": "解绑"
}
},
"article-category": {
@@ -1695,7 +1697,7 @@
"3eqv71": "请前往小程序使用完整服务",
"08cg8y": "客服地址有误",
"0gwt7z": "清除成功",
- "87yghj": "退出成功",
+ "87yghj": "退出成功",
"di6v5t": "请先获取授权",
"nu5058": "不支持地理位置选择!",
"4v6q86": "未选择位置"
diff --git a/pages.json b/pages.json
index 0d9cfe9d..46325598 100644
--- a/pages.json
+++ b/pages.json
@@ -69,372 +69,422 @@
"subPackages": [
{
"root": "pages/goods-detail",
- "pages": [{
- "path": "goods-detail",
- "style": {
- // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || H5 || APP
- "navigationStyle": "custom",
- // #endif
- "enablePullDownRefresh": true,
- "navigationBarTitleText": ""
+ "pages": [
+ {
+ "path": "goods-detail",
+ "style": {
+ // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || H5 || APP
+ "navigationStyle": "custom",
+ // #endif
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": ""
+ }
}
- }]
+ ]
},
{
"root": "pages/login",
- "pages": [{
- "path": "login",
- "style": {
- "enablePullDownRefresh": false,
- "navigationBarTitleText": ""
+ "pages": [
+ {
+ "path": "login",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationBarTitleText": ""
+ }
}
- }]
+ ]
},
{
"root": "pages/cart-page",
- "pages": [{
- "path": "cart-page",
- "style": {
- // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || H5 || APP
- "navigationStyle": "custom",
- // #endif
- // #ifdef MP-ALIPAY
- "transparentTitle": "always",
- "titlePenetrate": "YES",
- // 该页不显示滚动条
- "scrollIndicator": "none",
- // #endif
- "enablePullDownRefresh": false,
- // 禁止页面下拉
- "disableScroll": true,
- "navigationBarTitleText": ""
+ "pages": [
+ {
+ "path": "cart-page",
+ "style": {
+ // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || H5 || APP
+ "navigationStyle": "custom",
+ // #endif
+ // #ifdef MP-ALIPAY
+ "transparentTitle": "always",
+ "titlePenetrate": "YES",
+ // 该页不显示滚动条
+ "scrollIndicator": "none",
+ // #endif
+ "enablePullDownRefresh": false,
+ // 禁止页面下拉
+ "disableScroll": true,
+ "navigationBarTitleText": ""
+ }
}
- }]
+ ]
},
{
"root": "pages/buy",
- "pages": [{
- "path": "buy",
- "style": {
- "enablePullDownRefresh": true,
- "navigationBarTitleText": ""
+ "pages": [
+ {
+ "path": "buy",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": ""
+ }
}
- }]
+ ]
},
{
"root": "pages/goods-search",
- "pages": [{
- "path": "goods-search",
- "style": {
- "enablePullDownRefresh": true,
- "navigationBarTitleText": ""
+ "pages": [
+ {
+ "path": "goods-search",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": ""
+ }
}
- }]
+ ]
},
{
"root": "pages/goods-comment",
- "pages": [{
- "path": "goods-comment",
- "style": {
- "enablePullDownRefresh": true,
- "navigationBarTitleText": ""
+ "pages": [
+ {
+ "path": "goods-comment",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": ""
+ }
}
- }]
+ ]
},
{
"root": "pages/user-address",
- "pages": [{
- "path": "user-address",
- "style": {
- "enablePullDownRefresh": true,
- "navigationBarTitleText": ""
+ "pages": [
+ {
+ "path": "user-address",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": ""
+ }
}
- }]
+ ]
},
{
"root": "pages/user-address-save",
- "pages": [{
- "path": "user-address-save",
- "style": {
- "enablePullDownRefresh": false,
- "navigationBarTitleText": ""
+ "pages": [
+ {
+ "path": "user-address-save",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationBarTitleText": ""
+ }
}
- }]
+ ]
},
{
"root": "pages/user-order",
- "pages": [{
- "path": "user-order",
- "style": {
- "enablePullDownRefresh": true,
- "navigationBarTitleText": ""
+ "pages": [
+ {
+ "path": "user-order",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": ""
+ }
}
- }]
+ ]
},
{
"root": "pages/user-order-detail",
- "pages": [{
- "path": "user-order-detail",
- "style": {
- "enablePullDownRefresh": true,
- "navigationBarTitleText": ""
+ "pages": [
+ {
+ "path": "user-order-detail",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": ""
+ }
}
- }]
+ ]
},
{
"root": "pages/user-order-comments",
- "pages": [{
- "path": "user-order-comments",
- "style": {
- "enablePullDownRefresh": true,
- "navigationBarTitleText": ""
+ "pages": [
+ {
+ "path": "user-order-comments",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": ""
+ }
}
- }]
+ ]
},
{
"root": "pages/user-favor",
- "pages": [{
- "path": "user-favor",
- "style": {
- "enablePullDownRefresh": true,
- "navigationBarTitleText": ""
+ "pages": [
+ {
+ "path": "user-favor",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": ""
+ }
}
- }]
+ ]
},
{
"root": "pages/user-goods-comments",
- "pages": [{
- "path": "user-goods-comments",
- "style": {
- "enablePullDownRefresh": true,
- "navigationBarTitleText": ""
+ "pages": [
+ {
+ "path": "user-goods-comments",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": ""
+ }
}
- }]
+ ]
},
{
"root": "pages/user-goods-comments-form",
- "pages": [{
- "path": "user-goods-comments-form",
- "style": {
- "enablePullDownRefresh": true,
- "navigationBarTitleText": ""
+ "pages": [
+ {
+ "path": "user-goods-comments-form",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": ""
+ }
}
- }]
+ ]
},
{
"root": "pages/message",
- "pages": [{
- "path": "message",
- "style": {
- "enablePullDownRefresh": true,
- "navigationBarTitleText": ""
+ "pages": [
+ {
+ "path": "message",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": ""
+ }
}
- }]
+ ]
},
{
"root": "pages/user-integral",
- "pages": [{
- "path": "user-integral",
- "style": {
- "enablePullDownRefresh": true,
- "navigationBarTitleText": ""
+ "pages": [
+ {
+ "path": "user-integral",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": ""
+ }
}
- }]
+ ]
},
{
"root": "pages/user-goods-browse",
- "pages": [{
- "path": "user-goods-browse",
- "style": {
- "enablePullDownRefresh": true,
- "navigationBarTitleText": ""
+ "pages": [
+ {
+ "path": "user-goods-browse",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": ""
+ }
}
- }]
+ ]
},
{
"root": "pages/user-orderaftersale",
- "pages": [{
- "path": "user-orderaftersale",
- "style": {
- "enablePullDownRefresh": true,
- "navigationBarTitleText": ""
+ "pages": [
+ {
+ "path": "user-orderaftersale",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": ""
+ }
}
- }]
+ ]
},
{
"root": "pages/user-orderaftersale-detail",
- "pages": [{
- "path": "user-orderaftersale-detail",
- "style": {
- "enablePullDownRefresh": true,
- "navigationBarTitleText": ""
+ "pages": [
+ {
+ "path": "user-orderaftersale-detail",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": ""
+ }
}
- }]
+ ]
},
{
"root": "pages/extraction-address",
- "pages": [{
- "path": "extraction-address",
- "style": {
- "enablePullDownRefresh": true,
- "navigationBarTitleText": ""
+ "pages": [
+ {
+ "path": "extraction-address",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": ""
+ }
}
- }]
+ ]
},
{
"root": "pages/common/open-setting-location",
- "pages": [{
- "path": "open-setting-location",
- "style": {
- // #ifndef MP-TOUTIAO
- "navigationStyle": "custom",
- // #endif
- "enablePullDownRefresh": false
+ "pages": [
+ {
+ "path": "open-setting-location",
+ "style": {
+ // #ifndef MP-TOUTIAO
+ "navigationStyle": "custom",
+ // #endif
+ "enablePullDownRefresh": false
+ }
}
- }]
+ ]
},
{
"root": "pages/common/agreement",
- "pages": [{
- "path": "agreement",
- "style": {
- // #ifndef MP-TOUTIAO
- "navigationStyle": "custom",
- // #endif
- "enablePullDownRefresh": false
+ "pages": [
+ {
+ "path": "agreement",
+ "style": {
+ // #ifndef MP-TOUTIAO
+ "navigationStyle": "custom",
+ // #endif
+ "enablePullDownRefresh": false
+ }
}
- }]
+ ]
},
{
"root": "pages/customview",
- "pages": [{
- "path": "customview",
- "style": {
- "enablePullDownRefresh": true,
- "navigationBarTitleText": ""
+ "pages": [
+ {
+ "path": "customview",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": ""
+ }
}
- }]
+ ]
},
{
"root": "pages/design",
- "pages": [{
- "path": "design",
- "style": {
- "enablePullDownRefresh": true,
- "navigationBarTitleText": ""
+ "pages": [
+ {
+ "path": "design",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": ""
+ }
}
- }]
+ ]
},
{
"root": "pages/web-view",
- "pages": [{
- "path": "web-view",
- "style": {
- "enablePullDownRefresh": false,
- "navigationBarTitleText": ""
+ "pages": [
+ {
+ "path": "web-view",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationBarTitleText": ""
+ }
}
- }]
+ ]
},
{
"root": "pages/paytips",
- "pages": [{
- "path": "paytips",
- "style": {
- "enablePullDownRefresh": true,
- "navigationBarTitleText": ""
+ "pages": [
+ {
+ "path": "paytips",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": ""
+ }
}
- }]
+ ]
},
{
"root": "pages/error",
- "pages": [{
- "path": "error",
- "style": {
- "enablePullDownRefresh": true,
- "navigationBarTitleText": ""
+ "pages": [
+ {
+ "path": "error",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": ""
+ }
}
- }]
+ ]
},
{
"root": "pages/article-category",
- "pages": [{
- "path": "article-category",
- "style": {
- "enablePullDownRefresh": true,
- "navigationBarTitleText": ""
+ "pages": [
+ {
+ "path": "article-category",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": ""
+ }
}
- }]
+ ]
},
{
"root": "pages/article-detail",
- "pages": [{
- "path": "article-detail",
- "style": {
- "enablePullDownRefresh": true,
- "navigationBarTitleText": ""
+ "pages": [
+ {
+ "path": "article-detail",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": ""
+ }
}
- }]
+ ]
},
{
"root": "pages/setup",
- "pages": [{
- "path": "setup",
- "style": {
- "enablePullDownRefresh": false,
- "navigationBarTitleText": ""
+ "pages": [
+ {
+ "path": "setup",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationBarTitleText": ""
+ }
}
- }]
+ ]
},
{
"root": "pages/personal",
- "pages": [{
- "path": "personal",
- "style": {
- "enablePullDownRefresh": false,
- "navigationBarTitleText": ""
+ "pages": [
+ {
+ "path": "personal",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationBarTitleText": ""
+ }
}
- }]
+ ]
},
{
"root": "pages/logout",
- "pages": [{
- "path": "logout",
- "style": {
- "enablePullDownRefresh": false,
- "navigationBarTitleText": ""
+ "pages": [
+ {
+ "path": "logout",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationBarTitleText": ""
+ }
}
- }]
+ ]
},
{
"root": "pages/password",
- "pages": [{
- "path": "password",
- "style": {
- "enablePullDownRefresh": false,
- "navigationBarTitleText": ""
+ "pages": [
+ {
+ "path": "password",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationBarTitleText": ""
+ }
}
- }]
+ ]
},
{
"root": "pages/plugins/seckill",
- "pages": [{
- "path": "index/index",
- "style": {
- // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
- "navigationStyle": "custom",
- // #endif
- // #ifdef MP-ALIPAY
- "transparentTitle": "auto",
- "titlePenetrate":"YES",
- // #endif
- "enablePullDownRefresh": true,
- "navigationBarTitleText": ""
- }
- }]
- },
- {
- "root": "pages/plugins/coupon",
- "pages": [{
+ "pages": [
+ {
"path": "index/index",
"style": {
// #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
@@ -442,7 +492,26 @@
// #endif
// #ifdef MP-ALIPAY
"transparentTitle": "auto",
- "titlePenetrate":"YES",
+ "titlePenetrate": "YES",
+ // #endif
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": ""
+ }
+ }
+ ]
+ },
+ {
+ "root": "pages/plugins/coupon",
+ "pages": [
+ {
+ "path": "index/index",
+ "style": {
+ // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
+ "navigationStyle": "custom",
+ // #endif
+ // #ifdef MP-ALIPAY
+ "transparentTitle": "auto",
+ "titlePenetrate": "YES",
// #endif
"enablePullDownRefresh": true,
"navigationBarTitleText": ""
@@ -466,7 +535,8 @@
},
{
"root": "pages/plugins/membershiplevelvip",
- "pages": [{
+ "pages": [
+ {
"path": "index/index",
"style": {
// #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
@@ -474,7 +544,7 @@
// #endif
// #ifdef MP-ALIPAY
"transparentTitle": "auto",
- "titlePenetrate":"YES",
+ "titlePenetrate": "YES",
// #endif
"enablePullDownRefresh": true,
"navigationBarTitleText": ""
@@ -495,7 +565,7 @@
// #endif
// #ifdef MP-ALIPAY
"transparentTitle": "auto",
- "titlePenetrate":"YES",
+ "titlePenetrate": "YES",
// #endif
"enablePullDownRefresh": true,
"navigationBarTitleText": ""
@@ -554,7 +624,8 @@
},
{
"root": "pages/plugins/distribution",
- "pages": [{
+ "pages": [
+ {
"path": "user/user",
"style": {
// #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
@@ -562,7 +633,7 @@
// #endif
// #ifdef MP-ALIPAY
"transparentTitle": "auto",
- "titlePenetrate":"YES",
+ "titlePenetrate": "YES",
// #endif
"enablePullDownRefresh": true,
"navigationBarTitleText": ""
@@ -705,7 +776,8 @@
},
{
"root": "pages/plugins/wallet",
- "pages": [{
+ "pages": [
+ {
"path": "user/user",
"style": {
// #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
@@ -713,7 +785,7 @@
// #endif
// #ifdef MP-ALIPAY
"transparentTitle": "auto",
- "titlePenetrate":"YES",
+ "titlePenetrate": "YES",
// #endif
"enablePullDownRefresh": true,
"navigationBarTitleText": ""
@@ -727,7 +799,7 @@
// #endif
// #ifdef MP-ALIPAY
"transparentTitle": "auto",
- "titlePenetrate":"YES",
+ "titlePenetrate": "YES",
// #endif
"enablePullDownRefresh": false,
"navigationBarTitleText": ""
@@ -793,7 +865,8 @@
},
{
"root": "pages/plugins/excellentbuyreturntocash",
- "pages": [{
+ "pages": [
+ {
"path": "profit/profit",
"style": {
"enablePullDownRefresh": true,
@@ -811,7 +884,8 @@
},
{
"root": "pages/plugins/weixinliveplayer",
- "pages": [{
+ "pages": [
+ {
"path": "index/index",
"style": {
"enablePullDownRefresh": true,
@@ -836,13 +910,15 @@
},
{
"root": "pages/plugins/exchangerate",
- "pages": [{
- "path": "currency/currency",
- "style": {
- "enablePullDownRefresh": true,
- "navigationBarTitleText": ""
+ "pages": [
+ {
+ "path": "currency/currency",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": ""
+ }
}
- }]
+ ]
},
{
"root": "pages/plugins/invoice",
@@ -879,7 +955,8 @@
},
{
"root": "pages/plugins/signin",
- "pages": [{
+ "pages": [
+ {
"path": "user/user",
"style": {
"enablePullDownRefresh": true,
@@ -894,7 +971,7 @@
// #endif
// #ifdef MP-ALIPAY
"transparentTitle": "auto",
- "titlePenetrate":"YES",
+ "titlePenetrate": "YES",
// #endif
"enablePullDownRefresh": true,
"navigationBarTitleText": ""
@@ -925,41 +1002,46 @@
},
{
"root": "pages/plugins/points",
- "pages": [{
- "path": "index/index",
- "style": {
- // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
- "navigationStyle": "custom",
- // #endif
- // #ifdef MP-ALIPAY
- "transparentTitle": "auto",
- "titlePenetrate":"YES",
- // #endif
- "enablePullDownRefresh": true,
- "navigationBarTitleText": ""
+ "pages": [
+ {
+ "path": "index/index",
+ "style": {
+ // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
+ "navigationStyle": "custom",
+ // #endif
+ // #ifdef MP-ALIPAY
+ "transparentTitle": "auto",
+ "titlePenetrate": "YES",
+ // #endif
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": ""
+ }
+ },
+ {
+ "path": "scan/scan",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationBarTitleText": ""
+ }
}
- },
- {
- "path": "scan/scan",
- "style": {
- "enablePullDownRefresh": false,
- "navigationBarTitleText": ""
- }
- }]
+ ]
},
{
"root": "pages/plugins/brand",
- "pages": [{
- "path": "index/index",
- "style": {
- "enablePullDownRefresh": true,
- "navigationBarTitleText": ""
+ "pages": [
+ {
+ "path": "index/index",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": ""
+ }
}
- }]
+ ]
},
{
"root": "pages/plugins/shop",
- "pages": [{
+ "pages": [
+ {
"path": "index/index",
"style": {
"enablePullDownRefresh": true,
@@ -1003,7 +1085,8 @@
},
{
"root": "pages/plugins/activity",
- "pages": [{
+ "pages": [
+ {
"path": "index/index",
"style": {
"enablePullDownRefresh": true,
@@ -1021,17 +1104,20 @@
},
{
"root": "pages/plugins/label",
- "pages": [{
- "path": "detail/detail",
- "style": {
- "enablePullDownRefresh": true,
- "navigationBarTitleText": ""
+ "pages": [
+ {
+ "path": "detail/detail",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": ""
+ }
}
- }]
+ ]
},
{
"root": "pages/plugins/blog",
- "pages": [{
+ "pages": [
+ {
"path": "index/index",
"style": {
"enablePullDownRefresh": true,
@@ -1077,17 +1163,20 @@
},
{
"root": "pages/plugins/express",
- "pages": [{
- "path": "detail/detail",
- "style": {
- "enablePullDownRefresh": true,
- "navigationBarTitleText": ""
+ "pages": [
+ {
+ "path": "detail/detail",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": ""
+ }
}
- }]
+ ]
},
{
"root": "pages/plugins/realstore",
- "pages": [{
+ "pages": [
+ {
"path": "index/index",
"style": {
"enablePullDownRefresh": true,
@@ -1109,7 +1198,7 @@
// #endif
// #ifdef MP-ALIPAY
"transparentTitle": "auto",
- "titlePenetrate":"YES",
+ "titlePenetrate": "YES",
// #endif
"enablePullDownRefresh": true,
"navigationBarTitleText": ""
@@ -1161,7 +1250,8 @@
},
{
"root": "pages/plugins/binding",
- "pages": [{
+ "pages": [
+ {
"path": "index/index",
"style": {
"enablePullDownRefresh": true,
@@ -1179,7 +1269,8 @@
},
{
"root": "pages/plugins/delivery",
- "pages": [{
+ "pages": [
+ {
"path": "order/order",
"style": {
"enablePullDownRefresh": false,
@@ -1204,7 +1295,8 @@
},
{
"root": "pages/plugins/ask",
- "pages": [{
+ "pages": [
+ {
"path": "index/index",
"style": {
// #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
@@ -1212,7 +1304,7 @@
// #endif
// #ifdef MP-ALIPAY
"transparentTitle": "auto",
- "titlePenetrate":"YES",
+ "titlePenetrate": "YES",
// #endif
"enablePullDownRefresh": true,
"navigationBarTitleText": ""
@@ -1240,7 +1332,7 @@
// #endif
// #ifdef MP-ALIPAY
"transparentTitle": "auto",
- "titlePenetrate":"YES",
+ "titlePenetrate": "YES",
// #endif
"enablePullDownRefresh": true,
"navigationBarTitleText": ""
@@ -1271,7 +1363,8 @@
},
{
"root": "pages/plugins/intellectstools",
- "pages": [{
+ "pages": [
+ {
"path": "goods-comments/goods-comments",
"style": {
"enablePullDownRefresh": true,
@@ -1282,7 +1375,8 @@
},
{
"root": "pages/plugins/scanpay",
- "pages": [{
+ "pages": [
+ {
"path": "index/index",
"style": {
"enablePullDownRefresh": true,
@@ -1300,7 +1394,8 @@
},
{
"root": "pages/plugins/thirdpartylogin",
- "pages": [{
+ "pages": [
+ {
"path": "index/index",
"style": {
"disableScroll": true,
@@ -1312,7 +1407,8 @@
},
{
"root": "pages/plugins/magic",
- "pages": [{
+ "pages": [
+ {
"path": "detail/detail",
"style": {
"enablePullDownRefresh": true,
@@ -1323,7 +1419,8 @@
},
{
"root": "pages/plugins/ordergoodsform",
- "pages": [{
+ "pages": [
+ {
"path": "order/order",
"style": {
"enablePullDownRefresh": true,
@@ -1334,7 +1431,8 @@
},
{
"root": "pages/plugins/coin",
- "pages": [{
+ "pages": [
+ {
"path": "user/user",
"style": {
// #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
@@ -1342,7 +1440,7 @@
// #endif
// #ifdef MP-ALIPAY
"transparentTitle": "auto",
- "titlePenetrate":"YES",
+ "titlePenetrate": "YES",
// #endif
"enablePullDownRefresh": true,
"navigationBarTitleText": ""
@@ -1356,12 +1454,19 @@
// #endif
// #ifdef MP-ALIPAY
"transparentTitle": "auto",
- "titlePenetrate":"YES",
+ "titlePenetrate": "YES",
// #endif
"enablePullDownRefresh": true,
"navigationBarTitleText": ""
}
},
+ {
+ "path": "recharge-pay/recharge-pay",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": ""
+ }
+ },
{
"path": "convert/convert",
"style": {
@@ -1377,7 +1482,7 @@
// #endif
// #ifdef MP-ALIPAY
"transparentTitle": "auto",
- "titlePenetrate":"YES",
+ "titlePenetrate": "YES",
// #endif
"enablePullDownRefresh": true,
"navigationBarTitleText": ""
@@ -1391,7 +1496,7 @@
// #endif
// #ifdef MP-ALIPAY
"transparentTitle": "auto",
- "titlePenetrate":"YES",
+ "titlePenetrate": "YES",
// #endif
"enablePullDownRefresh": true,
"navigationBarTitleText": ""
@@ -1425,6 +1530,13 @@
"navigationBarTitleText": ""
}
},
+ {
+ "path": "recharge-detail/recharge-detail",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": ""
+ }
+ },
{
"path": "collection/collection",
"style": {
@@ -1446,7 +1558,8 @@
"color": "#333",
"selectedColor": "#333",
"backgroundColor": "#fff",
- "list": [{
+ "list": [
+ {
"pagePath": "pages/index/index",
"iconPath": "static/images/common/tabbar/home.png",
"selectedIconPath": "static/images/common/tabbar/home.png",
@@ -1472,4 +1585,4 @@
}
]
}
-}
\ No newline at end of file
+}
diff --git a/pages/plugins/coin/detail/detail.vue b/pages/plugins/coin/detail/detail.vue
index fe4f7ee9..cbe3962c 100644
--- a/pages/plugins/coin/detail/detail.vue
+++ b/pages/plugins/coin/detail/detail.vue
@@ -1,6 +1,6 @@
-
+
@@ -35,25 +35,25 @@
- {{ item.type }}
- {{ item.date }}
+ {{ item.coin_type_name }}
+ {{ item.add_time }}
- 金额类型:
- {{ item.price_type }}
+ 操作类型:
+ {{ item.operate_type_name }}
- 操作金额:
- {{ item.price }}
+ 操作数量:
+ {{ item.operate_coin }}
- 原始金额:
- {{ item.init_price }}
+ 原始数量:
+ {{ item.original_coin }}
- 最新金额:
- {{ item.new_price }}
+ 最新数量:
+ {{ item.latest_coin }}
@@ -211,7 +211,7 @@
dataType: 'json',
success: (res) => {
uni.stopPullDownRefresh();
- console.log(res);
+ console.log( res.data.data);
if (res.data.code == 0) {
var data = res.data.data;
this.setData({
@@ -222,6 +222,13 @@
data_list_loding_msg: '',
data_list_loding_status: 0,
});
+ for (var i = 0; i < data.accounts_list.length; i++) {
+ if (data.accounts_list[i].id === this.params.id) {
+ this.setData({
+ accounts_list_index: i,
+ });
+ }
+ }
} else {
this.setData({
data_list_loding_status: 2,
diff --git a/pages/plugins/coin/recharge-detail/recharge-detail.css b/pages/plugins/coin/recharge-detail/recharge-detail.css
new file mode 100644
index 00000000..77b1c17e
--- /dev/null
+++ b/pages/plugins/coin/recharge-detail/recharge-detail.css
@@ -0,0 +1,14 @@
+.convert .nav {
+ z-index: 102;
+}
+.scroll-box {
+ height: calc(100vh - 88rpx);
+}
+
+/*
+ * 钱包弹窗
+*/
+.popup_wallet_container .item {
+ background-color: #f4f4f4;
+ border-radius: 30rpx;
+}
\ No newline at end of file
diff --git a/pages/plugins/coin/recharge-detail/recharge-detail.vue b/pages/plugins/coin/recharge-detail/recharge-detail.vue
new file mode 100644
index 00000000..b7f663d8
--- /dev/null
+++ b/pages/plugins/coin/recharge-detail/recharge-detail.vue
@@ -0,0 +1,395 @@
+
+
+
+
+
+ 钱包
+
+
+
+ 类型
+
+
+
+
+
+
+
+ {{ item.status }}
+ {{ item.date }}
+
+
+
+ 转出余额:
+ {{ item.tob }}
+
+
+ 转换汇率:
+ {{ item.convert_rate }}
+
+
+ 最新金额:
+ {{ item.new_price }}
+
+
+
+
+
+
+
+
+ 钱包种类
+
+
+ {{ $t('nav-more.nav-more.h9g4b1') }}
+
+
+
+
+
+
+
+ 提现类型
+
+
+ {{ $t('nav-more.nav-more.h9g4b1') }}
+
+
+
+
+
+
+
+
+
diff --git a/pages/plugins/coin/recharge-pay/recharge-pay.css b/pages/plugins/coin/recharge-pay/recharge-pay.css
new file mode 100644
index 00000000..e645e8f4
--- /dev/null
+++ b/pages/plugins/coin/recharge-pay/recharge-pay.css
@@ -0,0 +1,77 @@
+.coin-dropdown {
+ --height: 72rpx;
+ height: var(--height);
+ line-height: var(--height);
+ padding: 0 52rpx 0 20rpx;
+ background: #F6F6F6;
+ border-radius: 36rpx;
+ width: 168rpx;
+}
+
+.coin-dropdown-icon {
+ right: 24rpx;
+ top: 2rpx;
+ padding: 0;
+}
+
+.coin-list-img {
+ --size: 40rpx;
+ width: var(--size);
+ height: var(--size) !important;
+}
+
+.coin-num {
+ --height: 72rpx;
+ display: inline-block;
+}
+
+.num.input-br {
+ border: 2rpx solid #F6F6F6;
+}
+
+.coin-num .num {
+ height: var(--height);
+ line-height: var(--height);
+ padding: 0 20rpx 0 20rpx;
+ border-radius: 36rpx;
+ width: 196rpx;
+}
+
+.coin-center-convert {
+ --size: 82rpx;
+ left: 50%;
+ transform: translateX(-50%);
+ margin-top: -54rpx;
+ width: var(--size);
+ height: var(--size);
+ border: 2rpx solid #e1e1e1;
+ border-radius: 50%;
+ background-color: #fff;
+}
+
+.convert-icon {
+ transition: all 0.5s ease-in-out;
+}
+
+.convert_true {
+ transform: rotate3d(1, 0, 0, 180deg);
+}
+
+.convert_false {
+ transform: rotate3d(1, 0, 0, 0deg);
+}
+
+.convert-btn {
+ background: linear-gradient(107deg, #31B4FC 0%, #0842E2 100%);
+ transition: all 0.3s ease-in-out;
+}
+
+.convert-btn:active {
+ background: linear-gradient( 107deg, #FC6F31 0%, #E22C08 100%);
+}
+
+.coin-content-list-img {
+ --size: 36rpx;
+ width: var(--size);
+ height: var(--size) !important;
+}
\ No newline at end of file
diff --git a/pages/plugins/coin/recharge-pay/recharge-pay.vue b/pages/plugins/coin/recharge-pay/recharge-pay.vue
new file mode 100644
index 00000000..aa4df2d5
--- /dev/null
+++ b/pages/plugins/coin/recharge-pay/recharge-pay.vue
@@ -0,0 +1,320 @@
+
+
+
+
+
+
+
+
+
+
+ {{ coin_list[send_accounts_id_index]['platform_name'] }}
+
+
+
+
+
+ 余额:{{ coin_list[send_accounts_id_index]['platform_symbol'] }}{{ coin_list[send_accounts_id_index]['normal_coin'] }}
+
+
+
+
+ {{ coin_list[send_accounts_id_index]['platform_symbol'] }}{{ coin_list[send_accounts_id_index]['default_coin'] }}
+
+
+
+
+
+
+
+
+
+ {{ coin_list[receive_accounts_id_index]['platform_name'] }}
+
+
+
+
+
+ 余额:{{ coin_list[receive_accounts_id_index]['platform_symbol'] }}{{ coin_list[receive_accounts_id_index]['normal_coin'] }}
+
+
+
+
+ {{ coin_list[receive_accounts_id_index]['platform_symbol'] }}{{ coin_list[receive_accounts_id_index]['default_coin'] }}
+
+
+
+
+ 1XRP = 2.45546 ($21.00)
+
+
+
+ 支付密码
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.platform_name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/plugins/coin/recharge/recharge.css b/pages/plugins/coin/recharge/recharge.css
index 478e4851..6dd77d1b 100644
--- a/pages/plugins/coin/recharge/recharge.css
+++ b/pages/plugins/coin/recharge/recharge.css
@@ -31,6 +31,7 @@
text-align: center;
padding: 30rpx 38rpx;
}
+
.recharge-qrcode .img {
width: 160rpx !important;
height: 160rpx !important;
@@ -68,6 +69,22 @@
width: calc((100% / 3) - 24rpx);
}
+.recharge-price-badge {
+ background: linear-gradient(107deg, #8A18DF 0%, #8D17DD 100%), #D8D8D8;
+ border-radius: 16rpx 0px 16rpx 0px;
+ padding: 2rpx 20rpx;
+ position: absolute;
+ left: 0;
+ top: -20rpx;
+ max-width: calc(100% - 20px);
+}
+
+.recharge-price-list.active {
+ background: rgba(8, 140, 226, 0.06);
+ border-radius: 8px;
+ border: 1px solid #2FB0FB;
+}
+
.recharge-price-name {
font-size: 44rpx;
}
diff --git a/pages/plugins/coin/recharge/recharge.vue b/pages/plugins/coin/recharge/recharge.vue
index 4242666f..bb22e9d2 100644
--- a/pages/plugins/coin/recharge/recharge.vue
+++ b/pages/plugins/coin/recharge/recharge.vue
@@ -1,109 +1,105 @@
-
-
-
-
-
-
-
-
- {{ coin_list[coin_index]['name'] }}
-
-
-
+
+
+
+
+
+
+
+ {{ accounts_list[accounts_list_index]['platform_name'] }}
+
+
- 38000
-
-
-
-
-
-
-
+ {{ accounts_list[accounts_list_index]['normal_coin'] }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 充币地址
+
+ {{ recharge_address }}
+
+
-
-
- 充币地址
-
- 4gfgefg33445fghfghh4bfbfghebdfb34fgdfg44gfgefg33445fghfghh4bfbfghebdfb34fgdfg4
-
-
+
+ 充币网络
+
+
+ {{ network_list[network_list_index]['name'] }}
+
+
+
+
+ 选择充值金额
+
+
+
+
+ {{ item.value }}
+ 10000
+ {{ item.tips }}
-
- 充币网络
-
-
- {{ recharge_web_list[recharge_web_index]['name'] }}
-
-
+
+ 其他数量
+
+
+
-
- 选择充值金额
-
-
-
-
- {{ item.name }}
-
- {{ item.price }}
-
-
-
- 其他数量
-
-
-
-
-
-
-
- 充值说明:
-
- 充值只可选择以上固定档位金额
- 充值只可选择以上固定档位金额
- 充值只可选择以上固定档位金额
-
+
+
+
+ 充值说明:
+
+ {{ item }}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
- {{ item.name }}
-
-
-
-
+
+
+
+
+
+
+ {{ item.platform_name }}
+
+
+
-
-
+
+