From 5b7a37431552786ad8138b6b1f9be2b4e5fa9476 Mon Sep 17 00:00:00 2001
From: ylj20011123 <YLJ>
Date: Wed, 3 Sep 2025 19:13:22 +0800
Subject: [PATCH] update

---
 pages/everdayRenven/AnhuiIndex.vue          |  21 +-
 pages/everdayRenven/AnhuiServerpart.vue     |  37 +-
 pages/everdayRenven/components/listUnit.vue | 415 ++++++++++++--------
 pages/everdayRenven/serviceDetail.vue       | 297 ++++++++------
 4 files changed, 450 insertions(+), 320 deletions(-)

diff --git a/pages/everdayRenven/AnhuiIndex.vue b/pages/everdayRenven/AnhuiIndex.vue
index 847827a..40a3090 100644
--- a/pages/everdayRenven/AnhuiIndex.vue
+++ b/pages/everdayRenven/AnhuiIndex.vue
@@ -16,27 +16,27 @@
 							</view>
 							<text class="section-text">营收占比</text>
 						</view>
-						
+
 					</view>
 					<view class="analysis-container">
 
 						<view class="modern-tabs">
-							<view class="tab-item" @tap="selectTab('nowTab', 1)"
+							<view class="tab-item" @click="selectTab('nowTab', 1)"
 								v-if="theRequest.ProvinceCode == 340000" :class="{ 'active': nowTab == 1 }">
 								<view class="tab-icon">🏢</view>
 								<view class="tab-label">经营模式</view>
 							</view>
-							<view class="tab-item" @tap="selectTab('nowTab', 2)" :class="{ 'active': nowTab == 2 }">
+							<view class="tab-item" @click="selectTab('nowTab', 2)" :class="{ 'active': nowTab == 2 }">
 								<view class="tab-icon">🏪</view>
 								<view class="tab-label">经营业态</view>
 							</view>
-							<view class="tab-item" @tap="selectTab('nowTab', 3)"
+							<view class="tab-item" @click="selectTab('nowTab', 3)"
 								v-if="areaProgress.length && areaProgress.length > 1"
 								:class="{ 'active': nowTab == 3 }">
 								<view class="tab-icon">🗺</view>
 								<view class="tab-label">区域营收</view>
 							</view>
-							<view class="tab-item" @tap="selectTab('nowTab', 4)"
+							<view class="tab-item" @click="selectTab('nowTab', 4)"
 								v-if="theRequest.ProvinceCode == 340000 && theRequest.GroupType == 1000"
 								:class="{ 'active': nowTab == 4 }">
 								<view class="tab-icon">🚗</view>
@@ -166,7 +166,7 @@
 				<template v-if="theRequest && theRequest.GroupType == 1020 && regionList.length">
 					<view class="service-list">
 						<view v-for="(item, i) in regionList[0].child" :key="i" class="service-card"
-							@tap="toDetail(item)">
+							@click="toDetail(item)">
 							<view class="service-header">
 								<view class="service-info">
 									<view class="service-name">🏢 {{ item.serverpart_Name }}</view>
@@ -196,7 +196,7 @@
 				<template v-else-if="theRequest && theRequest.GroupType == 1000">
 					<view class="region-list" v-show="regionShow1">
 						<block v-for="(item, i) in regionList" :key="i">
-							<view class="region-card" @tap="toggleRegion(item)">
+							<view class="region-card" @click="toggleRegion(item)">
 								<view class="region-main">
 									<view class="region-info">
 										<view class="region-name">{{ item.name }}</view>
@@ -226,7 +226,8 @@
 								</view>
 								<view class="service-sublist" v-show="item.show">
 									<view class="subservice-card" v-for="(child, index) in item.child"
-										:class="{ 'visited': child.visited }" :key="index" @tap="toDetail(child)">
+										:class="{ 'visited': child.visited }" :key="index"
+										@click.stop="toDetail(child)">
 										<view class="subservice-info">
 											<view class="subservice-name">{{ child.serverpart_Name }}</view>
 											<view class="subservice-revenue">￥{{ $util.fmoney(child.cashpay, 2) }}
