Merge branch 'main' of https://git.zdool.com/xs/yxdt/h5 into main

index.html

@@ -8,8 +8,6 @@
   <title>优享地图</title>
 </head>
 <script type="text/javascript" src="https://api.tianditu.gov.cn/api?v=4.0&tk=4e6d9067f64ad8101ca0f4ceb7cb4083" crossorigin></script>
-<!-- https://tile1.tianditu.gov.cn/vts?t=vt&pk=gd1a&tk=75f0434f240669f4a2df6359275146d2&v=1.0 -->
-<!-- <script src="https://cdn.bootcss.com/vConsole/3.3.0/vconsole.min.js" crossorigin></script> -->
 <script>
   // var vConsole = new VConsole();
 </script>

src/views/HomeView.vue

@@ -24,7 +24,81 @@
       </div>
     </div>
     <div id="mapDiv"></div>
-    <van-popup
+    <van-floating-panel v-model:height="height" :anchors="anchors">
+      <van-sticky style="background-color: #fff; z-index: 99">
+        <van-search
+          v-model="dropdown.sesh"
+          shape="round"
+          background="#4fc08d00"
+          placeholder=""
+          @change="getlist()"
+        />
+        <van-dropdown-menu>
+          <van-dropdown-item
+            v-model="dropdown.value1"
+            :options="dropdown.option1"
+          />
+          <van-dropdown-item
+            v-model="dropdown.value2"
+            :options="dropdown.option2"
+          />
+          <van-dropdown-item
+            v-model="dropdown.value3"
+            :options="dropdown.option3"
+          />
+        </van-dropdown-menu>
+      </van-sticky>
+      <div class="card">
+        <div
+          class="cardlist"
+          v-for="(item, index) in dropdown.rmyy"
+          @click="addClickHandls(item)"
+          :key="index"
+        >
+          <img
+            class="imgse"
+            :src="
+              item.img ||
+              'https://ts4.cn.mm.bing.net/th?id=OIP-C.loXEDwoMcxdPH4Ka75v3qgHaFU&w=294&h=211&c=8&rs=1&qlt=90&o=6&pid=3.1&rm=2'
+            "
+            alt=""
+          />
+          <div class="bodys">
+            <div class="bt">{{ item.fu_wu_ti_gong_dan_wei_ming_chen }}</div>
+            <div class="dz">
+              <div class="xxdz">{{ item.xiang_xi_di_zhi }}</div>
+            </div>
+            <div class="bq">
+              <van-tag plain type="primary">{{
+                item.fu_wu_ti_gong_dan_wei_lei_xing
+              }}</van-tag>
+            </div>
+          </div>
+        </div>
+        <van-divider
+          v-if="dropdown.rmyy.length < count && dropdown.rmyy.length !== 0"
+          @click="getlists()"
+          :style="{
+            color: '#1989fa',
+            borderColor: '#1989fa',
+            padding: '0 16px',
+          }"
+        >
+          点击加载更多
+        </van-divider>
+        <van-divider
+          v-if="dropdown.rmyy.length >= count"
+          :style="{
+            color: '#969799',
+            borderColor: '#969799',
+            padding: '0 16px',
+          }"
+        >
+          没有更多了
+        </van-divider>
+      </div>
+    </van-floating-panel>
+    <!-- <van-popup
       :show="true"
       :overlay="false"
       round
@@ -107,7 +181,7 @@
           没有更多了
         </van-divider>
       </div>
-    </van-popup>
+    </van-popup> -->
   </div>
   <van-popup
     v-model:show="show"
@@ -178,6 +252,12 @@ import img16 from "@/assets/home/yxfwxz.png";
 import img17 from "@/assets/home/yy.png";
 import img18 from "@/assets/home/wdwz.png";
 import img19 from "@/assets/home/xzwz.png";
+const anchors = [
+  Math.round(0.3 * window.innerHeight),
+  Math.round(0.6 * window.innerHeight),
+  Math.round(1 * window.innerHeight),
+];
+const height = ref(anchors[0]);
 const count = ref(0);
 var map = null;
 var control = null;
@@ -188,7 +268,7 @@ const showdata = ref({});
 const dropdown = reactive({
   sesh: "",
   value1: 0,
-  hinegh: 280,
+  hinegh: 400,
   value1: 0,
   value2: 0,
   value3: 0,
@@ -350,7 +430,6 @@ function addClickHandler(content, LngLats) {
         });
         let ss = item.xiang_xi_di_zhi_jing_wei_du.split(",");
         ss = gcj02towgs84(ss[0], ss[1]);
-
         var LngLats = new T.Marker(new T.LngLat(ss[0], ss[1]), {
           icon: icons,
         });
@@ -416,8 +495,10 @@ const addClickHandls = (e) => {
   });
 };
 onMounted(() => {
+  setTimeout(() => {
     init();
     columnList();
+  }, 600);
 });
 const columnList = (e) => {
   http.get(`/srv/platform/map/columnList`).then((res) => {
@@ -495,7 +576,7 @@ const getlists = () => {
     });
 };
 </script>
-<style scoped lang='scss'>
+<style scoped lang="scss">
 .home_body {
   position: relative;
 }

vite.config.js

@@ -12,12 +12,16 @@ export default defineConfig({
     proxy: {
       "/generate": {
         // target: "http://192.168.2.86:8003",
-        target: "https://aiai.cityme.com.cn",
+        // target: "https://aiai.cityme.com.cn",
+        target: "https://yx.cityme.com.cn/",
+
         changeOrigin: true,
         // rewrite: (path) => path.replace(/\/test/, ""), //重写真实路径,替换/api
       },
       '/srv': {
-        target: 'http://36.140.118.172:88',//沈涛
+        // target: "https://aiai.cityme.com.cn",
+        // target: 'http://36.140.118.172:88',//沈涛
+        target: "https://yx.cityme.com.cn/",
         changeOrigin: true,
       },