From 76a3b19a065386efa68e9235d32f8db4b298c465 Mon Sep 17 00:00:00 2001
From: aiShuiJiaoDeXioShou <2832294398@qq.com>
Date: Mon, 9 Sep 2024 08:40:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A0=E7=89=A9=E8=AF=A6=E7=BB=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E3=80=81=E8=BA=AB=E4=BB=BD=E8=AF=81=E8=AF=86=E5=88=AB?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 acdr-mall/vite.config.ts                      |  2 +-
 acdr-ui/.github/ISSUE_TEMPLATE/bug_report.md  | 32 ----------
 .../.github/ISSUE_TEMPLATE/feature_request.md |  6 --
 acdr-ui/.github/workflows/deploy-h5.yml       | 52 ---------------
 acdr-ui/.husky/commit-msg                     |  4 --
 acdr-ui/.husky/pre-commit                     |  4 --
 .../src/pages/permission/real-name-auth.vue   | 51 +++++++++------
 acdr-ui/src/pages/pet/pet-detail-page.vue     | 64 ++++++++++++++++---
 acdr-ui/src/utils/commUtils.js                | 11 +++-
 acdr-ui/vite.config.ts                        |  2 +-
 10 files changed, 97 insertions(+), 131 deletions(-)
 delete mode 100644 acdr-ui/.github/ISSUE_TEMPLATE/bug_report.md
 delete mode 100644 acdr-ui/.github/ISSUE_TEMPLATE/feature_request.md
 delete mode 100644 acdr-ui/.github/workflows/deploy-h5.yml
 delete mode 100644 acdr-ui/.husky/commit-msg
 delete mode 100644 acdr-ui/.husky/pre-commit

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
----
-
-<!--
-    注意：为更好的解决你的问题，请参考模板提供完整信息，准确描述问题，信息不全的 issue 将被关闭。
-
-    Note: In order to better solve your problem, please refer to the template to provide complete information, accurately describe the problem, and the incomplete information issue will be closed.
--->
-
-# Bug report（问题描述）
-
-please write your issue description here
-
-## Steps to reproduce（问题复现步骤）
-
-<!--
-1. [xxx]
-2. [xxx]
-3. [xxxx]
--->
-
-## 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 @@
   <TopBar />
   <image
     class="absolute w-full h-full"
-    :src="'@/static/certification/certification_bg.png'"
+    src="/static/certification/certification_bg.png"
     mode="aspectFill"
   ></image>
-  <view>
+  <view class="absolute w-full top-[75vw]">
     <view v-if="!user.userInfo.isRealName">
       <!-- 实名认证部分 -->
       <view class="p-4">
         <text class="text-lg text-gray-800 mb-2">请进行身份证实名认证</text>
 
-        <view class="bg-white p-4 rounded-lg shadow mb-4 flex items-center justify-between">
-          <view class="flex items-center">
-            <image :src="frontImage" class="w-24 h-16 object-cover rounded"></image>
-            <text class="ml-4">身份证人像面</text>
+        <view class="flex justify-center items-center flex-col gap-[10px]">
+          <view class="text-center">
+            <image
+              class="w-[60vw]"
+              mode="widthFix"
+              src="/static/permission/idcard.png"
+              @click="chooseFrontImage"
+            ></image>
+            <view class="pt-1">身份证人像面</view>
           </view>
-          <button class="bg-[#ffc107] text-white rounded-full px-4 py-2" @click="chooseFrontImage">
-            <wd-icon name="add" />
-          </button>
-        </view>
-
-        <view class="bg-white p-4 rounded-lg shadow mb-4 flex items-center justify-between">
-          <view class="flex items-center">
-            <image :src="backImage" class="w-24 h-16 object-cover rounded"></image>
-            <text class="ml-4">身份证国徽面</text>
+          <view class="text-center">
+            <image
+              class="w-[60vw]"
+              mode="widthFix"
+              src="/static/permission/idcard_back.png"
+              @click="chooseBackImage"
+            ></image>
+            <view class="pt-1">身份证国徽面</view>
           </view>
-          <button class="bg-[#ffc107] text-white rounded-full px-4 py-2" @click="chooseBackImage">
-            <wd-icon name="add" />
-          </button>
         </view>
 
         <button
-          class="w-full bg-pink-500 text-white text-center rounded-full py-4 mt-4"
+          class="w-full bg-[#FCCB30] text-black text-center rounded-full py-1 mt-4"
           @click="submitAuth"
         >
           提交认证材料
         </button>
+
+        <button
+          class="w-full bg-[#ff7f50] text-black text-center rounded-full py-1 mt-4"
+          @click="toPath('/')"
+        >
+          返回首页
+        </button>
       </view>
     </view>
-    <view class="bg-[#F5F5F5] h-full" v-else>您已经完成了实名认证！</view>
+    <view class="w-full h-full text-center flex justify-center items-center content-center" v-else>
+      <view class="mt-[30vw]">您已经完成了实名认证！</view>
+    </view>
   </view>
 </template>
 
@@ -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 @@
     <view class="relative">
       <view class="absolute left-4 bottom-[-20px] z-10">
         <image
