Auto merge main into base-uview-plus

2025-06-22 06:22:25 +00:00 · 2025-06-22 06:05:39 +00:00 · 2025-06-22 05:24:11 +00:00 · 2025-06-22 05:02:28 +00:00 · 2025-06-22 12:21:13 +08:00 · 2025-06-22 11:53:51 +08:00
19 changed files with 106 additions and 363 deletions
--- a/.github/release.yml
+++ b/.github/release.yml
@ -1,31 +0,0 @@
-categories:
-  - title: 🚀 新功能
-    labels: [feat, feature]
-  - title: 🛠️ 修复
-    labels: [fix, bugfix]
-  - title: 💅 样式
-    labels: [style]
-  - title: 📄 文档
-    labels: [docs]
-  - title: ⚡️ 性能
-    labels: [perf]
-  - title: 🧪 测试
-    labels: [test]
-  - title: ♻️ 重构
-    labels: [refactor]
-  - title: 📦 构建
-    labels: [build]
-  - title: 🚨 补丁
-    labels: [patch, hotfix]
-  - title: 🌐 发布
-    labels: [release, publish]
-  - title: 🔧 流程
-    labels: [ci, cd, workflow]
-  - title: ⚙️ 配置
-    labels: [config, chore]
-  - title: 📁 文件
-    labels: [file]
-  - title: 🎨 格式化
-    labels: [format]
-  - title: 🔀 其他
-    labels: [other, misc]
--- a/.github/workflows/auto-merge.yml
+++ b/.github/workflows/auto-merge.yml
@ -1,80 +0,0 @@
-name: Auto Merge Main to Other Branches
-
-on:
-  push:
-    branches:
-      - main
-  workflow_dispatch: # 手动触发
-
-jobs:
-  merge-to-i18n:
-    name: Merge main into i18n
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.GH_TOKEN_AUTO_MERGE }}
-
-      - name: Merge main into i18n
-        run: |
-          git config user.name "GitHub Actions"
-          git config user.email "actions@github.com"
-          git checkout i18n
-          git merge main --no-ff -m "Auto merge main into i18n"
-          git push origin i18n
-
-  merge-to-base-sard-ui:
-    name: Merge main into base-sard-ui
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.GH_TOKEN_AUTO_MERGE }}
-
-      - name: Merge main into base-sard-ui
-        run: |
-          git config user.name "GitHub Actions"
-          git config user.email "actions@github.com"
-          git checkout base-sard-ui
-          git merge main --no-ff -m "Auto merge main into base-sard-ui"
-          git push origin base-sard-ui
-
-  merge-to-base-uv-ui:
-    name: Merge main into base-uv-ui
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.GH_TOKEN_AUTO_MERGE }}
-
-      - name: Merge main into base-uv-ui
-        run: |
-          git config user.name "GitHub Actions"
-          git config user.email "actions@github.com"
-          git checkout base-uv-ui
-          git merge main --no-ff -m "Auto merge main into base-uv-ui"
-          git push origin base-uv-ui
-
-  merge-to-base-uview-plus:
-    name: Merge main into base-uview-plus
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.GH_TOKEN_AUTO_MERGE }}
-
-      - name: Merge main into base-uview-plus
-        run: |
-          git config user.name "GitHub Actions"
-          git config user.email "actions@github.com"
-          git checkout base-uview-plus
-          git merge main --no-ff -m "Auto merge main into base-uview-plus"
-          git push origin base-uview-plus
--- a/.github/workflows/release-log.yml
+++ b/.github/workflows/release-log.yml
@ -1,119 +0,0 @@
-name: Auto Release
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-permissions:
-  contents: write
-  pull-requests: read
-  issues: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Install yq
-        run: sudo snap install yq
-
-      - name: Generate changelog
-        id: changelog
-        env:
-          CONFIG_FILE: .github/release.yml
-        run: |
-          # 解析配置文件
-          declare -A category_map
-          while IFS=";" read -r title labels; do
-              for label in $labels; do
-                  category_map[$label]="$title"
-              done
-          done < <(yq -o=tsv '.categories[] | [.title, (.labels | join(" "))] | join(";")' $CONFIG_FILE)
-          # 获取版本范围
-          mapfile -t tags < <(git tag -l --sort=-version:refname)
-          current_tag=${tags[0]}
-          previous_tag=${tags[1]:-}
-          if [[ -z "$previous_tag" ]]; then
-              commit_range="$current_tag"
-              echo "首次发布版本: $current_tag"
-          else
-              commit_range="$previous_tag..$current_tag"
-              echo "版本范围: $commit_range"
-          fi
-          # 获取所有符合规范的提交
-          commits=$(git log --pretty=format:"%s|%h" "$commit_range")
-          # 生成分类日志
-          declare -A log_entries
-          while IFS="|" read -r subject hash; do
-              # type=$(echo "$subject" | cut -d':' -f1 | tr -d ' ')
-              type=$(echo "$subject" | sed -E 's/^([[:alnum:]]+)(\(.*\))?:.*/\1/' | tr -d ' ')
-              found=0
-              for label in "${!category_map[@]}"; do
-                  if [[ "$type" == "$label" ]]; then
-                      entry="- ${subject} (${hash:0:7})"
-                      log_entries[${category_map[$label]}]+="$entry"$'\n'
-                      found=1
-                      break
-                  fi
-              done
-              if [[ $found -eq 0 ]]; then
-                  entry="- ${subject} (${hash:0:7})"
-                  log_entries["其他"]+="$entry"$'\n'
-              fi
-          done <<< "$commits"
-
-          # 统计提交数量
-          commit_count=$(git log --oneline "$commit_range" | wc -l)
-          # 统计受影响的文件数量
-          file_count=$(git diff --name-only "$commit_range" | wc -l)
-          # 统计贡献者信息
-          contributor_stats=$(git shortlog -sn "$commit_range")
-          contributor_notes=""
-          while IFS= read -r line; do
-              commits=$(echo "$line" | awk '{print $1}')
-              name=$(echo "$line" | awk '{$1=""; print $0}' | sed 's/^ //')
-              contributor_notes+="- @${name} (${commits} commits)\n"
-          done <<< "$contributor_stats"
-          # 构建输出内容
-          release_notes="## 版本更新日志 ($current_tag)\n\n"
-          while IFS= read -r category; do
-              if [[ -n "${log_entries[$category]}" ]]; then
-                  release_notes+="### $category\n${log_entries[$category]}\n"
-              fi
-          done < <(yq '.categories[].title' $CONFIG_FILE)
-          # 构建输出内容
-          release_notes="## 版本更新日志 ($current_tag)\n\n"
-          current_date=$(date +"%Y-%m-%d")
-          # 添加发布日期和下载统计信息
-          release_notes+=" ### 📅 发布日期: ${current_date}\n"
-          while IFS= read -r category; do
-              if [[ -n "${log_entries[$category]}" ]]; then
-                  release_notes+="### $category\n${log_entries[$category]}\n"
-              fi
-          done < <(yq '.categories[].title' $CONFIG_FILE)
-
-          # 添加统计信息
-          release_notes+="### 📊 统计信息\n"
-          release_notes+="- 本次发布包含 ${commit_count} 个提交\n"
-          release_notes+="- 影响 ${file_count} 个文件\n\n"
-          # 添加贡献者信息
-          release_notes+="### 👥 贡献者\n"
-          release_notes+="感谢这些优秀的贡献者（按提交次数排序）：\n"
-          release_notes+="${contributor_notes}\n"
-          release_notes+="---\n"
-          # 写入文件
-          echo -e "$release_notes" > changelog.md
-          echo "生成日志内容："
-          cat changelog.md
-      - name: Create Release
-        uses: ncipollo/release-action@v1
-        with:
-          generateReleaseNotes: false
-          bodyFile: changelog.md
-          tag: ${{ github.ref_name }}
--- a/package.json
+++ b/package.json
@ -99,8 +99,8 @@
    "pinia": "2.0.36",
    "pinia-plugin-persistedstate": "3.2.1",
    "qs": "6.5.3",
