mkm
/
shop-applet
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修改

This commit is contained in:
DESKTOP-GMUNQ1B\k 2024-04-07 17:16:49 +08:00
parent 068b3a12df
commit 20834e3d99
7 changed files with 59 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/content-top/index.vue
View File

@ -73,7 +73,7 @@
.z-bootm-img2 { .z-bootm-img2 {
width: 38rpx; width: 38rpx;
height: 34rpx; height: 38rpx;
margin-top: -15rpx; margin-top: -15rpx;
margin-left: -15rpx; margin-left: -15rpx;
position: absolute; position: absolute;

25
pages/index/index.vue
View File

@ -78,26 +78,6 @@
</view> </view>
</view> </view>
<!-- <view class="content-tools" style="margin-top: 30rpx;"
v-if="$store.state.app.userInfo&&$store.state.app.userInfo.mer_info&&$store.state.app.userInfo.mer_info.type_code=='TypeSupplyChain'">
<view class="tools-one" style="margin-bottom: 20rpx;">
转账订单
<view class=""></view>
</view>
<view class="content-order">
<view class="" v-for="(item,i) in other_order" :key='i' @click="other_shopporder(item)">
<view class="content-order-two">
{{item.value}}
</view>
<view class="content-order-one">
{{item.name}}
</view>
</view>
<view class="" v-for="item in 3" :key="'empty'+item">
</view>
</view>
</view> -->
<view class="content-tools"> <view class="content-tools">
<view class="tools-one"> <view class="tools-one">
@ -2320,7 +2300,6 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
} }
} }
@ -2345,8 +2324,6 @@
margin-top: 61rpx; margin-top: 61rpx;
.content-middlea { .content-middlea {
// width: 161rpx;
// flex: 1;
width: 33.33%; width: 33.33%;
flex-shrink: 0; flex-shrink: 0;
text-align: center; text-align: center;
@ -2384,7 +2361,6 @@
.content-bottom { .content-bottom {
background-color: #ffffff; background-color: #ffffff;
border-radius: 32rpx 32rpx 0px 0px; border-radius: 32rpx 32rpx 0px 0px;
// margin-top: 41rpx;
padding-top: 46rpx; padding-top: 46rpx;
.content-order { .content-order {
@ -2392,7 +2368,6 @@
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
view { view {
width: 100rpx; width: 100rpx;

70
pages/withdrawal/add.vue
View File

@ -19,7 +19,7 @@
class="withdrawal-left-empty">{{bindForm.is_own === 0 ? '法人账户' : bindForm.is_own === 1 ? '对公账户':'请选择账户类型'}}</text> class="withdrawal-left-empty">{{bindForm.is_own === 0 ? '法人账户' : bindForm.is_own === 1 ? '对公账户':'请选择账户类型'}}</text>
</view> </view>
<view class="withdrawal-right" @click="show = true"> <view class="withdrawal-right" @click="handleShow">
<text class="withdrawal-right-add">{{bindForm.is_own === ''?'选择':'更换'}}账户</text> <text class="withdrawal-right-add">{{bindForm.is_own === ''?'选择':'更换'}}账户</text>
<u-icon name="arrow-right" size="14" color="#40AE36"></u-icon> <u-icon name="arrow-right" size="14" color="#40AE36"></u-icon>
</view> </view>
@ -30,15 +30,14 @@
<view class="withdrawal-form"> <view class="withdrawal-form">
<view class="withdrawal-form-item"> <view class="withdrawal-form-item">
<view class="withdrawal-form-item-label">开户银行</view> <view class="withdrawal-form-item-label">开户银行</view>
<view class="withdrawal-form-item-val"> <view class="withdrawal-form-item-val" @click="changeBank">
<image :src="bindForm.icon" v-if="bindForm.icon"></image> <image :src="bindForm.icon" v-if="bindForm.icon"></image>
<text> {{bindForm.bank?bindForm.bank:'请选择开户银行'}}</text> <text> {{bindForm.bank?bindForm.bank:'点击选择开户银行'}}</text>
</view> </view>
<!-- <view class="withdrawal-change" v-if="!bindForm.bank" >
<view class="withdrawal-change" @click="changeBank">
<text class="withdrawal-right-add">{{bindForm.bank?'更换':'选择'}}银行</text> <text class="withdrawal-right-add">{{bindForm.bank?'更换':'选择'}}银行</text>
<u-icon name="arrow-right" size="14" color="#40AE36"></u-icon> <u-icon name="arrow-right" size="14" color="#40AE36"></u-icon>
</view> </view> -->
</view> </view>
<view class="withdrawal-form-item"> <view class="withdrawal-form-item">
@ -60,7 +59,7 @@
<view class="withdrawal-form-item"> <view class="withdrawal-form-item">
<view class="withdrawal-form-item-label">银行帐号</view> <view class="withdrawal-form-item-label">银行帐号</view>
<view class="withdrawal-form-item-val"> <view class="withdrawal-form-item-val">
<input v-model="bindForm.bank_code" type="text" placeholder="请输入银行账号" <input v-model="bindForm.bank_code" type="number" placeholder="请输入银行账号"
placeholder-class="placeholderClass"> placeholder-class="placeholderClass">
</view> </view>
</view> </view>
@ -76,14 +75,14 @@
<view class="withdrawal-form-item"> <view class="withdrawal-form-item">
<view class="withdrawal-form-item-label">手机号码</view> <view class="withdrawal-form-item-label">手机号码</view>
<view class="withdrawal-form-item-val"> <view class="withdrawal-form-item-val">
<input v-model="bindForm.phone" type="text" placeholder="请输入手机号码" <input v-model="bindForm.phone" type="number" placeholder="请输入手机号码"
placeholder-class="placeholderClass"> placeholder-class="placeholderClass">
</view> </view>
</view> </view>
</view> </view>
<!-- 相关凭证 --> <!-- 相关凭证 -->
<!-- <view class="withdrawal-envidence"> <view class="withdrawal-envidence">
<view class="withdrawal-envidence"> <view class="withdrawal-envidence">
<text class="withdrawal-envidence-main">请上传相关凭证</text> <text class="withdrawal-envidence-main">请上传相关凭证</text>
<text class="withdrawal-envidence-sub">(图片格式支持JPG、PNG、JPEG)</text> <text class="withdrawal-envidence-sub">(图片格式支持JPG、PNG、JPEG)</text>
@ -102,8 +101,8 @@
<text>上传凭证</text> <text>上传凭证</text>
</view> </view>
</view> </view>
</view> --> </view>
<view style="color: #FE2121;font-size:24rpx;margin-top: 20rpx;"> <view style="color: #FE2121;font-size:24rpx;margin-top: 20rpx;line-height: 30rpx;">
锁定规则：错误输入超 3 次后锁定。<br> 锁定规则：错误输入超 3 次后锁定。<br>
恢复规则：12 时后或次日 0 时恢复。<br> 恢复规则：12 时后或次日 0 时恢复。<br>
温馨提示：锁定期间勿重复提交绑定，否则锁定时间延长。 温馨提示：锁定期间勿重复提交绑定，否则锁定时间延长。
@ -115,14 +114,14 @@
<view class="withdrawal-form"> <view class="withdrawal-form">
<view class="withdrawal-form-item"> <view class="withdrawal-form-item">
<view class="withdrawal-form-item-label">开户银行</view> <view class="withdrawal-form-item-label">开户银行</view>
<view class="withdrawal-form-item-val"> <view class="withdrawal-form-item-val" @click="changeBank">
<image :src="bindForm.icon" v-if="bindForm.icon"></image> <image :src="bindForm.icon" v-if="bindForm.icon"></image>
<text> {{bindForm.bank?bindForm.bank:'请选择开户银行'}}</text> <text> {{bindForm.bank?bindForm.bank:'点击选择开户银行'}}</text>
</view> </view>
<view class="withdrawal-change" @click="changeBank"> <!-- <view class="withdrawal-change" v-if="!bindForm.bank" >
<text class="withdrawal-right-add">{{bindForm.bank?'更换':'选择'}}银行</text> <text class="withdrawal-right-add">{{bindForm.bank?'更换':'选择'}}银行</text>
<u-icon name="arrow-right" size="14" color="#40AE36"></u-icon> <u-icon name="arrow-right" size="14" color="#40AE36"></u-icon>
</view> </view> -->
</view> </view>
<view class="withdrawal-form-item"> <view class="withdrawal-form-item">
@ -136,7 +135,7 @@
<view class="withdrawal-form-item"> <view class="withdrawal-form-item">
<view class="withdrawal-form-item-label">银行账号</view> <view class="withdrawal-form-item-label">银行账号</view>
<view class="withdrawal-form-item-val"> <view class="withdrawal-form-item-val">
<input v-model="bindForm.bank_code" type="text" placeholder="请输入银行账号" <input v-model="bindForm.bank_code" type="number" placeholder="请输入银行账号"
placeholder-class="placeholderClass"> placeholder-class="placeholderClass">
</view> </view>
</view> </view>
@ -149,7 +148,7 @@
</view> </view>
</view> </view>
</view> </view>
<view style="color: #FE2121;font-size:24rpx;margin-top: 20rpx;"> <view style="color: #FE2121;font-size:24rpx;margin-top: 20rpx;line-height: 30rpx;">
锁定规则：错误输入超 3 次后锁定。<br> 锁定规则：错误输入超 3 次后锁定。<br>
恢复规则：12 时后或次日 0 时恢复。<br> 恢复规则：12 时后或次日 0 时恢复。<br>
温馨提示：锁定期间勿重复提交绑定，否则锁定时间延长。 温馨提示：锁定期间勿重复提交绑定，否则锁定时间延长。
@ -166,7 +165,7 @@
<!-- 提现账户 --> <!-- 提现账户 -->
<u-action-sheet title="请选择提现账户" :actions="list" :show="show" round="15" @select="handleSelected" <u-action-sheet title="请选择提现账户" :actions="list" :show="show" round="15" @select="handleSelected"
@close="show = false"></u-action-sheet> @close="show = false" :safeAreaInsetBottom='true'></u-action-sheet>
<!-- 银行 --> <!-- 银行 -->
<u-action-sheet title="请选择银行" :show="bankShow" round="15" @close="bankShow = false"> <u-action-sheet title="请选择银行" :show="bankShow" round="15" @close="bankShow = false">
@ -241,7 +240,7 @@
//获取法人真实姓名 //获取法人真实姓名
this.bindForm.name = JSON.parse(this.$Cache.get("USER_INFO")).mer_info.real_name; this.bindForm.name = JSON.parse(this.$Cache.get("USER_INFO")).mer_info.real_name;
} else { } else {
this.bindForm.is_own = 0; this.bindForm.is_own = 1;
//获取法人真实姓名 //获取法人真实姓名
this.bindForm.name = JSON.parse(this.$Cache.get("USER_INFO")).mer_info.real_name; this.bindForm.name = JSON.parse(this.$Cache.get("USER_INFO")).mer_info.real_name;
this.list = [{ this.list = [{
@ -254,6 +253,7 @@
//如果绑定银行卡用户为个体户 则不能添加对公账户,只能添加法人账户 is_company =0 个体户 //如果绑定银行卡用户为个体户 则不能添加对公账户,只能添加法人账户 is_company =0 个体户
const isCompany = JSON.parse(this.$Cache.get("USER_INFO")).mer_info.is_company; const isCompany = JSON.parse(this.$Cache.get("USER_INFO")).mer_info.is_company;
if (isCompany != 1) { if (isCompany != 1) {
this.bindForm.is_own = 0;
this.list = [{ this.list = [{
name: '法人账户' name: '法人账户'
}]; }];
@ -269,9 +269,9 @@
Object.assign(this.bindForm, res.data.financial_account); Object.assign(this.bindForm, res.data.financial_account);
this.bindForm.id = res.data.id; this.bindForm.id = res.data.id;
this.mer_id = this.bindForm.mer_id; this.mer_id = this.bindForm.mer_id;
// if (this.bindForm.is_own === 0 && this.bindForm.financial_img) { if (this.bindForm.is_own === 0 && this.bindForm.financial_img) {
// this.$set(this.bindForm, 'temp', this.bindForm.financial_img.split(",")); this.$set(this.bindForm, 'temp', this.bindForm.financial_img.split(","));
// } }
} }
}) })
}, },
@ -279,6 +279,8 @@
// 账户类型 // 账户类型
handleSelected(e) { handleSelected(e) {
this.show = false; this.show = false;
this.bindForm.bank = '';
this.bindForm.icon = '';
if (e.name == '法人账户') { if (e.name == '法人账户') {
this.bindForm.is_own = 0; this.bindForm.is_own = 0;
this.bindForm.name = JSON.parse(this.$Cache.get("USER_INFO")).mer_info.real_name; this.bindForm.name = JSON.parse(this.$Cache.get("USER_INFO")).mer_info.real_name;
@ -302,6 +304,10 @@
this.bindForm.temp.splice(index, 1); this.bindForm.temp.splice(index, 1);
}, },
handleShow() {
this.show = true;
},
// 选择银行卡 // 选择银行卡
handleSelectedBank(e) { handleSelectedBank(e) {
this.bindForm.bank = e.name; this.bindForm.bank = e.name;
@ -340,10 +346,10 @@
// 法人账号验证 // 法人账号验证
if (this.bindForm.is_own === 0) { if (this.bindForm.is_own === 0) {
// if (!this.bindForm.temp.length > 0) return this.$util.Tips({ if (!this.bindForm.temp.length > 0) return this.$util.Tips({
// title: '请上传凭证！' title: '请上传凭证！'
// }); });
// this.bindForm.financial_img = this.bindForm.temp.join(","); this.bindForm.financial_img = this.bindForm.temp.join(",");
if (!uni.$u.test.idCard(this.bindForm.id_card)) return this.$util.Tips({ if (!uni.$u.test.idCard(this.bindForm.id_card)) return this.$util.Tips({
title: '请输入正确的身份证号！' title: '请输入正确的身份证号！'
@ -364,9 +370,10 @@
}) })
}); });
}).catch(err => { }).catch(err => {
this.$util.Tips({ uni.showToast({
title: err title: err,
}); duration: 3000
})
}) })
}, },
@ -490,6 +497,11 @@
input { input {
font-size: 30rpx; font-size: 30rpx;
width: 460rpx;
}
text {
color: #40AE36;
} }
} }

