From 035e611db7465a9f7f6942f1a5a9402626076acc Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Fri, 12 Jul 2024 15:19:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 my/commission/index.vue           | 196 ++++++++++++++++++++++++------
 my/orderRevenueDetails/index.vue  |   2 +-
 pages/index/addClock.vue          |   4 +-
 pages/index/currentIncome.vue     |   2 +-
 pages/index/currentPoints.vue     |   4 +-
 pages/index/currentYeji.vue       |   2 +-
 pages/index/previousAdditions.vue |   4 +-
 pages/index/previousEarnings.vue  |   2 +-
 pages/index/previousPoints.vue    |   4 +-
 pages/my/shangjiaInp.vue          |   9 +-
 10 files changed, 179 insertions(+), 50 deletions(-)

diff --git a/my/commission/index.vue b/my/commission/index.vue
index 27bd13e..387f714 100644
--- a/my/commission/index.vue
+++ b/my/commission/index.vue
@@ -21,14 +21,7 @@
 						</view>
 					</view>
 					<view class="middleTop">
-						<!-- <view class="IntegralImport">
-							<view class="totalIntegralNumber">
-								{{this.homePageDataNum.totalRevenue ? this.homePageDataNum.totalRevenue : 0 }}
-							</view>
-							<view class="totalIntegral">
-								本期收益(元)
-							</view>
-						</view> -->
+						
 						<view class="IntegralImport">
 							<view class="IntegralClassify">
 								<view class="" style="margin-top: -12px;font-weight: 700; color: #fb672b;">
@@ -84,26 +77,47 @@
 					<!-- 父元素列表 -->
 					<cc-nodata title="暂无数据" v-if="noDataScrollStatus"
 						:style="{width:100+'%',height:domNeedHeight == 0? 420 + 'px' : domNeedHeight + 'px'}"></cc-nodata>
-					<view v-if="!noDataScrollStatus" v-for="(item,index) in commissionDetail" :key="index"
-						class="optionsDetailImport">
-						<view class="storedIntegralTop">
-							<view class="storedIntegralTopOfRight">
-								<view class="">订单收益</view>
-								<view class="">{{item.artificerMoneyTotal}}元</view>
+					
+					<view v-if="!noDataScrollStatus" class="mian-view" v-for="(item,index) in commissionDetail" :key="index" @click="goOder(item)">
+						<view class="mian-head">
+							<view class="mian-head-biao">{{item.status=='3'?'待评价':'已完成'}}</view>
+							<view class="mian-head-time">
+								<span class="shouyi-text">预约时间: </span>
+								<span>{{item.serveTime}}</span>
 							</view>
 						</view>
-
-						<view class="storedIntegralMiddle">
-							<view class="">服务时间:{{item.serveTime}}</view>
-							<view class="storedIntegralMiddleofRight">下单时间:{{item.payTime}}</view>
-						</view>
-
-						<view class="viewOrdersInfo">
-							<view class="storedIntegralBottom">订单号: {{item.ordersNo}}</view>
-							<view class="storedIntegralBottom" @tap="jumpOrdersDetail(item.ordersId)">查看明细
+						<view class="mian-foot">
+							<view class="mian-foot-img">
+								<image :src="item.massageImg?item.massageImg: '../../../static/logo.png'" mode=""></image>
+							</view>
+							<view class="mian-foot-list">
+								<view class="mian-foot-view">
+									<view class="mian-title">{{item.entryName}}</view>
+									<view class="mian-dingwei">
+										<image src="../../static/index/dangqian2.png" mode=""></image>
+										<span class="shouyi-text">{{item.km}}km</span>
+									</view>
+								</view>
+								<view class="mian-foot-dan od-number">
+									订单编号 : {{item.ordersNo}}
+								</view>
+								<view class="mian-foot-adder shouyi-text add-text">
+									服务地址 : {{item.address}}
+								</view>
+								<view class="mian-bottom">
+									<view class="mian-bottom-xiang shouyi-text">
+										项目金额 :
+										<span  style="color: #FF6000;font-weight: bold;">
+											￥{{item.price}}
+										</span>
+									</view>
+									<view class="mian-bottom-shou">
+										<span class="shouyi-text">本单收益:  </span>
+										<span class="shouyi-text">￥{{item.artificerMoneyTotal}}</span>
+									</view>
+								</view>
 							</view>
 						</view>
