update

components/customLoading.vue

@@ -0,0 +1,70 @@
+<template>
+  <view class="custom-loading" v-if="visible">
+    <view class="centerContent">
+      <image class="loading-icon" src="/static/icon/logotransparent.png" />
+      <text class="loading-text">{{ text }}</text>
+    </view>
+  </view>
+</template>
+  
+  <script>
+export default {
+  props: {
+    visible: Boolean,
+    text: {
+      type: String,
+      default: "加载中...",
+    },
+  },
+};
+</script>
+  
+  <style>
+.custom-loading {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  /* background: rgba(0, 0, 0, 0.5); */
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 9999999;
+  width: 100vw;
+  height: 100vh;
+}
+.centerContent {
+  width: 100px;
+  height: 100px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  background: rgba(0, 0, 0, 0.5);
+  border-radius: 18rpx;
+  box-sizing: border-box;
+  padding: 16rpx;
+}
+.loading-icon {
+  width: 50px;
+  height: 50px;
+  animation: spinZ 3s linear infinite; /* 添加旋转动画 */
+}
+@keyframes spinZ {
+  0% {
+    transform: rotateY(0deg); /* 从 0 度开始 */
+  }
+  50% {
+    transform: rotateY(180deg); /* 旋转到 360 度 */
+  }
+  100% {
+    transform: rotateY(0deg); /* 旋转到 360 度 */
+  }
+}
+.loading-text {
+  color: white;
+  margin-top: 10px;
+  font-size: 28rpx;
+}
+</style>

main.js

@@ -7,7 +7,11 @@ import MyMoment from './utils/moment'
 // #ifndef VUE3
 import Vue from 'vue'
 import './uni.promisify.adaptor'
+import customLoading from './components/customLoading.vue'
 