28
pages/withdrawal/index.vue
View File

@ -9,6 +9,7 @@
<text></text> <text></text>
</view> </view>
</view> </view>
<view class="withdrawal-con"> <view class="withdrawal-con">
<view class="withdrawal"> <view class="withdrawal">
<view class="withdrawal-left"> <view class="withdrawal-left">
@ -60,8 +61,8 @@
<!-- 协议 --> <!-- 协议 -->
<view class="withdrawal-pro"> <view class="withdrawal-pro">
<!-- <text class="withdrawal-pro-txt" @click="handlePreview">《企业授权法人提现书》</text> --> <text class="withdrawal-pro-progress" @click="viewProgress">账户开通审核进度</text>
<text class="withdrawal-pro-progress" @click="viewProgress">查看审核进度</text> <text class="withdrawal-pro-txt" @click="handlePreview">《企业授权法人提现书》</text>
</view> </view>
<!-- 提示 --> <!-- 提示 -->
@ -122,9 +123,8 @@
</view> </view>
<!-- 提现btn --> <!-- 提现btn -->
<view class="withdrawal-btn tapActive" @click="handleSubmit" v-if="bankList.length != 0"> <view class="withdrawal-btn tapActive" @click="handleSubmit" v-if="bankList.length !=0">
<view class="withdrawal-btn-wrap"> <view class="withdrawal-btn-wrap">
<!-- <text v-if="bankList.length == 0">点击查看审核进度</text> -->
<text>点击提现</text> <text>点击提现</text>
</view> </view>
</view> </view>
@ -190,6 +190,8 @@
this.getBankInfo(); this.getBankInfo();
// 用户信息 // 用户信息
this.userInfo = JSON.parse(this.$Cache.get("USER_INFO")); this.userInfo = JSON.parse(this.$Cache.get("USER_INFO"));
console.log(this.userInfo.mer_info.is_company)
}, },
methods: { methods: {
@ -201,15 +203,15 @@
}, },
// 图片预览 // 图片预览
// handlePreview() { handlePreview() {
// let that = this; let that = this;
// if (this.bankInfo && this.bankInfo.financial_account.financial_img) { if (this.bankInfo && this.bankInfo.financial_account.financial_img) {
// uni.previewImage({ uni.previewImage({
// urls: that.bankInfo.financial_account.financial_img.split(','), urls: that.bankInfo.financial_account.financial_img.split(','),
// current: 0 current: 0
// }) })
// } }
// }, },
// 添加账户 // 添加账户
handleToAdd() { handleToAdd() {

4
pages/withdrawal/progress.vue
View File

@ -17,7 +17,7 @@
<view class="shop-type-con-progress-card"> <view class="shop-type-con-progress-card">
<view class="shop-type-con-progress-left"> <view class="shop-type-con-progress-left">
<view class="shop-type-con-progress-left-item"> <view class="shop-type-con-progress-left-item">
<u-icon name="checkmark-circle-fill" size="20" color="#40AE36"></u-icon> <u-icon name="checkmark-circle-fill" size="18" color="#40AE36"></u-icon>
</view> </view>
<view class="dot"></view> <view class="dot"></view>
<view class="dot"></view> <view class="dot"></view>
@ -29,7 +29,7 @@
<view class="shop-type-con-progress-left-item"> <view class="shop-type-con-progress-left-item">
<u-icon name="checkmark-circle-fill" size="18" color="#999" v-if="item.is_check == 0" /> <u-icon name="checkmark-circle-fill" size="18" color="#999" v-if="item.is_check == 0" />
<u-icon name="checkmark-circle-fill" size="18" color="#40AE36" v-if="item.is_check == 1" /> <u-icon name="checkmark-circle-fill" size="18" color="#40AE36" v-if="item.is_check == 1" />
<u-icon name="close-circle-fill" size="20" color="#F55726" v-if="item.is_check == 2" /> <u-icon name="close-circle-fill" size="18" color="#F55726" v-if="item.is_check == 2" />
</view> </view>
</view> </view>
<view class="shop-type-con-progress-right"> <view class="shop-type-con-progress-right">

BIN
static/images/fb2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
static/images/fb21.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB