合并代码

2025-08-30 22:28:02 +08:00
parent fa87894a6f d92419f3c5
commit c9984b988b
143 changed files with 6369 additions and 2072 deletions
--- a/src/pages/publishBall/components/SelectStadium/StadiumDetail.tsx
+++ b/src/pages/publishBall/components/SelectStadium/StadiumDetail.tsx
@@ -3,7 +3,8 @@ import Taro from '@tarojs/taro'
 import { View, Text, Image } from '@tarojs/components'
 import images from '@/config/images'
 import TextareaTag from '@/components/TextareaTag'
-import CoverImageUpload, { type CoverImage } from '@/components/ImageUpload'
+// import CoverImageUpload, { type CoverImage } from '@/components/ImageUpload'
+import UploadCover, { type CoverImageValue } from '@/components/UploadCover'
 import { useDictionaryActions } from '@/store/dictionaryStore'
 import './StadiumDetail.scss'

@@ -18,7 +19,7 @@ export interface Stadium {
  court_surface?: string
  description?: string
  description_tag?: string[]
-  venue_image_list?: CoverImage[]
+  venue_image_list?: CoverImageValue[]
 }

 interface StadiumDetailProps {
@@ -103,7 +104,7 @@ const StadiumDetail = forwardRef<StadiumDetailRef, StadiumDetailProps>(({
    court_type: court_type[0] || '',
    court_surface: court_surface[0] || '',
    additionalInfo: '',
-    venue_image_list: [] as CoverImage[],
+    venue_image_list: [] as CoverImageValue[],
    description:{
      description: '',
      description_tag: []
@@ -216,9 +217,21 @@ const StadiumDetail = forwardRef<StadiumDetailRef, StadiumDetailProps>(({
        if (item.type === 'image') {
          return (
            <SectionContainer key={item.label} title={item.label} prop={item.prop}>
-              <CoverImageUpload
-                images={formData[item.prop]}
-                onChange={(images) => updateFormData(item.prop, images)}
+              <UploadCover
+                value={formData[item.prop]}
+                onChange={(value) => {
+                  console.log(value, 'value')
+                  if (value instanceof Function) {
+                    const newValue = value(formData[item.prop])
+                    console.log(newValue, 'newValue')
+                    updateFormData(item.prop, newValue)
+                  } else {
+                    updateFormData(item.prop, value)
+                  }
+                }}
+                maxCount={9}
+                source={['album', 'history', 'preset']}
+                align='left'
              />
            </SectionContainer>
          )
@@ -230,4 +243,4 @@ const StadiumDetail = forwardRef<StadiumDetailRef, StadiumDetailProps>(({
  )
 })

-export default StadiumDetail 
+export default StadiumDetail
--- a/src/pages/publishBall/index.tsx
+++ b/src/pages/publishBall/index.tsx
@@ -8,40 +8,40 @@ import PublishForm from './publishForm'
 import { publishBallFormSchema } from '../../config/formSchema/publishBallFormSchema';
 import { PublishBallFormData } from '../../../types/publishBall';
 import PublishService from '@/services/publishService';
-import { getNextHourTime, getEndTime } from '@/utils/timeUtils';
+import { getNextHourTime, getEndTime, delay } from '@/utils';
 import images from '@/config/images'
 import styles from './index.module.scss'

 const defaultFormData: PublishBallFormData = {
-  title: '',   
-  image_list: ['https://static-o.oss-cn-shenzhen.aliyuncs.com/images/tpbj/tpss10.jpg'],  
+  title: '',
+  image_list: ['https://static-o.oss-cn-shenzhen.aliyuncs.com/images/tpbj/tpss10.jpg'],
  timeRange: {
-    start_time: getNextHourTime(), 
+    start_time: getNextHourTime(),
    end_time: getEndTime(getNextHourTime())
  },
-  activityInfo: {   
+  activityInfo: {
    play_type: '不限',
    price: '',
-    venue_id: null, 
+    venue_id: null,
    location_name: '',
-    location: '', 
-    latitude: '', 
+    location: '',
+    latitude: '',
    longitude: '',
-    court_type: '', 
-    court_surface: '', 
-    venue_description_tag: [], 
-    venue_description: '', 
-    venue_image_list: [], 
+    court_type: '',
+    court_surface: '',
+    venue_description_tag: [],
+    venue_description: '',
+    venue_image_list: [],
  },
  players: [1, 4],
  skill_level: [1.0, 5.0],
  descriptionInfo: {
-    description: '', 
-    description_tag: [], 
+    description: '',
+    description_tag: [],
  },
-  is_substitute_supported: true, 
-  is_wechat_contact: true, 
-  wechat_contact: '14223332214' 
+  is_substitute_supported: true,
+  is_wechat_contact: true,
+  wechat_contact: '14223332214'
 }

 const PublishBall: React.FC = () => {
@@ -72,7 +72,7 @@ const PublishBall: React.FC = () => {
  const [formData, setFormData] = useState<PublishBallFormData[]>([
    defaultFormData
  ])
-  
+
  // 删除确认弹窗状态
  const [deleteConfirm, setDeleteConfirm] = useState<{
    visible: boolean;
@@ -225,6 +225,13 @@ const PublishBall: React.FC = () => {
          title: '发布成功',
          icon: 'success'
        })
+        delay(1000)
+        // 如果是个人球局，则跳转到详情页，并自动分享
+        // 如果是畅打，则跳转第一个球局详情页，并自动分享 @刘杰
+        Taro.navigateTo({
+          // @ts-expect-error: id
+          url: `/pages/detail/index?id=${res.data.id || 1}&from=publish&autoShare=1`
+        })
      } else {
        Taro.showToast({
          title: res.message,
@@ -268,12 +275,16 @@ const PublishBall: React.FC = () => {
    <View className={styles['publish-ball']}>
      {/* 活动类型切换 */}
      <View className={styles['activity-type-switch']}>
+<<<<<<< HEAD
        {/* <ActivityTypeSwitch 
+=======
+        <ActivityTypeSwitch
+>>>>>>> d92419f3c5648a67d1b6857d66d6c92a4bece034
          value={activityType}
          onChange={handleActivityTypeChange}
        /> */}
      </View>
-      
+
      <View className={styles['publish-ball__scroll']}>
        {
          formData.map((item, index) => (
@@ -283,19 +294,19 @@ const PublishBall: React.FC = () => {
                <View className={styles['session-header']}>
                  <View className={styles['session-title']}>
                  第{index + 1}场
-                  <View 
-                      className={styles['session-delete']} 
+                  <View
+                      className={styles['session-delete']}
                      onClick={() => showDeleteConfirm(index)}
                    >
                      <Image src={images.ICON_DELETE} className={styles['session-delete-icon']} />
-                      
+
                    </View>
                  </View>
                  <View className={styles['session-actions']}>
-                    
+
                    {index > 0 && (
-                      <View 
-                        className={styles['session-action-btn']} 
+                      <View
+                        className={styles['session-action-btn']}
                        onClick={() => handleCopyPrevious(index)}
                      >
                        复制上一场
@@ -304,10 +315,10 @@ const PublishBall: React.FC = () => {
                  </View>
                </View>
              )}
-              <PublishForm 
-                formData={item} 
-                onChange={(key, value) => updateFormData(key, value, index)} 
-                optionsConfig={publishBallFormSchema} 
+              <PublishForm
+                formData={item}
+                onChange={(key, value) => updateFormData(key, value, index)}
+                optionsConfig={publishBallFormSchema}
              />
            </View>
          ))
@@ -323,6 +334,7 @@ const PublishBall: React.FC = () => {
      </View>

      {/* 删除确认弹窗 */}
+<<<<<<< HEAD
      <CommonDialog
        visible={deleteConfirm.visible}
        cancelText="再想想"
@@ -332,6 +344,30 @@ 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']}>
--- a/src/pages/publishBall/publishForm.tsx
+++ b/src/pages/publishBall/publishForm.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react'
 import { View, Text } from '@tarojs/components'
-import { ImageUpload, Range, TimeSelector, TextareaTag, NumberInterval, TitleTextarea, FormSwitch } from '../../components'
+import { ImageUpload, Range, TimeSelector, TextareaTag, NumberInterval, TitleTextarea, FormSwitch, UploadCover } from '../../components'
 import FormBasicInfo from './components/FormBasicInfo'
 import { type CoverImage } from '../../components/index.types'
 import { FormFieldConfig, FieldType } from '../../config/formSchema/publishBallFormSchema'
@@ -22,18 +22,22 @@ const componentMap = {
    [FieldType.WECHATCONTACT]: WechatSwitch,
 }

-const PublishForm: React.FC<{ 
-    formData: PublishBallFormData, 
-    onChange: (key: keyof PublishBallFormData, value: any, index?: number) => void, 
+const PublishForm: React.FC<{
+    formData: PublishBallFormData,
+    onChange: (key: keyof PublishBallFormData, value: any, index?: number) => void,
    optionsConfig: FormFieldConfig[] }> = ({ formData, onChange, optionsConfig }) => {
  const [coverImages, setCoverImages] = useState<CoverImage[]>([])
-  
+
  // 字典数据相关
  const { getDictionaryValue } = useDictionaryActions()

  // 处理封面图片变化
-  const handleCoverImagesChange = (images: CoverImage[]) => {
-    setCoverImages(images)
+  const handleCoverImagesChange = (fn: (images: CoverImage[]) => CoverImage[]) => {
+    if (fn instanceof Function) {
+      setCoverImages(fn(coverImages))
+    } else {
+      setCoverImages(fn)
+    }
  }

  // 更新表单数据
@@ -70,7 +74,7 @@ const PublishForm: React.FC<{
          })
        }
      }
-      
+
      // 如果是补充要求，从字典获取选项
      if (item.prop === 'descriptionInfo') {
        const descriptionOptions = getDictionaryOptions('publishing_requirements', [])
@@ -79,7 +83,7 @@ const PublishForm: React.FC<{
          options: descriptionOptions
        }
      }
-      
+
      return item
    })
  }
@@ -121,7 +125,7 @@ const PublishForm: React.FC<{



- 
+

  // 获取动态表单配置
  const dynamicConfig = getDynamicFormConfig()
@@ -140,8 +144,8 @@ const PublishForm: React.FC<{
                }
                if (item.type === FieldType.UPLOADIMAGE) {
                    /* 活动封面 */
-                    return  <ImageUpload 
-                      images={coverImages}
+                    return  <UploadCover
+                      value={coverImages}
                      onChange={handleCoverImagesChange}
                      {...item.props}
                    />
@@ -182,7 +186,7 @@ const PublishForm: React.FC<{
                                value={formData[item.prop]}
                                onChange={(value) => updateFormData(item.prop as keyof PublishBallFormData, value)}
                                {...optionProps}
-                                placeholder={item.placeholder} 
+                                placeholder={item.placeholder}
                            />
                        </View>
                    </View>