From de74d28e12a1077878d42895e589697781962ddf Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Thu, 6 Oct 2022 17:50:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=94=AE=E5=90=8E=E9=87=91=E9=A2=9D=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E4=BF=AE=E6=94=B9=E6=88=90=E4=B8=BB=E5=8D=95=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=EF=BC=9B=E4=B8=BB=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=80=BB=E5=8A=A0=E4=BB=B7=E5=8F=8A=E5=8A=A0?=
 =?UTF-8?q?=E4=BB=B7=E5=90=8E=E7=9A=84=E6=80=BB=E9=87=91=E9=A2=9D=EF=BC=8C?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=BF=9B=E5=85=A5=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=B1=95=E7=A4=BA=E5=90=84=E4=B8=AA=E5=AD=90=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84=E5=8A=A0=E4=BB=B7=E8=AE=B0=E5=BD=95=EF=BC=9B=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81=E5=90=88=E5=B9=B6=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/request.js                          |  4 +-
 pages/index/my-home.vue                       | 59 ++++++++++++-------
 .../components/modal/apply-after-service.vue  |  4 +-
 pages/my/my-order.vue                         | 39 +++++-------
 pages/my/serv-detail.vue                      | 31 ++++++++--
 5 files changed, 81 insertions(+), 56 deletions(-)

diff --git a/common/js/request.js b/common/js/request.js
index 561726c..cf8c0e3 100644
--- a/common/js/request.js
+++ b/common/js/request.js
@@ -11,9 +11,9 @@ export default {
 					title: '加载中'
 				})
 				// request 触发前拼接 url 
-				args.url = 'https://www.opsoul.com' + args.url;
+				// args.url = 'https://www.opsoul.com' + args.url;
 				// args.url = 'http://192.168.2.20:80' + args.url;
