From 4f7cda122e17db8effe12c38945a4ce32d9856a5 Mon Sep 17 00:00:00 2001
From: 13405411873 <1994398261@qq.com>
Date: Tue, 6 May 2025 14:05:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/business/base.js              |  4 ++--
 api/business/member.js            |  2 +-
 pages/mine/coupon/coupon-list.vue |  4 ++--
 pages/mine/coupon/my-coupon.vue   | 10 +++++-----
 pages/mine/mine-index.vue         |  2 +-
 pages/notice/detail.vue           |  2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/api/business/base.js b/api/business/base.js
index 97a417c..7a6cd2a 100644
--- a/api/business/base.js
+++ b/api/business/base.js
@@ -35,8 +35,8 @@ export function rightList(params) {
 	})
 }
 
-//------------------通告券相关-----------------------
-//查询基础通告券
+//------------------急招券相关-----------------------
+//查询基础急招券
 export function initCouponList() {
 	return request({
 		url: '/base/coupon/uniCouponList',
diff --git a/api/business/member.js b/api/business/member.js
index a5dd26c..936b5e2 100644
--- a/api/business/member.js
+++ b/api/business/member.js
@@ -201,7 +201,7 @@ export function saveBlack(data) {
 	})
 }
 
-//查询通告券
+//查询急招券
 export function getMemberCoupon() {
 	return request({
 		url: '/member/coupon/getMemberCoupon',
diff --git a/pages/mine/coupon/coupon-list.vue b/pages/mine/coupon/coupon-list.vue
index 519ba0e..c5fe8a5 100644
--- a/pages/mine/coupon/coupon-list.vue
+++ b/pages/mine/coupon/coupon-list.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="container-box">
-		<navigation-bar-vue title="通告券" style="width: 100%;" background-color="#ffffff"
+		<navigation-bar-vue title="急招券" style="width: 100%;" background-color="#ffffff"
 			title-color="#000000"></navigation-bar-vue>
 		<view class="content">
 			<view class="content-body">
@@ -24,7 +24,7 @@
 			</view>
 			<view class="item-field" style="align-items: center;">
 				<!--				<view class="my-suggest-dom" @click="viewRichText()">-->
-				<!--					<text>了解通告券</text>-->
+				<!--					<text>了解急招券</text>-->
 				<!--					<uni-icons type="right" color="#363636" size="14"></uni-icons>-->
 				<!--				</view>-->
 				<view class="my-suggest-dom" @click="goMyCoupon(1)">
diff --git a/pages/mine/coupon/my-coupon.vue b/pages/mine/coupon/my-coupon.vue
index c5ab802..8882d24 100644
--- a/pages/mine/coupon/my-coupon.vue
+++ b/pages/mine/coupon/my-coupon.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="container-box">
-		<navigation-bar-vue title="通告券" style="width: 100%;" background-color="#ffffff"
+		<navigation-bar-vue title="急招券" style="width: 100%;" background-color="#ffffff"
 			title-color="#000000"></navigation-bar-vue>
 		<view class="content">
 			<!-- 操作按钮 -->
@@ -37,7 +37,7 @@
 				</view>
 				<view class="item-field" style="align-items: center;">
 					<view class="my-suggest-dom" @click="viewRichText()">
-						<text>查看《通告券购买协议》</text>
+						<text>查看《急招券购买协议》</text>
 					</view>
 				</view>
 			</view>
@@ -53,7 +53,7 @@
 								</view>
 							</view>
 							<view class="detail-item">
-								<view class="left-dom">通告券</view>
+								<view class="left-dom">急招券</view>
 								<view class="right-dom">*{{item.goodsNum}} 张</view>
 							</view>
 							<view class="detail-item" style="border-bottom:1rpx solid #F4F4F4;padding-bottom: 25rpx;">
@@ -107,10 +107,10 @@
 		data() {
 			return {
 				globalConfig: getApp().globalData.config,
-				menus: ['通告券', '购买记录'],
+				menus: ['急招券', '购买记录'],
 				menuIndex: 0,
 				coupon: 0,
-				//选中的通告券下标
+				//选中的急招券下标
 				couponIndex: 0,
 				queryParams: {
 					pageNum: 1,
diff --git a/pages/mine/mine-index.vue b/pages/mine/mine-index.vue
index 66bb148..038e71e 100644
--- a/pages/mine/mine-index.vue
+++ b/pages/mine/mine-index.vue
@@ -112,7 +112,7 @@
 						<view class="menu-item" v-if="'01'==localUserType" @click="goCoupon()">
 							<!-- <image src="@/static/mine/zuji.png" mode="aspectFit"></image> -->
 							<image src="@/static/mine/caise/tonggaoquan.png" mode="aspectFit"></image>
-							<view class="text-dom">通告券</view>
+							<view class="text-dom">急招券</view>
 							<uni-icons type="right" color="#623109" size="12"></uni-icons>
 						</view>
 						<view class="menu-item" @click="goHistory()">
diff --git a/pages/notice/detail.vue b/pages/notice/detail.vue
index 9330c6d..3e413ab 100644
--- a/pages/notice/detail.vue
+++ b/pages/notice/detail.vue
@@ -587,7 +587,7 @@
 				this.$refs.share.open()
 			},
 			/**
-			 * 使用通告券加速
+			 * 使用急招券加速
 			 */
 			useCoupon() {
 

From d326e2e8722192220a273cd620f5d44657b0d10e Mon Sep 17 00:00:00 2001
From: 13405411873 <1994398261@qq.com>
Date: Tue, 6 May 2025 14:41:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/navigation/navigationBar.vue | 8 ++++++--
 pages/notice/detail.vue                 | 7 ++++++-
 pages/notice/public-notice.vue          | 2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/components/navigation/navigationBar.vue b/components/navigation/navigationBar.vue
index 1173686..750dbbc 100644
--- a/components/navigation/navigationBar.vue
+++ b/components/navigation/navigationBar.vue
@@ -31,6 +31,10 @@
 				type: String,
 				default: '#fff'
 			},
+			navigatePath: {
+				type: String,
+				default: '000'
+			},
 		},
 		data() {
 			return {
@@ -40,8 +44,8 @@
 		methods: {
 			back() {
 				console.log('返回');
-				if (this.title == '通告详情') {
-					this.$emit('goIndex')
+				if (this.navigatePath != '000') {
+					this.$tab.navigateTo(this.navigatePath)
 				} else {
 					uni.navigateBack()
 				}
diff --git a/pages/notice/detail.vue b/pages/notice/detail.vue
index 3e413ab..460b8c5 100644
--- a/pages/notice/detail.vue
+++ b/pages/notice/detail.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="dl-detail-box">
-		<navigation-bar-vue title="通告详情" @goIndex="goIndex" style="width: 100%;" background-color="#ffffff"
+		<navigation-bar-vue title="通告详情" :navigatePath="navigatePath" style="width: 100%;" background-color="#ffffff"
 			title-color="#000000"></navigation-bar-vue>
 		<view class="notice-detail-last-box">
 			<!-- 报名列表 -->
@@ -254,6 +254,7 @@
 		},
 		data() {
 			return {
+				navigatePath: '000',
 				//是否是看自己的通告-通告主
 				viewMy: false,
 				//通告ID
@@ -339,6 +340,10 @@
 				this.noticeId = params.noticeId
 			}
 
+			if (params.navigatePath && params.navigatePath == "index") {
+				this.navigatePath = "/pages/index"
+			}
+
 		},
 		onShow() {
 			if (null != getJSONData(constant.userInfo)) {
diff --git a/pages/notice/public-notice.vue b/pages/notice/public-notice.vue
index cb2c85a..38668a2 100644
--- a/pages/notice/public-notice.vue
+++ b/pages/notice/public-notice.vue
@@ -581,7 +581,7 @@
 				saveNotice(this.dataObj).then(res => {
 					this.dataObj.id = res.data.noticeId
 					uni.showToast({
-						title: '发布成功等待审核',
+						title: res.data.msg,
 						icon: 'none',
 						duration: 1000
 					})