-          :src="imgUrl('@/static/icons/cat.png')"
+          :src="petInfo.profileUrl ? imgUrl(petInfo.profileUrl) : imgUrl('@/static/icons/cat.png')"
           class="w-20 h-20 object-cover rounded-full border-4 border-white"
         ></image>
       </view>
@@ -38,7 +38,7 @@
       </view>
       <view class="text-center">
         <text class="text-lg">0</text>
-        <text class="block text-gray-600">获猫币</text>
+        <text class="block text-gray-600">关注度</text>
       </view>
       <view class="text-center">
         <text class="text-lg">0</text>
@@ -49,21 +49,25 @@
     <view class="pl-4 pr-4">
       <!-- 宠物信息 -->
       <view class="bg-white p-4 rounded-lg">
-        <text class="text-xl">cat</text>
+        <text class="text-xl">{{ petInfo.name || 'cat' }}</text>
         <view class="flex items-center mt-2">
           <wd-icon name="calendar" size="20" class="text-[#ffc107]"></wd-icon>
-          <text class="ml-2 text-gray-600">距离生日还有12天哦</text>
+          <text class="ml-2 text-gray-600">
+            距离生日还有{{ daysUntilBirthday(petInfo.age) }}天哦
+          </text>
         </view>
       </view>
 
       <!-- 操作按钮 -->
       <view class="flex justify-between py-4">
         <button
+          @click="editPet(petInfo.id)"
           class="bg-[#F0985A] text-white rounded-lg py-2 px-6 h-9 flex-grow-[8] flex items-center justify-center"
         >
-          修改头像
+          修改信息
         </button>
         <button
+          @click="share"
           class="bg-[#ffc107] text-white rounded-lg py-2 px-6 h-9 flex-grow-[2] flex items-center justify-center ml-4"
         >
           分享
@@ -97,15 +101,59 @@
 <script setup>
 import EmptyState from '@/components/EmptyState.vue'
 import TopBar from '@/components/TopBar.vue'
-import { imgUrl } from '@/utils/commUtils'
+import { imgUrl, toast, toPath } from '@/utils/commUtils'
+import { httpGet } from '@/utils/http'
 import { ref } from 'vue'
 
 const tabs = ref(['全部', '心情', '养护', '清洁'])
 const activeTab = ref('全部')
+const petInfo = ref({})
 
-const goBack = () => {
-  uni.navigateBack()
+const getPetId = async (id) => {
+  try {
+    const res = await httpGet('/petInfo/find_by_id/' + id)
+    if (res.code === 200) {
+      petInfo.value = res.data
+      console.log(petInfo.value)
+    } else {
+      toast(res.data.message)
+    }
+  } catch (e) {
+    console.log(e)
+  }
 }
+
+const editPet = (id) => {
+  toPath('/pages/pet/pet-add-page?id=' + id)
+}
+
+const share = () => {}
+
+const daysUntilBirthday = (birthDateStr) => {
+  // 将出生日期转换为日期对象
+  const birthDate = new Date(birthDateStr)
+  const today = new Date()
+
+  // 将出生年份替换为当前年份
+  const nextBirthday = new Date(today.getFullYear(), birthDate.getMonth(), birthDate.getDate())
+
+  // 如果今年的生日已经过了，则计算明年的生日
+  if (nextBirthday < today) {
+    nextBirthday.setFullYear(today.getFullYear() + 1)
+  }
+
+  // 计算天数差
+  const oneDay = 24 * 60 * 60 * 1000 // 一天的毫秒数
+  const daysLeft = Math.ceil((nextBirthday - today) / oneDay)
+
+  return daysLeft
+}
+
+onLoad(async (options) => {
+  if (options.id) {
+    await getPetId(options.id)
+  }
+})
 </script>
 
 <style scoped>
diff --git a/acdr-ui/src/utils/commUtils.js b/acdr-ui/src/utils/commUtils.js
index eac85ce6..7b058cc6 100644
--- a/acdr-ui/src/utils/commUtils.js
+++ b/acdr-ui/src/utils/commUtils.js
@@ -1,5 +1,5 @@
-import sheep from "@/sheep"
-import PLATFORM from "./platform"
+import sheep from '@/sheep'
+import PLATFORM from './platform'
 
 // 获取服务baseUrl
 export const baseUrl = import.meta.env.VITE_SERVER_BASEURL
@@ -61,9 +61,14 @@ export const scanCodeAsync = () => {
 
 // 路径导航
 export const toPath = (path) => {
+  if (path === '/') {
+    uni.switchTab({ url: '/pages/index/index' })
+    return
+  }
+
   // 如果没有指定路由默认跳转到首页去
   if (!path) {
-    uni.navigateTo({ url: '/pages/index/index' })
+    uni.switchTab({ url: '/pages/index/index' })
     return
   }
 
diff --git a/acdr-ui/vite.config.ts b/acdr-ui/vite.config.ts
index 38f914e4..097bbb66 100644
--- a/acdr-ui/vite.config.ts
+++ b/acdr-ui/vite.config.ts
@@ -65,7 +65,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(),