+    "uview-plus": "^3.4.41",
    "vue": "^3.4.21",
-    "wot-design-uni": "^1.9.1",
    "z-paging": "2.8.7"
  },
  "devDependencies": {
--- a/pages.config.ts
+++ b/pages.config.ts
@ -13,7 +13,11 @@ export default defineUniPages({
    autoscan: true,
    custom: {
      '^fg-(.*)': '@/components/fg-$1/fg-$1.vue',
-      '^wd-(.*)': 'wot-design-uni/components/wd-$1/wd-$1.vue',
+      // 下面的是 uview-plus 的配置
+      '^u--(.*)': 'uview-plus/components/u-$1/u-$1.vue',
+      '^up-(.*)': 'uview-plus/components/u-$1/u-$1.vue',
+      '^u-([^-].*)': 'uview-plus/components/u-$1/u-$1.vue',
+      // 下面是z-paging 的配置
      '^(?!z-paging-refresh|z-paging-load-more)z-paging(.*)':
        'z-paging/components/z-paging$1/z-paging$1.vue',
    },
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -85,12 +85,12 @@ importers:
      qs:
        specifier: 6.5.3
        version: 6.5.3
+      uview-plus:
+        specifier: ^3.4.41
+        version: 3.4.41
      vue:
        specifier: ^3.4.21
        version: 3.5.15(typescript@5.7.2)
-      wot-design-uni:
-        specifier: ^1.9.1
-        version: 1.9.1(vue@3.5.15(typescript@5.7.2))
      z-paging:
        specifier: 2.8.7
        version: 2.8.7
@ -3060,6 +3060,9 @@ packages:
    resolution: {integrity: sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==}
    engines: {node: '>=18'}

+  clipboard@2.0.11:
+    resolution: {integrity: sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==}
+
  cliui@7.0.4:
    resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==}

@ -3321,6 +3324,9 @@ packages:
    resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
    engines: {node: '>=0.4.0'}

+  delegate@3.2.0:
+    resolution: {integrity: sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==}
+
  depd@2.0.0:
    resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==}
    engines: {node: '>= 0.8'}
@ -3993,6 +3999,9 @@ packages:
    resolution: {integrity: sha512-O+7l9tPdHCU320IigZZPj5zmRCFG9xHmx9cU8FqU2Rp+JN714seHV+2S9+JslCpY4gJwU2vOGox0wzgae/MCEg==}
    engines: {node: '>=18'}

+  good-listener@1.2.2:
+    resolution: {integrity: sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==}
+
  gopd@1.2.0:
    resolution: {integrity: sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==}
    engines: {node: '>= 0.4'}
@ -5638,6 +5647,9 @@ packages:
  scule@1.3.0:
    resolution: {integrity: sha512-6FtHJEvt+pVMIB9IBY+IcCJ6Z5f1iQnytgyfKMhDKgmzYG+TeH/wx1y3l27rshSbLiSanrR9ffZDrEsmjlQF2g==}

+  select@1.1.2:
+    resolution: {integrity: sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==}
+
  semver@6.3.1:
    resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}
    hasBin: true
