From 0ec6588fca9801c05bd41b84dcb11aef656013c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Fri, 19 Jul 2024 15:25:51 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 my/order/revenueDetails.vue | 26 +++++++++++---------------
 pages/index/index.vue       |  2 +-
 pages/order/index.vue       | 10 +++++++---
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/my/order/revenueDetails.vue b/my/order/revenueDetails.vue
index 181db05..4a96381 100644
--- a/my/order/revenueDetails.vue
+++ b/my/order/revenueDetails.vue
@@ -44,7 +44,7 @@
 										<view class="mian-money-num">
 											<span class="fuhao">￥</span>
 											<span class="number">
-												{{order.massagePrice}}
+												{{order.priceMarkup}}
 											</span>
 										</view>
 									</view>
@@ -115,9 +115,7 @@
 						</view>
 						<view class="mian-content-list">
 							<span class="mian-content-list-title">车费收益</span>
-							<span class="mian-content-list-text" v-if="order.artificerTaxiMoney">￥{{order.artificerTaxiMoney}}</span>
-							<span class="mian-content-list-text" v-else>-</span>
-							
+							<span class="mian-content-list-text">￥{{order.artificerTaxiMoney}}</span>			
 						</view>
 						<view class="mian-view-list" v-if="order.oldOrdersMassageList[0].userPackageDetail">
 							<view class="mian-view-list-title">{{order.packageType=='104'?'套餐':order.packageType=='105'?'次卡':order.packageType=='106'?'疗程':'其他'}}名称</view>
@@ -269,7 +267,7 @@
 						</view> -->
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">车费收益</span>
-							<span class="mian-view-list-text"> ￥{{order.taxiMoney}}</span>
+							<span class="mian-view-list-text">￥{{order.artificerTaxiMoney}}</span>
 						</view>
 						<view class="mian-view-list" v-if="order.addNum!=null">
 							<span class="mian-view-list-title">加钟收益</span>
@@ -455,7 +453,7 @@
 						</view>
 						<view class="mian-content-list">
 							<span class="mian-content-list-title">车费收益</span>
-							<span class="mian-content-list-text">￥ {{order.artificerTaxiMoney}}</span>
+							<span class="mian-content-list-text">￥{{order.artificerTaxiMoney}}</span>
 						</view>
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">服务项目</span>
@@ -556,7 +554,7 @@
 						</view> -->
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">车费收益</span>
-							<span class="mian-view-list-text"> ￥{{order.artificerTaxiMoney}}</span>
+							<span class="mian-view-list-text">￥{{order.artificerTaxiMoney}}</span>
 						</view>
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">加钟收益</span>
@@ -743,8 +741,7 @@
 						</view>
 						<view class="mian-content-list">
 							<span class="mian-content-list-title">车费收益</span>
-							<span class="mian-content-list-text" v-if="order.artificerTaxiMoney">￥ {{order.artificerTaxiMoney}}</span>
-							<span class="mian-content-list-text" v-else>-</span>
+							<span class="mian-content-list-text">￥{{order.artificerTaxiMoney}}</span>
 						</view>
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">项目金额</span>
@@ -794,8 +791,7 @@
 						</view> -->
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">车费收益</span>
-							<span class="mian-view-list-text" v-if="order.artificerTaxiMoney"> ￥{{order.artificerTaxiMoney}}</span>
-							<span class="mian-view-list-text" v-else>-</span>
+							<span class="mian-view-list-text">￥{{order.artificerTaxiMoney}}</span>
 						</view>
 					</view>
 					<view class="yiji">
@@ -976,7 +972,7 @@
 						</view>
 						<view class="mian-content-list">
 							<span class="mian-content-list-title">车费收益</span>
-							<span class="mian-content-list-text">￥ {{order.artificerTaxiMoney}}</span>
+							<span class="mian-content-list-text">￥{{order.artificerTaxiMoney}}</span>
 						</view>
 						
 						<view class="mian-view-list">
@@ -1036,7 +1032,7 @@
 						</view> -->
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">车费收益</span>
-							<span class="mian-view-list-text"> ￥{{order.artificerTaxiMoney}}</span>
+							<span class="mian-view-list-text">￥{{order.artificerTaxiMoney}}</span>
 						</view>
 					</view>
 					<view class="yiji">
@@ -1226,7 +1222,7 @@
 						</view>
 						<view class="mian-content-list">
 							<span class="mian-content-list-title">车费收益</span>
-							<span class="mian-content-list-text">￥ {{order.artificerTaxiMoney}}</span>
+							<span class="mian-content-list-text">￥{{order.artificerTaxiMoney}}</span>
 						</view>
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">项目金额</span>
@@ -1318,7 +1314,7 @@
 						</view> -->
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">车费收益</span>
-							<span class="mian-view-list-text"> ￥{{order.artificerTaxiMoney}}</span>
+							<span class="mian-view-list-text">￥{{order.artificerTaxiMoney}}</span>
 						</view>
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">加钟收益</span>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7b54fb3..03a2aef 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -494,11 +494,11 @@
 								class="text-xl text-bold">{{ item.artificerMoneyTotal }}</text>
 						</view>
 						<view class="flex text-right">
+							【{{ item.ordersNo }}】
 							<!-- <u-button v-if="item.status == 1" :custom-style="customStyle" shape="circle" :plain="true"
 								@click="cancelOrder(item)">取消订单</u-button> -->
 							<u-button v-if="item.status == 1" :custom-style="customStyle1" shape="circle" :plain="true"
 								@click="bindphone(item.phone)">联系TA</u-button>
-
 							<u-button v-if="item.state == 1" :custom-style="customStyle1" shape="circle" :plain="true"
 								@click="goNav('/my/order/pay?id=' + item.ordersId + '&isTrue=1')">查看详情</u-button>
 							<!-- 							<u-button v-if="item.status == 6" :custom-style="customStyle" shape="circle" :plain="true"
diff --git a/pages/order/index.vue b/pages/order/index.vue
index d48e81b..0db6008 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -103,9 +103,13 @@
 								{{ item.title }}
 							</view>
 						</view>
-						<view class="flex-sub">
-							<!--<text class="text-df">实收:￥</text>--><text class="text-xl text-bold">￥{{ item.artificerMoneyTotal
-								}}</text>
+						<view class="flex">
+							<view style="width: 100px">
+								<text class="text-xl text-bold">￥{{ item.artificerMoneyTotal}}</text>
+							</view>
+							<view class="flex text-right">
+								<text style="margin:4px 60px 0px 0px;font-size: 16px;">【{{ item.ordersNo}}】</text>
+							</view>								
 						</view>
 						<view class="text-cut" style="color: #999;">{{ item.address }}</view>
 					</view>