Prechádzať zdrojové kódy

/deep/ 改为::deep

“hanlingqiang 3 rokov pred
rodič
commit
11de858e2d

+ 6 - 0
.env.development

@@ -8,6 +8,12 @@ VUE_APP_ZL_WSS = '/api'
 VUE_APP_ZL_WSS_ZP='/prod-api'
 VUE_APP_ZL_JF='/blade-api'
 VUE_APP_ZL_WSS_ZP_BT='/subsidy'
+
+# 高德地图key
+VITE_APP_AMAP_KEY = '017ac002b4b1a16ec87b2182b17bbed9'
+# 高德地图密钥
+VITE_APP_AMAP_SECURITY = '0f17176ade9bdeee2ed7b9990e6423bd'
+
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.
 # It only does one thing by converting all import() to require().

+ 4 - 1
.env.production

@@ -9,7 +9,10 @@ VUE_APP_ZL_WSS = 'https://cdbwss.poteviohealth.com'
 VUE_APP_ZL_WSS_ZP = 'https://test.poteviohealth.com/prod-api'
 VUE_APP_ZL_WSS_ZP_BT = 'https://test.poteviohealth.com/subsidy'
 
-
+# 高德地图key
+VITE_APP_AMAP_KEY = '017ac002b4b1a16ec87b2182b17bbed9'
+# 高德地图密钥
+VITE_APP_AMAP_SECURITY = '0f17176ade9bdeee2ed7b9990e6423bd'
 
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 241 - 170
package-lock.json


+ 1 - 0
package.json

@@ -9,6 +9,7 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
+    "@amap/amap-jsapi-loader": "^1.0.1",
     "axios": "^0.27.2",
     "core-js": "^3.6.5",
     "image-conversion": "^2.1.1",

+ 2 - 2
src/views/weibao/components/vanUploader.vue

