Prechádzať zdrojové kódy

Merge branch 'main'

Z.X.PING 10 mesiacov pred
rodič
commit
2729c16c49

+ 36 - 0
.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

+ 1 - 0
.vscode/settings.json

@@ -42,6 +42,7 @@
     "tabbar",
     "Toutiao",
     "unibest",
+    "uview",
     "uvui",
     "vitepress",
     "Wechat",

+ 14 - 1
src/pages/index/index.vue

@@ -53,7 +53,7 @@ console.log('index')
 
 <template>
   <view class="bg-white px-4 pt-2" :style="{ marginTop: `${safeAreaInsets?.top}px` }">
-    <view class="mt-12">
+    <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]">
@@ -66,6 +66,19 @@ console.log('index')
     <view class="m-auto mb-2 max-w-100 text-justify indent text-4">
       {{ description }}
     </view>
+    <view class="mt-4 text-center">
+      作者:
+      <text class="text-green-500">
+        菲鸽
+      </text>
+    </view>
+    <view class="mt-4 text-center">
+      官网地址:
+      <text class="text-green-500">
+        https://unibest.tech
+      </text>
+    </view>
+    <view class="mt-6 h-1px bg-#eee" />
     <view class="mt-8 text-center">
       当前平台是:
       <text class="text-green-500">