From cfe5634c9196ed9a9f436ce916c5bb54b8d15294 Mon Sep 17 00:00:00 2001 From: feige996 <1020102647@qq.com> Date: Sun, 22 Jun 2025 11:59:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?ci(workflow):=20=E6=B7=BB=E5=8A=A0=20base-u?= =?UTF-8?q?v-ui=20=E5=92=8C=20base-uview-plus=20=E7=9A=84=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=90=88=E5=B9=B6=E5=B7=A5=E4=BD=9C=E6=B5=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加两个新的工作流用于将 main 分支自动合并到 base-uv-ui 和 base-uview-plus 分支 --- .github/workflows/auto-merge.yml | 36 ++++++++++++++++++++++++++++++++ .vscode/settings.json | 1 + 2 files changed, 37 insertions(+) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index c1a9d78..b1ea5c2 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -42,3 +42,39 @@ jobs: 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 diff --git a/.vscode/settings.json b/.vscode/settings.json index f56793f..10823bf 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -41,6 +41,7 @@ "tabbar", "Toutiao", "unibest", + "uview", "uvui", "Wechat", "WechatMiniprogram", From 946ad7c976754bdc83d2d6ddaf0cfc04de5b6a15 Mon Sep 17 00:00:00 2001 From: feige996 <1020102647@qq.com> Date: Sun, 22 Jun 2025 12:06:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(=E9=A6=96=E9=A1=B5):=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BD=9C=E8=80=85=E5=92=8C=E5=AE=98=E7=BD=91=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=B9=B6=E8=B0=83=E6=95=B4=E9=A1=B6=E9=83=A8=E9=97=B4?= =?UTF-8?q?=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在首页添加作者和官网信息展示，同时将顶部图片间距从mt-12调整为mt-10以优化布局 --- src/pages/index/index.vue | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index ec3bcbf..04f6994 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -53,7 +53,7 @@ console.log('index')