完成委托订单功能
This commit is contained in:
parent
cda132d920
commit
7a87342e3c
@ -19,6 +19,10 @@
|
|||||||
<view class="one-txt-b">
|
<view class="one-txt-b">
|
||||||
委托周期:{{item.entrust_day}}
|
委托周期:{{item.entrust_day}}
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
<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>
|
</view>
|
||||||
|
|
||||||
@ -70,10 +74,10 @@
|
|||||||
已拒绝
|
已拒绝
|
||||||
</view>
|
</view>
|
||||||
<view class="contentgn">
|
<view class="contentgn">
|
||||||
<view class="contentgn_a" click="deleteOrder(item)">
|
<!-- <view class="contentgn_a" click="deleteOrder(item)">
|
||||||
删除
|
删除
|
||||||
</view>
|
</view>
|
||||||
<span></span>
|
<span></span> -->
|
||||||
<view class="contentgn_b" @click="detail(item)">
|
<view class="contentgn_b" @click="detail(item)">
|
||||||
详情
|
详情
|
||||||
</view>
|
</view>
|
||||||
@ -105,15 +109,15 @@
|
|||||||
<image src="@/static/images/wt_close.png" mode=""></image>
|
<image src="@/static/images/wt_close.png" mode=""></image>
|
||||||
</view>
|
</view>
|
||||||
<view class="entrust_bg">
|
<view class="entrust_bg">
|
||||||
<view class="entrust_bg-content">
|
<view class="entrust_bg-content" v-if="obj.mer_info">
|
||||||
<view class="bg-content-a">
|
<view class="bg-content-a">
|
||||||
委托申请处理
|
委托申请处理
|
||||||
</view>
|
</view>
|
||||||
<view class="bg-content-b">
|
<view class="bg-content-b" >
|
||||||
结算周期: <span>{{obj.settle_cycle}}天</span>
|
结算周期: <span>{{obj.mer_info.settle_cycle}}天</span>
|
||||||
</view>
|
</view>
|
||||||
<view class="bg-content-c">
|
<view class="bg-content-c" >
|
||||||
利息比例: <span>{{obj.interest_rate}}%</span>
|
利息比例: <span>{{obj.mer_info.interest_rate}}%</span>
|
||||||
</view>
|
</view>
|
||||||
<view class="entrust_bga_btn">
|
<view class="entrust_bga_btn">
|
||||||
<view class="cancellation" @click="passDelete(obj)">
|
<view class="cancellation" @click="passDelete(obj)">
|
||||||
|
@ -61,6 +61,7 @@
|
|||||||
<view :class="orderInfo.order_status == 5 ? 'on':''">已完成</view>
|
<view :class="orderInfo.order_status == 5 ? 'on':''">已完成</view>
|
||||||
</view>
|
</view>
|
||||||
<view class='progress acea-row row-between-wrapper'>
|
<view class='progress acea-row row-between-wrapper'>
|
||||||
|
|
||||||
<view
|
<view
|
||||||
v-if="orderInfo.order_status == 8||orderInfo.order_status == 9||orderInfo.order_status == 1">
|
v-if="orderInfo.order_status == 8||orderInfo.order_status == 9||orderInfo.order_status == 1">
|
||||||
<view class='iconfont icon-webicon318 t-color'>
|
<view class='iconfont icon-webicon318 t-color'>
|
||||||
@ -82,13 +83,17 @@
|
|||||||
|
|
||||||
</view>
|
</view>
|
||||||
<view class='iconfont'
|
<view class='iconfont'
|
||||||
:class='(orderInfo.status == 1 ? "icon-webicon318":"icon-yuandianxiao") + " " +(orderInfo.status >= 1 && orderInfo.status != 9 ? "t-color":"")'
|
:class='(orderInfo.status == 3 ? "icon-webicon318":"icon-yuandianxiao") + " " +(orderInfo.status > 3 && orderInfo.status != 9 ? "t-color":"")'
|
||||||
v-if="orderInfo.order_type == 0"></view>
|
v-if="orderInfo.order_type == 0"></view>
|
||||||
|
|
||||||
|
|
||||||
<view class='line' :class='orderInfo.status > 1 && orderInfo.status != 9 ? "b-color":""'
|
<view class='line' :class='orderInfo.status > 1 && orderInfo.status != 9 ? "b-color":""'
|
||||||
v-if="orderInfo.order_type == 0"></view>
|
v-if="orderInfo.order_type == 0"></view>
|
||||||
|
|
||||||
<view class='iconfont'
|
<view class='iconfont'
|
||||||
:class='(orderInfo.status == 2 && orderInfo.status != 9&& orderInfo.order_status != 8 ? "icon-webicon318":"icon-yuandianxiao") + " " + (orderInfo.status >= 2 && orderInfo.status != 9 ? "t-color":"")'>
|
:class='(orderInfo.status == 2 && orderInfo.status != 9&& orderInfo.order_status != 8 ? "icon-webicon318":"icon-yuandianxiao") + " " + (orderInfo.status >= 2 && orderInfo.status != 9 ? "t-color":"")'>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class='line' :class='orderInfo.status > 2 && orderInfo.status != 9 ? "b-color":""'>
|
<view class='line' :class='orderInfo.status > 2 && orderInfo.status != 9 ? "b-color":""'>
|
||||||
</view>
|
</view>
|
||||||
<view class='iconfont'
|
<view class='iconfont'
|
||||||
@ -336,7 +341,7 @@
|
|||||||
hover-class='none' :url="'/pages/users/goods_logistics/index?orderId='+ orderInfo.order_id">查看物流
|
hover-class='none' :url="'/pages/users/goods_logistics/index?orderId='+ orderInfo.order_id">查看物流
|
||||||
</navigator>
|
</navigator>
|
||||||
|
|
||||||
<view class="" v-if="orderInfo.activity_type==98">
|
<view class="" v-if="orderInfo.activity_type==98||orderInfo.activity_type==99">
|
||||||
<view class='bnt b-color' @tap='confirmOrdera(orderInfo)' v-if="orderInfo.pay_type==8">确认收货
|
<view class='bnt b-color' @tap='confirmOrdera(orderInfo)' v-if="orderInfo.pay_type==8">确认收货
|
||||||
</view>
|
</view>
|
||||||
<view class='bnt b-color' @tap='confirmOrderb(orderInfo)' v-else>确认收货
|
<view class='bnt b-color' @tap='confirmOrderb(orderInfo)' v-else>确认收货
|
||||||
|
@ -732,7 +732,7 @@
|
|||||||
|
|
||||||
if (status == 5) {
|
if (status == 5) {
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url: '/pages/users/refund/list?type=0'
|
url: '/pages/users/refund/list?type=98'
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
if (status == this.orderStatus) return;
|
if (status == this.orderStatus) return;
|
||||||
|
@ -490,7 +490,7 @@
|
|||||||
arrlist() {
|
arrlist() {
|
||||||
|
|
||||||
refundList({
|
refundList({
|
||||||
product_type: 98,
|
product_type: 99,
|
||||||
type: 0,
|
type: 0,
|
||||||
page: 1,
|
page: 1,
|
||||||
limit: 1500
|
limit: 1500
|
||||||
@ -568,7 +568,7 @@
|
|||||||
getOrderData: function() {
|
getOrderData: function() {
|
||||||
let that = this;
|
let that = this;
|
||||||
orderData({
|
orderData({
|
||||||
product_type: 98
|
product_type: 99
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
// console.log(res.data)
|
// console.log(res.data)
|
||||||
that.$set(that, 'orderData', res.data);
|
that.$set(that, 'orderData', res.data);
|
||||||
@ -729,7 +729,7 @@
|
|||||||
|
|
||||||
if (status == 5) {
|
if (status == 5) {
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url: '/pages/users/refund/list?type=0'
|
url: '/pages/users/refund/list?type=99'
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
if (status == this.orderStatus) return;
|
if (status == this.orderStatus) return;
|
||||||
@ -756,7 +756,7 @@
|
|||||||
groupOrderList({
|
groupOrderList({
|
||||||
page: that.page,
|
page: that.page,
|
||||||
limit: that.limit,
|
limit: that.limit,
|
||||||
product_type: 98
|
product_type: 99
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
that.isReady = true;
|
that.isReady = true;
|
||||||
let list = res.data.list || [];
|
let list = res.data.list || [];
|
||||||
@ -783,7 +783,7 @@
|
|||||||
status: arr,
|
status: arr,
|
||||||
page: that.page,
|
page: that.page,
|
||||||
limit: that.limit,
|
limit: that.limit,
|
||||||
product_type: 98
|
product_type: 99
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
let list = res.data.list || [];
|
let list = res.data.list || [];
|
||||||
let loadend = list.length < that.limit;
|
let loadend = list.length < that.limit;
|
||||||
|
@ -111,7 +111,7 @@
|
|||||||
isScroll: true,
|
isScroll: true,
|
||||||
page: 1,
|
page: 1,
|
||||||
limit: 15,
|
limit: 15,
|
||||||
type: 1
|
type: 0
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onLoad(e) {
|
onLoad(e) {
|
||||||
@ -153,7 +153,7 @@
|
|||||||
},
|
},
|
||||||
getList() {
|
getList() {
|
||||||
if (!this.isScroll) return
|
if (!this.isScroll) return
|
||||||
if (this.type == 1) {
|
if (this.type == 0) {
|
||||||
refundList({
|
refundList({
|
||||||
type: this.tabIndex,
|
type: this.tabIndex,
|
||||||
page: this.page,
|
page: this.page,
|
||||||
@ -167,7 +167,7 @@
|
|||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
refundList({
|
refundList({
|
||||||
product_type: 98,
|
product_type: this.type,
|
||||||
type: this.tabIndex,
|
type: this.tabIndex,
|
||||||
page: this.page,
|
page: this.page,
|
||||||
limit: this.limit
|
limit: this.limit
|
||||||
|
Loading…
x
Reference in New Issue
Block a user