diff --git a/App copy.vue b/App copy.vue
new file mode 100644
index 0000000..73a3b3a
--- /dev/null
+++ b/App copy.vue	
@@ -0,0 +1,160 @@
+<script>
+	const jwx = require('jweixin-module')
+	
+	export default {
+		onLaunch: function() {
+			// this.$nextTick(() => {
+				
+			// })
+
+		},
+		onShow: function() {
+			let link = window.location.href;
+			uni.showModal({title:'进入'})
+			if (/code=/.test(link) || link.indexOf("code") > -1) {
+				let temp = decodeURIComponent((new RegExp('[?|&]' + 'code' + '=' + '([^&;]+?)(&|#|;|$)')
+					.exec(link) || [, ''])[1].replace(/\+/g, '%20')) || null
+					uni.showModal({title:'code:'+temp})
+				let tadk2_lifeData = uni.getStorageSync('tadk2_lifeData')
+				if (!tadk2_lifeData.vuex_token) {
+					uni.showModal({title:'无Token'})
+					this.$u.api.login({
+						code: temp
+					}).then(res => {
+						uni.showModal({title:'获取到Token'})
+						this.$u.vuex('vuex_token', res.token)
+						this.$u.api.user().then(res => {
+							uni.showModal({title:'获取到user'})
+							this.$u.vuex('vuex_user', res)
+							let url = location.href.split('#')[0]
+							let link = "https://vr.langye.net/h5tadk/";
+							this.$u.api.share({
+								url
+							}).then(res => {
+								uni.showModal({title:'获取到share'})
+								this.$u.vuex('vuex_share', true)
+								jwx.config({
+									debug: false, // 开启调试模式,调用的所有 api 的返回值会在客户端 alert 出来，若要查看传入的参数，可以在 pc 端打开，参数信息会通过 log 打出，仅在 pc 端时才会打印。
+									appId: res.appId,
+									jsApiList: res.jsApiList,
+									nonceStr: res.nonceStr,
+									signature: res.signature,
+									timestamp: res.timestamp,
+								})
+								jwx.ready(() => {
+									jwx.updateAppMessageShareData({
+										title: '阵地有声 理响通安', // 分享标题
+										link: link, // 分享链接,该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
+										desc: '点击查看',
+										imgUrl: 'https://vr.langye.net/storage/files/170899758665dd3bd2c88c7.png', // 分享图标
+										success: () => {
+											console.log(
+												'updateAppMessageShareData-success'
+												)
+										},
+			
+									});
+									jwx.updateTimelineShareData({
+										title: '阵地有声 理响通安', // 分享标题
+										desc: '点击查看',
+										link: link, // 分享链接,该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
+										imgUrl: 'https://vr.langye.net/storage/files/170899758665dd3bd2c88c7.png', // 分享图标
+										success: () => {
+											console.log(
+												'updateTimelineShareData-success'
+												)
+										}
+									});
+								})
+								uni.showModal({title:'请求结束'})
+								this.$isResolve()
+								// console.log("123---to")
+								//  uni.reLaunch({
+								//   url: '/pages/index/index',
+								// });
+							})
+							
+						})
+					})
+				} else {
+					uni.showModal({title:'有Token'})
+					this.$u.api.user().then(res => {
+						uni.showModal({title:'获取user'})
+						this.$u.vuex('vuex_user', res)
+						let url = location.href.split('#')[0]
+						let link = "https://vr.langye.net/h5tadk/";
+						this.$u.api.share({
+							url
+						}).then(res => {
+							this.$u.vuex('vuex_share', true)
+							uni.showModal({title:'获取share'})
+							jwx.config({
+								debug: false, // 开启调试模式,调用的所有 api 的返回值会在客户端 alert 出来，若要查看传入的参数，可以在 pc 端打开，参数信息会通过 log 打出，仅在 pc 端时才会打印。
+								appId: res.appId,
+								jsApiList: res.jsApiList,
+								nonceStr: res.nonceStr,
+								signature: res.signature,
+								timestamp: res.timestamp,
+							})
+							jwx.ready(() => {
+								jwx.updateAppMessageShareData({
+									title: '阵地有声 理响通安', // 分享标题
+									desc: '点击查看',
+									link: link, // 分享链接,该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
+									imgUrl: 'https://vr.langye.net/storage/files/170899758665dd3bd2c88c7.png', // 分享图标
+									success: () => {
+										console.log(
+											'updateAppMessageShareData-success'
+											)
+									},
+			
+								});
+								jwx.updateTimelineShareData({
+									title: '阵地有声 理响通安', // 分享标题
+									desc: '点击查看',
+									link: link, // 分享链接,该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
+									imgUrl: 'https://vr.langye.net/storage/files/170899758665dd3bd2c88c7.png', // 分享图标
+									success: () => {
+										console.log(
+											'updateTimelineShareData-success'
+											)
+									}
+								});
+							})
+							uni.showModal({title:'请求结束'})
+							this.$isResolve()
+							// console.log("123---to")
+							//  uni.reLaunch({
+							//   url: '/pages/index/index',
+							// });
+						})
+					})
+				}
+			} else {
+				
+				
+				// let that = this
+				// setInterval(function(){
+				// 	console.log("asd-------------")
+				// 	that.$u.vuex('vuex_token', "8801|764nhDiiWEGvu0TPh0wyhl3Pfq01Oozhgu8X8Cvl")
+				// 	that.$u.vuex('vuex_share', true)
+				// },10000)
+				
+				this.$u.api.getAppId().then(res => {
+					let redirect = encodeURIComponent(link.replace(/#\//, ""))
+					uni.showModal({title:'跳转到公众号链接'})
+					window.location.href =
+						`https://open.weixin.qq.com/connect/oauth2/authorize?appid=${res.appid}&redirect_uri=${redirect}&response_type=code&scope=snsapi_base#wechat_redirect`
+				})
+			}
+		},
+		onHide: function() {
+			console.log('App Hide')
+		}
+	}
+</script>
+
+<style lang="scss">
+	/*每个页面公共css */
+	@import "uview-ui/index.scss";
+</style>
\ No newline at end of file
diff --git a/App.vue b/App.vue
index 4e42c05..fe190b4 100644
--- a/App.vue
+++ b/App.vue
@@ -4,137 +4,138 @@
 	export default {
 		onLaunch: function() {
 			this.$nextTick(() => {
-				let link = window.location.href;
-				if (/code=/.test(link) || link.indexOf("code") > -1) {
-					let temp = decodeURIComponent((new RegExp('[?|&]' + 'code' + '=' + '([^&;]+?)(&|#|;|$)')
-						.exec(link) || [, ''])[1].replace(/\+/g, '%20')) || null
-					let tadk2_lifeData = uni.getStorageSync('tadk2_lifeData')
-					if (!tadk2_lifeData.vuex_token) {
-						this.$u.api.login({
-							code: temp
-						}).then(res => {
-							this.$u.vuex('vuex_token', res.token)
-							this.$u.api.user().then(res => {
-								this.$u.vuex('vuex_user', res)
-								let url = location.href.split('#')[0]
-								let link = "https://vr.langye.net/h5tadk/";
-								this.$u.api.share({
-									url
+				let link = window.location.href;
+				if (/code=/.test(link) || link.indexOf("code") > -1) {
+					let temp = decodeURIComponent((new RegExp('[?|&]' + 'code' + '=' + '([^&;]+?)(&|#|;|$)')
+						.exec(link) || [, ''])[1].replace(/\+/g, '%20')) || null
+					let tadk2_lifeData = uni.getStorageSync('tadk2_lifeData')
+					if (!tadk2_lifeData.vuex_token) {
+						this.$u.api.login({
+							code: temp
+						}).then(res => {
+							this.$u.vuex('vuex_token', res.token)
+							this.$u.api.user().then(res => {
+								this.$u.vuex('vuex_user', res)
+								let url = location.href.split('#')[0]
+								let link = "https://vr.langye.net/h5tadk/";
+								this.$u.api.share({
+									url
 								}).then(res => {
 									this.$u.vuex('vuex_share', true)
-									this.$isResolve()
-									jwx.config({
-										debug: false, // 开启调试模式,调用的所有 api 的返回值会在客户端 alert 出来，若要查看传入的参数，可以在 pc 端打开，参数信息会通过 log 打出，仅在 pc 端时才会打印。
-										appId: res.appId,
-										jsApiList: res.jsApiList,
-										nonceStr: res.nonceStr,
-										signature: res.signature,
-										timestamp: res.timestamp,
-									})
-									jwx.ready(() => {
-										jwx.updateAppMessageShareData({
-											title: '阵地有声 理响通安', // 分享标题
-											link: link, // 分享链接,该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
-											desc: '点击查看',
-											imgUrl: 'https://vr.langye.net/storage/files/170899758665dd3bd2c88c7.png', // 分享图标
-											success: () => {
-												console.log(
-													'updateAppMessageShareData-success'
-													)
-											},
-
-										});
-										jwx.updateTimelineShareData({
-											title: '阵地有声 理响通安', // 分享标题
-											desc: '点击查看',
-											link: link, // 分享链接,该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
-											imgUrl: 'https://vr.langye.net/storage/files/170899758665dd3bd2c88c7.png', // 分享图标
-											success: () => {
-												console.log(
-													'updateTimelineShareData-success'
-													)
-											}
-										});
+									jwx.config({
+										debug: false, // 开启调试模式,调用的所有 api 的返回值会在客户端 alert 出来，若要查看传入的参数，可以在 pc 端打开，参数信息会通过 log 打出，仅在 pc 端时才会打印。
+										appId: res.appId,
+										jsApiList: res.jsApiList,
+										nonceStr: res.nonceStr,
+										signature: res.signature,
+										timestamp: res.timestamp,
+									})
+									jwx.ready(() => {
+										jwx.updateAppMessageShareData({
+											title: '阵地有声 理响通安', // 分享标题
+											link: link, // 分享链接,该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
+											desc: '点击查看',
+											imgUrl: 'https://vr.langye.net/storage/files/170951606765e52523351d8.jpg', // 分享图标
+											success: () => {
+												console.log(
+													'updateAppMessageShareData-success'
+													)
+											},
+				
+										});
+										jwx.updateTimelineShareData({
+											title: '阵地有声 理响通安', // 分享标题
+											desc: '点击查看',
+											link: link, // 分享链接,该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
+											imgUrl: 'https://vr.langye.net/storage/files/170951606765e52523351d8.jpg', // 分享图标
+											success: () => {
+												console.log(
+													'updateTimelineShareData-success'
+													)
+											}
+										});
 									})
+									this.$isResolve()
 									// console.log("123---to")
 									//  uni.reLaunch({
 									//   url: '/pages/index/index',
-									// });
+									// });
 								})
-								
-							})
-						})
-					} else {
-						this.$u.api.user().then(res => {
-							this.$u.vuex('vuex_user', res)
-							let url = location.href.split('#')[0]
-							let link = "https://vr.langye.net/h5tadk/";
-							this.$u.api.share({
-								url
+								
+							})
+						})
+					} else {
+						this.$u.api.user().then(res => {
+							this.$u.vuex('vuex_user', res)
+							let url = location.href.split('#')[0]
+							let link = "https://vr.langye.net/h5tadk/";
+							this.$u.api.share({
+								url
 							}).then(res => {
 								this.$u.vuex('vuex_share', true)
-								this.$isResolve()
-								jwx.config({
-									debug: false, // 开启调试模式,调用的所有 api 的返回值会在客户端 alert 出来，若要查看传入的参数，可以在 pc 端打开，参数信息会通过 log 打出，仅在 pc 端时才会打印。
-									appId: res.appId,
-									jsApiList: res.jsApiList,
-									nonceStr: res.nonceStr,
-									signature: res.signature,
-									timestamp: res.timestamp,
-								})
-								jwx.ready(() => {
-									jwx.updateAppMessageShareData({
-										title: '阵地有声 理响通安', // 分享标题
-										desc: '点击查看',
-										link: link, // 分享链接,该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
-										imgUrl: 'https://vr.langye.net/storage/files/170899758665dd3bd2c88c7.png', // 分享图标
-										success: () => {
-											console.log(
-												'updateAppMessageShareData-success'
-												)
-										},
-
-									});
-									jwx.updateTimelineShareData({
-										title: '阵地有声 理响通安', // 分享标题
-										desc: '点击查看',
-										link: link, // 分享链接,该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
-										imgUrl: 'https://vr.langye.net/storage/files/170899758665dd3bd2c88c7.png', // 分享图标
-										success: () => {
-											console.log(
-												'updateTimelineShareData-success'
-												)
-										}
-									});
+								jwx.config({
+									debug: false, // 开启调试模式,调用的所有 api 的返回值会在客户端 alert 出来，若要查看传入的参数，可以在 pc 端打开，参数信息会通过 log 打出，仅在 pc 端时才会打印。
+									appId: res.appId,
+									jsApiList: res.jsApiList,
+									nonceStr: res.nonceStr,
+									signature: res.signature,
+									timestamp: res.timestamp,
+								})
+								jwx.ready(() => {
+									jwx.updateAppMessageShareData({
+										title: '阵地有声 理响通安', // 分享标题
+										desc: '点击查看',
+										link: link, // 分享链接,该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
+										imgUrl: 'https://vr.langye.net/storage/files/170951606765e52523351d8.jpg', // 分享图标
+										success: () => {
+											console.log(
+												'updateAppMessageShareData-success'
+												)
+										},
+				
+									});
+									jwx.updateTimelineShareData({
+										title: '阵地有声 理响通安', // 分享标题
+										desc: '点击查看',
+										link: link, // 分享链接,该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
+										imgUrl: 'https://vr.langye.net/storage/files/170951606765e52523351d8.jpg', // 分享图标
+										success: () => {
+											console.log(
+												'updateTimelineShareData-success'
+												)
+										}
+									});
 								})
+								this.$isResolve()
 								// console.log("123---to")
 								//  uni.reLaunch({
 								//   url: '/pages/index/index',
-								// });
-							})
-						})
-					}
+								// });
+							})
+						})
+					}
 				} else {
 					
 					
 					// let that = this
 					// setInterval(function(){
 					// 	console.log("asd-------------")
-					// 	that.$u.vuex('vuex_token', "8801|764nhDiiWEGvu0TPh0wyhl3Pfq01Oozhgu8X8Cvl")
+					// 	that.$u.vuex('vuex_token', "8849|gyvzzL2oj23cjFEHLkL3R6D3nG1G2LjkXj9j6NfP")
 					// 	that.$u.vuex('vuex_share', true)
 					// },10000)
-					
-					this.$u.api.getAppId().then(res => {
-						let redirect = encodeURIComponent(link.replace(/#\//, ""))
-						window.location.href =
-							`https://open.weixin.qq.com/connect/oauth2/authorize?appid=${res.appid}&redirect_uri=${redirect}&response_type=code&scope=snsapi_base#wechat_redirect`
-					})
+					// this.$u.vuex('vuex_token', "8849|gyvzzL2oj23cjFEHLkL3R6D3nG1G2LjkXj9j6NfP")
+					this.$u.api.getAppId().then(res => {
+						let redirect = encodeURIComponent(link.replace(/#\//, ""))
+						console.log(redirect)
+						window.location.href =
+							`https://open.weixin.qq.com/connect/oauth2/authorize?appid=${res.appid}&redirect_uri=${redirect}&response_type=code&scope=snsapi_base#wechat_redirect`
+					})
 				}
 			})
 
 		},
 		onShow: function() {
-			console.log('App Show')
+			
 		},
 		onHide: function() {
 			console.log('App Hide')
diff --git a/pages/certificate/certificate.vue b/pages/certificate/certificate.vue
index a0e2ccb..4b57c08 100644
--- a/pages/certificate/certificate.vue
+++ b/pages/certificate/certificate.vue
@@ -21,10 +21,9 @@
       </div>
     </div>
 
-   <!-- <div class="footer">
-      主办单位：中共苏州市委党史工作办公室 <br>
-      承办单位：江苏有线苏州分公司
-    </div> -->
+   <div class="footer">
+      技术支撑：江苏有线苏州分公司
+    </div>
 
     <transition name="share-pop" enter-active-class="fade-in" leave-to-class="fade-out">
       <view class="share_cover" v-show="isShare" @click="isShare = false">
@@ -159,9 +158,9 @@ export default {
 }
 .footer {
   text-align: center;
-  font-size: 18rpx;
+  font-size: 24rpx;
   font-weight: 400;
-  color: #F8DB97;
+  color: #f8cd82;
 
   padding: 20rpx 0;
   position: absolute;
diff --git a/pages/detail/detail.vue b/pages/detail/detail.vue
index 680c0c2..ec88697 100644
--- a/pages/detail/detail.vue
+++ b/pages/detail/detail.vue
@@ -67,7 +67,8 @@
 				hasAnswer:false,
 				// goBack:false,
 				showAnswer:false,
-				isSubmit:false
+				isSubmit:false,
+				isNext:false
 			};
 		},
 		methods: {
@@ -133,9 +134,10 @@
 					toast('请先答题')
 					return
 				}
-				if(this.isSubmit){
+				if(this.isSubmit || this.isNext){
 					return
 				}
+				this.isNext = true
 				if(this.currentIndex==this.question_list.length-1){
 					uni.showLoading({title:'提交中'})
 					this.isSubmit = true
@@ -178,6 +180,7 @@
 						that.currentIndex++
 						that.showAnswer = false
 						that.hasAnswer = false
+						that.isNext = false
 					}
 				},1200)
 				
@@ -260,7 +263,8 @@
 
 				&-text {
 					color: #000000;
-					font-size: 32rpx;
+					font-size: 32rpx;
+					padding-left:30rpx;
 				}
 			}
 			&-answer{
diff --git a/pages/index/index copy.vue b/pages/index/index copy.vue
new file mode 100644
index 0000000..344d41f
--- /dev/null
+++ b/pages/index/index copy.vue	
@@ -0,0 +1,219 @@
+<template>
+	<view class="container">
+		<image class="logo" :src="require('@/static/index-logo.png')"></image>
+		<image class="logo1" :src="require('@/static/index-logo1.png')"></image>
+		<view style="height:100px;color:red" @click="clearHistory">清除历史记录</view>
+		<view class="titlewrap">
+			<image class="title" :src="require('@/static/index-title.png')"></image>
+			<view class="title-progress">
+				<view class="progress-text">{{progressPercentage}}%</view>
+				
+				<view>interval0::::{{interval0}}</view>
+				<view>isOk::::{{isOk}}</view>
+				<view>token:::{{token}}</view>
+				<view>user:::{{user}}</view>
+				<view>isShare::::{{isShare}}</view>
+				<view>inter::::{{interval}}</view>
+				<view>shareFalse101::::{{shareFalse101}}</view>
+				
+				<view class="progress-bar-container">
+					<view class="progress-bar" :style="{'width':progressPercentage+'%'}"></view>
+				</view>
+			</view>
+			
+		</view>
+
+		<!-- <view class="support">
+			<view>
+				<p>主办单位：中共苏州工业园区斜塘街道工作委员会</p>
+				<p>承办单位：江苏有线苏州分公司</p>
+			</view>
+		</view> -->
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				progressPercentage: 0,
+				interval0:null,
+				interval:null,
+				isShare:false,
+				shareFalse101:0,
+				isOk:'未请求完毕',
+				token:'--1',
+				user:'--2'
+			}
+		},
+		async onLoad() {
+			uni.showModal({
+				title:'index--onload'
+			})
+			this.startBefore()
+			uni.showModal({
+				title:'end--startBefore'
+			})
+			await this.$onLaunched;
+			uni.showModal({
+				title:'this.$onLaunched'
+			})
+			this.token = uni.getStorageSync('tadk2_lifeData').vuex_token
+			this.user = uni.getStorageSync('tadk2_lifeData').vuex_user
+			console.log("请求完毕，开始执行")
+			this.isOk =" 请求完毕，开始执行"
+			this.start();
+			
+		},
+		beforeDestroy() {
+			clearInterval(this.interval0);
+			clearInterval(this.interval);
+		},
+		methods: {
+			clearHistory() {
+				// 获取当前窗口的history对象
+				const history = window.history;
+	
+				// 使用pushState方法将当前URL替换为一个不可见的新URL，从而清除历史记录
+				history.pushState(null, "", "#");
+	
+				// 添加popstate事件监听器，当用户点击后退按钮时，将再次触发该事件并清除历史记录
+				window.addEventListener("popstate", function(event) {
+					history.pushState(null, "", "#");
+				});
+			},
+			startBefore(){
+				this.interval0 = setInterval(() => {
+					 if(this.progressPercentage<33){
+					 	this.progressPercentage++;
+					 }else{
+						 clearInterval(this.interval0);
+					 }
+				}, 50);
+			},
+			start() {
+				 this.interval = setInterval(() => {
+					 this.isShare = uni.getStorageSync('tadk2_lifeData').vuex_share?true:false
+					const userInfo = uni.getStorageSync('tadk2_lifeData').vuex_user
+					if(this.isShare){
+						if(this.progressPercentage<100){
+							this.progressPercentage++;
+						}else{
+							clearInterval(this.interval);
+							if(userInfo && userInfo.mobile){
+								uni.navigateTo({
+									url:'/pages/map/map'
+								})
+							}else{
+								uni.navigateTo({
+									url:'/pages/login/login'
+								})
+							}
+						}
+					}else{
+						if(this.progressPercentage<99){
+							this.progressPercentage++;
+						}else{
+							this.shareFalse101 = this.progressPercentage
+						}
+					}
+					
+				}, 50);
+			},
+		},
+	}
+</script>
+
+<style lang="scss">
+	.container {
+		height: 100vh;
+		width: 100vw;
+		background: #e1f1f2;
+		position: relative;
+
+		.logo {
+			width: 59rpx;
+			height: 106rpx;
+			position: absolute;
+			top: 35rpx;
+			left: 65rpx;
+		}
+
+		.logo1 {
+			width: 97rpx;
+			height: 86rpx;
+			position: absolute;
+			top: 45rpx;
+			left: 140rpx
+		}
+		.titlewrap{
+			position: absolute;
+			top: 40%;
+			left: 50%;
+			transform: translate(-50%, -50%);
+			.title {
+				width: 633rpx;
+				height: 498rpx;
+			}
+			.title-progress{
+				margin-top:30rpx;
+				.progress-text{
+					text-align: center;
+					color:#156e68;
+					font-size: 60rpx;
+					margin-bottom:20rpx
+				}
+				.progress-bar-container {
+					width: 90%;
+					height: 55rpx;
+					background-color: #f7f1e1;
+					overflow: hidden;
+					border:4rpx solid #156e68;
+					border-radius: 20rpx;
+					margin:0 auto;
+					font-size: 0;
+				}
+				
+				.progress-bar {
+					height: 100%;
+					background-color: #156e68;
+					width:0;
+					border-radius:0 16rpx 16rpx 0;
+					// transition: width 0.5s;
+					// animation: width100 5s cubic-bezier(0.36, 0.07, 0.19, 0.97) both;
+				}
+				// @keyframes width100 {
+				// 	0% {
+				// 		width:0%
+				// 	}
+				// 	30% {
+				// 		width:30%
+				// 	}
+				// 	50%{
+				// 		width:30%
+				// 	}
+				// 	70%{
+				// 		width:70%
+				// 	}
+				// 	100% {
+				// 		width:100%
+				// 	}
+				// }
+			}
+
+		}
+		
+
+		.support {
+			position: absolute;
+			bottom: 10rpx;
+			width: 100%;
+			font-size: 24rpx;
+			color: #666;
+			font-family: '宋体';
+			opacity: 1;
+			text-align: center;
+			z-index: 9;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 75a0b3b..24e5172 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,15 +1,12 @@
 <template>
 	<view class="container">
 		<image class="logo" :src="require('@/static/index-logo.png')"></image>
-		<image class="logo1" :src="require('@/static/index-logo1.png')"></image>
+		<image class="logo1" :src="require('@/static/index-logo1.png')"></image>
 		<view class="titlewrap">
 			<image class="title" :src="require('@/static/index-title.png')"></image>
 			<view class="title-progress">
 				<view class="progress-text">{{progressPercentage}}%</view>
-				<!-- <view>isOk::::{{isOk}}</view>
-				<view>isShare::::{{isShare}}</view>
-				<view>shareFalse101::::{{shareFalse101}}</view>
-				<view>inter::::{{interval}}</view> -->
+				
 				<view class="progress-bar-container">
 					<view class="progress-bar" :style="{'width':progressPercentage+'%'}"></view>
 				</view>
@@ -17,12 +14,11 @@
 			
 		</view>
 
-		<!-- <view class="support">
+		<view class="support">
 			<view>
-				<p>主办单位：中共苏州工业园区斜塘街道工作委员会</p>
-				<p>承办单位：江苏有线苏州分公司</p>
+				<p>技术支撑：江苏有线苏州分公司</p>
 			</view>
-		</view> -->
+		</view>
 	</view>
 </template>
 
@@ -31,39 +27,24 @@
 		data() {
 			return {
 				progressPercentage: 0,
-				// interval0:null,
 				interval:null,
-				isShare:false,
-				// shareFalse101:0,
-				// isOk:'未请求完毕',
+				isShare:false,
 			}
 		},
 		async onLoad() {
-			await this.startBefore()
-			await this.$onLaunched;
-			// console.log("请求完毕，开始执行")
-			// this.isOk =" 请求完毕，开始执行"
+			// await this.$onLaunched;
 			this.start();
 			
 		},
 		beforeDestroy() {
 			clearInterval(this.interval);
 		},
-		methods: {
-			startBefore(){
-				this.interval0 = setInterval(() => {
-					 if(this.progressPercentage<33){
-					 	this.progressPercentage++;
-					 }else{
-						 clearInterval(this.interval0);
-					 }
-				}, 50);
-			},
+		methods: {
 			start() {
 				 this.interval = setInterval(() => {
 					 this.isShare = uni.getStorageSync('tadk2_lifeData').vuex_share?true:false
 					const userInfo = uni.getStorageSync('tadk2_lifeData').vuex_user
-					if(this.isShare){
+					// if(this.isShare){
 						if(this.progressPercentage<100){
 							this.progressPercentage++;
 						}else{
@@ -78,15 +59,13 @@
 								})
 							}
 						}
-					}else{
-						if(this.progressPercentage<99){
-							this.progressPercentage++;
-						}else{
-							this.shareFalse101 = this.progressPercentage
-						}
-					}
+					// }else{
+					// 	if(this.progressPercentage<99){
+					// 		this.progressPercentage++;
+					// 	}
+					// }
 					
-				}, 50);
+				}, 60);
 			},
 		},
 	}
@@ -177,7 +156,7 @@
 			bottom: 10rpx;
 			width: 100%;
 			font-size: 24rpx;
-			color: #666;
+			color: #333;
 			font-family: '宋体';
 			opacity: 1;
 			text-align: center;
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 3d0ba02..c6831fb 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -148,6 +148,15 @@
 		background: #e1f1f2;
 		position: relative;
 		overflow: scroll;
+		::v-deep .u-drawer-content-visible{
+			height:60%!important;
+			.u-datetime-picker{
+				height:100%!important;
+				.u-picker-body{
+					height:100%!important;
+				}
+			}
+		}
 		.show-modal{
 			width: 100%;
 			height: 100%;
diff --git a/pages/map/map.vue b/pages/map/map.vue
index 9513770..d3a6516 100644
--- a/pages/map/map.vue
+++ b/pages/map/map.vue
@@ -97,7 +97,7 @@
 				area: {
 					w: 2212,
 					h: 1583,
-					x: -523 / 2
+					x: -2212 / 4.8
 				},
 				pointers: []
 			};