From 0c5cbe678906eb1bb8b940f0946bd9f18115f9c1 Mon Sep 17 00:00:00 2001
From: qubiaobiao <3294694717@qq.com>
Date: Thu, 7 Mar 2024 17:27:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=82=B9=E5=87=BB=E5=9C=B0?=
 =?UTF-8?q?=E7=82=B9=E6=A0=87=E7=82=B9=EF=BC=8C=E5=BC=B9=E5=87=BA=E5=9C=B0?=
 =?UTF-8?q?=E7=82=B9=E4=BF=A1=E6=81=AF=E5=BC=B9=E7=AA=97=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/util.js                 |  4 ++--
 src/components/LandMarkShow.vue | 21 ++++++++++++++-------
 src/stores/flyto.js             |  2 ++
 src/stores/position.js          |  2 ++
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/api/util.js b/src/api/util.js
index 97f178e..f5a0f4d 100644
--- a/src/api/util.js
+++ b/src/api/util.js
@@ -1,8 +1,8 @@
 export const isLnglat = lnglat => {
   const { lng, lat } = lnglat
 	
-  if (isNaN(lng) || lng > 180 || lng < -180) return false
-  if (isNaN(lat) || lat > 90  || lat < -90 ) return false
+  if (lng=='' || isNaN(lng) || lng > 180 || lng < -180) return false
+  if (lat=='' || isNaN(lat) || lat > 90  || lat < -90 ) return false
 
   return true
 }
\ No newline at end of file
diff --git a/src/components/LandMarkShow.vue b/src/components/LandMarkShow.vue
index 41929ce..599d654 100644
--- a/src/components/LandMarkShow.vue
+++ b/src/components/LandMarkShow.vue
@@ -7,13 +7,17 @@
           <br />
           <h1 class="describesTitle">{{LandMarkShow.information.landTitle}}</h1>
           <br />
+          <div class="paragraphBox">
           <p class="describesParagraph">{{LandMarkShow.information.landDescribes}}</p>
+          </div>
         </div>
       </div>
       <div id="brieflyBox" class="brieflyBox" :style="brieflyShow">
         <div class="textBox">
           <h3 class="brieflyTitle">{{LandMarkShow.information.landTitle}}</h3>
+          <div class="paragraphBox">
           <p class="brieflyParagraph">{{LandMarkShow.information.landBriefly}}</p>
+          </div>
         </div>
       </div>
       <div class="share showBtn">
@@ -165,10 +169,15 @@ const close = () => {
 }
 .textBox {
   width: 80%;
-  height: 90%;
+  height: 100%;
   overflow: hidden;
   margin: auto;
 }
+.paragraphBox{
+  height:80%;
+  overflow-x:hidden;
+  overflow-y:auto;
+}
 .describesTitle {
   text-align: center;
   margin: 0;
@@ -178,25 +187,23 @@ const close = () => {
   text-align: left;
   text-indent: 2em;
   margin: 0;
+  font-weight:bolder;
   font-size: clamp(0.5rem, 0.489rem + 1.05vw, 1rem);
 }
 .brieflyTitle {
   color: #fff;
   text-align: left;
+  margin-top: 4%;
   margin-bottom: 1%;
   font-size: clamp(0.6rem, 0.489rem + 1.05vw, 1.2rem);
 }
 .brieflyParagraph {
   color: #fff;
-  font-size: clamp(0.4rem, 0.489rem + 1.05vw, 0.8rem);
   text-align: left;
   text-indent: 2em;
   margin-top: 0;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  -webkit-line-clamp: 3;
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
+  font-weight:bolder;
+  font-size: clamp(0.4rem, 0.489rem + 1.05vw, 0.8rem);
 }
 .boxClose {
   bottom: 15%;
diff --git a/src/stores/flyto.js b/src/stores/flyto.js
index ac40bb5..4bd4298 100644
--- a/src/stores/flyto.js
+++ b/src/stores/flyto.js
@@ -7,6 +7,7 @@ export const useFlytoStore = defineStore({
   state: () => ({
     lng: NaN,
     lat: NaN,
+    change:true,
   }),
   getters: {
     value: (state) => { state.lng, state.lat }
@@ -17,6 +18,7 @@ export const useFlytoStore = defineStore({
 
       this.lng = flyto.lng
       this.lat = flyto.lat
+      this.change =  !this.change
 
       return true
     },
diff --git a/src/stores/position.js b/src/stores/position.js
index 434ab9d..c040056 100644
--- a/src/stores/position.js
+++ b/src/stores/position.js
@@ -7,6 +7,7 @@ export const usePositionStore = defineStore({
   state: () => ({
     lng: NaN,
     lat: NaN,
+    change:true,
   }),
   getters: {
     value: (state) => { state.lng, state.lat }
@@ -17,6 +18,7 @@ export const usePositionStore = defineStore({
 
       this.lng = position.lng
       this.lat = position.lat
+      this.change =  !this.change
 
       return true
     },