修改报错

src/components/GuideBar/index.tsx

@@ -3,7 +3,7 @@ import { View, Text, Image } from '@tarojs/components'
 import Taro from '@tarojs/taro'
 import img from '@/config/images'
 import './index.scss'
-
+import PublishMenu from '../PublishMenu'
 export type currentPageType = 'games' | 'message' | 'personal'
 
 const GuideBar = (props) => {
@@ -59,9 +59,10 @@ const GuideBar = (props) => {
           ))}
         </View>
         {/* publish button on the right */}
-        <View className='guide-bar-publish' onClick={handlePublish}>
+        {/* <View className='guide-bar-publish' onClick={handlePublish}>
           <Image className='guide-bar-publish-icon' src={img.ICON_GUIDE_BAR_PUBLISH} />
-        </View>
+        </View> */}
+        <PublishMenu />
       </View>
     </View>
   )

src/components/PublishMenu/index.module.scss

@@ -1,19 +1,8 @@
 .publishMenu {
-  position: fixed;
-  bottom: 40px;
-  right: 40px;
+  position: relative;
   z-index: 1000;
 }
 
-.overlay {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background: transparent;
-  z-index: 999;
-}
 
 .menuCard {
   position: absolute;

src/components/index.ts

@@ -9,12 +9,12 @@ import TimeSelector from './TimeSelector'
 import TitleTextarea from './TitleTextarea'
 import CommonPopup from './CommonPopup'
 import DateTimePicker from './DateTimePicker/DateTimePicker'
-<<<<<<< HEAD
 import TimePicker from './TimePicker/TimePicker'
 import CalendarCard, { DialogCalendarCard } from './CalendarCard'
 import CommonDialog from './CommonDialog'
 import PublishMenu from './PublishMenu/PublishMenu'
- 
+import UploadCover from './UploadCover'
+
  export { 
      ActivityTypeSwitch, 
      TextareaTag, 
@@ -30,23 +30,7 @@ import PublishMenu from './PublishMenu/PublishMenu'
     CalendarCard,
     DialogCalendarCard,
     CommonDialog,
-    PublishMenu
+    PublishMenu,
+    UploadCover
  }
-=======
-import UploadCover from './UploadCover'
-
-export {
-    ActivityTypeSwitch,
-    TextareaTag,
-    FormSwitch,
-    ImageUpload,
-    Range,
-    NumberInterval,
-    TimeSelector,
-    TitleTextarea,
-    CommonPopup,
-    DateTimePicker,
-    UploadCover,
-}
->>>>>>> d92419f3c5648a67d1b6857d66d6c92a4bece034