update

components/chargeBox.vue

@@ -747,13 +747,7 @@
             @click="handleChangeSelectPopup(item.value)"
           >
             {{ item.label }}
-            {{
+            {{ item.sum ? `(${item.sum})` : "" }}
-              chargeDetailList &&
-              chargeDetailList.length > 0 &&
-              item.value === selectPopup
-                ? `(${chargeDetailList.length})`
-                : ""
-            }}
           </div>
         </div>
 
@@ -975,10 +969,10 @@ export default {
       chargeDetailList: [], // 悬浮框里面的详情数据
       isShow: false,
       popupTab: [
-        { label: "理想", value: 1 },
+        { label: "理想", value: 1, sum: 0 },
-        { label: "蔚来", value: 2 },
+        { label: "蔚来", value: 2, sum: 0 },
-        { label: "交控新能源", value: 3 },
+        { label: "交控", value: 3, sum: 0 },
-        { label: "国网", value: 4 },
+        { label: "国网", value: 4, sum: 0 },
       ], // 点开的服务区有哪几种充电的
       selectPopup: 1,
       SERVERPART_TARGETOBJ: {},
@@ -1059,6 +1053,25 @@ export default {
     handleGetMore(obj) {
       obj.noMore = false;
     },
+    // 遍历去调用 理想的全部数据 并输出在一个list里面
+    async handleTraverseLXAllData(sum, token) {
+      // sum 为遍历次数
+      let res = [];
+      for (let i = 0; i < sum; i++) {
+        const data = await this.$testApi.$post("/send", {
+          url: "https://openapi.chehejia.com/lcp-inter-evio-service/evcs/v1/evio/query_stations_info",
+          data: JSON.stringify({
+            PageNo: 2 + i,
+            PageSize: 999,
+          }),
+          id: 0,
+          seq: `00${3 + i}`,
+          token: token,
+        });
+        res = res.concat(data.Data.StationInfos);
+      }
+      return res;
+    },
     // 解服务区的一个枚举
     async handleSERVERPART_TARGETOBJ() {
       let SERVERPART_TARGET = await this.$api.$get(
@@ -1242,14 +1255,6 @@ export default {
               subItem.imgList =
                 this.styleType === 1
                   ? [
-                      {
-                        url:
-                          HASPANTRY > 0 || HASWIFI > 0
-                            ? "https://eshangtech.com/minTestImg/WC.svg"
-                            : "https://eshangtech.com/minTestImg/noWC.svg",
-                        isShow: HASPANTRY > 0,
-                        title: "卫生间",
-                      },
                       {
                         url:
                           HASPANTRY > 0 || HASWIFI > 0
@@ -1258,14 +1263,6 @@ export default {
                         isShow: HASPANTRY > 0 || HASWIFI > 0,
                         title: "母婴室",
                       },
-                      // {
-                      //   url:
-                      //     HASSHOWERROOM > 0
-                      //       ? "https://eshangtech.com/minTestImg/HASSHOWERROOM.svg"
-                      //       : "https://eshangtech.com/minTestImg/noHASSHOWERROOM.svg",
-                      //   isShow: HASSHOWERROOM > 0,
-                      //   title: "淋浴房",
-                      // },
                       {
                         url:
                           HASPILOTLOUNGE > 0
@@ -1274,6 +1271,47 @@ export default {
                         isShow: HASPILOTLOUNGE > 0,
                         title: "司机之家",
                       },
+                      {
+                        url: HASCHILD
+                          ? "https://eshangtech.com/minTestImg/HASCHILD.svg"
+                          : "https://eshangtech.com/minTestImg/noHASCHILD.svg",
+                        isShow: SMALLPARKING,
+                        title: "车辆维修",
+                      },
+                      {
+                        url:
+                          DININGROOMCOUNT > 0
+                            ? "https://eshangtech.com/minTestImg/DININGROOMCOUNT.svg"
+                            : "https://eshangtech.com/minTestImg/noDININGROOMCOUNT.svg",
+                        isShow: DININGROOMCOUNT > 0,
+                        title: "餐饮",
+                      },
+                      {
+                        url:
+                          HASBACKGROUNDRADIO > 0
+                            ? "https://eshangtech.com/minTestImg/HASBACKGROUNDRADIO.svg"
+                            : "https://eshangtech.com/minTestImg/noHASBACKGROUNDRADIO.svg",
+                        isShow: HASBACKGROUNDRADIO > 0,
+                        title: "便利店",
+                      },
+                      {
+                        url:
+                          HASPANTRY > 0 || HASWIFI > 0
+                            ? "https://eshangtech.com/minTestImg/WC.svg"
+                            : "https://eshangtech.com/minTestImg/noWC.svg",
+                        isShow: HASPANTRY > 0,
+                        title: "卫生间",
+                      },
+
+                      // {
+                      //   url:
+                      //     HASSHOWERROOM > 0
+                      //       ? "https://eshangtech.com/minTestImg/HASSHOWERROOM.svg"
+                      //       : "https://eshangtech.com/minTestImg/noHASSHOWERROOM.svg",
+                      //   isShow: HASSHOWERROOM > 0,
+                      //   title: "淋浴房",
+                      // },
+
                       // {
                       //   url:
                       //     HASWATERROOM > 0
@@ -1323,29 +1361,7 @@ export default {
                           GACENERGYCHARGESum > 0,
                         title: "充电桩",
                       },
-                      {
+
-                        url:
-                          DININGROOMCOUNT > 0
-                            ? "https://eshangtech.com/minTestImg/DININGROOMCOUNT.svg"
-                            : "https://eshangtech.com/minTestImg/noDININGROOMCOUNT.svg",
-                        isShow: DININGROOMCOUNT > 0,
-                        title: "餐饮",
-                      },
-                      {
-                        url:
-                          HASBACKGROUNDRADIO > 0
-                            ? "https://eshangtech.com/minTestImg/HASBACKGROUNDRADIO.svg"
-                            : "https://eshangtech.com/minTestImg/noHASBACKGROUNDRADIO.svg",
-                        isShow: HASBACKGROUNDRADIO > 0,
-                        title: "便利店",
-                      },
-                      {
-                        url: HASCHILD
-                          ? "https://eshangtech.com/minTestImg/HASCHILD.svg"
-                          : "https://eshangtech.com/minTestImg/noHASCHILD.svg",
-                        isShow: SMALLPARKING,
-                        title: "车辆维修",
-                      },
                       {
                         url:
                           POINTCONTROLCOUNT > 0
@@ -1520,14 +1536,6 @@ export default {
                     ]
                   : this.styleType === 2
                   ? [
-                      {
-                        url:
-                          HASPANTRY > 0 || HASWIFI > 0
-                            ? "https://eshangtech.com/minTestImg/chargeImgNew/WC.svg"
-                            : "https://eshangtech.com/minTestImg/chargeImgNew/noWC.svg",
-                        isShow: HASPANTRY > 0,
-                        title: "卫生间",
-                      },
                       {
                         url:
                           HASPANTRY > 0 || HASWIFI > 0
@@ -1544,6 +1552,39 @@ export default {
                         isShow: HASPILOTLOUNGE > 0,
                         title: "司机之家",
                       },
+                      {
+                        url: HASCHILD
+                          ? "https://eshangtech.com/minTestImg/chargeImgNew/HASCHILD.svg"
+                          : "https://eshangtech.com/minTestImg/chargeImgNew/noHASCHILD.svg",
+                        isShow: SMALLPARKING,
+                        title: "车辆维修",
+                      },
+                      {
+                        url:
+                          DININGROOMCOUNT > 0
+                            ? "https://eshangtech.com/minTestImg/chargeImgNew/DININGROOMCOUNT.svg"
+                            : "https://eshangtech.com/minTestImg/chargeImgNew/noDININGROOMCOUNT.svg",
+                        isShow: DININGROOMCOUNT > 0,
+                        title: "餐饮",
+                      },
+                      {
+                        url:
+                          HASBACKGROUNDRADIO > 0
+                            ? "https://eshangtech.com/minTestImg/chargeImgNew/HASBACKGROUNDRADIO.svg"
+                            : "https://eshangtech.com/minTestImg/chargeImgNew/noHASBACKGROUNDRADIO.svg",
+                        isShow: HASBACKGROUNDRADIO > 0,
+                        title: "便利店",
+                      },
+
+                      {
+                        url:
+                          HASPANTRY > 0 || HASWIFI > 0
+                            ? "https://eshangtech.com/minTestImg/chargeImgNew/WC.svg"
+                            : "https://eshangtech.com/minTestImg/chargeImgNew/noWC.svg",
+                        isShow: HASPANTRY > 0,
+                        title: "卫生间",
+                      },
+
                       {
                         url:
                           SMALLPARKING > 0 ||
@@ -1585,29 +1626,7 @@ export default {
                           GACENERGYCHARGESum > 0,
                         title: "充电桩",
                       },
-                      {
+
-                        url:
-                          DININGROOMCOUNT > 0
-                            ? "https://eshangtech.com/minTestImg/chargeImgNew/DININGROOMCOUNT.svg"
-                            : "https://eshangtech.com/minTestImg/chargeImgNew/noDININGROOMCOUNT.svg",
-                        isShow: DININGROOMCOUNT > 0,
-                        title: "餐饮",
-                      },
-                      {
-                        url:
-                          HASBACKGROUNDRADIO > 0
-                            ? "https://eshangtech.com/minTestImg/chargeImgNew/HASBACKGROUNDRADIO.svg"
-                            : "https://eshangtech.com/minTestImg/chargeImgNew/noHASBACKGROUNDRADIO.svg",
-                        isShow: HASBACKGROUNDRADIO > 0,
-                        title: "便利店",
-                      },
-                      {
-                        url: HASCHILD
-                          ? "https://eshangtech.com/minTestImg/chargeImgNew/HASCHILD.svg"
-                          : "https://eshangtech.com/minTestImg/chargeImgNew/noHASCHILD.svg",
-                        isShow: SMALLPARKING,
-                        title: "车辆维修",
-                      },
                       {
                         url:
                           POINTCONTROLCOUNT > 0
@@ -1789,7 +1808,10 @@ export default {
         servicePart: list,
       };
       // _this.handleGetChargeData(list, ["新桥", "丰乐", "肥东"]);
-      _this.handleGetChargeData(list, nameList);
+      // 理想
+      await _this.handleGetChargeData(list, nameList);
+      // 交控
+      await _this.handleTrafficControlData(list, nameList);
 
       uni.hideLoading();
     },
@@ -1862,9 +1884,9 @@ export default {
     },
     // 拿到充电的理想数据
     async handleGetChargeData(serviceList, nameList) {
-      uni.showLoading({
+      // uni.showLoading({
-        title: "查询理想设备信息...",
+      //   title: "查询理想设备信息...",
-      });
+      // });
 
       const LiOperatorSecret = "bGMyYwJFl17BqwD3";
       const LiOperCode = "MA7EBGWBX";
@@ -1904,11 +1926,19 @@ export default {
         seq: "002",
         token: token,
       });
+      console.log("allStationList", allStationList);
       let stationList = allStationList.Data.StationInfos;
-      console.log("stationList", stationList);
+      // 判断 因为 理想的数据 是一页20个 20个的返回的 所以需要我们去遍历 拿到 他的全部数据
+      // 那么就需要 看看这次有多少页 然后遍历去拿
+      // 值为多少 就说明还要遍历  sum - 1次
+      let sum = allStationList.Data.PageCount;
+      let remainData = [];
+      if (sum > 1) {
+        remainData = await this.handleTraverseLXAllData(sum, token);
+        stationList = stationList.concat(remainData);
+      }
 
       let newStationList = [];
-
       if (stationList && stationList.length > 0) {
         stationList.forEach((item) => {
           if (item.Address) {
@@ -1945,7 +1975,7 @@ export default {
             StationIDs: stationIds,
           }),
           id: 0,
-          seq: "003",
+          seq: `00${sum + 2}`,
           token: token,
         });
         let statusList = stationInfo.Data.StationStatusInfos;
@@ -1970,8 +2000,8 @@ export default {
 
       console.log("haveStationList", haveStationList);
 
-      if (serviceList && serviceList.length > 0) {
+      if (this.detailObj.servicePart && this.detailObj.servicePart.length > 0) {
-        let newRes = JSON.parse(JSON.stringify(serviceList));
+        let newRes = JSON.parse(JSON.stringify(this.detailObj.servicePart));
         newRes.forEach((item) => {
           let LXCharge = [];
           let LXInfoList = [];
@@ -1998,12 +2028,11 @@ export default {
                 }
               }
             });
+
             // 空多少个
             let LXEmpty = 0;
             // 一共多少个
             let LXSum = 0;
-            console.log("LXEmpty", LXEmpty);
-            console.log("LXSum", LXSum);
 
             if (LXCharge && LXCharge.length > 0) {
               LXCharge.forEach((subItem) => {
@@ -2056,7 +2085,165 @@ export default {
         this.detailObj.servicePart = newRes;
         this.$forceUpdate();
       }
-      uni.hideLoading();
+      // uni.hideLoading();
+    },
+
+    // 拿到交控的充电数据
+    async handleTrafficControlData(list, nameList) {
+      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;
+      let serviceObj = {}; // 枚举值 value: label
+      if (serviceList && serviceList.length > 0) {
+        serviceList.forEach((item) => {
+          serviceObj[item.code] = item.name;
+        });
+      }
+
+      // 服务区充电桩数据
+      const chargData = await new Promise((resolve, reject) => {
+        uni.request({
+          url: `https://wmgs.anhui-expressway.net/api/ydcx/v1/service/evcharging/connector/list`,
+          method: "GET",
+          header: {
+            Authorization: `Bearer ${token}`,
+            "content-type": "application/x-www-form-urlencoded",
+          },
+          success(res) {
+            resolve(res);
+          },
+        });
+      });
+      let chargInfoList = chargData.data.data;
+      // chargInfoList 数据 没有服务区名称 根据服务区code 拼上名称
+      if (chargInfoList && chargInfoList.length > 0) {
+        chargInfoList.forEach((item) => {
+          item.serviceName =
+            item.serviceCode && serviceObj ? serviceObj[item.serviceCode] : "";
+        });
+      }
+      // 赋值了服务区名称之后的充电数据
+      // console.log("chargInfoList", chargInfoList);
+
+      // 拿到现在查询的这几个服务区数据
+      // console.log("nameList", nameList);
+      // 现在查询的几个服务区的数据
+      let nowServiceList = [];
+
+      if (chargInfoList && chargInfoList.length > 0) {
+        chargInfoList.forEach((item) => {
+          let name = item.serviceName.split("服务区")[0];
+          if (nameList.indexOf(name) !== -1) {
+            nowServiceList.push(item);
+          }
+        });
+      }
+
+      console.log("nowServiceListssss", nowServiceList);
+      // nowServiceListssss 就是当前查询的这几个服务区里面的 充电桩数据
+      // 接下来就是将它的数据 放到我们显示的数组里面
+      if (this.detailObj.servicePart && this.detailObj.servicePart.length > 0) {
+        let newRes = JSON.parse(JSON.stringify(this.detailObj.servicePart));
+        newRes.forEach((item) => {
+          let JKCharge = [];
+          let JKInfoList = [];
+          let sortName = item.SERVERPART_NAME.split("服务区")[0];
+
+          if (nowServiceList && nowServiceList.length > 0) {
+            nowServiceList.forEach((subItem) => {
+              if (subItem.serviceName.indexOf(sortName) !== -1) {
+                JKInfoList.push({
+                  ...subItem,
+                  Status: subItem.status,
+                  Power: subItem.power,
+                  ConnectorID: subItem.equipmentID,
+                  VoltageLowerLimits: subItem.voltage_lower_limits,
+                  VoltageUpperLimits: subItem.voltage_upper_limits,
+                  ConnectorType: subItem.connector_type,
+                  NationalStandard: subItem.national_standard,
+                });
+                JKCharge.push({
+                  Status: subItem.status,
+                  ConnectorId: subItem.connectorId,
+                });
+              }
+            });
+          }
+
+          // 空多少个
+          let JKEmpty = 0;
+          // 一共多少个
+          let JKSum = 0;
+
+          if (JKCharge && JKCharge.length > 0) {
+            JKCharge.forEach((subItem) => {
+              if (subItem.Status !== 3) {
+                JKEmpty += 1;
+              }
+              JKSum += 1;
+            });
+          }
+          item.JKDetail = {
+            JKSum: JKSum,
+            JKEmpty: JKEmpty,
+          };
+          if (this.styleType === 2) {
+            item.allChargeDetail = {
+              allSum:
+                Number(
+                  item.LXDetail && item.LXDetail.LXSum ? item.LXDetail.LXSum : 0
+                ) +
+                Number(item.WLDetail.WLSum || 0) +
+                Number(JKSum || 0) +
+                Number(item.chargeAndReplaceDetail.chargeAndReplaceSum || 0),
+              empty:
+                Number(
+                  item.LXDetail && item.LXDetail.LXEmpty
+                    ? item.LXDetail.LXEmpty
+                    : 0
+                ) +
+                Number(item.WLDetail.WLEmpty || 0) +
+                Number(JKEmpty || 0) +
+                Number(item.chargeAndReplaceDetail.WLEmpty || 0),
+            };
+          }
+          item.JKInfoList = JKInfoList;
+          item.JKCharge = JKCharge;
+        });
+
+        console.log("JKnewRes", newRes);
+        this.detailObj.servicePart = newRes;
+        this.$forceUpdate();
+      }
     },
     // 生成随机数
     handleGetRandomData(max, min) {
@@ -2091,6 +2278,28 @@ export default {
 
       this.nowCurrentObj = obj;
       this.chargeDetailList = obj.LXInfoList;
+
+      this.popupTab = [
+        {
+          label: "理想",
+          value: 1,
+          sum:
+            obj.LXInfoList && obj.LXInfoList.length > 0
+              ? obj.LXInfoList.length
+              : 0,
+        },
+        { label: "蔚来", value: 2, sum: 0 },
+        {
+          label: "交控",
+          value: 3,
+          sum:
+            obj.JKInfoList && obj.JKInfoList.length > 0
+              ? obj.JKInfoList.length
+              : 0,
+        },
+        { label: "国网", value: 4, sum: 0 },
+      ];
+
       console.log("this.chargeDetailList", this.chargeDetailList);
       this.$refs.popup.open("bottom");
       this.isShow = true;
@@ -2111,11 +2320,18 @@ export default {
     },
     handleChangeSelectPopup(value) {
       this.selectPopup = value;
+      console.log("value", value);
+      console.log("this.nowCurrentObj", this.nowCurrentObj);
       if (value === 1) {
+        // 理想
         this.chargeDetailList = this.nowCurrentObj.LXInfoList;
+      } else if (value === 3) {
+        // 交控
+        this.chargeDetailList = this.nowCurrentObj.JKInfoList;
       } else {
         this.chargeDetailList = [];
       }
+      console.log("this.chargeDetailList", this.chargeDetailList);
     },
   },
 };

pages/contact/addContact.vue

@@ -61,6 +61,7 @@
                   ? '请描述一下招领物品'
                   : ''
               "
+              :auto-height="true"
               style="font-size: 28rpx"
               placeholderStyle="font-size:28rpx;color: #B8B7B4;"
               v-model="shopName"

pages/contact/index.vue

@@ -181,18 +181,18 @@
               </view>
               <view>
                 <div class="timeBox">
-                  <span class="label">时间</span>
+                  <!-- <span class="label">时间</span> -->
                   {{ item.SUGGESTION_CREATEDATE || "-" }}
                 </div>
 
                 <div class="placeBox">
-                  <span class="label">{{
+                  <!-- <span class="label">{{
                     fintType === 1000 ? "丢失地点" : "捡拾地点"
-                  }}</span>
+                  }}</span> -->
                   {{ item.SERVERPART_NAME || "-" }}
                 </div>
                 <div class="phone">
-                  <span class="label">联系电话</span>
+                  <!-- <span class="label">联系电话</span> -->
                   {{ item.PHONE_NUMBER || "-" }}
                 </div>
               </view>
@@ -978,7 +978,7 @@ export default {
             font-weight: 400;
             font-size: 26rpx;
             color: #716f69;
-            line-height: 32rpx;
+            line-height: 38rpx;
             text-align: left;
             font-style: normal;
             .label {

pages/home/index.vue

@@ -16,7 +16,8 @@
             class="YDIcon"
             src="https://eshangtech.com/wanmeiyizhanImg/home/YDIcon.png"
           />
-          <span class="pageTitle">皖美驿站</span>
+          <!-- <span class="pageTitle">皖美驿站</span> -->
+          <span class="pageTitle">驿达</span>
         </div>
         <div class="topRight" @click="goSelectServer">
           <image
@@ -783,6 +784,21 @@ export default {
     }
     uni.stopPullDownRefresh();
   },
+  onShareAppMessage() {
+    // let _this = this;
+    return {
+      title: "皖美驿站",
+      path: "/pages/home/index",
+      // imageUrl: _this.good.DEFAULT_IMG,
+    };
+  },
+  onShareTimeline() {
+    return {
+      title: "皖美驿站",
+      path: "/pages/home/index",
+      // imageUrl: _this.good.DEFAULT_IMG,
+    };
+  },
   methods: {
     ...mapMutations({
       setArea: "setHomeServer",
@@ -1308,6 +1324,7 @@ export default {
       uni.getLocation({
         type: "gcj02",
         altitude: true,
+        isHighAccuracy: true,
         success: async (res) => {
           console.log("rewrwqerwq", res);
           let seatInfo = {

pages/home/oldIndex.vue

@@ -551,7 +551,7 @@ export default {
     },
     getLocalServer () { // 根据定位获取周边服务区
       let _this = this
-      wx.getFuzzyLocation({
+      wx.getLocation({
         type: 'gcj02',
         altitude: true,
         success: async (res) => {

pages/homeFn/mycar/index.vue

@@ -8,7 +8,10 @@
         </div>
         <div class="messageText">2、1个车牌号仅允许被1个账号绑定。</div>
       </div>
-      <image class="carLogo" src="https://eshangtech.com/wanmeiyizhanImg/home/carLogoBg.png" />
+      <image
+        class="carLogo"
+        src="https://eshangtech.com/wanmeiyizhanImg/home/carLogoBg.png"
+      />
     </div>
 
     <!-- 输入车牌号的框 -->
@@ -53,7 +56,10 @@
         <swiper scroll-x="true" class="banner">
           <swiper-item v-for="(item, o) in cards" :key="o" class="car-card">
             <div class="car-card">
-              <image src="https://eshangtech.com/wanmeiyizhanImg/car-card.png" mode="acspetFit" />
+              <image
+                src="https://eshangtech.com/wanmeiyizhanImg/car-card.png"
+                mode="acspetFit"
+              />
               <text class="card-title">{{ item.License_Plate }}</text>
             </div>
           </swiper-item>
@@ -89,7 +95,7 @@ export default {
       normalLen: 7,
       nowIndex: -1,
       isShow: false,
-      saveCarText: ["浙", "A", "", "", "", "", "", ""],
+      saveCarText: ["皖", "A", "", "", "", "", "", ""],
       newEnergy: true, // 是否是新能源
       haveCode: false, // 判断是否已经有了code
     };
@@ -284,7 +290,7 @@ export default {
             _this.saveCarText = code.split("");
             _this.haveCode = true;
           } else {
-            _this.saveCarText = ["浙", "A", "", "", "", "", "", ""];
+            _this.saveCarText = ["皖", "A", "", "", "", "", "", ""];
             _this.haveCode = false;
           }
           uni.hideLoading();

pages/newMap/index/index.vue

@@ -236,7 +236,7 @@ export default {
       this.seatInfo = JSON.parse(seatInfo);
     }
     let type = uni.getStorageSync("loginType");
-    // wx.getFuzzyLocation({
+    // wx.getLocation({
     //   type: 'gcj02',
     //   altitude: true,
     //   success: async (res) => {

pages/orders/order/index.vue

@@ -82,7 +82,7 @@
                 v-if="
                   item.COMMENT_STATE === 0 &&
                   item.SALEBILL_STATE !== 1010 &&
-                  item.SALEBILL_STATE > 3000
+                  item.SALEBILL_STATE >= 3000 && item.SALEBILL_STATE < 8000
                 "
               >
                 评价得积分
@@ -258,11 +258,15 @@ export default {
           value: 2,
         },
         {
-          label: "待收货",
+          label: "待制作",
+          value: 3,
+        },
+        {
+          label: "待取餐",
           value: 4,
         },
         {
-          label: "已完成",
+          label: "待评价",
           value: 5,
         },
       ],
@@ -288,15 +292,15 @@ export default {
       this.orderList = [];
       let type =
         this.selectTab === 1
-          ? ""
+          ? "1005,1010,2010,3000"
           : this.selectTab === 2
           ? "1005"
           : this.selectTab === 3
           ? "1010"
           : this.selectTab === 4
-          ? "2000"
+          ? "2010"
           : this.selectTab === 5
-          ? ""
+          ? "3000"
           : "";
       this.handleGetOrderList(type);
     },
@@ -456,19 +460,19 @@ export default {
   onLoad(query) {
     if (query.type) {
       this.searchType = query.type;
-      this.selectTab = Number(this.searchType);
+      this.selectTab = Number(this.searchType) 
     }
     let type =
       this.selectTab === 1
-        ? ""
+        ? "1005,1010,2010,3000"
         : this.selectTab === 2
         ? "1005"
         : this.selectTab === 3
         ? "1010"
         : this.selectTab === 4
-        ? "2000"
+        ? "2010"
         : this.selectTab === 5
-        ? ""
+        ? "3000"
         : "";
     // 获取订单数据
     this.handleGetOrderList(type);

pages/reservationOrder/index.vue

@@ -266,6 +266,21 @@ export default {
       this.handleGetShopList();
     }
   },
+  onShareAppMessage() {
+    // let _this = this;
+    return {
+      title: "点餐列表",
+      path: "/pages/reservationOrder/index",
+      // imageUrl: _this.good.DEFAULT_IMG,
+    };
+  },
+  onShareTimeline() {
+    return {
+      title: "点餐列表",
+      path: "/pages/reservationOrder/index",
+      // imageUrl: _this.good.DEFAULT_IMG,
+    };
+  },
   computed: {
     ...mapGetters({
       user: "user",

pages/scanCodeCharge/index.vue

@@ -5,6 +5,17 @@
       class="chargeList"
       :style="{ height: `calc(100vh - 60px - ${bottomSafeArea}px)` }"
     >
+      <view class="mapBox">
+        <map
+          id="myMap"
+          :longitude="longitude"
+          :latitude="latitude"
+          class="map"
+          :scale="16"
+          :show-location="true"
+        ></map>
+      </view>
+
       <view
         class="chargeboxComponents"
         v-if="chaegeBoxList && chaegeBoxList.length > 0"
@@ -256,7 +267,10 @@
     </scroll-view>
     <div class="pageBottom" :style="{ height: 60 + bottomSafeArea + 'px' }">
       <div class="textBox" @click="handleScan">
-        <image class="codeIcon" src="https://eshangtech.com/wanmeiyizhanImg/home/scanCodeIcon.svg" />
+        <image
+          class="codeIcon"
+          src="https://eshangtech.com/wanmeiyizhanImg/home/scanCodeIcon.svg"
+        />
         <span class="codeText">扫码充电</span>
       </div>
     </div>
@@ -271,7 +285,10 @@
       <div class="popupDetailBox">
         <div class="popupTitle">
           <div class="closeIcon" @click="handleClosePopup">
-            <image class="img" src="https://eshangtech.com/wanmeiyizhanImg/home/closeIcon.svg" />
+            <image
+              class="img"
+              src="https://eshangtech.com/wanmeiyizhanImg/home/closeIcon.svg"
+            />
           </div>
           <div clsas="title">电桩详情</div>
           <div class="closeIcon"></div>
@@ -527,6 +544,8 @@ export default {
       nowCurrentObj: {}, // 当前点击选中的悬浮框的对象
       SERVERPART_TARGETOBJ: {},
       chaegeBoxList: [], // 组件要的服务区名称的数组
+      longitude: "116.894249",
+      latitude: "31.919001",
     };
   },
   onLoad() {
@@ -553,6 +572,8 @@ export default {
     let seatInfo = uni.getStorageSync("seatInfo");
     if (seatInfo) {
       this.seatInfo = JSON.parse(seatInfo);
+      this.longitude = this.seatInfo.longitude;
+      this.latitude = this.seatInfo.latitude;
     }
     console.log("this.seatInfo", this.seatInfo);
 
@@ -567,6 +588,22 @@ export default {
     // 最近的三个服务区数据
     this.handleGetThreeList();
   },
+
+  onShareAppMessage() {
+    // let _this = this;
+    return {
+      title: "扫码充电",
+      path: "/pages/scanCodeCharge/index",
+      // imageUrl: _this.good.DEFAULT_IMG,
+    };
+  },
+  onShareTimeline() {
+    return {
+      title: "扫码充电",
+      path: "/pages/scanCodeCharge/index",
+      // imageUrl: _this.good.DEFAULT_IMG,
+    };
+  },
   methods: {
     // 解服务区的一个枚举
     async handleSERVERPART_TARGETOBJ() {
@@ -1077,12 +1114,58 @@ export default {
       });
     },
 
+    // 取问号后面的参数
+    getQueryParams(url) {
+      let queryStr = url.split("?")[1]; // 获取 ? 后面的部分
+      let params = {};
+
+      if (queryStr) {
+        let pairs = queryStr.split("&");
+        pairs.forEach((pair) => {
+          let [key, value] = pair.split("=");
+          params[key] = decodeURIComponent(value || "");
+        });
+      }
+
+      return params;
+    },
+
     // 扫一扫
     handleScan() {
+      let _this = this;
       uni.scanCode({
         success: function (res) {
           console.log("条码类型：" + res.scanType);
           console.log("条码内容：" + res.result);
+          let url = res.result;
+          if (url.indexOf("lixiang") !== -1) {
+            let obj = _this.getQueryParams(url);
+            console.log("obj", obj);
+            uni.showModal({
+              title: "",
+              content: `识别二维码类型为【理想】，确认跳转？`,
+              success(res) {
+                uni.navigateToMiniProgram({
+                  appId: "wxefd5d8119561aaca",
+                  path: `/pages/electricity/pile/index?connectorId=${obj.qrcode}`,
+                  success(res) {},
+                });
+              },
+            });
+          } else if (url.indexOf("jksdxny") !== -1) {
+            // 交控
+            uni.showModal({
+              title: "",
+              content: `识别二维码类型为【交控新能源】，确认跳转？`,
+              success(res) {
+                uni.navigateToMiniProgram({
+                  appId: "wx01617ba079061ca9",
+                  path: `/pages/map/index`,
+                  success(res) {},
+                });
+              },
+            });
+          }
         },
       });
     },
@@ -1100,6 +1183,18 @@ export default {
     height: 100%;
     box-sizing: border-box;
     padding: 24rpx 32rpx;
+    .mapBox {
+      width: 100%;
+      height: 600rpx;
+      margin-bottom: 24rpx;
+      border-radius: 16rpx;
+      overflow: hidden;
+      .map {
+        width: 100%;
+        height: 100%;
+      }
+    }
+
     .chargeboxComponents {
       width: calc(100vw - 112rpx);
       background: #fff;

pages/scanCodeCharge/travelNavigation.vue

@@ -431,6 +431,21 @@
           <span class="searchBtn" @click="searchPOI">搜索</span>
         </view>
 
+        <view class="filterBox" v-if="!hideFilterSearch">
+          <view class="filterItem" @click="handleAddSearchText('服务区')">
+            <view class="filterContent service"> 服务区</view>
+          </view>
+          <view class="filterItem" @click="handleAddSearchText('加油站')">
+            <view class="filterContent gasStation">加油站</view>
+          </view>
+          <view class="filterItem" @click="handleAddSearchText('收费站')">
+            <view class="filterContent tollStation">收费站</view>
+          </view>
+          <view class="filterItem" @click="handleAddSearchText('充电站')"
+            ><view class="filterContent chargingStation">充电站</view></view
+          >
+        </view>
+
         <scroll-view scroll-y class="listBox">
           <view
             class="listItem"
@@ -505,6 +520,7 @@ export default {
       searchPoint: "", // 搜索地名的值
       pointList: [], // 查询到的地名数组
       chaegeBoxList: [], // 组件要的服务区名称的数组
+      hideFilterSearch: false, // 隐藏筛选的小项
     };
   },
   onLoad() {
@@ -614,15 +630,42 @@ export default {
     let userInfo = uni.getStorageSync("userInfo");
     this.userInfo = userInfo;
   },
+  onShareAppMessage() {
+    // let _this = this;
+    return {
+      title: "出行导航",
+      path: "/pages/scanCodeCharge/travelNavigation",
+      // imageUrl: _this.good.DEFAULT_IMG,
+    };
+  },
+  onShareTimeline() {
+    return {
+      title: "出行导航",
+      path: "/pages/scanCodeCharge/travelNavigation",
+      // imageUrl: _this.good.DEFAULT_IMG,
+    };
+  },
   methods: {
+    // 给搜索框 加上指定文字
+    handleAddSearchText(searchType) {
+      this.searchPoint += searchType;
+      this.hideFilterSearch = true;
+      this.searchPOI();
+    },
     // 高德的搜索
     searchPOI() {
+      if (!this.searchPoint) {
+        this.hideFilterSearch = false;
+      }
+
       let _this = this;
       const key = "6e96a801bcea5290d3dcbf100358a6b3"; // 在高德开发者平台申请
-      const url = `https://restapi.amap.com/v5/place/text?key=${key}&keywords=${this.searchPoint}&offset=10&page=1`;
+      const url = `https://restapi.amap.com/v5/place/text?key=${key}&types=&keywords=${this.searchPoint}&offset=10&page=1&region=合肥市`;
       // radius=5000&types=餐饮服务|购物服务&
       console.log("url", url);
 
+      // types 010100|010101|010102  加油站 180300|180301|180302 服务区
+
       uni.request({
         url,
         success: (res) => {
@@ -644,6 +687,19 @@ export default {
               item.distance = distance;
             }
           }
+
+          if (list && list.length > 0) {
+            for (let i = 0; i < list.length - 1; i++) {
+              // 外层循环控制排序趟数
+              for (let j = 0; j < list.length - i - 1; j++) {
+                if (Number(list[j].distance) > Number(list[j + 1].distance)) {
+                  let temp = list[j];
+                  list[j] = list[j + 1];
+                  list[j + 1] = temp;
+                }
+              }
+            }
+          }
           _this.pointList = list;
           console.log("_this.pointList", _this.pointList);
         },
@@ -1104,9 +1160,11 @@ export default {
 
       const data = await new Promise((resolve, reject) => {
         uni.request({
-          url: `https://restapi.amap.com/v3/direction/driving?key=${key}&origin=${start}&destination=${this.endObj.longitude},${this.endObj.latitude}&strategy=0`,
+          url: `https://restapi.amap.com/v3/direction/driving?key=${key}&origin=${start}&destination=${this.endObj.longitude},${this.endObj.latitude}&strategy=19`,
           method: "GET",
           success(res) {
+            console.log("resresresresresresresresresresres", res);
+
             if (
               res.data &&
               res.data.route &&
@@ -1770,6 +1828,7 @@ export default {
 
       this.searchPoint = "";
       this.pointList = [];
+      this.hideFilterSearch = false;
     },
     // 跳转去地图
     handleToMap(obj) {
@@ -2556,6 +2615,47 @@ export default {
       }
     }
 
+    .filterBox {
+      width: 100%;
+      margin-top: 18rpx;
+      display: flex;
+      .filterItem {
+        width: 25%;
+        display: flex;
+        align-items: center;
+        .filterContent {
+          width: 80%;
+          border-radius: 32rpx;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          font-family: "PingFangSC";
+          font-weight: 400;
+          font-size: 24rpx;
+          color: #130f05;
+          line-height: 40rpx;
+          font-style: normal;
+          .imgIcon {
+            width: 24rpx;
+            height: 24rpx;
+            margin-right: 8rpx;
+          }
+        }
+        .service {
+          background: #e4ebfd;
+        }
+        .gasStation {
+          background: #d5ebf6;
+        }
+        .tollStation {
+          background: #cff7d2;
+        }
+        .chargingStation {
+          background: #ffebd2;
+        }
+      }
+    }
+
     .listBox {
       width: 100%;
       height: calc(100% - 72rpx);

pages/shopPages/settlement/index.vue

@@ -621,6 +621,7 @@ export default {
       uni.getLocation({
         type: "gcj02",
         altitude: true,
+        isHighAccuracy: true,
         success: async (res) => {
           console.log("rewrwqerwq", res);
           let seatInfo = {

pages/shopPages/shop/index.vue

@@ -1252,6 +1252,21 @@ export default {
     }
     this.$forceUpdate();
   },
+  onShareAppMessage() {
+    // let _this = this;
+    return {
+      title: "点餐",
+      path: "/pages/shopPages/shop/index",
+      // imageUrl: _this.good.DEFAULT_IMG,
+    };
+  },
+  onShareTimeline() {
+    return {
+      title: "点餐",
+      path: "/pages/shopPages/shop/index",
+      // imageUrl: _this.good.DEFAULT_IMG,
+    };
+  },
 };
 </script>
 

pages/userCenter/index.vue

@@ -426,20 +426,25 @@ export default {
           url: "https://eshangtech.com/wanmeiyizhanImg/home/obligation.svg",
         },
         {
-          label: "待收货",
+          label: "待制作",
           value: 2,
           url: "https://eshangtech.com/wanmeiyizhanImg/home/receiptOfGoods.svg",
         },
         {
-          label: "待评价",
+          label: "待取餐",
           value: 3,
-          url: "https://eshangtech.com/wanmeiyizhanImg/home/evaluated.svg",
-        },
-        {
-          label: "售后/退货",
-          value: 4,
           url: "https://eshangtech.com/wanmeiyizhanImg/home/afterSales.svg",
         },
+        {
+          label: "待评价",
+          value: 4,
+          url: "https://eshangtech.com/wanmeiyizhanImg/home/evaluated.svg",
+        },
+        // {
+        //   label: "售后/退货",
+        //   value: 4,
+        //   url: "https://eshangtech.com/wanmeiyizhanImg/home/afterSales.svg",
+        // },
       ],
       oftenList: [
         {
@@ -534,6 +539,21 @@ export default {
     this.getDistributionCount();
     this.handleGetUserInfo();
   },
+  onShareAppMessage() {
+    // let _this = this;
+    return {
+      title: "我的",
+      path: "/pages/userCenter/index",
+      // imageUrl: _this.good.DEFAULT_IMG,
+    };
+  },
+  onShareTimeline() {
+    return {
+      title: "我的",
+      path: "/pages/userCenter/index",
+      // imageUrl: _this.good.DEFAULT_IMG,
+    };
+  },
   methods: {
     // 签到
     handleSign() {
@@ -565,7 +585,8 @@ export default {
                     icon: "none",
                   });
                   uni.setStorageSync("signTime", nowDay);
-                  this.toDayHaveSign = true;
+                  _this.toDayHaveSign = true;
+                  _this.handleGetUserInfo();
                 });
             } else if (res.ResultCode === "101") {
               uni.showToast({
@@ -602,13 +623,13 @@ export default {
         // 待付款
         type = 2;
       } else if (obj.value === 2) {
-        // 待收货
+        // 待制作
-        type = 4;
+        type = 3;
       } else if (obj.value === 3) {
-        // 待评价
+        // 待取餐
-        type = 5;
+        type = 4;
       } else if (obj.value === 4) {
-        // 售后
+        // 待评价
         type = 5;
       }
       uni.navigateTo({ url: `/pages/orders/order/index?type=${type}` });

static/home/tollStation.svg

@@ -0,0 +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="1742439875259" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="18014" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M1004.16 499.2h-78.08V424.32c3.2 0 68.48 0.64 76.8 0a17.28 17.28 0 0 0 21.12-17.28 19.2 19.2 0 0 0-21.76-17.92l-61.44-0.64c10.88-17.28 55.68-81.92 66.56-98.56a19.2 19.2 0 0 0-15.36-30.72 28.288 28.288 0 0 0-23.68 14.72l-71.04 106.88H896l-72.32-109.44c-15.36-28.8-55.04-12.16-39.04 16 10.88 16.64 53.76 83.84 64.64 100.48h-54.4c-18.56 1.28-25.6 8.96-25.6 19.84a19.84 19.84 0 0 0 18.56 17.28h78.72V499.2H787.2a18.048 18.048 0 0 0-18.56 17.92 32.448 32.448 0 0 0 1.28 5.76 19.2 19.2 0 0 0 17.92 11.52c7.68 0.64 78.08 0.64 78.08 0.64v65.28a29.376 29.376 0 0 0 30.08 28.8 29.824 29.824 0 0 0 30.08-28.8V534.4h74.88a19.776 19.776 0 0 0 22.4-18.56 17.6 17.6 0 0 0-19.2-16.64zM768 767.36v-56.32h256l-0.64 56.96-255.36-0.64z m-94.72 5.76H576.64a34.752 34.752 0 0 1-32.64-11.52 71.616 71.616 0 0 0-12.16-11.52l-67.2-49.28 4.48 130.56H197.12V616.96c0-48.64-19.2-96.64 32.64-96.64h156.16A93.504 93.504 0 0 1 472.96 576a78.272 78.272 0 0 1 13.44 10.88l112 103.04c2.56 3.2 4.48 3.84 7.04 7.04h50.56a44.8 44.8 0 0 1 47.36 37.12 33.152 33.152 0 0 1-30.08 39.04zM448.64 373.76A125.376 125.376 0 1 1 323.2 256a121.6 121.6 0 0 1 125.44 117.76zM576 64H64v896h512v-64h64v128H0V0.64L640 0v192H576V64z" fill="#144d9c" p-id="18015"></path></svg>

unpackage/dist/build/app-plus/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/dist/build/app-plus/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>