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

2

Browse Source
This commit is contained in:
SK-20231103YIXF\Administrator 2024-04-08 16:42:44 +08:00
parent 20834e3d99
commit 7ce2829aa5
5 changed files with 595 additions and 512 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

241
pages/activeCode/subsidy.vue
View File

@ -7,7 +7,8 @@
<view class="c-head"> <view class="c-head">
<view :class="type==2?'left':'right'" @click="changeType(2)">增收销售补贴</view> <view :class="type==2?'left':'right'" @click="changeType(2)">增收销售补贴</view>
<!-- <view :class="type==1?'left':'right'" @click="changeType(1)">春耕采购补贴</view> --> <!-- <view :class="type==1?'left':'right'" @click="changeType(1)">春耕采购补贴</view> -->
<view v-if="mer_info.type_code=='PersonalStore'" :class="type==1?'left':'right'" @click="changeType(1)">春耕采购补贴</view> <view v-if="mer_info.type_code=='PersonalStore'" :class="type==1?'left':'right'"
@click="changeType(1)">春耕采购补贴</view>
<view v-else></view> <view v-else></view>
</view> </view>
<view class="c-body-title"> <view class="c-body-title">
@ -27,7 +28,7 @@
<image @click="back" class="bg_back" <image @click="back" class="bg_back"
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/back.png"></image> src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/back.png"></image>
<view class="bg_title">补贴进度</view> <view class="bg_title">补贴进度</view>
<view class="body" > <view class="body">
<view class="b-card" v-if="type==1"> <view class="b-card" v-if="type==1">
<view class="b-top"> <view class="b-top">
<view>春耕采购金额{{info.spring_subsidy}}元</view> <view>春耕采购金额{{info.spring_subsidy}}元</view>
@ -36,7 +37,9 @@
<view class="b-bottom"> <view class="b-bottom">
<view class="pro"> <view class="pro">
<view class="loss" :style="{left: `-${100-info.spring_subsidy_rate}%`}"> <view class="loss" :style="{left: `-${100-info.spring_subsidy_rate}%`}">
<image class="image" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/f805f20240229155704834.webp"></image> <image class="image"
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/f805f20240229155704834.webp">
</image>
<view class="text">{{info.spring_subsidy_rate}}%</view> <view class="text">{{info.spring_subsidy_rate}}%</view>
</view> </view>
@ -53,7 +56,9 @@
<view class="b-bottom"> <view class="b-bottom">
<view class="pro"> <view class="pro">
<view class="loss" :style="{left: `-${100-info.sale_finish_rate}%`}"> <view class="loss" :style="{left: `-${100-info.sale_finish_rate}%`}">
<image class="image" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/f805f20240229155704834.webp"></image> <image class="image"
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/f805f20240229155704834.webp">
</image>
<view class="text">{{info.sale_finish_rate}}%</view> <view class="text">{{info.sale_finish_rate}}%</view>
</view> </view>
</view> </view>
@ -69,7 +74,9 @@
<view class="b-bottom"> <view class="b-bottom">
<view class="pro"> <view class="pro">
<view class="loss" :style="{left: `-${100-info.purchase_finish_rate}%`}"> <view class="loss" :style="{left: `-${100-info.purchase_finish_rate}%`}">
<image class="image" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/f805f20240229155704834.webp"></image> <image class="image"
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/f805f20240229155704834.webp">
</image>
<view class="text">{{info.purchase_finish_rate}}%</view> <view class="text">{{info.purchase_finish_rate}}%</view>
</view> </view>
@ -87,7 +94,9 @@
<view class="b-bottom"> <view class="b-bottom">
<view class="pro"> <view class="pro">
<view class="loss" :style="{left: `-${100-info.official_purchase_finish_rate}%`}"> <view class="loss" :style="{left: `-${100-info.official_purchase_finish_rate}%`}">
<image class="image" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/f805f20240229155704834.webp"></image> <image class="image"
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/f805f20240229155704834.webp">
</image>
<view class="text">{{info.official_purchase_finish_rate}}%</view> <view class="text">{{info.official_purchase_finish_rate}}%</view>
</view> </view>
@ -104,7 +113,9 @@
<view class="b-bottom"> <view class="b-bottom">
<view class="pro"> <view class="pro">
<view class="loss" :style="{left: `-${100-info.purchase_finish_rate}%`}"> <view class="loss" :style="{left: `-${100-info.purchase_finish_rate}%`}">
<image class="image" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/f805f20240229155704834.webp"></image> <image class="image"
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/f805f20240229155704834.webp">
</image>
<view class="text">{{info.purchase_finish_rate}}%</view> <view class="text">{{info.purchase_finish_rate}}%</view>
</view> </view>
@ -115,7 +126,11 @@
</view> </view>
</block> </block>
<view class="b-tips" v-if="type==1"> <view class="b-tips" v-if="type==1">
*春耕采购余额使用完，采购金额和销售金额达到后才可获取补贴 *春耕采购余额使用完，采购金额和销售金额达到后才可获取补贴。<br>
*当进度完成时将在每月月底进行统计审核，审核完成后经本人确认，一个季度内到账。
</view>
<view class="b-tips" v-if="type==2">
*当进度完成时将在每月月底进行统计审核，审核完成后经本人确认，一个季度内到账。
</view> </view>
<view class="b-list"> <view class="b-list">
<view class="list-head"></view> <view class="list-head"></view>
@ -127,7 +142,8 @@
<view>状态</view> <view>状态</view>
</view> </view>
<view class="list-b-text" v-for="(item,index) in list" :key="index"> <view class="list-b-text" v-for="(item,index) in list" :key="index">
<view class="item1">￥{{ cPrice2(item.extra.official_purchase_target, item.extra.purchase_target) }}</view> <view class="item1">
￥{{ cPrice2(item.extra.official_purchase_target, item.extra.purchase_target) }}</view>
<view class="item2">￥{{ item.extra.sale_target }}</view> <view class="item2">￥{{ item.extra.sale_target }}</view>
<view class="item3"> <view class="item3">
<text v-if="item.id==0">￥{{cPrice(item.coupon_price)}}</text> <text v-if="item.id==0">￥{{cPrice(item.coupon_price)}}</text>
@ -135,7 +151,8 @@
</view> </view>
<view class="item4" @click="showPopup(item.send_status, item.id)"> <view class="item4" @click="showPopup(item.send_status, item.id)">
<!-- send_status 发放状态：-1未激活，0待审核，1待领取，2已完成 --> <!-- send_status 发放状态：-1未激活，0待审核，1待领取，2已完成 -->
<text v-if="item.send_status==2||item.send_status==1" style="color: #FF5E0C;">{{item.send_status_cn}}</text> <text v-if="item.send_status==2||item.send_status==1"
style="color: #FF5E0C;">{{item.send_status_cn}}</text>
<text v-else>{{item.send_status_cn}}</text> <text v-else>{{item.send_status_cn}}</text>
</view> </view>
</view> </view>
@ -147,11 +164,15 @@
<uni-popup type="center" ref="pupRef"> <uni-popup type="center" ref="pupRef">
<view style="width: 630rpx;height: 500rpx;position: relative;"> <view style="width: 630rpx;height: 500rpx;position: relative;">
<view style="position: absolute;top: 0;right: 10rpx;" @click="closePopup"> <view style="position: absolute;top: 0;right: 10rpx;" @click="closePopup">
<image style="width: 50rpx;height: 50rpx;" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/c8b19202403201714381681.webp"></image> <image style="width: 50rpx;height: 50rpx;"
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/c8b19202403201714381681.webp"></image>
</view> </view>
<view style="width: 630rpx;position: absolute;top: 70rpx;right: 0;" :class="[send_status_cn>0?'h430':'h310']"> <view style="width: 630rpx;position: absolute;top: 70rpx;right: 0;"
<image style="width: 100%;" :class="[send_status_cn>0?'h430':'h310']" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/23ad8202403201716417527.webp"></image> :class="[send_status_cn>0?'h430':'h310']">
<view style="position: absolute;top: 0;left: 0;width: 100%;height: 100%;padding: 30rpx;display: flex;flex-direction: column;justify-content: center;"> <image style="width: 100%;" :class="[send_status_cn>0?'h430':'h310']"
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/23ad8202403201716417527.webp"></image>
<view
style="position: absolute;top: 0;left: 0;width: 100%;height: 100%;padding: 30rpx;display: flex;flex-direction: column;justify-content: center;">
<view style="padding-bottom: 50rpx;font-size: 32rpx;color: #2E2E2E;"> <view style="padding-bottom: 50rpx;font-size: 32rpx;color: #2E2E2E;">
<text v-if="send_status_cn==-1">补贴未激活</text> <text v-if="send_status_cn==-1">补贴未激活</text>
<text v-else-if="send_status_cn==0">补贴审核中</text> <text v-else-if="send_status_cn==0">补贴审核中</text>
@ -166,15 +187,24 @@
电话：13627640188 电话：13627640188
</text> </text>
</view> </view>
<view v-if="send_status_cn==10" style="background-color: #fff;border-radius: 20rpx;padding: 20rpx;"> <view v-if="send_status_cn==10"
<textarea v-model="reason" placeholder="请填写错误内容" style="height: 100rpx;"/> style="background-color: #fff;border-radius: 20rpx;padding: 20rpx;">
<textarea v-model="reason" placeholder="请填写错误内容" style="height: 100rpx;" />
</view> </view>
<view v-if="send_status_cn==1" style="display: flex;justify-content: center;margin-top: 30rpx;color: #F98144;"> <view v-if="send_status_cn==1"
<view @click="reAudit" style="padding: 9rpx 50rpx 12rpx 50rpx;border-radius: 40rpx;border: 4rpx solid #F98144;margin-right: 100rpx;">错误</view> style="display: flex;justify-content: center;margin-top: 30rpx;color: #F98144;">
<view @click="couponReceive" style="padding: 9rpx 50rpx 12rpx 50rpx;border-radius: 40rpx;border: 4rpx solid #F98144;color: #FFF;background-color: #F98144;">正确</view> <view @click="reAudit"
style="padding: 9rpx 50rpx 12rpx 50rpx;border-radius: 40rpx;border: 4rpx solid #F98144;margin-right: 100rpx;">
错误</view>
<view @click="couponReceive"
style="padding: 9rpx 50rpx 12rpx 50rpx;border-radius: 40rpx;border: 4rpx solid #F98144;color: #FFF;background-color: #F98144;">
正确</view>
</view> </view>
<view v-else-if="send_status_cn==10" style="display: flex;justify-content: center;margin-top: 30rpx;color: #F98144;"> <view v-else-if="send_status_cn==10"
<view @click="couponRefuse" style="padding: 9rpx 50rpx 12rpx 50rpx;border-radius: 40rpx;border: 4rpx solid #F98144;color: #FFF;background-color: #F98144;">提交</view> style="display: flex;justify-content: center;margin-top: 30rpx;color: #F98144;">
<view @click="couponRefuse"
style="padding: 9rpx 50rpx 12rpx 50rpx;border-radius: 40rpx;border: 4rpx solid #F98144;color: #FFF;background-color: #F98144;">
提交</view>
</view> </view>
</view> </view>
</view> </view>
@ -186,8 +216,15 @@
</template> </template>
<script> <script>
import { getSubsidy, getSubsidyRecord, couponReceive, couponRefuse } from "@/api/admin.js" import {
import { Toast } from "../../libs/uniApi"; getSubsidy,
getSubsidyRecord,
couponReceive,
couponRefuse
} from "@/api/admin.js"
import {
Toast
} from "../../libs/uniApi";
export default { export default {
data() { data() {
return { return {
@ -198,19 +235,19 @@
send_status_cn: '1', send_status_cn: '1',
send_id: 0, send_id: 0,
reason: '', reason: '',
where:{ where: {
page: 1, page: 1,
limit: 20, limit: 20,
type: 2 type: 2
}, },
mer_info:{ mer_info: {
type_code: '' type_code: ''
} }
} }
}, },
onLoad() { onLoad() {
let user = this.$store.state.app.userInfo; let user = this.$store.state.app.userInfo;
if(typeof user == 'string') user = JSON.parse(user); if (typeof user == 'string') user = JSON.parse(user);
this.mer_info.type_code = user.mer_info.type_code; this.mer_info.type_code = user.mer_info.type_code;
this.mer_id = user.service.mer_id; this.mer_id = user.service.mer_id;
this.getSubsidy(); this.getSubsidy();
@ -221,82 +258,83 @@
}, },
onShow() {}, onShow() {},
methods: { methods: {
showPopup(type, send_id){ showPopup(type, send_id) {
this.send_status_cn = type; this.send_status_cn = type;
this.send_id = send_id; this.send_id = send_id;
if(type==2) Toast('已经领取过啦'); if (type == 2) Toast('已经领取过啦');
else this.$refs.pupRef.open(); else this.$refs.pupRef.open();
}, },
closePopup(){ closePopup() {
this.$refs.pupRef.close(); this.$refs.pupRef.close();
}, },
back() { back() {
uni.navigateBack(); uni.navigateBack();
}, },
changeType(type){ changeType(type) {
this.type = type; this.type = type;
this.where.type = type; this.where.type = type;
this.getSubsidy(); this.getSubsidy();
this.getSubsidyRecord(); this.getSubsidyRecord();
}, },
getSubsidy(){ getSubsidy() {
if(!this.mer_id) return ; if (!this.mer_id) return;
getSubsidy(this.mer_id, { getSubsidy(this.mer_id, {
type: this.type type: this.type
}).then(res=>{ }).then(res => {
this.info = res.data; this.info = res.data;
}) })
}, },
couponReceive(){ couponReceive() {
this.closePopup(); this.closePopup();
couponReceive({ couponReceive({
mer_id: this.mer_id, mer_id: this.mer_id,
id: this.send_id, id: this.send_id,
}).then(res=>{ }).then(res => {
this.$nextTick(()=>{ this.$nextTick(() => {
Toast('领取成功') Toast('领取成功')
}) })
}).catch(err=>{ }).catch(err => {
this.$nextTick(()=>{ this.$nextTick(() => {
Toast(err) Toast(err)
}) })
}) })
}, },
reAudit(){ reAudit() {
this.send_status_cn = 10; this.send_status_cn = 10;
}, },
couponRefuse(){ couponRefuse() {
if(this.reason=='') return Toast('错误内容不能为空'); if (this.reason == '') return Toast('错误内容不能为空');
this.closePopup(); this.closePopup();
couponRefuse({ couponRefuse({
mer_id: this.mer_id, mer_id: this.mer_id,
id: this.send_id, id: this.send_id,
reason: this.reason reason: this.reason
}).then(res=>{ }).then(res => {
this.$nextTick(()=>{ this.$nextTick(() => {
Toast('提交成功') Toast('提交成功')
}) })
}).catch(err=>{ }).catch(err => {
this.$nextTick(()=>{ this.$nextTick(() => {
Toast(err) Toast(err)
}) })
}) })
}, },
getSubsidyRecord(){ getSubsidyRecord() {
getSubsidyRecord(this.mer_id, this.where).then(res=>{ getSubsidyRecord(this.mer_id, this.where).then(res => {
this.list = res.data.record; this.list = res.data.record;
}) })
}, },
cPrice(n){ //计算未激活的补贴达成了多少 cPrice(n) { //计算未激活的补贴达成了多少
let t = Number(this.info.official_purchase_finish_rate) + Number(this.info.purchase_finish_rate) + Number(this.info.sale_finish_rate); let t = Number(this.info.official_purchase_finish_rate) + Number(this.info.purchase_finish_rate) + Number(
t/=3*100; this.info.sale_finish_rate);
t==0?t=1:null; t /= 3 * 100;
return (+n*t).toFixed(2); t == 0 ? t = 1 : null;
return (+n * t).toFixed(2);
}, },
cPrice2(a,b){ cPrice2(a, b) {
a = Number(a); a = Number(a);
b = Number(b); b = Number(b);
return (a+b).toFixed(2) return (a + b).toFixed(2)
} }
}, },
onPullDownRefresh() { onPullDownRefresh() {
@ -306,9 +344,10 @@
</script> </script>
<style lang="scss"> <style lang="scss">
page{ page {
background-color: #fff; background-color: #fff;
} }
.page { .page {
position: relative; position: relative;
font-size: 28rpx; font-size: 28rpx;
@ -321,7 +360,8 @@
left: 0; left: 0;
width: 750rpx; width: 750rpx;
height: 530rpx; height: 530rpx;
.card{
.card {
position: absolute; position: absolute;
transition: 300ms; transition: 300ms;
bottom: 30rpx; bottom: 30rpx;
@ -333,48 +373,57 @@
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
padding-bottom: 40rpx; padding-bottom: 40rpx;
.c-head{
.c-head {
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
height: 90rpx; height: 90rpx;
overflow: hidden; overflow: hidden;
margin-top: 20rpx; margin-top: 20rpx;
view{
view {
flex: 1; flex: 1;
text-align: center; text-align: center;
} }
.left{
.left {
font-size: 32rpx; font-size: 32rpx;
color: #DF4104; color: #DF4104;
line-height: 80rpx; line-height: 80rpx;
} }
.right{
.right {
color: #7A7A7A; color: #7A7A7A;
line-height: 100rpx; line-height: 100rpx;
} }
} }
.c-body-title{
.c-body-title {
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
color: #2E2E2E; color: #2E2E2E;
height: 70rpx; height: 70rpx;
align-items: center; align-items: center;
} }
.c-body-text{
.c-body-text {
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
color: #7A7A7A; color: #7A7A7A;
height: 70rpx; height: 70rpx;
align-items: center; align-items: center;
.price{
.price {
color: #F13B3B; color: #F13B3B;
} }
} }
} }
.card2{
.card2 {
background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e5b2e202402291538018132.webp'); background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e5b2e202402291538018132.webp');
} }
.bottom{
.bottom {
position: absolute; position: absolute;
left: 0; left: 0;
bottom: -1px; bottom: -1px;
@ -403,40 +452,46 @@
transform: translate(-50%); transform: translate(-50%);
} }
.body{ .body {
padding: 530rpx 30rpx 30rpx 30rpx; padding: 530rpx 30rpx 30rpx 30rpx;
.b-card{
.b-card {
padding-bottom: 30rpx; padding-bottom: 30rpx;
.b-top{
.b-top {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
font-size: 26rpx; font-size: 26rpx;
} }
.b-bottom{
.b-bottom {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
height: 80rpx; height: 80rpx;
.pro{ .pro {
width: 570rpx; width: 570rpx;
height: 28rpx; height: 28rpx;
border-radius: 28rpx; border-radius: 28rpx;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
background-color: #ffdfce; background-color: #ffdfce;
.loss{
.loss {
width: 570rpx; width: 570rpx;
height: 28rpx; height: 28rpx;
position: absolute; position: absolute;
top: 0; top: 0;
left: -100%; left: -100%;
} }
.image{
.image {
width: 570rpx; width: 570rpx;
height: 28rpx; height: 28rpx;
} }
.text{
.text {
position: absolute; position: absolute;
right: 0; right: 0;
top: 0; top: 0;
@ -451,61 +506,73 @@
} }
} }
} }
.b-tips{
.b-tips {
color: #7A7A7A; color: #7A7A7A;
font-size: 24rpx; font-size: 24rpx;
margin-bottom: 30rpx; margin-bottom: 30rpx;
} }
.b-list{
.list-head{ .b-list {
.list-head {
width: 690rpx; width: 690rpx;
height: 45rpx; height: 45rpx;
background: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/7bc46202402291702073308.webp'); background: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/7bc46202402291702073308.webp');
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
} }
.list-body{
.list-b-title{ .list-body {
.list-b-title {
padding: 20rpx 0; padding: 20rpx 0;
display: flex; display: flex;
view{
view {
flex: 1; flex: 1;
text-align: center; text-align: center;
flex-shrink: 0; flex-shrink: 0;
} }
} }
.list-b-text{
.list-b-text {
background-color: #F9F9F9; background-color: #F9F9F9;
border-radius: 12rpx; border-radius: 12rpx;
padding: 20rpx 0; padding: 20rpx 0;
margin-bottom: 20rpx; margin-bottom: 20rpx;
display: flex; display: flex;
font-size: 24rpx; font-size: 24rpx;
view{
view {
flex: 1; flex: 1;
text-align: center; text-align: center;
flex-shrink: 0; flex-shrink: 0;
} }
.item1{
.item1 {
color: #F13B3B; color: #F13B3B;
} }
.item2{
.item2 {
color: #20A162; color: #20A162;
} }
.item3{
.item3 {
color: #FF8056; color: #FF8056;
} }
.item4{
.item4 {
color: #2E2E2E; color: #2E2E2E;
} }
} }
} }
} }
} }
.h430{
.h430 {
height: 430rpx; height: 430rpx;
} }
.h310{
.h310 {
height: 310rpx; height: 310rpx;
} }
</style> </style>

3
pages/product/addGood/addGood.vue
View File

@ -651,6 +651,9 @@
let userInfo = this.$store.state.app.userInfo; let userInfo = this.$store.state.app.userInfo;
if (typeof userInfo == 'string') userInfo = JSON.parse(userInfo); if (typeof userInfo == 'string') userInfo = JSON.parse(userInfo);
let showFlag = ''; let showFlag = '';
console.log(postData);
postData.attrValue.forEach(t => { postData.attrValue.forEach(t => {
if (userInfo.mer_info.wholesale && (!t.wholesale_price || +t.wholesale_price <= 0)) { if (userInfo.mer_info.wholesale && (!t.wholesale_price || +t.wholesale_price <= 0)) {
showFlag = '批发价不能小于0' showFlag = '批发价不能小于0'

5
pages/product/components/selectForm.vue
View File

@ -104,10 +104,9 @@
form: { form: {
handler(val) { handler(val) {
this.formData = val; this.formData = val;
// 需求方要求为空 直接输入 不需要默认值 // 需求方要求为空 直接输入 不需要默认值
this.formData.price = ''; if (!this.formData.price || this.formData.price == '0.00') this.formData.price = '';
this.formData.stock = ''; if (!this.formData.stock) this.formData.stock = '';
}, },
deep: true deep: true
} }

30
pages/withdrawal/add.vue
View File

@ -82,7 +82,7 @@
</view> </view>
<!-- 相关凭证 --> <!-- 相关凭证 -->
<view class="withdrawal-envidence"> <view class="withdrawal-envidence" v-if="isCompany == 1">
<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>
@ -164,8 +164,19 @@
</view> </view>
<!-- 提现账户 --> <!-- 提现账户 -->
<u-action-sheet title="请选择提现账户" :actions="list" :show="show" round="15" @select="handleSelected" <u-action-sheet title="请选择提现账户" :show="show" round="15" @close="show = false">
@close="show = false" :safeAreaInsetBottom='true'></u-action-sheet> <view class="actions" style="padding-bottom: 0;">
<view class="actions-wrap">
<block v-for="(item ,indx) in list" :key="indx">
<view class="actions-item" @click="handleSelected(item)">
<text :class="{'textactive':bindForm.bank == item.name}">{{item.name}}</text>
</view>
</block>
</view>
</view>
<!-- 底部安全范围 -->
<u-safe-bottom></u-safe-bottom>
</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">
@ -214,7 +225,8 @@
id: 0, id: 0,
icon: '' icon: ''
}, },
mer_id: '' mer_id: '',
isCompany: ''
} }
}, },
@ -230,7 +242,7 @@
name: '对公账户' name: '对公账户'
}]; }];
this.bindForm.is_own = 1; this.bindForm.is_own = 1;
//获取法人真实姓名 //获取公司名称
this.bindForm.name = JSON.parse(this.$Cache.get("USER_INFO")).mer_info.company_name; this.bindForm.name = JSON.parse(this.$Cache.get("USER_INFO")).mer_info.company_name;
} else if (opt.hasOwnProperty('isOwn') && opt.isOwn == 1) { } else if (opt.hasOwnProperty('isOwn') && opt.isOwn == 1) {
this.list = [{ this.list = [{
@ -241,8 +253,8 @@
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 = 1; 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.company_name;
this.list = [{ this.list = [{
name: '对公账户' name: '对公账户'
}, { }, {
@ -252,6 +264,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;
this.isCompany = isCompany;
if (isCompany != 1) { if (isCompany != 1) {
this.bindForm.is_own = 0; this.bindForm.is_own = 0;
this.list = [{ this.list = [{
@ -372,7 +385,8 @@
}).catch(err => { }).catch(err => {
uni.showToast({ uni.showToast({
title: err, title: err,
duration: 3000 duration: 3000,
icon: "none"
}) })
}) })
}, },

2
pages/withdrawal/index.vue
View File

@ -104,7 +104,7 @@
<!-- 协议 --> <!-- 协议 -->
<view class="withdrawal-pro"> <view class="withdrawal-pro">
<text class="withdrawal-pro-progress" @click="viewProgress">查看审核进度</text> <text class="withdrawal-pro-progress" @click="viewProgress">账户开通审核进度</text>
</view> </view>
<!-- 提示 --> <!-- 提示 -->