-				// args.url = 'http://127.0.0.1:80' + args.url;
+				args.url = 'http://127.0.0.1:80' + args.url;
 				if (args.data && Object.prototype && Object.prototype.toString.call(args.data) === '[object Object]') {
 					args.data.deptId = globalData.deptId;
 					args.data.from = globalData.from;
diff --git a/pages/index/my-home.vue b/pages/index/my-home.vue
index 6e19f30..a688f29 100644
--- a/pages/index/my-home.vue
+++ b/pages/index/my-home.vue
@@ -82,7 +82,7 @@
 						</view>
 						<text>待付款</text>
 					</view>
-					<view class="cu-item" @click="showMyOrders(servOrderTabList, 1, servOrderType)">
+					<!-- <view class="cu-item" @click="showMyOrders(servOrderTabList, 1, servOrderType)">
 						<view class="cuIcon-list">
 							<view class="cu-tag badge" v-if="myInfo.serOrderNum.wait2Serv > 0">
 								<block>{{myInfo.serOrderNum.wait2Serv}}</block>
@@ -105,24 +105,32 @@
 							</view>
 						</view>
 						<text>待上门</text>
+					</view> -->
+					<view class="cu-item" @click="showMyOrders(servOrderTabList, 1, servOrderType)">
+						<view class="cuIcon-repair">
+							<view class="cu-tag badge" v-if="myInfo.serOrderNum.processing > 0">
+								<block>{{myInfo.serOrderNum.processing}}</block>
+							</view>
+						</view>
+						<text>待服务</text>
 					</view>
-					<view class="cu-item" @click="showMyOrders(servOrderTabList, 4, servOrderType)">
+					<view class="cu-item" @click="showMyOrders(servOrderTabList, 2, servOrderType)">
 						<view class="cuIcon-comment">
 							<view class="cu-tag badge" v-if="myInfo.serOrderNum.afterServ > 0">
 								<block>{{myInfo.serOrderNum.afterServ}}</block>
 							</view>
 						</view>
-						<text>服务中</text>
+						<text>进行中</text>
 					</view>
-					<view class="cu-item" @click="showMyOrders(servOrderTabList, 5, servOrderType)">
+					<!-- <view class="cu-item" @click="showMyOrders(servOrderTabList, 3, servOrderType)">
 						<view class="cuIcon-notice">
 							<view class="cu-tag badge" v-if="myInfo.serOrderNum.afterServ > 0">
 								<block>{{myInfo.serOrderNum.afterServ}}</block>
 							</view>
 						</view>
-						<text>待确认</text>
-					</view>
-					<view class="cu-item" @click="showMyOrders(servOrderTabList, 6, servOrderType)">
+						<text>确认中</text>
+					</view> -->
+					<view class="cu-item" @click="showMyOrders(servOrderTabList, 3, servOrderType)">
 						<view class="cuIcon-service">
 							<view class="cu-tag badge" v-if="myInfo.serOrderNum.afterServ > 0">
 								<block>{{myInfo.serOrderNum.afterServ}}</block>
@@ -130,7 +138,7 @@
 						</view>
 						<text>售后中</text>
 					</view>
-					<view class="cu-item" @click="showMyOrders(servOrderTabList, 7, servOrderType)">
+					<view class="cu-item" @click="showMyOrders(servOrderTabList, 4, servOrderType)">
 						<view class="cuIcon-forward">
 							<view class="cu-tag badge" v-if="myInfo.serOrderNum.wait2Forward > 0">
 								<block>{{myInfo.serOrderNum.wait2Forward}}</block>
@@ -300,22 +308,29 @@
 				servOrderTabList: [{
 					// type: -1,
 					name: '待付款'
+				}, 
+				// {
+				// 	type: 0,
+				// 	name: '待接单'
+				// }, {
+				// 	type: 1,
+				// 	name: '待排期'
+				// }, {
+				// 	type: 2,
+				// 	name: '待上门'
+				// }, 
+				{
+					type: '0,1,2',
+					name: '待服务'
 				}, {
-					type: 0,
-					name: '待接单'
-				}, {
-					type: 1,
-					name: '待排期'
-				}, {
-					type: 2,
-					name: '待上门'
-				}, {
-					type: 3,
+					type: '3,4',
 					name: '服务中'
-				}, {
-					type: 4,
-					name: '待确认'
-				}, {
+				}, 
+				// {
+				// 	type: 4,
+				// 	name: '待确认'
+				// }, 
+				{
 					// type: 4,
 					name: '售后中'
 				}, {
diff --git a/pages/my/components/modal/apply-after-service.vue b/pages/my/components/modal/apply-after-service.vue
index 5ee2b4e..9550e82 100644
--- a/pages/my/components/modal/apply-after-service.vue
+++ b/pages/my/components/modal/apply-after-service.vue
@@ -207,13 +207,13 @@
 						});
 					}
 					if (updateStatusRes && updateStatusRes.code === 0) {
+						this.hideModal();
+						this.$emit('confirmFeedback');
 						uni.showToast({
 							title: '已发起售后，进度可在订单详情内查看',
 							icon: 'none',
 							duration: 2000
 						})
-						this.hideModal();
-						this.$emit('confirmFeedback');
 						return;
 					}
 				}
diff --git a/pages/my/my-order.vue b/pages/my/my-order.vue
index d7f085c..2931470 100644
--- a/pages/my/my-order.vue
+++ b/pages/my/my-order.vue
@@ -37,32 +37,18 @@
 						<view class="margin-right-sm"><text>总价</text><text class="text-price text-red">{{shopOrder.totalMoney}}</text>
 						</view>
 						<view class="margin-right-sm"><text>优惠</text><text class="text-price text-red">{{shopOrder.discountMoney}}</text>
