Merge remote-tracking branch 'origin/app' into app

# Conflicts:
#	h5/src/router/index.js

h5/src/views/heatMap/index.vue

@@ -20,11 +20,13 @@
       :min="1"
       v-model="sliderVal"
       @change="slideHandle"
-    />
+    >
+    </van-slider>
+    <div v-if="sliderVal" class="custom-button">{{ getSliderVal }}</div>
   </div>
 </template>
 <script setup>
-import { onMounted, watch, ref, nextTick } from "vue";
+import { onMounted, watch, ref, nextTick, computed } from "vue";
 import { useRoute } from "vue-router";
 import { Toast } from "vant";
 
@@ -34,6 +36,12 @@ let map = null; // 地图对象
 
 const $route = useRoute();
 
+const getSliderVal = computed(() => {
+  return timeLevel.value == "rt"
+    ? getTimeMin(sliderVal.value)
+    : Math.round(sliderVal.value) + "";
+});
+
 // 监听route参数
 // ?atoken='xxx'&mallId='xxx'
 const storeId = ref(""); // 店铺id

h5/vite.config.js

@@ -16,7 +16,7 @@ const loder_pxtovw = pxtovw({
 import path from "path";
 import copy from "rollup-plugin-copy";
 export default defineConfig({
-  base: "./",
+  base: "/appH5/",
   publicDir: "public",
   server: {
     host: true,