From b56cf24aa35b225e12c450d412bef78f77407c6e Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Sat, 28 Nov 2020 11:43:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=91=87=E6=A0=91?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=8E=20uni.openLocation=E3=80=81uni.choo?=
 =?UTF-8?q?seLocation=20=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E9=94=99?=
 =?UTF-8?q?=E4=B9=B1=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system-routes/choose-location/index.vue   | 77 +++++++++----------
 .../system-routes/open-location/index.vue     | 34 ++++----
 2 files changed, 55 insertions(+), 56 deletions(-)

diff --git a/src/platforms/h5/components/system-routes/choose-location/index.vue b/src/platforms/h5/components/system-routes/choose-location/index.vue
index 429079e51..0b8555c88 100644
--- a/src/platforms/h5/components/system-routes/choose-location/index.vue
+++ b/src/platforms/h5/components/system-routes/choose-location/index.vue
@@ -9,17 +9,17 @@
       @regionchange="_regionchange"
     >
       <div class="map-location" />
-      <div
-        class="map-move"
-        @click="_moveToLocation"
+      <div
+        class="map-move"
+        @click="_moveToLocation"
       >
         <i>&#xec32;</i>
       </div>
     </v-uni-map>
     <div class="nav">
-      <div
-        class="nav-btn back"
-        @click="_back"
+      <div
+        class="nav-btn back"
+        @click="_back"
       >
         <i class="uni-btn-icon">&#xe650;</i>
       </div>
@@ -51,14 +51,14 @@
           取消
         </div>
       </div>
-      <v-uni-scroll-view
-        scroll-y
-        class="list"
-        @scrolltolower="_scrolltolower"
+      <v-uni-scroll-view
+        scroll-y
+        class="list"
+        @scrolltolower="_scrolltolower"
       >
-        <div
-          v-if="loading"
-          class="list-loading"
+        <div
+          v-if="loading"
+          class="list-loading"
         >
           <i class="uni-loading" />
         </div>
@@ -213,7 +213,7 @@ export default {
   }
 }
 </script>
