From 3fd1b689367ca205f39a7da8e8a32641cce4c092 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 15 Apr 2024 10:00:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/amap-wx.130.js |  31 -----
 pages/home/home.vue   |   6 +-
 pages/index/index.vue | 273 +++++++++++++++++-------------------------
 pages/line/line.vue   |  10 +-
 pages/me/me.vue       |   6 +-
 5 files changed, 118 insertions(+), 208 deletions(-)
 delete mode 100644 common/amap-wx.130.js

diff --git a/common/amap-wx.130.js b/common/amap-wx.130.js
deleted file mode 100644
index 718d6ef..0000000
--- a/common/amap-wx.130.js
+++ /dev/null
@@ -1,31 +0,0 @@
-function AMapWX(a){this.key=a.key;this.requestConfig={key:a.key,s:"rsx",platform:"WXJS",appname:a.key,sdkversion:"1.2.0",logversion:"2.0"};this.MeRequestConfig={key:a.key,serviceName:"https://restapi.amap.com/rest/me"}}
-AMapWX.prototype.getWxLocation=function(a,b){wx.getLocation({type:"gcj02",success:function(c){c=c.longitude+","+c.latitude;wx.setStorage({key:"userLocation",data:c});b(c)},fail:function(c){wx.getStorage({key:"userLocation",success:function(d){d.data&&b(d.data)}});a.fail({errCode:"0",errMsg:c.errMsg||""})}})};
-AMapWX.prototype.getMEKeywordsSearch=function(a){if(!a.options)return a.fail({errCode:"0",errMsg:"\u7f3a\u5c11\u5fc5\u8981\u53c2\u6570"});var b=a.options,c=this.MeRequestConfig,d={key:c.key,s:"rsx",platform:"WXJS",appname:a.key,sdkversion:"1.2.0",logversion:"2.0"};b.layerId&&(d.layerId=b.layerId);b.keywords&&(d.keywords=b.keywords);b.city&&(d.city=b.city);b.filter&&(d.filter=b.filter);b.sortrule&&(d.sortrule=b.sortrule);b.pageNum&&(d.pageNum=b.pageNum);b.pageSize&&(d.pageSize=b.pageSize);b.sig&&(d.sig=
-b.sig);wx.request({url:c.serviceName+"/cpoint/datasearch/local",data:d,method:"GET",header:{"content-type":"application/json"},success:function(e){(e=e.data)&&e.status&&"1"===e.status&&0===e.code?a.success(e.data):a.fail({errCode:"0",errMsg:e})},fail:function(e){a.fail({errCode:"0",errMsg:e.errMsg||""})}})};
-AMapWX.prototype.getMEIdSearch=function(a){if(!a.options)return a.fail({errCode:"0",errMsg:"\u7f3a\u5c11\u5fc5\u8981\u53c2\u6570"});var b=a.options,c=this.MeRequestConfig,d={key:c.key,s:"rsx",platform:"WXJS",appname:a.key,sdkversion:"1.2.0",logversion:"2.0"};b.layerId&&(d.layerId=b.layerId);b.id&&(d.id=b.id);b.sig&&(d.sig=b.sig);wx.request({url:c.serviceName+"/cpoint/datasearch/id",data:d,method:"GET",header:{"content-type":"application/json"},success:function(e){(e=e.data)&&e.status&&"1"===e.status&&
-0===e.code?a.success(e.data):a.fail({errCode:"0",errMsg:e})},fail:function(e){a.fail({errCode:"0",errMsg:e.errMsg||""})}})};
-AMapWX.prototype.getMEPolygonSearch=function(a){if(!a.options)return a.fail({errCode:"0",errMsg:"\u7f3a\u5c11\u5fc5\u8981\u53c2\u6570"});var b=a.options,c=this.MeRequestConfig,d={key:c.key,s:"rsx",platform:"WXJS",appname:a.key,sdkversion:"1.2.0",logversion:"2.0"};b.layerId&&(d.layerId=b.layerId);b.keywords&&(d.keywords=b.keywords);b.polygon&&(d.polygon=b.polygon);b.filter&&(d.filter=b.filter);b.sortrule&&(d.sortrule=b.sortrule);b.pageNum&&(d.pageNum=b.pageNum);b.pageSize&&(d.pageSize=b.pageSize);
-b.sig&&(d.sig=b.sig);wx.request({url:c.serviceName+"/cpoint/datasearch/polygon",data:d,method:"GET",header:{"content-type":"application/json"},success:function(e){(e=e.data)&&e.status&&"1"===e.status&&0===e.code?a.success(e.data):a.fail({errCode:"0",errMsg:e})},fail:function(e){a.fail({errCode:"0",errMsg:e.errMsg||""})}})};
-AMapWX.prototype.getMEaroundSearch=function(a){if(!a.options)return a.fail({errCode:"0",errMsg:"\u7f3a\u5c11\u5fc5\u8981\u53c2\u6570"});var b=a.options,c=this.MeRequestConfig,d={key:c.key,s:"rsx",platform:"WXJS",appname:a.key,sdkversion:"1.2.0",logversion:"2.0"};b.layerId&&(d.layerId=b.layerId);b.keywords&&(d.keywords=b.keywords);b.center&&(d.center=b.center);b.radius&&(d.radius=b.radius);b.filter&&(d.filter=b.filter);b.sortrule&&(d.sortrule=b.sortrule);b.pageNum&&(d.pageNum=b.pageNum);b.pageSize&&
-(d.pageSize=b.pageSize);b.sig&&(d.sig=b.sig);wx.request({url:c.serviceName+"/cpoint/datasearch/around",data:d,method:"GET",header:{"content-type":"application/json"},success:function(e){(e=e.data)&&e.status&&"1"===e.status&&0===e.code?a.success(e.data):a.fail({errCode:"0",errMsg:e})},fail:function(e){a.fail({errCode:"0",errMsg:e.errMsg||""})}})};
-AMapWX.prototype.getGeo=function(a){var b=this.requestConfig,c=a.options;b={key:this.key,extensions:"all",s:b.s,platform:b.platform,appname:this.key,sdkversion:b.sdkversion,logversion:b.logversion};c.address&&(b.address=c.address);c.city&&(b.city=c.city);c.batch&&(b.batch=c.batch);c.sig&&(b.sig=c.sig);wx.request({url:"https://restapi.amap.com/v3/geocode/geo",data:b,method:"GET",header:{"content-type":"application/json"},success:function(d){(d=d.data)&&d.status&&"1"===d.status?a.success(d):a.fail({errCode:"0",
-errMsg:d})},fail:function(d){a.fail({errCode:"0",errMsg:d.errMsg||""})}})};
-AMapWX.prototype.getRegeo=function(a){function b(d){var e=c.requestConfig;wx.request({url:"https://restapi.amap.com/v3/geocode/regeo",data:{key:c.key,location:d,extensions:"all",s:e.s,platform:e.platform,appname:c.key,sdkversion:e.sdkversion,logversion:e.logversion},method:"GET",header:{"content-type":"application/json"},success:function(g){if(g.data.status&&"1"==g.data.status){g=g.data.regeocode;var h=g.addressComponent,f=[],k=g.roads[0].name+"\u9644\u8fd1",m=d.split(",")[0],n=d.split(",")[1];if(g.pois&&
-g.pois[0]){k=g.pois[0].name+"\u9644\u8fd1";var l=g.pois[0].location;l&&(m=parseFloat(l.split(",")[0]),n=parseFloat(l.split(",")[1]))}h.provice&&f.push(h.provice);h.city&&f.push(h.city);h.district&&f.push(h.district);h.streetNumber&&h.streetNumber.street&&h.streetNumber.number?(f.push(h.streetNumber.street),f.push(h.streetNumber.number)):f.push(g.roads[0].name);f=f.join("");a.success([{iconPath:a.iconPath,width:a.iconWidth,height:a.iconHeight,name:f,desc:k,longitude:m,latitude:n,id:0,regeocodeData:g}])}else a.fail({errCode:g.data.infocode,
-errMsg:g.data.info})},fail:function(g){a.fail({errCode:"0",errMsg:g.errMsg||""})}})}var c=this;a.location?b(a.location):c.getWxLocation(a,function(d){b(d)})};
-AMapWX.prototype.getWeather=function(a){function b(g){var h="base";a.type&&"forecast"==a.type&&(h="all");wx.request({url:"https://restapi.amap.com/v3/weather/weatherInfo",data:{key:d.key,city:g,extensions:h,s:e.s,platform:e.platform,appname:d.key,sdkversion:e.sdkversion,logversion:e.logversion},method:"GET",header:{"content-type":"application/json"},success:function(f){if(f.data.status&&"1"==f.data.status)if(f.data.lives){if((f=f.data.lives)&&0<f.length){f=f[0];var k={city:{text:"\u57ce\u5e02",data:f.city},
-weather:{text:"\u5929\u6c14",data:f.weather},temperature:{text:"\u6e29\u5ea6",data:f.temperature},winddirection:{text:"\u98ce\u5411",data:f.winddirection+"\u98ce"},windpower:{text:"\u98ce\u529b",data:f.windpower+"\u7ea7"},humidity:{text:"\u6e7f\u5ea6",data:f.humidity+"%"}};k.liveData=f;a.success(k)}}else f.data.forecasts&&f.data.forecasts[0]&&a.success({forecast:f.data.forecasts[0]});else a.fail({errCode:f.data.infocode,errMsg:f.data.info})},fail:function(f){a.fail({errCode:"0",errMsg:f.errMsg||""})}})}
-function c(g){wx.request({url:"https://restapi.amap.com/v3/geocode/regeo",data:{key:d.key,location:g,extensions:"all",s:e.s,platform:e.platform,appname:d.key,sdkversion:e.sdkversion,logversion:e.logversion},method:"GET",header:{"content-type":"application/json"},success:function(h){if(h.data.status&&"1"==h.data.status){h=h.data.regeocode;if(h.addressComponent)var f=h.addressComponent.adcode;else h.aois&&0<h.aois.length&&(f=h.aois[0].adcode);b(f)}else a.fail({errCode:h.data.infocode,errMsg:h.data.info})},
-fail:function(h){a.fail({errCode:"0",errMsg:h.errMsg||""})}})}var d=this,e=d.requestConfig;a.city?b(a.city):d.getWxLocation(a,function(g){c(g)})};
-AMapWX.prototype.getPoiAround=function(a){function b(e){e={key:c.key,location:e,s:d.s,platform:d.platform,appname:c.key,sdkversion:d.sdkversion,logversion:d.logversion};a.querytypes&&(e.types=a.querytypes);a.querykeywords&&(e.keywords=a.querykeywords);wx.request({url:"https://restapi.amap.com/v3/place/around",data:e,method:"GET",header:{"content-type":"application/json"},success:function(g){if(g.data.status&&"1"==g.data.status){if((g=g.data)&&g.pois){for(var h=[],f=0;f<g.pois.length;f++){var k=0==
-f?a.iconPathSelected:a.iconPath;h.push({latitude:parseFloat(g.pois[f].location.split(",")[1]),longitude:parseFloat(g.pois[f].location.split(",")[0]),iconPath:k,width:22,height:32,id:f,name:g.pois[f].name,address:g.pois[f].address})}a.success({markers:h,poisData:g.pois})}}else a.fail({errCode:g.data.infocode,errMsg:g.data.info})},fail:function(g){a.fail({errCode:"0",errMsg:g.errMsg||""})}})}var c=this,d=c.requestConfig;a.location?b(a.location):c.getWxLocation(a,function(e){b(e)})};
-AMapWX.prototype.getStaticmap=function(a){function b(e){c.push("location="+e);a.zoom&&c.push("zoom="+a.zoom);a.size&&c.push("size="+a.size);a.scale&&c.push("scale="+a.scale);a.markers&&c.push("markers="+a.markers);a.labels&&c.push("labels="+a.labels);a.paths&&c.push("paths="+a.paths);a.traffic&&c.push("traffic="+a.traffic);e="https://restapi.amap.com/v3/staticmap?"+c.join("&");a.success({url:e})}var c=[];c.push("key="+this.key);var d=this.requestConfig;c.push("s="+d.s);c.push("platform="+d.platform);
-c.push("appname="+d.appname);c.push("sdkversion="+d.sdkversion);c.push("logversion="+d.logversion);a.location?b(a.location):this.getWxLocation(a,function(e){b(e)})};
-AMapWX.prototype.getInputtips=function(a){var b=Object.assign({},this.requestConfig);a.location&&(b.location=a.location);a.keywords&&(b.keywords=a.keywords);a.type&&(b.type=a.type);a.city&&(b.city=a.city);a.citylimit&&(b.citylimit=a.citylimit);wx.request({url:"https://restapi.amap.com/v3/assistant/inputtips",data:b,method:"GET",header:{"content-type":"application/json"},success:function(c){c&&c.data&&c.data.tips&&a.success({tips:c.data.tips})},fail:function(c){a.fail({errCode:"0",errMsg:c.errMsg||
-""})}})};
-AMapWX.prototype.getDrivingRoute=function(a){var b=Object.assign({},this.requestConfig);a.origin&&(b.origin=a.origin);a.destination&&(b.destination=a.destination);a.strategy&&(b.strategy=a.strategy);a.waypoints&&(b.waypoints=a.waypoints);a.avoidpolygons&&(b.avoidpolygons=a.avoidpolygons);a.avoidroad&&(b.avoidroad=a.avoidroad);wx.request({url:"https://restapi.amap.com/v3/direction/driving",data:b,method:"GET",header:{"content-type":"application/json"},success:function(c){c&&c.data&&c.data.route&&a.success({paths:c.data.route.paths,
-taxi_cost:c.data.route.taxi_cost||""})},fail:function(c){a.fail({errCode:"0",errMsg:c.errMsg||""})}})};
-AMapWX.prototype.getWalkingRoute=function(a){var b=Object.assign({},this.requestConfig);a.origin&&(b.origin=a.origin);a.destination&&(b.destination=a.destination);wx.request({url:"https://restapi.amap.com/v3/direction/walking",data:b,method:"GET",header:{"content-type":"application/json"},success:function(c){c&&c.data&&c.data.route&&a.success({paths:c.data.route.paths})},fail:function(c){a.fail({errCode:"0",errMsg:c.errMsg||""})}})};
-AMapWX.prototype.getTransitRoute=function(a){var b=Object.assign({},this.requestConfig);a.origin&&(b.origin=a.origin);a.destination&&(b.destination=a.destination);a.strategy&&(b.strategy=a.strategy);a.city&&(b.city=a.city);a.cityd&&(b.cityd=a.cityd);wx.request({url:"https://restapi.amap.com/v3/direction/transit/integrated",data:b,method:"GET",header:{"content-type":"application/json"},success:function(c){c&&c.data&&c.data.route&&(c=c.data.route,a.success({distance:c.distance||"",taxi_cost:c.taxi_cost||
-"",transits:c.transits}))},fail:function(c){a.fail({errCode:"0",errMsg:c.errMsg||""})}})};
-AMapWX.prototype.getRidingRoute=function(a){var b=Object.assign({},this.requestConfig);a.origin&&(b.origin=a.origin);a.destination&&(b.destination=a.destination);wx.request({url:"https://restapi.amap.com/v3/direction/riding",data:b,method:"GET",header:{"content-type":"application/json"},success:function(c){c&&c.data&&c.data.route&&a.success({paths:c.data.route.paths})},fail:function(c){a.fail({errCode:"0",errMsg:c.errMsg||""})}})};module.exports.AMapWX=AMapWX;
\ No newline at end of file
diff --git a/pages/home/home.vue b/pages/home/home.vue
index b6ae6e5..5d64663 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -773,11 +773,11 @@
 					color: #333;
 					font-size: 33rpx;
 					margin: 0 auto;
