update

components/chargeBoxStyle.vue

@@ -396,7 +396,10 @@ export default {
             type: Boolean,
             default: false,
         },
-
+        comeForm: {
+            type: String,
+            default: "",
+        }
     },
     // #ifdef MP-WEIXIN
     onReady() {
@@ -463,6 +466,10 @@ export default {
         },
         // 打开对应的悬浮框
         handleOpenDetail(item) {
+            if (this.comeForm === 'scanCode') {
+                this.$emit("handleGetNowService", item)
+                return
+            }
             console.log('this.noChargeDetail', this.noChargeDetail);
 
             if (this.noChargeDetail) {
@@ -800,6 +807,10 @@ export default {
         },
         // 跳转地图服务区详情
         handleGoServiceDetail(id, obj) {
+            if (this.comeForm === 'scanCode') {
+                this.$emit("handleGetNowService", obj)
+                return
+            }
             if (this.pageType === "newMap") {
                 let res = this.handleChangeServiceInfo(obj);
 
@@ -825,6 +836,12 @@ export default {
         },
         // 选择的服务区详情
         handleGoDetail(id, obj) {
+            if (this.comeForm === 'scanCode') {
+                this.$emit("handleGetNowService", obj)
+                return
+            }
+
+
             if (this.pageType === "newMap") {
                 let res = this.handleChangeServiceInfo(obj);
                 uni.setStorageSync("currentService", res); // 当前选中服务区信息

manifest.json

@@ -2,8 +2,8 @@
     "name" : "驿佳",
     "appid" : "__UNI__F870657",
     "description" : "",
-    "versionName" : "1.0.33",
+    "versionName" : "1.0.34",
-    "versionCode" : 1033,
+    "versionCode" : 1034,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/scanCodeCharge/mapIndexAPP.vue

@@ -219,8 +219,8 @@
         <view class="pageBottomTop">
           <view class="leftSearchBox">
             <image class="searchIcon" src="https://eshangtech.com/wanmeiyizhanImg/app/chargeSearch.png" />
-            <input style="margin-left: 16rpx; font-size: 28rpx" placeholder="请输入服务区" v-model="searchText"
+            <input style="margin-left: 16rpx; font-size: 28rpx;width: calc(100%  - 44rpx);" placeholder="请输入服务区"
-              @confirm="handleConfirm" />
+              v-model="searchText" @confirm="handleConfirm" />
           </view>
 
           <view class="rightBox" @click="handleChangePageType">
@@ -290,8 +290,8 @@
       <view class="pageBottomTop">
         <view class="leftSearchBox">
           <image class="searchIcon" src="https://eshangtech.com/wanmeiyizhanImg/app/chargeSearch.png" />
-          <input style="margin-left: 16rpx; font-size: 28rpx" placeholder="请输入服务区" v-model="searchText"
+          <input style="margin-left: 16rpx; font-size: 28rpx;width: calc(100%  - 44rpx)" placeholder="请输入服务区"
-            @confirm="handleConfirm" />
+            v-model="searchText" @confirm="handleConfirm" />
         </view>
 
         <view class="rightBox" @click="handleChangePageType">
@@ -303,7 +303,8 @@
         <view v-if="showChargeList">
           <!-- <charge-box ref="chargeBoxRef" :serviceAreaList="allServiceNameList" :pageStyleType="1"
             :pageType="'mapList'" /> -->
-          <chargeBoxStyle :dataList="allDataList" :pageType="'mapList'" />
+          <chargeBoxStyle :dataList="allDataList" :pageType="'mapList'" :comeForm="'scanCode'"
+            @handleGetNowService="handleGetNowService" />
         </view>
       </scroll-view>
     </view>
@@ -406,6 +407,13 @@ export default {
     }),
   },
   methods: {
+    // 点击列表里面的服务区时 触发的方法
+    handleGetNowService(obj) {
+      console.log('objobjobjobj', obj);
+      this.searchText = obj.SERVERPART_NAME
+      this.handleChangePageType()
+      this.handleConfirm()
+    },
     extractDirection(stationName) {
       if (!stationName) return '';
       // 定义方向匹配的正则表达式（按优先级排序）
@@ -1183,7 +1191,6 @@ export default {
       this.allDataList = this.allDataList.concat(list)
       console.log('djasijdaskjdaslkdj', this.allDataList);
     },
-
     handleChangeShow(e) {
       this.showMap = !e
       this.$forceUpdate();
@@ -2331,7 +2338,7 @@ export default {
         .funItemText {
           font-family: Source Han Sans SC, Source Han Sans SC;
           font-weight: 400;
-          font-size: 26rpx;
+          font-size: 28rpx;
           color: #FFFFFF;
           text-align: left;
           font-style: normal;

pages/scanCodeCharge/oilIndex.vue

@@ -1,15 +1,15 @@
 <template>
   <view class="main">
     <view :class="showListPage ? 'mapBox moveLeft' : 'mapBox'" v-if="!showListPage">
-      <movable-area style="width: 100vw; height: 100vh">
+      <view style="width: 100vw; height: 100vh">
-        <map id="myMap" :longitude="longitude" :latitude="latitude" class="map" :scale="17" :show-location="true"
+        <map id="myMap" :longitude="longitude" :latitude="latitude" class="map" :show-location="true" :markers="markers"
-          :markers="markers" :enable-scroll="!isDragging" @markertap="handleClickMarker"></map>
+          @markertap="handleClickMarker"></map>
 
         <view class="topBox">
           <view class="topRight">
             <image class="searchIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/searchIcon.png" />
-            <input style="margin-left: 16rpx; font-size: 28rpx" placeholder="请输入服务区" v-model="searchText"
+            <input style="margin-left: 16rpx; font-size: 28rpx;width: calc(100% - 32rpx);" placeholder="请输入服务区"
-              @confirm="handleConfirm" />
+              v-model="searchText" @confirm="handleConfirm" />
             <!-- <span class="searchText">请输入服务区</span> -->
           </view>
 
@@ -94,7 +94,7 @@
             </view>
           </view>
         </view>
-      </movable-area>
+      </view>
     </view>
 
     <view :class="showListPage ? 'listPage moveRight' : 'listPage '" v-if="showListPage">
@@ -102,7 +102,7 @@
       <view class="searchBox">
         <view class="topRight">
           <image class="searchIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/searchIcon.png" />
-          <input style="margin-left: 16rpx; font-size: 28rpx" placeholder="请输入服务区" v-model="searchText"
+          <input style="margin-left: 16rpx; font-size: 28rpx;width: calc(100% - 32rpx)" placeholder="请输入服务区" v-model="searchText"
             @confirm="handleConfirm" />
           <!-- <span class="searchText">请输入服务区</span> -->
         </view>
@@ -773,7 +773,8 @@ export default {
       justify-content: space-between;
 
       .topRight {
-        width: calc(100% - 240rpx);
+        // width: calc(100% - 240rpx); 
+        width: 100%;
         height: 72rpx;
         background: #fff;
         border-radius: 36rpx;
@@ -1170,7 +1171,8 @@ export default {
       justify-content: space-between;
 
       .topRight {
-        width: calc(100% - 240rpx);
+        // width: calc(100% - 240rpx);
+        width: 100%;
         height: 72rpx;
         background: #fff;
         border-radius: 36rpx;

pages/scanCodeCharge/travelNavigation.vue

@@ -11,9 +11,9 @@
                   startObj.name || ""
                 }}</view>
                 <view class="positionBox" v-if="startEndType !== 1">
-                  <textarea style="width: 100%;" placeholder="请输入目的地" auto-height placeholder-style="font-size: 30rpx"
+                  <input style="width: 100%;" placeholder="请输入目的地" auto-height placeholder-style="font-size: 30rpx"
                     v-model="searchPoint" confirm-type="search" @focus="handleEndPlaceFocus" @input="searchPOI"
-                    @confirm="handleConfirmToSearch"></textarea>
+                    @confirm="handleConfirmToSearch"></input>
                   <!-- @blur="handleEndPlaceBlur" -->
                   <!-- @confirm="searchPOI" -->
 
@@ -24,9 +24,9 @@
               <view class="itemLeftItem">
                 <view class="positionIcon endObj"></view>
                 <view class="positionBox noBorderBottom" v-if="startEndType === 1">
-                  <textarea style="width: 100%;" auto-height placeholder="请输入目的地" placeholder-style="font-size: 30rpx"
+                  <input style="width: 100%;" auto-height placeholder="请输入目的地" placeholder-style="font-size: 30rpx"
                     v-model="searchPoint" confirm-type="search" @focus="handleEndPlaceFocus" @input="searchPOI"
-                    @confirm="handleConfirmToSearch"></textarea>
+                    @confirm="handleConfirmToSearch"></input>
                   <!-- @blur="handleEndPlaceBlur" -->
                   <!-- @confirm="searchPOI" -->
 
@@ -35,9 +35,8 @@
                 <view class="positionBox noBorderBottom" v-if="startEndType !== 1">{{ endObj.name || "" }}</view>
               </view>
             </view>
-            <view class="itemRight">
+            <view class="itemRight" @click="handleChangeStartEnd">
-              <image class="reachIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/reachIcon.png"
+              <image class="reachIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/reachIcon.png" />
-                @click="handleChangeStartEnd" />
             </view>
           </view>
         </view>
@@ -733,9 +732,54 @@ export default {
           }
           _this.pointList = list;
           console.log("_this.pointList", _this.pointList);
+          let result = _this.getBestMatchFromPointList()
+          console.log("resresresres", result);
+
+          if (result && result.id) {
+            const idx = list.findIndex(item => item.id === result.id);
+            if (idx > 0) {
+              const [matchItem] = list.splice(idx, 1);
+              list.unshift(matchItem);
+            }
+          }
+          _this.pointList = list;
         },
       });
     },
+
+
+    getBestMatchFromPointList() {
+      if (!this.searchPoint || !this.pointList || this.pointList.length === 0) return null;
+      let bestItem = null;
+      let bestRatio = 0;
+
+      this.pointList.forEach(item => {
+        const label = item.label || item.name || '';
+        if (!label) return;
+        // 统计searchPoint中有多少字符在label中出现（顺序一致）
+        let matchCount = 0;
+        let labelIdx = 0;
+        for (let i = 0; i < this.searchPoint.length; i++) {
+          const char = this.searchPoint[i];
+          labelIdx = label.indexOf(char, labelIdx);
+          if (labelIdx !== -1) {
+            matchCount++;
+            labelIdx++; // 保证顺序
+          } else {
+            break;
+          }
+        }
+        // 只有全匹配才算
+        if (matchCount === this.searchPoint.length) {
+          const ratio = matchCount / label.length;
+          if (ratio > bestRatio) {
+            bestRatio = ratio;
+            bestItem = item;
+          }
+        }
+      });
+      return bestItem;
+    },
     // 点击高德搜索出来的 导航
     handleGoUsMap(obj) {
       console.log("obj", obj);
@@ -2165,6 +2209,10 @@ export default {
           }
 
           .itemRight {
+            width: 24rpx;
+            height: 130rpx;
+            display: flex;
+            align-items: center;
             margin-left: 6rpx;
 
             .reachIcon {

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -1119,8 +1119,8 @@ function populateParameters(result) {
   var parameters = {
     appId: "__UNI__F870657",
     appName: "驿佳",
-    appVersion: "1.0.33",
+    appVersion: "1.0.34",
-    appVersionCode: "1033",
+    appVersionCode: "1034",
     appLanguage: getAppLanguage(hostLanguage),
     uniCompileVersion: "4.45",
     uniCompilerVersion: "4.45",
@@ -1220,8 +1220,8 @@ var getAppBaseInfo = {
     result = sortObject(Object.assign(result, {
       appId: "__UNI__F870657",
       appName: "驿佳",
-      appVersion: "1.0.33",
+      appVersion: "1.0.34",
-      appVersionCode: "1033",
+      appVersionCode: "1034",
       appLanguage: getAppLanguage(hostLanguage),
       hostVersion: version,
       hostLanguage: hostLanguage,

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

@@ -435,6 +435,7 @@ var _default = {
         });
       } else {
         var seatInfo = uni.getStorageSync("seatInfo");
+        console.log('11111', obj);
         var req = {
           start: {
             coordinate: {
@@ -445,8 +446,8 @@ var _default = {
           },
           end: {
             coordinate: {
-              latitude: obj.latitude,
+              latitude: obj.SERVERPART_Y,
-              longitude: obj.longitude
+              longitude: obj.SERVERPART_X
             },
             name: obj.SERVERPART_NAME
           },