From 40faac6de8befd2945ebcbd185171a35eefcc023 Mon Sep 17 00:00:00 2001
From: cclu <1106109051@qq.com>
Date: Fri, 4 Aug 2023 18:32:57 +0800
Subject: [PATCH] update

---
 pages/commercialBI/specialCase.vue   |   6 +-
 pages/index/index.vue                |   2 +-
 pages/operatingStatements/detail.vue | 155 ++++++++++++++----
 pages/operatingStatements/index.vue  | 225 ++++++++++++++++++---------
 pages/userCenter/userCenter.vue      |   4 +-
 5 files changed, 280 insertions(+), 112 deletions(-)

diff --git a/pages/commercialBI/specialCase.vue b/pages/commercialBI/specialCase.vue
index d19dd96..23309a6 100644
--- a/pages/commercialBI/specialCase.vue
+++ b/pages/commercialBI/specialCase.vue
@@ -61,7 +61,7 @@
       <div class="contentList" v-if="selectTab===2">
         <div class="contentItem" v-for="(item,index) in tableList" :key="index">
           <div class="index">
-            <div class="boxBg"></div>
+            <div class="boxBg" v-if="index<=2"></div>
             <span class="indexText" :style="{fontWeight:index<=2?'bold':'normal'}">{{index + 1}}</span>
           </div>
           <div class="serviceBox">
@@ -73,8 +73,8 @@
             <span class="unit">/辆</span>
           </div>
           <div class="addBox">
