diff --git a/pages/creator/imgDetail.vue b/pages/creator/imgDetail.vue
index bd32b43..f5db026 100644
--- a/pages/creator/imgDetail.vue
+++ b/pages/creator/imgDetail.vue
@@ -34,11 +34,6 @@
 </template>
 
 <script>
-	let isplayOver = false;
-	let timer = 0;
-	let Timer = null;
-	let stayTime = 0;
-	let isOverTask = false
 	import {
 		detailsTiktokImg, // 获取图片详情
 		judgeTiktokLike, // 查询是否点赞过
@@ -53,7 +48,7 @@
 		checkUserCanDownload// 检查某平台用户当日下载次数是否超标
 	} from '@/api/creator.js'
   import {loginTiktok} from '@/api/auth.js'
-  import tiktokAd from '@/utils/tiktokAd.js'
+  // import tiktokAd from '@/utils/tiktokAd.js'
 	export default {
 		data() {
 			return {
@@ -71,11 +66,8 @@
 				likeColor: '#ef223c',
 				collectColor: '#dcaa04',
 				urlParamId: undefined,
-				htime: 0, //广告点击
-				mintime: 999999999, //最短持续时间
-				taskhide: false,
-				starttask: false,
-				done: false,
+				isplayOver: false,
+				downloadUrl: undefined,
 				adList:['0qfnoa4053uwkefbas','2v63zq5hvfclpxmurl','d4ltbnxa23zp2hhqwe'] //激励视频广告列表
 			}
 		},
@@ -83,72 +75,19 @@
 			if (option?.id) {
 				this.urlParamId = option.id;
 			}
-			isOverTask = false;
+			this.isplayOver = false;
 			//随机选择一个激励视频广告初始化
 			let num = Math.floor(Math.random() * this.adList.length + 1)-1;
-			console.log('随机激励视频id为：',this.adList[num])
+			//console.log('随机激励视频id为：',this.adList[num])
 			//tiktokAd.rewarded.load(this.adList[num])
 			this.loadAdvertise(this.adList[num]);
 		},