@ -5888,6 +5900,9 @@ packages:
  timm@1.7.1:
    resolution: {integrity: sha512-IjZc9KIotudix8bMaBW6QvMuq64BrJWFs1+4V0lXwWGQZwH+LnX87doAYhem4caOEusRP9/g6jVDQmZ8XOk1nw==}

+  tiny-emitter@2.1.0:
+    resolution: {integrity: sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==}
+
  tiny-pinyin@1.3.2:
    resolution: {integrity: sha512-uHNGu4evFt/8eNLldazeAM1M8JrMc1jshhJJfVRARTN3yT8HEEibofeQ7QETWQ5ISBjd6fKtTVBCC/+mGS6FpA==}

@ -6152,6 +6167,10 @@ packages:
    resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==}
    engines: {node: '>= 0.4.0'}

+  uview-plus@3.4.41:
+    resolution: {integrity: sha512-0c2KeJmXO4Rez2nERb4yi2fwydRT2pzBcjDlh9DkLaQ39VJD9zpv8NSN0mWAFEgc8U+hykXHt0DDr8yqaXAxbg==}
+    engines: {HBuilderX: ^3.1.0}
+
  v8-to-istanbul@8.1.1:
    resolution: {integrity: sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==}
    engines: {node: '>=10.12.0'}
@ -6284,12 +6303,6 @@ packages:
    resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}
    engines: {node: '>=0.10.0'}

