diff --git a/lang/en.json b/lang/en.json
index 690f73d2..044e93aa 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -203,7 +203,9 @@
"plugins-coin-cash-list": "Withdrawal details",
"plugins-coin-convert-list": "Conversion details",
"plugins-coin-recharge-list": "Recharge details",
- "plugins-antifakecode-index": "Authentic inquiry"
+ "plugins-antifakecode-index": "Authentic inquiry",
+ "plugins-rechargecard-index": "My recharge card",
+ "plugins-rechargecard-form": "Recharge card redemption"
},
"login": {
"login": {
@@ -1849,5 +1851,13 @@
"yyjemb": "Anonymous or not",
"0nhrj0": "Comment content"
}
- }
+ },
+ "rechargecard-index": {
+ "rechargecard-index": {
+ "hfg2fg": "Cami",
+ "8uhyui": "Recharge time",
+ "8tfgh2": "Recharge card redemption",
+ "fu3rf1": "Please enter the card password"
+ }
+ }
}
\ No newline at end of file
diff --git a/lang/zh.json b/lang/zh.json
index 1bd18b5f..342435ac 100644
--- a/lang/zh.json
+++ b/lang/zh.json
@@ -202,7 +202,9 @@
"plugins-coin-convert-list": "转换明细",
"plugins-coin-recharge-list": "充值明细",
"plugins-coin-collection": "收款",
- "plugins-antifakecode-index": "正品查询"
+ "plugins-antifakecode-index": "正品查询",
+ "plugins-rechargecard-index": "我的充值卡",
+ "plugins-rechargecard-form": "充值卡兑换"
},
"login": {
"login": {
@@ -1834,5 +1836,13 @@
"yyjemb": "是否匿名",
"0nhrj0": "评论内容"
}
- }
+ },
+ "rechargecard-index": {
+ "rechargecard-index": {
+ "hfg2fg": "卡密",
+ "8uhyui": "充值时间",
+ "8tfgh2": "充值卡兑换",
+ "fu3rf1": "请输入卡密"
+ }
+ }
}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index d47a662a..f5921f54 100644
--- a/pages.json
+++ b/pages.json
@@ -1576,6 +1576,25 @@
}
}
]
+ },
+ {
+ "root": "pages/plugins/rechargecard",
+ "pages": [
+ {
+ "path": "index/index",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": ""
+ }
+ },
+ {
+ "path": "form/form",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationBarTitleText": ""
+ }
+ }
+ ]
}
],
"preloadRule": {
diff --git a/pages/plugins/invoice/invoice/invoice.css b/pages/plugins/invoice/invoice/invoice.css
index d1fa993a..02ef5134 100644
--- a/pages/plugins/invoice/invoice/invoice.css
+++ b/pages/plugins/invoice/invoice/invoice.css
@@ -12,12 +12,4 @@
padding: 0 48rpx;
height: 60rpx;
line-height: 60rpx;
-}
-
-/*
-* 底部按钮
-*/
-.submit-container button {
- height: 88rpx;
- line-height: 88rpx;
}
\ No newline at end of file
diff --git a/pages/plugins/rechargecard/form/form.vue b/pages/plugins/rechargecard/form/form.vue
new file mode 100644
index 00000000..08d58193
--- /dev/null
+++ b/pages/plugins/rechargecard/form/form.vue
@@ -0,0 +1,117 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/plugins/rechargecard/index/index.vue b/pages/plugins/rechargecard/index/index.vue
new file mode 100644
index 00000000..e8ffc00b
--- /dev/null
+++ b/pages/plugins/rechargecard/index/index.vue
@@ -0,0 +1,216 @@
+
+
+
+
+
+
+
+
+
+ {{ fv.name }}:
+ {{ item[fv.field] }}
+ {{ fv.unit }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/plugins/wallet/transfer/transfer.vue b/pages/plugins/wallet/transfer/transfer.vue
index 7d35ab68..d61a677e 100644
--- a/pages/plugins/wallet/transfer/transfer.vue
+++ b/pages/plugins/wallet/transfer/transfer.vue
@@ -1,4 +1,3 @@
-
@@ -183,7 +182,7 @@
if (res.data.code == 0) {
app.globalData.url_open('/pages/plugins/wallet/user/user?type=3', true);
} else {
- if (app.globalData.is_login_check(res.data, this, 'form_submit')) {
+ if (app.globalData.is_login_check(res.data, this, 'form_submit', e)) {
app.globalData.showToast(res.data.msg);
}
}