-						<!-- <u-gap style="width:97%" height="1" bg-color="#ededed"></u-gap> -->
 					</view>
 					<uniLoadMore color="#007AFF" :iconType="iconType" :status="loadingStatus" :marginBottom="20"
 						:marginTop="20" v-if="isShowLoadMore" />
@@ -251,6 +265,11 @@
 			}
 		},
 		methods: {
+			goOder(item){
+				uni.navigateTo({
+					url:'/my/order/revenueDetails?ordersId='+item.ordersId
+				})
+			},
 			//自适应改变列表高度
 			selfAdaptionChangeElemtHeight() {
 				let _this = this;
@@ -289,16 +308,17 @@
 					if (res && res.data && res.data.records.length > 0) {
 						//有数据时
 						let obj = {};
-						res.data.records.forEach((item) => {
-							obj = {
-								artificerMoneyTotal: item.artificerMoneyTotal,
-								serveTime: item.serveTime,
-								payTime: item.payTime,
-								ordersNo: item.ordersNo,
-								ordersId: item.ordersId,
-							}
-							this.commissionDetail.push(obj);
-						})
+						// res.data.records.forEach((item) => {
+						// 	obj = {
+						// 		artificerMoneyTotal: item.artificerMoneyTotal,
+						// 		serveTime: item.serveTime,
+						// 		payTime: item.payTime,
+						// 		ordersNo: item.ordersNo,
+						// 		ordersId: item.ordersId,
+						// 	}
+						// 	this.commissionDetail.push(obj);
+						// })
+						this.commissionDetail=res.data.records||{};
 						console.log("this.commissionDetail",res.data.records)
 						this.noDataScrollStatus = false;
 						this.isShowLoadMore = true;
@@ -429,6 +449,114 @@
 
 <style scoped>
 	@import "./index.css";
+	.od-number{
+		font-size: 24rpx;
+		color: #7ea866;
+	}
+	.mian-bottom{
+			width: 100%;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: space-between;
+			margin-top: 8rpx;
+		}
+		.mian-foot-adder{
+			margin: 3px 0px;
+		}
+		.mian-dingwei image{
+			width: 18.75rpx;
+			height:21.53rpx;
+			margin-right: 5px;
+		}
+		.mian-dingwei,.mian-bottom-shou{
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+		}
+		.mian-title{
+			font-weight: bold;
+			font-size: 31rpx;
+			color: #333333;
+		}
+		.mian-foot-view{
+			width: 100%;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: space-between;
+			margin-bottom: 5px;
+		}
+		.mian-foot-list{
+			width: 73%;
+			display: flex;
+			flex-direction: column;
+		}
+	.mian-foot-img image{
+			width: 100%;
+			height: 100%;
+			border-radius: 20rpx;
+		}
+		.mian-foot-img{
+			width: 160rpx;
+			height: 160rpx;
+			background: #E6E6E6;
+			border-radius: 30rpx;
+		}
+		
+		.mian-foot{
+			width: 100%;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: space-between;
+		}
+		.shouyi-text{
+			color: #7D7D7D;
+			font-size: 26rpx;
+		}
+		.mian-head-time span:nth-child(2){
+			color: #11957C;
+			margin-top: 1px;
+		}
+		.mian-head-time{
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			font-weight: 400;
+			font-size: 26rpx;
+		}
+		.mian-head-biao{
+			width: 130rpx;
+			height: 47rpx;
+			line-height: 47rpx;
+			color: #fff;
+			font-size: 25rpx;
+			text-align: center;
+			background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+			border-top-left-radius: 21rpx;
+			border-bottom-right-radius: 21rpx;
+		}
+		.mian-head{
+			width: 100%;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: space-between;
+			border-bottom: 1px solid #E5E5E5;
+			padding-bottom: 5px;
+			margin-bottom: 10px;
+		}
+		.mian-view{
+			width: 95%;
+			background-color: #fff;
+			padding: 12px;
+			border-radius: 24rpx;
+			display: flex;
+			flex-direction: column;
+			margin: 26rpx auto;
+			
+		}
 </style>
 
 <style>
diff --git a/my/orderRevenueDetails/index.vue b/my/orderRevenueDetails/index.vue
index 16bbee6..effafd6 100644
--- a/my/orderRevenueDetails/index.vue
+++ b/my/orderRevenueDetails/index.vue
@@ -11,7 +11,7 @@
 						<view class="storedIntegralTop">
 							<view class="storedIntegralTopOfRight">
 								<view class="">订单收益</view>
-								<view class="">{{parentData.sumArtificerMoney}}元</view>
+								<view class="">{{parentData.artificerMoneyTotal}}元</view>
 							</view>
 						</view>
 
diff --git a/pages/index/addClock.vue b/pages/index/addClock.vue
index 02a6a45..fabc2e2 100644
--- a/pages/index/addClock.vue
+++ b/pages/index/addClock.vue
@@ -67,7 +67,7 @@
 									<view class="mian-bottom-xiang shouyi-text">项目金额 : ￥{{item.price}}</view>
 									<view class="mian-bottom-shou">
 										<span class="shouyi-text">本单收益:  </span>
-										<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">￥{{item.artificerMoney}}</span>
+										<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">￥{{item.artificerMoneyTotal}}</span>
 									</view>
 								</view>
 							</view>
@@ -106,7 +106,7 @@
 									<view class="mian-bottom-xiang add-text">项目金额 : ￥{{item.price}}</view>
 									<view class="mian-bottom-shou">
 										<span class="add-text">本单收益:  </span>
-										<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">￥{{item.artificerMoney}}</span>
+										<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">￥{{item.artificerMoneyTotal}}</span>
 									</view>
 								</view>
 							</view>
diff --git a/pages/index/currentIncome.vue b/pages/index/currentIncome.vue
index d764b99..15baa00 100644
--- a/pages/index/currentIncome.vue
+++ b/pages/index/currentIncome.vue
@@ -48,7 +48,7 @@
 								<view class="mian-bottom-xiang shouyi-text">项目金额 : ￥{{item.price}}</view>
 								<view class="mian-bottom-shou">
 									<span class="shouyi-text">本单收益:  </span>
-									<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">￥{{item.artificerMoney}}</span>
+									<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">￥{{item.artificerMoneyTotal}}</span>
 								</view>
 							</view>
 						</view>
diff --git a/pages/index/currentPoints.vue b/pages/index/currentPoints.vue
index bbe41de..c023a62 100644
--- a/pages/index/currentPoints.vue
+++ b/pages/index/currentPoints.vue
@@ -62,7 +62,7 @@
 								<view class="mian-bottom-xiang shouyi-text">项目金额 : ￥{{item.price}}</view>
 								<view class="mian-bottom-shou">
 									<span class="shouyi-text">本单收益:  </span>
-									<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">￥{{item.sumArtificerMoney}}</span>
+									<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">￥{{item.artificerMoneyTotal}}</span>
 								</view>
 							</view>
 						</view>
@@ -159,7 +159,7 @@
 								<view class="mian-bottom-xiang shouyi-text">项目金额 : ￥{{item.price}}</view>
 								<view class="mian-bottom-shou">
 									<span class="shouyi-text">本单收益:  </span>
-									<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">￥{{item.sumArtificerMoney}}</span>
+									<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">￥{{item.artificerMoneyTotal}}</span>
 								</view>
 							</view>
 						</view>
diff --git a/pages/index/currentYeji.vue b/pages/index/currentYeji.vue
index d370540..d3c19fe 100644
--- a/pages/index/currentYeji.vue
+++ b/pages/index/currentYeji.vue
@@ -48,7 +48,7 @@
 								<view class="mian-bottom-xiang shouyi-text">项目金额 :<span  style="color: #FF6000;font-weight: bold;">￥{{item.price}}</span></view>
 								<view class="mian-bottom-shou">
 									<span class="shouyi-text">本单收益:  </span>
-									<span class="shouyi-text">￥{{item.artificerMoney}}</span>
+									<span class="shouyi-text">￥{{item.artificerMoneyTotal}}</span>
 								</view>
 							</view>
 						</view>
diff --git a/pages/index/previousAdditions.vue b/pages/index/previousAdditions.vue
index f313a85..b3b57fd 100644
--- a/pages/index/previousAdditions.vue
+++ b/pages/index/previousAdditions.vue
@@ -70,7 +70,7 @@
 									<view class="mian-bottom-xiang shouyi-text">项目金额 : ￥{{item.price}}</view>
 									<view class="mian-bottom-shou">
 										<span class="shouyi-text">本单收益:  </span>
-										<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">￥{{item.artificerMoney}}</span>
+										<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">￥{{item.artificerMoneyTotal}}</span>
 									</view>
 								</view>
 							</view>
@@ -109,7 +109,7 @@
 									<view class="mian-bottom-xiang shouyi-text">项目金额 : ￥{{item.price}}</view>
 									<view class="mian-bottom-shou">
 										<span class="shouyi-text">本单收益:  </span>
-										<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">￥{{item.artificerMoney}}</span>
+										<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">￥{{item.artificerMoneyTotal}}</span>
 									</view>
 								</view>
 							</view>
diff --git a/pages/index/previousEarnings.vue b/pages/index/previousEarnings.vue
index e64a6ff..cd5af1f 100644
--- a/pages/index/previousEarnings.vue
+++ b/pages/index/previousEarnings.vue
@@ -48,7 +48,7 @@
 								<view class="mian-bottom-xiang shouyi-text">项目金额 : ￥{{item.price}}</view>
 								<view class="mian-bottom-shou">
 									<span class="shouyi-text">本单收益:  </span>
-									<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">￥{{item.artificerMoney}}</span>
+									<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">￥{{item.artificerMoneyTotal}}</span>
 								</view>
 							</view>
 						</view>
diff --git a/pages/index/previousPoints.vue b/pages/index/previousPoints.vue
index df75801..bca6746 100644
--- a/pages/index/previousPoints.vue
+++ b/pages/index/previousPoints.vue
@@ -64,7 +64,7 @@
 								<view class="mian-bottom-xiang shouyi-text">项目金额 : ￥{{item.price}}</view>
 								<view class="mian-bottom-shou">
 									<span class="shouyi-text">本单收益:  </span>
-									<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">￥{{item.sumArtificerMoney}}</span>
+									<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">￥{{item.artificerMoneyTotal}}</span>
 								</view>
 							</view>
 						</view>
@@ -161,7 +161,7 @@
 								<view class="mian-bottom-xiang shouyi-text">项目金额 : ￥{{item.price}}</view>
 								<view class="mian-bottom-shou">
 									<span class="shouyi-text">本单收益:  </span>
-									<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">￥{{item.sumArtificerMoney}}</span>
+									<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">￥{{item.artificerMoneyTotal}}</span>
 								</view>
 							</view>
 						</view>
diff --git a/pages/my/shangjiaInp.vue b/pages/my/shangjiaInp.vue
index 49ae6c6..f5286a3 100644
--- a/pages/my/shangjiaInp.vue
+++ b/pages/my/shangjiaInp.vue
@@ -24,11 +24,11 @@
 					<u-input placeholder="请填写店铺标签(以逗号分隔)" v-model="form.labels" type="text"
 						 style="color: #999999;" />
 				</u-form-item>
-				<u-form-item label="" :border-bottom='false'>
+				<u-form-item class="jiashao" label="" :border-bottom='false'>
 					<view class="skleft">
 						店铺介绍
 					</view>
-					<view class="margin-tb-sm bg">
+					<view class="bg">
 						<u-input  v-model="form.consortiaContent" style="border-radius: 20rpx;"
 							type="textarea" height="200" placeholde="请填写店铺介绍" maxlengt="200" :clearable="false" />
 					</view>
@@ -234,15 +234,16 @@
 </script>
 
 <style>
+	.jiashao /deep/.u-form-item--right__content__slot{
+		align-items: end;
+	}
 	page {
 		background-color: #F7F7F7;
 	}
 
 	.bg {
 		width: 94%;
-		margin:30rpx auto;
 		background-color: #FFFFFF;		
-		padding: 20rpx 36rpx;
 		border-radius: 26rpx;
 		
 	}