+						</view>
+						<view class="margin-right-sm" v-if="shopOrder.changeMoney"><text>加价</text><text class="text-price text-red">{{shopOrder.changeMoney}}</text>
 						</view>
 						<view class="text-lg"><text>需付款</text><text
 								class="text-price text-red text-lg text-bold">{{shopOrder.payMoney}}</text></view>
 					</view>
 					<view v-if="orderType === 0" class="padding-tb-sm">
-						<view class="flex justify-end" v-if="tabCur === 0">
-							<button class="cu-btn bg-gray margin-right-sm shadow-blur" @click="showModalByRef('confirmModal', shopOrder)" v-if="shopOrder.orderStatus < 2">取消订单</button>
-							<button v-if="shopOrder.payStatus === 0" class="cu-btn bg-main-color shadow-blur" @click="wxpay(shopOrder)">付款</button>
-						</view>
-						<view class="flex justify-end" v-if="tabCur === 1">
-							<button class="cu-btn bg-gray margin-right-sm shadow-blur" @click="showModalByRef('confirmModal', shopOrder)">取消订单</button>
-							<!-- <button class="cu-btn bg-gray margin-right-sm shadow-blur">撤换师傅</button> -->
-							<!-- <button class="cu-btn bg-main-color margin-right-sm shadow-blur">催单</button> -->
-						</view>
-						<view class="flex justify-end" v-if="tabCur === 2">
-							<button class="cu-btn bg-gray margin-right-sm shadow-blur" @click="showModalByRef('confirmModal', shopOrder)">取消订单</button>
-							<!-- <button class="cu-btn bg-gray margin-right-sm shadow-blur">撤换师傅</button> -->
-							<button class="cu-btn bg-main-color margin-right-sm shadow-blur" @click="showServDetail(shopOrder)">查看</button>
-						</view>
-						<view class="flex justify-end" v-if="tabCur === 3">
-							<!-- <button class="cu-btn bg-gray margin-right-sm shadow-blur">申请售后</button> -->
-							<!-- <button class="cu-btn bg-main-color margin-right-sm shadow-blur">加价</button> -->
-						</view>
-						<!-- <view class="flex justify-end" v-if="tabCur === 4">
-							<button class="cu-btn bg-main-color margin-right-sm shadow-blur">评价</button>
-						</view> -->
+						<view class="flex justify-end">
+							<button v-if="[0,1,2].indexOf(shopOrder.orderStatus) > 0" class="cu-btn bg-gray margin-right-sm shadow-blur" @click="showModalByRef('confirmModal', shopOrder)">取消订单</button>
+							<button v-if="shopOrder.payStatus === 0" class="cu-btn bg-main-color shadow-blur margin-right-sm" @click="wxpay(shopOrder)">付款</button>
+							<button class="cu-btn bg-main-color shadow-blur" @click="showServDetail(shopOrder)">查看</button>
+						</view>
 					</view>
 					<view v-if="orderType === 0 && shopOrder.orderStatus === 4"
 						class="padding-tb-sm solid-top">
@@ -78,7 +64,7 @@
 						</view>
 					</view>
 					<view
-						v-if="orderType === 0 && (tabCur === 1 || tabCur === 2)"
+						v-if="orderType === 0"
 						class="padding-tb-sm solid-top">
 						<view>约定服务时间：</view>
 						<view class="flex justify-between align-end">