-<style scoped>
+<style>
 @font-face {
   font-weight: normal;
   font-style: normal;
@@ -232,7 +232,7 @@ export default {
   background: #f8f8f8;
 }
 
-.map {
+.uni-system-choose-location .map {
   position: absolute;
   top: -40px;
   left: 0;
@@ -240,7 +240,7 @@ export default {
   height: 380px;
 }
 
-.map-location {
+.uni-system-choose-location .map-location {
   position: absolute;
   left: 50%;
   bottom: 50%;
@@ -252,7 +252,7 @@ export default {
   background-size: 100%;
 }
 
-.map-move {
+.uni-system-choose-location .map-move {
   position: absolute;
   bottom: 50px;
   right: 10px;
@@ -267,7 +267,7 @@ export default {
   box-shadow: 0px 0 5px 1px rgba(0, 0, 0, 0.3);
 }
 
-.map-move > i {
+.uni-system-choose-location .map-move > i {
   display: block;
   width: 100%;
   height: 100%;
@@ -279,7 +279,7 @@ export default {
   -webkit-font-smoothing: antialiased;
 }
 
-.nav {
+.uni-system-choose-location .nav {
   position: absolute;
   top: 0;
   left: 0;
@@ -293,7 +293,7 @@ export default {
   );
 }
 
-.nav-btn {
+.uni-system-choose-location .nav-btn {
   position: absolute;
   box-sizing: border-box;
   top: 0;
@@ -308,16 +308,16 @@ export default {
   cursor: pointer;
 }
 
-.nav-btn.confirm {
+.uni-system-choose-location .nav-btn.confirm {
   left: auto;
   right: 0;
 }
 
-.nav-btn.disable {
+.uni-system-choose-location .nav-btn.disable {
   opacity: 0.4;
 }
 
-.nav-btn > .uni-btn-icon {
+.uni-system-choose-location .nav-btn > .uni-btn-icon {
   display: block;
   width: 100%;
   height: 100%;
@@ -325,11 +325,11 @@ export default {
   border-radius: 2px;
 }
 
-.nav-btn.confirm > .uni-btn-icon {
+.uni-system-choose-location .nav-btn.confirm > .uni-btn-icon {
   background-color: #007aff;
 }
 
-.menu {
+.uni-system-choose-location .menu {
   position: absolute;
   top: 300px;
   left: 0;
@@ -338,7 +338,7 @@ export default {
   background-color: white;
 }
 
-.search {
+.uni-system-choose-location .search {
   display: flex;
   flex-direction: row;
   height: 50px;
@@ -348,7 +348,7 @@ export default {
   background-color: white;
 }
 
-.search-input {
+.uni-system-choose-location .search-input {
   flex: 1;
   height: 100%;
   border-radius: 5px;
@@ -356,15 +356,14 @@ export default {
   background: #ebebeb;
 }
 
-.search-btn {
+.uni-system-choose-location .search-btn {
   width: 2.8em;
   color: #007aff;
   font-size: 17px;
   text-align: center;
-  cursor: pointer;
 }
 
-.list {
+.uni-system-choose-location .list {
   position: absolute;
   top: 50px;
   left: 0;
@@ -374,21 +373,21 @@ export default {
   /* background-color: #f6f6f6; */
 }
 
-.list-loading {
+.uni-system-choose-location .list-loading {
   display: flex;
   height: 50px;
   justify-content: center;
   align-items: center;
 }
 
-.list-item {
+.uni-system-choose-location .list-item {
   position: relative;
   padding: 10px;
   padding-right: 40px;
   cursor: pointer;
 }
 
-.list-item.selected::before {
+.uni-system-choose-location .list-item.selected::before {
   position: absolute;
   top: 50%;
   right: 10px;
@@ -405,7 +404,7 @@ export default {
   -webkit-font-smoothing: antialiased;
 }
 
-.list-item:not(:last-child)::after {
+.uni-system-choose-location .list-item:not(:last-child)::after {
   position: absolute;
   content: "";
   height: 1px;
@@ -415,14 +414,14 @@ export default {
   background-color: #d3d3d3;
 }
 
-.list-item-title {
+.uni-system-choose-location .list-item-title {
   font-size: 14px;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
 }
 
-.list-item-detail {
+.uni-system-choose-location .list-item-detail {
   font-size: 12px;
   color: #808080;
   overflow: hidden;
@@ -431,15 +430,15 @@ export default {
 }
 
 @media screen and (min-width: 800px) {
-  .map {
+  .uni-system-choose-location .map {
     top: 0;
     height: 100%;
   }
-  .map-move {
+  .uni-system-choose-location .map-move {
     bottom: 10px;
     right: 320px;
   }
-  .menu {
+  .uni-system-choose-location .menu {
     top: 54px;
     left: auto;
     right: 10px;
diff --git a/src/platforms/h5/components/system-routes/open-location/index.vue b/src/platforms/h5/components/system-routes/open-location/index.vue
index 55aa1f033..4bd8025b2 100644
--- a/src/platforms/h5/components/system-routes/open-location/index.vue
+++ b/src/platforms/h5/components/system-routes/open-location/index.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="uni-system-open-location">
-    <div
-      class="map-content"
-      :class="{ 'fix-position': isPoimarkerSrc }"
+    <div
+      class="map-content"
+      :class="{ 'fix-position': isPoimarkerSrc }"
     >
       <iframe
         ref="map"
@@ -13,15 +13,15 @@
         @load="_check"
       />
       <!-- 去这里 -->
-      <div
-        v-if="isPoimarkerSrc"
-        class="actTonav"
-        @click="_nav"
+      <div
+        v-if="isPoimarkerSrc"
+        class="actTonav"
+        @click="_nav"
       />
     </div>
-    <div
-      class="nav-btn-back"
-      @click="_back"
+    <div
+      class="nav-btn-back"
+      @click="_back"
     >
       <i class="uni-btn-icon">&#xe601;</i>
     </div>
@@ -76,7 +76,7 @@ export default {
   }
 }
 </script>
-<style scoped>
+<style>
 .uni-system-open-location {
   display: block;
   position: absolute;
@@ -87,7 +87,7 @@ export default {
   background: #f8f8f8;
 }
 
-.nav-btn-back {
+.uni-system-open-location .nav-btn-back {
   position: absolute;
   box-sizing: border-box;
   top: 0;
@@ -102,7 +102,7 @@ export default {
   cursor: pointer;
 }
 
-.nav-btn-back > .uni-btn-icon {
+.uni-system-open-location .nav-btn-back > .uni-btn-icon {
   display: block;
   width: 100%;
   height: 100%;
@@ -111,7 +111,7 @@ export default {
   background-color: rgba(0, 0, 0, 0.5);
 }
 
-.map-content {
+.uni-system-open-location .map-content {
   position: absolute;
   left: 0;
   top: 0px;
@@ -120,18 +120,18 @@ export default {
   overflow: hidden;
 }
 
-.map-content.fix-position {
+.uni-system-open-location .map-content.fix-position {
   top: -74px;
   bottom: -44px;
 }
 
-.map-content > iframe {
+.uni-system-open-location .map-content > iframe {
   width: 100%;
   height: 100%;
   border: none;
 }
 
-.actTonav {
+.uni-system-open-location .actTonav {
   position: absolute;
   right: 16px;
   bottom: 56px;
-- 
GitLab