From 21a3701c4717ce73283b44879d217243a3ab8f61 Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Mon, 27 Mar 2023 16:59:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../driverDetails/driverDetails.vue           |  19 +-
 driverManagement/index/index.vue              |  15 ++
 pages/index/newindex.css                      | 229 +++++++++++++++---
 pages/index/newindex.vue                      | 185 +++++++-------
 static/copy.png                               | Bin 0 -> 347 bytes
 5 files changed, 322 insertions(+), 126 deletions(-)
 create mode 100644 static/copy.png

diff --git a/driverManagement/driverDetails/driverDetails.vue b/driverManagement/driverDetails/driverDetails.vue
index 039e536..df340e7 100644
--- a/driverManagement/driverDetails/driverDetails.vue
+++ b/driverManagement/driverDetails/driverDetails.vue
@@ -35,7 +35,10 @@
 												inactive-color="#BBBBBB" size='35' v-model="switchOpen"
 												@change="change"></u-switch>
 										</view>
-										<view>{{dirverDetails.customerInfoVo.phone}}</view>
+										<view>
+											{{dirverDetails.customerInfoVo.phone}} 
+											<view class="copy" v-if="dirverDetails.customerInfoVo.phone" @tap.stop="copy(dirverDetails.customerInfoVo.phone)"></view>
+										</view>
 										<view style="font-size: 22rpx;color: #999999;">
 											{{dirverDetails.customerInfoVo.createTime}}
 										</view>
@@ -328,6 +331,11 @@
 			// }
 		},
 		methods: {
+			copy(text) {
+				uni.setClipboardData({
+					data: text,
+				});
+			},
 			dirverIndexFn(e){
 				if(e){
 					this.dirverIndex = 1;this.current=1
@@ -852,4 +860,13 @@
 		position: relative;
 		font-size: 28rpx;
 	}
+	.copy {
+		position: relative;
+		top: 7rpx;
+		display: inline-block;
+		margin-left: 15rpx;
+		width: 32rpx;
+		height: 32rpx;
+		background: url('../../static/copy.png')  100%/ 100%;
+	}
 </style>
diff --git a/driverManagement/index/index.vue b/driverManagement/index/index.vue
index 6a665bd..6079c6d 100644
--- a/driverManagement/index/index.vue
+++ b/driverManagement/index/index.vue
@@ -39,6 +39,7 @@
 									<view :style="{color:item.userName?'':'#999999'}">{{item.userName?item.userName:' 无设置'}}</view>
 									<view>
 										{{item.phone?item.phone:'无设置'}}
+										<view class="copy"  v-if="item.phone" @tap.stop="copy(item.phone)"></view>
 									</view>
 									<view class="form-item_body_left_bottom_text" style="">{{item.companyName?item.companyName :'无直属公司'}}</view>
 								</view>
@@ -130,6 +131,11 @@
 			this.getList();
 		},
 		methods: {
+			copy(text) {
+				uni.setClipboardData({
+					data: text,
+				});
+			},
 			scrolltolower() {
 				this.getData.currentPage+=1
 				console.log('触底了')
@@ -379,4 +385,13 @@
 	.top {
 		height: var(--status-bar-height);
 	}
+	.copy {
+		position: relative;
+		top: 7rpx;
+		display: inline-block;
+		margin-left: 15rpx;
+		width: 32rpx;
+		height: 32rpx;
+		background: url('../../static/copy.png')  100%/ 100%;
+	}
 </style>
diff --git a/pages/index/newindex.css b/pages/index/newindex.css
index 132d484..eef6673 100644
--- a/pages/index/newindex.css
+++ b/pages/index/newindex.css
@@ -1,11 +1,20 @@
+/* page {
+	background: ;
+} */
+
 .home_page_container {
 	position: relative;
+	padding-top: 330rpx;
 	width: 100vw;
-	/* height: 100vh; */
 	overflow: hidden;
+	
+	
+/* 	display: flex;
+	height: 100vh;
+	flex-direction: column; */
 }
 
-.home_page_header {
+/* .home_page_header {
 	width: 100%;
 	height: 703rpx;
 	background-color: #ADCEFF;
@@ -30,10 +39,8 @@
 .home_page_menu_circular {
 	width: 600rpx;
 	height: 600rpx;
-	/* background-color:#2866FF ; */
 	border-radius: 50%;
 	position: relative;
-	/* transform: rotateZ(180deg); */
 	transition: all 1s;
 	z-index: 2;
 	display: flex;
@@ -45,8 +52,7 @@
 	Width: 100;
 	Height: 52rpx;
 	text-align: end;
-	/* padding-right:34rpx ; */
-}
+} */
 
 .iconclass {
 	font-weight: 600;
@@ -55,7 +61,7 @@
 	right: 34rpx;
 }
 
-.home_page_header_title {
+/* .home_page_header_title {
 	font-size: 62rpx;
 	font-weight: 500;
 	display: flex;
@@ -99,10 +105,8 @@
 
 .home_page_menu_item {
 	position: absolute;
-	/* width: fit-content;; */
 	width: 60rpx;
 	height: 60rpx;
-	/* background-color: #007AFF; */
 	border-radius: 50%;
 	display: flex;
 	align-items: center;
@@ -152,42 +156,208 @@
 	border-radius: 0px 0px 10px 10px;
 	width: 290rpx;
 	padding:  15rpx ;
+} */
+
+
+.header {
+	position: fixed;
+	top: 0;
+	left: 0;
+	/* position: relative; */
+	width: 100%;
+	height: 336rpx;
+	background: #2866FF;
+	z-index: 10;
 }
-.collection{
-	/* padding: 27rpx; */
-	height: 260rpx;
-	margin:  0 auto;
+.info-frame {
+	position: absolute;
+	left: 50%;
+	bottom: -44rpx;
+	transform: translateX(-50%);
+	padding: 20rpx 0 20rpx 200rpx;
 	display: flex;
+	flex-direction: column;
+	justify-content: space-evenly;
+	width: 670rpx;
+	height: 160rpx;
+	border-radius: 20rpx;
+	background: #fff;
+}
+
+.info-frame > view:nth-of-type(1),
+.info-frame > view:nth-of-type(3) {
+	/* font-size: 32rpx; */
+	overflow: hidden;
+	width: 320rpx;
+	text-overflow: ellipsis;
+	/* margin-top: 60rpx; */
+	white-space: nowrap;
+	color: #666;
+}
+.info-frame > view:nth-of-type(2) {
+	/* font-size: 32rpx; */
+	color: #bbb;
+}
+
+.info-frame > image {
+	position: absolute;
+	left: 40rpx;
+	top: -30rpx;
+	width: 120rpx;
+	height: 120rpx;
+	/* border-radius: 50%; */
+}
+.domain {
+	/* flex: 1; */
+	
+	padding-bottom: 320rpx;
+}
+.domain > .item {
 	margin-top: 30rpx;
-	padding: 0 27rpx;
+}
+.domain > .item:nth-of-type(1) {
+	margin-top: 90rpx;
+}
+
+.domain > .item > .title {
+	padding-left: 40rpx;
+	font-size: 32rpx;
+	color: #666;
+}
+.options-frame {
+	margin-top: 10rpx;
+	padding-left: 106rpx;
+	display: flex;
+}
+.options-frame > .option {
 	position: relative;
-	box-sizing: border-box;
-	/* justify-content: space-between; */
+	margin-left: 20rpx;
+	padding: 10rpx 14rpx;
+	width: 240rpx;
+	height: 140rpx;
+	background: #fff;
+	border-radius: 20rpx;
+}
+.options-frame > .option:nth-of-type(1) {
+	margin-left: 0;
+}
+.options-frame > .option > .star {
+	position: absolute;
+	top: 0;
+	right: 0;
+	width: 80rpx;
+	height: 80rpx;
+	line-height: 80rpx;
+	text-align: center;
+	background: #ffffff;
+	border-radius: 20rpx;
+	z-index: 5;
+	
+}
+.options-frame > .option > .wall {
+	position: relative;
+	padding-left: 20rpx;
+	padding-top: 9rpx;
+	width: 212rpx;
+	height: 120rpx;
+	background: rgba(40, 102, 255, .1) ;
+	border-radius: 20rpx;
+}
+.options-frame > .option > .wall > .name {
+	position: absolute;
+	left: 24rpx;
+	bottom: 12rpx;
+	font-size: 28rpx;
+	color: #666;
+}
+
+
+.collection{
+	position: fixed;
+	left: 0;
+	bottom: 0;
+	width: 100%;
+	height: 318rpx;
+	background: #F0F2FF;
+	z-index: 10;
+}
+.collection > .collect-frame {
+	display: flex;
+	justify-content: space-between;
+	position: absolute;
+	left: 0;
+	bottom: 0;
+	padding: 0 54rpx;
+	width: 100%;
+	height: 218rpx;
+	background: #adceff;
+	border-radius: 30rpx 30rpx 0 0;
+}
+.collection_item {
+	position: relative;
+	top: -74rpx;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	/* margin-left: calc((100% - 60/* 0rpx) / 2); */ 
+	width: 200rpx;
+	height: 240rpx;
+	background-color: #FFF;
+	border-radius: 20rpx;
+	animation: name 0.5s;
 }
-.collectionbg{
+.collection-empty {
+	position: relative;
+	top: -74rpx;
+
+	width: 200rpx;
+	height: 240rpx;
+	
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	flex-direction: column;
+	
+	background-color: #FFF;
+	border:  6rpx dashed #BBBBBB;
+	border-radius: 20rpx;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+/* .collectionbg{
 	width: calc(100% - 54rpx);
 	height: 100%;
 	position: absolute;
 	z-index: -1;
 	box-sizing: border-box;
 	display: flex;
-}
-.collection_item{
-	width: 200rpx;
-	height: 100%;
-	background-color: #FFFFFF;
-	border-radius: 10px;
+} */
+/* .collection_item{
+	position: relative;
 	display: flex;
 	justify-content: center;
 	align-items: center;
 	margin-left: calc((100% - 600rpx) / 2);
-	position: relative;
+	width: 200rpx;
+	height: 100%;
+	background-color: #FFFFFF;
+	border-radius: 10px;
 	animation: name 0.5s;
-}
-.collection_itembg{
+} */
+
+/* .collection_itembg{
 	width: 200rpx;
 	height: 100%;
-	/* background-color: #BBBBBB; */
 	border-radius: 10px;
 	display: flex;
 	justify-content: center;
@@ -199,7 +369,10 @@
 	color: #BBBBBB;
 	flex-direction: column;
 	
-}
+} */
+
+
+
 @keyframes name{
 	from{opacity: 0;}
 	to{opacity: 1;}
diff --git a/pages/index/newindex.vue b/pages/index/newindex.vue
index 4aa8e1d..fddfd53 100644
--- a/pages/index/newindex.vue
+++ b/pages/index/newindex.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="home_page_container">
-		<view :style="{paddingTop:styles.top+styles.height + 'px'}" class="home_page_header">
+<!-- 		<view :style="{paddingTop:styles.top+styles.height + 'px'}" class="home_page_header">
 			<view class="home_page_header_title">
 				{{user.name?`Hi ,${user.name}` : user.userPhone?user.userPhone:'暂未设置'}}
 				<uni-icons @tap.stop='close()' class="iconclass" color="#ffffff" custom-prefix="iconfont"
@@ -8,9 +8,9 @@
 				</uni-icons>
 			</view>
 			<view class="home_page_header_identity">{{user.roles[0].roleName}}</view>
-		</view>
+		</view> -->
 
-		<view :style="{transform:`rotate(${180}deg)`}" class="home_page_menu">
+<!-- 		<view :style="{transform:`rotate(${180}deg)`}" class="home_page_menu">
 			<view class="home_page_menu_name">
 				{{menuList[menuIndex].name?menuList[menuIndex].name:''}}
 			</view>
@@ -25,8 +25,8 @@
 						size="25"></uni-icons>
 				</view>
 			</view>
-		</view>
-		<view :style="{transform:`translateY(${Submenu?0:-433}rpx)`}" class="Submenu">
+		</view> -->
+<!-- 		<view :style="{transform:`translateY(${Submenu?0:-433}rpx)`}" class="Submenu">
 			<view @tap.stop="jump(item)" v-if="user.authList.includes(item.lable)"
 				v-for="(item,index) in menuList[menuIndex].submenu" class="Submenu_item">
 				<view @tap.stop="collectionFn(item)" class="label">
@@ -35,28 +35,59 @@
 				</view>
 				<view class="Submenu_item_name">{{item.name}}</view>
 			</view>
+		</view> -->
+		
+		
+		<view class="header">
+			<view class="info-frame">
+				<image  src="../../static/tx.png"></image>
+				<view>{{user.userPhone || '暂未设置'}}</view>
+				<view>{{user.name ||'暂未设置'}}</view>
+				<view>{{user.roles[0].roleName}}</view>
+				<uni-icons @tap.stop='close()' class="iconclass" color="#bbb" custom-prefix="iconfont"
+					type="iconkaiguan" size="35">
+				</uni-icons>
+			</view>
 		</view>
-		<view class="collection">
-			<view @tap.stop="jump(item)" v-for="(item,index) in collection" class="collection_item">
-				<view @tap.stop="remove(item)" class="tip">
-					<uni-icons custom-prefix="iconfont" color="#ffffff" type="iconchiping" size="20"></uni-icons>
-				</view>
-				<view class="collection_item_name">
-					<uni-icons custom-prefix="iconfont" color="#2866FF" :type="item.icon" size="30"></uni-icons>
-					<view class="collection_item_text">{{item.name}}</view>
+		<view class="domain">
+			<view class="item" v-for="item,index in menuList" :key="index">
+				<view class="title">{{item.name}}</view>
+				<view class="options-frame" >
+					<view class="option" v-for="optionItme,optionIndex in item.submenu" :key="optionIndex" @tap.stop="jump(optionItme)">
+						<view class="star" @tap.stop="collectionFn(optionItme)">
+							<uni-icons :color="iconFn(optionItme)" custom-prefix="iconfont" type="iconshoucang-yishoucang" size="18"></uni-icons>
+						</view>
+						<view class="wall">
+							<view class="name">{{optionItme.name}}</view>
+							<uni-icons color="#fff" custom-prefix="iconfont" :type="optionItme.icon" size="50"></uni-icons>
+						</view>
+					</view>
 				</view>
 			</view>
-			<view class="collectionbg">
-				<view v-for="(item,index) in 3" class="collection_itembg">
-					<view>
-						<text>点击</text>
-						<uni-icons style="margin-left: 10rpx;" color="#bbbbbb" custom-prefix="iconfont"
-							type="iconshoucang-yishoucang" size="12"></uni-icons>
+		</view>
+		
+		
+		<view class="collection">
+			<view class="collect-frame">
+				<template v-for="(item,index) in collection">
+					<view v-if="item" @tap.stop="jump(item)" class="collection_item">
+						<view @tap.stop="remove(item)" class="tip">
+							<uni-icons custom-prefix="iconfont" color="#fff" type="iconchiping" size="20"></uni-icons>
+						</view>
+						<view class="collection_item_name">
+							<uni-icons custom-prefix="iconfont" color="#2866FF" :type="item.icon" size="30"></uni-icons>
+							<view class="collection_item_text">{{item.name}}</view>
+						</view>
 					</view>
-					<view>收藏</view>
-					<!--
-					<view>Here</view> -->
-				</view>
+					<view v-else class="collection-empty">
+							<view>
+								<text>点击</text>
+								<uni-icons style="margin-left: 10rpx;" color="#bbbbbb" custom-prefix="iconfont"
+									type="iconshoucang-yishoucang" size="12"></uni-icons>
+							</view>
+							<view>收藏</view>
+					</view>
+				</template>
 			</view>
 		</view>
 	</view>
@@ -99,7 +130,6 @@
 		watch: {
 			menuIndex: (n, o) => {
 
-				console.log(n, 'menuIndex')
 			},
 			collection: function(n, o) {
 				uni.setStorageSync('collection', n);
@@ -117,20 +147,20 @@
 									url: '../login/login?type=1'
 								})
 							})
-						} else if (res.cancel) {
-							console.log('用户点击取消');
 						}
 					}
 				});
 
 			},
 			jump(e) {
+				console.log(e.router)
+				uni.navigateTo({
+					url: e.router,
+				})
+				return 
 				if (this.user.authList.includes(e.lable)) {
 					uni.navigateTo({
 						url: e.router,
-						fail(e) {
-							console.log('失败')
-						},
 					})
 				} else {
 					uni.showToast({
@@ -139,47 +169,44 @@
 					})
 				}
 			},
