From b52c66ff9ae56f3b98e701d34b7e8ea1ea2d08c7 Mon Sep 17 00:00:00 2001
From: aiShuiJiaoDeXioShou <2832294398@qq.com>
Date: Mon, 9 Sep 2024 18:04:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A0=E7=89=A9=E9=99=AA=E4=BC=B4=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E3=80=81=E5=AE=A0=E7=89=A9=E9=99=AA=E9=81=9B=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=88=9D=E5=A7=8B=E5=8C=96=E3=80=81=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A1=86=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 acdr-ui/src/components/AddressCell.vue        |  6 +-
 acdr-ui/src/components/Search.vue             | 78 +++++++++++++++++++
 acdr-ui/src/pages.json                        | 16 ++++
 acdr-ui/src/pages/index/index.vue             |  8 +-
 acdr-ui/src/pages/push/door.vue               |  6 +-
 acdr-ui/src/pages/service/accompany.vue       | 16 ++++
 acdr-ui/src/pages/service/knowledge.vue       | 16 ++++
 acdr-ui/src/service/mapService.js             | 27 ++++++-
 acdr-ui/src/service/userService.js            |  1 +
 acdr-ui/src/types/uni-pages.d.ts              |  2 +
 .../user/service/impl/UsersServiceImpl.java   |  7 +-
 11 files changed, 174 insertions(+), 9 deletions(-)
 create mode 100644 acdr-ui/src/components/Search.vue
 create mode 100644 acdr-ui/src/pages/service/accompany.vue
 create mode 100644 acdr-ui/src/pages/service/knowledge.vue

diff --git a/acdr-ui/src/components/AddressCell.vue b/acdr-ui/src/components/AddressCell.vue
index bb634b83..28cd7c9e 100644
--- a/acdr-ui/src/components/AddressCell.vue
+++ b/acdr-ui/src/components/AddressCell.vue
@@ -1,6 +1,9 @@
 <template>
   <view
-    class="pos-fixed z-999 left-[20px] top-[10px] flex gap-[10px] items-center content-center justify-center"
+    :class="[
+      'pos-fixed z-999 left-[10px]  flex gap-[10px] items-center content-center justify-center',
+      isH5 ? 'top-[20px]' : 'top-[40px]',
+    ]"
   >
     <image src="/static/addresscell/location.png" class="w-[30px]" mode="widthFix" />
     <view>
@@ -15,6 +18,7 @@
 
 <script lang="js" setup>
 import { getLocation, getMapDetailAddress } from '@/service/mapService'
+import { isH5 } from '@/utils/platform'
 
 const addressDetail = ref({})
 // 获取地址详细信息
diff --git a/acdr-ui/src/components/Search.vue b/acdr-ui/src/components/Search.vue
new file mode 100644
index 00000000..c5c60424
--- /dev/null
+++ b/acdr-ui/src/components/Search.vue
@@ -0,0 +1,78 @@
+<template>
+  <view class="w-full h-full">
+    <wd-search
+      v-model="value"
+      placeholder="每一次搜索与众不同"
+      cancel-txt="搜索"
+      @search="search"
+      @cancel="search"
+    >
+      <template #prefix>
+        <wd-popover mode="menu" :content="menu" @menuclick="changeSearchType">
+          <view class="search-type">
+            <text>{{ searchType }}</text>
+            <wd-icon custom-class="icon-arrow" name="fill-arrow-down"></wd-icon>
+          </view>
+        </wd-popover>
+      </template>
+    </wd-search>
+  </view>
+</template>
+
+<script lang="js" setup>
+const searchType = ref('全部')
+const value = ref('')
+const menu = ref([
+  {
+    content: '全部',
+  },
+  {
+    content: '上门服务',
+  },
+  {
+    content: '宠物陪伴',
+  },
+  {
+    content: '宠物陪遛',
+  },
+  {
+    content: '宠物商城',
+  },
+])
+
+// 搜索结果
+const search = ({ value }) => {}
+
+// 改变搜索值
+const changeSearchType = ({ item, index }) => {
+  searchType.value = item.content
+}
+</script>
+
+<style lang="scss" scoped>
+.search-type {
+  position: relative;
+  height: 30px;
+  line-height: 30px;
+  padding: 0 8px 0 16px;
+}
+.search-type::after {
+  position: absolute;
+  content: '';
+  width: 1px;
+  right: 0;
+  top: 5px;
+  bottom: 5px;
+  background: rgba(0, 0, 0, 0.25);
+}
+.search-type {
+  :deep(.icon-arrow) {
+    display: inline-block;
+    font-size: 20px;
+    vertical-align: middle;
+  }
+}
+.wd-search {
+  background-color: #ff8261;
+}
+</style>
diff --git a/acdr-ui/src/pages.json b/acdr-ui/src/pages.json
index 4296af88..5010783b 100644
--- a/acdr-ui/src/pages.json
+++ b/acdr-ui/src/pages.json
@@ -234,6 +234,14 @@
         "navigationBarTitleText": "发布页面"
       }
     },