@@ -360,8 +361,6 @@ export default {
 			let canToSeverpartIndex = !provinceId ? this.hasSeverpartIndexAuthority : this.PushAuthority.some(n => {
 				return n.ProvinceCode == provinceId && n.ShopAnalysisType == 1
 			})
-			console.log('severpartIndexPath', severpartIndexPath)
-			console.log('canToSeverpartIndex', canToSeverpartIndex)
 			this.$util.toNextRoute('navigateTo', severpartIndexPath)
 
 			item.visited = true
@@ -793,6 +792,7 @@ export default {
 	position: relative;
 	box-sizing: border-box;
 	min-height: 100vh;
+	padding-bottom: env(safe-area-inset-bottom);
 }
 
 .uni-flex-column {
@@ -1756,6 +1756,7 @@ canvas.operation-content {
 	border: none;
 	background: transparent;
 	color: #666;
+	margin: 0 8rpx;
 }
 
 .tab-item.active {
diff --git a/pages/everdayRenven/AnhuiServerpart.vue b/pages/everdayRenven/AnhuiServerpart.vue
index 1b11b2d..8c69167 100644
--- a/pages/everdayRenven/AnhuiServerpart.vue
+++ b/pages/everdayRenven/AnhuiServerpart.vue
@@ -1,6 +1,5 @@
 <template>
-	<view :style="showUnUpLoad ? 'overflow:hideen;height:100vh;' : 'height:100%;'" class="page-body"
-		scroll-with-animation v-if="showPage">
+	<view class="page-body" scroll-with-animation v-if="showPage">
 		<div class="box-card" :style="'opacity:' + (1 - opacity) + ';'">
 			<div class="box-top-title">
 				<span class="box-center-title">{{ sMsg.serverpartname }}</span>
@@ -12,7 +11,7 @@
 			</div>
 			<view class="top-card">
 				<div class="box-center-box">
-					<div class="uni-flex ai-center jc-between">
+					<div class="uni-flex ai-center jc-between" style="margin-bottom: 8rpx;">
 						<div class="main-amount-title">对客营收(元)</div>
 						<div class="tab-unit" @tap="showPop">
 							<span>上传门店：</span>
@@ -123,7 +122,7 @@
 						</div>
 						<div class="uni-flex jc-between">
 							<div style="margin-bottom: 0;"><span style="font-size: 32rpx;">{{ operationModel[0].data
-									}}</span>元
+							}}</span>元
 							</div>
 							<div style="margin-bottom: 0;" v-if="operationModel[1].data"><span
 									style="font-size: 32rpx;">{{
@@ -715,6 +714,8 @@ export default {
 	box-sizing: border-box;
 	-webkit-overflow-scrolling: touch;
 	min-height: 100vh;
+	padding-bottom: constant(safe-area-inset-bottom);
+	padding-bottom: env(safe-area-inset-bottom);
 }
 
 .mt8 {
@@ -808,9 +809,9 @@ cover-view.page-title {
 .tab-content {
 	display: flex;
 	flex-wrap: wrap;
-	margin-top: 24rpx;
+	// margin-top: 24rpx;
 	transition: all 0.5s cubic-bezier(0, 1, 0.5, 1);
-	margin: 24rpx auto 0 auto;
+	margin: 0 auto 0 auto;
 	overflow: hidden;
 	height: inherit;
 	width: inherit;
@@ -926,7 +927,7 @@ cover-view.page-title {
 }
 
 .shop-card .price-num {
-	font-size: 36rpx;
+	font-size: 28rpx;
 	font-family: 'DIN Alternate', 'Bahnschrift', sans-serif;
 	font-weight: 700;
 	text-shadow: 0 2rpx 4rpx rgba(0, 0, 0, 0.3);
@@ -934,7 +935,7 @@ cover-view.page-title {
 }
 
 .box-card {
-	padding: 32rpx 24rpx 0;
+	padding: 32rpx 24rpx 16rpx;
 	background-color: #fff;
 	width: 100%;
 	box-sizing: border-box;
@@ -959,7 +960,7 @@ cover-view.page-title {
 .top-card {
 	background: linear-gradient(135deg, #27B25F 0%, #4CCC7F 100%);
 	margin-top: 32rpx;
-	padding: 40rpx 0;
+	padding: 24rpx 0;
 	border-radius: 16rpx;
 	position: relative;
 	box-shadow: 0 8rpx 24rpx rgba(39, 178, 95, 0.2);
@@ -981,6 +982,8 @@ cover-view.page-title {
 	color: rgba(255, 255, 255, 0.9);
 	font-family: 'DIN Alternate', 'Bahnschrift', sans-serif;
 	font-weight: 500;
+	display: flex;
+	align-items: center;
 }
 
 .budget-title {
@@ -994,7 +997,7 @@ cover-view.page-title {
 
 .up-text-title,
 .down-text-title {
-	font-size: 34rpx;
+	font-size: 32rpx;
 	font-family: 'DIN Alternate', 'Bahnschrift', sans-serif;
 	font-weight: 600;
 	line-height: 1.3;
@@ -1083,7 +1086,7 @@ cover-view.page-title {
 }
 
 .center-num {
-	font-size: 40rpx;
+	font-size: 32rpx;
 	color: #fff;
 	font-family: 'DIN Alternate', 'Bahnschrift', sans-serif;
 	font-weight: 700;
@@ -1110,7 +1113,7 @@ cover-view.page-title {
 	border-radius: 20rpx;
 	color: #fff;
 	font-size: 26rpx;
-	padding: 8rpx 16rpx;
+	padding: 2rpx 16rpx;
 	font-weight: 500;
 	backdrop-filter: blur(10rpx);
 	border: 1rpx solid rgba(255, 255, 255, 0.3);
@@ -1118,7 +1121,7 @@ cover-view.page-title {
 
 .check-price-color {
 	color: #fff;
-	font-size: 38rpx;
+	font-size: 28rpx;
 	font-family: 'DIN Alternate', 'Bahnschrift', sans-serif;
 	line-height: 1.3;
 	font-weight: 600;
@@ -1126,7 +1129,7 @@ cover-view.page-title {
 }
 
 .check-price-color text {
-	font-size: 22rpx;
+	font-size: 24rpx;
 }
 
 .tab-icon2 {
@@ -1316,7 +1319,7 @@ cover-view.page-title {
 // 经营模式占比
 .model-busniess {
 	font-family: 'DIN Alternate', 'Bahnschrift', sans-serif;
-	padding: 24rpx 24rpx 0;
+	padding: 8rpx 24rpx;
 	background: linear-gradient(135deg, #f8f9fa 0%, #ffffff 100%);
 	border-radius: 12rpx;
 	border: 1rpx solid #f0f0f0;
@@ -1327,7 +1330,7 @@ cover-view.page-title {
 	font-size: 28rpx;
 	font-weight: 600;
 	color: #333;
-	margin-bottom: 16rpx;
+	// margin-bottom: 16rpx;
 }
 
 .model-busniess .progress-content {
@@ -1336,7 +1339,7 @@ cover-view.page-title {
 	border-radius: 6rpx;
 	display: flex;
 	justify-content: space-between;
-	margin: 20rpx 0 16rpx;
+	margin: 8rpx 0 8rpx;
 	overflow: hidden;
 	box-shadow: inset 0 2rpx 4rpx rgba(0, 0, 0, 0.1);
 }
diff --git a/pages/everdayRenven/components/listUnit.vue b/pages/everdayRenven/components/listUnit.vue
index fb06353..86fef2a 100644
--- a/pages/everdayRenven/components/listUnit.vue
+++ b/pages/everdayRenven/components/listUnit.vue
@@ -1,192 +1,277 @@
 <template>
 	<div>
-	<div class="analysis-cell" @tap="toggleShow" :class="{'active':item.show}">
-		<div class="shop-title">
-			<span> {{( i>8 ? i+1: '0'+(i+1) ) + ' '+item.SHOPNAME}}</span>
-			<p>
-				<span v-show="item.UNACCOUNT_SIGN">￥</span>
-				<span class="cell-price" :style="{'padding-right':!item.UNACCOUNT_SIGN ? '36rpx':'0','font-size':!item.UNACCOUNT_SIGN ? '24rpx':'36rpx'}">{{item.UNACCOUNT_SIGN ? $util.fmoney(item.CASHPAY_TOTAL,2): '无结账信息'}}</span>
-				<image src="/static/images/effective/true.png" mode="aspectFit" class="" v-if='item.SHOWDEAL_SIGN'></image>
-				<!-- <text class="uni-icon uni-icon-checkmarkempty"  v-if='item.SHOWDEAL_SIGN'></text> -->
-				
+		<div class="analysis-cell" @tap="toggleShow" :class="{ 'active': item.show }">
+			<div class="shop-title">
+				<span> {{ (i > 8 ? i + 1 : '0' + (i + 1)) + ' ' + item.SHOPNAME }}</span>
+				<p>
+					<span v-show="item.UNACCOUNT_SIGN">￥</span>
+					<span class="cell-price"
+						:style="{ 'padding-right': !item.UNACCOUNT_SIGN ? '0' : '0', 'font-size': !item.UNACCOUNT_SIGN ? '24rpx' : '24rpx' }">{{
+							item.UNACCOUNT_SIGN
+								? $util.fmoney(item.CASHPAY_TOTAL, 2) : '无结账信息' }}</span>
+					<image src="/static/images/effective/true.png" mode="aspectFit" class="" v-if='item.SHOWDEAL_SIGN'>
+					</image>
+					<!-- <text class="uni-icon uni-icon-checkmarkempty"  v-if='item.SHOWDEAL_SIGN'></text> -->
+
+				</p>
+			</div>
+			<p v-if="item.detail.length > 0" style="line-height: 1.2;">
+				<span v-for="(child, index) in item.detail" :key="index" class="atribute-tag">{{ child }} </span>
 			</p>
 		</div>
-		<p v-if=" item.detail.length>0" style="line-height: 1.2;">
-			<span v-for="(child,index) in item.detail" :key="index" class="atribute-tag">{{child}} </span>
-		</p>
-	</div>
-	<div class="analysis-detail" v-show="item.show">
-		<div class="detail-unit" v-for="(unit,o) in item.ShopEndAccountList" :key="o">
-			<div class="uni-inline-flex">
-				<span class="detail-title">结账时间：</span>
-				<div style="flex: 1;text-align: left;">
-					<div>起 {{unit.ENDACCOUNT_STARTDATE}}</div>
-					<div>止 {{unit.ENDACCOUNT_DATE}}</div>
-				</div>	
-				<span style="color:#EE7941;margin-right:50rpx;padding-top: 42rpx;">{{getHour(unit.ENDACCOUNT_STARTDATE,unit.ENDACCOUNT_DATE)}}小时</span>
-			</div>
-			<block v-if="unit.DESCRIPTION_DATE">
-				
-				<div class="detail-title">日结校验：{{unit.DESCRIPTION_DATE}}</div>
-				<p><span class="detail-title">{{unit.DESCRIPTION_STAFF}}：</span><span>{{unit.DIFFERENCE_REASON}}</span></p>
-			</block>
-			<block v-if="unit.APPROVE_DATE">
-				<div><span class="detail-title">日结审核：{{unit.APPROVE_DATE}}</span></div>
-				<p><span class="detail-title">{{unit.APPROVE_STAFF}}：</span><span>{{unit.APPROVED_INFO}}</span></p>
-			</block>
-			<div>
-				<p class="detail-short-info" v-show="unit.FACTAMOUNT_SALE">单品报表：<text class="uni-icon uni-icon-checkmarkempty"  ></text></p>
-				<p class="detail-short-info" v-show="unit.FACTAMOUNT_CIGARETTE">香烟数据：<span class="uni-icon uni-icon-checkmarkempty"></span></p>
-			</div>
-			<div><span class="detail-title detail-short-info">稽核次数：{{unit.CHECK_COUNT}} 次</span><span class="detail-short-info">长短款额：{{$util.fmoney(unit.DIFFERENT_PRICE)}} 元</span></div>
-			<div>
-				<span class="detail-title detail-short-info">现金缴款：{{$util.fmoney(unit.CASHPAY_DOWNLORD)}} 元</span>
-				<span class="detail-short-info">移动支付：{{$util.fmoney(unit.MOBILEPAYMENT)}} 元</span>
+		<div class="analysis-detail" v-show="item.show">
+			<div class="detail-unit" v-for="(unit, o) in item.ShopEndAccountList" :key="o">
+				<div class="uni-inline-flex">
+					<span class="detail-title">结账时间：</span>
+					<div style="flex: 1;text-align: left;">
+						<div style="font-size: 24rpx;">起 {{ unit.ENDACCOUNT_STARTDATE }}</div>
+						<div style="font-size: 24rpx;">止 {{ unit.ENDACCOUNT_DATE }}</div>
+					</div>
+					<span style="color:#EE7941;margin-right:50rpx;padding-top: 20rpx;font-size: 24rpx;">{{
+						getHour(unit.ENDACCOUNT_STARTDATE, unit.ENDACCOUNT_DATE) }}小时</span>
+				</div>
+				<block v-if="unit.DESCRIPTION_DATE">
+
+					<div class="detail-title">日结校验：{{ unit.DESCRIPTION_DATE }}</div>
+					<p><span class="detail-title">{{ unit.DESCRIPTION_STAFF }}：</span><span>{{ unit.DIFFERENCE_REASON
+							}}</span>
+					</p>
+				</block>
+				<block v-if="unit.APPROVE_DATE">
+					<div><span class="detail-title">日结审核：{{ unit.APPROVE_DATE }}</span></div>
+					<p><span class="detail-title">{{ unit.APPROVE_STAFF }}：</span><span>{{ unit.APPROVED_INFO }}</span>
+					</p>
+				</block>
+				<div>
+					<p class="detail-short-info" v-show="unit.FACTAMOUNT_SALE">单品报表：<text
+							class="uni-icon uni-icon-checkmarkempty"></text></p>
+					<p class="detail-short-info" v-show="unit.FACTAMOUNT_CIGARETTE">香烟数据：<span
+							class="uni-icon uni-icon-checkmarkempty"></span></p>
+				</div>
+				<div><span class="detail-title detail-short-info">稽核次数：{{ unit.CHECK_COUNT }} 次</span><span
+						class="detail-short-info">长短款额：{{ $util.fmoney(unit.DIFFERENT_PRICE) }} 元</span></div>
+				<div>
+					<span class="detail-title detail-short-info">现金缴款：{{ $util.fmoney(unit.CASHPAY_DOWNLORD) }} 元</span>
+					<span class="detail-short-info">移动支付：{{ $util.fmoney(unit.MOBILEPAYMENT) }} 元</span>
+				</div>
 			</div>
 		</div>
 	</div>
-	</div>
 </template>
 
 <script>
-	export default {
-		props: {
-			item: {
-				type: Object,
-				required: true
-			},
-			i: {
-				type: Number,
-				required: true
-			}
+export default {
+	props: {
+		item: {
+			type: Object,
+			required: true
 		},
-		data () {
-			return {
-				
-				
-			}
+		i: {
+			type: Number,
+			required: true
+		}
+	},
+	data() {
+		return {
+
+
+		}
+	},
+	computed: {
+
+	},
+	methods: {
+		getHour(start, end) {
+			return parseInt((new Date(end) - new Date(start)) / (1000 * 3600))
 		},
-		computed: {
-			
-		},
-		methods: {
-			getHour(start,end){
-				return parseInt((new Date(end) - new Date(start)) / (1000 * 3600)) 
-			},
-			
-			toggleShow () {
-				this.$emit('toggleShow', this.i)
-			}
+
+		toggleShow() {
+			this.$emit('toggleShow', this.i)
 		}
 	}
+}
 </script>
 
-<style scoped>
-	.analysis-cell {
-		/* height: 1140rpx; */
-		background-color: #ffffff;
-		border-bottom: 2rpx solid #F8F8F8;
-		padding: 24rpx 20rpx 18rpx 30rpx;
-		display: flex;
-		flex-direction: column;
+<style lang="scss" scoped>
+.analysis-cell {
+	background-color: #fff;
+	border-radius: 16rpx;
+	margin-bottom: 16rpx;
+	box-shadow: 0 2px 12px rgba(0, 0, 0, 0.08);
+	padding: 16rpx 16rpx 8rpx;
+	display: flex;
+	flex-direction: column;
+	transition: all 0.3s ease;
+	position: relative;
+
+	&.active {
+		border: 2rpx solid #27B25F;
+		box-shadow: 0 4px 20px rgba(39, 178, 95, 0.15);
 	}
-	
-	.analysis-cell .shop-title {
+}
+
+.analysis-cell .shop-title {
+	display: flex;
+	justify-content: space-between;
+	position: relative;
+	font-size: 24rpx;
+	font-weight: 600;
+	align-items: flex-start;
+
+	span {
+		color: #333;
+		flex: 1;
+	}
+
+	p {
 		display: flex;
-		justify-content: space-between;
-		position: relative;
-		margin-left: 20rpx;
-		font-size: 26rpx;
-		height: 100%;
 		align-items: center;
+		flex-shrink: 0;
 	}
-	
-	.analysis-cell .shop-title:before {
-		content: '';
-		position: absolute;
-		width: 20rpx;
-		height: 20rpx;
-		border-radius: 20rpx;
-		background: url(/static/images/revenue/select.png) no-repeat center;
-		background-size: contain;
-		left: -32rpx;
-		
+}
+
+.analysis-cell .shop-title:before {
+	content: '';
+	position: absolute;
+	width: 24rpx;
+	height: 24rpx;
+	border-radius: 50%;
+	left: -40rpx;
+	top: 4rpx;
+	background: #e0e0e0;
+	border: 3rpx solid #fff;
+	box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
+	transition: all 0.3s ease;
+}
+
+.analysis-cell.active .shop-title:before {
+	background: #27B25F;
+	box-shadow: 0 2rpx 12rpx rgba(39, 178, 95, 0.3);
+}
+
+.shop-title image {
+	width: 32rpx;
+	height: 32rpx;
+	margin-left: 12rpx;
+	border-radius: 4rpx;
+}
+
+.analysis-cell .cell-price {
+	color: #27B25F;
+	font-family: 'PingFang SC', sans-serif;
+	font-size: 24rpx;
+	font-weight: 700;
+}
+
+.atribute-tag {
+	display: inline-block;
+	background: linear-gradient(135deg, #ff9f43, #ff8c42);
+	color: #fff;
+	padding: 4rpx 12rpx;
+	margin: 4rpx 8rpx 4rpx 0;
+	border-radius: 20rpx;
+	font-size: 20rpx;
+	font-weight: 500;
+	box-shadow: 0 2rpx 8rpx rgba(255, 159, 67, 0.2);
+}
+
+.analysis-detail {
+	background-color: #f8f9fa;
+	border-radius: 12rpx;
+	position: relative;
+	overflow: hidden;
+	// margin-top: 16rpx;
+	border: 1rpx solid #f0f0f0;
+}
+
+.analysis-detail span,
+.analysis-detail view {
+	color: #333;
+	font-size: 26rpx;
+}
+
+.uni-icon-checkmarkempty,
+.analysis-detail span.uni-icon-checkmarkempty {
+	color: #2ed573;
+	font-size: 32rpx;
+	font-weight: 600;
+}
+
+.analysis-detail::before {
+	content: '';
+	width: 0;
+	height: 0;
+	border-left: 12rpx solid transparent;
+	border-right: 12rpx solid transparent;
+	border-bottom: 16rpx solid #f8f9fa;
+	position: absolute;
+	top: -16rpx;
+	left: 32rpx;
+}
+
+.analysis-detail .detail-unit {
+	background-color: #fff;
+	padding: 24rpx;
+	border-radius: 8rpx;
+	// margin: 16rpx;
+	box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
+
+	&:first-child {
+		// margin-top: 24rpx;
 	}
-	
-	.analysis-cell.active .shop-title:before {
-		background: url(/static/images/revenue/select_active.png) no-repeat center;
-		background-size: contain;
+
+	&:last-child {
+		margin-bottom: 24rpx;
 	}
-	.shop-title image {
-		width: 40rpx;
-		height: 40rpx;
-		margin-left: 16rpx;
-		vertical-align: text-bottom;
+}
+
+.analysis-detail .detail-unit>div {
+	display: flex;
+	justify-content: space-between;
+	align-items: flex-start;
+	margin-bottom: 16rpx;
+
+	&:last-child {
+		margin-bottom: 0;
 	}
-	.analysis-cell .cell-price {
-		color: #565656;
-		font-family: Bahnschrift Regular;
-		font-size: 38rpx;
+}
+
+.analysis-detail .detail-unit>p {
+	margin-bottom: 16rpx;
+
+	&:last-child {
+		margin-bottom: 0;
 	}
-	
-	.analysis-detail {
-		background-color: #fff;
-		position: relative;
+}
+
+.analysis-detail span {
+	display: inline-block;
+	vertical-align: middle;
+	line-height: 1.4;
+}
+
+.analysis-detail .detail-title {
+	min-width: 140rpx;
+	color: #666;
+	font-weight: 500;
+	font-size: 24rpx;
+}
+
+.analysis-detail .detail-short-info {
+	width: 50%;
+	color: #333;
+	font-size: 24rpx;
+
+	&:first-child {
+		padding-right: 16rpx;
 	}
-	.analysis-detail span, .analysis-detail view{
-		color: #333 ;
-		font-size: 24rpx ;
-	}
-	.uni-icon-checkmarkempty, .analysis-detail span.uni-icon-checkmarkempty {
-		color: #4F8E24;
-		font-size: 36rpx;
-	}
-	.analysis-detail::before {
-		content: '';
-		width: 24rpx;
-		height: 12rpx;
-		background: url(/static/images/revenue/bg-s.png) no-repeat center;
-		background-size: contain;
-		display: block;
-		position: absolute;
-		top: -12rpx;
-		left: 48rpx;
-	}
-	.analysis-detail .detail-unit {
-		background-color: #F8F8F8;
-		line-height: 2;
-		padding: 20rpx 10rpx 20rpx 50rpx;
-	}
-	
-	.analysis-detail .detail-unit>div {
-		display: flex;
-		justify-content: space-between;
-		margin-top: 12rpx;
-	}
-	
-	.analysis-detail .detail-unit>p {
-		margin-top: 12rpx;
-	}
-	.analysis-detail .detail-unit+.detail-unit {
-		margin-top: 20rpx;
-	}
-	
-	.analysis-cell .atribute-tag {
-		color: #EE7941;
-		margin-left: 10rpx;
-		font-size: 24rpx;
-	}
-	
-	.analysis-detail span {
-		display: inline-block;
-		vertical-align: middle;
-	}
-	
-	.analysis-detail .detail-title {
-		min-width: 120rpx;
-	}
-	
-	.analysis-detail .detail-short-info {
-		width: 50%;
+}
+
+.uni-inline-flex {
+	span:last-child {
+		color: #ff9f43;
+		font-weight: 600;
+		font-size: 28rpx;
 	}
+}
 </style>
diff --git a/pages/everdayRenven/serviceDetail.vue b/pages/everdayRenven/serviceDetail.vue
index 11f18f9..ec0c7cb 100644
--- a/pages/everdayRenven/serviceDetail.vue
+++ b/pages/everdayRenven/serviceDetail.vue
@@ -1,158 +1,199 @@
 <template>
 	<div class="page-body" v-if="showPage">
 
-		<div class="service-brand-box" >
+		<div class="service-brand-box">
 			<div class="uni-flex align-center">
 
 				<image v-if="pageMsg.Brand_ICO" :src="pageMsg.Brand_ICO" mode="aspectFit"></image>
 				<image v-else src="/static/images/revenue/home.png" mode="aspectFit"></image>
 
 
-				<div class="band-name">{{pageMsg.Brand_Name}}</div>
+				<div class="band-name">{{ pageMsg.Brand_Name }}</div>
 			</div>
-			<div class="price-num">{{pageMsg.Revenue_Amount ? $util.fmoney(pageMsg.Revenue_Amount,2) :'0.00'}}</div>
+			<div class="price-num">{{ pageMsg.Revenue_Amount ? $util.fmoney(pageMsg.Revenue_Amount, 2) : '0.00' }}</div>
 		</div>
 		<!--服务区门店分析-->
-
-		<div style="margin-top: 0 20rpx;" >
-			<shopCell v-for="(item,i) in pageMsg.ShopEndaccountList" :key="i" :item='item' @toggleShow="toggleShow" :i='i'></shopCell>
+		<div style="margin-top: 0 20rpx;padding: 0 16rpx">
+			<shopCell v-for="(item, i) in pageMsg.ShopEndaccountList" :key="i" :item='item' @toggleShow="toggleShow"
+				:i='i'></shopCell>
 
 		</div>
 	</div>
 </template>
 
 <script>
-	import shopCell from './components/listUnit.vue'
-	export default {
-		data() {
-			return {
-				showPage:false,
+import shopCell from './components/listUnit.vue'
+export default {
+	data() {
+		return {
+			showPage: false,
 
-				pageMsg: {},
-				keyJson : {
-						SHOWMORE_SIGN: { 1: '【长款】',2:'【异常长款】' }, // 长款
-						SHOWLESS_SIGN:{ 1: '【短款】',2:'【异常短款】' }, // 短款
-						SHOWABNORMAL_SIGN: { 1: '【异常校验】'},  // 异常日结
-						SHOWSCAN_SIGN : { 1: '【扫】'},  // 扫码上传
-						SHOWSSUPPLY_SIGN : { 1: '【补】' }, // 账期补录
-						SHOWCHECK_SIGN : { 1: '【稽核检查】' }, // 稽核检查
-						INTERFACE_SIGN : { 1: '【接口传输】' }, // 接口传输
-					}
-			}
-		},
-		components:{
-			shopCell
-		},
-		methods: {
-			toggleShow(i){
-
-				let item = this.pageMsg.ShopEndaccountList[i]
-				item.show = !item.show
-				this.$forceUpdate()
-			},
-
-
-			getDetail(data){
-				let arr =[]
-				let keyJson = this.keyJson
-				var keyCode =  ['SHOWABNORMAL_SIGN','SHOWCHECK_SIGN','SHOWMORE_SIGN','SHOWLESS_SIGN','SHOWSCAN_SIGN','SHOWSSUPPLY_SIGN','INTERFACE_SIGN']
-					 keyCode.map(n=>{
-
-						if( keyJson[n][data[n]] ) arr.push( keyJson[n][data[n]])
-
-					})
-					return arr
-			},
-			getBrandRevenue(obj) {
-				let _this = this
-				this.$request.$webGet('CommercialApi/Revenue/GetShopEndAccountList', {
-					Serverpart_Id: obj.id,
-					pushProvinceCode: obj.provinceId,
-					Statistics_Date: obj.time,
-					ServerpartShop_Ids: obj.shopid,
-				}).then(res => {
-					uni.hideLoading()
-					if (res.Result_Code != 100) return
-					res.Result_Data.ShopEndaccountList.map(n=>{
-						n.show = true
-						n.detail =  this.getDetail(n)
-					})
-					_this.pageMsg = res.Result_Data
-					_this.showPage =true
-				})
-			},
-			zgetBrandRevenue(obj) {
-				let _this = this
-				this.$request.$webGet('/WeChat/GetServerpartBrandShop', {
-					Serverpart_Id: obj.id,
-					business_Brand: obj.bid,
-					pushProvinceCode: obj.provinceId,
-					statictics_Time: obj.time,
-					bussiness_Trade: obj.btid,
-				}).then(res => {
-					uni.hideLoading()
-					if (res.Result_Code != 100) return
-					res.Result_Data.listBrandShopModel.map(n=>{
-						n.show = true
-						n.detail =  this.getDetail(n)
-					})
-					res.Result_Data.ShopEndaccountList = res.Result_Data.listBrandShopModel
-					_this.pageMsg = res.Result_Data
-					_this.showPage =true
-				})
-			},
-		},
-		onUnload() {
-			this.$util.addUserBehavior()
-		},
-		onLoad(option) {
-			uni.showLoading({
-				title:'正在加载...'
-			})
-			if(option.provinceId==='330000'){
-				this.zgetBrandRevenue(option)
-			}else{
-
-			this.getBrandRevenue(option)
+			pageMsg: {},
+			keyJson: {
+				SHOWMORE_SIGN: { 1: '【长款】', 2: '【异常长款】' }, // 长款
+				SHOWLESS_SIGN: { 1: '【短款】', 2: '【异常短款】' }, // 短款
+				SHOWABNORMAL_SIGN: { 1: '【异常校验】' },  // 异常日结
+				SHOWSCAN_SIGN: { 1: '【扫】' },  // 扫码上传
+				SHOWSSUPPLY_SIGN: { 1: '【补】' }, // 账期补录
+				SHOWCHECK_SIGN: { 1: '【稽核检查】' }, // 稽核检查
+				INTERFACE_SIGN: { 1: '【接口传输】' }, // 接口传输
 			}
 		}
+	},
+	components: {
+		shopCell
+	},
+	methods: {
+		toggleShow(i) {
+
+			let item = this.pageMsg.ShopEndaccountList[i]
+			item.show = !item.show
+			this.$forceUpdate()
+		},
+
+
+		getDetail(data) {
+			let arr = []
+			let keyJson = this.keyJson
+			var keyCode = ['SHOWABNORMAL_SIGN', 'SHOWCHECK_SIGN', 'SHOWMORE_SIGN', 'SHOWLESS_SIGN', 'SHOWSCAN_SIGN', 'SHOWSSUPPLY_SIGN', 'INTERFACE_SIGN']
+			keyCode.map(n => {
+
+				if (keyJson[n][data[n]]) arr.push(keyJson[n][data[n]])
+
+			})
+			return arr
+		},
+		getBrandRevenue(obj) {
+			let _this = this
+			this.$request.$webGet('CommercialApi/Revenue/GetShopEndAccountList', {
+				Serverpart_Id: obj.id,
+				pushProvinceCode: obj.provinceId,
+				Statistics_Date: obj.time,
+				ServerpartShop_Ids: obj.shopid,
+			}).then(res => {
+				uni.hideLoading()
+				if (res.Result_Code != 100) return
+				res.Result_Data.ShopEndaccountList.map(n => {
+					n.show = true
+					n.detail = this.getDetail(n)
+				})
+				_this.pageMsg = res.Result_Data
+				console.log('_this.pageMsg_this.pageMsg_this.pageMsg', _this.pageMsg);
+
+				_this.showPage = true
+			})
+		},
+		zgetBrandRevenue(obj) {
+			let _this = this
+			this.$request.$webGet('/WeChat/GetServerpartBrandShop', {
+				Serverpart_Id: obj.id,
+				business_Brand: obj.bid,
+				pushProvinceCode: obj.provinceId,
+				statictics_Time: obj.time,
+				bussiness_Trade: obj.btid,
+			}).then(res => {
+				uni.hideLoading()
+				if (res.Result_Code != 100) return
+				res.Result_Data.listBrandShopModel.map(n => {
+					n.show = true
+					n.detail = this.getDetail(n)
+				})
+				res.Result_Data.ShopEndaccountList = res.Result_Data.listBrandShopModel
+				_this.pageMsg = res.Result_Data
+				console.log('_this.pageMsg_this.pageMsg_this.pageMsg', _this.pageMsg);
+				_this.showPage = true
+			})
+		},
+	},
+	onUnload() {
+		this.$util.addUserBehavior()
+	},
+	onLoad(option) {
+		uni.showLoading({
+			title: '正在加载...'
+		})
+		if (option.provinceId === '330000') {
+			this.zgetBrandRevenue(option)
+		} else {
+
+			this.getBrandRevenue(option)
+		}
 	}
+}
 </script>
 
-<style scoped>
-	.page-body {
-		background-color: #fff;
-		padding-top: 40rpx;
-		height: 100%;
-	}
-	/*服务区分析*/
+<style lang="scss" scoped>
+.page-body {
+	background-color: #f8f9fa;
+	padding: 32rpx 24rpx;
+	min-height: 100vh;
+}
 
-	/* 服务区品牌详情 */
-	.service-brand-box {
+/* 服务区品牌详情 */
+.service-brand-box {
+	width: 100%;
+	box-sizing: border-box;
+	padding: 24rpx;
+	margin-bottom: 32rpx;
+	background: linear-gradient(135deg, #27B25F 0%, #4CCC7F 100%);
+	border-radius: 24rpx;
+	box-shadow: 0 2px 12px rgba(0, 0, 0, 0.08);
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	position: relative;
+	overflow: hidden;
 
-		width: 693rpx;
-		height: 103rpx;
-		color: #fff;
-		border-radius: 10rpx;
-		background: url('https://eshangtech.com/ShopICO/ahyd-BID/revenue/brand-card.png') no-repeat 60rpx center,linear-gradient(#98a1c2 0%, #aab3d0 100%);
-		background-size: contain;
-		display: flex;
-		align-items: center;
-		margin: 0 auto;
-
-		padding: 0 25rpx;
-		justify-content: space-between;
-		box-sizing: border-box;
-	}
-	.service-brand-box image {
-		height: 60rpx;
-		width: 60rpx;
-		border: 2rpx solid #fff;
+	&::before {
+		content: '';
+		position: absolute;
+		top: -50%;
+		right: -20%;
+		width: 200rpx;
+		height: 200rpx;
+		background: rgba(255, 255, 255, 0.1);
 		border-radius: 50%;
-		margin-right: 24rpx;
+		z-index: 1;
 	}
-	.service-brand-box .price-num {
-		font-size: 40rpx;
-		font-family: Bahnschrift Regular;
+
+	&::after {
+		content: '';
+		position: absolute;
+		bottom: -30%;
+		left: -10%;
+		width: 120rpx;
+		height: 120rpx;
+		background: rgba(255, 255, 255, 0.08);
+		border-radius: 50%;
+		z-index: 1;
 	}
+}
+
+.service-brand-box image {
+	width: 72rpx;
+	height: 72rpx;
+	border: 3rpx solid rgba(255, 255, 255, 0.8);
+	border-radius: 50%;
+	margin-right: 24rpx;
+	position: relative;
+	z-index: 2;
+}
+
+.band-name {
+	color: #fff;
+	font-size: 28rpx;
+	font-weight: 600;
+	position: relative;
+	z-index: 2;
+}
+
+.price-num {
+	color: #fff;
+	font-size: 32rpx;
+	font-weight: 700;
+	font-family: 'PingFang SC', sans-serif;
+	position: relative;
+	z-index: 2;
+	text-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
+}
 </style>