update

components/chargeBox.vue

@@ -496,10 +496,14 @@
 
           <view class="bottomItemNew" v-if="styleType === 2" @click.stop="handleOpenDetail(item)">
             <view class="leftCharge">
-              <image class="chargeIcon" src="https://eshangtech.com/minTestImg/stateGridIcon.png" />
+              <image class="chargeIcon" v-if="item.GWDetail && item.GWDetail.GWSum > 0"
-              <image class="chargeIcon" src="https://eshangtech.com/minTestImg/LXIcon.png" />
+                src="https://eshangtech.com/minTestImg/stateGridIcon.png" />
-              <image class="chargeIcon" src="https://eshangtech.com/minTestImg/WLIcon.png" />
+              <image class="chargeIcon" v-if="item.LXDetail && item.LXDetail.LXSum > 0"
-              <image class="chargeIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/sunIcon.svg" />
+                src="https://eshangtech.com/minTestImg/LXIcon.png" />
+              <image class="chargeIcon" v-if="item.WLDetail && item.WLDetail.WLSum > 0"
+                src="https://eshangtech.com/minTestImg/WLIcon.png" />
+              <image class="chargeIcon" v-if="item.JKDetail && item.JKDetail.JKSum > 0"
+                src="https://eshangtech.com/wanmeiyizhanImg/home/sunIcon.svg" />
             </view>
             <view class="rightcharge">
               <span class="empty">空</span>
@@ -847,6 +851,7 @@ export default {
   // 更新内容的时候 看好 有两版内容 样式需要改两个地方 暂时这样 后续可以变为一个
   // #ifdef MP-WEIXIN
   onReady() {
+
     let SERVERPART_TARGET = uni.getStorageSync("SERVERPART_TARGET");
     if (SERVERPART_TARGET) {
       this.SERVERPART_TARGETOBJ = JSON.parse(SERVERPART_TARGET);
@@ -1860,6 +1865,10 @@ export default {
               });
             }
           }
+
+          console.log('thisServiceResthisServiceResthisServiceRes', LXData);
+
+
           // 空多少个
           let LXEmpty = 0;
           // 一共多少个
@@ -2027,6 +2036,9 @@ export default {
             }
           }
 
+          console.log('thisServiceResthisServiceResthisServiceRes', WLData);
+
+
           // 空多少个
           let WLEmpty = 0;
           // 一共多少个