-					line-height: 2;
-					height: 660rpx;
+					line-height: 1.7;
+					height: 610rpx;
 					overflow: scroll;
 					position: absolute;
-					top: 345rpx;
+					top: 390rpx;
 					left: 50%;
 					transform: translate(-50%, 0%);
 					width: 80%;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 8283a3d..6e9c5fb 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,104 +1,61 @@
-<template>
-	<view class="wrap">
-		
-	<view class="container">
-		<image class="container-bg" :src="require('@/static/index-bg.png')"></image>
-		<view class="animations" ref="apiAnimateDemo">
-			<view v-for="(item,index) in animations">
-				<!-- <gal-css-animate v-if="item.show" :animateName="item.name" :style="{'top':item.class=='logo1'?navBarBoxHeight+'px':''}" :class='item.class' :duration="item.duration"
-					:autoPlay="item.autoplay" timingFunction="ease-in">
-					<image :src="item.content" :style="{'width':item.width,'height':item.height}"></image>
-				</gal-css-animate> -->
-				<view :animateName="item.name" :style="{'top':item.class=='logo1'?navBarBoxHeight+'px':''}" :class='item.class' :duration="item.duration"
-					:autoPlay="item.autoplay" timingFunction="ease-in">
-					<image :src="item.content" :style="{'width':item.width,'height':item.height}"></image>
-				</view>
-			</view>
-		</view>
-
-		<view class="titlewrap">
-			<view class="title-progress">
-				<!-- <view class="progress-text">{{progressPercentage}}%</view> -->
-				<view class="progress-bar-container">
-					<view class="progress-bar" :style="{'width':progressPercentage+'%'}"></view>
-				</view>
+<template>
+	<view class="wrap">
+
+		<view class="container">
+			<image class="container-bg" :src="require('@/static/index-bg.png')"></image>
+			<view class="imgwrap" :style="{'padding-top':navBarBoxHeight+'rpx'}">
+				<image class="imgwrap-map" :src="require('@/static/index-map.png')"></image>
+				<image class="imgwrap-title" :src="require('@/static/index-title.png')"></image>
+				<view class="titlewrap">
+					<view class="title-progress">
+						<view class="progress-bar-container">
+							<view class="progress-bar" :style="{'width':progressPercentage+'%'}"></view>
+						</view>
+					</view>
+					<view @click="toHome" style="min-height:240rpx">
+						<image class="title-btn" v-if="showBtn" :src="require('@/static/index-btn.png')"></image>
+					</view>
+
+
+				</view>
+				
 			</view>
