feat :1.橙宝日志 项目修改。

pages.config.ts

@@ -35,28 +35,17 @@ export default defineUniPages({
       },
       {
         icon: '/static/tabbar/music.png',
-        pagePath: 'pages/category/category',
-        text: 'tabbar.category',
+        pagePath: 'pages/music/music',
+        text: 'tabbar.music',
         iconType: 'local',
       },
-      // {
-      //   icon: '/static/tabbar/cart.png',
-      //   pagePath: 'pages/cart/cart',
-      //   text: 'tabbar.cart',
-      //   iconType: 'local',
-      // },
+
       {
         icon: '/static/tabbar/user.png',
         pagePath: 'pages/community/community',
         text: 'tabbar.community',
         iconType: 'local',
       },
-      // {
-      //   icon: '/static/tabbar/person.png',
-      //   pagePath: 'pages/person/person',
-      //   text: 'tabbar.person',
-      //   iconType: 'local',
-      // },
     ],
   },
 })

src/components/shop-tabbar/shop-tabbar.vue

@@ -11,7 +11,6 @@
         <image :src="music.icon" class="home-item-img" mode="widthFix"></image>
       </view>
     </view>
-    <!-- 111 -->
     <view class="home-item" @click="selectTabBar(user.path, 0)">
       <view class="home-item-wrapper">
         <image :src="user.icon" class="home-item-img" mode="widthFix"></image>
@@ -37,8 +36,8 @@
     console.log(url, '11111111')
     console.log(index, '222222')
 