@@ -160,14 +160,14 @@ export default {
   }
 }
 .van-uploader {
-  /deep/.van-uploader__wrapper {
+  ::v-deep .van-uploader__wrapper {
     .van-uploader__upload {
       width: 200px;
       height: 200px;
     }
   }
 
-  /deep/.van-uploader__preview {
+  ::v-deep .van-uploader__preview {
     .van-uploader__file-icon,
     .van-uploader__file-name {
       display: none;

+ 4 - 4
src/views/weibao/views/consultation/details.vue

@@ -169,14 +169,14 @@ export default {
     position: absolute;
     top: 0;
     left: 0;
-    /deep/.van-uploader__wrapper {
+    ::v-deep .van-uploader__wrapper {
       .van-uploader__upload {
         width: 200px;
         height: 200px;
       }
     }
 
-    /deep/.van-uploader__preview {
+    ::v-deep .van-uploader__preview {
       margin: 0 20px;
       .van-uploader__file {
         opacity: 0;
@@ -219,10 +219,10 @@ export default {
     margin-bottom: 16px;
   }
 }
-/deep/.van-field__control {
+::v-deep .van-field__control {
   color: #333;
 }
-/deep/.van-field__control:disabled {
+::v-deep .van-field__control:disabled {
   color: #333;
   -webkit-text-fill-color: unset;
 }

+ 4 - 4
src/views/weibao/views/consultation/initiateConsultation.vue

@@ -364,14 +364,14 @@ export default {
     position: absolute;
     top: 0;
     left: 0;
-    /deep/.van-uploader__wrapper {
+    ::v-deep .van-uploader__wrapper {
       .van-uploader__upload {
         width: 200px;
         height: 200px;
       }
     }
 
-    /deep/.van-uploader__preview {
+    ::v-deep .van-uploader__preview {
       margin: 20px;
       .van-uploader__file {
         opacity: 0;
@@ -387,10 +387,10 @@ export default {
     }
   }
 }
-/deep/.van-field__control {
+::v-deep .van-field__control {
   color: #333;
 }
-/deep/.van-field__control:disabled {
+::v-deep .van-field__control:disabled {
   color: #333;
   -webkit-text-fill-color: unset;
 }

+ 4 - 4
src/views/weibao/views/followUp/addfollow.vue

@@ -342,14 +342,14 @@ export default {
     position: absolute;
     top: 0;
     left: 0;
-    /deep/.van-uploader__wrapper {
+    ::v-deep .van-uploader__wrapper {
       .van-uploader__upload {
         width: 200px;
         height: 200px;
       }
     }
 
-    /deep/.van-uploader__preview {
+    ::v-deep .van-uploader__preview {
       margin: 20px;
       .van-uploader__file {
         opacity: 0;
@@ -365,10 +365,10 @@ export default {
     }
   }
 }
-/deep/.van-field__control {
+::v-deep .van-field__control {
   color: #333;
 }
-/deep/.van-field__control:disabled {
+::v-deep .van-field__control:disabled {
   color: #333;
   -webkit-text-fill-color: unset;
 }

+ 2 - 2
src/views/weibao/views/followUp/details.vue

@@ -140,7 +140,7 @@ export default {
     display: flex;
     flex-wrap: wrap;
     // justify-content: space-between;
-    /deep/.van-image {
+    ::v-deep .van-image {
       max-width: 200px;
       //   max-height: 200px;
       margin: 0 10px;
@@ -163,7 +163,7 @@ export default {
     }
   }
 }
-/deep/.van-overlay {
+::v-deep .van-overlay {
   background-color: rgba(0, 0, 0, 0.75);
 }
 </style>

+ 4 - 4
src/views/weibao/views/followUp/record.vue

@@ -293,14 +293,14 @@ export default {
     position: absolute;
     top: 0;
     left: 0;
-    /deep/.van-uploader__wrapper {
+    ::v-deep .van-uploader__wrapper {
       .van-uploader__upload {
         width: 200px;
         height: 200px;
       }
     }
 
-    /deep/.van-uploader__preview {
+    ::v-deep .van-uploader__preview {
       margin: 0 20px;
       .van-uploader__file {
         opacity: 0;
@@ -316,10 +316,10 @@ export default {
     }
   }
 }
-/deep/.van-field__control {
+::v-deep .van-field__control {
   color: #333;
 }
-/deep/.van-field__control:disabled {
+::v-deep .van-field__control:disabled {
   color: #333;
   -webkit-text-fill-color: unset;
 }

+ 3 - 3
src/views/weibao/views/home/index.vue

@@ -180,7 +180,7 @@ export default {
   overflow: hidden;
   margin: 0 auto;
   transform: translateY(0);
-  /deep/.van-swipe-item {
+  ::v-deep .van-swipe-item {
     text-align: center;
     overflow: hidden;
     img {
@@ -189,13 +189,13 @@ export default {
     }
   }
 }
-/deep/ .van-swipe__indicator {
+::v-deep .van-swipe__indicator {
   width: 12px;
   height: 12px;
   background: rgba(255, 255, 255, 0.65);
 }
 
-/deep/.van-swipe__indicator--active {
+::v-deep .van-swipe__indicator--active {
   width: 70px;
   border-radius: 8px;
 }

+ 1 - 1
src/views/weibao/views/login/index.vue

@@ -81,7 +81,7 @@ export default {
   color: #1a1a1a;
   text-align: center;
 }
-/deep/.van-cell {
+::v-deep .van-cell {
   margin-top: 100px;
   background-color: transparent;
   width: 94%;

+ 4 - 4
src/views/weibao/views/loveHelp/details.vue

@@ -416,14 +416,14 @@ export default {
     position: absolute;
     top: 0;
     left: 0;
-    /deep/.van-uploader__wrapper {
+    ::v-deep .van-uploader__wrapper {
       .van-uploader__upload {
         width: 200px;
         height: 200px;
       }
     }
 
-    /deep/.van-uploader__preview {
+    ::v-deep .van-uploader__preview {
       margin: 20px;
       .van-uploader__file {
         opacity: 0;
@@ -439,10 +439,10 @@ export default {
     }
   }
 }
-/deep/.van-field__control {
+::v-deep .van-field__control {
   color: #333;
 }
-/deep/.van-field__control:disabled {
+::v-deep .van-field__control:disabled {
   color: #333;
   -webkit-text-fill-color: unset;
 }

+ 1 - 1
src/views/weibao/views/loveHelp/index.vue

@@ -138,7 +138,7 @@ p {
     }
   }
 }
-/deep/.van-search__action:active {
+::v-deep .van-search__action:active {
   background-color: transparent;
 }
 </style>

+ 4 - 4
src/views/weibao/views/reporting/details.vue

@@ -154,14 +154,14 @@ export default {
     position: absolute;
     top: 0;
     left: 0;
-    /deep/.van-uploader__wrapper {
+    ::v-deep .van-uploader__wrapper {
       .van-uploader__upload {
         width: 200px;
         height: 200px;
       }
     }
 
-    /deep/.van-uploader__preview {
+    ::v-deep .van-uploader__preview {
       margin: 0 20px;
       .van-uploader__file {
         opacity: 0;
@@ -204,10 +204,10 @@ export default {
     margin-bottom: 16px;
   }
 }
-/deep/.van-field__control {
+::v-deep .van-field__control {
   color: #333;
 }
-/deep/.van-field__control:disabled {
+::v-deep .van-field__control:disabled {
   color: #333;
   -webkit-text-fill-color: unset;
 }

+ 1 - 1
src/views/weibao/views/reporting/index.vue

@@ -140,7 +140,7 @@ export default {
   margin-top: 16px;
   border-bottom: 1px solid #eee;
   .img {
-    /deep/.van-image {
+    ::v-deep .van-image {
       width: 260px;
       height: 160px;
       img {

+ 4 - 4
src/views/weibao/views/reporting/initiateConsultation.vue

@@ -293,14 +293,14 @@ export default {
     position: absolute;
     top: 0;
     left: 0;
-    /deep/.van-uploader__wrapper {
+    ::v-deep .van-uploader__wrapper {
       .van-uploader__upload {
         width: 200px;
         height: 200px;
       }
     }
 
-    /deep/.van-uploader__preview {
+    ::v-deep .van-uploader__preview {
       margin: 20px;
       .van-uploader__file {
         opacity: 0;
@@ -316,10 +316,10 @@ export default {
     }
   }
 }
-/deep/.van-field__control {
+::v-deep .van-field__control {
   color: #333;
 }
-/deep/.van-field__control:disabled {
+::v-deep van-field__control:disabled {
   color: #333;
   -webkit-text-fill-color: unset;
 }

+ 5 - 5
src/views/weibao/views/specialServices/details.vue

@@ -150,7 +150,7 @@ export default {
     display: flex;
     flex-wrap: wrap;
     // justify-content: space-between;
-    /deep/.van-image {
+    ::v-deep .van-image {
       img {
         max-width: 200px;
         max-height: 200px;
@@ -219,14 +219,14 @@ export default {
     position: absolute;
     top: 0;
     left: 0;
-    /deep/.van-uploader__wrapper {
+    ::v-deep .van-uploader__wrapper {
       .van-uploader__upload {
         width: 200px;
         height: 200px;
       }
     }
 
-    /deep/.van-uploader__preview {
+    ::v-deep .van-uploader__preview {
       margin: 0 20px;
       .van-uploader__file {
         opacity: 0;
@@ -242,10 +242,10 @@ export default {
     }
   }
 }
-/deep/.van-field__control {
+::v-deep .van-field__control {
   color: #333;
 }
-/deep/.van-field__control:disabled {
+::v-deep .van-field__control:disabled {
   color: #333;
   -webkit-text-fill-color: unset;
 }

+ 2 - 2
src/views/weibao/views/specialServices/startServiceplay.vue

@@ -397,10 +397,10 @@ export default {
     font-weight: bold;
   }
 }
-/deep/.van-field__control {
+::v-deep .van-field__control {
   color: #333;
 }
-/deep/.van-field__control:disabled {
+::v-deep .van-field__control:disabled {
   color: #333;
   -webkit-text-fill-color: unset;
 }

+ 72 - 3
src/views/zhulao/views/circle/index.vue

@@ -1,17 +1,86 @@
 <template>
   <div class="page">
     <van-nav-bar title="养老服务圈" fixed placeholder safe-area-inset-top />
+     <div
+          class="map_bg"
+          id="container_home"
+        >
+     </div>
     <Tabbar />
   </div>
 </template>
 
 <script>
 import Tabbar from '../../components/Tabbar.vue'
+import AMapLoader from "@amap/amap-jsapi-loader";
+const map = ''
+const AMapOut =''
+const placeSearch = ''
+const address = ''
 export default {
-     components: { Tabbar },
+    components: { Tabbar },
+    data() {
+      return {
+       
+      }
+    },
+    created() {
+      this.initMap()
+    },
+  methods: {
+    /**地图初始化 */
+    async initMap() {
+        await AMapLoader.load({
+        key: process.env.VITE_APP_AMAP_KEY,
+        version: "2.0", // 指定要加载的 JSAPI 的版本,缺省时默认为 1.4.15
+        plugins: ["AMap.PlaceSearch", "AMap.AutoComplete", "AMap.Geolocation"], // 需要使用的的插件列表,如比例尺'AMap.Scale'等
+      })
+        .then((AMap) => {
+          AMapOut.value = AMap;
+          map.value = new AMap.Map("container_home", {
+            //设置地图容器id
+            center: [114.057999, 22.5436],
+            zoom: 11, //初始化地图级别
+          });
+          
+          var autoOptions = {
+            // 城市,默认全国
+            city: "深圳",
+            // 使用联想输入的input的id
+            input: "address",
+          };
+
+          // var autocomplete = new AMap.AutoComplete(autoOptions);
+          placeSearch.value = new AMap.PlaceSearch({
+            city: "深圳",
+            citylimit: true,
+            pageSize: 1, // 单页显示结果条数
+            pageIndex: 1, // 页码
+          });
+          nextTick(()=>{
+            var autocomplete = new AMap.AutoComplete(autoOptions);
+            autocomplete.on("select", function add (e) {
+              address.value = e.poi.name;
+            });
+          })
+        
+        })
+
+        .catch((e) => {
+          console.log(e);
+        });
+    }
+  }
 }
 </script>
 
-<style>
-
+<style lang="scss" scoped>
+.page {
+  background-color: #f5f5f5;
+}
+.map_bg {
+  width: 100%;
+  height: 100%;
+  background-color: antiquewhite;
+}
 </style>

+ 1 - 1
src/views/zhulao/views/classRoom/index.vue

@@ -94,7 +94,7 @@ export default {
 }
 .van-tabs {
   border-bottom: 0;
-  /deep/.van-tab {
+  ::v-deep .van-tab {
     font-size: 30px;
   }
 }

+ 1 - 1
src/views/zhulao/views/home/index.vue

@@ -131,7 +131,7 @@ export default {
   overflow: hidden;
   margin: 0 auto;
   transform: translateY(0);
-  /deep/.van-swipe-item {
+  ::v-deep .van-swipe-item {
     text-align: center;
     overflow: hidden;
     img {

+ 6 - 6
src/views/zhulao/views/shoppingMall/components/goods.vue

@@ -99,7 +99,7 @@ export default {
 .box {
   display: flex;
   height: calc(100% - 100px);
-  /deep/.van-sidebar {
+  ::v-deep .van-sidebar {
     flex-shrink: 1;
     width: 200px;
     height: 100%;
@@ -116,24 +116,24 @@ export default {
     border-bottom: 0;
     height: 100%;
     text-align: left;
-    /deep/.van-tab {
+    ::v-deep .van-tab {
       flex: none;
       padding: 0;
       padding-right: 20px;
     }
-    /deep/.van-tabs__nav--complete {
+    ::v-deep .van-tabs__nav--complete {
       padding: 0;
     }
-    /deep/.van-tabs__line {
+    ::v-deep .van-tabs__line {
       height: 0;
     }
-    /deep/.van-tabs__wrap {
+    ::v-deep .van-tabs__wrap {
       height: 60px;
       .van-tab__span {
         font-size: 24px;
       }
     }
-    /deep/.van-tabs__content {
+    ::v-deep .van-tabs__content {
       height: calc(100% - 60px);
       overflow-y: auto;
     }

+ 1 - 1
src/views/zhulao/views/shoppingMall/details.vue

@@ -86,7 +86,7 @@ export default {
   overflow: hidden;
   margin: 0 auto;
   transform: translateY(0);
-  /deep/.van-swipe-item {
+  ::v-deep .van-swipe-item {
     text-align: center;
     overflow: hidden;
     .van-image {

+ 2 - 2
src/views/zhulao/views/shoppingMall/index.vue

@@ -32,10 +32,10 @@ export default {
   border-bottom: 0;
   height: 100%;
   overflow: hidden;
-  /deep/.van-tab {
+  ::v-deep .van-tab {
     font-size: 30px;
   }
-  /deep/.van-tabs__content {
+  ::v-deep .van-tabs__content {
     height: calc(100% - 92px);
     .van-tab__pane {
       height: 100%;

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov