11

2024-06-23 17:17:51 +08:00 · 2024-06-23 17:17:51 +08:00 · c5e0df3081
commit c5e0df3081
parent 486da8d5ea
9 changed files with 1596 additions and 452 deletions
--- a/page_user/agreement.vue
+++ b/page_user/agreement.vue
@ -1,8 +1,16 @@
 <template>
 	<view class="page">
-		<u-navbar title="协议" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='45'></u-navbar>
+		<u-navbar :is-back='false' title=" " :border-bottom="false" :background="bgc" title-color='#000'
+			title-size='36' height='45'></u-navbar>
 		<view class="cont" v-html="info.content"></view>
+		<view class="bottom">
+			<view class="btn" @click="quit()">
+				不同意
+			</view>
+			<view class="btn1" @click="ok()">
+				同意
+			</view>
+		</view>
 	</view>
 </template>

@ -18,13 +26,36 @@
 				areaInfo: {}
 			}
 		},
+		onLoad(e) {
+			console.log(e, 'eee');
+			if (e.needback) {
+				this.showbot = true
+			}
+		},
 		onShow() {
 			this.getagree()
 		},
 		methods: {
+			ok() {
+					this.$store.commit('SET_SHOWAGRE',false);
+					console.log( this.$store.getters.showagre);
+					uni.redirectTo({
+						url:'/pages/index/index'
+					})
+			},
+			quit() {
+				uni.exitMiniProgram({
+					success: function() {
+						console.log('退出小程序成功');
+					},
+					fail: function(err) {
+						console.log('退出小程序失败', err);
+					}
+				})
+			},

 			getagree() {
-					let id = uni.getStorageSync('areaId');
+				let id = 15
 				this.$u.get(`/app/article/list?areaId=${id}&tag=agreement`).then((res) => {
 					if (res.code === 200) {
 						this.info = res.rows[0];
@ -78,6 +109,47 @@
 	.page {
 		width: 750rpx;

+		.bottom {
+			position: fixed;
+			background: #fff;
+			bottom: 0;
+			width: 750rpx;
+			height: 200rpx;
+			display: flex;
+			flex-wrap: nowrap;
+			align-items: center;
+			justify-content: space-around;
+			// box-shadow: 12rpx 16rpx 40rpx 0rpx rgba(42,130,228,0.1);
+			.btn {
+				width: 250rpx;
+				height: 80rpx;
+				display: flex;
+				flex-wrap: nowrap;
+				align-items: center;
+				justify-content: center;
+				// border: 2rpx solid #000;
+				border-radius: 40rpx;
+				background: #ccc;
+				color: #fff;
+				font-size: 28rpx;
+				font-weight: 600;
+			}
+			.btn1{
+				width: 250rpx;
+				height: 80rpx;
+				display: flex;
+				flex-wrap: nowrap;
+				align-items: center;
+				justify-content: center;
+				// border: 2rpx solid #000;
+				border-radius: 40rpx;
+				background: #4C97E7;
+				color: #fff;
+				font-size: 28rpx;
+				font-weight: 600;
+			}
+		}
+
 		.cont {
 			margin-top: 34rpx;
 			margin: 0 auto;
--- a/page_user/khfw/khfw.vue
+++ b/page_user/khfw/khfw.vue
@ -1,11 +1,34 @@
 <template>
 	<view class="page">
-		<u-navbar title="客户服务" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
+		<u-navbar title="客户服务" :border-bottom="false" :background="bgc" title-color='#fff' title-size='36'
 			height='45'></u-navbar>
+			<image class="backimg" src="https://lxnapi.ccttiot.com/bike/img/static/uWCOkHl7HYqjZUVUOzxy" mode=""></image>
+			<view class="tit">
+				Hi 您好，我们为您提供更多帮助哦~
+			</view>
+			<view class="qscard">
+				<view class="card_top">
+					<view class="li"  v-for="(item,index) in classlist" :key="index" @click="changeitx(item,index)">
+						<view class="txt">
+							{{item.classifyName}}
+						</view>
+						<view class="bot_bor" v-if="tabindex==index"></view>
+						<view class="bot_bor" v-if="tabindex!=index" style="background: #fff;"></view>
+					</view>
+					
+				</view>
+				<view class="qs_li" v-for="(item,index) in wordlist" :key="index" @click="topage(item)">
+					<view class="qs_li_txt">
+						{{item.title}}
+					</view>
+					<view class="iconfont icon-xiangyou1"></view>
+				</view>
+			</view>
 		<view class="btn" @click="callPhone">
 			<image src="https://lxnapi.ccttiot.com/bike/img/static/uEM1RpP3J0K51qTjtnA5" mode=""></image>
 			电话咨询：{{areaInfo.servicePhone}}
 		</view>
+		
 	</view>
 </template>

@ -14,15 +37,84 @@
 		data() {
 			return {
 				bgc: {
-					backgroundColor: "#fff",
+					backgroundColor: "#4C97E7",
 				},
-				areaInfo: {}
+				areaInfo: {},
+				tabindex:0,
+				classlist:[],
+				wordlist:[]
 			}
 		},
 		onShow() {
 			this.getarea()
+			this.getclass()
 		},
 		methods: {
+			getuserInfo(){
+				uni.showLoading({
+					title:'加载中'
+				})
+				this.$u.get("/getAppInfo").then((res) => {
+				
+					if (res.code == 200) {
+						uni.hideLoading()
+						
+						this.getarea()
+						// if( res.user.role==2){
+						// 	uni.navigateTo({
+						// 		url:'/page_fix/fix_index'
+						// 	})
+						// }
+					} else {
+						
+						let areaId=uni.getStorageSync('areaId'); 
+						if(areaId){
+							let that =this
+							wx.login({
+								success(res) {
+									if (res.code) {
+										console.log('登录！', res);
+										let data = {
+											wxOpenId: res.code,
+							
+										};
+										let areaId = uni.getStorageSync('areaId');
+										that.$u.post('/loginByopenid?jsCode=' + res.code + '&areaId=' + areaId).then(
+											res => {
+												uni.hideLoading();
+												if (res.code == 200) {
+													uni.setStorageSync('token', res.token);
+													that.getuserInfo()
+							
+							
+												} else if (res.code == 501) {
+													uni.showToast({
+														title: res.msg,
+														icon: 'none',
+														duration: 2000
+													});
+												} else {
+													// console.log("老用户登录",res.data)
+													uni.redirectTo({
+														url: '/pages/login/login'
+													})
+												}
+											});
+									}
+								},
+							
+							});
+						}else{
+							uni.showToast({
+								title: '请授权位置信息后再尝试',
+								icon: 'none',
+								duration: 4000
+							});
+						}
+						
+					}
+				});
+			},
 			getarea() {
 				let id = uni.getStorageSync('areaId');
 				this.$u.get("/app/area/" + id).then((res) => {
@ -39,6 +131,52 @@
 					}
 				});
 			},
+			topage(item) {
+			    // 编码 title 和 content
+			    const encodedTitle = encodeURIComponent(item.title);
+			    const encodedContent = encodeURIComponent(JSON.stringify(item.content));
+			    // 跳转到新页面并传递编码后的 title 和 content
+			    uni.navigateTo({
+			        url: `/page_user/word?title=${encodedTitle}&content=${encodedContent}`
+			    });
+			},
+			changeitx(itme,index){
+				this.tabindex=index
+				this.getword(itme.classifyId)
+			},
+			getclass() {
+				
+				this.$u.get("/app/classify/list?deptId=101&parentId=111" ).then((res) => {
+			
+					if (res.code == 200) {
+						this.classlist = res.data
+						let id =this.classlist[0].classifyId
+						this.getword(id)
+					} else {
+						// uni.showToast({
+						// 	title: res.msg,
+						// 	icon: 'none',
+						// 	duration: 2000
+						// });
+					}
+				});
+			},
+			getword(id) {
+				
+				this.$u.get("/app/article/list??classifyId="+id ).then((res) => {
+			
+					if (res.code == 200) {
+						this.wordlist = res.rows
+			
+					} else {
+						// uni.showToast({
+						// 	title: res.msg,
+						// 	icon: 'none',
+						// 	duration: 2000
+						// });
+					}
+				});
+			},
 			callPhone(){
 				uni.makePhoneCall({
 					phoneNumber:this.areaInfo.servicePhone
@ -55,7 +193,70 @@

 	.page {
 		width: 750rpx;
+		.backimg{
+			position: fixed;
+			width: 750rpx;
+			height: 384rpx;
+			z-index: -1;
+		}
+		.tit{
+			margin-top: 56rpx;
+			margin-left: 56rpx;
+			font-weight: 400;
+			font-size: 30rpx;
+			color: #FFFFFF;
+		}
+		.qscard{
+			width: 680rpx;
+			margin: 40rpx auto ;
+			background: #FFFFFF;
+			border-radius: 40rpx;
+			padding: 28rpx 30rpx;
+			box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42,130,228,0.1);
+			.card_top{
+				display: flex;
+				align-items: center;
+				flex-wrap: nowrap;
+				justify-content: space-around;
+				.li{
+					width: 112rpx;
+					display: flex;
+					flex-wrap: wrap;
+					justify-content: center;
+					.txt{
+						font-weight: 500;
+						font-size: 28rpx;
+						color: #3D3D3D;
+					}
+					.bot_bor{
+						margin-top: 16rpx;
+						width: 66rpx;
+						height: 6rpx;
+						background: #4C97E7;
+						border-radius: 3rpx 3rpx 3rpx 3rpx;
+					}
+				}
+			}
+			.qs_li{
+					margin-top: 10rpx;
+				display: flex;
+				flex-wrap: nowrap;
+				align-items: center;
+				justify-content: space-between;
+				border-bottom: 2rpx solid #D8D8D8;
+				padding-bottom: 26rpx;
+				.qs_li_txt{
 				
+					font-weight: 400;
+					font-size: 28rpx;
+					color: #3D3D3D;
+				}
+				.icon-xiangyou1{
+					font-size: 32rpx;
+					color: #3D3D3D;
+				}
+			}
+		}
 		.btn {
 			position: fixed;
 			left: 36rpx;
--- a/page_user/word.vue
+++ b/page_user/word.vue
@ -0,0 +1,78 @@
+<template>
+	<view class="page">
+		<u-navbar :title="title" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
+			height='45'></u-navbar>
+		<view class="cont" v-html="content"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				bgc: {
+					backgroundColor: "#fff",
+				},
+				info: {},
+				userinfo: {},
+				areaInfo: {},
+				content: '',
+				title:''
+			}
+		},
+		onLoad(options) {
+			if (options.title && options.content) {
+				// 解码 title 和 content
+				const title = decodeURIComponent(options.title);
+				const content = JSON.parse(decodeURIComponent(options.content));
+				// 设置数据
+				this.title = title
+				this.content = content
+				this.insertPhoneNumberAndDate()
+			}
+		},
+
+		methods: {
+
+			getagree() {
+				let id = uni.getStorageSync('areaId');
+				this.$u.get(`/app/article/list?areaId=${id}&tag=agreement`).then((res) => {
+					if (res.code === 200) {
+						this.info = res.rows[0];
+						this.insertPhoneNumberAndDate();
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 2000
+						});
+					}
+				});
+			},
+
+			insertPhoneNumberAndDate() {
+
+				// 替换所有的&nbsp;为 \u00A0
+				this.content = this.content.replace(/&nbsp;/g, '\u00A0');
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	page {
+		background-color: #fff;
+	}
+
+	.page {
+		width: 750rpx;
+
+		.cont {
+			margin-top: 34rpx;
+			margin: 0 auto;
+			width: 634rpx;
+
+		}
+	}
+</style>
--- a/page_user/yj.vue
+++ b/page_user/yj.vue
@ -238,7 +238,7 @@
 							this.getinfo()
 							this.getlist()
 							this.show = false
-						}, 2000)
+						}, 500)

 					} else {
 						uni.hideLoading()
--- a/pages.json
+++ b/pages.json
@ -355,6 +355,15 @@
 						"enablePullDownRefresh" : false,
 						"navigationStyle": "custom"
 					}
+				},
+				{
+					"path" : "word",
+					"style" : 
+					{
+					"navigationBarTitleText" : "",
+					"enablePullDownRefresh" : false,
+					"navigationStyle": "custom"
+					}
 				}

 				// 其他 userpages 目录下的页面...
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
--- a/pages_admin/admin_index.vue
+++ b/pages_admin/admin_index.vue
@ -21,7 +21,9 @@
 		<map class="map" id="map" ref="map" :scale="zoomSize" :latitude="latitude" :longitude="longitude"
 			:show-location="true" :markers="markers" :polygons="polyline" @markertap="onMarkerTap">
 		</map>
-
+		<view class="park" @click="toggleIconAndCallout">
+			<image src="https://lxnapi.ccttiot.com/bike/img/static/uRiYQZQEb3l2LsltEsyW" mode=""></image>
+		</view>
 		<view @touchmove.stop.prevent="() => {}">
 			<view class="btn_box">
 				<view class="btn1" @click="qecodelock()">
@ -147,6 +149,7 @@
 				statusidx: 7,
 				deviceNum: {},
 				areaId: 0,
+				showIconAndCallout:false


 			}
@ -203,6 +206,38 @@
 			},
 		},
 		methods: {
+			toggleIconAndCallout() {
+				this.showIconAndCallout = !this.showIconAndCallout;
+				if (this.showIconAndCallout) {
+					const newMarkers = [];
+					this.parkingList.forEach(item => {
+						newMarkers.push({
+							id: parseFloat(item.parkingId),
+							latitude: parseFloat(item.latitude),
+							longitude: parseFloat(item.longitude),
+							width: 20,
+							height: 40,
+							iconPath: 'https://lxnapi.ccttiot.com/bike/img/static/u9yz0bKCWKyev0JYpTne',
+							callout: {
+								content: item.parkingName,
+								color: '#ffffff',
+								fontSize: 14,
+								borderRadius: 10,
+								bgColor: item.type == 1 ? '#3A7EDB' : item.type == 2 ? '#FFC107' :
+									'#FF473E',
+								padding: 6,
+								display: 'ALWAYS'
+							},
+							isCalloutVisible: true // 添加标记
+						});
+					});
+					this.$set(this, 'markers', [...this.markers, ...newMarkers]);
+				} else {
+					// 过滤掉所有气泡显示的标记
+					this.$set(this, 'markers', this.markers.filter(marker => !marker.isCalloutVisible));
+				}
+			
+			},
 			getareaid() {
 				this.$u.post('/appVerify/getAreaId').then((res) => {
 					if (res.code == 200) {
@ -769,64 +804,7 @@
 						this.polyline = this.polyline.concat(polylines);
 						console.log(this.polyline, 'this.polyline');
 						// console.log(this.polyline);
-						res.rows.forEach(item => {
-							if(item.type==1){
-								this.markers.push({
-									id: parseFloat(item.parkingId),
-									latitude: parseFloat(item.latitude),
-									longitude: parseFloat(item.longitude),
-									width: 20,
-									height: 40,
-									iconPath: 'https://lxnapi.ccttiot.com/bike/img/static/u9yz0bKCWKyev0JYpTne',
-									callout: {
-										content: item.parkingName, // 修改为你想要显示的文字内容
-										color: '#ffffff', // 修改为文字颜色
-										fontSize: 14, // 修改为文字大小
-										borderRadius: 10, // 修改为气泡圆角大小
-										bgColor: '#3A7EDB', // 修改为气泡背景颜色
-										padding: 6, // 修改为气泡内边距
-										display: 'ALWAYS' // 修改为气泡的显示策略
-									}
-								});
-							}else if(item.type==2){
-								this.markers.push({
-									id: parseFloat(item.parkingId),
-									latitude: parseFloat(item.latitude),
-									longitude: parseFloat(item.longitude),
-									width: 20,
-									height: 40,
-									iconPath: 'https://lxnapi.ccttiot.com/bike/img/static/u9yz0bKCWKyev0JYpTne',
-									callout: {
-										content: item.parkingName, // 修改为你想要显示的文字内容
-										color: '#ffffff', // 修改为文字颜色
-										fontSize: 14, // 修改为文字大小
-										borderRadius: 10, // 修改为气泡圆角大小
-										bgColor: '#FFC107', // 修改为气泡背景颜色
-										padding: 6, // 修改为气泡内边距
-										display: 'ALWAYS' // 修改为气泡的显示策略
-									}
-								});
-							}else if(item.type==3){
-								this.markers.push({
-									id: parseFloat(item.parkingId),
-									latitude: parseFloat(item.latitude),
-									longitude: parseFloat(item.longitude),
-									width: 20,
-									height: 40,
-									iconPath: 'https://lxnapi.ccttiot.com/bike/img/static/u9yz0bKCWKyev0JYpTne',
-									callout: {
-										content: item.parkingName, // 修改为你想要显示的文字内容
-										color: '#ffffff', // 修改为文字颜色
-										fontSize: 14, // 修改为文字大小
-										borderRadius: 10, // 修改为气泡圆角大小
-										bgColor: '#FF473E', // 修改为气泡背景颜色
-										padding: 6, // 修改为气泡内边距
-										display: 'ALWAYS' // 修改为气泡的显示策略
-									}
-								});
-							}
-						})
-					
+							this.parkingList = res.rows
 					}
 				}).catch(error => {
 					console.error("Error fetching parking data:", error);
@ -894,7 +872,24 @@


 		}
+		.park {
+			position: fixed;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			right: 30rpx;
+			bottom: 500rpx;
+			// background-color: #fff;
+			border-radius: 50%;
+			width: 82rpx;
+			height: 82rpx;
+			z-index: 10;
 		
+			.img {
+				width: 82rpx;
+				height: 82rpx;
+			}
+		}
 		.btn_box {
 			width: 100%;
 			display: flex;
--- a/store/getters.js
+++ b/store/getters.js
@ -16,6 +16,6 @@ const getters = {
  userId: state => state.app.userId,
  isMeal: state => state.app.isMeal,
  deposit: state => state.app.deposit,
-  showTips: state => state.app.showTips,
+  showagre: state => state.app.showagre,
 }
 export default getters
--- a/store/modules/app.js
+++ b/store/modules/app.js
@ -13,7 +13,7 @@ const state = {
 		userId:null,
 		isMeal:null,
 		deposit:null,
-		showTips:true,
+		showagre:true,
 };

 const mutations = {
@ -52,9 +52,9 @@ const mutations = {
 		state.deposit = fee;
 		
 	},
-	SET_SHOWTIPS(state, fee) {
+	SET_SHOWAGRE(state, fee) {
 			console.log(fee,'feefeefeefee');
-			state.showTips = fee;
+			state.showagre = fee;
 			
 		
 	}