更新委托销售功能
This commit is contained in:
parent
f1dabd1461
commit
7ad8780361
|
@ -213,10 +213,10 @@
|
||||||
type: 2,
|
type: 2,
|
||||||
title: "送货"
|
title: "送货"
|
||||||
},
|
},
|
||||||
{
|
// {
|
||||||
type: 3,
|
// type: 3,
|
||||||
title: "无需物流"
|
// title: "无需物流"
|
||||||
}
|
// }
|
||||||
],
|
],
|
||||||
splitList: [
|
splitList: [
|
||||||
{
|
{
|
||||||
|
|
|
@ -54,7 +54,7 @@
|
||||||
</view>
|
</view>
|
||||||
<view class="bottom" @click="navTo('/subpkg/orderDetail/orderDetail')">
|
<view class="bottom" @click="navTo('/subpkg/orderDetail/orderDetail')">
|
||||||
<view class="item">
|
<view class="item">
|
||||||
<view>履约保证金额(元)</view>
|
<view>履约押金额(元)</view>
|
||||||
<view class="num" v-show="eyeType">{{
|
<view class="num" v-show="eyeType">{{
|
||||||
userInfo.deposit || 0.0
|
userInfo.deposit || 0.0
|
||||||
}}</view>
|
}}</view>
|
||||||
|
|
|
@ -169,7 +169,7 @@
|
||||||
一键改价
|
一键改价
|
||||||
</view>
|
</view>
|
||||||
<view class="bnt" @click="modify(item, 1)">订单备注</view>
|
<view class="bnt" @click="modify(item, 1)">订单备注</view>
|
||||||
<view class="bnt bnt_color" v-if="where.status == 2 && item.order_type == 0&&item.activity_type==98"
|
<view class="bnt bnt_color" v-if="where.status == 2 && item.order_type == 0&&(item.activity_type==98||item.activity_type==99)"
|
||||||
@click="toPostage(item)">去发货
|
@click="toPostage(item)">去发货
|
||||||
</view>
|
</view>
|
||||||
<view class="bnt bnt_color" v-if="where.status == 2 && item.order_type == 0&& item.order_type !=1 &&item.activity_type==0"
|
<view class="bnt bnt_color" v-if="where.status == 2 && item.order_type == 0&& item.order_type !=1 &&item.activity_type==0"
|
||||||
|
|
|
@ -44,7 +44,7 @@
|
||||||
<view class="center-twoa">
|
<view class="center-twoa">
|
||||||
委托方:
|
委托方:
|
||||||
</view>
|
</view>
|
||||||
<view class="center-twob">
|
<view v-if="objinfo.mer_info" class="center-twob">
|
||||||
{{objinfo.mer_info.mer_name}}
|
{{objinfo.mer_info.mer_name}}
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
@ -52,7 +52,7 @@
|
||||||
<view class="center-twoa">
|
<view class="center-twoa">
|
||||||
被委托方:
|
被委托方:
|
||||||
</view>
|
</view>
|
||||||
<view class="center-twob">
|
<view v-if="objinfo.entrust_mer_info" class="center-twob">
|
||||||
{{objinfo.entrust_mer_info.mer_name}}
|
{{objinfo.entrust_mer_info.mer_name}}
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
@ -61,22 +61,22 @@
|
||||||
委托周期:
|
委托周期:
|
||||||
</view>
|
</view>
|
||||||
<view class="center-twob">
|
<view class="center-twob">
|
||||||
{{objinfo.entrust_day}}
|
{{objinfo.entrust_day}}天
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="center-two">
|
<view class="center-two">
|
||||||
<view class="center-twoa">
|
<view class="center-twoa">
|
||||||
结算周期:
|
结算周期:
|
||||||
</view>
|
</view>
|
||||||
<view class="center-twob">
|
<view v-if="objinfo.mer_info" class="center-twob">
|
||||||
{{objinfo.mer_info.settle_cycle}}
|
{{objinfo.mer_info.settle_cycle}}天
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="center-two">
|
<view class="center-two">
|
||||||
<view class="center-twoa">
|
<view class="center-twoa">
|
||||||
结算利息:
|
结算利息:
|
||||||
</view>
|
</view>
|
||||||
<view class="center-twob">
|
<view v-if="objinfo.mer_info" class="center-twob">
|
||||||
{{objinfo.mer_info.interest_rate}}%
|
{{objinfo.mer_info.interest_rate}}%
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
|
@ -10,82 +10,92 @@
|
||||||
|
|
||||||
<view class="content-one">
|
<view class="content-one">
|
||||||
<view class="content-one-img">
|
<view class="content-one-img">
|
||||||
<image src="@/static/images/bg2.png" mode="aspectFit"></image>
|
<image :src="item.mer_info&&item.mer_info.mer_avatar" mode="aspectFit"></image>
|
||||||
</view>
|
</view>
|
||||||
<view class="content-one-txt">
|
<view class="content-text">
|
||||||
<view class="one-txt-a">
|
<view class="flex" style="justify-content: space-between;">
|
||||||
{{item.title}}
|
<view class="one-txt-a">
|
||||||
</view>
|
{{item.title}}
|
||||||
<view class="one-txt-b">
|
</view>
|
||||||
委托周期:{{item.entrust_day}}
|
<block>
|
||||||
</view>
|
<view class="content-two_one" v-if="item.mer_status==0">
|
||||||
</view>
|
<view class="content-two-edita" style="font-weight: bold;">
|
||||||
</view>
|
待处理
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="content-two_oneq" v-if="item.mer_status==1">
|
||||||
<view class="content-two_one" v-if="item.mer_status==0">
|
<view class="content-two-editb" @click="accepted" style="font-weight: bold;">
|
||||||
<view class="content-two-edita" @click="order">
|
已接受
|
||||||
待处理
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="contentgn">
|
<view class="content-two_one" v-if="item.mer_status==2">
|
||||||
<!-- <view class="contentgn_a" @click="soldEdit(item)">
|
<view class="content-two-editc" @click="declined" style="font-weight: bold;">
|
||||||
处理
|
已拒绝
|
||||||
</view>
|
</view>
|
||||||
<span></span>-->
|
</view>
|
||||||
<view class="contentgn_a" style="margin-left: 10rpx;" @click="Edit(item)">
|
<view class="content-two_one" v-if="item.type==4" style="font-weight: bold;">
|
||||||
编辑
|
<view class="content-two-editd" @click="soldEdit">
|
||||||
</view>
|
已完成
|
||||||
<span></span>
|
</view>
|
||||||
<view class="contentgn_a" style="margin-left: 10rpx;" @click="deleteOrder(item)">
|
</view>
|
||||||
删除
|
</block>
|
||||||
</view>
|
</view>
|
||||||
<span></span>
|
|
||||||
<view class="contentgn_b" @click="detail(item)">
|
<view class="text-bottom">
|
||||||
详情
|
<view class="one-txt-b">
|
||||||
</view>
|
委托周期:{{item.entrust_day}}天
|
||||||
</view>
|
</view>
|
||||||
</view>
|
<block>
|
||||||
<view class="content-two_oneq" v-if="item.mer_status==1">
|
<view class="content-two_one" v-if="item.mer_status==0">
|
||||||
<view class="content-two-editb" @click="accepted">
|
<view class="contentgn">
|
||||||
已接受
|
<view class="contentgn_a" style="margin-left: 10rpx;" @click="Edit(item)">
|
||||||
</view>
|
编辑
|
||||||
<view class="contentgn">
|
</view>
|
||||||
<view class="contentgn_a" @click="closingorder(item)" v-if="item.entrust_finish==3">
|
<span></span>
|
||||||
结束委托
|
<view class="contentgn_a" style="margin-left: 10rpx;" @click="deleteOrder(item)">
|
||||||
</view>
|
删除
|
||||||
<span v-if="item.entrust_finish==3"></span>
|
</view>
|
||||||
<view class="contentgn_b" @click="detail(item)">
|
<span></span>
|
||||||
详情
|
<view class="contentgn_b" @click="detail(item)">
|
||||||
</view>
|
详情
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="content-two_one" v-if="item.mer_status==2">
|
</view>
|
||||||
<view class="content-two-editc" @click="declined">
|
<view class="content-two_oneq" v-if="item.mer_status==1">
|
||||||
已拒绝
|
<view class="contentgn">
|
||||||
</view>
|
<view class="contentgn_a" @click="closingorder(item)" v-if="item.entrust_finish==3">
|
||||||
<view class="contentgn">
|
结束委托
|
||||||
<!--<view class="contentgn_a" @click="deleteOrder(item)">
|
</view>
|
||||||
删除
|
<span v-if="item.entrust_finish==3"></span>
|
||||||
</view>
|
<view class="contentgn_b" @click="detail(item)">
|
||||||
<span></span> -->
|
详情
|
||||||
<view class="contentgn_b" @click="detail(item)">
|
</view>
|
||||||
详情
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
<view class="content-two_one" v-if="item.mer_status==2">
|
||||||
</view>
|
<view class="contentgn">
|
||||||
<view class="content-two_one" v-if="item.type==4">
|
<!--<view class="contentgn_a" @click="deleteOrder(item)">
|
||||||
<view class="content-two-editd" @click="soldEdit">
|
删除
|
||||||
已完成
|
</view>
|
||||||
</view>
|
<span></span> -->
|
||||||
<view class="contentgn">
|
<view class="contentgn_b" @click="detail(item)">
|
||||||
<view class="contentgn_a" @click="deleteOrder(item)">
|
详情
|
||||||
删除
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<span></span>
|
</view>
|
||||||
<view class="contentgn_b" @click="detail(item)">
|
<view class="content-two_one" v-if="item.type==4">
|
||||||
详情
|
<view class="contentgn">
|
||||||
</view>
|
<view class="contentgn_a" @click="deleteOrder(item)">
|
||||||
|
删除
|
||||||
|
</view>
|
||||||
|
<span></span>
|
||||||
|
<view class="contentgn_b" @click="detail(item)">
|
||||||
|
详情
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</block>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
@ -101,6 +111,7 @@
|
||||||
<emptyPage title="暂无订单~"></emptyPage>
|
<emptyPage title="暂无订单~"></emptyPage>
|
||||||
</view>
|
</view>
|
||||||
<u-loadmore :status="status" v-if="orderList.length >= where.limit" />
|
<u-loadmore :status="status" v-if="orderList.length >= where.limit" />
|
||||||
|
<view style="height: 200rpx;"></view>
|
||||||
<uni-popup ref="bindmobile" type="center" @click="close">
|
<uni-popup ref="bindmobile" type="center" @click="close">
|
||||||
<view class="" style="position: relative;">
|
<view class="" style="position: relative;">
|
||||||
<view class="entrust">
|
<view class="entrust">
|
||||||
|
@ -176,7 +187,7 @@
|
||||||
<view class="cancellation" @click="refused">
|
<view class="cancellation" @click="refused">
|
||||||
拒绝
|
拒绝
|
||||||
</view>
|
</view>
|
||||||
<view class="determine" @click="agree(obj)">
|
<view class="determine" @click="agree(obj, 1)">
|
||||||
接受
|
接受
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
@ -406,9 +417,9 @@
|
||||||
// this.$refs.bindmobile2.open()
|
// this.$refs.bindmobile2.open()
|
||||||
this.$refs.bindmobile3.open()
|
this.$refs.bindmobile3.open()
|
||||||
},
|
},
|
||||||
agree(item) {
|
agree(item, status=2) {
|
||||||
finishentrust(item.community_id, {
|
finishentrust(item.community_id, {
|
||||||
status: 2,
|
status: status,
|
||||||
refusal: this.refuseds
|
refusal: this.refuseds
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
|
|
||||||
|
@ -485,7 +496,6 @@
|
||||||
.content {
|
.content {
|
||||||
height: 100vh;
|
height: 100vh;
|
||||||
position: relative;
|
position: relative;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.content_top {
|
.content_top {
|
||||||
|
@ -503,7 +513,7 @@
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
display: flex;
|
display: flex;
|
||||||
position: fixed;
|
position: fixed;
|
||||||
position: absolute;
|
// position: absolute;
|
||||||
bottom: 84rpx;
|
bottom: 84rpx;
|
||||||
left: 50%;
|
left: 50%;
|
||||||
margin-left: -347rpx;
|
margin-left: -347rpx;
|
||||||
|
@ -551,6 +561,7 @@
|
||||||
|
|
||||||
|
|
||||||
.content-one {
|
.content-one {
|
||||||
|
width: 100%;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
||||||
padding-bottom: 23rpx;
|
padding-bottom: 23rpx;
|
||||||
|
@ -598,12 +609,31 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.content-text{
|
||||||
|
flex: 1;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: space-between;
|
||||||
|
.text-bottom{
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
}
|
||||||
|
.one-txt-a{
|
||||||
|
flex: 1;
|
||||||
|
font-size: 30rpx;
|
||||||
|
display: -webkit-box;
|
||||||
|
-webkit-line-clamp: 2; /* 限制为三行 */
|
||||||
|
-webkit-box-orient: vertical;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.content-two_oneq {
|
.content-two_oneq {
|
||||||
position: absolute;
|
flex-shrink: 0;
|
||||||
right: 20rpx;
|
|
||||||
text-align: right;
|
text-align: right;
|
||||||
|
|
||||||
.content-two-edita {
|
.content-two-edita {
|
||||||
|
@ -642,7 +672,7 @@
|
||||||
|
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 47rpx;
|
// margin-top: 47rpx;
|
||||||
|
|
||||||
.contentgn_a {
|
.contentgn_a {
|
||||||
font-size: 32rpx;
|
font-size: 32rpx;
|
||||||
|
@ -676,7 +706,7 @@
|
||||||
|
|
||||||
.content-two_one {
|
.content-two_one {
|
||||||
|
|
||||||
|
flex-shrink: 0;
|
||||||
|
|
||||||
text-align: right;
|
text-align: right;
|
||||||
|
|
||||||
|
@ -716,7 +746,7 @@
|
||||||
|
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 47rpx;
|
// margin-top: 47rpx;
|
||||||
|
|
||||||
.contentgn_a {
|
.contentgn_a {
|
||||||
font-size: 32rpx;
|
font-size: 32rpx;
|
||||||
|
|
|
@ -7,99 +7,108 @@
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="content-content" v-for="(item,i) in orderList" :key="i" @click="nav(item)">
|
<view class="content-content" v-for="(item,i) in orderList" :key="i" @click="nav(item)">
|
||||||
|
|
||||||
<view class="content-one">
|
<view class="content-one">
|
||||||
<view class="content-one-img">
|
<view class="content-one-img">
|
||||||
<image src="@/static/images/bg2.png" mode="aspectFit"></image>
|
<image :src="item.mer_info&&item.mer_info.mer_avatar" mode="aspectFit"></image>
|
||||||
</view>
|
</view>
|
||||||
<view class="content-one-txt">
|
<view class="content-text">
|
||||||
<view class="one-txt-a">
|
<view class="flex" style="justify-content: space-between;">
|
||||||
{{item.title}}
|
<view class="one-txt-a">
|
||||||
</view>
|
{{item.title}}
|
||||||
<view class="one-txt-b">
|
</view>
|
||||||
委托周期:{{item.entrust_day}}
|
<block>
|
||||||
</view>
|
<view class="content-two_one" v-if="item.mer_status==0">
|
||||||
|
<view class="content-two-edita" style="font-weight: bold;">
|
||||||
<view class="one-txt-b" v-if="item.mer_status==1" style="color: red;margin-top: 3rpx;">
|
待处理
|
||||||
{{item.entrust_finish==0?'未申请结束委托':""||item.entrust_finish==1?'委托已结束':""||item.entrust_finish==2?'商家拒绝结束委托':""||item.entrust_finish==3?'结束委托申请中':""}}
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
<view class="content-two_oneq" v-if="item.mer_status==1">
|
||||||
|
<view class="content-two-editb" @click="accepted" style="font-weight: bold;">
|
||||||
|
已接受
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="content-two_one" v-if="item.mer_status==2">
|
||||||
|
<view class="content-two-editc" @click="declined" style="font-weight: bold;">
|
||||||
|
已拒绝
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="content-two_one" v-if="item.type==4" style="font-weight: bold;">
|
||||||
|
<view class="content-two-editd" @click="soldEdit">
|
||||||
|
已完成
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</block>
|
||||||
|
</view>
|
||||||
|
|
||||||
|
<view class="text-bottom">
|
||||||
|
<view class="one-txt-b">
|
||||||
|
委托周期:{{item.entrust_day}}天
|
||||||
|
</view>
|
||||||
|
<block>
|
||||||
|
<view class="content-two_one" v-if="item.mer_status==0">
|
||||||
|
<view class="contentgn">
|
||||||
|
<view class="contentgn_a" @click="soldEdit(item)">
|
||||||
|
处理
|
||||||
|
</view>
|
||||||
|
<span></span>
|
||||||
|
<view class="contentgn_b" @click="detail(item)">
|
||||||
|
详情
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="content-two_oneq" v-if="item.mer_status==1">
|
||||||
|
<view class="contentgn">
|
||||||
|
<block v-if="item.entrust_order_id>0&&item.mer_status==1">
|
||||||
|
<view class="contentgn_a" v-if="item.entrust_finish==0" style="margin-left: 10rpx;" @click="closingorder(item)">
|
||||||
|
申请结束
|
||||||
|
</view>
|
||||||
|
<view class="contentgn_a" v-else-if="item.entrust_finish==1" style="margin-left: 10rpx; color: #20A162;">
|
||||||
|
已结束
|
||||||
|
</view>
|
||||||
|
<view class="contentgn_a" v-else-if="item.entrust_finish==2" @click="closingorder(item)" style="margin-left: 10rpx;">
|
||||||
|
被拒绝
|
||||||
|
</view>
|
||||||
|
<view class="contentgn_a" v-else-if="item.entrust_finish==3" style="margin-left: 10rpx; color: #FE9A10;">
|
||||||
|
申请中
|
||||||
|
</view>
|
||||||
|
<span></span>
|
||||||
|
</block>
|
||||||
|
<view class="contentgn_a" v-if="item.entrust_order_id==0" style="margin-left: 10rpx;"
|
||||||
|
@click="order(item)">
|
||||||
|
去下单
|
||||||
|
</view>
|
||||||
|
<span v-if="item.entrust_order_id==0"></span>
|
||||||
|
|
||||||
|
<view class="contentgn_b" @click="detail(item)">
|
||||||
|
详情
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="content-two_one" v-if="item.mer_status==2">
|
||||||
|
<view class="contentgn">
|
||||||
|
<view class="contentgn_b" @click="detail(item)">
|
||||||
|
详情
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="content-two_one" v-if="item.type==4">
|
||||||
|
<view class="contentgn">
|
||||||
|
|
||||||
|
<view class="contentgn_b" @click="detail(item)">
|
||||||
|
详情
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</block>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="content-two_one" v-if="item.mer_status==0">
|
|
||||||
<view class="content-two-edita" @click="order">
|
|
||||||
待处理
|
|
||||||
</view>
|
|
||||||
<view class="contentgn">
|
|
||||||
<view class="contentgn_a" @click="soldEdit(item)">
|
|
||||||
处理
|
|
||||||
</view>
|
|
||||||
<span></span>
|
|
||||||
<!-- <view class="contentgn_a" style="margin-left: 10rpx;" @click="Edit(item)">
|
|
||||||
编辑
|
|
||||||
</view>
|
|
||||||
<span></span> -->
|
|
||||||
<!-- <view class="contentgn_a" style="margin-left: 10rpx;" @click="deleteOrder(item)">
|
|
||||||
删除
|
|
||||||
</view>
|
|
||||||
<span></span> -->
|
|
||||||
<view class="contentgn_b" @click="detail(item)">
|
|
||||||
详情
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
<view class="content-two_oneq" v-if="item.mer_status==1">
|
|
||||||
<view class="content-two-editb" @click="accepted">
|
|
||||||
已接受
|
|
||||||
</view>
|
|
||||||
<view class="contentgn">
|
|
||||||
<view class="contentgn_a" style="margin-left: 10rpx;"
|
|
||||||
v-if="item.entrust_order_id>0&&item.mer_status==1" @click="closingorder(item)">
|
|
||||||
申请结束委托
|
|
||||||
</view>
|
|
||||||
<span v-if="item.entrust_order_id>0&&item.mer_status==1"></span>
|
|
||||||
<view class="contentgn_a" v-if="item.entrust_order_id==0" style="margin-left: 10rpx;"
|
|
||||||
@click="order(item)">
|
|
||||||
去下单
|
|
||||||
</view>
|
|
||||||
<span v-if="item.entrust_order_id==0"></span>
|
|
||||||
|
|
||||||
<view class="contentgn_b" @click="detail(item)">
|
|
||||||
详情
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
<view class="content-two_one" v-if="item.mer_status==2">
|
|
||||||
<view class="content-two-editc" @click="declined">
|
|
||||||
已拒绝
|
|
||||||
</view>
|
|
||||||
<view class="contentgn">
|
|
||||||
<!--
|
|
||||||
-->
|
|
||||||
<view class="contentgn_b" @click="detail(item)">
|
|
||||||
详情
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
<view class="content-two_one" v-if="item.type==4">
|
|
||||||
<view class="content-two-editd" @click="soldEdit">
|
|
||||||
已完成
|
|
||||||
</view>
|
|
||||||
<view class="contentgn">
|
|
||||||
|
|
||||||
<view class="contentgn_b" @click="detail(item)">
|
|
||||||
详情
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view v-if="orderList.length == 0">
|
<view v-if="orderList.length == 0">
|
||||||
<emptyPage title="暂无订单~"></emptyPage>
|
<emptyPage title="暂无订单~"></emptyPage>
|
||||||
</view>
|
</view>
|
||||||
<u-loadmore :status="status" v-if="orderList.length >= where.limit" />
|
<u-loadmore :status="status" v-else />
|
||||||
<u-loadmore :status="status" v-if="orderList.length >= where.limit" />
|
|
||||||
<uni-popup ref="bindmobile" type="center" @click="close">
|
<uni-popup ref="bindmobile" type="center" @click="close">
|
||||||
<view class="" style="position: relative;">
|
<view class="" style="position: relative;">
|
||||||
<view class="entrust">
|
<view class="entrust">
|
||||||
|
@ -228,7 +237,8 @@
|
||||||
import {
|
import {
|
||||||
entrustlist,
|
entrustlist,
|
||||||
finishchain,
|
finishchain,
|
||||||
checkchain
|
checkchain,
|
||||||
|
addEntrustCart
|
||||||
} from '@/api/sale.js'
|
} from '@/api/sale.js'
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
|
@ -365,9 +375,23 @@
|
||||||
},
|
},
|
||||||
//下单
|
//下单
|
||||||
order(item) {
|
order(item) {
|
||||||
uni.navigateTo({
|
// uni.navigateTo({
|
||||||
url: '/pages/commissionedSales/delegation_details/index?id=' + item.community_id + '&type=1'
|
// url: '/pages/commissionedSales/delegation_details/index?id=' + item.community_id + '&type=1'
|
||||||
})
|
// })
|
||||||
|
addEntrustCart({
|
||||||
|
community_id: item.community_id
|
||||||
|
}).then(res => {
|
||||||
|
if (res.status == 200) {
|
||||||
|
this.$util.Tips({
|
||||||
|
title: res.message,
|
||||||
|
icon: 'success'
|
||||||
|
})
|
||||||
|
uni.navigateTo({
|
||||||
|
url: '/pages/users/order_confirm/index?cartId=' + res.data.cart_id.toString()
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
})
|
||||||
},
|
},
|
||||||
//申请结束委托申请
|
//申请结束委托申请
|
||||||
deteragrss(item) {
|
deteragrss(item) {
|
||||||
|
@ -471,8 +495,8 @@
|
||||||
|
|
||||||
|
|
||||||
.content-one {
|
.content-one {
|
||||||
|
width: 100%;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
||||||
padding-bottom: 23rpx;
|
padding-bottom: 23rpx;
|
||||||
|
|
||||||
.content-one-img {
|
.content-one-img {
|
||||||
|
@ -480,6 +504,7 @@
|
||||||
height: 148rpx;
|
height: 148rpx;
|
||||||
margin-right: 28rpx;
|
margin-right: 28rpx;
|
||||||
border: 1px solid;
|
border: 1px solid;
|
||||||
|
flex-shrink: 0;
|
||||||
|
|
||||||
image {
|
image {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
@ -488,7 +513,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.content-one-txt {
|
.content-one-txt {
|
||||||
|
flex: 1;
|
||||||
|
|
||||||
.txt-b-a {
|
.txt-b-a {
|
||||||
font-size: 32rpx;
|
font-size: 32rpx;
|
||||||
|
@ -518,13 +543,32 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.content-text{
|
||||||
|
flex: 1;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: space-between;
|
||||||
|
.text-bottom{
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
}
|
||||||
|
.one-txt-a{
|
||||||
|
flex: 1;
|
||||||
|
font-size: 30rpx;
|
||||||
|
display: -webkit-box;
|
||||||
|
-webkit-line-clamp: 2; /* 限制为三行 */
|
||||||
|
-webkit-box-orient: vertical;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.content-two_oneq {
|
.content-two_oneq {
|
||||||
position: absolute;
|
|
||||||
right: 20rpx;
|
|
||||||
text-align: right;
|
text-align: right;
|
||||||
|
flex-shrink: 0;
|
||||||
|
|
||||||
.content-two-edita {
|
.content-two-edita {
|
||||||
|
|
||||||
|
@ -562,7 +606,7 @@
|
||||||
|
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 47rpx;
|
// margin-top: 47rpx;
|
||||||
|
|
||||||
.contentgn_a {
|
.contentgn_a {
|
||||||
font-size: 32rpx;
|
font-size: 32rpx;
|
||||||
|
@ -596,7 +640,7 @@
|
||||||
|
|
||||||
.content-two_one {
|
.content-two_one {
|
||||||
|
|
||||||
|
flex-shrink: 0;
|
||||||
|
|
||||||
text-align: right;
|
text-align: right;
|
||||||
|
|
||||||
|
@ -636,7 +680,7 @@
|
||||||
|
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
margin-top: 47rpx;
|
// margin-top: 47rpx;
|
||||||
|
|
||||||
.contentgn_a {
|
.contentgn_a {
|
||||||
font-size: 32rpx;
|
font-size: 32rpx;
|
||||||
|
|
|
@ -3,13 +3,13 @@
|
||||||
<view class="info">
|
<view class="info">
|
||||||
<view class="bg"></view>
|
<view class="bg"></view>
|
||||||
<view class="card">
|
<view class="card">
|
||||||
<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">
|
||||||
|
@ -106,7 +106,7 @@
|
||||||
});
|
});
|
||||||
|
|
||||||
},
|
},
|
||||||
//获取保证金信息
|
//获取押金信息
|
||||||
decimal() {
|
decimal() {
|
||||||
merchant({
|
merchant({
|
||||||
id: this.mer_id
|
id: this.mer_id
|
||||||
|
@ -114,17 +114,17 @@
|
||||||
this.merchant_Data = res.data
|
this.merchant_Data = res.data
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
//缴纳保证金
|
//缴纳押金
|
||||||
paydecimal() {
|
paydecimal() {
|
||||||
if (this.merchant_Data.is_margin != 1) {
|
if (this.merchant_Data.is_margin != 1) {
|
||||||
this.$util.Tips({
|
this.$util.Tips({
|
||||||
title: '暂时无需缴纳保证金'
|
title: '暂时无需缴纳押金'
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
let that = this
|
let that = this
|
||||||
uni.showModal({
|
uni.showModal({
|
||||||
title: '提示',
|
title: '提示',
|
||||||
content: '商户' + this.merchant_Data.mer_name + '是否同意缴纳保证金',
|
content: '商户' + this.merchant_Data.mer_name + '是否同意缴纳押金',
|
||||||
success: (res) => {
|
success: (res) => {
|
||||||
if (res.confirm) {
|
if (res.confirm) {
|
||||||
|
|
||||||
|
|
|
@ -78,7 +78,7 @@
|
||||||
<view class="examine" @click="paydecimal">
|
<view class="examine" @click="paydecimal">
|
||||||
<image class="icon_img" src="@/static/images/index20.png" mode="aspectFill">
|
<image class="icon_img" src="@/static/images/index20.png" mode="aspectFill">
|
||||||
</image>
|
</image>
|
||||||
<text class="text">保证缴纳金</text>
|
<text class="text">押金缴纳</text>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="examine" @click="navigator(`/pages/commissionedSales/index/index?mer_id=${mer_id}`)">
|
<view class="examine" @click="navigator(`/pages/commissionedSales/index/index?mer_id=${mer_id}`)">
|
||||||
|
@ -186,7 +186,7 @@
|
||||||
<view class="examine" @click="paydecimal">
|
<view class="examine" @click="paydecimal">
|
||||||
<image class="icon_img" src="@/static/images/index20.png" mode="aspectFill">
|
<image class="icon_img" src="@/static/images/index20.png" mode="aspectFill">
|
||||||
</image>
|
</image>
|
||||||
<text class="text">保证缴纳金</text>
|
<text class="text">押金缴纳</text>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="examine" @click="navigator(`/pages/users/trading_hall/index?mer_id=${mer_id}`)">
|
<view class="examine" @click="navigator(`/pages/users/trading_hall/index?mer_id=${mer_id}`)">
|
||||||
|
@ -361,7 +361,7 @@
|
||||||
<view class="examine" @click="paydecimal">
|
<view class="examine" @click="paydecimal">
|
||||||
<image class="icon_img" src="@/static/images/index20.png" mode="aspectFill">
|
<image class="icon_img" src="@/static/images/index20.png" mode="aspectFill">
|
||||||
</image>
|
</image>
|
||||||
<text class="text">保证缴纳金</text>
|
<text class="text">押金缴纳</text>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
|
@ -817,7 +817,7 @@
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
//保证金缴纳
|
//押金缴纳
|
||||||
paydecimal() {
|
paydecimal() {
|
||||||
if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
|
if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
<view class="txt-b-a">
|
<view class="txt-b-a">
|
||||||
¥ {{item.total_price}}
|
¥ {{item.total_price}}
|
||||||
</view>
|
</view>
|
||||||
<view class="txt-b-b"
|
<view v-if="item.resale_type!=1" class="txt-b-b"
|
||||||
style="font-size: 28rpx;font-family: SF Pro Display-Regular, SF Pro Display;font-weight: 400;color: #999999;">
|
style="font-size: 28rpx;font-family: SF Pro Display-Regular, SF Pro Display;font-weight: 400;color: #999999;">
|
||||||
结算价:¥{{item.discount_price}}
|
结算价:¥{{item.discount_price}}
|
||||||
</view>
|
</view>
|
||||||
|
|
|
@ -39,14 +39,14 @@
|
||||||
<view class="record flex">
|
<view class="record flex">
|
||||||
<view class="circle"></view>
|
<view class="circle"></view>
|
||||||
<view class="cont-box">
|
<view class="cont-box">
|
||||||
<view class="title">签署里海云《履约保证金协议》</view>
|
<view class="title">签署里海云《履约押金协议》</view>
|
||||||
<view class="text-box">
|
<view class="text-box">
|
||||||
<view class="have-filled" v-if="false">
|
<view class="have-filled" v-if="false">
|
||||||
<text>1.完成签署履约保证金协议2023-05-08 13:15完成</text>
|
<text>1.完成签署履约押金协议2023-05-08 13:15完成</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="get-through" v-else>
|
<view class="get-through" v-else>
|
||||||
<text class="through-title">1、签署里海云《履约保证金协议》</text>
|
<text class="through-title">1、签署里海云《履约押金协议》</text>
|
||||||
<text>请详细阅读里海云履约保证金协议,并充分理解内容后进行电子签名。</text>
|
<text>请详细阅读里海云履约押金协议,并充分理解内容后进行电子签名。</text>
|
||||||
<view class="flex_a_c" style="margin-top: auto;">
|
<view class="flex_a_c" style="margin-top: auto;">
|
||||||
<view class="through-btn">签署协议</view>
|
<view class="through-btn">签署协议</view>
|
||||||
<view class="tiaoguo">跳过</view>
|
<view class="tiaoguo">跳过</view>
|
||||||
|
@ -58,16 +58,16 @@
|
||||||
<view class="record flex">
|
<view class="record flex">
|
||||||
<view class="circle"></view>
|
<view class="circle"></view>
|
||||||
<view class="cont-box">
|
<view class="cont-box">
|
||||||
<view class="title">缴纳履约保证金</view>
|
<view class="title">缴纳履约押金</view>
|
||||||
<view class="text-box">
|
<view class="text-box">
|
||||||
<view class="have-filled" v-if="!true">
|
<view class="have-filled" v-if="!true">
|
||||||
<text>1.完成履约保证金缴纳 2023-05-08 13:15完成</text>
|
<text>1.完成履约押金缴纳 2023-05-08 13:15完成</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="get-through" v-else>
|
<view class="get-through" v-else>
|
||||||
<text class="through-title">1、缴纳履约保证金</text>
|
<text class="through-title">1、缴纳履约押金</text>
|
||||||
<text>线上缴纳履约保证金,完成保证金审核后签约完成。</text>
|
<text>线上缴纳履约押金,完成押金审核后签约完成。</text>
|
||||||
<view class="flex_a_c" style="margin-top: auto;">
|
<view class="flex_a_c" style="margin-top: auto;">
|
||||||
<view class="through-btn">缴纳履约保证金</view>
|
<view class="through-btn">缴纳履约押金</view>
|
||||||
<view class="tiaoguo">跳过</view>
|
<view class="tiaoguo">跳过</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
Loading…
Reference in New Issue