+    {
+      "path": "pages/service/accompany",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationBarTitleText": "宠物陪伴"
+      }
+    },
     {
       "path": "pages/service/detail",
       "type": "page",
@@ -257,6 +265,14 @@
         "navigationBarTitleText": "服务页面"
       }
     },
+    {
+      "path": "pages/service/knowledge",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationBarTitleText": "宠物宝典"
+      }
+    },
     {
       "path": "pages/service/my-service",
       "type": "page",
diff --git a/acdr-ui/src/pages/index/index.vue b/acdr-ui/src/pages/index/index.vue
index db0e7c9e..15d5897e 100644
--- a/acdr-ui/src/pages/index/index.vue
+++ b/acdr-ui/src/pages/index/index.vue
@@ -11,7 +11,12 @@
   <view class="container">
     <Banner />
     <AddressCell />
+    <!-- 这里放搜索框 -->
+    <view class="w-[80vw] pos-absolute top-[53vw]">
+      <Search />
+    </view>
     <loading-animation v-model="isLoading" />
+
     <view class="index">
       <view
         v-if="petInfo?.id"
@@ -41,7 +46,7 @@
           <view class="service-card small-card" @click="toPath('/pages/service/slippery')">
             <image :src="imgUrl('@/static/home/cwpl.png')" class="service-image" mode="widthFix" />
           </view>
-          <view class="service-card small-card" @click="toPath('/pages/service/door')">
+          <view class="service-card small-card" @click="toPath('/pages/service/search')">
             <image :src="imgUrl('@/static/home/smfw.png')" class="service-image" mode="widthFix" />
           </view>
         </view>
@@ -80,6 +85,7 @@ import { imgUrl, toast } from '@/utils/commUtils'
 import { httpGet } from '@/utils/http'
 import Tabbar from '@/components/Tabbar.vue'
 import AddressCell from '@/components/AddressCell.vue'
+import Search from '@/components/Search.vue'
 
 const isLoading = ref(false)
 const petInfo = ref({})
diff --git a/acdr-ui/src/pages/push/door.vue b/acdr-ui/src/pages/push/door.vue
index 06a0a858..947ced81 100644
--- a/acdr-ui/src/pages/push/door.vue
+++ b/acdr-ui/src/pages/push/door.vue
@@ -151,13 +151,15 @@ const auth = async () => {
     toast('您还未实名认证，请先实名认证！')
     try {
       const res = await isBindPhone()
-      if (res.code == 200 && res.data) {
+      if (res.code != 200 || !res.data) {
         toast('您手机号还未绑定!')
-        uni.navigateTo({ url: '/pages/permission/phone-auth' })
+        uni.navigateTo({ url: '/pages/permission/bind-phone' })
+        return
       }
     } catch (e) {
       console.log('手机号发送验证信息失败：', e)
     }
+    toast('请先实名认证！')
     // 跳转到指定实名页面
     uni.navigateTo({ url: '/pages/permission/real-name-auth' })
     return
diff --git a/acdr-ui/src/pages/service/accompany.vue b/acdr-ui/src/pages/service/accompany.vue
new file mode 100644
index 00000000..c0892db0
--- /dev/null
+++ b/acdr-ui/src/pages/service/accompany.vue
@@ -0,0 +1,16 @@
+<route lang="json5" type="page">
+{
+  layout: 'default',
+  style: {
+    navigationBarTitleText: '宠物陪伴',
+  },
+}
+</route>
+
+<template>
+  <view class=""></view>
+</template>
+
+<script lang="js" setup></script>
+
+<style lang="scss" scoped></style>
diff --git a/acdr-ui/src/pages/service/knowledge.vue b/acdr-ui/src/pages/service/knowledge.vue
new file mode 100644
index 00000000..30ea8e74
--- /dev/null
+++ b/acdr-ui/src/pages/service/knowledge.vue
@@ -0,0 +1,16 @@
+<route lang="json5" type="page">
+{
+  layout: 'default',
+  style: {
+    navigationBarTitleText: '宠物宝典',
+  },
+}
+</route>
+
+<template>
+  <view class=""></view>
+</template>
+
+<script lang="js" setup></script>
+
+<style lang="scss" scoped></style>
diff --git a/acdr-ui/src/service/mapService.js b/acdr-ui/src/service/mapService.js
index f17ce513..9f1296e8 100644
--- a/acdr-ui/src/service/mapService.js
+++ b/acdr-ui/src/service/mapService.js
@@ -1,6 +1,9 @@
 import { toast } from '@/utils/commUtils'
 import { httpGet } from '@/utils/http'
 
+const CACHE_KEY = 'lastLocation'; // 缓存位置的键
+const THROTTLE_TIME = 30000; // 30秒内不能重复获取
+
 // 通过高德地图api获取详细位置
 export const getReverseGeocoding = async (longitude, latitude) => {
   try {
@@ -39,20 +42,36 @@ export const getMapDetailAddress = async (longitude, latitude) => {
 
 // 获取当前经纬度信息
 export const getLocation = async () => {
+  const currentTime = Date.now()
+
+  // 从本地缓存中获取上次的位置信息
+  const cachedLocation = uni.getStorageSync(CACHE_KEY)
+
+  // 如果有缓存并且未超过30秒，直接返回缓存的位置信息
+  if (cachedLocation && currentTime - cachedLocation.time < THROTTLE_TIME) {
+    return cachedLocation.data // 返回缓存中的数据
+  }
+
   try {
     const res = await new Promise((resolve, reject) => {
       uni.getLocation({
-        type: 'gcj02', // 可以指定返回的经纬度类型，如 'gcj02'、'wgs84'等
+        type: 'gcj02',
         success: (res) => {
           resolve(res) // 成功时返回结果
         },
         fail: (err) => {
           reject(err) // 失败时抛出错误
         },
-      })
+      });
+    });
+
+    // 成功获取到位置信息后，缓存到本地存储
+    uni.setStorageSync(CACHE_KEY, {
+      data: res,
+      time: currentTime, // 记录获取位置的时间戳
     })
-    // 返回获取到的地理位置信息
-    return res
+
+    return res // 返回最新的位置信息
   } catch (err) {
     console.log(err)
     toast('获取位置失败')
diff --git a/acdr-ui/src/service/userService.js b/acdr-ui/src/service/userService.js
index 5ef96f7c..9033b8b0 100644
--- a/acdr-ui/src/service/userService.js
+++ b/acdr-ui/src/service/userService.js
@@ -1,4 +1,5 @@
 import { useUserStore } from "@/store"
+import { httpGet } from "@/utils/http"
 
 // 获取用户信息并且更新缓存
 // 返回用户详细信息
diff --git a/acdr-ui/src/types/uni-pages.d.ts b/acdr-ui/src/types/uni-pages.d.ts
index d9cb2619..e4e403cd 100644
--- a/acdr-ui/src/types/uni-pages.d.ts
+++ b/acdr-ui/src/types/uni-pages.d.ts
@@ -33,9 +33,11 @@ interface NavigateToOptions {
        "/pages/push/goods" |
        "/pages/push/index" |
        "/pages/push/share" |
+       "/pages/service/accompany" |
        "/pages/service/detail" |
        "/pages/service/door" |
        "/pages/service/index" |
+       "/pages/service/knowledge" |
        "/pages/service/my-service" |
        "/pages/service/search" |
        "/pages/service/shop" |
diff --git a/acdr/src/main/java/com/yskj/acdr/master/user/service/impl/UsersServiceImpl.java b/acdr/src/main/java/com/yskj/acdr/master/user/service/impl/UsersServiceImpl.java
index 32af9ea0..6e21b870 100644
--- a/acdr/src/main/java/com/yskj/acdr/master/user/service/impl/UsersServiceImpl.java
+++ b/acdr/src/main/java/com/yskj/acdr/master/user/service/impl/UsersServiceImpl.java
@@ -84,6 +84,11 @@ public class UsersServiceImpl extends ServiceImpl<UsersMapper, Users> implements
 
     @Override
     public GlobalResponse<String> getMhCode(String phone) {
+        // 判断上一次验证码是否失效
+        if (redisCache.hasKey(phone)) {
+            return GlobalResponse.failure("您在一分钟前已经获取过验证码了！");
+        }
+
         // 获取配置数据
         String smsapi = "http://api.smsbao.com/";
         String user = "549555305"; // 短信平台帐号
@@ -100,7 +105,7 @@ public class UsersServiceImpl extends ServiceImpl<UsersMapper, Users> implements
         if ("0".equals(result) || ProfileUtil.isDebug()) { // 发送成功
             log.debug("验证码：" + code);
             // 将验证码存入缓存
-            redisCache.set(phone, code, 5, TimeUnit.MINUTES);
+            redisCache.set(phone, code, 1, TimeUnit.MINUTES);
             return GlobalResponse.success("验证码获取成功", code);
         } else if (result == null) {
             log.debug("短信接口请求失败");