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

发布测试

See merge request !45

components/commonPopup/everyJoinPopup.vue

@@ -27,7 +27,11 @@
 		</view>
 		</view>
       </view>
       </view>
       <view class="joinFotter">
       <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 }}
 		    {{ cancelText }}
 		  </view>
 		  </view>
 		  <view @click="handleContinue">
 		  <view @click="handleContinue">