Browse Source

fix: 修改通知栏

ansoni 4 months ago
parent
commit
d2d23385a1

+ 0 - 5
.idea/.gitignore

@@ -1,5 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/

+ 0 - 10
.idea/UniappTool.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="cn.fjdmy.uniapp.UniappProjectDataService">
-    <option name="generalBasePath" value="$PROJECT_DIR$" />
-    <option name="manifestPath" value="$PROJECT_DIR$/manifest.json" />
-    <option name="pagesPath" value="$PROJECT_DIR$/pages.json" />
-    <option name="scanNum" value="1" />
-    <option name="type" value="store" />
-  </component>
-</project>

+ 1 - 4
.idea/material_theme_project_new.xml

@@ -3,10 +3,7 @@
   <component name="MaterialThemeProjectNewConfig">
     <option name="metadata">
       <MTProjectMetadataState>
-        <option name="migrated" value="true" />
-        <option name="pristineConfig" value="false" />
-        <option name="userId" value="-c883cca:189887095b0:-8000" />
-        <option name="version" value="8.13.2" />
+        <option name="userId" value="-41661f7c:195cc83473c:-7fb0" />
       </MTProjectMetadataState>
     </option>
   </component>

+ 1 - 1
.idea/modules.xml

@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/next-blog.iml" filepath="$PROJECT_DIR$/.idea/next-blog.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/site_front.iml" filepath="$PROJECT_DIR$/.idea/site_front.iml" />
     </modules>
   </component>
 </project>

+ 0 - 1
.idea/prettier.xml

@@ -2,6 +2,5 @@
 <project version="4">
   <component name="PrettierConfiguration">
     <option name="myConfigurationMode" value="AUTOMATIC" />
-    <option name="myRunOnSave" value="true" />
   </component>
 </project>

+ 5 - 1
.idea/next-blog.iml → .idea/site_front.iml

@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="WEB_MODULE" version="4">
   <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>

+ 104 - 0
.idea/workspace.xml

@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="cefcab87-0337-4425-a7d4-cfe46845b330" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/.gitignore" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/UniappTool.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/material_theme_project_new.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/material_theme_project_new.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/next-blog.iml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/prettier.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/prettier.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/public/icon-192x192.png" beforeDir="false" afterPath="$PROJECT_DIR$/public/icon-192x192.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/public/icon-512x512.png" beforeDir="false" afterPath="$PROJECT_DIR$/public/icon-512x512.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/app/[locale]/(TabBar)/[[...share]]/@prizeWidget/page.tsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/app/[locale]/(TabBar)/[[...share]]/@prizeWidget/page.tsx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/app/[locale]/(TabBar)/[[...share]]/_home/HomeNoticeBar.tsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/app/[locale]/(TabBar)/[[...share]]/_home/HomeNoticeBar.tsx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/app/[locale]/(TabBar)/[[...share]]/_home/HomeTabs.tsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/app/[locale]/(TabBar)/[[...share]]/_home/HomeTabs.tsx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/app/[locale]/(TabBar)/[[...share]]/layout.tsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/app/[locale]/(TabBar)/[[...share]]/layout.tsx" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectColorInfo"><![CDATA[{
+  "associatedIndex": 8
+}]]></component>
+  <component name="ProjectId" id="2unn7XrU0ZZlgyKTAFAGfBYZ5XC" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="openDirectoriesWithSingleClick" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "JavaScript Debug.localhost:3000.executor": "Debug",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.git.unshallow": "true",
+    "git-widget-placeholder": "feature-Before",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "pnpm",
+    "npm.dev.executor": "Run",
+    "prettierjs.PrettierConfiguration.Package": "F:\\project\\site_front\\node_modules\\prettier",
+    "ts.external.directory.path": "F:\\project\\site_front\\node_modules\\typescript\\lib",
+    "vue.rearranger.settings.migration": "true"
+  }
+}]]></component>
+  <component name="RecentsManager">
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="F:\project\site_front\public" />
+    </key>
+  </component>
+  <component name="RunManager" selected="npm.dev">
+    <configuration name="localhost:3000" type="JavascriptDebugType" temporary="true" nameIsGenerated="true" uri="http://localhost:3000">
+      <method v="2" />
+    </configuration>
+    <configuration name="dev" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
+      <package-json value="$PROJECT_DIR$/package.json" />
+      <command value="run" />
+      <scripts>
+        <script value="dev" />
+      </scripts>
+      <node-interpreter value="project" />
+      <envs />
+      <method v="2" />
+    </configuration>
+    <recent_temporary>
+      <list>
+        <item itemvalue="JavaScript Debug.localhost:3000" />
+        <item itemvalue="npm.dev" />
+      </list>
+    </recent_temporary>
+  </component>
+  <component name="SharedIndexes">
+    <attachedChunks>
+      <set>
+        <option value="bundled-js-predefined-d6986cc7102b-e768b9ed790e-JavaScript-WS-243.21565.180" />
+      </set>
+    </attachedChunks>
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="cefcab87-0337-4425-a7d4-cfe46845b330" name="Changes" comment="" />
+      <created>1742893039198</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1742893039198</updated>
+      <workItem from="1742893040377" duration="8579000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+</project>

