修改报错

src/pages/publishBall/index.tsx

@@ -275,11 +275,7 @@ const PublishBall: React.FC = () => {
     <View className={styles['publish-ball']}>
       {/* 活动类型切换 */}
       <View className={styles['activity-type-switch']}>
-<<<<<<< HEAD
         {/* <ActivityTypeSwitch 
-=======
-        <ActivityTypeSwitch
->>>>>>> d92419f3c5648a67d1b6857d66d6c92a4bece034
           value={activityType}
           onChange={handleActivityTypeChange}
         /> */}
@@ -334,7 +330,6 @@ const PublishBall: React.FC = () => {
       </View>
 
       {/* 删除确认弹窗 */}
-<<<<<<< HEAD
       <CommonDialog
         visible={deleteConfirm.visible}
         cancelText="再想想"
@@ -344,30 +339,6 @@ const PublishBall: React.FC = () => {
         contentTitle="确认移除该场次？"
         contentDesc="该操作不可恢复"
       />
-=======
-      {deleteConfirm.visible && (
-        <View className={styles['delete-modal']}>
-          <View className={styles['delete-modal__content']}>
-            <Text className={styles['delete-modal__title']}>确认移除该场次？</Text>
-            <Text className={styles['delete-modal__desc']}>该操作不可恢复</Text>
-            <View className={styles['delete-modal__actions']}>
-              <Button
-                className={styles['delete-modal__btn']}
-                onClick={closeDeleteConfirm}
-              >
-                再想想
-              </Button>
-              <Button
-                className={styles['delete-modal__btn']}
-                onClick={confirmDelete}
-              >
-                确认移除
-              </Button>
-            </View>
-          </View>
-        </View>
-      )}
->>>>>>> d92419f3c5648a67d1b6857d66d6c92a4bece034
 
       {/* 完成按钮 */}
       <View className={styles['submit-section']}>