@@ -2099,13 +2111,46 @@ export default {
     },
     extractDirection(stationName) {
       if (!stationName) return '';
-      // 方法1：使用正则表达式匹配括号内的方向信息
+
-      const directionRegex = /（([^）]+方向)）|\(([^)]+方向)\)/;
+      // 定义方向匹配的正则表达式
-      const match = stationName.match(directionRegex);
+      const directionPatterns = [
+        /(?:（|\(|【)([^）\)】]*方向)(?:\)|）|】)/,  // 匹配括号内的方向
+        /([^，,。.;;！!?？、\s]+方向)/,           // 匹配无括号的方向
+        /方向([^，,。.;;！!?？、\s]+)/              // 匹配"方向XX"格式
+      ];
+
+      for (const pattern of directionPatterns) {
+        const match = stationName.match(pattern);
         if (match) {
-        // 返回第一个非空的匹配组（兼容中文和英文括号）
+          // 提取最核心的方向信息（去掉前后可能的多余字符）
-        return match[1] || match[2] || '';
+          const direction = match[1] || match[0];
+          return direction.replace(/^[（\(【]|[）\)】]$/g, '').trim();
         }
+      }
+
+      return '';
+
+
+      // if (!stationName) return '';
+      // const bracketMatch = stationName.match(/(?:（|\().*?方向(?:\)|）)/);
+      // if (bracketMatch) {
+      //   return bracketMatch[0];
+      // }
+
+      // const plainMatch = stationName.match(/.*?方向/);
+      // if (plainMatch) {
+      //   return plainMatch[0];
+      // }
+      // return '';
+
+      // if (!stationName) return '';
+      // // 方法1：使用正则表达式匹配括号内的方向信息
+      // const directionRegex = /（([^）]+方向)）|\(([^)]+方向)\)/;
+      // const match = stationName.match(directionRegex);
+      // if (match) {
+      //   // 返回第一个非空的匹配组（兼容中文和英文括号）
+      //   return match[1] || match[2] || '';
+      // }
     },
     // 随机给充电桩数据
     handleHaveRandomData() {
@@ -2827,6 +2872,7 @@ export default {
       let electricityFeeObj = {}
       if (obj.LXInfoList && obj.LXInfoList.length > 0) {
 
+        console.log('obj.LXInfoList.LXInfoList.LXInfoList', obj.LXInfoList);
         let directionList = {}
         let directionTypeList = []
         let electricityFeeStr = ''
@@ -2887,6 +2933,7 @@ export default {
       }
 
       if (obj.WLInfoList && obj.WLInfoList.length > 0) {
+        console.log('obj.WLInfoListobj.WLInfoListobj.WLInfoList', obj.WLInfoList);
 
         let directionList = {}
         let directionTypeList = []
@@ -3134,6 +3181,8 @@ export default {
       this.selectElectricityFee = this.electricityFeeRes[list[0].label] || []
 
       this.pageDirection = pageDirection
+      console.log('this.pageDirectionthis.pageDirectionthis.pageDirection', this.pageDirection);
+
       this.$emit("handleChangeShow", true);
       this.$refs.popup.open("bottom");
       this.isShow = true;
@@ -3174,7 +3223,7 @@ export default {
         this.selectElectricityFee = this.electricityFeeRes['蔚来'] || []
       }
 
-
+      this.selectSmallTab = 0
     },
 
     handleChangeSmallTab(value) {

components/chargeBoxStyle.vue

@@ -99,10 +99,14 @@
 
                     <view class="bottomItemNew" @click.stop="handleOpenDetail(item)">
                         <view class="leftCharge">
-                            <image class="chargeIcon" src="https://eshangtech.com/minTestImg/stateGridIcon.png" />
+                            <image class="chargeIcon" v-if="item.GWDetail && item.GWDetail.GWSum > 0"
-                            <image class="chargeIcon" src="https://eshangtech.com/minTestImg/LXIcon.png" />
+                                src="https://eshangtech.com/minTestImg/stateGridIcon.png" />
-                            <image class="chargeIcon" src="https://eshangtech.com/minTestImg/WLIcon.png" />
+                            <image class="chargeIcon" v-if="item.LXDetail && item.LXDetail.LXSum > 0"
-                            <image class="chargeIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/sunIcon.svg" />
+                                src="https://eshangtech.com/minTestImg/LXIcon.png" />
+                            <image class="chargeIcon" v-if="item.WLDetail && item.WLDetail.WLSum > 0"
+                                src="https://eshangtech.com/minTestImg/WLIcon.png" />
+                            <image class="chargeIcon" v-if="item.JKDetail && item.JKDetail.JKSum > 0"
+                                src="https://eshangtech.com/wanmeiyizhanImg/home/sunIcon.svg" />
                         </view>
                         <view class="rightcharge">
                             <span class="empty">空</span>
@@ -459,9 +463,12 @@ export default {
         },
         // 打开对应的悬浮框
         handleOpenDetail(item) {
+            console.log('this.noChargeDetail', this.noChargeDetail);
+
             if (this.noChargeDetail) {
                 return
             }
+
             let obj = {}
             if (item) {
                 obj = item
@@ -823,7 +830,8 @@ export default {
                 uni.setStorageSync("currentService", res); // 当前选中服务区信息
 
                 if (this.comeForm === "home") {
-                    uni.navigateTo({ url: "/pages/serviceDetail/shopDetail/index" });
+                    // uni.navigateTo({ url: "/pages/serviceDetail/shopDetail/index" });
+                    uni.navigateTo({ url: "/pages/serviceDetail/index" });
                 } else {
                     uni.navigateBack({
                         delta: 1,

manifest.json

@@ -2,8 +2,8 @@
     "name" : "驿佳",
     "appid" : "__UNI__F870657",
     "description" : "",
-    "versionName" : "1.0.30",
+    "versionName" : "1.0.31",
-    "versionCode" : 1030,
+    "versionCode" : 1031,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/home/newIndex.vue

@@ -345,6 +345,10 @@ export default {
           label: "投诉建议", value: 8, id: "NewSuggestIcon", src: "/static/home/NewSuggestIcon.png",
           desc: "如果您对我们的服务有任何意见或建议，或者遇到了问题，请使用‘投诉建议’，直接向我们反馈，我们会认真倾听并改进！"
         },
+        // {
+        //   label: "投诉建议", value: 8, id: "NewSuggestIcon", src: "https://eshangtech.com/wanmeiyizhanImg/NewSuggestIcon.png",
+        //   desc: "如果您对我们的服务有任何意见或建议，或者遇到了问题，请使用‘投诉建议’，直接向我们反馈，我们会认真倾听并改进！"
+        // },
       ], // 可以跳转的功能列表
       tabList: [
         { label: "驿达推荐", desc: "推荐精选", value: 1 },
@@ -987,7 +991,8 @@ export default {
       if (obj.value === 1) {
         // 扫码充电
         if (this.loginType === "min") {
-          uni.navigateTo({ url: "/pages/scanCodeCharge/mapIndex" });
+          // uni.navigateTo({ url: "/pages/scanCodeCharge/mapIndex" });
+          uni.navigateTo({ url: "/pages/scanCodeCharge/mapIndexAPP" });
         } else {
           uni.navigateTo({ url: "/pages/scanCodeCharge/mapIndexAPP" });
         }

pages/scanCodeCharge/components/chargeBox.vue

@@ -1482,6 +1482,7 @@ export default {
       } else {
         this.chargeDetailList = [];
       }
+      this.selectSmallTab = 0
     },
   },
 };

pages/scanCodeCharge/mapIndexAPP.vue

@@ -15,12 +15,12 @@
         </view>
       </view> -->
 
-      <view style="width: 100vw; height: calc(100vh - 606rpx);position: relative;" v-show="showMap">
+      <cover-view v-if="loginType !== 'min'" style="width: 100vw; height: calc(100vh - 606rpx);position: relative;"
+        v-show="showMap">
         <map id="myMap" :longitude="longitude" :latitude="latitude" class="map" :scale="17" :show-location="true"
           :markers="markers" :enable-scroll="!isDragging" @markertap="handleClickMarker"></map>
-        <view v-if="false">
+
-          <cover-view class="statusBox" :style="{ left: showListPage ? '-2000px' : '' }" @tap="handleShowChargeDetail">
+        <cover-view class="statusBox" style="z-index: 9999;">
-            <cover-view>
           <!-- 国网 -->
           <cover-view class="statusItem" style="margin: 0 16rpx;">
             <cover-view class="colorBox" style="background-color: #ff9929"></cover-view>
@@ -104,10 +104,117 @@
             </cover-view>
           </cover-view>
         </cover-view>
+
       </cover-view>
+
+      <view v-else style="width: 100vw; height: calc(100vh - 606rpx);position: relative;" v-show="showMap">
+        <map id="myMap" :longitude="longitude" :latitude="latitude" class="map" :scale="17" :show-location="true"
+          :markers="markers" :enable-scroll="!isDragging" @markertap="handleClickMarker"></map>
+
+        <view class="statusBox" @click="handleShowChargeDetail">
+          <view>
+            <!-- 国网 -->
+            <view class="statusItem">
+              <!-- <image
+          class="statusIcon"
+          src="https://eshangtech.com/minTestImg/stateGridIcon.png"
+        /> -->
+              <view class="colorBox" style="background-color: #ff9929"></view>
+              <text class="brandCharge">国网</text>
+              <span class="empty">空</span>
+              <view class="valueBox">
+                <span class="emptyValue">{{
+                  chargeData && chargeData.GWDetail
+                    ? chargeData.GWDetail.GWEmpty
+                    : 0
+                }}
+                </span>
+                <span class="sum">/{{
+                  chargeData && chargeData.GWDetail
+                    ? chargeData.GWDetail.GWSum
+                    : 0
+                }}</span>
               </view>
             </view>
 
+            <!-- 理想 -->
+            <view class="statusItem">
+              <view class="colorBox" style="background-color: #d81e06"></view>
+              <!-- <image
+          class="statusIcon"
+          src="https://eshangtech.com/minTestImg/LXIcon.png"
+        /> -->
+              <text class="brandCharge">理想</text>
+              <span class="empty">空</span>
+              <view class="valueBox">
+                <span class="emptyValue">{{
+                  chargeData && chargeData.LXDetail
+                    ? chargeData.LXDetail.LXEmpty
+                    : 0
+                }}</span>
+                <span class="sum">/{{
+                  chargeData && chargeData.LXDetail
+                    ? chargeData.LXDetail.LXSum
+                    : 0
+                }}</span>
+              </view>
+            </view>
+
+            <!-- 蔚来 -->
+            <view class="statusItem">
+              <!-- <image
+          class="statusIcon"
+          src="https://eshangtech.com/minTestImg/WLIcon.png"
+        /> -->
+              <view class="colorBox" style="background-color: #f4ea2a"></view>
+              <text class="brandCharge">蔚来</text>
+              <span class="empty">空</span>
+              <view class="valueBox">
+                <span class="emptyValue">{{
+                  chargeData && chargeData.WLDetail
+                    ? chargeData.WLDetail.WLEmpty
+                      ? chargeData.WLDetail.WLEmpty
+                      : 0
+                    : 0
+                }}</span>
+                <span class="sum">/{{
+                  chargeData && chargeData.WLDetail
+                    ? chargeData.WLDetail.WLSum
+                      ? chargeData.WLDetail.WLSum
+                      : 0
+                    : 0
+                }}</span>
+              </view>
+            </view>
+
+            <!-- 交控 -->
+            <view class="statusItem">
+              <!-- <image
+          class="statusIcon"
+          src="https://eshangtech.com/wanmeiyizhanImg/home/sunIcon.svg"
+        /> -->
+              <view class="colorBox" style="background-color: #57d16e"></view>
+              <text class="brandCharge">交控新能源</text>
+              <span class="empty">空</span>
+              <view class="valueBox">
+                <span class="emptyValue">{{
+                  chargeData && chargeData.JKDetail
+                    ? chargeData.JKDetail.JKEmpty
+                    : 0
+                }}
+                </span>
+                <span class="sum">/{{
+                  chargeData && chargeData.JKDetail
+                    ? chargeData.JKDetail.JKSum
+                    : 0
+                }}</span>
+              </view>
+            </view>
+          </view>
+        </view>
+
+      </view>
+
       <view class="pageBottomStyle">
         <view class="pageBottomTop">
           <view class="leftSearchBox">
@@ -134,7 +241,8 @@
         </view>
 
         <view class="currentServiceBox">
-          <chargeBoxStyle :dataList="dataList" :pageType="'mapList'" :hideConfig="true" :noChargeDetail="true" />
+          <chargeBoxStyle :dataList="dataList" :pageType="'mapList'" :hideConfig="true"
+            :noChargeDetail="loginType !== 'min'" />
         </view>
       </view>
 
@@ -254,6 +362,9 @@ export default {
   },
   async onLoad() {
     let systemInfo = uni.getSystemInfoSync();
+    let type = uni.getStorageSync("loginType");
+    this.loginType = type;
+    console.log('this.loginType', this.loginType);
 
     // this.positionX = systemInfo.safeArea.width - 66;
 
@@ -297,13 +408,28 @@ export default {
   methods: {
     extractDirection(stationName) {
       if (!stationName) return '';
-      // 方法1：使用正则表达式匹配括号内的方向信息
+      // 定义方向匹配的正则表达式（按优先级排序）
-      const directionRegex = /（([^）]+方向)）|\(([^)]+方向)\)/;
+      const directionPatterns = [
-      const match = stationName.match(directionRegex);
+        /(?:（|\(|【)([^）\)】]*方向\d*)(?:\)|）|】)/,  // 匹配括号内的方向（可含数字）
+        /([^，,。.;;！!?？、\s]+方向\d*)/,            // 匹配无括号的方向（可含数字）
+        /方向([^，,。.;;！!?？、\s]+)/                 // 匹配"方向XX"格式
+      ];
+
+      for (const pattern of directionPatterns) {
+        const match = stationName.match(pattern);
         if (match) {
-        // 返回第一个非空的匹配组（兼容中文和英文括号）
+          // 提取最核心的方向信息
-        return match[1] || match[2] || '';
+          let direction = match[1] || match[0];
+          // 清理结果：去除括号和数字
+          direction = direction
+            .replace(/^[（\(【]|[）\)】]$/g, '')  // 去除括号
+            .replace(/\d+$/, '')                 // 去除末尾数字
+            .trim();
+          return direction;
         }
+      }
+
+      return '';
     },
     // 每次进入页面拿到一次繁忙度的数据
     async handleGetBusiness() {
@@ -537,7 +663,7 @@ export default {
       this.isLoading = false
       this.dataList = list
       console.log('djasijdaskjdaslkdj', this.dataList);
-
+      this.chargeData = list[0]
     },
     // 到充电数据
     async handleGetChargeData(serviceList, idList) {
@@ -2032,7 +2158,8 @@ export default {
         color: #ffffff;
         text-align: left;
         font-style: normal;
-        display: inline-block;
+        display: inline-flex;
+        align-items: center;
         background-color: #009DFF;
         padding: 6rpx 30rpx 10rpx 32rpx;
         border-radius: 32rpx;
@@ -2169,7 +2296,8 @@ export default {
         color: #ffffff;
         text-align: left;
         font-style: normal;
-        display: inline-block;
+        display: inline-flex;
+        align-items: center;
         background-color: #009DFF;
         padding: 6rpx 30rpx 10rpx 32rpx;
         border-radius: 32rpx;
@@ -2183,7 +2311,7 @@ export default {
       margin-top: 20rpx;
 
       .funItem {
-        height: 40rpx;
+        height: 50rpx;
         box-sizing: border-box;
         padding: 10rpx 16rpx;
         background-color: #009DFF;
@@ -2192,15 +2320,15 @@ export default {
         align-items: center;
 
         .funItemIcon {
-          width: 20rpx;
+          width: 28rpx;
-          height: 20rpx;
+          height: 28rpx;
           margin-right: 10rpx;
         }
 
         .funItemText {
           font-family: Source Han Sans SC, Source Han Sans SC;
           font-weight: 400;
-          font-size: 20rpx;
+          font-size: 26rpx;
           color: #FFFFFF;
           text-align: left;
           font-style: normal;

pages/scanCodeCharge/travelNavigation.vue

@@ -1992,13 +1992,33 @@ export default {
             },
             name: this.endObj.name,
           },
-          pageType: 1
+          pageType: 0
         }
 
+
+        // OneNavi.calculateDriveRoute({
+        //   start: [//起点
+        //     {
+        //       latitude: this.startObj.latitude,
+        //       longitude: this.startObj.longitude
+        //     }
+        //   ],
+        //   end: [//终点
+        //     {
+        //       latitude: this.endObj.latitude,
+        //       longitude: this.endObj.longitude
+        //     }
+        //   ],
+        //   strategy: 20//策略，取值0-20，参考https://lbs.amap.com/api/android-navi-sdk/guide/route-plan/drive-route-plan
+        // });
+
+
         OneNavi.showRoute(req, () => {
-          console.log('进去了');
+          // console.log('进去了');
 
         })
+
+
       }
 
 

pages/serviceDetail/index.vue

@@ -1166,7 +1166,7 @@ export default {
             },
             name: obj.SERVERPART_NAME,
           },
-          pageType: 1
+          pageType: 0
         }
 
         OneNavi.showRoute(req, () => {

unpackage/dist/dev/mp-weixin/pages/serviceDetail/index.js

@@ -450,7 +450,7 @@ var _default = {
             },
             name: obj.SERVERPART_NAME
           },
-          pageType: 1
+          pageType: 0
         };
         OneNavi.showRoute(req, function () {
           console.log('进去了');

unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -7,6 +7,13 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/scanCodeCharge/mapIndex",
+          "pathName": "pages/scanCodeCharge/mapIndex",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "pages/scanCodeCharge/mapIndexAPP",
           "pathName": "pages/scanCodeCharge/mapIndexAPP",