From 7a87342e3cc88dbadc151136fc10a3eb617a2751 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Mon, 11 Sep 2023 15:00:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=A7=94=E6=89=98=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../receivedCommission/index.vue               | 18 +++++++++++-------
 pages/order_details/index.vue                  |  9 +++++++--
 pages/users/order_list/indexCopy.vue           |  2 +-
 pages/users/order_list/relase.vue              | 10 +++++-----
 pages/users/refund/list.vue                    |  6 +++---
 5 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/pages/commissionedSales/receivedCommission/index.vue b/pages/commissionedSales/receivedCommission/index.vue
index 0e6775a..b2c1646 100644
--- a/pages/commissionedSales/receivedCommission/index.vue
+++ b/pages/commissionedSales/receivedCommission/index.vue
@@ -19,6 +19,10 @@
 					<view class="one-txt-b">
 						委托周期:{{item.entrust_day}}
 					</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>
 
@@ -70,10 +74,10 @@
 					已拒绝
 				</view>
 				<view class="contentgn">
-					<view class="contentgn_a" click="deleteOrder(item)">
+				<!-- 	<view class="contentgn_a" click="deleteOrder(item)">
 						删除
 					</view>
-					<span></span>
+					<span></span> -->
 					<view class="contentgn_b" @click="detail(item)">
 						详情
 					</view>
@@ -105,15 +109,15 @@
 						<image src="@/static/images/wt_close.png" mode=""></image>
 					</view>
 					<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>
-							<view class="bg-content-b">
-								结算周期: <span>{{obj.settle_cycle}}天</span>
+							<view class="bg-content-b" >
+								结算周期: <span>{{obj.mer_info.settle_cycle}}天</span>
 							</view>
-							<view class="bg-content-c">
-								利息比例: <span>{{obj.interest_rate}}%</span>
+							<view class="bg-content-c" >
+								利息比例: <span>{{obj.mer_info.interest_rate}}%</span>
 							</view>
 							<view class="entrust_bga_btn">
 								<view class="cancellation" @click="passDelete(obj)">
diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue
index bafa280..fd8c56e 100644
--- a/pages/order_details/index.vue
+++ b/pages/order_details/index.vue
@@ -61,6 +61,7 @@
 							<view :class="orderInfo.order_status == 5 ? 'on':''">已完成</view>
 						</view>
 						<view class='progress acea-row row-between-wrapper'>
+						
 							<view
 								v-if="orderInfo.order_status == 8||orderInfo.order_status == 9||orderInfo.order_status == 1">
 								<view class='iconfont icon-webicon318 t-color'>
@@ -82,13 +83,17 @@
 
 							</view>
 							<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>
+								
+								
 							<view class='line' :class='orderInfo.status > 1 && orderInfo.status != 9 ? "b-color":""'
 								v-if="orderInfo.order_type == 0"></view>
+								
 							<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":"")'>
 							</view>
+							
 							<view class='line' :class='orderInfo.status > 2 && orderInfo.status != 9 ? "b-color":""'>
 							</view>
 							<view class='iconfont'
@@ -336,7 +341,7 @@
 						hover-class='none' :url="'/pages/users/goods_logistics/index?orderId='+ orderInfo.order_id">查看物流
 					</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>
 						<view class='bnt b-color' @tap='confirmOrderb(orderInfo)' v-else>确认收货
diff --git a/pages/users/order_list/indexCopy.vue b/pages/users/order_list/indexCopy.vue
index e838c9c..63577c1 100644
--- a/pages/users/order_list/indexCopy.vue
+++ b/pages/users/order_list/indexCopy.vue
@@ -732,7 +732,7 @@
 
 					if (status == 5) {
 						uni.navigateTo({
-							url: '/pages/users/refund/list?type=0'
+							url: '/pages/users/refund/list?type=98'
 						})
 					} else {
 						if (status == this.orderStatus) return;
diff --git a/pages/users/order_list/relase.vue b/pages/users/order_list/relase.vue
index 4014b4e..1dcd9a1 100644
--- a/pages/users/order_list/relase.vue
+++ b/pages/users/order_list/relase.vue
@@ -490,7 +490,7 @@
 				arrlist() {
 
 					refundList({
-						product_type: 98,
+						product_type: 99,
 						type: 0,
 						page: 1,
 						limit: 1500
@@ -568,7 +568,7 @@
 				getOrderData: function() {
 					let that = this;
 					orderData({
-						product_type: 98
+						product_type: 99
 					}).then(res => {
 						// console.log(res.data)
 						that.$set(that, 'orderData', res.data);
@@ -729,7 +729,7 @@
 
 					if (status == 5) {
 						uni.navigateTo({
-							url: '/pages/users/refund/list?type=0'
+							url: '/pages/users/refund/list?type=99'
 						})
 					} else {
 						if (status == this.orderStatus) return;
@@ -756,7 +756,7 @@
 							groupOrderList({
 								page: that.page,
 								limit: that.limit,
-								product_type: 98
+								product_type: 99
 							}).then(res => {
 								that.isReady = true;
 								let list = res.data.list || [];
@@ -783,7 +783,7 @@
 								status: arr,
 								page: that.page,
 								limit: that.limit,
-								product_type: 98
+								product_type: 99
 							}).then(res => {
 								let list = res.data.list || [];
 								let loadend = list.length < that.limit;
diff --git a/pages/users/refund/list.vue b/pages/users/refund/list.vue
index 5184774..145fc39 100644
--- a/pages/users/refund/list.vue
+++ b/pages/users/refund/list.vue
@@ -111,7 +111,7 @@
 				isScroll: true,
 				page: 1,
 				limit: 15,
-				type: 1
+				type: 0
 			}
 		},
 		onLoad(e) {
@@ -153,7 +153,7 @@
 			},
 			getList() {
 				if (!this.isScroll) return
-				if (this.type == 1) {
+				if (this.type == 0) {
 					refundList({
 						type: this.tabIndex,
 						page: this.page,
@@ -167,7 +167,7 @@
 					})
 				} else {
 					refundList({
-						product_type: 98,
+						product_type: this.type,
 						type: this.tabIndex,
 						page: this.page,
 						limit: this.limit