-			<view @click="toHome">
-				<image v-if="showBtn" style="width: 322rpx;height: 211rpx;margin-top:70rpx" :src="require('@/static/index-btn.png')"></image>
-				
-				<!-- <gal-css-animate v-if="showBtn" :animateName="'wobble'" class="title-btn" :duration="'1s'"
-					 timingFunction="ease-in">
-					<image style="width: 322rpx;height: 211rpx;margin-top:70rpx" :src="require('@/static/index-btn.png')"></image>
-				</gal-css-animate> -->
-			</view>
-
-
-		</view>
-
-		<!-- <view class="support">
-			<view>
-				<p>技术支撑：江苏有线苏州分公司</p>
+			<view class="support">
+				<view>
+					<p>技术支持:江苏有线苏州分公司</p>
+				</view>
 			</view>
-		</view> -->
-	</view>
+		</view>
 	</view>
 </template>
 
 <script>
-	import galCssAnimate from "@/GAL/components/gal-css-animate.vue"
 
 	export default {
 		components: {
-			galCssAnimate
 		},
 		data() {
 			return {
 				progressPercentage: 0,
 				interval: null,
-				isShare: false,
-				showBtn:false,
-				navBarBoxHeight:0,
-				animations: [
-					{
-						name: 'flipInX',
-						duration: '2s',
-						timer: 1500,
-						content: require('../../static/index-map.png'),
-						autoplay: false,
-						class: 'logo',
-						show: false,
-						width: '745rpx',
-						height: '857rpx'
-					}, 
-					{
-						name: 'zoomIn',
-						duration: '1s',
-						timer: 1500,
-						content: require('../../static/index-title.png'),
-						autoplay: false,
-						class: 'title',
-						show: false,
-						width: '512rpx',
-						height: '131rpx'
-					}
-				],
+				isShare: false,
+				showBtn: false,
+				navBarBoxHeight: 0,
 			}
 		},
 		async onLoad() {
-			// await this.$onLaunched;
-			// this.play(0)
 			this.start();
-			const MenuButton = uni.getMenuButtonBoundingClientRect()
+			const MenuButton = uni.getMenuButtonBoundingClientRect()
 			this.navBarBoxHeight = MenuButton.top + MenuButton.height + 10
 		},
 		beforeDestroy() {
 			clearInterval(this.interval);
 		},
-		methods: {
-			toHome(){
-				uni.switchTab({
-					url:'/pages/home/home'
-				})
+		methods: {
+			toHome() {
+				uni.switchTab({
+					url: '/pages/home/home'
+				})
 			},
 			start() {
 				this.interval = setInterval(() => {
@@ -111,116 +68,100 @@
 
 				}, 30);
 			},
-			play(index) {
-				if (index > this.animations.length - 1) {
-					return
-				}
-				this.animations[index]['show'] = true
-				this.animations[index]['autoplay'] = true
-				setTimeout(() => {
-					this.play(index + 1);
-				}, this.animations[index].timer)
-			},
 		},
 	}
 </script>
 
-<style lang="scss">
-	.wrap{
-		height: 120vh;
-		width: 100vw;
+<style lang="scss">
+	.wrap {
+		// height: 100vh;
+		width: 100vw;
 		position: relative;
+		// padding-bottom:200rpx;
+		height: 100vh;
 	}
+
 	.container {
 		background: #efe9df;
-		&-bg{
-			position: absolute;
-			top:0;
-			left:0;
-			width:100%;
-			height:100%;
-		}
-
-		.logo {
+		width: 100vw;
+		position: relative;
+		// padding-bottom:200rpx;
+		min-height: 100vh;
+		padding-bottom:80rpx;
+		&-bg {
 			position: absolute;
-			top: 60rpx;
-			left: 0rpx;
-
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
 		}
-
-		.logo1 {
-
-			position: absolute;
-			top: 130rpx;
-			right: 50rpx;
-
+		.support {
+			position: absolute;
+			bottom: 40rpx;
+			width: 100%;
+			font-size: 24rpx;
+			color: #333;
+			font-family: '宋体';
+			opacity: 1;
+			text-align: center;
+			z-index: 9;
 		}
+		.imgwrap {
+			position: relative;
+			z-index: 9;
 
-		.title {
-			// width: 512rpx;
-			// height: 131rpx;
-			position: absolute;
-			top: 850rpx;
-			left: 50%;
-			transform: translate(-50%, 0%);
-		}
+			&-map {
+				width: 745rpx;
+				height: 857rpx;
+				margin: 0 auto;
+				display: block;
+			}
+
+			&-title {
+				width: 512rpx;
+				height: 131rpx;
+				margin: 30rpx auto;
+				display: block;
 
-		.titlewrap {
-			position: absolute;
-			top: 1020rpx;
-			left: 50%;
-			transform: translate(-50%, 0%);
-			text-align: center;
-			width: 70%;
-
-			.title-btn {
-				width: 322rpx;
-				height: 211rpx;
-				margin:0 auto;
-				margin-top: 70rpx;
 			}
 
-			.title-progress {
-				margin-top: 30rpx;
-				.progress-text {
-					text-align: center;
-					color: #960909;
-					font-size: 60rpx;
-					margin-bottom: 20rpx
-				}
+			.titlewrap {
+				width: 70%;
+				margin: 0 auto;
 
-				.progress-bar-container {
-					width: 100%;
-					height: 40rpx;
-					background-color: #f7f1e2;
-					overflow: hidden;
-					border: 4rpx solid #d6aca1;
-					border-radius: 20rpx;
+				.title-btn {
+					width: 322rpx;
+					height: 211rpx;
 					margin: 0 auto;
-					font-size: 0;
+					margin-top: 70rpx;
+					display: block;
 				}
 
-				.progress-bar {
-					height: 100%;
-					background-color: #960909;
-					width: 0;
-					border-radius: 0 16rpx 16rpx 0;
-				}
+				.title-progress {
+					margin-top: 30rpx;
+					.progress-bar-container {
+						width: 100%;
+						height: 40rpx;
+						background-color: #f7f1e2;
+						overflow: hidden;
+						border: 4rpx solid #d6aca1;
+						border-radius: 20rpx;
+						margin: 0 auto;
+						font-size: 0;
+					}
 
-			}
+					.progress-bar {
+						height: 100%;
+						background-color: #960909;
+						width: 0;
+						border-radius: 0 16rpx 16rpx 0;
+					}
 
-		}
+				}
 
-		.support {
-			position: absolute;
-			bottom: 10rpx;
-			width: 100%;
-			font-size: 24rpx;
-			color: #333;
-			font-family: '宋体';
-			opacity: 1;
-			text-align: center;
-			z-index: 9;
+			}
+			
 		}
+
 	}
 </style>
\ No newline at end of file
diff --git a/pages/line/line.vue b/pages/line/line.vue
index bc56bd8..31f1b8c 100644
--- a/pages/line/line.vue
+++ b/pages/line/line.vue
@@ -21,7 +21,7 @@
 							<image :src="item.image.url" mode=""></image>
 							<view>
 								<view class="line-item-top-line-title">{{item.name}}</view>
-								<view class="line-item-top-line-dec">{{item.content}}</view>
+								<view class="line-item-top-line-title">{{item.content}}</view>
 							</view>
 						</view>
 						<view class="line-item-top-border"></view>
@@ -195,10 +195,10 @@
 
 						image {
 							border: 10rpx solid #ebe0d1;
-							width: 177rpx;
-							height: 177rpx;
-							border-radius: 177rpx;
-							margin-right: 30rpx;
+							width: 170rpx;
+							height: 170rpx;
+							border-radius: 170rpx;
+							margin-right: 20rpx;
 							box-sizing: border-box;
 						}
 
diff --git a/pages/me/me.vue b/pages/me/me.vue
index 0d97da7..879a84e 100644
--- a/pages/me/me.vue
+++ b/pages/me/me.vue
@@ -473,11 +473,11 @@
 					color: #333;
 					font-size: 33rpx;
 					margin: 0 auto;
-					line-height: 2;
-					height: 650rpx;
+					line-height: 1.7;
+					height: 610rpx;
 					overflow: scroll;
 					position: absolute;
-					top: 350rpx;
+					top: 390rpx;
 					left: 50%;
 					transform: translate(-50%, 0%);
 					width: 80%;