diff --git a/pages/components/my-notice-item-tg.vue b/pages/components/my-notice-item-tg.vue
index f9513e5..3d561c8 100644
--- a/pages/components/my-notice-item-tg.vue
+++ b/pages/components/my-notice-item-tg.vue
@@ -11,9 +11,10 @@
 			<!-- 操作按钮 -->
 			<view class="opt-button-box">
 				<!-- 状态为待审核和已审核的可以关闭 -->
-				<view class="opt-item" v-if="item.approvalStatus!='2'" @click="updateStatus(0,item.id)">关闭</view>
+				<view class="opt-item" v-if="tabStatus!='1'" @click="updateStatus(0,item.id)">关闭</view>
+				<view class="opt-item" v-if="tabStatus!='1'" @click="editNotice(item)">编辑</view>
 				<!-- 状态为已关闭的可以重启 -->
-				<view class="opt-item" v-if="item.approvalStatus=='2'" @click="updateStatus(1,item.id)">重启</view>
+				<!-- <view class="opt-item" v-if="item.approvalStatus=='2'" @click="updateStatus(1,item.id)">重启</view> -->
 				<view class="opt-item" @click="goDetail(item.id)">查看详情</view>
 				<view class="opt-item" @click="publish(item)">发类似</view>
 
@@ -32,6 +33,10 @@
 			dataList: {
 				type: Array,
 				default: []
+			},
+			tabStatus: {
+				type: String,
+				default: '0'
 			}
 		},
 		components: {
@@ -46,6 +51,9 @@
 			publish(item) {
 				this.$tab.navigateTo('/pages/notice/public-notice?sameId=' + item.id)
 			},
+			editNotice() {
+				this.$tab.navigateTo('/pages/notice/public-notice?sameId=' + item.id + '&isEdit=1')
+			},
 			evaluate() {
 				this.$tab.navigateTo('/pages/mine/set/evaluate')
 			},
diff --git a/pages/components/my-notice-tg.vue b/pages/components/my-notice-tg.vue
index a4f2e78..286ee35 100644
--- a/pages/components/my-notice-tg.vue
+++ b/pages/components/my-notice-tg.vue
@@ -6,8 +6,8 @@
 		</view>
 		<!-- 搜索框 -->
 		<view class="dl-search-box">
-			<uni-search-bar placeholder="请输入搜索内容" style="width: 100%;" @confirm="search"
-				v-model="queryParams.searchValue">
+			<uni-search-bar placeholder="请输入搜索内容" style="width: 100%;" @confirm="search" @cancel="clear"
+				v-model="queryParams.searchValue" @clear="clear">
 			</uni-search-bar>
 		</view>
 		<!-- 菜单 -->
@@ -20,7 +20,7 @@
 			<view class="dl-item-box">
 				<scroll-view style="height: 100%;" scroll-y="true" @scrolltolower="onReachBottomCus" refresher-enabled
 					@refresherrefresh="onRefresherrefresh" :refresher-triggered="isTriggered">
-					<my-notice-item-tg v-if="dataList.length>0" :dataList="dataList"
+					<my-notice-item-tg :tabStatus="menuIndex" v-if="dataList.length>0" :dataList="dataList"
 						@goDetail="goDetail"></my-notice-item-tg>
 					<view style="text-align: center" v-if="dataList.length==0">
 						<image class="" src="@/static/images/nothing.png"></image>
@@ -73,6 +73,12 @@
 			})
 		},
 		methods: {
+			clear(res) {
+				this.queryParams.pageNum = 1
+				this.total = 0
+				this.queryParams.searchValue = ""
+				this.selectDataList()
+			},
 			/**
 			 * 查询数据
 			 */
diff --git a/pages/components/my-notice.vue b/pages/components/my-notice.vue
index 27a26e1..5cb1bfb 100644
--- a/pages/components/my-notice.vue
+++ b/pages/components/my-notice.vue
@@ -6,8 +6,8 @@
 		</view>
 		<!-- 搜索框 -->
 		<view class="dl-search-box">
-			<uni-search-bar placeholder="请输入搜索内容" style="width: 100%;" @confirm="search"
-				v-model="queryParams.searchValue">
+			<uni-search-bar placeholder="请输入搜索内容" style="width: 100%;" @confirm="clear"
+				v-model="queryParams.searchValue" @clear="search" @cancel="clear">
 			</uni-search-bar>
 		</view>
 		<!-- 菜单 -->
@@ -121,6 +121,12 @@
 				this.total = 0
 				this.selectDataList()
 			},
