Skip to content

Commit 0178bc2

Browse files
committed
chore: chore update
2 parents 1eee961 + aff99a4 commit 0178bc2

12 files changed

Lines changed: 32 additions & 107 deletions

File tree

.github/workflows/auto-merge.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,24 @@ on:
77
workflow_dispatch: # 手动触发
88

99
jobs:
10+
merge-to-release:
11+
name: Merge main into release
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Checkout repository
15+
uses: actions/checkout@v4
16+
with:
17+
fetch-depth: 0
18+
token: ${{ secrets.GH_TOKEN_AUTO_MERGE }}
19+
20+
- name: Merge main into release
21+
run: |
22+
git config user.name "GitHub Actions"
23+
git config user.email "actions@github.com"
24+
git checkout release
25+
git merge main --no-ff -m "Auto merge main into release"
26+
git push origin release
27+
1028
merge-to-i18n:
1129
name: Merge main into i18n
1230
runs-on: ubuntu-latest

.vscode/vue3.code-snippets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
"}",
2929
"</route>\n",
3030
"<script lang=\"ts\" setup>",
31-
"//$3",
31+
"//$2",
3232
"</script>\n",
3333
"<template>",
34-
" <view class=\"\">$2</view>",
34+
" <view class=\"\">$3</view>",
3535
"</template>\n",
3636
"<style lang=\"scss\" scoped>",
3737
"//$4",

openapi-ts-request.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ export default [
44
{
55
schemaPath: 'http://petstore.swagger.io/v2/swagger.json',
66
serversPath: './src/service/app',
7-
requestLibPath: `import request from '@/utils/request';\n import { CustomRequestOptions } from '@/interceptors/request';`,
7+
requestLibPath: `import request from '@/utils/request';\n import { CustomRequestOptions } from '@/http/interceptor';`,
88
requestOptionsType: 'CustomRequestOptions',
99
isGenReactQuery: true,
1010
reactQueryMode: 'vue',

package.json

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
{
22
"name": "unibest",
33
"type": "commonjs",
4-
"version": "3.3.0",
4+
"version": "3.3.1",
5+
"unibest-version": "用户创建项目时生成,使用version版本号",
56
"packageManager": "pnpm@10.10.0",
67
"description": "unibest - 最好的 uniapp 开发模板",
7-
"update-time": "2025-07-08",
8+
"generate-time": "用户创建项目时生成",
89
"author": {
910
"name": "feige996",
1011
"zhName": "菲鸽",
@@ -15,8 +16,6 @@
1516
"license": "MIT",
1617
"homepage": "https://unibest.tech",
1718
"repository": "https://github.com/feige996/unibest",
18-
"repository-gitee": "https://gitee.com/feige996/unibest",
19-
"repository-old": "https://github.com/codercup/unibest",
2019
"bugs": {
2120
"url": "https://github.com/feige996/unibest/issues",
2221
"url-old": "https://github.com/codercup/unibest/issues"
@@ -149,7 +148,6 @@
149148
"postcss-scss": "^4.0.9",
150149
"rollup-plugin-visualizer": "^5.12.0",
151150
"sass": "1.77.8",
152-
"terser": "^5.36.0",
153151
"typescript": "^5.7.2",
154152
"unocss": "65.4.2",
155153
"unplugin-auto-import": "^0.17.8",

pnpm-lock.yaml

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

scripts/postupgrade.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const { exec } = require('node:child_process')
77
// 定义要执行的命令
88
const dependencies = [
99
'@dcloudio/uni-app-harmony',
10-
// TODO: 如果需要某个平台的小程序,请手动删除或注释掉
10+
// TODO: 如果不需要某个平台的小程序,请手动删除或注释掉
1111
'@dcloudio/uni-mp-alipay',
1212
'@dcloudio/uni-mp-baidu',
1313
'@dcloudio/uni-mp-jd',

src/layouts/fg-tabbar/tabbarList.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import type { TabBar } from '@uni-helper/vite-plugin-uni-pages'
2+
13
/**
24
* tabbar 选择的策略,更详细的介绍见 tabbar.md 文件
35
* 0: 'NO_TABBAR' `无 tabbar`
@@ -19,14 +21,14 @@ export const selectedTabbarStrategy = TABBAR_MAP.NATIVE_TABBAR
1921
// selectedTabbarStrategy==NATIVE_TABBAR(1) 时,需要填 iconPath 和 selectedIconPath
2022
// selectedTabbarStrategy==CUSTOM_TABBAR(2,3) 时,需要填 icon 和 iconType
2123
// selectedTabbarStrategy==NO_TABBAR(0) 时,tabbarList 不生效
22-
export const tabbarList = [
24+
export const tabbarList: TabBar['list'] = [
2325
{
2426
iconPath: 'static/tabbar/home.png',
2527
selectedIconPath: 'static/tabbar/homeHL.png',
2628
pagePath: 'pages/index/index',
2729
text: '首页',
2830
icon: 'home',
29-
// 选用 UI 框架自带的 icon时,iconType 为 uiLib
31+
// 选用 UI 框架自带的 icon 时,iconType 为 uiLib
3032
iconType: 'uiLib',
3133
},
3234
{
@@ -56,7 +58,7 @@ export const tabbarList = [
5658
export const cacheTabbarEnable = selectedTabbarStrategy === TABBAR_MAP.NATIVE_TABBAR
5759
|| selectedTabbarStrategy === TABBAR_MAP.CUSTOM_TABBAR_WITH_CACHE
5860

59-
const _tabbar = {
61+
const _tabbar: TabBar = {
6062
color: '#999999',
6163
selectedColor: '#018d71',
6264
backgroundColor: '#F8F8F8',

src/pages/about/about.vue

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
import RequestComp from './components/request.vue'
1212
import UploadComp from './components/upload.vue'
1313
14-
// 获取屏幕边界到安全区域距离
15-
const { safeAreaInsets } = uni.getSystemInfoSync()
16-
1714
// 奇怪:同样的代码放在 vue 里面不会校验到错误,放在 .ts 文件里面会校验到错误
1815
// const testOxlint = (name: string) => {
1916
// console.log('oxlint')

src/style/index.scss

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
1-
@import './iconfont.css';
2-
3-
.test {
4-
// 可以通过 @apply 多个样式封装整体样式
5-
@apply mt-4 ml-4;
6-
7-
padding-top: 4px;
8-
color: red;
9-
}
1+
// 测试用的 iconfont,可生效
2+
// @import './iconfont.css';
103

114
:root,
125
page {

vite-plugins/copyNativeRes.ts

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)