From 9323f53ddf3607f7ea56db4355f9b17e8155fb44 Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Sat, 7 Dec 2024 17:21:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=8A=B6=E6=80=81=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/production.js                          |  4 ++--
 .../Order_details/Order_details.vue           |  7 ++++---
 pages/order/list.vue                          | 21 +++++++++++--------
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/config/production.js b/config/production.js
index 855f49b..713db3b 100644
--- a/config/production.js
+++ b/config/production.js
@@ -5,12 +5,12 @@
 // api请求地址
 // export const baseUrl = 'https://cbtadmin.jtyqt.com'
 // export const baseUrl = 'https://yaochangtest.first.xinzhidi.cn'//测试地址1
-export const baseUrl = 'http://devzhiyao.zeyan.wang'//测试地址1
+export const baseUrl = 'http://devzhiyao.zeyan.wang'//测试地址2
 
 // 图片域名
 // export const imgDomain='https://cbtadmin.jtyqt.com'
 // export const imgDomain = 'https://yaochangtest.first.xinzhidi.cn'//测试地址1
-export const imgDomain = 'http://devzhiyao.zeyan.wang'//测试地址1
+export const imgDomain = 'http://devzhiyao.zeyan.wang'//测试地址2
 
 // 极光推送
 export const PUSHCONFIG = {
diff --git a/page_salesman_order/Order_details/Order_details.vue b/page_salesman_order/Order_details/Order_details.vue
index 0792bc3..e8884ec 100644
--- a/page_salesman_order/Order_details/Order_details.vue
+++ b/page_salesman_order/Order_details/Order_details.vue
@@ -130,9 +130,9 @@
 								待支付</div>
 							<div v-else-if="data.pay.pay_status == 1 ">支付中</div>
 							<div v-else-if="data.pay.pay_status == 0 && data.pay.received_money == 0">未支付</div>
-							<div v-else-if="data.pay.pay_status == 0 && data.pay.received_money > 0">部分支付</div>
+							<div v-else-if="data.pay.pay_status == 0 && data.pay.pay_money > 0 && data.pay.received_money > 0">部分支付</div>
 							<div v-else-if="data.pay.pay_status==2">已支付</div>
-							<div v-else-if="data.order_status > 0 && data.sales_status == 0">已支付</div>
+<!--							<div v-else-if="data.order_status > 0 && data.sales_status == 0">已支付</div>-->
 							<div v-else>暂无收款记录</div>
 							<!-- <div v-if="data.sales_balance==1 && data.wait_status==2">已收款</div>
 							<div v-if="data.sales_balance==0 && data.wait_status==1">待付款</div>
@@ -252,7 +252,8 @@
 					<div class="df aic jcsa listtwo" v-if="data.order_status_name=='待支付'" @click="payment">去支付</div>
 					<div class="df aic jcsa listtwo" v-if="data.order_status==1" @click="show3=true">确认发货</div>
 					<div class="df aic jcsa listtwo" v-if="data.sales_status == 0" @click="show9=true">去审核</div>
-					<div class="df aic jcsa listtwo" v-if="data.sales_status != 0" @click="cancelAudit(data.order_id)">取消审核</div>
+<!--订单状态order_status在[0待支付,1待发货,20待审核] && sales_status=0时才展示取消审核-->
+					<div class="df aic jcsa listtwo" v-if="data.sales_status != 0 && [0,1,20].includes(data.order_status)" @click="cancelAudit(data.order_id)">取消审核</div>
 				</view>
 				<u-overlay :show="show9">
 					<view class="head-one">
diff --git a/pages/order/list.vue b/pages/order/list.vue
index 782f42e..d38c378 100644
--- a/pages/order/list.vue
+++ b/pages/order/list.vue
@@ -33,9 +33,12 @@
               <text class="status-name color-base-text" v-if="orderStatusName">
                 {{ orderStatusName }}
               </text>
-							<text class="status-name color-base-text" v-else>
-								{{ orderItem.order_status_name }}
+							<text class="status-name color-base-text" v-else-if="orderItem.order_status_name == `待审核` && orderItem.pay.pay_status == 0">
+								待支付
 							</text>
+              <text class="status-name color-base-text" v-else>
+                {{ orderItem.order_status_name }}
+              </text>
 						</view>
 						<view class="order-body" @click="orderDetail(orderItem)">
 							<view class="goods-wrap" v-for="(goodsItem, goodsIndex) in orderItem.order_goods"
@@ -365,13 +368,13 @@
 				if (this.orderStatus == '') this.mergePayOrder = [];
 				this.orderStatus = this.statusList[index].status;
 
-        let _findRes = this.findStatusItem(this.statusList, this.orderStatus);
-        //如果tab的索引=all(全部),那么就展示订单原有的状态名称,否则展示当前tab的名称
-        if (this.orderStatus == 'all'){
-          this.orderStatusName = ''//当前订单卡片的状态名称
-        }else{
-          this.orderStatusName = _findRes.name//当前订单卡片的状态名称
-        }
+        // let _findRes = this.findStatusItem(this.statusList, this.orderStatus);
+        // 如果tab的索引=all(全部),那么就展示订单原有的状态名称,否则展示当前tab的名称
+        // if (this.orderStatus == 'all'){
+        //   this.orderStatusName = ''//当前订单卡片的状态名称
+        // }else{
+        //   this.orderStatusName = _findRes.name//当前订单卡片的状态名称
+        // }
 
         this.$refs.loadingCover.show();
 				this.$refs.mescroll.refresh();