+const loading = new Vue({
+  render: h => h(customLoading)
+}).$mount();
 Vue.config.productionTip = false
 App.mpType = 'app'
 const app = new Vue({
@@ -16,6 +20,16 @@ const app = new Vue({
   utils,
   ...App
 })
+Vue.prototype.$showLoading = (text) => {
+  uni.$emit('showLoading', {
+    text
+  });
+};
+
+Vue.prototype.$hideLoading = () => {
+  uni.$emit('hideLoading');
+};
+
 Vue.prototype.$api = api;
 Vue.prototype.$testApi = testApi;
 Vue.prototype.$utils = utils;

manifest.json

@@ -2,8 +2,8 @@
     "name" : "皖美驿站",
     "appid" : "__UNI__F870657",
     "description" : "",
-    "versionName": "1.0.2",
-    "versionCode": 102,
+    "versionName" : "1.0.3",
+    "versionCode" : 103,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -77,12 +77,7 @@
                 },
                 "appstore" : "static/icons/logo.png",
                 "swiftSupport" : true,
-                "plugins": {
-                    "DummySwift": {
-                        "type": "native",
-                        "provider": "self"
-                    }
-                }
+                "embedSwift" : true
             },
             /* SDK配置 */
             "sdkConfigs" : {

pages/home/index.vue

@@ -1,8 +1,5 @@
 <template>
-  <page-meta
-    class="main"
-    :style="{ background: pageStyle === 1 ? '' : ' #F5F7F9' }"
-  >
+  <div class="main" :style="{ background: pageStyle === 1 ? '' : ' #F5F7F9' }">
     <div
       v-if="loginType === 'min'"
       :class="pageStyle === 1 ? 'topBox' : 'topBox newTopBox'"
@@ -515,12 +512,14 @@
       </div>
     </div>
     <tabbar :page="'/pages/home/index'" />
-  </page-meta>
+    <CustomLoading :visible="isLoading" text="加载中..." />
+  </div>
 </template>
 <script>
 import { mapGetters, mapMutations } from "vuex";
 import tabbar from "../../components/tabbar.vue";
 import ChargeBox from "../../components/chargeBox.vue";
+import CustomLoading from "../../components/customLoading.vue";
 
 import {
   handleHavePointInApp,
@@ -528,7 +527,7 @@ import {
 } from "../../utils/publicMethods";
 
 export default {
-  components: { tabbar, ChargeBox },
+  components: { tabbar, ChargeBox, CustomLoading },
   data() {
     return {
       statusBarHeight: {},
@@ -733,6 +732,7 @@ export default {
           oldPrice: "299",
         },
       ],
+      isLoading: false,
     };
   },
   computed: {

pages/scanCodeCharge/mapIndex.vue

@@ -183,6 +183,9 @@
           <view class="scanIconBox" @click="handleScan">
             <!-- <image class="scanIcon" src="/static/tabs/scanCode.svg" /> -->
             <image class="scanIcon" src="/static/home/scanCodeIcon.svg" />
+            <view class="scanBox">
+              <view class="line"></view>
+            </view>
           </view>
         </movable-view>
 
@@ -282,36 +285,45 @@ export default {
       this.handleAddServiceMarkers();
     }
     let nearService = uni.getStorageSync("nearService");
-    if (nearService) {
+    let seatInfo = uni.getStorageSync("seatInfo");
+    if (seatInfo) {
+      let res = JSON.parse(seatInfo);
       this.seatInfo = {
-        longitude: nearService.SERVERPART_X,
-        latitude: nearService.SERVERPART_Y,
+        longitude: res.longitude,
+        latitude: res.latitude,
       };
       this.longitude = this.seatInfo.longitude;
       this.latitude = this.seatInfo.latitude;
       // this.longitude = 116.894166;
       // this.latitude = 31.920213;
-      this.currentServiceObj = nearService;
-      this.currentServiceList = [nearService.SERVERPART_NAME];
+
       // this.currentServiceList = ["新桥服务区"];
       // 全部服务区的名称
       this.handleGetServiceNameList();
     }
+    if (nearService) {
+      this.currentServiceObj = nearService;
+      this.currentServiceList = [nearService.SERVERPART_NAME];
+    }
   },
   methods: {
     // 显示自己的定位
     handleShowLocal() {
       let seatInfo = uni.getStorageSync("seatInfo");
       if (seatInfo) {
-        let res = JSON.parse(seatInfo)
+        let res = JSON.parse(seatInfo);
         this.seatInfo = {
           longitude: res.longitude,
           latitude: res.latitude,
         };
         this.longitude = this.seatInfo.longitude;
         this.latitude = this.seatInfo.latitude;
-        console.log("this.latitude", this.latitude);
-        console.log("this.longitude", this.longitude);
+
+
+        uni.createMapContext("myMap", this).moveToLocation({
+          longitude: this.longitude,
+          latitude: this.latitude,
+        });
       }
       this.$forceUpdate();
     },
@@ -881,9 +893,39 @@ export default {
         display: flex;
         justify-content: center;
         align-items: center;
+        position: relative;
         .scanIcon {
-          width: 60rpx;
-          height: 60rpx;
+          width: 80rpx;
+          height: 80rpx;
+        }
+        .scanBox {
+          position: absolute;
+          width: 40rpx;
+          height: 40rpx;
+          top: 50%;
+          left: 50%;
+          transform: translate(-50%, -50%);
+          background: #ba922f;
+          overflow: hidden;
+          .line {
+            position: absolute;
+            width: 37rpx;
+            height: 4rpx;
+            background: #fff;
+            animation: moveUpDown 2s linear infinite;
+          }
+
+          @keyframes moveUpDown {
+            0% {
+              top: 8rpx;
+            }
+            50% {
+              top: calc(100% - 12rpx); /* 40rpx(容器高度) - 4rpx(线条高度) */
+            }
+            100% {
+              top: 8rpx;
+            }
+          }
         }
       }
     }

pages/serviceDetail/index.vue

@@ -1229,10 +1229,10 @@ export default {
     // 预览新的图片
     handleShowImg(index, imgList) {
       console.log("imgList", imgList);
-      let list = []
+      let list = [];
       imgList.forEach((item) => {
-        list.push(item.src)
-      })
+        list.push(item.src);
+      });
 
       uni.previewImage({
         urls: list,
@@ -1470,9 +1470,12 @@ export default {
       console.log("configObj", configObj);
 
       obj.configList = configList;
+      console.log("configList", configList);
       obj.configObj = configObj;
       obj.sumDetail = sumObj;
+      if (configList && configList.length > 0) {
         this.thirdTab = configList[0].key;
+      }
       this.detailInfo = obj;
       console.log("this.detailInfo", this.detailInfo);
       // let sortName = this.detailInfo.SERVERPART_NAME.split("服务区")[0];
@@ -1481,8 +1484,77 @@ export default {
       //   this.handleGetChargeData(sortName);
       // }
 
+      // 拿到油价的数据
+      this.handleGetOilData();
+
       uni.hideLoading();
     },
+    // 拿到油价数据
+    async handleGetOilData() {
+      const tokenData = await new Promise((resolve, reject) => {
+        uni.request({
+          url: `https://wmgs.anhui-expressway.net/token/generate?client=4d1cf0d1-3bfc-4c91-b9ac-3a3f4ce7a4b5&secret=fEoBj6DFSKmz2fjgIauQkg`,
+          method: "GET",
+          success(res) {
+            resolve(res);
+          },
+        });
+      });
+      let token = tokenData.data.data;
+
+      // 拿服务区数据 知道服务区id对应的服务区名称
+      const serviceData = await new Promise((resolve, reject) => {
+        uni.request({
+          url: `https://wmgs.anhui-expressway.net/api/ydcx/v1/v1/jt/share/ext_service_areas`,
+          method: "GET",
+          data: {
+            pageSize: 999,
+            pageNum: 1,
+            beginDate: "2000-01-01",
+            endDate: "2025-03-20",
+          },
+          header: {
+            Authorization: `Bearer ${token}`,
+            "content-type": "application/x-www-form-urlencoded",
+          },
+          success(res) {
+            resolve(res);
+          },
+        });
+      });
+      let serviceList = serviceData.data.data.records;
+      console.log("serviceList", serviceList);
+      // 从他们的服务区列表中 找到我们当前的服务区 并拿到他们对应的服务区id 之后 再去查数据
+      let currentObj = {};
+      if (serviceList && serviceList.length > 0) {
+        serviceList.forEach((item) => {
+          if (item.name === this.detailInfo.SERVERPART_NAME) {
+            currentObj = item;
+          }
+        });
+      }
+
+      console.log("currentObj", currentObj);
+
+      const oilres = await new Promise((resolve, reject) => {
+        uni.request({
+          url: `https://wmgs.anhui-expressway.net/api/ydcx/v1/service-area/oil/price`,
+          method: "GET",
+          data: {
+            areaId: currentObj.id,
+          },
+          header: {
+            Authorization: `Bearer ${token}`,
+            "content-type": "application/x-www-form-urlencoded",
+          },
+          success(res) {
+            resolve(res);
+          },
+        });
+      });
+      let oliData = oilres.data.data;
+      console.log("oliData", oliData);
+    },
     // 生成随机数
     handleGetRandomData(max, min) {
       return Math.floor(Math.random() * (max - min + 1)) + min;

static/home/scanCodeIcon.svg

@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1744682469403" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6196" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M928 544 96 544c-17.664 0-32-14.336-32-32s14.336-32 32-32l832 0c17.696 0 32 14.336 32 32S945.696 544 928 544zM832 928l-192 0c-17.696 0-32-14.304-32-32s14.304-32 32-32l192 0c17.664 0 32-14.336 32-32l0-160c0-17.696 14.304-32 32-32s32 14.304 32 32l0 160C928 884.928 884.928 928 832 928zM352 928 192 928c-52.928 0-96-43.072-96-96l0-160c0-17.696 14.336-32 32-32s32 14.304 32 32l0 160c0 17.664 14.368 32 32 32l160 0c17.664 0 32 14.304 32 32S369.664 928 352 928zM128 384c-17.664 0-32-14.336-32-32L96 192c0-52.928 43.072-96 96-96l160 0c17.664 0 32 14.336 32 32s-14.336 32-32 32L192 160C174.368 160 160 174.368 160 192l0 160C160 369.664 145.664 384 128 384zM896 384c-17.696 0-32-14.336-32-32L864 192c0-17.632-14.336-32-32-32l-192 0c-17.696 0-32-14.336-32-32s14.304-32 32-32l192 0c52.928 0 96 43.072 96 96l0 160C928 369.664 913.696 384 896 384z" fill="#ffffff" p-id="6197"></path></svg>
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1744794198750" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2601" data-spm-anchor-id="a313x.search_index.0.i1.d39c3a81QDGkWR" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M223.163733 336.964267a26.282667 26.282667 0 0 1-52.497066 0V266.922667A96.256 96.256 0 0 1 266.922667 170.666667h70.0416a26.282667 26.282667 0 0 1 0 52.497066H266.922667c-24.200533 0-43.793067 19.592533-43.793067 43.793067v69.973333z m577.672534 0V266.922667c0-24.200533-19.592533-43.793067-43.793067-43.793067h-69.973333a26.282667 26.282667 0 0 1 0-52.497067h69.973333A96.256 96.256 0 0 1 853.333333 266.922667v70.0416a26.282667 26.282667 0 1 1-52.497066 0zM223.163733 687.035733v70.007467c0 24.200533 19.592533 43.793067 43.793067 43.793067h69.973333a26.282667 26.282667 0 1 1 0 52.497066h-69.973333A96.256 96.256 0 0 1 170.666667 757.077333v-70.0416a26.282667 26.282667 0 0 1 52.497066 0z m577.672534 0a26.282667 26.282667 0 1 1 52.497066 0v70.007467A96.256 96.256 0 0 1 757.077333 853.333333h-70.0416a26.282667 26.282667 0 0 1 0-52.497066h70.007467c24.200533 0 43.793067-19.592533 43.793067-43.793067v-69.973333zM301.943467 555.758933a26.282667 26.282667 0 0 1 0-52.497066h420.113066a26.282667 26.282667 0 0 1 0 52.497066H301.943467z" fill="#ffffff" p-id="2602" data-spm-anchor-id="a313x.search_index.0.i0.d39c3a81QDGkWR" class="selected"></path></svg>

unpackage/cache/appleConfig.ini

@@ -17,4 +17,14 @@ universalLinks_weibo=
 spaceid_weibo=
 
 [appstore]
-appstore=
+appstore=4b74d8cd44b86b38e3d035ada7fcb842
+
+[iphone]
+app%402x=676527d29327b7762023c75e6adf667c
+app%403x=bc8254ae003ec8b0c37fa225d4e14569
+notification%402x=061245a2289be07ce8a51dffb01a7181
+notification%403x=d4d670abcacd2cf08f42084b2c3d6502
+settings%402x=a94cc4edaa92be65eeaf17f723236bbd
+settings%403x=d43d0d5c8decfa4050c14235c688507c
+spotlight%402x=a4e5dc30282073422094f3d0b8abd679
+spotlight%403x=676527d29327b7762023c75e6adf667c

unpackage/cache/wgt/__UNI__F870657/static/images/discovery/noImg.svg

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>服务区/地址备份_2@2x</title>
-    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.699999988">
-        <g id="服务区信息" transform="translate(-124.000000, -2015.000000)">
-            <g id="image-fill" transform="translate(124.000000, 2015.000000)">
-                <polygon id="路径" points="0 0 16 0 16 16 0 16"></polygon>
-                <path d="M13.3333333,3.33333333 L2.66666667,3.33333333 L2.66666667,12.6666667 L8.86133333,6.47066667 C9.12166657,6.21041204 9.54366677,6.21041204 9.804,6.47066667 L13.3333333,10.0066667 L13.3333333,3.33333333 Z M1.33333333,2.662 C1.33587188,2.2977037 1.63037311,2.0029056 1.99466667,2 L14.0053333,2 C14.3706667,2 14.6666667,2.29666667 14.6666667,2.662 L14.6666667,13.338 C14.6641281,13.7022963 14.3696269,13.9970944 14.0053333,14 L1.99466667,14 C1.62931454,13.9996321 1.33333333,13.7033523 1.33333333,13.338 L1.33333333,2.662 Z M5.33333333,7.33333333 C4.59695367,7.33333333 4,6.73637967 4,6 C4,5.26362033 4.59695367,4.66666667 5.33333333,4.66666667 C6.069713,4.66666667 6.66666667,5.26362033 6.66666667,6 C6.66666667,6.73637967 6.069713,7.33333333 5.33333333,7.33333333 Z" id="形状" fill="#FFFFFF" fill-rule="nonzero"></path>
-            </g>
-        </g>
-    </g>
-</svg>

unpackage/cache/wgt/__UNI__F870657/static/images/home/Charging.svg

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>服务区图标/花洒_2@2x</title>
-    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="切图汇总" transform="translate(-436.000000, -318.000000)">
-            <g id="服务区图标/花洒" transform="translate(436.000000, 318.000000)">
-                <rect id="矩形" x="0" y="0" width="20" height="20"></rect>
-                <g id="编组" transform="translate(1.250000, 2.812500)">
-                    <rect id="矩形" stroke="#BA922F" stroke-width="1.25" x="1.875" y="0.625" width="7.5" height="13.125"></rect>
-                    <rect id="矩形" fill="#BA922F" fill-rule="nonzero" x="0" y="13.125" width="11.25" height="1.25"></rect>
-                    <path d="M16.25,0 L16.25,11.875 C16.25,12.9105339 15.4105339,13.75 14.375,13.75 C13.3394661,13.75 12.5,12.9105339 12.5,11.875 L12.5,8.75 C12.5,8.05964406 11.9403559,7.5 11.25,7.5 L9.375,7.5 L9.375,7.5" id="路径" stroke="#BA922F" stroke-width="1.25"></path>
-                    <rect id="矩形" fill="#BA922F" fill-rule="nonzero" x="15" y="3.125" width="2.5" height="3.75"></rect>
-                    <polygon id="路径" fill="#BA922F" fill-rule="nonzero" points="5.98214286 5.9375 8.125 5.9375 5.26785714 10.4375 5.26785714 7.4375 3.125 7.4375 5.98214286 2.9375"></polygon>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>