This commit is contained in:
weipengfei 2023-12-28 18:59:31 +08:00
parent 96891aa235
commit bb58661166
5 changed files with 147 additions and 46 deletions

View File

@ -313,3 +313,8 @@ export function merchant(data) {
export function marginlist(data) { export function marginlist(data) {
return request.get(`user/margin/list`,data); return request.get(`user/margin/list`,data);
} }
//获取押金扣除列表
export function autoMarginlist(id, data) {
return request.get(`admin/${id}/auto_margin`,data);
}

View File

@ -69,8 +69,8 @@
</view> </view>
</view> </view>
<view class="content-tools" style="margin-top: 10rpx;" v-if="$store.state.app.userInfo&&$store.state.app.userInfo.mer_info&&$store.state.app.userInfo.mer_info.type_code=='TypeSupplyChain'"> <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"> <view class="tools-one" style="margin-bottom: 20rpx;">
赊账订单 赊账订单
<view class=""></view> <view class=""></view>
</view> </view>
@ -1948,7 +1948,7 @@ import { Toast } from '../../libs/uniApi';
.top-titleb { .top-titleb {
width: 30rpx; width: 30rpx;
height: 30rpx; height: 30rpx;
margin-top: 5rpx; margin-bottom: 5rpx;
margin-left: 10rpx; margin-left: 10rpx;
margin-right: 15rpx; margin-right: 15rpx;

View File

@ -6,15 +6,15 @@
<view class="title">店铺押金信息</view> <view class="title">店铺押金信息</view>
<view class="item"> <view class="item">
<text>已缴纳押金</text> <text>已缴纳押金</text>
<text>{{merchant_Data.paid_margin}}</text> <text>{{merchant_Data.paid_margin}}</text>
</view> </view>
<view class="item"> <view class="item">
<text>剩余缴纳押金</text> <text>剩余缴纳押金</text>
<text>{{merchant_Data.unpaid_margin}}</text> <text>{{merchant_Data.unpaid_margin}}</text>
</view> </view>
<view class="item"> <view class="item">
<text>缴纳押金账户</text> <text>缴纳押金账户</text>
<text>{{merchant_Data.mer_name}}</text> <text class="text">{{merchant_Data.mer_name}}</text>
</view> </view>
</view> </view>
</view> </view>
@ -30,16 +30,45 @@
<view class="text">充值后帐户的金额不能提现可用于商城消费使用佣金导入账户之后不能再次导出不可提现账户充值出现问题可联系商城客服也可拨打商城客服热线<text @click="copyPhone('4008888888')">4008888888</text> <view class="text">充值后帐户的金额不能提现可用于商城消费使用佣金导入账户之后不能再次导出不可提现账户充值出现问题可联系商城客服也可拨打商城客服热线<text @click="copyPhone('4008888888')">4008888888</text>
</view> </view>
</view> --> </view> -->
<view class="content-order" v-for="(item,i ) in productList"> <u-tabs :list="[{name: '扣除记录'},{name: '充值记录'}]" @click="changeCurrent" lineColor="#f56c6c" :activeStyle="{
<view class="">订单编号{{item.order_sn}}</view> color: '#333',
<view class="">支付金额{{item.total_price}}</view> fontWeight: 'bold',
<view class="">支付状态{{item.pay_type==1?'已支付':'待支付'}}</view> transform: 'scale(1.05)'
<view class="">支付时间{{item.pay_time}}</view> }"
</view> :inactiveStyle="{
<view class='loadingicon acea-row row-center-wrapper' v-if='productList.length > 0'> color: '#333',
<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}} transform: 'scale(1)'
</view> }"></u-tabs>
<block v-if="current==0">
<view class="content-order" v-for="(item,i ) in deductList">
<view class="deduct">扣除编号{{item.financial_record_sn}}</view>
<view class="deduct">扣除金额<text style="color: #ff5c2d;">{{item.number}}</text></view>
<view class="deduct">扣费方式{{item.financial_type=='auto_margin'? '订单自动扣除': '其他扣除'}}</view>
<view class="deduct">订单编号{{item.order_sn}}</view>
<view class="deduct">扣除时间{{item.create_time}}</view>
</view>
<view class='loadingicon acea-row row-center-wrapper' v-if='deductList.length > 0'>
<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle2}}
</view>
<view class='loadingicon acea-row row-center-wrapper' v-else>
没有更多了
</view>
</block>
<block v-if="current==1">
<view class="content-order" v-for="(item,i ) in productList">
<view class="view">订单编号{{item.order_sn}}</view>
<view class="view">支付金额{{item.total_price}}</view>
<view class="view">支付状态{{item.pay_type==1?'已支付':'待支付'}}</view>
<view class="view">支付时间{{item.pay_time}}</view>
</view>
<view class='loadingicon acea-row row-center-wrapper' v-if='productList.length > 0'>
<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
</view>
<view class='loadingicon acea-row row-center-wrapper' v-else>
没有更多了
</view>
</block>
</view> </view>
</template> </template>
@ -47,9 +76,10 @@
import { import {
merchant, merchant,
paymerchant, paymerchant,
marginlist marginlist,
autoMarginlist
} from '@/api/api.js' } from '@/api/api.js'
import { Toast } from '../../libs/uniApi' import { Toast } from '../../libs/uniApi'
export default { export default {
data() { data() {
return { return {
@ -59,23 +89,36 @@ import { Toast } from '../../libs/uniApi'
page: 1, page: 1,
limit: 10 limit: 10
}, },
where2: {
page: 1,
limit: 10
},
productList: [], productList: [],
deductList: [],
loadend: false, loadend: false,
loading: false, loading: false,
loadTitle: '加载更多', loadTitle: '加载更多',
loadend2: false,
loading2: false,
loadTitle2: '加载更多',
current: 0
} }
}, },
onLoad(e) { onLoad(e) {
this.mer_id = e.mer_id this.mer_id = e.mer_id
this.decimal() this.decimal()
this.list(true) // this.list(true);
this.autoList(true);
}, },
onReachBottom() { onReachBottom() {
if (this.productList.length > 0) { if(this.current==0){
setTimeout(() => { this.loadend2 = false;
this.list(false); this.loading2 = false;
}, 1000) this.autoList(false);
}else {
this.loadend = false;
this.loading = false;
this.list(false);
} }
}, },
methods: { methods: {
@ -84,7 +127,6 @@ import { Toast } from '../../libs/uniApi'
if (that.loadend) return; if (that.loadend) return;
if (that.loading) return; if (that.loading) return;
if (isPage === true) that.$set(that, 'productList', []); if (isPage === true) that.$set(that, 'productList', []);
that.loading = true; that.loading = true;
that.loadTitle = ''; that.loadTitle = '';
marginlist(that.where).then(res => { marginlist(that.where).then(res => {
@ -164,6 +206,43 @@ import { Toast } from '../../libs/uniApi'
} }
}, },
changeCurrent(e){
this.current = e.index;
if(e.index==0){
this.loadend = false;
this.loading = false;
this.autoList(true);
}else {
this.loadend = false;
this.loading = false;
this.list(true)
}
},
autoList(isPage){
let that = this;
if (that.loadend2) return;
if (that.loading2) return;
if (isPage === true) that.$set(that, 'deductList', []);
that.loading2 = true;
that.loadTitle2 = '';
autoMarginlist(36, that.where2).then(res=>{
let list = res.data;
let deductList = that.$util.SplitArray(list, that.deductList);
let loadend = list.length < that.where2.limit;
that.loadend2 = loadend;
that.loading2 = false;
that.loadTitle2 = loadend ? '已全部加载' : '加载更多';
setTimeout(() => {
that.$set(that, 'deductList', deductList);
}, 500);
that.$set(that.where2, 'page', that.where2.page + 1);
if (that.where2.page == 1 && res.data.length <= 0) that.emptyShow = true
}).catch(err=>{
console.log(err);
that.loading2 = false;
that.loadTitle2 = '加载更多';
})
}
} }
} }
</script> </script>
@ -177,23 +256,22 @@ import { Toast } from '../../libs/uniApi'
} }
.content-order { .content-order {
background: #fff;
background: #F4F4F4;
border-radius: 21rpx 21rpx; border-radius: 21rpx 21rpx;
margin: 0 28rpx;
margin-top: 30rpx; margin-top: 30rpx;
padding: 10rpx; padding: 28rpx;
margin-left: 10rpx; box-shadow: 0 0 10rpx 2rpx rgba(0, 0, 0, 0.1);
margin-right: 10rpx;
view { .view {
font-size: 30rpx; font-size: 30rpx;
font-family: PingFang SC-Regular, PingFang SC; font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;
margin: 20rpx;
} }
.deduct{
}
} }
.info { .info {
@ -215,18 +293,20 @@ import { Toast } from '../../libs/uniApi'
.card { .card {
width: 694rpx; width: 694rpx;
min-height: 180rpx; height: 270rpx;
background: #FFFFFF; background: #FFFFFF;
margin-top: 38.55rpx; margin-top: 38.55rpx;
box-shadow: 0rpx 0rpx 18rpx 2rpx rgba(50, 116, 249, 0.1); box-shadow: 0rpx 0rpx 18rpx 2rpx rgba(50, 116, 249, 0.1);
border-radius: 14rpx 14rpx 14rpx 14rpx; border-radius: 14rpx 14rpx 14rpx 14rpx;
opacity: 1; opacity: 1;
padding: 31.5rpx 28rpx; padding: 31.5rpx 28rpx;
font-size: 30rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-around; justify-content: space-between;
position: absolute; position: absolute;
top: 0; top: 0;
.title { .title {
font-size: 32rpx; font-size: 32rpx;
@ -241,12 +321,17 @@ import { Toast } from '../../libs/uniApi'
font-size: 32rpx; font-size: 32rpx;
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;
margin-bottom: 10rpx;
text:nth-child(1) { text:nth-child(1) {
flex-shrink: 0; flex-shrink: 0;
margin-right: 18rpx; margin-right: 18rpx;
} }
.text{
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
overflow: hidden;
}
} }
} }
} }
@ -255,14 +340,14 @@ import { Toast } from '../../libs/uniApi'
display: flex; display: flex;
flex-direction: column; flex-direction: column;
padding: 0 28rpx; padding: 0 28rpx;
margin-top: 85rpx; margin-top: 90rpx;
.title { .title {
font-size: 32rpx; font-size: 32rpx;
font-weight: 600; font-weight: 600;
color: #333333; color: #333333;
line-height: 39rpx; line-height: 39rpx;
margin-bottom: 42rpx; margin-bottom: 30rpx;
} }
.tab { .tab {
@ -309,7 +394,7 @@ import { Toast } from '../../libs/uniApi'
.btn { .btn {
width: 694rpx; width: 694rpx;
height: 84rpx; height: 84rpx;
margin-top: 73.6rpx; margin-top: 30rpx;
background: #FF5C2D; background: #FF5C2D;
box-shadow: 0rpx 14rpx 44rpx 2rpx #E9EFF5; box-shadow: 0rpx 14rpx 44rpx 2rpx #E9EFF5;
border-radius: 42rpx 42rpx 42rpx 42rpx; border-radius: 42rpx 42rpx 42rpx 42rpx;

View File

@ -20,11 +20,11 @@
<view class='wrapper'> <view class='wrapper'>
<view :hidden='currentTab != 0' class='list'> <view :hidden='currentTab != 0' class='list'>
<form @submit="subCash" report-submit='true'> <form @submit="subCash" report-submit='true'>
<view class='item acea-row row-between-wrapper'> <!-- <view class='item acea-row row-between-wrapper'>
<view class='name'>持卡人</view> <view class='name'>持卡人</view>
<view class='input'><input v-model="mode.real_name" placeholder='请输入持卡人姓名' <view class='input'><input v-model="mode.real_name" placeholder='请输入持卡人姓名'
placeholder-class='placeholder' name="real_name"></input></view> placeholder-class='placeholder' name="real_name"></input></view>
</view> </view> -->
<view class='item acea-row row-between-wrapper'> <view class='item acea-row row-between-wrapper'>
<view class='name'>卡号</view> <view class='name'>卡号</view>
<view class='input'><input v-model="mode.bank_code" type='number' placeholder='请填写卡号' <view class='input'><input v-model="mode.bank_code" type='number' placeholder='请填写卡号'
@ -53,6 +53,9 @@
当前可提现金额: <text 当前可提现金额: <text
class="price">{{extract_money}}</text>, 冻结金额: {{lock_money}} class="price">{{extract_money}}</text>, 冻结金额: {{lock_money}}
</view> </view>
<view class='tip'>
当前押金: {{ot_margin}}
</view>
<view class='tip'> <view class='tip'>
说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额 说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额
</view> </view>
@ -94,6 +97,9 @@
当前可提现金额: <text 当前可提现金额: <text
class="price">{{extract_money}},</text>冻结金额: {{lock_money}} class="price">{{extract_money}},</text>冻结金额: {{lock_money}}
</view> </view>
<view class='tip'>
当前押金: {{ot_margin}}
</view>
<view class='tip'> <view class='tip'>
说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额 说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额
</view> </view>
@ -143,6 +149,9 @@
当前可提现金额: <text 当前可提现金额: <text
class="price">{{extract_money}}</text>, 冻结金额: {{lock_money}} class="price">{{extract_money}}</text>, 冻结金额: {{lock_money}}
</view> </view>
<view class='tip'>
当前押金: {{ot_margin}}
</view>
<view class='tip'> <view class='tip'>
说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额 说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额
</view> </view>
@ -195,6 +204,7 @@
return { return {
extract_money:"", extract_money:"",
lock_money: "", lock_money: "",
ot_margin: "",
lock_time: "", lock_time: "",
mode: { mode: {
bank_address: "", bank_address: "",
@ -282,6 +292,7 @@
this.mode.bank_address = res.data.financial_bank_branch this.mode.bank_address = res.data.financial_bank_branch
this.extract_money=res.data.extract_money this.extract_money=res.data.extract_money
this.lock_money = res.data.lock_money this.lock_money = res.data.lock_money
this.ot_margin = res.data.ot_margin
this.lock_time = res.data.lock_time this.lock_time = res.data.lock_time
console.log(this.extract_money) console.log(this.extract_money)
} catch (err) { } catch (err) {

View File

@ -278,13 +278,13 @@
<block v-if="item.order_status == 1 "> <block v-if="item.order_status == 1 ">
<view class='bnt b-color' v-if="item.status==12" @click.stop='dePay'> <!-- <view class='bnt b-color' v-if="item.status==12" @click.stop='dePay'>
去付款 去付款
</view> </view> -->
<view class='bnt b-color' v-else <!-- <view class='bnt b-color' v-else
@click.stop='goPay(item.pay_price,item.group_order_id,item.activity_type)'> @click.stop='goPay(item.pay_price,item.group_order_id,item.activity_type)'>
去付款 去付款
</view> </view> -->
</block> </block>
<block v-if="item.order_status == 9 "> <block v-if="item.order_status == 9 ">