diff --git a/acdr-mall/vite.config.ts b/acdr-mall/vite.config.ts
index 48e9f15e..5a7701a1 100644
--- a/acdr-mall/vite.config.ts
+++ b/acdr-mall/vite.config.ts
@@ -76,7 +76,7 @@ export default ({ command, mode }) => {
pagesJsonDir: path.resolve(__dirname, './src/pages.json'),
includes: ['path', 'aliasPath', 'name', 'meta'],
}),
- mpliveMainfestPlugin(env.SHOPRO_MPLIVE_ON),
+ // mpliveMainfestPlugin(env.SHOPRO_MPLIVE_ON),
UniLayouts(),
UniPlatform(),
UniManifest(),
diff --git a/acdr-ui/.github/ISSUE_TEMPLATE/bug_report.md b/acdr-ui/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index bed7e7d6..00000000
--- a/acdr-ui/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-name: Bug report(报告问题)
-about: Create a report to help us improve
----
-
-
-
-# Bug report(问题描述)
-
-please write your issue description here
-
-## Steps to reproduce(问题复现步骤)
-
-
-
-## Screenshot or Gif(截图或动态图)
-
-## minimal reproduction(最小可还原代码)
-
-## System Info
-
-`npx envinfo --system --npmPackages vue --binaries --browsers`
-
-执行上面命令,将结果贴下面
diff --git a/acdr-ui/.github/ISSUE_TEMPLATE/feature_request.md b/acdr-ui/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index c6b45b76..00000000
--- a/acdr-ui/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-name: Feature Request(新功能建议)
-about: Suggest an idea for this project
----
-
-# Feature request(新功能建议)
diff --git a/acdr-ui/.github/workflows/deploy-h5.yml b/acdr-ui/.github/workflows/deploy-h5.yml
deleted file mode 100644
index b1996572..00000000
--- a/acdr-ui/.github/workflows/deploy-h5.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-name: Deploy Pages
-
-on:
- # Runs on pushes targeting the default branch
- push:
- branches: ['main']
-
- # Allows you to run this workflow manually from the Actions tab
- workflow_dispatch:
-
-# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
-permissions:
- contents: read
- pages: write
- id-token: write
-
-jobs:
- # Build job
- build:
- runs-on: ubuntu-latest
- steps:
- # 设置服务器时区为东八区
- - name: Set time zone
- run: sudo timedatectl set-timezone 'Asia/Shanghai'
- - uses: actions/checkout@v4
- - uses: pnpm/action-setup@v2
- with:
- version: 8
- - uses: actions/setup-node@v4
- with:
- node-version: '18'
- cache: 'pnpm'
- - name: Install dependencies
- run: pnpm i --no-frozen-lockfile
- - name: Build
- run: pnpm build:h5
- - name: Upload artifact
- uses: actions/upload-pages-artifact@v3
- with:
- path: ./dist/build/h5
-
- # Deployment job
- deploy:
- environment:
- name: github-pages
- url: ${{ steps.deployment.outputs.page_url }}
- runs-on: ubuntu-latest
- needs: build
- steps:
- - name: Deploy to GitHub Pages
- id: deployment
- uses: actions/deploy-pages@v4
diff --git a/acdr-ui/.husky/commit-msg b/acdr-ui/.husky/commit-msg
deleted file mode 100644
index 7241764b..00000000
--- a/acdr-ui/.husky/commit-msg
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-npx --no-install commitlint --edit
diff --git a/acdr-ui/.husky/pre-commit b/acdr-ui/.husky/pre-commit
deleted file mode 100644
index fc7c89dc..00000000
--- a/acdr-ui/.husky/pre-commit
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-npx --no-install -- lint-staged
diff --git a/acdr-ui/src/pages/permission/real-name-auth.vue b/acdr-ui/src/pages/permission/real-name-auth.vue
index 4e85886f..1a2f6b3a 100644
--- a/acdr-ui/src/pages/permission/real-name-auth.vue
+++ b/acdr-ui/src/pages/permission/real-name-auth.vue
@@ -12,44 +12,54 @@
-
+
请进行身份证实名认证
-
-
-
- 身份证人像面
+
+
+
+ 身份证人像面
-
-
-
-
-
-
- 身份证国徽面
+
+
+ 身份证国徽面
-
+
+
- 您已经完成了实名认证!
+
+ 您已经完成了实名认证!
+
@@ -58,6 +68,7 @@ import { ref } from 'vue'
import { httpUploadFile } from '@/utils/http'
import { useUserStore } from '@/store'
import TopBar from '@/components/TopBar.vue'
+import { toPath } from '@/utils/commUtils'
const frontImage = ref('https://via.placeholder.com/100')
const backImage = ref('https://via.placeholder.com/100')
diff --git a/acdr-ui/src/pages/pet/pet-detail-page.vue b/acdr-ui/src/pages/pet/pet-detail-page.vue
index a72d1abb..05dc9900 100644
--- a/acdr-ui/src/pages/pet/pet-detail-page.vue
+++ b/acdr-ui/src/pages/pet/pet-detail-page.vue
@@ -20,7 +20,7 @@
@@ -38,7 +38,7 @@
0
- 获猫币
+ 关注度
0
@@ -49,21 +49,25 @@
- cat
+ {{ petInfo.name || 'cat' }}
- 距离生日还有12天哦
+
+ 距离生日还有{{ daysUntilBirthday(petInfo.age) }}天哦
+