From fde2ed3eee597cb992ed9a4776fe82c16e2ea4fa Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Mon, 1 Apr 2024 11:36:40 +0800
Subject: [PATCH] 1
---
pages/admin/orderList/index.vue | 9 +-
pages/index/index.vue | 67 ++++++------
pages/payment/payment_detail.vue | 15 +--
pages/users/user_modify_pwd/index.vue | 93 +++++++++--------
pages/withdrawal/add.vue | 140 +++++++++++++++++++++-----
pages/withdrawal/index.vue | 32 ++++--
pages/withdrawal/progress.vue | 30 +++++-
7 files changed, 262 insertions(+), 124 deletions(-)
diff --git a/pages/admin/orderList/index.vue b/pages/admin/orderList/index.vue
index 20b53b4..2616d4e 100644
--- a/pages/admin/orderList/index.vue
+++ b/pages/admin/orderList/index.vue
@@ -11,6 +11,9 @@
+
+ 全部
+
待付款
@@ -36,7 +39,7 @@
-
+
@@ -181,11 +184,11 @@
@click="toPostage(item)">去发货
去发货
去核销
diff --git a/pages/index/index.vue b/pages/index/index.vue
index cd8b16a..5606db9 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -443,7 +443,8 @@
import {
merstreet,
getUserInfo,
- getAdminApplyAPI
+ getAdminApplyAPI,
+ progressBankList
} from '@/api/user.js';
import {
business,
@@ -901,7 +902,7 @@
if (index == 4) return;
let url;
if (index == 0) url = "/pages/users/embody/embody?mer_id=" + this.userInfoData.service.mer_id;
- if (index == 2) url = `/pages/admin/orderList/index?merId=${this.userInfoData.service.mer_id}&types=2`;
+ if (index == 2) url = `/pages/admin/orderList/index?merId=${this.userInfoData.service.mer_id}&types=`;
if (index == 3) url = "/pages/activeCode/subsidy";
uni.navigateTo({
@@ -956,21 +957,18 @@
uni.navigateTo({
url: '/pages/admin/orderList/index?merId=' + this.userInfoData.service.mer_id +
'&types=' + item.type
-
})
break;
case 6:
uni.navigateTo({
url: '/pages/admin/orderList/index?merId=' + this.userInfoData.service.mer_id +
'&types=' + item.type
-
})
break;
case 99:
uni.navigateTo({
url: '/pages/admin/orderList/index?merId=' + this.userInfoData.service.mer_id +
'&types=' + item.type
-
})
break;
}
@@ -1015,12 +1013,9 @@
case 6:
uni.navigateTo({
url: '/pages/admin/orderList/indexOther?merId=' + this.userInfoData.service
- .mer_id +
- '&types=' + item.type
-
+ .mer_id + '&types=' + item.type
})
break;
-
}
} else {
this.isAuto = true;
@@ -1275,27 +1270,24 @@
const data = {
product_type: this.where1.product_type
}
- orderStatistics(this.userInfoData.service.mer_id, data).then(
- res => {
- this.order[0].value = res.data.order.unpaid;
- this.order[1].value = res.data.order.verify;
+ orderStatistics(this.userInfoData.service.mer_id, data).then(res => {
+ this.order[0].value = res.data.order.unpaid;
+ this.order[1].value = res.data.order.verify;
- this.order[2].value = res.data.order.unshipped
- this.order[3].value = res.data.order.untake
- // this.order[4].value = res.data.order.unevaluate
- this.order[4].value = res.data.order.refund
+ this.order[2].value = res.data.order.unshipped
+ this.order[3].value = res.data.order.untake
+ // this.order[4].value = res.data.order.unevaluate
+ this.order[4].value = res.data.order.refund
- this.list[2].value = res.data.data.month.orderNum
- this.list[5].value = res.data.data.today.orderNum
- },
- err => {
- that.$util.Tips({
- title: err.msg
- })
- }
- );
+ this.list[2].value = res.data.data.month.orderNum
+ this.list[5].value = res.data.data.today.orderNum
+ }, err => {
+ this.$util.Tips({
+ title: err.msg
+ })
+ });
// otherOrderStatistics(this.userInfoData.service.mer_id, data).then(
// res => {
// this.other_order[0].value = res.data.order.unshipped
@@ -1487,10 +1479,25 @@
})
break;
case 5:
- //提现管理
- uni.navigateTo({
- // url: '/pages/users/embody/embody?mer_id=' + this.userInfoData.service.mer_id
- url: '/pages/withdrawal/index?mer_id=' + this.userInfoData.service.mer_id
+ // 是否有一个银行卡在申请 或者两个银行卡在申请
+ progressBankList(this.userInfoData.service.mer_id).then(res => {
+ const data = res.data.list || [];
+
+ console.log(data.length == 1 && data[0].is_check === 0)
+
+ if ((data.length == 1 && data[0].is_check === 0) || (data.length == 2 && data[
+ 0].is_check === 0 && data[1].is_check === 0)) {
+ uni.navigateTo({
+ url: '/pages/withdrawal/progress?mer_id=' + this.userInfoData
+ .service.mer_id
+ })
+ } else {
+ uni.navigateTo({
+ // url: '/pages/users/embody/embody?mer_id=' + this.userInfoData.service.mer_id
+ url: '/pages/withdrawal/index?mer_id=' + this.userInfoData
+ .service.mer_id
+ })
+ }
})
break;
case 6:
diff --git a/pages/payment/payment_detail.vue b/pages/payment/payment_detail.vue
index 77df634..a222599 100644
--- a/pages/payment/payment_detail.vue
+++ b/pages/payment/payment_detail.vue
@@ -27,7 +27,8 @@
- {{item.come_msg}}
+ {{item.come_msg}}
+ {{item.pay_type_name}}
{{item.msg == '支出'?'-':'+'}}{{item.pay_price}}
@@ -131,12 +132,12 @@
pickerConfirm(e) {
const date = new Date(e.value).format('yyyy-MM-dd');
if (this.pickStartShow) {
- this.searchParams.section_startTime = date;
- this.searchParams.page = 1;
- this.paymentData = [];
- this.loadend = false;
- this.getData();
- }
+ this.searchParams.section_startTime = date;
+ this.searchParams.page = 1;
+ this.paymentData = [];
+ this.loadend = false;
+ this.getData();
+ }
if (this.pickEndShow) {
if (!this.searchParams.section_startTime)
this.searchParams.section_startTime = date;
diff --git a/pages/users/user_modify_pwd/index.vue b/pages/users/user_modify_pwd/index.vue
index 2e0ff8b..41d9b65 100644
--- a/pages/users/user_modify_pwd/index.vue
+++ b/pages/users/user_modify_pwd/index.vue
@@ -8,33 +8,33 @@
{{userInfo.phone}}
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -43,7 +43,8 @@
-
+
+
@@ -77,12 +78,12 @@
toLogin
} from '@/libs/login.js';
import Verify from '@/components/verify/verify.vue';
- import popups from "@/components/popups/index.vue";
+ import popups from "@/components/popups/index.vue";
export default {
mixins: [sendVerifyCode],
components: {
Verify,
- popups
+ popups
},
data() {
return {
@@ -95,7 +96,7 @@
codeVal: '',
disabled: false,
type: '',
- set_type: '',
+ set_type: '',
};
},
computed: mapGetters(['isLogin', 'viewColor']),
@@ -129,18 +130,18 @@
that.userInfo = res.data
});
},
- showPopup(type){
- this.set_type = type;
- this.$refs.popups.handleOpen();
- },
- // 输入密码回调
- handleConfirm(e) {
- if(this.set_type==1)this.password = e;
- else this.repassword = e;
- },
-
- handleClear() {},
- handleChange() {},
+ showPopup(type) {
+ this.set_type = type;
+ this.$refs.popups.handleOpen();
+ },
+ // 输入密码回调
+ handleConfirm(e) {
+ if (this.set_type == 1) this.password = e;
+ else this.repassword = e;
+ },
+
+ handleClear() {},
+ handleChange() {},
confirmSubmit: function() {
let that = this;
@@ -161,15 +162,19 @@
setPayPwd({
password: that.password,
repassword: that.repassword,
- sms_code: that.captcha
+ sms_code: that.captcha,
}).then(res => {
that.$util.Tips({
- title: '修改成功！',
- icon: 'success'
- })
- this.$nextTick((res=>{
- uni.navigateBack();
- }))
+ title: '修改成功！',
+ icon: 'success'
+ }, () => {
+ uni.navigateBack();
+ });
+ }).catch(err => {
+ that.$util.Tips({
+ title: err,
+ icon: 'none'
+ })
})
} else { // 登录密码
modifyPassword({
@@ -204,7 +209,7 @@
await registerVerify({
phone: that.userInfo.phone,
code: that.captcha,
- type: 'change_pwd',
+ type: this.type == 'payPwd' ? 'pay_pwd' : 'change_pwd',
captchaType: 'blockPuzzle',
captchaVerification: data.captchaVerification
}).then(res => {
diff --git a/pages/withdrawal/add.vue b/pages/withdrawal/add.vue
index 0be2902..e68b6ea 100644
--- a/pages/withdrawal/add.vue
+++ b/pages/withdrawal/add.vue
@@ -5,7 +5,7 @@
- {{bindForm.id?'修改银行卡绑定':'添加银行卡'}}
+ {{bindForm.id?'修改账户':'添加账户'}}
@@ -30,7 +30,10 @@
开户银行
- {{bindForm.bank?bindForm.bank:'请选择开户银行'}}
+
+
+ {{bindForm.bank?bindForm.bank:'请选择开户银行'}}
+
{{bindForm.bank?'更换':'选择'}}银行
@@ -41,7 +44,7 @@
持卡人
-
@@ -49,15 +52,15 @@
身份证
-
- 银行账户
+ 银行帐号
-
@@ -65,7 +68,7 @@
开户网点
-
@@ -100,6 +103,9 @@
+
+ 锁定规则为连续输入超过3次后或当日总次数超过10次后锁定。恢复规则分为12时后恢复和次日0时恢复。锁定期间建议不要重复提交绑定，否则锁定时间会相应延长。
+
@@ -107,8 +113,10 @@
开户银行
- {{bindForm.bank?bindForm.bank:'请选择开户银行'}}
-
+
+
+ {{bindForm.bank?bindForm.bank:'请选择开户银行'}}
+
{{bindForm.bank?'更换':'选择'}}银行
@@ -124,9 +132,9 @@
- 银行账户
+ 银行账号
-
@@ -139,6 +147,9 @@
+
+ 锁定规则为连续输入超过3次后或当日总次数超过10次后锁定。恢复规则分为12时后恢复和次日0时恢复。锁定期间建议不要重复提交绑定，否则锁定时间会相应延长。
+
@@ -154,8 +165,21 @@
@close="show = false">
-
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+ 确认
+
+
+
@@ -183,7 +207,8 @@
phone: '', //手机号
is_own: '', //转账类型(0个人，1对公)
temp: [],
- id: 0
+ id: 0,
+ icon: ''
},
mer_id: ''
}
@@ -196,15 +221,18 @@
}
if (opt.mer_id) {
this.mer_id = opt.mer_id;
- if (opt.hasOwnProperty('isOwn') && opt.isOwn === 0) {
+ if (opt.hasOwnProperty('isOwn') && (opt.isOwn === 0 || opt.isOwn == '0')) {
this.list = [{
name: '对公账户'
- }]
- } else if (opt.hasOwnProperty('isOwn') && opt.isOwn === 1) {
+ }];
+ this.bindForm.is_own = 1;
+ } else if (opt.hasOwnProperty('isOwn') && opt.isOwn == 1) {
this.list = [{
name: '法人账户'
- }]
+ }];
+ this.bindForm.is_own = 0;
} else {
+ this.bindForm.is_own = 0;
this.list = [{
name: '对公账户'
}, {
@@ -251,7 +279,7 @@
// 选择银行卡
handleSelectedBank(e) {
this.bindForm.bank = e.name;
- this.bankShow = false;
+ this.bindForm.icon = e.img;
},
// 获取银行卡
@@ -269,15 +297,15 @@
// 绑定账号
handleBind() {
if (!this.bindForm.name) return this.$util.Tips({
- title: this.bindForm.is_own === 0 ? '法人姓名不能为空！' : '账户名称不能为空！'
+ title: this.bindForm.is_own === 0 ? '请输入法人姓名！' : '请输入账户名称！'
});
if (!this.bindForm.bank) return this.$util.Tips({
title: '请选择开户银行！'
});
- if (!this.bindForm.bank) return this.$util.Tips({
- title: '请输入银行账户！'
+ if (!this.bindForm.bank_code) return this.$util.Tips({
+ title: this.bindForm.is_own === 0 ? '请输入银行帐号！' : '请输入银行账号！'
});
if (!this.bindForm.bank_branch) return this.$util.Tips({
@@ -305,11 +333,13 @@
this.$util.Tips({
title: '提交成功,请等待后台审核！'
}, () => {
- uni.navigateBack();
+ uni.redirectTo({
+ url: "/pages/withdrawal/progress?mer_id=" + this.mer_id
+ })
});
}).catch(err => {
this.$util.Tips({
- title: 'err'
+ title: err
});
})
},
@@ -415,12 +445,20 @@
}
.withdrawal-form-item-val {
- color: #666666;
+ display: flex;
+ align-items: center;
+ color: #333;
font-size: 30rpx;
+ image {
+ width: 40rpx;
+ height: 40rpx;
+ margin-right: 10rpx;
+ }
+
/deep/.uni-input-placeholder,
.placeholderClass {
- font-size: 28rpx;
+ font-size: 30rpx;
color: #999;
}
@@ -536,4 +574,54 @@
}
}
}
+
+ .actions {
+ padding-bottom: 30rpx;
+
+ .actions-btn {
+ width: 650rpx;
+ height: 88rpx;
+ line-height: 88rpx;
+ background: linear-gradient(359deg, #72BE53 0%, #46B03A 100%);
+ border-radius: 88rpx;
+ margin: 0 auto;
+ text-align: center;
+
+ text {
+ font-weight: 600;
+ font-size: 30rpx;
+ color: #FFFFFF;
+ }
+ }
+
+ .actions-wrap {
+ max-height: 50vh;
+ overflow: auto;
+ margin-bottom: 30rpx;
+
+ .actions-item {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ height: 104rpx;
+ border-bottom: 2rpx solid #eeefef;
+
+ image {
+ width: 40rpx;
+ height: 40rpx;
+ margin-right: 12rpx;
+ }
+
+ text {
+ font-size: 32rpx;
+ color: #333;
+ }
+ }
+
+ .textactive {
+ font-weight: 600;
+ color: #40AE36 !important;
+ }
+ }
+ }
\ No newline at end of file
diff --git a/pages/withdrawal/index.vue b/pages/withdrawal/index.vue
index e1cf79d..35a5d21 100644
--- a/pages/withdrawal/index.vue
+++ b/pages/withdrawal/index.vue
@@ -39,7 +39,7 @@
{{bankInfo.financial_account.id_card}}
- 银行账户
+ 银行账号
{{bankInfo.financial_account.bank_code}}
@@ -57,7 +57,7 @@
- 《企业授权法人提现书》
+ 《企业授权法人提现书》
查看审核进度
@@ -78,7 +78,7 @@
{{bankInfo.financial_account.name}}
- 银行账户
+ 银行账号
{{bankInfo.financial_account.bank_code}}
@@ -100,7 +100,6 @@
-
查看审核进度
@@ -112,8 +111,12 @@
提货付款订单在完成后次日18:00才可提现
-
+
+
+
+
@@ -180,9 +183,21 @@
},
methods: {
+ // 图片预览
+ handlePreview() {
+ let that = this;
+ if (this.bankInfo && this.bankInfo.financial_account.financial_img) {
+ uni.previewImage({
+ urls: that.bankInfo.financial_account.financial_img.split(','),
+ current: 0
+ })
+ }
+ },
+
+ // 添加账户
handleToAdd() {
let strUrl = "?mer_id=" + this.mer_id;
- if (this.bankInfo && this.bankInfo.is_own) strUrl += "&isOwn=" + this.bankInfo.is_own
+ if (this.bankInfo) strUrl += "&isOwn=" + this.bankInfo.is_own
uni.navigateTo({
url: "/pages/withdrawal/add" + strUrl
})
@@ -254,11 +269,10 @@
title: '请输入提现金额'
});
- if (!Number(this.payForm.extract_money) < 0) return this.$util.Tips({
+ if (Number(this.payForm.extract_money) < 0) return this.$util.Tips({
title: '请输入正确的提现金额'
});
-
// 是否输入密码
const result = await this.$util.checkPassword();
if (result.data.code == 101) { //未设置支付密码
@@ -460,7 +474,7 @@
.withdrawal-form-item-val {
font-size: 30rpx;
- color: #666666;
+ color: #333;
input {}
diff --git a/pages/withdrawal/progress.vue b/pages/withdrawal/progress.vue
index 5b7214d..fb73deb 100644
--- a/pages/withdrawal/progress.vue
+++ b/pages/withdrawal/progress.vue
@@ -21,8 +21,9 @@
+
-
+
@@ -32,8 +33,7 @@
-
+
申请已提交
{{item.create_time}}
@@ -162,8 +162,8 @@
align-items: center;
.dot {
- width: 4rpx;
- height: 4rpx;
+ width: 6rpx;
+ height: 6rpx;
border-radius: 50%;
background-color: #ccc;
margin-bottom: 4rpx;
@@ -184,6 +184,26 @@
margin-bottom: 0;
}
+ // #ifndef H5
+ .apply {
+ display: flex;
+ margin-bottom: 38rpx;
+ justify-content: space-between;
+ align-items: center;
+ }
+
+ // #endif
+
+ // #ifdef H5
+ .apply {
+ display: flex;
+ margin-bottom: 36rpx;
+ justify-content: space-between;
+ align-items: center;
+ }
+
+ // #endif
+
.shop-type-con-progress-right-name {
font-weight: 400;
font-size: 28rpx;