-  wot-design-uni@1.9.1:
-    resolution: {integrity: sha512-bZBt6xt5HfvmHBm76BZWBrvthHKeK7cbR//bbmv2ICjPRLXvD9KKHGZDZrq6C/j+DXHzA4UbcGer3iE8XcuVkw==}
-    engines: {HBuilderX: ^3.8.7}
-    peerDependencies:
-      vue: '>=3.2.47'
-
  wrap-ansi@7.0.0:
    resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
    engines: {node: '>=10'}
@ -10406,6 +10419,12 @@ snapshots:
      slice-ansi: 5.0.0
      string-width: 7.2.0

+  clipboard@2.0.11:
+    dependencies:
+      good-listener: 1.2.2
+      select: 1.1.2
+      tiny-emitter: 2.1.0
+
  cliui@7.0.4:
    dependencies:
      string-width: 4.2.3
@ -10618,6 +10637,8 @@ snapshots:

  delayed-stream@1.0.0: {}

+  delegate@3.2.0: {}
+
  depd@2.0.0: {}

  dequal@2.0.3: {}
@ -11445,6 +11466,10 @@ snapshots:

  globals@16.2.0: {}

+  good-listener@1.2.2:
+    dependencies:
+      delegate: 3.2.0
+
  gopd@1.2.0: {}

  got@11.8.6:
@ -13452,6 +13477,8 @@ snapshots:

  scule@1.3.0: {}

+  select@1.1.2: {}
+
  semver@6.3.1: {}

  semver@7.7.2: {}
@ -13727,6 +13754,8 @@ snapshots:

  timm@1.7.1: {}

+  tiny-emitter@2.1.0: {}
+
  tiny-pinyin@1.3.2: {}

  tinycolor2@1.6.0: {}
@ -14036,6 +14065,11 @@ snapshots:

  utils-merge@1.0.1: {}

+  uview-plus@3.4.41:
+    dependencies:
+      clipboard: 2.0.11
+      dayjs: 1.11.10
+
  v8-to-istanbul@8.1.1:
    dependencies:
      '@types/istanbul-lib-coverage': 2.0.6
@ -14147,10 +14181,6 @@ snapshots:

  word-wrap@1.2.5: {}

-  wot-design-uni@1.9.1(vue@3.5.15(typescript@5.7.2)):
-    dependencies:
-      vue: 3.5.15(typescript@5.7.2)
-
  wrap-ansi@7.0.0:
    dependencies:
      ansi-styles: 4.3.0
--- a/src/App.vue
+++ b/src/App.vue
@ -17,6 +17,7 @@ onHide(() => {
 </script>

 <style lang="scss">
+/* stylelint-disable selector-type-no-unknown */
 button::after {
  border: none;
 }
--- a/src/components/fg-navbar/fg-navbar.vue
+++ b/src/components/fg-navbar/fg-navbar.vue
@ -1,58 +0,0 @@
-<script lang="ts" setup>
-withDefaults(
-  defineProps<{
-    leftText?: string
-    rightText?: string
-    leftArrow?: boolean
-    bordered?: boolean
-    fixed?: boolean
-    placeholder?: boolean
-    zIndex?: number
-    safeAreaInsetTop?: boolean
-    leftDisabled?: boolean
-    rightDisabled?: boolean
-  }>(),
-  {
-    leftText: '返回',
-    rightText: '',
-    leftArrow: true,
-    bordered: true,
-    fixed: false,
-    placeholder: true,
-    zIndex: 1,
-    safeAreaInsetTop: true,
-    leftDisabled: false,
-    rightDisabled: false,
-  },
-)
-
-function handleClickLeft() {
-  uni.navigateBack({
-    fail() {
-      uni.reLaunch({
-        url: '/pages/index/index',
-      })
-    },
-  })
-}
-</script>
-
-<template>
-  <wd-navbar
-    :left-text="leftText"
-    :right-text="rightText"
-    :left-arrow="leftArrow"
-    :bordered="bordered"
-    :fixed="fixed"
-    :placeholder="placeholder"
-    :z-index="zIndex"
-    :safe-area-inset-top="safeAreaInsetTop"
-    :left-disabled="leftDisabled"
-    :right-disabled="rightDisabled"
-    @click-left="handleClickLeft"
-  >
-    <template #title>
-      <slot />
-    </template>
-  </wd-navbar>
-</template>
--- a/src/layouts/default.vue
+++ b/src/layouts/default.vue
@ -1,17 +1,7 @@
-<script lang="ts" setup>
-import type { ConfigProviderThemeVars } from 'wot-design-uni'
-
-const themeVars: ConfigProviderThemeVars = {
-  // colorTheme: 'red',
-  // buttonPrimaryBgColor: '#07c160',
-  // buttonPrimaryColor: '#07c160',
-}
-</script>
+<script lang="ts" setup></script>

 <template>
-  <wd-config-provider :theme-vars="themeVars">
+  <div>
    <slot />
-    <wd-toast />
-    <wd-message-box />
-  </wd-config-provider>
+  </div>
 </template>
--- a/src/layouts/demo.vue
+++ b/src/layouts/demo.vue
@ -1,17 +1,7 @@
-<script lang="ts" setup>
-import type { ConfigProviderThemeVars } from 'wot-design-uni'
-
-const themeVars: ConfigProviderThemeVars = {
-  // colorTheme: 'red',
-  // buttonPrimaryBgColor: '#07c160',
-  // buttonPrimaryColor: '#07c160',
-}
-</script>
+<script lang="ts" setup></script>

 <template>
-  <wd-config-provider :theme-vars="themeVars">
+  <div>
    <slot />
-    <wd-toast />
-    <wd-message-box />
-  </wd-config-provider>
+  </div>
 </template>
--- a/src/layouts/fg-tabbar/fg-tabbar.vue
+++ b/src/layouts/fg-tabbar/fg-tabbar.vue
@ -7,9 +7,9 @@ import { tabbarList as _tabBarList, cacheTabbarEnable, selectedTabbarStrategy }
 const customTabbarEnable = selectedTabbarStrategy === 1 || selectedTabbarStrategy === 2
 /** tabbarList 里面的 path 从 pages.config.ts 得到 */
 const tabbarList = _tabBarList.map(item => ({ ...item, path: `/${item.pagePath}` }))
-function selectTabBar({ value: index }: { value: number }) {
-  const url = tabbarList[index].path
-  tabbarStore.setCurIdx(index)
+function selectTabBar(name: number) {
+  const url = tabbarList[name].path
+  tabbarStore.setCurIdx(name)
  if (cacheTabbarEnable) {
    uni.switchTab({ url })
  }
@ -34,9 +34,11 @@ onLoad(() => {
 </script>

 <template>
-  <wd-tabbar
+  <up-tabbar
    v-if="customTabbarEnable"
-    v-model="tabbarStore.curIdx"
+    :value="tabbarStore.curIdx"
+    active-color="#d81e06"
+    inactive-color="#7d7e80"
    bordered
    safeareainsetbottom
    placeholder
@ -44,24 +46,40 @@ onLoad(() => {
    @change="selectTabBar"
  >
    <block v-for="(item, idx) in tabbarList" :key="item.path">
-      <wd-tabbar-item v-if="item.iconType === 'uiLib'" :title="item.text" :icon="item.icon" />
-      <wd-tabbar-item
+      <up-tabbar-item
+        v-if="item.iconType === 'uiLib'"
+        :text="item.text"
+        :icon="item.icon"
+        :name="idx"
+      />
+
+      <up-tabbar-item
        v-else-if="item.iconType === 'unocss' || item.iconType === 'iconfont'"
-        :title="item.text"
+        :text="item.text"
+        :name="idx"
      >
-        <template #icon>
+        <template #active-icon>
          <view
            h-40rpx
            w-40rpx
+            class="text-[#d81e06]"
            :class="[item.icon, idx === tabbarStore.curIdx ? 'is-active' : 'is-inactive']"
          />
        </template>
-      </wd-tabbar-item>
-      <wd-tabbar-item v-else-if="item.iconType === 'local'" :title="item.text">
+        <template #inactive-icon>
+          <view
+            h-40rpx
+            w-40rpx
+            class="text-[#7d7e80]"
+            :class="[item.icon, idx === tabbarStore.curIdx ? 'is-active' : 'is-inactive']"
+          />
+        </template>
+      </up-tabbar-item>
+      <up-tabbar-item v-else-if="item.iconType === 'local'" :text="item.text" :name="idx">
        <template #icon>
          <image :src="item.icon" h-40rpx w-40rpx />
        </template>
-      </wd-tabbar-item>
+      </up-tabbar-item>
    </block>
-  </wd-tabbar>
+  </up-tabbar>
 </template>
--- a/src/layouts/tabbar.vue
+++ b/src/layouts/tabbar.vue
@ -1,19 +1,10 @@
 <script lang="ts" setup>
-import type { ConfigProviderThemeVars } from 'wot-design-uni'
 import FgTabbar from './fg-tabbar/fg-tabbar.vue'
-
-const themeVars: ConfigProviderThemeVars = {
-  // colorTheme: 'red',
-  // buttonPrimaryBgColor: '#07c160',
-  // buttonPrimaryColor: '#07c160',
-}
 </script>

 <template>
-  <wd-config-provider :theme-vars="themeVars">
+  <view>
    <slot />
    <FgTabbar />
-    <wd-toast />
-    <wd-message-box />
-  </wd-config-provider>
+  </view>
 </template>
--- a/src/pages.json
+++ b/src/pages.json
@ -10,7 +10,9 @@
    "autoscan": true,
    "custom": {
      "^fg-(.*)": "@/components/fg-$1/fg-$1.vue",
-      "^wd-(.*)": "wot-design-uni/components/wd-$1/wd-$1.vue",
+      "^u--(.*)": "uview-plus/components/u-$1/u-$1.vue",
+      "^up-(.*)": "uview-plus/components/u-$1/u-$1.vue",
+      "^u-([^-].*)": "uview-plus/components/u-$1/u-$1.vue",
      "^(?!z-paging-refresh|z-paging-load-more)z-paging(.*)": "z-paging/components/z-paging$1/z-paging$1.vue"
    }
  },
--- a/src/pages/about/components/request.vue
+++ b/src/pages/about/components/request.vue
@ -61,9 +61,9 @@ function reset() {
    <!-- #endif -->

    <!-- http://localhost:9000/#/pages/index/request -->
-    <wd-button class="my-6" @click="run">
+    <up-button class="my-6" type="primary" @click="run">
      发送请求
-    </wd-button>
+    </up-button>
    <view class="h-16">
      <view v-if="loading">
        loading...
@ -77,8 +77,8 @@ function reset() {
        </view>
      </block>
    </view>
-    <wd-button type="error" class="my-6" :disabled="!data" @click="reset">
+    <up-button type="warning" class="my-6" :disabled="!data" @click="reset">
      重置数据
-    </wd-button>
+    </up-button>
  </view>
 </template>
--- a/src/pages/about/components/upload.vue
+++ b/src/pages/about/components/upload.vue
@ -13,9 +13,9 @@ const { loading, data, run } = useUpload()

 <template>
  <view class="p-4 text-center">
-    <wd-button @click="run">
+    <up-button type="primary" @click="run">
      选择图片并上传
-    </wd-button>
+    </up-button>
    <view v-if="loading" class="h-10 text-blue">
      上传...
    </view>
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@ -56,7 +56,7 @@ console.log('index')
    <view class="mt-10">
      <image src="/static/logo.svg" alt="" class="mx-auto block h-28 w-28" />
    </view>
-    <view class="mt-4 text-center text-4xl text-[#d14328]">
+    <view class="main-title-color mt-4 text-center text-4xl">
      unibest
    </view>
    <view class="mb-8 mt-2 text-center text-2xl">
@ -88,7 +88,7 @@ console.log('index')
    <view class="mt-4 text-center">
      模板分支是：
      <text class="text-green-500">
-        base
+        base-uview-plus
      </text>
    </view>
  </view>
--- a/src/uni.scss
+++ b/src/uni.scss
@ -75,3 +75,5 @@ $uni-color-subtitle: #555; // 二级标题颜色
 $uni-font-size-subtitle: 18px;
 $uni-color-paragraph: #3f536e; // 文章段落颜色
 $uni-font-size-paragraph: 15px;
+
+@import "uview-plus/theme.scss"; // /* 行为相关颜色 */
--- a/tsconfig.json
+++ b/tsconfig.json
@ -14,7 +14,7 @@
      "@dcloudio/types",
      "@uni-helper/uni-types",
      "@types/wechat-miniprogram",
-      "wot-design-uni/global.d.ts",
+      "uview-plus/types",
      "z-paging/types",
      "./src/typings.d.ts"
    ],
--- a/vite.config.ts
+++ b/vite.config.ts
@ -182,5 +182,8 @@ export default async ({ command, mode }) => {
        },
      },
    },
+    optimizeDeps: {
+      exclude: ['sard-uniapp'],
+    },
  })
 }
Author	SHA1	Message	Date
GitHub Actions	e74e86266c	Auto merge main into base-uview-plus	2025-06-22 06:22:25 +00:00
GitHub Actions	c0d489a6f9	Auto merge main into base-uview-plus	2025-06-22 06:05:39 +00:00
GitHub Actions	187693b84b	Auto merge main into base-uview-plus	2025-06-22 05:24:11 +00:00
GitHub Actions	2d944e474d	Auto merge main into base-uview-plus	2025-06-22 05:02:28 +00:00
feige996	06588a6ce4	Merge branch 'main' into base-uview-plus	2025-06-22 12:21:13 +08:00
feige996	2876b91db4	chore: 更新项目配置和模板分支名称更新VSCode设置中的拼写检查字典，添加uview相关词汇将模板分支名称从base sard-ui改为base-uview-plus	2025-06-22 11:53:51 +08:00
feige996	5ab8872c6a	fix(fg-tabbar): 将selectedTabbarStrategy默认值改为0以启用缓存	2025-06-22 11:44:02 +08:00
feige996	5308dcb00a	style: 移除未使用的 uview-plus 样式导入	2025-06-22 11:42:02 +08:00
feige996	ab669ce491	style(components): 统一按钮样式为 primary 和 warning 类型将上传和请求组件中的按钮样式统一为 type="primary"，并将重置按钮改为 type="warning" 以保持一致性	2025-06-22 11:38:04 +08:00
feige996	03317eefb1	ci: 删除不再使用的GitHub工作流和发布配置文件	2025-06-22 11:26:06 +08:00
feige996	ee383968a5	feat(tabbar): 更新tabbar策略并优化样式	2025-06-22 11:24:10 +08:00
feige996	b8c593e957	fix(fg-tabbar): 将selectedTabbarStrategy默认值改为0 修改tabbar策略的默认值以适配缓存逻辑	2025-06-22 11:14:45 +08:00
feige996	34dc7c071d	refactor(ui): 替换 sard-uniapp 为 uview-plus 组件库	2025-06-22 11:14:12 +08:00
feige996	ac05ba415e	refactor: 替换 sard-uniapp 为 uview-plus 组件库	2025-06-22 11:07:35 +08:00
feige996	f500c48482	Merge branch 'main' into base-sard-ui	2025-06-22 10:09:06 +08:00
GitHub Actions	6c80163673	Auto merge main into base-sard-ui	2025-06-21 15:03:43 +00:00
GitHub Actions	e6a0997c2e	Auto merge main into base-sard-ui	2025-06-21 14:46:57 +00:00
GitHub Actions	1eb4cab66f	Auto merge main into base-sard-ui	2025-06-21 11:44:40 +00:00
feige996	749ff30f80	Merge branch 'main' into base-sard-ui	2025-06-21 19:42:18 +08:00
feige996	4a5d8f9cb8	chore: 生成的	2025-06-21 19:32:57 +08:00
feige996	5c18e0e8ec	feat: 继续处理 tabbar	2025-06-21 19:32:31 +08:00
feige996	668ff750b2	feat: 处理成 sar-ui 的tabbar形式	2025-06-21 19:22:12 +08:00
feige996	1272f9bd8f	Merge branch 'main' into base-sard-ui	2025-06-21 19:12:43 +08:00
feige996	f6c7a27bcb	chore: 升级版本	2025-06-06 14:53:41 +08:00
feige996	ca04b37b6b	feat: add commitlint & husky	2025-06-06 14:52:51 +08:00
feige996	3c09e54b9a	refactor: 移除用户相关页面和组件并更新UI组件库 - 删除所有用户相关的页面（登录、个人中心、修改密码等） - 移除隐私协议弹窗组件及相关样式 - 将wd-button组件替换为sar-button组件 - 更新页面配置和路由，移除用户相关路由 - 修改首页显示的分支名称 ``` 这个提交消息简明扼要地概括了主要变更： 1. 类型使用refactor表示这是代码重构 2. 描述了主要的变更内容： - 移除了用户相关功能 - 更新了UI组件库 - 修改了配置和路由 3. 保持了简洁的格式，符合提交消息规范	2025-06-03 13:26:20 +08:00
feige996	2f7c60856b	refactor: 替换 wot-design-uni 为 sard-uniapp 组件库 - 更新 vite 配置以优化 sard-uniapp 的依赖处理 - 修改全局样式导入和组件引用路径 - 移除 wot-design-uni 相关配置和依赖 - 更新 tsconfig 和页面配置中的类型定义 - 调整布局组件中的配置提供逻辑	2025-06-03 13:07:08 +08:00