From 83786fb95b6fcc141a53c400594325248b9b2130 Mon Sep 17 00:00:00 2001
From: cclu <lkrnchocolateaaron@gmail.com>
Date: Wed, 11 May 2022 18:46:14 +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

---
 common/css/listUnit.css                              |  6 +++++-
 common/utils.js                                      |  2 +-
 components/uni-popup.vue                             |  2 +-
 pages/authorityApproval/components/businessUnit.vue  |  6 +++---
 .../components/merchartInfoView.vue                  |  2 +-
 pages/authorityApproval/index.vue                    |  7 ++++---
 pages/businessApproval/components/businessUnit.vue   | 12 ++++++------
 pages/businessApproval/productDetail.vue             |  2 ++
 pages/everdayRenven/components/CarAnalysis.vue       |  8 ++++----
 pages/everdayRenven/index.vue                        |  2 +-
 10 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/common/css/listUnit.css b/common/css/listUnit.css
index e8335ba..5524f5e 100644
--- a/common/css/listUnit.css
+++ b/common/css/listUnit.css
@@ -19,6 +19,7 @@
 	white-space: nowrap;
 	margin-left: 36rpx;
 	color: #333333;
+
 	
 }
 .content-type-text {
@@ -26,7 +27,10 @@
 	padding-left: 38rpx;
 	font-size: 22rpx;
 	line-height: 1.6;
-	max-width: 610rpx;
+	max-width: 306rpx;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+		overflow: hidden;
 }
 .content-index {
 	width: 42rpx;
diff --git a/common/utils.js b/common/utils.js
index d65655d..ad3b438 100644
--- a/common/utils.js
+++ b/common/utils.js
@@ -154,7 +154,7 @@ function addUserBehavior (obj) {
   // 视频播放
 const EZUIPlayer = require('./ezuikit.js'); 
 function playVideo(opt) {
-	  debugger
+	  
 	  return new EZUIPlayer(opt)
   }
 export default {
diff --git a/components/uni-popup.vue b/components/uni-popup.vue
index d7e93f8..3f07cbf 100644
--- a/components/uni-popup.vue
+++ b/components/uni-popup.vue
@@ -105,7 +105,7 @@
 		left: 0;
 		bottom: 0;
 		width: 100%;
-		min-height: 200upx;
+		min-height: 400upx;
 		line-height: 100upx;
 		text-align: center;
 	}
diff --git a/pages/authorityApproval/components/businessUnit.vue b/pages/authorityApproval/components/businessUnit.vue
index be271a2..31c33bd 100644
--- a/pages/authorityApproval/components/businessUnit.vue
+++ b/pages/authorityApproval/components/businessUnit.vue
@@ -2,7 +2,7 @@
 	<div class="card" :class="item.SORTNUM == 0 ? 'conten-border' : ''" @tap='goDetail' v-if="item">
 		<div class="uni-flex jc-between" >
 			<p class="contentName">
-				{{item.name}}
+				{{item.serverpart}}
 			<!-- <span v-if="item.HIGHWAYPROINST_NEXTID=='3000'" style="color:#D73535;">【退】</span>
 				<span v-else-if="item.HIGHWAYPROINST_NEXTID=='4000'" style="color:#D73535;">【移】</span> -->
 			</p>
@@ -10,10 +10,10 @@
 		</div>
 		<div class="content-index">{{i+1}}</div>
 		<view style="line-height: 1;">
-			<text class="content-type-text">{{item.serverpart}}</text>
+			<text class="content-type-text">{{item.title}}</text>
 		</view>
 		<view class="content-box-cashpay">
-			<text >{{item.title}}</text> 
+			<text >{{item.name}}</text> 
 	
 		</view>
 		<view class="bb1"></view>
diff --git a/pages/authorityApproval/components/merchartInfoView.vue b/pages/authorityApproval/components/merchartInfoView.vue
index 9c2f513..35871b9 100644
--- a/pages/authorityApproval/components/merchartInfoView.vue
+++ b/pages/authorityApproval/components/merchartInfoView.vue
@@ -275,7 +275,7 @@
 			},
 			savaShops() {
 				let _this = this
-				debugger
+				
 				if(!this.selectShopids.length){
 					uni.showToast({ title: '请选择需要授权的门店' ,icon:'none'})
 					return 
diff --git a/pages/authorityApproval/index.vue b/pages/authorityApproval/index.vue
index 8683f2e..46b251e 100644
--- a/pages/authorityApproval/index.vue
+++ b/pages/authorityApproval/index.vue
@@ -24,7 +24,7 @@
 			<text>{{!pageData.isEnd ? '正在加载,请稍后...':'——— 我是有底线的 ———'}}</text>
 		</view>
 		<UniPop :show="showPop" @hidePopup="closePop" type="bottom" @touchmove.prevent round="true">
-			<view class="pb24">
+			<view class="pb24" style="min-height: 550rpx;">
 				<!-- <view class="moduleTitle">日期</view>
 				<view class="uni-flex align-center">
 					<view v-for="(d,index) in dateList" :key="index" @click="selectDate(index)" class="tag-item" :class="{'actived':dateIndex==index}">{{d.name}}</view>
@@ -238,8 +238,9 @@
 	color: #fff;
 	font-size: 28rpx;
 	background: #5b96e9;
-	border-radius: 8rpx;
+	border-radius: 40rpx;
 	/* margin-top: 48rpx; */
-	margin: 48rpx auto 24rpx auto;
+	margin: 48rpx auto 0 auto;
+	transform: translateY(88%);
 }
 </style>
diff --git a/pages/businessApproval/components/businessUnit.vue b/pages/businessApproval/components/businessUnit.vue
index 5ebe3f4..02aec55 100644
--- a/pages/businessApproval/components/businessUnit.vue
+++ b/pages/businessApproval/components/businessUnit.vue
@@ -2,18 +2,18 @@
 	<div class="card" :class="item.SORTNUM == 0 ? 'conten-border' : ''" @tap='goDetail' v-if="item">
 		<div class="uni-flex jc-between" >
 			<p class="contentName">
-				{{item.PRODEF_NAME}}
-				<span v-if="item.HIGHWAYPROINST_NEXTID=='3000'" style="color:#D73535;">【退】</span>
-				<span v-else-if="item.HIGHWAYPROINST_NEXTID=='4000'" style="color:#D73535;">【移】</span>
+				{{item.SERVERPART_NAME}}
+			<!-- 	<span v-if="item.HIGHWAYPROINST_NEXTID=='3000'" style="color:#D73535;">【退】</span>
+				<span v-else-if="item.HIGHWAYPROINST_NEXTID=='4000'" style="color:#D73535;">【移】</span> -->
 			</p>
 			<text class="typeText" :class="item.HIGHWAYPROINST_NEXTID=='9000' ? 'typeText-color' : ''">{{item.SORTNUM==0 ? '待我处理': proStatus[item.HIGHWAYPROINST_NEXTID]}}</text>
 		</div>
 		<div class="content-index">{{i+1}}</div>
-		<view style="line-height: 1;">
-			<text class="content-type-text">{{item.SERVERPART_NAME}}</text>
+		<view style="line-height: 1;" class="content-type-text">
+			{{item.PROINST_NAME}}
 		</view>
 		<view class="content-box-cashpay">
-			<text >{{item.PROINST_NAME}}</text> 
+			<text >{{item.PRODEF_NAME }}</text> 
 	
 		</view>
 		<view class="bb1"></view>
diff --git a/pages/businessApproval/productDetail.vue b/pages/businessApproval/productDetail.vue
index 87e242a..9f2b3ac 100644
--- a/pages/businessApproval/productDetail.vue
+++ b/pages/businessApproval/productDetail.vue
@@ -414,6 +414,7 @@
 		box-shadow: 0 2upx 6upx rgba(0, 0, 0, 0.1);
 		margin-left: 24upx;
 		margin-right: 24upx;
+		margin-top: 2rpx;
 	}
 
 	.main-card+.main-card {
@@ -422,6 +423,7 @@
 
 	.uni-collapse-content .main-card:nth-last-child(1) {
 		margin-bottom: 40upx;
+		
 	}
 
 	.card-title {
diff --git a/pages/everdayRenven/components/CarAnalysis.vue b/pages/everdayRenven/components/CarAnalysis.vue
index 63056df..6121342 100644
--- a/pages/everdayRenven/components/CarAnalysis.vue
+++ b/pages/everdayRenven/components/CarAnalysis.vue
@@ -36,7 +36,7 @@
 			</div>
 			<div class="customer-content">
 				<div class="customer-title">车辆归属地</div>
-				<div v-if="chartdata.countChart[canvasTab] || !lodingDetail">
+				<div v-if="chartdata.countChart[canvasTab] && !lodingDetail">
 					<view class="operation-pie-content">
 						<!-- <uni-ec-canvas 
 							class="operation-stock-content"
@@ -221,10 +221,10 @@
 					...params
 				})
 
+					
 				if (data.Result_Code === 100 && data.Result_Data.List.length > 0) {
 					const [list] = data.Result_Data.List
 					this.chartdata.countChart[type] = list
-					
 					this.showClounm({
 						id: 'carBelong',
 						data: [{
@@ -241,7 +241,7 @@
 						}],
 						categories: list.OwnerCity
 					})
-					// 
+					
 					this.showPie({
 						id: 'carFunnel',
 						data: list.OwnerProvinceList.map(n => {
@@ -364,7 +364,7 @@
 							type:'categories',
 							titleFontSize: uni.upx2px(22),
 							titleFontColor: '#BABABA',
-							titleOffsetX:  uni.upx2px(-40),
+							// titleOffsetX:  uni.upx2px(-40),
 							titleOffsetY:  uni.upx2px(-20),
 							fontSize: uni.upx2px(24),
 							fontColor: '#777777',
diff --git a/pages/everdayRenven/index.vue b/pages/everdayRenven/index.vue
index 6d41e27..03345d4 100644
--- a/pages/everdayRenven/index.vue
+++ b/pages/everdayRenven/index.vue
@@ -1176,7 +1176,7 @@
 				title: '正在加载...'
 			})
 			const toSnhuiPageProvinceCode = [340000,520000,451200,510000,620000,630000] // 需要跳转到安徽类型的每日营收推送页面
-			debugger
+			
 			if (option.ProvinceCode) { // 从推送进入
 				if (toSnhuiPageProvinceCode.indexOf(parseInt(option.ProvinceCode))>-1) {
 					// 451200、510000、520000、620000、630000