Merge branch 'feature-20250614-首页菜单优化' into 'dev'

发布测试 See merge request !45

Merge branch 'feature-20250614-首页菜单优化' into 'dev'
发布测试 See merge request !45
4a76ed1b · yuzhenWang · 365ca490 · c71fc184 · 4a76ed1b
Commit 4a76ed1b authored Jul 15, 2025 by yuzhenWang
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletions

components/commonPopup/everyJoinPopup.vue
+5 -1

No files found.
--- a/components/commonPopup/everyJoinPopup.vue
+++ b/components/commonPopup/everyJoinPopup.vue
@@ -27,7 +27,11 @@
 		</view>
      </view>
      <view class="joinFotter">
-		  <view @click="handleCancel" style="background-color: #FAFAFA;color: #333333;">
+		  <view 
+			v-if="showCanel"
+			@click="handleCancel" 
+			style="background-color: #FAFAFA;color: #333333;"
+		>
 		    {{ cancelText }}
 		  </view>
 		  <view @click="handleContinue">