-    // tabbarStore.setCurIdx(index)
-    // uni.switchTab({ url })
+    tabbarStore.setCurIdx(index)
+    uni.switchTab({ url })
   }
 
   onLoad(() => {

src/components/sku/sku.vue

@@ -1,11 +0,0 @@
-<template>
-  <view class="">商品SKU选择</view>
-</template>
-
-<script lang="ts" setup>
-  //
-</script>
-
-<style lang="scss" scoped>
-  //
-</style>

src/locale/en.json

@@ -1,7 +1,7 @@
 {
   "tabbar.home": "Home",
   "tabbar.category": "Category",
-  "tabbar.cart": "Cart",
+  "tabbar.music": "Cart",
   "tabbar.community": "Community",
   "tabbar.person": "Person",
   "app.name": "En Title",

src/locale/zh-Hans.json

@@ -1,7 +1,7 @@
 {
   "tabbar.home": "主页",
   "tabbar.category": "分类",
-  "tabbar.cart": "购物车",
+  "tabbar.music": "购物车",
   "tabbar.community": "社区",
   "tabbar.person": "我的",
   "app.name": "中文标题",

src/pages/category/category.vue

@@ -1,124 +0,0 @@
-<route lang="json5">
-{
-  layout: 'tabbar',
-  style: {
-    navigationBarTitleText: '%tabbar.category%',
-  },
-}
-</route>
-<template>
-  <view
-    style="height: 100vh; border-top: 2rpx solid #f2f2f2"
-    class="flex justify-between box-border"
-  >
-    <view class="w-183rpx box-border h-full overflow-auto bg-[#F2F2F2] pb-144rpx">
-      <view
-        v-for="(i, idx) in 30"
-        :key="i"
-        @click="handleSelectItem(idx, [])"
-        :class="`relative w-full   box-border p-32rpx h-[108rpx] text-28rpx ${idx === categoryIndex ? ' text-[#FF4C1B] bg-white font-600' : 'bg-[#F2F2F2] font-400'}`"
-      >
-        <view class="truncate">7{{ i }}Luggage</view>
-
-        <view
-          v-if="idx === categoryIndex"
-          class="absolute top-1/2 left-0 -translate-y-1/2 w-6rpx h-28rpx bg-[#FF4C1B] rounded-full"
-        ></view>
-        <image
-          v-if="idx === categoryIndex && categoryIndex != 0"
-          class="absolute right-0 -top-18rpx w-18rpx z-20 h-18rpx object-cover"
-          src="@/static/images/category/suffix.svg"
-          mode="widthFix"
-          alt=""
-        />
-        <image
-          v-if="idx === categoryIndex"
-          class="absolute right-0 -bottom-18rpx z-20 w-18rpx h-18rpx object-cover"
-          src="@/static/images/category/prefix.svg"
-          mode="widthFix"
-          alt=""
-        />
-      </view>
-    </view>
-
-    <view style="width: calc(100vw - 183rpx)" class="box-border px-32rpx pt-24rpx overflow-auto">
-      <view
-        class="flex justify-start h-72rpx items-center box-border px-24rpx rounded-full border-2rpx border-solid border2 mb-32rpx"
-      >
-        <image class="w-32rpx h-32rpx object-cover" :src="search" mode="widthFix" alt="" />
-
-        <text class="ml-20rpx text-28rpx text-[#999]">{{ t('category.search') }}</text>
-      </view>
-
-      <view
-        style="height: calc(100vh - 72rpx - 24rpx - 32rpx - 144rpx)"
-        class="category-list box-border w-full flex"
-      >
-        <view
-          v-for="(item, index) in 50"
-          :key="index"
-          @click="goToDlite('1')"
-          class="bg-white w-full"
-        >
-          <view class="w-110rpx h-110rpx mx-auto mb-16rpx">
-            <image
-              class="w-full"
-              src="https://t.xiaoyaotravel.com/image/TourImComplait/messageContent/7ce4d7df18b1416d866483d55fd91ceb.png"
-              mode="widthFix"
-            ></image>
-          </view>
-          <view class="line-clamp-1 overflow-hidden">Women's sports shoes</view>
-        </view>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script lang="ts" setup>
-  import { t } from '@/locale'
-  import search from '@/static/images/category/search.svg'
-  const { safeAreaInsets } = uni.getSystemInfoSync()
-  type childrenObj = {
-    name: string
-    imageUrl: string
-  }
-  const categoryIndex = ref(0)
-  const categoryChildrenList = ref([])
-
-  function handleSelectItem(idx: number, children: Array<childrenObj>) {
-    categoryIndex.value = idx
-    categoryChildrenList.value = children
-  }
-
-  function goToDlite(uid: string | number) {
-    uni.navigateTo({
-      url: `/pages/product/details?id=${uid}`,
-    })
-  }
-
-  onLoad(() => {
-    console.log('分类')
-    console.log(safeAreaInsets, 'safeAreaInsets')
-  })
-
-  onMounted(() => {})
-</script>
-<style lang="scss" scoped>
-  .category-list {
-    display: grid;
-    grid-template-rows: repeat(auto-fill, minmax(192rpx, 1fr)); /* 自动填充行，每行高度为 192rpx */
-    grid-template-columns: repeat(3, 1fr);
-    grid-auto-flow: row; /* 确保项目会填充所有的网格单元 */
-    grid-gap: 24rpx 32rpx;
-  }
-  /* 添加额外的空白行 */
-  .category-list::after {
-    grid-column: 1 / -1;
-    height: 144rpx; /* 额外的空行高度 */
-    content: '';
-  }
-
-  .border2 {
-    border-color: $shop-bg-line;
-  }
-</style>

src/pages/community/community.vue

@@ -1,11 +0,0 @@
-<route lang="json5">
-{
-  layout: 'tabbar',
-  style: {
-    navigationBarTitleText: '%tabbar.community%',
-  },
-}
-</route>
-<template>
-  <view>社区</view>
-</template>

src/pages/cart/cart.vue → src/pages/music/music.vue

@@ -3,7 +3,7 @@
   layout: 'tabbar',
   style: {
     navigationStyle: 'custom',
-    navigationBarTitleText: '%tabbar.cart%',
+    navigationBarTitleText: '%tabbar.music%',
   },
 }
 </route>
@@ -15,6 +15,6 @@
     class="pb-tab bg-white overflow-hidden box-border"
     :style="{ marginTop: safeAreaInsets?.top + 'px' }"
   >
-    购物车
+    音乐
   </view>
 </template>

src/static/images/category/search.svg

@@ -1,7 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="Frame">
-<path id="Vector" d="M7.00004 12.6667C10.1296 12.6667 12.6667 10.1296 12.6667 7C12.6667 3.8704 10.1296 1.33333 7.00004 1.33333C3.87044 1.33333 1.33337 3.8704 1.33337 7C1.33337 10.1296 3.87044 12.6667 7.00004 12.6667Z" stroke="#333333" stroke-linejoin="round"/>
-<path id="Vector_2" d="M8.88561 4.78103C8.40305 4.29847 7.73638 4 6.99998 4C6.26361 4 5.59695 4.29847 5.11438 4.78103" stroke="#333333" stroke-linecap="round" stroke-linejoin="round"/>
-<path id="Vector_3" d="M11.0739 11.0739L13.9023 13.9023" stroke="#333333" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-</svg>

src/static/images/search.svg

@@ -1,5 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" fill="none">
-  <path d="M8.75 15.8333C12.662 15.8333 15.8333 12.662 15.8333 8.75C15.8333 4.838 12.662 1.66666 8.75 1.66666C4.838 1.66666 1.66667 4.838 1.66667 8.75C1.66667 12.662 4.838 15.8333 8.75 15.8333Z" stroke="#FF4C1B" stroke-width="1.25" stroke-linejoin="round"/>
-  <path d="M11.1071 5.97629C10.5039 5.37308 9.67052 5 8.75002 5C7.82957 5 6.99623 5.37308 6.39302 5.97629" stroke="#FF4C1B" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M13.8424 13.8424L17.3779 17.3779" stroke="#FF4C1B" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="57" height="56" viewBox="0 0 57 56" fill="none">
+<rect x="0.875" width="56" height="56" rx="12" fill="#FFE6D2"/>
+<path d="M25.9539 12.6903V9.5487C25.9539 8.87274 26.2224 8.22447 26.7004 7.7465C27.1784 7.26852 27.8266 7 28.5026 7H29.5526C30.2286 7 30.8768 7.26852 31.3548 7.7465C31.8328 8.22447 32.1013 8.87274 32.1013 9.5487V12.7036L41.9349 21H16.1049L25.9539 12.6903ZM40.2941 24.7058L42.7546 40.1653C42.7299 42.533 41.7656 44.7938 40.0741 46.4506C38.3825 48.1074 36.1021 49.0244 33.7344 49H24.7149C22.3474 49.0244 20.067 48.1075 18.3755 46.4509C16.6839 44.7942 15.7196 42.5335 15.6947 40.166L18.1545 24.7065H40.2941V24.7058ZM32.9147 29.6464H26.355C25.9182 29.6464 25.4992 29.8199 25.1903 30.1288C24.8814 30.4377 24.7079 30.8567 24.7079 31.2935C24.7079 31.7303 24.8814 32.1493 25.1903 32.4582C25.4992 32.7671 25.9182 32.9406 26.355 32.9406H32.9154C33.3522 32.9405 33.7711 32.7669 34.08 32.4579C34.3888 32.149 34.5622 31.73 34.5622 31.2931C34.5621 30.8563 34.3884 30.4374 34.0795 30.1286C33.7705 29.8198 33.3515 29.6463 32.9147 29.6464ZM32.9147 34.5877H29.6345C29.1977 34.5877 28.7787 34.7612 28.4698 35.0701C28.1609 35.379 27.9874 35.798 27.9874 36.2348C27.9874 36.6716 28.1609 37.0906 28.4698 37.3995C28.7787 37.7084 29.1977 37.8819 29.6345 37.8819H32.9147C33.3515 37.8819 33.7705 37.7084 34.0794 37.3995C34.3883 37.0906 34.5618 36.6716 34.5618 36.2348C34.5618 35.798 34.3883 35.379 34.0794 35.0701C33.7705 34.7612 33.3515 34.5877 32.9147 34.5877ZM24.7149 42.8232H32.9147C33.3515 42.8232 33.7705 42.6497 34.0794 42.3408C34.3883 42.0319 34.5618 41.6129 34.5618 41.1761C34.5618 40.7393 34.3883 40.3203 34.0794 40.0114C33.7705 39.7025 33.3515 39.529 32.9147 39.529H24.7149C24.2781 39.529 23.8591 39.7025 23.5502 40.0114C23.2413 40.3203 23.0678 40.7393 23.0678 41.1761C23.0678 41.6129 23.2413 42.0319 23.5502 42.3408C23.8591 42.6497 24.2781 42.8232 24.7149 42.8232Z" fill="#FFFDED"/>
+<path d="M17.675 18.9441H40.075C42.4083 18.9441 43.575 20.1108 43.575 22.4441C43.575 24.7774 42.4083 25.9441 40.075 25.9441H17.675C15.3417 25.9441 14.175 24.7774 14.175 22.4441C14.175 20.1108 15.3417 18.9441 17.675 18.9441Z" fill="#FFAA65"/>
 </svg>