From fa5db483a3e0edbd4cb865ba4d75db915c13217c Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 7 Jul 2022 18:24:52 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 order/curClient/curClient.vue     | 9 +++++----
 order/orderDetail/orderDetail.vue | 4 ++--
 order/orders/orders.vue           | 2 +-
 pages/send/send.vue               | 3 ++-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/order/curClient/curClient.vue b/order/curClient/curClient.vue
index f3a856e..1fa3992 100644
--- a/order/curClient/curClient.vue
+++ b/order/curClient/curClient.vue
@@ -23,7 +23,7 @@
 										<text class="val">{{ item.businessManagerName }}</text>
 									</view>
 									<view class="line">
-										<text class="name">订单名称：</text>
+										<text class="name">客户名称：</text>
 										<text class="val">{{ item.customerName }}</text>
 									</view>
 									<view class="line">
@@ -132,7 +132,7 @@
 			const { options } = pages[pages.length - 1]
 			this.customerId = options.customerId
 			this.customerName = options.name
-			// this.initList()
+			this.initList()
 		},
 		methods: {
 			getList() {
@@ -140,11 +140,12 @@
 					title: '加载中'
 				})
 				const team = uni.getStorageSync('team')
+				const { orderStatus } = this
 				miniProgramOrderRecord({
 					businessManagerId: this.$util.getBmId(),
 					teamId: team.id,
-					customerId: this.customerId,
-					orderStatus: this.orderStatus,
+					customerId: +this.customerId,
+					orderStatus: orderStatus === '' ? null : orderStatus,
 					isAdmin: +team.isTeam, // 是否是管理员(0否 1是)
 					pageNum: this.page,
 					pageSize: this.pageSize,
diff --git a/order/orderDetail/orderDetail.vue b/order/orderDetail/orderDetail.vue
index 1825548..48506e4 100644
--- a/order/orderDetail/orderDetail.vue
+++ b/order/orderDetail/orderDetail.vue
@@ -76,7 +76,7 @@
 							</view>
 							<view class="line">
 								<view class="label">结算价</view>
-								<view class="val">{{ form.orderType === 2 ? 0 : item.settlementPrice }}元</view>
+								<view class="val">{{ item.settlementPrice }}元</view>
 							</view>
 							<view class="line">
 								<view class="label">折扣率</view>
@@ -84,7 +84,7 @@
 							</view>
 							<view class="line">
 								<view class="label">平台服务费</view>
-								<view class="val">{{ form.orderType === 2 ? 0 :item.serviceFee }}元</view>
+								<view class="val">{{ item.serviceFee }}元</view>
 							</view>
 							<view class="line done">
 								<view class="val">成交价格</view>
diff --git a/order/orders/orders.vue b/order/orders/orders.vue
index 778a2c2..17fa698 100644
--- a/order/orders/orders.vue
+++ b/order/orders/orders.vue
@@ -27,7 +27,7 @@
 										<text class="val">{{ item.businessManagerName }}</text>
 									</view>
 									<view class="line">
-										<text class="name">订单名称：</text>
+										<text class="name">客户名称：</text>
 										<text class="val">{{ item.customerName }}</text>
 									</view>
 									<view class="line">
diff --git a/pages/send/send.vue b/pages/send/send.vue
index 23546b5..d240ae0 100644
--- a/pages/send/send.vue
+++ b/pages/send/send.vue
@@ -28,7 +28,7 @@
 				email: '',
 				otherEmail: '',
 				myVal: 1,
-				otherVal: 2,
+				otherVal: '',
 				checkList: [{
 					text: '',
 					value: 1
@@ -66,6 +66,7 @@
 			// 提交
 			submit() {
 				const { otherEmail } = this
+				if (this.myVal && !this.email) return this.$util.errMsg('请选择其他邮箱！')
 				if (this.otherVal && !otherEmail) return this.$util.errMsg('请输入邮箱！')
 				mailFileSend({
 					copyWriting: this.files[this.id],