-			remove(e) {
-				let indexk;
-				this.collection.forEach((item, index) => {
-					if (e.name == item.name) {
-						indexk = index
-					}
-				})
-				this.collection.splice(indexk, 1);
+			remove(item) {
+				let index = this.collection.findIndex(i => i.name === item.name)
+				this.$set(this.collection,index,'')
 			},
 			iconFn(e) {
 				return this.collection.filter((item) => e.name == item.name).length == 0 ? '#bbbbbb' : '#FFB730';
 			},
 			initFn() {
 				this.menuList = JSON.parse(JSON.stringify(menus))
-				this.menuList.forEach((item, index) => {
-					item = Object.assign(item, this.circularPositioning(index));
-				})
-				this.trackingPosition.x = this.menuList[0].x;
-				this.trackingPosition.y = this.menuList[0].y;
-				this.collection = uni.getStorageSync('collection') || [];
+				
+				// this.menuList.forEach((item, index) => {
+				// 	item = Object.assign(item, this.circularPositioning(index));
+				// })
+				// this.trackingPosition.x = this.menuList[0].x;
+				// this.trackingPosition.y = this.menuList[0].y;
+				
+				this.collection = uni.getStorageSync('collection') || ['','',''];
 				this.user = uni.getStorageSync('user');
 			},
-			collectionFn(e) {
-				console.log(this.collection)
-				if (this.collection.length == 0) {
-					this.collection.unshift(e)
-				} else {
-					let repeatTest = this.collection.filter((item) => e.name == item.name).length == 0 ? true : false;
-					if (repeatTest) {
-						if (this.collection.length >= 3) {
-							this.collection.splice(this.collection.length - 1, 1)
-						}
-						this.collection.unshift(e)
-					} else {
-						this.remove(e)
-						// uni.showToast({
-						// 	title:'无需重复添加',
-						// 	icon:'none'
-						// })
-					}
+			collectionFn(item) {
+				let isHave = this.collection.find(i => i.name === item.name)
+				// 是否已收藏
+				if(isHave) {
+					this.remove(item)
+					return 
+				}
+				let isHaveEmptyIndex =  this.collection.findIndex(i => i === '')
+				// 是否有空余的收藏位置
+				if(isHaveEmptyIndex !== -1) {
+					this.$set(this.collection,isHaveEmptyIndex,item)
+					return 
 				}
+				if(this.collection.length === 3) {
+					//如果收藏满了 栈底推出
+					this.collection.pop()
+				}
+				//栈顶推入
+				this.collection.unshift(item)
 			},
 			gestureAnalysis(e) {},
 			indexDis(e) {
@@ -203,46 +230,10 @@
 				}, 500);
 			},
 			menuClick(index) {
-				// let newList = []
-				// // let arrayList =  this.menuList.length
-				// let arrayList =  8
-				// let alient = 0
-				// if (arrayList % 2 == 0){
-				//     alient = Math.floor(arrayList/2)
-				// }else{
-				// 	alient = Math.floor(arrayList/2)+1
-				// }
-				// let bbb = 7;
-				// index =6;
-				// console.log("index:{}alient:{},menuIndex{}arrayList{}",index,alient,bbb,arrayList);
-				// // // 计算当前坐标点和目标左边点差值0
-				// for(let i = 0; i <= arrayList-1; i++){
-				// 	let aaa = bbb;
-				// 	if(i<=alient){
-				// 		aaa = bbb-(alient-i);
-				// 		if(aaa < 0){
-				// 			aaa = arrayList-aaa
-				// 			console.log("1inde:{},aaa:{}",i,aaa)
-				// 		}else{
-				// 			console.log("2inde:{},aaa:{}",i,aaa)
-				// 		}
-				// 	}else{
-				// 		aaa = bbb+(i-alient);
-				// 		if(aaa >= arrayList){
-				// 			aaa = aaa-arrayList
-				// 			console.log("3inde:{},aaa:{}",i,aaa)
-				// 		}else{
-				// 			console.log("4inde:{},aaa:{}",i,aaa)
-				// 		}
-				// 	}
-
-				// }
-				// // NO=8
 				this.Submenu = false
 				let average = 360 / this.menuList.length;
 				this.trackingPosition.angle = index * average;
 				this.trackingPosition.fangle = -this.trackingPosition.angle;
-				// this.menuIndex = null
 				if (this.menuList[this.menuIndex].colorOpen) {
 					this.menuList[this.menuIndex].colorOpen = false
 				}
diff --git a/static/copy.png b/static/copy.png
new file mode 100644
index 0000000000000000000000000000000000000000..d77a63e263935603b220f8a79b36cfee2b4e0107
GIT binary patch
literal 347
zcmV-h0i^zkP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$6-h)vR9HvtmR}BnFbu}qa1ik%;z^W4tgqq|Np}djiEtA<NzDkFfzi|f{z<l1
zX#2~zuKf_ceDKTl;lBW^wFePNC#cpCQRT<06=3Ew0Av%2ccF;5HOADpJnsNVpP&$t
zO903Q0QLY-5m6otKtyV2ACj3}@lyo&eFgfbR(SW<649EOyCz(;2fRk{`==(N?WX`-
zm%47v#{(k*L<OP(QGvPqz<9<CRx2|<9YkeWrb&{x@1dro1pqfy?_Qwu7o(m16d=HW
zs6u83=&veu3rs_>1i)Kc^Jf8^b#62g4lFj}N<=y@q4f;|1+2B1h&cN_^$eWvt7H!j
tw};q;5+Gu0j5%uKgDkc-x#qtJa0N;p7%+$TA%6e>002ovPDHLkV1ifejPn2h

literal 0
HcmV?d00001