-            <image class="addIcon" :src="Number(item.VEHICLE_RATE)>100?'https://eshangtech.com/ShopICO/ahyd-BID/index/addIcon.svg':Number(item.VEHICLE_RATE)===100?'':'https://eshangtech.com/ShopICO/ahyd-BID/index/reduce.svg'"/>
-            <span class="add">{{item.VEHICLE_RATE}}%</span>
+            <image v-if="item.VEHICLE_RATE!==0" class="addIcon"  :src="Number(item.VEHICLE_RATE)>100?'/static/images/examine/add.svg':Number(item.VEHICLE_RATE)===100?'':'/static/images/examine/reduce.svg'"/>
+            <span class="add">{{item.VEHICLE_RATE===0?'-':item.VEHICLE_RATE+'%'}}</span>
           </div>
         </div>
       </div>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index f3c81c0..583574b 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -787,7 +787,7 @@ export default {
       popupType:'center',
       popupShow:false,
       popup:true,
-      selectBigTab:1,
+      selectBigTab:2,
       bigTab:[{imgUrl:'https://eshangtech.com/ShopICO/ahyd-BID/home/carTab.svg',text:'车流统计',value:1},
         {imgUrl:'https://eshangtech.com/ShopICO/ahyd-BID/home/revenueTab.svg',text:'经营统计',value:2}],
       smallTab:[{text:'服务区流量排名',value:1},{text:'断面流量排名',value:2},{text:'驶入率排名',value:3}],
diff --git a/pages/operatingStatements/detail.vue b/pages/operatingStatements/detail.vue
index 300db3d..c3099b6 100644
--- a/pages/operatingStatements/detail.vue
+++ b/pages/operatingStatements/detail.vue
@@ -1,19 +1,33 @@
 <template>
 	<view class="page-card" v-if="!isLoading">
-		<view class="head-card" v-show="pageMsg.Serverpart_Name" @tap="toTrend" >
+    <!-- 日期筛选 -->
+    <div class="uni-flex ai-center screen-box">
+      <picker mode="date" @change="bindDateChange($event,0)" :value="pageData.searchTime[0]" :end="pageData.endDate" start="2018-12-01" class="screen-unit">
+        <text>{{pageData.searchTime[0]}}</text>
+        <text class="uni-icon uni-icon-arrowdown"></text>
+      </picker>
+      <text class="mr20">至</text>
+      <picker mode="date" @change="bindDateChange($event,1)" :value="pageData.searchTime[1]" :end="pageData.endDate" start="2018-12-01" class="screen-unit">
+        <text>{{pageData.searchTime[1]}}</text>
+        <text class="uni-icon uni-icon-arrowdown"></text>
+      </picker>
+    </div>
+
+<!--    @tap="toTrend"-->
+		<view class="head-card" v-show="pageMsg.Serverpart_Name">
 			<view class="uni-flex jc-between ai-center text-strong">
 				<view class=""> {{pageMsg.Serverpart_Name}} </view>
 				<view class=""> ¥{{$util.fmoney(pageMsg.Serverpart_Revenue,2)}} </view>
 			</view>
 			<view class="uni-flex jc-between ai-center">
-				<text class=""> {{pageMsg.Serverpart_S||'南/东区'}} &nbsp; &nbsp;¥{{$util.fmoney(pageMsg.Serverpart_RevenueS,2)}}</text>
-				<text class=""> {{pageMsg.Serverpart_N||'北/西区'}} &nbsp; &nbsp;¥{{$util.fmoney(pageMsg.Serverpart_RevenueN,2)}}</text>
+				<text class="" v-if="pageMsg.Serverpart_S"> {{pageMsg.Serverpart_S}} &nbsp; &nbsp;¥{{$util.fmoney(pageMsg.Serverpart_RevenueS,2)}}</text>
+				<text class="" v-if="pageMsg.Serverpart_N"> {{pageMsg.Serverpart_N}} &nbsp; &nbsp;¥{{$util.fmoney(pageMsg.Serverpart_RevenueN,2)}}</text>
 			</view>
 		</view>
 		<view class="page-list">
-			<view v-for="(dateItem,i) in pageMsg.revenueReportDetilsDates" :key="i">
-				<text class="list-date"> {{$util.cutDate(dateItem.Statistics_Date,'MM.DD')}}</text>
-				<view class="cell-body uni-flex ai-center" v-for="(item,i) in dateItem.revenueReportDetils" :key="i">
+<!--			<view v-for="(dateItem,i) in pageMsg.revenueReportDetilsDates" :key="i">-->
+<!--				<text class="list-date"> {{// $util.cutDate(dateItem.Statistics_Date,'MM.DD')}}</text>-->
+				<view class="cell-body uni-flex ai-center" v-for="(item,i) in pageMsg.ShopList" :key="i">
 					<image :src="item.BusinessType_Logo || '/static/images/revenue/operating-shop.png'" mode="aspectFit"></image>
 					<view class="">
 						<view class="uni-flex ai-center jc-between">
@@ -21,7 +35,7 @@
 							<text class="shop-total">＋ ¥{{$util.fmoney(item.BusinessType_Revenue,2)}}</text>
 						</view>
 						<view class="uni-flex ai-center jc-between">
-							<text class="type-text" :class="{'scan':item.Upload_Type==1,'port':item.Upload_Type==2}">
+							<text style="display: inline-block;width: 20%" class="type-text" :class="{'scan':item.Upload_Type==1,'port':item.Upload_Type==2}">
 								<template v-if="item.Upload_Type==1">
 									扫码上传
 								</template>
@@ -35,63 +49,107 @@
 								<text class="type-text port" >接口传输</text>
 								<text v-else>自动上传</text> -->
 							</text>
-							<view class="uni-flex ai-center">
-								<text class="text-coast">{{item.Serverpart_S||'南/东区'}}: ¥{{$util.fmoney(item.Serverpart_RevenueS,2)}}</text>
-								<text class="text-coast">{{item.Serverpart_N||'北/西区'}}: ¥{{$util.fmoney(item.Serverpart_RevenueN,2)}}</text>
-							</view>
+							<view class="uni-flex ai-center" style="display: inline-block;width: 80%">
+                <div style="display: inline-block;width: 48%;text-align: left;margin-right: 4%" class="text-coast">
+                  <text style="display: inline-block;width: 40px;text-align: left">
+                    {{item.Serverpart_RevenueS===0 || item.Serverpart_RevenueS? `${item.Serverpart_S}： `:''}}
+                  </text>
+                  <text  style="display: inline-block;width: calc(100% - 50px);margin-left: 10px">
+                    {{item.Serverpart_RevenueS===0 || item.Serverpart_RevenueS? `¥${$util.fmoney(item.Serverpart_RevenueS,2)}`:''}}
+                  </text>
+                </div>
+								<div style="display: inline-block;width: 48%;text-align: right" class="text-coast">
+                  <text style="display: inline-block;width: 40px;text-align: left">
+                    {{item.Serverpart_RevenueN===0 || item.Serverpart_RevenueN? `${item.Serverpart_N}： `:''}}
+                  </text>
+                  <text  style="display: inline-block;width: calc(100% - 50px);margin-left: 10px">
+                    {{item.Serverpart_RevenueN===0 || item.Serverpart_RevenueN? `¥${$util.fmoney(item.Serverpart_RevenueN,2)}`:''}}
+                  </text>
+                </div>
+              </view>
 						</view>
-						
+
 					</view>
 				</view>
-			</view>
+<!--			</view>-->
 		</view>
-		<view class="" v-if="!isLoading && !pageMsg.Serverpart_Name">
+		<view class="" v-if="isLoading && !pageOption.Serverpart_Name">
 			<noFound nodata="true" :text="noDataText"/>
 		</view>
 	</view>
 </template>
 
 <script>
+import request from '@/util/index.js'
 	export default {
 		data() {
+      let now = new Date()
+      let nowTime = this.$util.cutDate(now, 'YYYY-MM-DD',-1)
+      let sTime = this.$util.cutDate(now, 'YYYY-MM-DD', -1)
 			return {
 				isLoading: true,
-				pageMsg: {},
+        pageData: {
+          endDate: nowTime,
+          searchTime: [sTime,nowTime],
+          msg: {},
+          isLoading: true,
+          exsideShow: true,
+          insideShow: true,
+        },
+        pageMsg:{},
 				pageOption: {},
 				noDataText: '抱歉，没有数据，请稍后重试'
 			}
 		},
 		methods: {
-			toTrend(){
+      bindDateChange(e,index){
+        let nowDate = this.pageData.searchTime[index]
+        if(e.detail.value != nowDate){
+          this.pageData.searchTime[index] = e.detail.value
+          this.$forceUpdate()
+          this.getDetail({st:this.pageData.searchTime[0],et:this.pageData.searchTime[1],id:this.pageOption.id,pcode:this.pageOption.pcode})
+        }
+      },
+      toTrend(){
 				this.$util.toNextRoute('navigateTo','/pages/operatingStatements/operatingTrend?name='+this.pageMsg.Serverpart_Name+'&time='+this.pageOption.et+'&id='+this.pageOption.id+'&ProvinceCode='+this.pageOption.pcode)
 			},
 			getDetail(obj){
+        console.log('obj',obj)
 				let _this = this
 				uni.showLoading({
 					title:'正在加载...',
 					mask:true
 				})
-				_this.$request.$webGet('WeChat/GetRevenueReportDetils',{
-					startTime: obj.st,
-					endTime: obj.et,
-					Serverpart_Id: obj.id,
-					pushProvinceCode: obj.pcode
+				// _this.$request.$webGet('WeChat/GetRevenueReportDetils',{
+        request.$webGet('CommercialApi/Revenue/GetRevenueReportDetil',{
+          startTime: obj.st,
+          endTime: obj.et,
+          serverpartId: obj.id,
+          provinceCode: obj.pcode
 				}).then(res=>{
-					
+          console.log('res',res)
 					if(res.Result_Code==100) {
 						_this.pageMsg = res.Result_Data
-						
-					}else{
+
+					}else if(res.Result_Code==200 || res.Result_Code==999){
+            _this.noDataText = '暂无数据'
+          } else{
 						_this.noDataText = res.Result_Desc
 					}
 					uni.hideLoading()
 					_this.isLoading = false
 				})
 			},
-			
+
 		},
 		onLoad(op) {
 			this.pageOption = op
+      if (this.pageOption.st){
+        this.pageData.searchTime[0] = this.pageOption.st
+      }
+      if (this.pageOption.et){
+        this.pageData.searchTime[1] = this.pageOption.et
+      }
 			this.getDetail(op)
 		}
 	}
@@ -102,9 +160,42 @@
 		background-color: #fff;
 	}
 	.page-card {
-		margin: 30rpx 20rpx;
-		
+		margin: 0 20rpx 30rpx;
+
 	}
+  .screen-box {
+    background-color: #fff;
+    padding: 0 20rpx;
+    position: sticky;
+    top: 0;
+    left: 0;
+    z-index: 9;
+  }
+  .screen-box .screen-unit {
+    display: flex;
+    align-items: center;
+    width: 200rpx;
+    padding: 0 14rpx;
+    line-height: 3;
+  }
+  .screen-box .mr20 {
+    margin-right: 20rpx;
+    color: #95999C;
+  }
+  .uni-icon-arrowdown {
+    font-size: 22rpx;
+    color: #C7C7C7;
+    margin-left: 8rpx;
+  }
+  .screen-box text {
+    line-height: 3;
+  }
+  .screen-box image{
+    width: 12rpx;
+    height: 8rpx;
+    margin: 0 16rpx;
+    vertical-align: middle;
+  }
 	.head-card {
 		padding: 30rpx 35rpx;
 		background: linear-gradient(to left, #f7f6f8 0%, #eceaeb 100%);
@@ -131,7 +222,7 @@
 		border: 1rpx solid #F0F0F0;
 		border-radius: 0 0 12rpx 12rpx;
 		overflow: hidden;
-		
+
 		padding: 30rpx 16rpx 30rpx 16rpx;
 	}
 	.cell-body {
@@ -179,9 +270,9 @@
 	text.text-coast {
 		color: #848484;
 		width: 184rpx;
-		
-	}
-	text.text-coast + text.text-coast {
-		text-align: right;
+    text-align: right;
 	}
+	/*text.text-coast + text.text-coast {*/
+	/*	text-align: right;*/
+	//}
 </style>
diff --git a/pages/operatingStatements/index.vue b/pages/operatingStatements/index.vue
index ecf9721..66a168d 100644
--- a/pages/operatingStatements/index.vue
+++ b/pages/operatingStatements/index.vue
@@ -13,36 +13,65 @@
 			</picker>
 		</div>
 		<template v-if="!pageData.isLoading && pageData.msg && pageData.msg.Total_Revenue">
-			<view class="uni-flex ai-center head-card">
-				<view class="" @tap="toTrend()">
-					<view>实收总额</view>
+			<view class="uni-flex ai-center head-card" >
+<!--        @tap="toTrend()"-->
+				<view class="topDetail"  style="width: 100%">
+					<view class="label">实收总额</view>
 					<view class="price-num">¥{{$util.fmoney(pageData.msg.Total_Revenue,2)}}</view>
-				</view>
-				<view class="" v-if="pageData.msg && pageData.msg.Province_ExternalAmount">
-					<div class="all-diff" @tap="regionType=!regionType">
-						<image src="../../static/images/revenue/next.png"></image>
-						切换
-					  </div>
-					<view>{{!regionType ?"省内" :"省外"}}实收</view>
-					<view class="price-num">¥{{!regionType ? $util.fmoney(pageData.msg.Province_InsideAmount,2) : $util.fmoney(pageData.msg.Province_ExternalAmount,2)}}</view>
-				</view>
-				<view class="" v-else>
-					<div class="all-diff" @tap="regionType=!regionType">
-						<image src="../../static/images/revenue/next.png"></image>
-						切换方向
-					  </div>
-					<view>{{!regionType ?"东 (南)" :"西 (北)"}}区实收</view>
-					<view class="price-num">¥{{!regionType ? $util.fmoney(pageData.msg.Revenue_AmountS,2) : $util.fmoney(pageData.msg.Revenue_AmountN,2)}}</view>
-				</view>
+          <view class="detailBox" style="margin-top: 12px">
+            <view class="detailItem" >
+              <view class="value">{{$util.fmoney(pageData.msg.Different_Price_More,2)}}</view>
+              <view class="label">长款金额 <span class="unit">/元</span></view>
+            </view>
+            <view class="detailItem">
+              <view class="value">{{$util.fmoney(pageData.msg.Different_Price_Less,2)}}</view>
+              <view class="label">短款金额 <span class="unit">/元</span></view>
+            </view>
+            <view class="detailItem">
+              <view class="value">{{$util.fmoney(pageData.msg.TotalOffAmount,2)}}</view>
+              <view class="label">优惠金额 <span class="unit">/元</span></view>
+            </view>
+            <view class="detailItem">
+              <view class="value">{{$util.noDecimal(pageData.msg.TicketCount)}}</view>
+              <view class="label">客单数量<span class="unit">/笔</span></view>
+            </view>
+            <view class="detailItem">
+              <view class="value">{{$util.fmoney(pageData.msg.TotalCount,2)}}</view>
+              <view class="label">商品出售 <span class="unit">/件</span></view>
+            </view>
+            <view class="detailItem">
+              <view class="value">{{$util.fmoney(pageData.msg.countave,2)}}</view>
+              <view class="label">商品均价 <span class="unit">/元</span></view>
+            </view>
+          </view>
+
+        </view>
+
+<!--				<view class="" v-if="pageData.msg && pageData.msg.Province_ExternalAmount">-->
+<!--					<div class="all-diff" @tap="regionType=!regionType">-->
+<!--						<image src="../../static/images/revenue/next.png"></image>-->
+<!--						切换-->
+<!--					  </div>-->
+<!--					<view>{{!regionType ?"省内" :"省外"}}实收</view>-->
+<!--					<view class="price-num">¥{{!regionType ? $util.fmoney(pageData.msg.Province_InsideAmount,2) : $util.fmoney(pageData.msg.Province_ExternalAmount,2)}}</view>-->
+<!--				</view>-->
+<!--				<view class="" v-else>-->
+<!--					<div class="all-diff" @tap="regionType=!regionType">-->
+<!--						<image src="../../static/images/revenue/next.png"></image>-->
+<!--						切换方向-->
+<!--					  </div>-->
+<!--					<view>{{!regionType ?"东 (南)" :"西 (北)"}}区实收</view>-->
+<!--					<view class="price-num">¥{{!regionType ? $util.fmoney(pageData.msg.Revenue_AmountS,2) : $util.fmoney(pageData.msg.Revenue_AmountN,2)}}</view>-->
+<!--				</view>-->
 			</view>
 			<view class="modle-title">
 				<image src="/static/images/revenue/yestoday-region.png" mode="aspectFit"></image>
 				<text>经营报表</text>
 			</view>
 			<view class="bg-white" v-if="ServerpartList.length>0">
-				<view class="region-area-title uni-flex ai-center jc-between" v-show="pageData.msg.Province_ExternalAmount" :class="{'active':pageData.insideShow}" @tap="pageData.insideShow=!pageData.insideShow"> 
+				<view class="region-area-title uni-flex ai-center jc-between" v-show="pageData.msg.Province_ExternalAmount" :class="{'active':pageData.insideShow}" @tap="pageData.insideShow=!pageData.insideShow">
 					<text>省内区域</text>
-					
+
 				</view>
 				<view v-show="pageData.insideShow">
 					<view v-for="(item,i) in ServerpartList" :key="i">
@@ -50,7 +79,7 @@
 							<div class="region-cell-unit region-title cuIcon-triangledownfill" >
 								<text class="">{{item.Region_Name}}</text>
 								<div class="ct01">
-									<text class="strong-text">¥{{$util.fmoney(item.Total_Revenue,2)}}</text> 
+									<text class="strong-text">¥{{$util.fmoney(item.Total_Revenue,2)}}</text>
 								</div>
 							</div>
 							<div class="region-cell-unit">
@@ -69,35 +98,34 @@
 								<view class="uni-flex ai-center data-number">
 									<text class="">{{child.Revenue_Proportion}}</text>
 									<text style="flex: 2;">¥{{$util.fmoney(child.Total_Revenue,2)}}</text>
-									 
 								</view>
 							</li>
 						</ul>
 					</view>
-					
+
 				</view>
-				
+
 				<template v-if="insideRegionList.length>0">
 					<view class="region-area-title uni-flex ai-center jc-between" :class="{'active':pageData.exsideShow }" @tap="pageData.exsideShow = !pageData.exsideShow">
 						<text>省外区域</text>
 					</view>
-					<view v-show="pageData.exsideShow"> 
+					<view v-show="pageData.exsideShow">
 						<view v-for="(item,i) in insideRegionList" :key="i">
 							<div class=" region-cell" @tap="toggleRegion(item)">
 								<div class="region-cell-unit region-title cuIcon-triangledownfill" :class="{'active':item.show}">
 									<text class="">{{item.Region_Name}}</text>
 									<div class="ct01">
 										<text class="strong-text">¥{{$util.fmoney(item.Total_Revenue,2)}}</text>
-										
+
 									</div>
-									
+
 								</div>
 								<div class="region-cell-unit">
 									<text>营收占比</text>
 									<div class="ct01">
 										<text class="strong-text">{{item.Revenue_Proportion}}</text>
 									</div>
-									
+
 								</div>
 								<div class="region-cell-unit"><text class="uni-icon uni-icon-arrowright" :class="{'active':item.show}"></text></div>
 							</div>
@@ -107,31 +135,32 @@
 									<view class="uni-flex ai-center data-number">
 										<text class="">{{child.Revenue_Proportion}}</text>
 										<text style="flex: 2;">¥{{$util.fmoney(child.Total_Revenue,2)}}</text>
-										
+
 									</view>
 								</li>
 							</ul>
 						</view>
 					</view>
 				</template>
-				
+
 			</view>
 		</template>
 		<view class="" v-else-if="!pageData.isLoading && !pageData.msg">
 			<noFound nodata=" true" :text="noDataText"/>
 		</view>
-		
+
 	</view>
-	
+
 </template>
 
 <script>
 	import {mapState} from 'vuex'
-	export default {
-		
+  import request from '@/util/index.js'
+  export default {
+
 		data() {
 			let now = new Date()
-			
+
 			let nowTime = this.$util.cutDate(now, 'YYYY-MM-DD',-1)
 			let sTime = this.$util.cutDate(now, 'YYYY-MM-DD', -1)
 			return {
@@ -155,7 +184,7 @@
 		methods: {
 			toTrend(){
 				this.$util.toNextRoute('navigateTo','/pages/operatingStatements/operatingTrend?time='+this.pageData.searchTime[1])
-				
+
 			},
 			bindDateChange(e,index){
 				let nowDate = this.pageData.searchTime[index]
@@ -170,7 +199,6 @@
 					title:'正在加载',
 					mask:true
 				})
-				
 				this.getList()
 			},
 			toggleRegion(item) {
@@ -178,6 +206,7 @@
 				this.$forceUpdate()
 			},
 			toDetail(item){
+        console.log('item',item)
 				this.$util.toNextRoute('navigateTo', '/pages/operatingStatements/detail?pcode='+item.Province_Code+'&id=' + item.Serverpart_Id + '&st=' + this.pageData.searchTime[0]+ '&et=' + this.pageData.searchTime[1])
 				item.visited = true
 				this.$forceUpdate()
@@ -185,14 +214,16 @@
 			getList(){
 				let _this = this
 				let searchTime = this.pageData.searchTime
-				_this.$request.$webGet('WeChat/GetRevenueReport',{
+				// _this.$request.$webGet('WeChat/GetRevenueReport',{
+        request.$webGet('CommercialApi/Revenue/GetRevenueReport',{
 					startTime: searchTime[0],
 					endTime: searchTime[1],
-					additionalCode: this.ProvinceCode=='330000' ? '451200,630000' :''
+					// additionalCode: this.ProvinceCode=='330000' ? '451200,630000' :''
 				}).then(res=>{
-					
+          console.log('res',res)
 					if(res.Result_Code==100) {
 						_this.pageData.msg = res.Result_Data
+            _this.pageData.msg.countave = (Number(_this.pageData.msg.Province_InsideAmount) / Number(_this.pageData.msg.TotalCount)).toFixed(2)
 						 res.Result_Data.revenueRegionModels.map(n=>{
 							n.show = false
 						 })
@@ -202,9 +233,11 @@
 							 })
 							_this.insideRegionList = res.Result_Data.revenueInsideRegionModels
 						}
-						
+
 						_this.ServerpartList = res.Result_Data.revenueRegionModels
-					}else{
+					}else if(res.Result_Code==200 || res.Result_Code==999){
+            _this.noDataText = '暂无数据'
+          }else{
 						_this.pageData.msg = null
 						_this.noDataText = res.Result_Desc
 					}
@@ -219,7 +252,7 @@
 				title:'正在加载...',
 				mask:true
 			})
-			
+
 			this.getList()
 		}
 	}
@@ -248,7 +281,7 @@
 		margin-right: 20rpx;
 		color: #95999C;
 	}
-	.uni-icon-arrowdown { 
+	.uni-icon-arrowdown {
 		font-size: 22rpx;
 		color: #C7C7C7;
 		margin-left: 8rpx;
@@ -268,25 +301,69 @@
 	}
 	.head-card>view {
 		width: 330rpx;
-		height: 190rpx;
+		//height: 190rpx;
 		color: #fff;
 		text-align: center;
 		padding-top: 30rpx;
 		font-size: 28rpx;
 		border-radius: 24rpx;
 		box-sizing: border-box;
-		
 	}
+  .head-card .topDetail .detailBox{
+    width: 100%;
+    display: flex;
+    flex-wrap: wrap;
+    align-content: flex-start;
+  }
+  .head-card .topDetail .label{
+    font-size: 14px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #fff;
+    opacity: 0.8;
+    line-height: 40rpx;
+    margin-bottom: 2px;
+  }
+  .detailBox .detailItem{
+    width: 33%;
+    margin-bottom: 16px;
+  }
+  .detailBox .detailItem .value{
+    font-size: 16px;
+    font-family: DINAlternate-Bold, DINAlternate;
+    font-weight: bold;
+    color: #fff;
+    line-height: 40rpx;
+  }
+  .detailBox .detailItem .label{
+    font-size: 14px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #fff;
+    opacity: 0.8;
+    line-height: 40rpx;
+    margin-bottom: 2px;
+  }
+  .detailBox .detailItem .label .unit{
+    font-size: 28rpx;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #fff;
+    line-height: 40rpx;
+    margin-left: 2px;
+  }
+
+
 	.head-card>view:first-child {
-		
+
 		background: linear-gradient(to left,#93a4ec 0%, #4b76e9 100%);
 	}
-	
+
 	.head-card>view:last-child  {
-		margin-left: 30rpx;
+		//margin-left: 30rpx;
 		background: linear-gradient(to left,#8cdade 0%, #82c2ce 100%);
 		position: relative;
-		overflow: hidden;
+		//overflow: hidden;
 	}
 	.head-card .price-num {
 		font-family: 'Bahnschrift Regular';
@@ -305,7 +382,7 @@
 		top: 0;
 		font-size: 20rpx;
 		border-radius: 0 0 0 54rpx;
-	
+
 	}
 	.all-diff image {
 		width: 20rpx;
@@ -344,7 +421,7 @@
 	    position: relative;
 		color: #929292;
 	    /* font-weight: bolder; */
-	   
+
 	}
 	.region-title,.ct01 {
 		color: #000000;
@@ -352,7 +429,7 @@
 	.ct01 {
 		padding-top: 8rpx;
 	}
-	
+
 	.region-area-title:before {
 		content: '';
 		position: absolute;
@@ -363,19 +440,19 @@
 		border-right: 8rpx solid transparent;
 		border-top: 8rpx solid #BBB7B7;
 	    left: 22rpx;
-	    top: 48rpx; 
+	    top: 48rpx;
 		transform: rotate(-90deg);
 		transition: all 0.4s;
 		display: block;
 	}
 	.active.region-area-title:before{
-		
+
 		border-left: 8rpx solid transparent;
 		border-right: 8rpx solid transparent;
 		border-top: 8rpx solid #E0BB97;
 		transform: rotate(0deg);
 	}
-	
+
 	.region-cell {
 		display: flex;
 		padding: 26rpx 46rpx 16rpx 56rpx;
@@ -383,8 +460,8 @@
 	}
 	.region-cell .active.uni-icon-arrowright::before {
 		transform: rotate(90deg);
-		
-		
+
+
 	}
 	.region-cell .uni-icon-arrowdown,.region-cell .uni-icon-arrowright {
 		font-size: 36rpx;
@@ -407,15 +484,15 @@
 		line-height: 1.5;
 		text-align: right;
 	}
-	
+
 	.region-cell .region-cell-unit:nth-child(1) {
 		flex: 3;
 		text-align: left;
 	}
 	.region-cell .region-cell-unit:nth-child(3) {
-		
+
 		flex: 2.5;
-		
+
 	}
 	.region-cell-image {
 		width: 48rpx;
@@ -423,14 +500,14 @@
 		align-items: center;
 		justify-content: flex-end;
 		height: 50rpx;
-		
+
 	}
-	
+
 	.region-cell image {
 		width: 14rpx;
 		height: 23rpx;
 	}
-	
+
 	/*日结上传服务区*/
 	.region-cell-area {
 		box-sizing: border-box;
@@ -438,19 +515,19 @@
 	.region-cell-area li:nth-child(2n+1) {
 		background-color: #FCFCFC;
 	}
-	.region-cell-area li view:first-child{  
+	.region-cell-area li view:first-child{
 		display: flex;
 		align-items: center;
 	}
-	.region-cell-area li.visited view:first-child{ 
+	.region-cell-area li.visited view:first-child{
 		color:#007AFF;
-		
+
 	}
 
 	.region-cell-area li:nth-child(2n+1) {
 		background-color: #F9F9FB;
 	}
-	
+
 	.region-cell-area li:nth-child(2n) view:first-child:before {
 		content: '';
 		background-color: #5596F9;
@@ -461,9 +538,9 @@
 		margin-right: 16rpx;
 		/* position: absolute;
 		left: 0rpx; */
-	
+
 	}
-	
+
 	.region-cell-area li:nth-child(2n+1) view:first-child:before {
 		content: '';
 		background-color: #FE6D67;
@@ -475,7 +552,7 @@
 	/* 	position: absolute;
 		left: 0rpx; */
 	}
-	
+
 	.region-cell-area li {
 		display: flex;
 		align-items: center;
@@ -485,7 +562,7 @@
 		text-align: left;
 		color: #2E2E2E;
 	}
-	
+
 	.region-cell-area li>view {
 		flex: 2;
 		font-size: 22rpx;
diff --git a/pages/userCenter/userCenter.vue b/pages/userCenter/userCenter.vue
index 3684574..abcceca 100644
--- a/pages/userCenter/userCenter.vue
+++ b/pages/userCenter/userCenter.vue
@@ -91,13 +91,13 @@ import Tabbar from "../../components/tabbar/tabbar.vue";
                 homeUrl: '/pages/operatingStatements/index',
                 imagePath: '/static/images/user/reportForms.svg',
                 bgUrl:'https://eshangtech.com/ShopICO/ahyd-BID/user/firstBg_3.png',
-                isNotice:'',
+                isNotice:true,
                 value: 1,
               },
             ],
           },
           {
-            name: '商业经营',
+            name: '商业画像',
             value: 2,
             list: [
               {