@@ -180,13 +166,18 @@
 				try {
 					params.customerId = this.curUserInfo.customerId;
 					params.orderType = this.orderType;
-					params.orderStatus = this.tabHeaderList[this.tabCur].type;
+					let orderStatus = this.tabHeaderList[this.tabCur].type;
+					if (typeof orderStatus == 'string' && orderStatus.indexOf(",") > 0) {
+						params.orderStatuses = orderStatus;
+					} else {
+						params.orderStatus = orderStatus;
+					}
 					if (this.tabCur === 0) {
 						params.payStatus = 0;
 						params.exceptOrderStatus = 6;
 					}
 					let res = null;
-					if (this.tabCur === 6) {
+					if (this.tabCur === 3) {
 						res = await this.$request.getAfterList({
 							customerId: params.customerId
 						});
diff --git a/pages/my/serv-detail.vue b/pages/my/serv-detail.vue
index 3d367ae..148cd18 100644
--- a/pages/my/serv-detail.vue
+++ b/pages/my/serv-detail.vue
@@ -106,6 +106,23 @@
 				<view class="margin-top-sm" v-if="servDetail.orderStatus >= 4">完成时间：{{item.workFinishTime}}</view>
 				<simple-product-picked :pickedList="item.orderStandardList" :columnTitleArr="servedColumnHeaders"
 					:valFieldArr="servedValFields"></simple-product-picked>
+			</view>
+			<view v-if="item.financialChangeRecord" class="bg-white">
+				<view class="cu-bar solid-bottom">
+					<view class="action bar-first-action">
+						<text class="cuIcon-title text-main-color"></text> 加价记录
+					</view>
+				</view>
+				<view class="padding-tb-sm">
+					<view>
+						<text>加价金额：</text>
+						<text>{{item.financialChangeRecord.changeMoney}}</text>
+					</view>
+					<view>
+						<text>加价备注：</text>
+						<text>{{item.financialChangeRecord.remark}}</text>
+					</view>
+				</view>
 			</view>
 			<view v-if="servDetail.orderStatus > 3 && item.finishImgList && item.finishImgList.length" class="bg-white">
 				<view class="cu-bar solid-bottom">
@@ -131,10 +148,8 @@
 					</view>
 				</view>
 				<view v-for="(afterServiceRecord, afterServiceRecordIndex) in item.afterServiceRecordList">
-					<view v-if="afterServiceRecord.createBy == 1" class="padding-tb solid-top">
-						<view class='cu-tag bg-main-color radius light'>客户发起</view>
-						<button class="cu-btn sm bg-yellow margin-left" v-show="afterServiceRecord.customerFinalCheck !== 1"
-							@click="cancelAfterService(afterServiceRecord.id)">撤销</button>
+					<view v-if="afterServiceRecord.createBy == 1" class="padding-tb-sm solid-top">
+						<view class='cu-tag bg-main-color radius light'>客户发起</view>
 						<view v-if="afterServiceRecord.operType === 1">
 							<view class="text-gray text-sm margin-bottom-xs">退单退款已提交至商家，其最大时限24小时内需完成操作！</view>
 							<view class="flex justify-start align-end">
@@ -187,9 +202,13 @@
 										:data-url="imgObj.imgUrl" mode="aspectFill"></image>
 								</view>
 							</view>
+						</view>
+						<view class="flex justify-end align-end margin-tb-sm">
+							<button class="cu-btn sm bg-yellow margin-left" v-show="afterServiceRecord.customerFinalCheck !== 1"
+								@click="cancelAfterService(afterServiceRecord.id)">撤销</button>
 						</view>
 					</view>
-					<view v-if="afterServiceRecord.updateBy == 2" class="padding-tb solid-top">
+					<view v-if="afterServiceRecord.updateBy == 2" class="padding-tb-sm solid-top">
 						<view class='cu-tag bg-main-color radius light'>师傅反馈</view>
 						<view v-if="afterServiceRecord.operType === 1">
 							<view class="margin-top-xs">
@@ -244,7 +263,7 @@
 								@click="afterServiceFinalCheck(afterServiceRecord.id, 0)">不同意</button>
 						</view>
 					</view>
-					<view v-if="afterServiceRecord.customerFinalCheck != null" class="padding-tb solid-top">
+					<view v-if="afterServiceRecord.customerFinalCheck != null" class="padding-tb-sm solid-top">
 						<view class='cu-tag bg-main-color radius light'>客户最终确认</view>
 						<view class="margin-top-xs">{{afterServiceRecord.customerFinalCheck === 1 ? '同意' : '不同意'}}
 						</view>