diff --git a/buyer/src/pages/forgetPassword.vue b/buyer/src/pages/forgetPassword.vue
index 322c6e50..c955c89e 100644
--- a/buyer/src/pages/forgetPassword.vue
+++ b/buyer/src/pages/forgetPassword.vue
@@ -280,7 +280,7 @@ export default {
.login-container {
position: relative;
margin: 10px auto;
- width: 1200px;
+ width: 600px;
background-color: #fff;
padding: 20px;
.login-btn{
diff --git a/buyer/src/pages/home/userCenter/MoneyManagement.vue b/buyer/src/pages/home/userCenter/MoneyManagement.vue
index f57011b3..9ebd1f13 100644
--- a/buyer/src/pages/home/userCenter/MoneyManagement.vue
+++ b/buyer/src/pages/home/userCenter/MoneyManagement.vue
@@ -188,10 +188,10 @@ export default {
},
formValidate: {
price: [
- { required: true, message: '请输入大于0小于9999的合法充值金额' },
+ { required: true, message: '请输入大于等于1小于9999的合法充值金额' },
{
pattern: /^[1-9]\d{0,3}(\.\d{1,2})?$/,
- message: '请输入大于0小于9999的合法充值金额',
+ message: '请输入大于等于1小于9999的合法充值金额',
trigger: 'change'
}
]
@@ -200,11 +200,13 @@ export default {
logColumns: [
{
title: '时间',
+ width: 190,
key: 'createTime'
},
{
title: '金额',
key: 'money',
+ width: 180,
render: (h, params) => {
if (params.row.money > 0) {
return h('div', [
@@ -241,20 +243,29 @@ export default {
logColumnsData: {}, // 余额日志
// 充值记录
rechargeListColumns: [
+ {
+ title: '充值时间',
+ key: 'createTime',
+ width: 168
+ },
{
title: '支付单号',
key: 'rechargeSn',
width: 200
},
- {
- title: '支付方式',
- key: 'rechargeWay'
- },
{
title: '充值金额',
key: 'rechargeMoney',
render: (h, params) => {
- return h('div', [h('span', this.$options.filters.unitPrice(params.row.rechargeMoney, '¥'))]);
+ if (params.row.payStatus === 'PAID') {
+ return h('div', [h('span', {
+ style: {
+ color: 'green'
+ }
+ }, this.$options.filters.unitPrice(params.row.rechargeMoney, '+ ¥'))]);
+ } else {
+ return h('div', [h('span', this.$options.filters.unitPrice(params.row.rechargeMoney, '¥'))]);
+ }
}
},
{
@@ -268,29 +279,60 @@ export default {
}
}
},
+ {
+ title: '支付方式',
+ key: 'rechargeWay',
+ render: (h, params) => {
+ if (params.row.rechargeWay === 'ALIPAY') {
+ return h('div', [h('span', {}, '支付宝')]);
+ } else if (params.row.rechargeWay === 'WECHAT') {
+ return h('div', [h('span', {}, '微信')]);
+ } else if (params.row.rechargeWay === 'BANK_TRANSFER') {
+ return h('div', [h('span', {}, '线下转账')]);
+ } else {
+ return h('div', [h('span', {}, '')]);
+ }
+ }
+ },
{
title: '支付时间',
- key: 'payTime'
+ key: 'payTime',
+ width: 180
}
],
rechargeListData: {}, // 充值记录数据
// 提现记录
withdrawApplyColumns: [
+ {
+ title: '申请时间',
+ key: 'createTime',
+ width: 168
+ },
{
title: '提现单号',
key: 'sn',
- width: 215
+ width: 200
},
{
title: '提现金额',
key: 'applyMoney',
+ width: 110,
render: (h, params) => {
- return h('div', [h('span', this.$options.filters.unitPrice(params.row.applyMoney, '¥'))]);
+ if (params.row.applyStatus === 'VIA_AUDITING') {
+ return h('div', [h('span', {
+ style: {
+ color: 'green'
+ }
+ }, this.$options.filters.unitPrice(params.row.applyMoney, '+ ¥'))]);
+ } else {
+ return h('div', [h('span', this.$options.filters.unitPrice(params.row.applyMoney, '¥'))]);
+ }
}
},
{
title: '提现状态',
key: 'applyStatus',
+ width: 95,
render: (h, params) => {
if (params.row.applyStatus === 'APPLY') {
return h('div', [h('span', {}, '申请中')]);
@@ -302,12 +344,14 @@ export default {
}
},
{
- title: '提现时间',
- key: 'inspectTime'
+ title: '审核时间',
+ key: 'inspectTime',
+ width: 168
},
{
title: '审核备注',
key: 'inspectRemark'
+
}
],
withdrawApplyColumnsListData: {} // 提现记录
diff --git a/buyer/src/pages/shopEntry/first-apply.vue b/buyer/src/pages/shopEntry/first-apply.vue
index 91ca0608..7b82e101 100644
--- a/buyer/src/pages/shopEntry/first-apply.vue
+++ b/buyer/src/pages/shopEntry/first-apply.vue
@@ -10,7 +10,6 @@
/>
-
人
+
+
+
店铺入驻
-
+
@@ -21,6 +21,9 @@
店铺已关闭，重申请联系管理员
审核未通过,请修改资质信息，如有疑问请联系管理员
+
+
+
@@ -38,38 +41,37 @@