From 6c9c3a9cd2f92f2c5a5f02e17a7d7787ebe13c76 Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Thu, 27 Jun 2024 23:22:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 my/order/payModifyDd.vue             | 5 +++--
 my/order/payding.vue                 | 9 ++++++---
 my/order/paydingDd.vue               | 7 +++----
 pages/index/index.vue                | 2 +-
 pages/order/index.vue                | 2 +-
 pages/therapist/therapist.vue        | 2 +-
 pages/therapist/therapistDingdan.vue | 4 ++--
 7 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/my/order/payModifyDd.vue b/my/order/payModifyDd.vue
index 04511db..5e529af 100644
--- a/my/order/payModifyDd.vue
+++ b/my/order/payModifyDd.vue
@@ -65,14 +65,14 @@
 									<image src="../../static/shezhi-jiantou.png" mode=""></image>
 							</view>
 						</view>
-						<view class="flex justify-between margin-top-lg" v-if="order.remark">
+						<!-- <view class="flex justify-between margin-top-lg" v-if="order.remark">
 							<view style="width: 170rpx;">备注内容</view>
 							<view class="flex">
 								<view class="">
 									{{order.remark}}
 								</view>
 							</view>
-						</view>
+						</view> -->
 					</view>
 				</view>
 				<view class="padding margin-top-sm header-view">
@@ -325,6 +325,7 @@
 				this.youhuiF(this.couponId)
 			}
 			this.orderXm=this.$queue.getData('xiangmu');//上一个页面带过来的全部数据
+			this.textareaData=this.orderXm.remark
 			this.number=this.orderXm.massageNum
 			console.log('this.orderXm',this.orderXm.technicianType)
 			this.youhui()
diff --git a/my/order/payding.vue b/my/order/payding.vue
index 12f54a0..59cae00 100644
--- a/my/order/payding.vue
+++ b/my/order/payding.vue
@@ -32,18 +32,21 @@
 								</view>
 							</view>
 							<view class="flex align-center">
-								<view>
+								<view style="width: 100%;">
 									<view class="flex justify-between margin-tb-sm" style="color: #999999;">
 										<view style="justify-content: space-between;">
 											{{order.ordersMassageList[0].massageType.duration}}分钟
 										</view>
 									</view>
 										
-									<view class="money-pay">
+									<view class="money-pay" style="justify-content: space-between;">
 										<view class="money-pay-zhen">
 											<span>￥</span>
 											<span>{{order.massagePrice}} </span>
-											<span style="color: #666;font-size: 12px;margin-left: 3px;"> x{{order.massageNum}}</span>
+											<!-- <span style="color: #666;font-size: 12px;margin-left: 3px;"> x{{order.massageNum}}</span> -->
+										</view>
+										<view>
+											<uni-number-box :disabled="true" :value="order.massageNum" :width='27' :min="1" @change="changeValue" />
 										</view>
 										<!-- <view class="money-pay-jia">￥298</view> -->
 									</view>
diff --git a/my/order/paydingDd.vue b/my/order/paydingDd.vue
index b691bcf..bcf3c31 100644
--- a/my/order/paydingDd.vue
+++ b/my/order/paydingDd.vue
@@ -32,14 +32,14 @@
 								</view>
 							</view>
 							<view class="flex align-center">
-								<view>
+								<view style="width: 100%;">
 									<view class="flex justify-between margin-tb-sm" style="color: #999999;">
 										<view style="justify-content: space-between;">
 											{{order.ordersMassageList[0].massageType.duration}}分钟
 										</view>
 									</view>
 										
-									<view class="money-pay">
+									<view class="money-pay" style="justify-content: space-between;">
 										<view class="money-pay-zhen">
 											<span>￥</span>
 											<span>{{order.massagePrice}}</span>
@@ -98,8 +98,7 @@
 								<view class="margin-right">
 									<image src="../../static/images/start.png" style="width: 24rpx;height: 22rpx;">
 									</image>