BIN
public/icon-192x192.png


BIN
public/icon-512x512.png


+ 1 - 1
src/app/[locale]/(TabBar)/[[...share]]/_home/HomeNoticeBar.tsx

@@ -15,7 +15,7 @@ const HomeNoticeBar: FC<Props> = (props) => {
                 "my-[0.0694rem] flex items-center overflow-hidden bg-[url(/home/notice.png)] bg-[length:100%_100%] px-[.1rem]"
             }
         >
-            <div className={"iconfont icon-laba mr-[0.06rem] text-[.14rem] text-[#86e2f0]"}></div>
+            <div className={"iconfont icon-laba mr-[0.06rem] text-[.14rem] text-[#86e2f0] "}></div>
             <Swiper
                 direction="vertical"
                 indicator={() => null}

+ 2 - 2
src/app/[locale]/(TabBar)/[[...share]]/_home/HomeTabs.tsx

@@ -114,7 +114,7 @@ const TabItem = ({
             <div className="flex h-[.55rem] items-end justify-center">
                 {!item.image && <span className={cls}></span>}
                 {item.image && (
-                    <Image src={item.image} width={45} height={55} alt={item.url}></Image>
+                    <img src={item.image} width={45} height={55} alt={item.url}></img>
                 )}
             </div>
 
@@ -171,7 +171,7 @@ const Tabs: FC<Props> = (props) => {
 
     return (
         <>
-            <Box pt={false} className="px-[.3rem] pb-[.2rem] pt-[.2rem]">
+            <Box pt={false} className="px-[.3rem]">
                 <Swiper slidesPerView={5} centeredSlides={true} centeredSlidesBounds>
                     {tabData?.map((group, index) => (
                         <SwiperSlide key={index}>

+ 19 - 21
src/app/[locale]/(TabBar)/[[...share]]/layout.tsx

@@ -65,33 +65,31 @@ const Layout: FC<PropsWithChildren<Props>> = async (props) => {
             <main id="maincontainer" className={"main-header"}>
                 {/*弹窗*/}
                 <Suspense fallback={<div></div>}>{popupWidget}</Suspense>
-                <Box none>
-                    <Box>
-                        {/* swiper */}
-                        {swiperWidget}
-                    </Box>
-                    {/* swiper下的活动 */}
-                    <Box none className="px-[.12rem]">
-                        {cardWidget}
-                    </Box>
-                    {/* 跑马灯 */}
-                    <Box none className="px-[.12rem]">
-                        {noticeWidget}
-                    </Box>
+                <Box>
+                    {/* swiper */}
+                    {swiperWidget}
+                </Box>
+                {/* swiper下的活动 */}
+                <Box none className="px-[.12rem]">
+                    {cardWidget}
+                </Box>
+                {/* 跑马灯 */}
+                <Box none className="px-[.12rem]">
+                    {noticeWidget}
+                </Box>
 
-                    {/* <Box>
+                {/* <Box>
                        {categoryWidget}
                     </Box> */}
 
-                    {/*体育轮播*/}
-                    {/* <Box> {sportSwiperWidget}</Box> */}
-                    {/* 搜索下面的大奖展示 */}
-                    {prizeWidget}
-                    {/* 搜索组件 */}
-                    {/* <Box none className="mb-[.2rem] px-[.12rem]">
+                {/*体育轮播*/}
+                {/* <Box> {sportSwiperWidget}</Box> */}
+                {/* 搜索下面的大奖展示 */}
+                {prizeWidget}
+                {/* 搜索组件 */}
+                {/* <Box none className="mb-[.2rem] px-[.12rem]">
                         {searchWidget}
                     </Box> */}
-                </Box>
                 {/* tabs 和 游戏列表 */}
 
                 {children}