From 328819c97b659a494b42d7a61c6fc68e4f9d8204 Mon Sep 17 00:00:00 2001
From: chenlong <vip_chenlong@163.com>
Date: Thu, 14 Sep 2023 11:51:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/pet.js                                 | 15 +++++++++++++++
 components/FooterNav/components/index.scss |  1 +
 pages/AboutUs/AboutUs.vue                  | 21 +++++++++++++++++++--
 pages/Index/components/UserPage/index.vue  |  8 ++++----
 pages/Index/index.vue                      |  6 +++---
 pages/Pet/index.vue                        |  7 ++++++-
 pages/PetDetail/index.vue                  | 13 +++++++++----
 pages/UserOrderPage/index.vue              |  5 +++++
 8 files changed, 62 insertions(+), 14 deletions(-)

diff --git a/api/pet.js b/api/pet.js
index 989e7cc..f94615d 100644
--- a/api/pet.js
+++ b/api/pet.js
@@ -57,4 +57,19 @@ export function editPet(data){
         method:'post',
         data:data
     })
+}
+
+/**
+ * 删除宠物
+ * @param id
+ * @returns {Promise | Promise<unknown>}
+ */
+export function delPet(id){
+    return request({
+        url:'user/pet-delete',
+        method:'post',
+        data:{
+            id:id
+        }
+    })
 }