-		onHide: function() {
-			var htime = Date.now()
-			this.taskhide = true
-			this.htime = htime
+		onShow() {
+		   this.achieveSaveImg();
 		},
-		onShow: function() {
-			var that = this;
-			if (isOverTask) {
-				return
-			}
-			if (this.taskhide) {
-				var stime = Date.now()
-				var lasttime = stime - this.htime;
-				stayTime = lasttime
-				if (!isplayOver) {
-					uni.showModal({
-						title: '任务失败',
-						content: '广告未播放完成',
-						showCancel: false,
-						confirmText: '知道了'
-					})
-					return
-				}
-				if (lasttime < this.mintime && this.mintime > 0) {
-					uni.showModal({
-						title: '任务失败',
-						content: '广告停留时间需要大于' + this.mintime / 1000 + '秒',
-						showCancel: false,
-						confirmText: '知道了'
-					})
-					// that.setData({
-					// 	taskhide: false
-					// })
-					that.taskhide = false;
-				} else {
-					if (that.hudian > 0) {
-						this.done = true;
-						this.starttask = true;
-						isOverTask = true;
-						uni.showModal({
-							title: '任务完成',
-							content: '点击右上角关闭按钮',
-							showCancel: false,
-							confirmText: '知道了'
-						})
-					} else {
-						uni.showModal({
-							title: '任务完成',
-							content: '你已经完成此任务！！',
-							showCancel: false,
-							confirmText: '确定',
-							complete: function() {
-								this.done = true
-								this.starttask = true
-							}
-						})
-					}
-				}
-			}
+		onHide() {
+			//切出小程序时，广告状态还原
+		   this.isplayOver = false;
 		},
 		created() {
 			const detailId = uni.getStorageSync('detailId')
@@ -177,84 +116,46 @@
 			}
 		},
 		methods: {
-			onUnload() {
-				//清除定时器
-				clearInterval(Timer)
-			},
-			//开启激励视频广告停留计时器
-			statTimer() {
-				Timer = setInterval(() => {
-					timer++;
-					if (timer >= 16) {
-						isplayOver = true;
-						clearInterval(Timer)
-					}
-				}, 1000)
-			},
-			
 			//加载激励视频广告
-			loadAdvertise(e){
+			loadAdvertise(adId){
 				// 在页面中定义激励视频广告
 				let videoAd = null
 				var that = this
 				// 在页面onLoad回调事件中创建激励视频广告实例
 				if (tt.createRewardedVideoAd) {
 					videoAd = tt.createRewardedVideoAd({
-						adUnitId: e
+						adUnitId: adId
 					})
-					this.videoAd = videoAd
+					that.videoAd = videoAd
 					videoAd.onLoad(() => {
-						console.log('激励视频广告'+e+'加载成功')
+						console.log('激励视频广告'+adId+'加载成功')
 					})
 					videoAd.onError((err) => {
 						that.err()
 					})
 					videoAd.onClose((res) => {
-						if (res && res.isEnded) {
+						if (res && res.isEnded || res === undefined) {
 							// 正常播放结束，可以下发游戏奖励
-							if (that.htime == 0) {
-								wx.showModal({
-									title: '您没有点击广告',
-									content: '点击视频广告下方的按钮进入广告停留' + that.mintime / 1000 + '秒后关闭广告即可',
-									showCancel: false
-								})
-							} else {
-								if (stayTime < this.mintime && this.mintime > 0) {
-									wx.showModal({
-										title: '图片下载失败',
-										content: '广告停留时间需要大于' + this.mintime / 1000 + '秒',
-										showCancel: false,
-										confirmText: '知道了'
-									})
-									this.taskhide = true
-								} else {
-									if (isOverTask) {
-										//this.gotoAdPage()
-										console.log('广告点击观看完毕!')
-									}
-									this.starttask = true;
-									console.log('this.starttask ',this.starttask)
-								}
-				
-							}
+							that.isplayOver = true;
+							console.log('激励视频广告观看完毕',isplayOver)
 						} else {
-							timer = 0;
-							isplayOver = false;
-							wx.showToast({
-								title: '您还没有看完视频，无法获取奖励',
+							that.isplayOver = false;
+							console.log('激励视频广告尚未看完',that.isplayOver)
+							uni.showToast({
+								title: '您还没有看完视频，无法下载图片',
 								icon: 'none'
 							})
-							this.done = false;
-							this.starttask = false;
 						}
 					})
 				}
 			},
 			
 			//展示激励视频广告
-			showAdvertise(){
+			showAdvertise(url){
 				let videoAd = this.videoAd
-				this.statTimer()
+				this.downloadUrl = url;
+				//console.log('看广告时传入进来的url',url);
+				//console.log('this.downloadUrl看广告时',this.downloadUrl);
 				videoAd.show().catch(() => {
 					// 失败重试
 					videoAd.load()
@@ -265,9 +166,7 @@
 								content: '请稍后重试',
 								showCancel: false,
 								complete: function() {
-									that.done = true;
-									that.starttask = true;
-									// that.cuowu = true;
+									this.isplayOver = false;
 								}
 							})
 						})
@@ -576,6 +475,161 @@
           this.download(url)
         }
       },
+	  
+	  //观看完广告，保存图片
+	  achieveSaveImg(){
+		let that = this;
+		console.log('广告状态',that.isplayOver)
+		if(that.isplayOver){
+			//观看完广告，可下载图片
+			let url = that.downloadUrl;
+			//console.log('that.downloadUrl观看完广告',that.downloadUrl);
+			//console.log('url观看完广告',url);
+			uni.showLoading({
+				title: '正在保存图片...',
+				success() {
+					//获取用户的当前设置。获取相册权限
+					uni.getSetting({
+						success(res){
+							//console.log('授权res',res)
+							//如果没有相册权限
+							if (!res.authSetting["scope.album"]) {
+								//向用户发起授权请求
+								uni.authorize({
+									scope: "scope.album",
+									success: () => {
+										//授权成功保存图片到系统相册
+										uni.downloadFile({
+											url,
+											success: (res) => {
+												if (res.statusCode === 200) {
+													uni.saveImageToPhotosAlbum({
+														//图片路径，不支持网络图片路径
+														filePath: res.tempFilePath,
+														success: (res) => {
+					
+														},
+														fail: (res) => {
+															return uni.showToast({
+																	title: res.errMsg,
+																	icon: 'none'
+																});
+														},
+														complete: (res) => {
+															uni.hideLoading();
+															if (res.errMsg !== "saveImageToPhotosAlbum:ok") {
+																return uni.showToast({
+																		title: "下载失败！",
+																		icon: 'none'
+																	});
+															} else {
+																return uni
+																	.showToast({
+																		title: "下载成功！",
+																		icon: 'none',
+																		success() {
+																			//下载成功写入下载收益、邀请收益
+																			that.insertPreAdProfit();
+																			that.insertPreInviteProfit();
+																		}
+																	});
+															}
+														},
+													});
+												} else {
+													uni.showToast({
+														title: "下载失败！",
+														icon: 'none'
+													});
+												}
+											}
+										})
+									},
+									//授权失败
+									fail: () => {
+										uni.hideLoading();
+										uni.showModal({
+											title: "您已拒绝获取相册权限",
+											content: "是否进入权限管理，调整授权？",
+											success: (res) => {
+												if (res.confirm) {
+													//调起客户端小程序设置界面，返回用户设置的操作结果。（重新让用户授权）
+													uni.openSetting({
+														success: (res) => {
+					
+														},
+													});
+												} else if (res.cancel) {
+													return uni.showToast({
+														title: "已取消！",
+														icon: 'none'
+													});
+												}
+											},
+										});
+									},
+								});
+							} else {
+								//如果已有相册权限，直接保存图片到系统相册
+								//console.log('已有相册权限,开始保存图片',url);
+								//授权成功保存图片到系统相册
+								uni.downloadFile({
+									url,
+									success: (res) => {
+										console.log('进入图片下载',res);
+										if (res.statusCode === 200) {
+											uni.saveImageToPhotosAlbum({
+												//图片路径，不支持网络图片路径
+												filePath: res.tempFilePath,
+												success: (res) => {
+													console.log('保存图片状态',res);
+												},
+												fail: (res) => {
+													return uni.showToast({
+															title: res.errMsg,
+															icon: 'none'
+														});
+												},
+												complete: (res) => {
+													uni.hideLoading();
+													if (res.errMsg !== "saveImageToPhotosAlbum:ok") {
+														return uni.showToast({
+																title: "下载失败！",
+																icon: 'none'
+															});
+													} else {
+														return uni.showToast({
+																title: "下载成功！",
+																icon: 'none',
+																success() {
+																	//下载成功写入下载收益、邀请收益
+																	that.insertPreAdProfit();
+																	that.insertPreInviteProfit();
+																	that.isplayOver = false;
+																}
+															});
+													}
+												},
+											});
+										} else {
+											uni.showToast({
+												title: "下载失败！",
+												icon: 'none'
+											});
+										}
+									}
+								})
+							}
+						},
+						fail: (res) => {},
+					});
+				}
+			});
+		}else{
+			//未观看完广告，不可下载图片
+			//console.log('未观看完广告，不可下载图片')
+		}  
+	  },
 			// 下载
 			 download(url) {
 				let that = this;
@@ -583,123 +637,7 @@
 					//满足可下载条件
 					that.isDownload = true
 					//展示激励视频广告
-					this.showAdvertise();
-					// const result = await tiktokAd.rewarded.show();
-					// console.log('结果为',result)
-					// if(result.achieveStatus === true){
-					// 	console.log('视频完成状态为:',result.achieveStatus)
-					// }
-					uni.showLoading({
-						title: '正在保存图片...'
-					});
-					console.log('test123')
-					//获取用户的当前设置。获取相册权限
-					// uni.getSetting({
-					// 	success: (res) => {
-					// 		//如果没有相册权限
-					// 		if (!res.authSetting["scope.writePhotosAlbum"]) {
-					// 			//向用户发起授权请求
-					// 			uni.authorize({
-					// 				scope: "scope.album",
-					// 				success: () => {
-					// 					//授权成功保存图片到系统相册
-					// 					uni.downloadFile({
-					// 						url,
-					// 						success: (res) => {
-					// 							if (res.statusCode === 200) {
-					// 								uni.saveImageToPhotosAlbum({
-					// 									//图片路径，不支持网络图片路径
-					// 									filePath: res.tempFilePath,
-					// 									success: (res) => {
-
-					// 									},
-					// 									fail: (res) => {
-					// 										return uni.showToast({
-					// 												title: res.errMsg,
-					// 												icon: 'none'
-					// 											});
-					// 									},
-					// 									complete: (res) => {
-					// 										uni.hideLoading();
-					// 										if (res.errMsg !== "saveImageToPhotosAlbum:ok") {
-					// 											return uni.showToast({
-					// 													title: "下载失败！",
-					// 													icon: 'none'
-					// 												});
-					// 										} else {
-					// 											return uni
-					// 												.showToast({
-					// 													title: "下载成功！",
-					// 													icon: 'none',
-					// 													success() {
-					// 														//下载成功写入下载收益、邀请收益
-					// 														that.insertPreAdProfit();
-					// 														that.insertPreInviteProfit();
-					// 													}
-					// 												});
-					// 										}
-					// 									},
-					// 								});
-					// 							} else {
-					// 								uni.showToast({
-					// 									title: "下载失败！",
-					// 									icon: 'none'
-					// 								});
-					// 							}
-					// 						}
-					// 					})
-					// 				},
-					// 				//授权失败
-					// 				fail: () => {
-					// 					uni.hideLoading();
-					// 					uni.showModal({
-					// 						title: "您已拒绝获取相册权限",
-					// 						content: "是否进入权限管理，调整授权？",
-					// 						success: (res) => {
-					// 							if (res.confirm) {
-					// 								//调起客户端小程序设置界面，返回用户设置的操作结果。（重新让用户授权）
-					// 								uni.openSetting({
-					// 									success: (res) => {
-
-					// 									},
-					// 								});
-					// 							} else if (res.cancel) {
-					// 								return uni.showToast({
-					// 									title: "已取消！",
-					// 									icon: 'none'
-					// 								});
-					// 							}
-					// 						},
-					// 					});
-					// 				},
-					// 			});
-					// 		} else {
-					// 			//如果已有相册权限，直接保存图片到系统相册
-					// 			uni.saveImageToPhotosAlbum({
-					// 				filePath: url,
-					// 				success: (res) => {
-					// 					uni.hideLoading();
-					// 					return uni.showToast({
-					// 						title: "保存成功！",
-					// 						icon: 'none'
-					// 					});
-					// 				},
-					// 				fail: (res) => {
-					// 					uni.hideLoading();
-					// 					return uni.showToast({
-					// 						title: res.errMsg,
-					// 						icon: 'none'
-					// 					});
-					// 				},
-					// 				//无论成功失败都走的回调
-					// 				complete: (res) => {
-					// 					uni.hideLoading();
-					// 				},
-					// 			});
-					// 		}
-					// 	},
-					// 	fail: (res) => {},
-					// });
+					that.showAdvertise(url);
 				} else {
 					//不满足可下载条件 canDownload为true状态
 					uni.showToast({