+			clear(res) {
+				this.queryParams.pageNum = 1
+				this.total = 0
+				this.queryParams.searchValue = ""
+				this.selectDataList()
+			},
 			/**
 			 * 查看通告详情
 			 * @param {Object} item
@@ -237,4 +243,4 @@
 			}
 		}
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/index.vue b/pages/index.vue
index 0a76dc3..d251202 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -7,8 +7,8 @@
 			<mine-index ref="minePage" :key="nowUserType" :nowUserType="nowUserType" v-if="'my'==menuCode"
 				@refreshUserType="refreshUserType()"></mine-index>
 			<subscribe v-if="'dingyue'==menuCode"></subscribe>
-			<my-notice v-if="'myNotice'==menuCode && '02'==nowUserType"></my-notice>
-			<my-notice-tg v-if="'myNotice'==menuCode && '01'==nowUserType"></my-notice-tg>
+			<my-notice ref="myNotice" v-if="'myNotice'==menuCode && '02'==nowUserType"></my-notice>
+			<my-notice-tg ref="myNoticeTg" v-if="'myNotice'==menuCode && '01'==nowUserType"></my-notice-tg>
 		</view>
 		<tabBarVue :menuCode="menuCode" :nowUserType="nowUserType" ref="tarBar" @changeMenu="changeMenu"></tabBarVue>
 		<!-- 普通弹窗 -->
@@ -96,6 +96,8 @@
 		},
 		onReady() {
 			this.$refs.minePage.getDetail()
+			this.$refs.myNotice.search()
+			this.$refs.myNoticeTg.search()
 		},
 		mounted() {
 			this.refreshUserType()
diff --git a/pages/mine/mine-index.vue b/pages/mine/mine-index.vue
index 5176bc3..54e1366 100644
--- a/pages/mine/mine-index.vue
+++ b/pages/mine/mine-index.vue
@@ -360,7 +360,7 @@
 				this.$tab.navigateTo('/pages/mine/auth/auth-choose')
 			},
 			goCoupon() {
-				this.$tab.navigateTo('/pages/mine/coupon/coupon-list?userId=' + this.userInfo.userId + '&coupon=' + this
+				this.$tab.navigateTo('/pages/mine/coupon/my-coupon?userId=' + this.userInfo.userId + '&coupon=' + this
 					.userInfo.coupon)
 			},
 			goHistory() {
@@ -863,4 +863,4 @@
 			}
 		}
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/notice/detail.vue b/pages/notice/detail.vue
index 460b8c5..1edc08a 100644
--- a/pages/notice/detail.vue
+++ b/pages/notice/detail.vue
@@ -109,6 +109,24 @@
 							{{!noticeDetail.isUrgent?'否':noticeDetail.isUrgent==1?'是':'否'}}
 						</view>
 					</view>
+					<view class="dl-item" v-if="noticeDetail.thirdUrl&&passSign">
+
+						<view class="dl-label">
+							三方链接：
+						</view>
+						<view class="dl-value">
+							{{noticeDetail.thirdUrl}}
+						</view>
+					</view>
+					<view class="dl-item" v-else-if="noticeDetail.thirdUrl&&!passSign">
+
+						<view class="dl-label">
+							三方链接：
+						</view>
+						<view class="dl-value">
+							报名后可查看
+						</view>
+					</view>
 				</view>
 				<view class="bottom-box">
 					<text class="update-text">{{calculateTimeDifference(noticeDetail.updateTime)||''}}更新</text>
diff --git a/pages/notice/public-notice.vue b/pages/notice/public-notice.vue
index bf38baf..495c5be 100644
--- a/pages/notice/public-notice.vue
+++ b/pages/notice/public-notice.vue
@@ -100,7 +100,7 @@
 							是否急招
 						</view>
 						<view class="item-value">
-							<uni-data-select v-model="dataObj.isUrgent" :localdata="ifHasRange"
+							<uni-data-select v-model="dataObj.isUrgent" :localdata="ifHasRangeStr"
 								@change="change($event,'isUrgent')" :clear="false"></uni-data-select>
 						</view>
 					</view>
@@ -210,6 +210,14 @@
 								placeholder="请输入通告明细" /> -->
 						</view>
 					</view>
+					<view class="item-field">
+						<view class="item-lable">
+							三方链接
+						</view>
+						<view class="item-value">
+							<input class="uni-input" v-model="dataObj.thirdUrl" type="text" placeholder="请输入" />
+						</view>
+					</view>
 				</view>
 				<!-- 自定义表单 -->
 				<view class="form-content">
@@ -326,8 +334,10 @@
 					bloggerTypesList: [],
 					tel: "",
 					wechat: "",
+					thirdUrl: "",
 					// 是否公开联系方式(0否|1是)
 					isShowTel: null,
+					isUrgent: 0
 				},
 				isEligibleList: [{
 					text: '报名需符合粉丝要求',
@@ -351,6 +361,15 @@
 						text: "是"
 					}
 				],
+				ifHasRangeStr: [{
+						value: '0',
+						text: "否"
+					},
+					{
+						value: '1',
+						text: "是"
+					}
+				],
 				//是否限制
 				limitRange: [{
 						value: 0,
@@ -361,6 +380,7 @@
 						text: "限制"
 					}
 				],
+				isEdit: 0
 
 			}
 		},
@@ -371,6 +391,12 @@
 			if (params.sameId) {
 				this.getSameNotice(params.sameId)
 			}
+			if (params.isEdit) {
+				this.isEdit = params.isEdit
+			}
+		},
+		onShow() {
+			this.dataObj.detail = this.dataObj.detail.replace(/<br>/g, '\n')
 		},
 		methods: {
 			/**
@@ -395,9 +421,14 @@
 				}).then(res => {
 					if (res.code == 200) {
 						this.dataObj = res.data.noticeDetail
-						this.dataObj.id = null
+						if (this.isEdit == 0) {
+							this.dataObj.id = null
+						}
+
 						if (res.data.noticeDetail.bloggerTypes) {
 							this.dataObj.bloggerTypesList = res.data.noticeDetail.bloggerTypes.split(",")
+						} else {
+							this.dataObj.bloggerTypesList = []
 						}
 						//处理产品图和群码
 						if (this.dataObj.images) {
@@ -561,8 +592,6 @@
 				}
 				let str = this.dataObj.detail.replace(/\n|\r\n/g, "<br>")
 				this.dataObj.detail = str
-				//待审核状态
-				this.dataObj.approvalStatus = '0'
 				if (this.fileList && this.fileList.length > 0) {
 					this.dataObj.images = []
 					this.dataObj.groupImage = ''
@@ -580,6 +609,8 @@
 				})
 
 				this.dataObj.customForm = this.customFieldList
+				//待审核状态
+				this.dataObj.approvalStatus = '0'
 				saveNotice(this.dataObj).then(res => {
 					this.dataObj.id = res.data.noticeId
 					uni.showToast({
diff --git a/uni_modules/uni-popup/components/uni-popup/uni-popup.vue b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
index c35afff..85f405d 100644
--- a/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
+++ b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
@@ -268,7 +268,7 @@
 
 			open(direction) {
 				console.log(direction, "12222")
-				debugger
+
 				// fix by mehaotian 处理快速打开关闭的情况
 				if (this.showPopup) {
 					return