\ No newline at end of file
diff --git a/components/FooterNav/components/index.scss b/components/FooterNav/components/index.scss
index b0d9d5f..0c5bbf9 100644
--- a/components/FooterNav/components/index.scss
+++ b/components/FooterNav/components/index.scss
@@ -17,6 +17,7 @@
   .foot-nav-button-group{
     width:100%;
     height:100%;
+    justify-content: space-around;
     padding:{
       left:33rpx;
       right:33rpx;
diff --git a/pages/AboutUs/AboutUs.vue b/pages/AboutUs/AboutUs.vue
index 953d5fe..65b56b7 100644
--- a/pages/AboutUs/AboutUs.vue
+++ b/pages/AboutUs/AboutUs.vue
@@ -1,13 +1,30 @@
 <template>
-    <view v-html="aboutUs"></view>
+    <view class="body-background" :style="{
+		backgroundImage:'url('+staticImage.wallpaperBgImage+')'
+		}"></view>
+    <HeaderNav title="关于我们" :is-back="true"></HeaderNav>
+
+   <view style="margin: 0 30rpx 50rpx">
+     <u-parse :content="aboutUs"></u-parse>
+   </view>
 </template>
 
 <script>
 import {getConfig} from "@/api/other";
+import HeaderNav from "../../components/HeaderNav/Index.vue";
+import {imghost} from "@/config/host";
 
 export default {
+    components: {HeaderNav},
     data() {
-        return {aboutUs:''};
+        return {
+            staticImage: {
+                orderCardBackground: imghost + '/static/image/order-card-background.png',
+                wallpaperBgImage: imghost + '/static/image/background.png',
+                addrDetailTitle: imghost + '/static/image/addr-detail-title.png',
+            },
+            aboutUs:''
+        };
     },
     onLoad() {
         this.getAboutUs();
diff --git a/pages/Index/components/UserPage/index.vue b/pages/Index/components/UserPage/index.vue
index 2f0ff4b..8f28111 100644
--- a/pages/Index/components/UserPage/index.vue
+++ b/pages/Index/components/UserPage/index.vue
@@ -121,16 +121,16 @@
 						<image class="img" :src="staticImage.more.online" mode="aspectFit"/>
 						<view class="user-title">在线沟通</view>
 					</view>
-					<view class="user-button col-3">
-						<image class="img" :src="staticImage.more.privacy" @click="navTo('/pages/PrivacyPolicy/PrivacyPolicy')" mode="aspectFit"/>
+					<view class="user-button col-3" @click="navTo('/pages/PrivacyPolicy/PrivacyPolicy')" >
+						<image class="img" :src="staticImage.more.privacy" mode="aspectFit"/>
 						<view class="user-title">隐私协议</view>
 					</view>
 					<view class="user-button col-3">
 						<image class="img" :src="staticImage.more.feedback" mode="aspectFit"/>
 						<view class="user-title">意见反馈</view>
 					</view>
-					<view class="user-button col-3">
-						<image class="img" :src="staticImage.more.about" @click="navTo('/pages/AboutUs/AboutUs')" mode="aspectFit"/>
+					<view class="user-button col-3" @click="navTo('/pages/AboutUs/AboutUs')">
+						<image class="img" :src="staticImage.more.about"  mode="aspectFit"/>
 						<view class="user-title">关于我们</view>
 					</view>
 				</view>
diff --git a/pages/Index/index.vue b/pages/Index/index.vue
index 475a3fd..56e8887 100644
--- a/pages/Index/index.vue
+++ b/pages/Index/index.vue
@@ -55,7 +55,7 @@
             image: imghost + "/static/image/foot-nav-button-two",
             name: 'order',
             title:'订单',
-						is_show: this.$store.state.userInfo.store_id > 0
+						is_show: uni.getStorageSync('user')?.store_id > 0
           },
           {
             image: imghost + "/static/image/foot-nav-button-three",
@@ -74,9 +74,8 @@
 			}
 		},
 		onLoad(option) {
-			this.footGroup = this.footGroup.filter(v => v.is_show );
       if(option?.foot_check){
-        this.footSelect(option.foot_check)
+        this.footSelect(option.foot_check);
       }
 		},
 		methods: {
@@ -112,6 +111,7 @@
 		created() {
 			// this.pagePadding = (api.navHeight().navPaddingTop+
 			// api.navHeight().navHeight + (api.navHeight().headerPadding *2))
+      this.footGroup = this.footGroup.filter(v => v.is_show );
 		},
 		mounted() {
 			this.title = this.$store.state.title;
diff --git a/pages/Pet/index.vue b/pages/Pet/index.vue
index ab2c0fa..cc76514 100644
--- a/pages/Pet/index.vue
+++ b/pages/Pet/index.vue
@@ -96,8 +96,13 @@
 			}
 		},
 		onLoad() {
-			this.getMyPets();
+
 		},
+    onShow() {
+      this.currentPage = 1;
+      this.status = 'loadmore';
+      this.getMyPets();
+    },
 		methods: {
       navTo(url){
         uni.navigateTo({
diff --git a/pages/PetDetail/index.vue b/pages/PetDetail/index.vue
index e3ef37b..35c9054 100644
--- a/pages/PetDetail/index.vue
+++ b/pages/PetDetail/index.vue
@@ -157,8 +157,8 @@
             <view class="video-title">
               <image class="img" mode="heightFix" :src="staticImage.petPhotoTitle"/>
             </view>
-            <view class="video-content row" v-for="(item, index) in pet.images" wx:key="index">
-              <view class="photo-item col-4">
+            <view class="video-content row" >
+              <view class="photo-item col-4" v-for="(item, index) in pet.images" >
                 <view class="photo-item-container">
                   <view class="photo-content">
                     <image class="img" mode="widthFix" :src="item ? item : staticImage.wallpaperBgImage"/>
@@ -208,8 +208,9 @@
 	import RightNav from '@/components/RightNav/Index.vue';
 	import MzButton from '@/components/MzButton/Index.vue';
 	import api from '@/utils/functions.js';
-  import {getDetail} from "@/api/pet";
+  import {delPet, getDetail} from "@/api/pet";
   import log from "@/utils/log";
+  import functions from "@/utils/functions.js";
 	export default {
 		components: {
 			HeaderNav,
@@ -275,7 +276,11 @@
 		},
 		methods: {
       delPet(){
-
+        functions.confirm("确认删除该宠物吗？").then(() => {
+          delPet(this.id).then((res) => {
+            functions.success('删除成功').then(() => uni.navigateBack())
+          })
+        })
       },
       navTo(url){
         uni.navigateTo({
diff --git a/pages/UserOrderPage/index.vue b/pages/UserOrderPage/index.vue
index 77e5019..6fe12be 100644
--- a/pages/UserOrderPage/index.vue
+++ b/pages/UserOrderPage/index.vue
@@ -1,4 +1,9 @@
 <template>
+  <view class="body-background" :style="{
+		backgroundImage:'url('+staticImage.wallpaperBgImage+')'
+		}"></view>
+  <HeaderNav title="我的订单" :is-back="true"></HeaderNav>
+
   <view class="order-screen-top" :style="{
 			top:topStyle
 		}">