-									<text
-										style="color: #F93731;margin-left: 5rpx;">{{order.artificer.ordersCount}}</text>
+									<text style="color: #F93731;margin-left: 5rpx;">{{order.artificer.ordersCount}}</text>
 								</view>
 								<text class="margin-bottom-xs box" style="margin-right: 10upx;">健康理疗师</text>
 							</view>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 4185a7f..7dfe40b 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -3,7 +3,7 @@
 		<view class="index-head">
 			<view class="index-top">
 				<view class="index-top-left font-size-34">盛安到家</view>
-        <view class="index-top-left font-size-34" style="display: none;">-{{latitude}}-{{longitude}}-</view>
+        <!-- <view class="index-top-left font-size-34">11111-{{latitude}}-11111111111-{{longitude}}-</view> -->
 				<view class="index-top-mian">
 					
 					<view class="index-top-mian-text">
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 6800c56..17bd1a5 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -22,7 +22,7 @@
 				<view class="text-green" v-if="item.status ==1"><span>{{item.ordersNo}}</span><span>待付款</span></view>
 				<view class="text-green" v-if="item.status ==2"><span>{{item.ordersNo}}</span><span>待服务</span></view>
 				<view class="text-green" v-if="item.status ==3"><span>{{item.ordersNo}}</span><span>待评价</span></view>
-				<view class="text-green" v-if="item.status ==4" style="color: #333333;"><span>{{item.ordersNo}}</span><span>已取消</span></view>
+				<view class="text-green" v-if="item.status ==4"><span>{{item.ordersNo}}</span><span>已取消</span></view>
 				<view class="text-green" v-if="item.status ==5"><span>{{item.ordersNo}}</span><span>已完成</span></view>
 				<view class="text-green" v-if="item.status ==6"><span>{{item.ordersNo}}</span><span>服务中</span></view>
 				<view class="text-green" v-if="item.status ==7"><span>{{item.ordersNo}}</span><span>技师出发</span></view>
diff --git a/pages/therapist/therapist.vue b/pages/therapist/therapist.vue
index f8bc292..b34420f 100644
--- a/pages/therapist/therapist.vue
+++ b/pages/therapist/therapist.vue
@@ -18,7 +18,7 @@
 		<view class="liebiao" v-show="current === 0">
 			<view v-if="orderList.length" class="flex text-center flex-wrap list-view">
 				<view class="margin-bottom-sm radius touxiang-left">
-					<view class="flex align-center touxiang-left-view" v-for="(item, index) in orderList" :key='index'
+					<view class="flex align-center touxiang-left-view" v-if="item.status=='1'" v-for="(item, index) in orderList" :key='index'
 					@click="goOrder(item)">
 						<view class="touxiang-left-content">
 							<image class="touxiang-left-content-img" :src="item.artificerImg ? item.artificerImg : '../../static/logo.png'"
diff --git a/pages/therapist/therapistDingdan.vue b/pages/therapist/therapistDingdan.vue
index 1072934..fe713df 100644
--- a/pages/therapist/therapistDingdan.vue
+++ b/pages/therapist/therapistDingdan.vue
@@ -18,8 +18,8 @@
 		<view class="liebiao" v-show="current === 0">
 			<view v-if="orderList.length" class="flex text-center flex-wrap list-view">
 				<view class="margin-bottom-sm radius touxiang-left">
-					<view class="flex align-center touxiang-left-view" v-for="(item, index) in orderList" :key='index'
-					@click="goOrder(item)">
+					<view class="flex align-center touxiang-left-view" v-if="item.status=='1'" v-for="(item, index) in orderList" :key='index'
+						@click="goOrder(item)">
 						<view class="touxiang-left-content">
 							<image class="touxiang-left-content-img" :src="item.artificerImg ? item.artificerImg : '../../static/logo.png'"
 								@click.stop="saveImgs(item.artificerImg)" mode="aspectFill"></image>