_

components/hch-position/hch-position.vue

@@ -135,9 +135,7 @@
 				}
 			},
 			//	点击标记点时触发，e.detail = {markerId}
-			markertap(index, mode = true, isQt = false) {
-				
-				console.log(index)
+			markertap(index, mode = true, isQt = false) {	
 				this.updateMode = mode
 				if(typeof index == 'object'){
 					index = index.markerId
@@ -158,18 +156,21 @@
 					latitude: this.markersIn[this.isActiveMarkerIndex].latitude,
 					longitude: this.markersIn[this.isActiveMarkerIndex].longitude
 				}
+				
 				this.painter.wait = 1;
-				this.$set(this.painter.base.views, 2, {
-					type: 'image',
-					src: this.markersIn[this.isActiveMarkerIndex].activeIconPath,
-					css: {
-						left: '3.5px',
-						top: '2px',
-						width: '35px',
-						height: '35px',
-						borderRadius: '17.5px'
-					}
-				})
+				this.painter.base.views[1].src = this.markersIn[this.isActiveMarkerIndex].activeIconPath + `?v=${(new Date()).getTime()}`
+				console.log(this.painter.base.views[1].src)
+				// this.$set(this.painter.base.views, 2, {
+				// 	type: 'image',
+				// 	src: this.markersIn[this.isActiveMarkerIndex].activeIconPath,
+				// 	css: {
+				// 		left: '3.5px',
+				// 		top: '2px',
+				// 		width: '35px',
+				// 		height: '35px',
+				// 		borderRadius: '17.5px'
+				// 	}
+				// })
 			},
 			canvasSuccess(e){
 				if(this.isActiveMarkerIndex == -1)return;

components/lime-painter/index.vue

@@ -132,6 +132,7 @@ export default {
 			  width: boardWidth,
 			  height: boardHeight,
 			}
+			
 			if(!single) {
 				ctx.clearRect(0, 0, boardWidth, boardHeight);
 			}
@@ -149,6 +150,7 @@ export default {
 			if (!use2dCanvas && !single) {
 				await this.canvasDraw(ctx);
 			}
+			
 			this.$emit('done')
 			if(this.isRenderImage && !single) {
 				this.canvasToTempFilePath()

pages/index/vote-detail/index.vue

@@ -128,7 +128,7 @@
 				</view>
 				<view class="textfont">
 					<text v-if="!isVoteNum && is_prize==0">今日投票数已用完
-						{{isVoteNum&&!is_vip&&vipRewardTicketNum ? `点击 加入IHG会员 可享受额外${vipRewardTicketNum}票` : ""}}</text>					
+						{{!isVoteNum&&!is_vip&&vipRewardTicketNum ? `点击 加入IHG会员 可享受额外${vipRewardTicketNum}票` : ""}}</text>					
 					<text v-if="isVoteNum && is_prize==0 ">今日投票数还有 {{userCanVoteNum}} 次
 						点击再次投票可再次为本项目投票也可为其他项目投票</text>
 					<text v-if="is_prize==1">恭喜你中奖了！
@@ -416,7 +416,8 @@
 				this.$refs.popup.open()
 			},
 			// 关闭弹出层
-			closeVote() {
+			closeVote() {
+				this.is_prize = false
 				this.$refs.popup.close()
 			},
 			//再次投票
@@ -569,7 +570,7 @@
 							this.openVote(false)
 						}else{
 							uni.showToast({
-								icon: 'error',
+								icon: 'none',
 								title: res.msg
 							})
 						}

pages/my/prize/exchangeDetail.vue

@@ -104,24 +104,39 @@
 				this.jump_config_vip = this.advise.value.exchange_other_path
 			}
 		},
-		
-		 onUnload() {
-		     this.back()
-		},	
+		onUnload(){
+			if(this.productType == 1){
+				uni.$emit('refreshData')
+				uni.redirectTo({
+					url: "/pages/my/integral/integral"
+				})
+			}else if(this.productType == 2){
+				uni.$emit('refreshPrizeData')
+				uni.navigateBack({
+					delta: 1,
+				})
+			}
+		},
 		methods: {
 			//返回上一级
 			back() {
-				if(this.productType == 1){
-					uni.$emit('refreshData')
-					uni.navigateBack({
-						delta: 2,
-					})
-				}else if(this.productType == 2){
-					uni.$emit('refreshPrizeData')
-					uni.navigateBack({
-						delta: 1,
-					})
-				}
+				uni.navigateBack({
+					delta: 1,
+				})
+				// if(this.productType == 1){
+				// 	uni.$emit('refreshData')
+				// 	uni.navigateBack({
+				// 		delta: 1,
+				// 	})
+				// 	uni.redirectTo({
+				// 		url: "/pages/my/integral/integral"
+				// 	})
+				// }else if(this.productType == 2){
+				// 	uni.$emit('refreshPrizeData')
+				// 	uni.navigateBack({
+				// 		delta: 1,
+				// 	})
+				// }
 			},
 			//广告图
 			getAdvertis() {

pages/my/prize/exchangePrize.vue

@@ -216,6 +216,9 @@
 					await this.getPrizeList(1)
 				}
 			}
+			uni.$on('refreshPrizeData', () => {
+				console.log('asdasdasdasdsadsad')
+			})
 		},
 
 		methods: {