update

pages.json

@@ -262,7 +262,9 @@
 				},
 				{
 					"path": "orderRemark/index",
-					"style": {}
+					"style": {
+						"navigationBarTitleText": "订单备注"
+					}
 				},
 				{
 					"path": "coupon/index",

pages/scanCodeCharge/components/chargeBox.vue

@@ -106,6 +106,7 @@
               :key="index"
             >
               <image class="configImg" :src="subItem.url" />
+              <text class="configText">{{ subItem.title || "" }}</text>
             </view>
           </view>
 
@@ -163,7 +164,7 @@
                 </view>
               </view>
 
-              <!-- 时代新能源(阳光) -->
+              <!-- 交控新能源(阳光) -->
               <view class="chargeItem">
                 <view class="chargeIconBox">
                   <image
@@ -171,7 +172,7 @@
                     src="/static/images/home/sunIcon.svg"
                   />
                 </view>
-                <view class="chargeTitle">时代新能源</view>
+                <view class="chargeTitle">交控新能源</view>
                 <view class="chargeInfo">
                   <span class="empty">空</span>
                   <span class="emptyValue">{{
@@ -480,16 +481,44 @@ export default {
         { label: "国网", value: 4 },
       ], // 点开的服务区有哪几种充电的
       selectPopup: 1,
+      SERVERPART_TARGETOBJ: {},
     };
   },
   props: ["serviceAreaList", "startObj", "endObj", "pageType"],
 
   onReady() {
     console.log("onShow");
+    let SERVERPART_TARGET = uni.getStorageSync("SERVERPART_TARGET");
+    if (SERVERPART_TARGET) {
+      this.SERVERPART_TARGETOBJ = JSON.parse(SERVERPART_TARGET);
+    } else {
+      // 拿到枚举
+      this.handleSERVERPART_TARGETOBJ();
+    }
     this.handldGetData();
   },
   methods: {
+    // 解服务区的一个枚举
+    async handleSERVERPART_TARGETOBJ() {
+      let SERVERPART_TARGET = await this.$api.$get(
+        "/EShangApiMain/FrameWork/GetFieldEnumTree",
+        { FieldExplainField: "SERVERPART_TARGET" }
+      );
+      let list = this.$utils.wrapTreeNode(SERVERPART_TARGET.Result_Data.List);
+      let obj = {};
+      if (list && list.length > 0) {
+        list.forEach((item) => {
+          obj[String(item.value)] = item.label;
+        });
+      }
+      console.log("obj", obj);
+      uni.setStorageSync("SERVERPART_TARGET", JSON.stringify(obj));
+      this.SERVERPART_TARGETOBJ = obj;
+    },
     async handldGetData() {
+      uni.showLoading({
+        title: "加载中...",
+      });
       this.seatInfo = JSON.parse(uni.getStorageSync("seatInfo"));
       // 服务区列表
       let serviceList = [];
@@ -538,6 +567,7 @@ export default {
               let HASPILOTLOUNGE = false; // 有无司机之家
               let SHOWERROOM = 0; // 司机之家淋浴间
               let HASCHILD = false; // 有无车辆维修
+              let HASMOTHER = false; // 有无母婴室
               let SMALLPARKING = 0; // 轿车车位
               let PACKING = 0; // 客车车位
               let TRUCKPACKING = 0; // 货车车位
@@ -554,6 +584,9 @@ export default {
               let DROOMWATER_DISPENSER = 0; // 司机之家饮水机
               let UREA_COUNT = 0; // 尿素
               let VEHICLEWATERFILLING = 0; // 加水
+              let REFUELINGGUN92 = 0; // 加油枪92号
+              let REFUELINGGUN95 = 0; //  加油枪95号
+              let REFUELINGGUN0 = 0; // 加油枪0号
 
               if (subItem.RegionInfo && subItem.RegionInfo.length > 0) {
                 subItem.RegionInfo.forEach((thirdItem) => {
@@ -582,6 +615,9 @@ export default {
                   DROOMWATER_DISPENSER += thirdItem.DROOMWATER_DISPENSER;
                   UREA_COUNT += thirdItem.UREA_COUNT;
                   VEHICLEWATERFILLING += thirdItem.VEHICLEWATERFILLING;
+                  REFUELINGGUN92 += thirdItem.REFUELINGGUN92;
+                  REFUELINGGUN95 += thirdItem.REFUELINGGUN95;
+                  REFUELINGGUN0 += thirdItem.REFUELINGGUN0;
 
                   if (thirdItem.HASPILOTLOUNGE) {
                     HASPILOTLOUNGE = true;
@@ -589,6 +625,9 @@ export default {
                   if (thirdItem.HASCHILD) {
                     HASCHILD = true;
                   }
+                  if (thirdItem.HASMOTHER) {
+                    HASMOTHER = true;
+                  }
 
                   LIAUTOCHARGESum += Number(thirdItem.LIAUTOCHARGE || 0);
                   STATEGRIDCHARGESum += Number(thirdItem.STATEGRIDCHARGE || 0);
@@ -603,157 +642,278 @@ export default {
               subItem.imgList = [
                 {
                   url:
-                    HASPANTRY > 0
+                    HASPANTRY > 0 || HASWIFI > 0
-                      ? "https://eshangtech.com/minTestImg/manWCIcon.svg"
+                      ? "https://eshangtech.com/minTestImg/WC.svg"
-                      : "https://eshangtech.com/minTestImg/nomanWCIcon.svg",
+                      : "https://eshangtech.com/minTestImg/noWC.svg",
                   isShow: HASPANTRY > 0,
+                  title: "卫生间",
                 },
                 {
                   url:
-                    HASWIFI > 0
+                    HASPANTRY > 0 || HASWIFI > 0
-                      ? "https://eshangtech.com/minTestImg/womanWCIcon.svg"
+                      ? "https://eshangtech.com/minTestImg/motherAndBaby.svg"
-                      : "https://eshangtech.com/minTestImg/nowomanWCIcon.svg",
+                      : "https://eshangtech.com/minTestImg/nomotherAndBaby.svg",
+                  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
+                      ? "https://eshangtech.com/minTestImg/HASPILOTLOUNGE.svg"
+                      : "https://eshangtech.com/minTestImg/noHASPILOTLOUNGE.svg",
+                  isShow: HASPILOTLOUNGE > 0,
+                  title: "司机之家",
+                },
+                // {
+                //   url:
+                //     HASWATERROOM > 0
+                //       ? "https://eshangtech.com/minTestImg/HASWATERROOM.svg"
+                //       : "https://eshangtech.com/minTestImg/noHASWATERROOM.svg",
+                //   isShow: HASWATERROOM > 0,
+                //   title: "开水器",
+                // },
+                {
+                  url:
+                    SMALLPARKING > 0 ||
+                    PACKING > 0 ||
+                    TRUCKPACKING > 0 ||
+                    DANPACKING > 0
+                      ? "https://eshangtech.com/minTestImg/SMALLPARKING.svg"
+                      : "https://eshangtech.com/minTestImg/noSMALLPARKING.svg",
+                  isShow:
+                    SMALLPARKING > 0 ||
+                    PACKING > 0 ||
+                    TRUCKPACKING > 0 ||
+                    DANPACKING > 0,
+                  title: "停车场",
+                },
+                {
+                  url:
+                    REFUELINGGUN92 > 0 ||
+                    REFUELINGGUN95 > 0 ||
+                    REFUELINGGUN0 > 0
+                      ? "https://eshangtech.com/minTestImg/REFUELINGGUN.svg"
+                      : "https://eshangtech.com/minTestImg/noREFUELINGGUN.svg",
+                  isShow:
+                    REFUELINGGUN92 > 0 ||
+                    REFUELINGGUN95 > 0 ||
+                    REFUELINGGUN0 > 0,
+                  title: "加油站",
+                },
+                {
+                  url:
+                    LIAUTOCHARGESum > 0 ||
+                    STATEGRIDCHARGESum > 0 ||
+                    GACENERGYCHARGESum > 0
+                      ? "https://eshangtech.com/minTestImg/chargingStation.svg"
+                      : "https://eshangtech.com/minTestImg/nochargingStation.svg",
+                  isShow:
+                    LIAUTOCHARGESum > 0 ||
+                    STATEGRIDCHARGESum > 0 ||
+                    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
+                      ? "https://eshangtech.com/minTestImg/POINTCONTROLCOUNT.svg"
+                      : "https://eshangtech.com/minTestImg/noPOINTCONTROLCOUNT.svg",
+                  isShow: POINTCONTROLCOUNT > 0,
+                  title: "客房",
+                },
+
+                // {
+                //   url:
+                //     HASWIFI > 0
+                //       ? "https://eshangtech.com/minTestImg/womanWCIcon.svg"
+                //       : "https://eshangtech.com/minTestImg/nowomanWCIcon.svg",
+                // },
+                // {
+                //   url:
                 //     TOILETCOUNT > 0
                 //       ? "https://eshangtech.com/minTestImg/TOILETCOUNT.svg"
                 //       : "https://eshangtech.com/minTestImg/noTOILETCOUNT.svg",
                 //   isShow: TOILETCOUNT > 0,
                 // },
-                {
-                  url:
-                    HASSHOWERROOM > 0
-                      ? "https://eshangtech.com/minTestImg/HASSHOWERROOM.svg"
-                      : "https://eshangtech.com/minTestImg/noHASSHOWERROOM.svg",
-                  isShow: HASSHOWERROOM > 0,
-                },
-                {
-                  url:
-                    HASWATERROOM > 0
-                      ? "https://eshangtech.com/minTestImg/HASWATERROOM.svg"
-                      : "https://eshangtech.com/minTestImg/noHASWATERROOM.svg",
-                  isShow: HASWATERROOM > 0,
-                },
-                {
-                  url:
-                    MICROWAVEOVEN > 0
-                      ? "https://eshangtech.com/minTestImg/MICROWAVEOVEN.svg"
-                      : "https://eshangtech.com/minTestImg/noMICROWAVEOVEN.svg",
-                  isShow: MICROWAVEOVEN > 0,
-                },
-                {
-                  url:
-                    WASHERCOUNT > 0
-                      ? "https://eshangtech.com/minTestImg/WASHERCOUNT.svg"
-                      : "https://eshangtech.com/minTestImg/noWASHERCOUNT.svg",
-                  isShow: WASHERCOUNT > 0,
-                },
-                {
-                  url:
-                    SLEEPINGPODS > 0
-                      ? "https://eshangtech.com/minTestImg/SLEEPINGPODS.svg"
-                      : "https://eshangtech.com/minTestImg/noSLEEPINGPODS.svg",
-                  isShow: SLEEPINGPODS > 0,
-                },
-                {
-                  url:
-                    HASPILOTLOUNGE > 0
-                      ? "https://eshangtech.com/minTestImg/HASPILOTLOUNGE.svg"
-                      : "https://eshangtech.com/minTestImg/noHASPILOTLOUNGE.svg",
-                  isShow: HASPILOTLOUNGE > 0,
-                },
-                {
-                  url:
-                    HASCHILD > 0
-                      ? "https://eshangtech.com/minTestImg/HASCHILD.svg"
-                      : "https://eshangtech.com/minTestImg/noHASCHILD.svg",
-                  isShow: HASCHILD > 0,
-                },
-                {
-                  url:
-                    DININGBXCOUNT > 0
-                      ? "https://eshangtech.com/minTestImg/DININGBXCOUNT.svg"
-                      : "https://eshangtech.com/minTestImg/noDININGBXCOUNT.svg",
-                  isShow: DININGBXCOUNT > 0,
-                },
-                {
-                  url:
-                    SMALLPARKING > 0
-                      ? "https://eshangtech.com/minTestImg/SMALLPARKING.svg"
-                      : "https://eshangtech.com/minTestImg/noSMALLPARKING.svg",
-                  isShow: SMALLPARKING > 0,
-                },
-                {
-                  url:
-                    PACKING > 0
-                      ? "https://eshangtech.com/minTestImg/PACKING.svg"
-                      : "https://eshangtech.com/minTestImg/noPACKING.svg",
-                  isShow: PACKING > 0,
-                },
-                {
-                  url:
-                    TRUCKPACKING > 0
-                      ? "https://eshangtech.com/minTestImg/TRUCKPACKING.svg"
-                      : "https://eshangtech.com/minTestImg/noTRUCKPACKING.svg",
-                  isShow: TRUCKPACKING > 0,
-                },
-                {
-                  url:
-                    DANPACKING > 0
-                      ? "https://eshangtech.com/minTestImg/DANPACKING.svg"
-                      : "https://eshangtech.com/minTestImg/noDANPACKING.svg",
-                  isShow: DANPACKING > 0,
-                },
                 // {
                 //   url:
-                //     DININGROOMCOUNT > 0
+                //     HASSHOWERROOM > 0
-                //       ? "https://eshangtech.com/minTestImg/DININGROOMCOUNT.svg"
+                //       ? "https://eshangtech.com/minTestImg/HASSHOWERROOM.svg"
-                //       : "https://eshangtech.com/minTestImg/noDININGROOMCOUNT.svg",
+                //       : "https://eshangtech.com/minTestImg/noHASSHOWERROOM.svg",
-                //   isShow: DININGROOMCOUNT > 0,
+                //   isShow: HASSHOWERROOM > 0,
+                //   title: "淋浴间",
                 // },
-                {
-                  url:
-                    HASBACKGROUNDRADIO > 0
-                      ? "https://eshangtech.com/minTestImg/HASBACKGROUNDRADIO.svg"
-                      : "https://eshangtech.com/minTestImg/noHASBACKGROUNDRADIO.svg",
-                  isShow: HASBACKGROUNDRADIO > 0,
-                },
                 // {
                 //   url:
-                //     POINTCONTROLCOUNT > 0
+                //     HASWATERROOM > 0
-                //       ? "https://eshangtech.com/minTestImg/POINTCONTROLCOUNT.svg"
+                //       ? "https://eshangtech.com/minTestImg/HASWATERROOM.svg"
-                //       : "https://eshangtech.com/minTestImg/noPOINTCONTROLCOUNT.svg",
+                //       : "https://eshangtech.com/minTestImg/noHASWATERROOM.svg",
-                //   isShow: POINTCONTROLCOUNT > 0,
+                //   isShow: HASWATERROOM > 0,
+                //   title: "开水器",
+                // },
+                // {
+                //   url:
+                //     MICROWAVEOVEN > 0
+                //       ? "https://eshangtech.com/minTestImg/MICROWAVEOVEN.svg"
+                //       : "https://eshangtech.com/minTestImg/noMICROWAVEOVEN.svg",
+                //   isShow: MICROWAVEOVEN > 0,
+                //   title: "微波炉",
+                // },
+                // {
+                //   url:
+                //     WASHERCOUNT > 0
+                //       ? "https://eshangtech.com/minTestImg/WASHERCOUNT.svg"
+                //       : "https://eshangtech.com/minTestImg/noWASHERCOUNT.svg",
+                //   isShow: WASHERCOUNT > 0,
+                //   title: "洗衣机",
+                // },
+                // // {
+                // //   url:
+                // //     SLEEPINGPODS > 0
+                // //       ? "https://eshangtech.com/minTestImg/SLEEPINGPODS.svg"
+                // //       : "https://eshangtech.com/minTestImg/noSLEEPINGPODS.svg",
+                // //   isShow: SLEEPINGPODS > 0,
+                // //   title: "睡眠仓",
+                // // },
+                // {
+                //   url:
+                //     HASPILOTLOUNGE > 0
+                //       ? "https://eshangtech.com/minTestImg/HASPILOTLOUNGE.svg"
+                //       : "https://eshangtech.com/minTestImg/noHASPILOTLOUNGE.svg",
+                //   isShow: HASPILOTLOUNGE > 0,
+                //   title: "司机之家",
+                // },
+                // {
+                //   url:
+                //     HASCHILD > 0
+                //       ? "https://eshangtech.com/minTestImg/HASCHILD.svg"
+                //       : "https://eshangtech.com/minTestImg/noHASCHILD.svg",
+                //   isShow: HASCHILD > 0,
+                //   title: "车辆维修",
+                // },
+                // {
+                //   url:
+                //     DININGBXCOUNT > 0
+                //       ? "https://eshangtech.com/minTestImg/DININGBXCOUNT.svg"
+                //       : "https://eshangtech.com/minTestImg/noDININGBXCOUNT.svg",
+                //   isShow: DININGBXCOUNT > 0,
+                //   title: "商铺",
+                // },
+                // {
+                //   url:
+                //     SMALLPARKING > 0
+                //       ? "https://eshangtech.com/minTestImg/SMALLPARKING.svg"
+                //       : "https://eshangtech.com/minTestImg/noSMALLPARKING.svg",
+                //   isShow: SMALLPARKING > 0,
+                //   title: "轿车车位",
+                // },
+                // {
+                //   url:
+                //     PACKING > 0
+                //       ? "https://eshangtech.com/minTestImg/PACKING.svg"
+                //       : "https://eshangtech.com/minTestImg/noPACKING.svg",
+                //   isShow: PACKING > 0,
+                //   title: "轿车车位",
+                // },
+                // {
+                //   url:
+                //     TRUCKPACKING > 0
+                //       ? "https://eshangtech.com/minTestImg/TRUCKPACKING.svg"
+                //       : "https://eshangtech.com/minTestImg/noTRUCKPACKING.svg",
+                //   isShow: TRUCKPACKING > 0,
+                // },
+                // {
+                //   url:
+                //     DANPACKING > 0
+                //       ? "https://eshangtech.com/minTestImg/DANPACKING.svg"
+                //       : "https://eshangtech.com/minTestImg/noDANPACKING.svg",
+                //   isShow: DANPACKING > 0,
+                // },
+                // // {
+                // //   url:
+                // //     DININGROOMCOUNT > 0
+                // //       ? "https://eshangtech.com/minTestImg/DININGROOMCOUNT.svg"
+                // //       : "https://eshangtech.com/minTestImg/noDININGROOMCOUNT.svg",
+                // //   isShow: DININGROOMCOUNT > 0,
+                // // },
+                // {
+                //   url:
+                //     HASBACKGROUNDRADIO > 0
+                //       ? "https://eshangtech.com/minTestImg/HASBACKGROUNDRADIO.svg"
+                //       : "https://eshangtech.com/minTestImg/noHASBACKGROUNDRADIO.svg",
+                //   isShow: HASBACKGROUNDRADIO > 0,
+                //   title: "便利店",
+                // },
+                // // {
+                // //   url:
+                // //     POINTCONTROLCOUNT > 0
+                // //       ? "https://eshangtech.com/minTestImg/POINTCONTROLCOUNT.svg"
+                // //       : "https://eshangtech.com/minTestImg/noPOINTCONTROLCOUNT.svg",
+                // //   isShow: POINTCONTROLCOUNT > 0,
+                // // },
+                // {
+                //   url:
+                //     TOILET_PAPER > 0
+                //       ? "https://eshangtech.com/minTestImg/TOILET_PAPER.svg"
+                //       : "https://eshangtech.com/minTestImg/noTOILET_PAPER.svg",
+                //   isShow: TOILET_PAPER > 0,
+                //   title: "厕纸巾",
+                // },
+                // {
+                //   url:
+                //     CHANGING_TABLE > 0
+                //       ? "https://eshangtech.com/minTestImg/CHANGING_TABLE.svg"
+                //       : "https://eshangtech.com/minTestImg/noCHANGING_TABLE.svg",
+                //   isShow: CHANGING_TABLE > 0,
+                //   title: "尿布台",
+                // },
+                // {
+                //   url:
+                //     NURSING_TABLE > 0
+                //       ? "https://eshangtech.com/minTestImg/NURSING_TABLE.svg"
+                //       : "https://eshangtech.com/minTestImg/noNURSING_TABLE.svg",
+                //   isShow: NURSING_TABLE > 0,
+                //   title: "哺乳桌",
+                // },
+                // {
+                //   url:
+                //     BABY_COT > 0
+                //       ? "https://eshangtech.com/minTestImg/BABY_COT.svg"
+                //       : "https://eshangtech.com/minTestImg/noBABY_COT.svg",
+                //   isShow: BABY_COT > 0,
+                //   title: "婴儿床",
                 // },
-                {
-                  url:
-                    TOILET_PAPER > 0
-                      ? "https://eshangtech.com/minTestImg/TOILET_PAPER.svg"
-                      : "https://eshangtech.com/minTestImg/noTOILET_PAPER.svg",
-                  isShow: TOILET_PAPER > 0,
-                },
-                {
-                  url:
-                    CHANGING_TABLE > 0
-                      ? "https://eshangtech.com/minTestImg/CHANGING_TABLE.svg"
-                      : "https://eshangtech.com/minTestImg/noCHANGING_TABLE.svg",
-                  isShow: CHANGING_TABLE > 0,
-                },
-                {
-                  url:
-                    NURSING_TABLE > 0
-                      ? "https://eshangtech.com/minTestImg/NURSING_TABLE.svg"
-                      : "https://eshangtech.com/minTestImg/noNURSING_TABLE.svg",
-                  isShow: NURSING_TABLE > 0,
-                },
-                {
-                  url:
-                    BABY_COT > 0
-                      ? "https://eshangtech.com/minTestImg/BABY_COT.svg"
-                      : "https://eshangtech.com/minTestImg/noBABY_COT.svg",
-                  isShow: BABY_COT > 0,
-                },
               ];
               // 理想的随机百分比
               let LXRate = this.handleGetRandomData(0, 60);
@@ -889,6 +1049,8 @@ export default {
         servicePart: list,
       };
       _this.handleGetChargeData(list, ["新桥", "丰乐", "肥东"]);
+
+      uni.hideLoading();
     },
 
     // 随机给充电桩数据
@@ -1490,16 +1652,30 @@ export default {
       .centerItem {
         width: 100%;
         box-sizing: border-box;
-        padding: 0 8rpx 0 20rpx;
+        margin-top: 24rpx;
-        margin-top: 12rpx;
         display: flex;
         align-items: center;
         flex-wrap: wrap;
         .centerConfigItem {
+          width: calc(100% / 5);
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          justify-content: center;
+          margin-bottom: 24rpx;
           .configImg {
-            width: 40rpx;
+            width: 32rpx;
-            height: 40rpx;
+            height: 32rpx;
-            margin-right: 8rpx;
+            // margin-right: 8rpx;
+            margin-bottom: 8rpx;
+          }
+          .configText {
+            font-family: "PingFang SC", "Noto Sans CJK SC", "Microsoft YaHei",
+              sans-serif;
+            font-weight: 400;
+            font-size: 24rpx;
+            color: #130f05;
+            line-height: 40rpx;
           }
         }
       }
@@ -1507,7 +1683,7 @@ export default {
         width: 100%;
         box-sizing: border-box;
         padding: 0 8rpx 0 20rpx;
-        margin-top: 24rpx;
+        // margin-top: 24rpx;
         .chargeBox {
           width: 100%;
           display: flex;
@@ -1558,7 +1734,7 @@ export default {
               }
               .emptyValue {
                 font-family: "DINAlternate";
-                font-weight: bold;
+                font-weight: 400;
                 font-size: 28rpx;
                 color: #130f05;
                 line-height: 36rpx;
@@ -1568,7 +1744,7 @@ export default {
               }
               .sum {
                 font-family: "DINAlternate";
-                font-weight: bold;
+                font-weight: 400;
                 font-size: 28rpx;
                 color: #716f69;
                 line-height: 36rpx;

pages/scanCodeCharge/index.vue

@@ -198,7 +198,7 @@
                 </view>
               </view>
 
-              <!-- 时代新能源(交控新能源) -->
+              <!-- 交控新能源(交控新能源) -->
               <view class="chargeItem">
                 <view class="chargeIconBox">
                   <image
@@ -1534,6 +1534,9 @@ export default {
       }
     }
   }
+  .chargeList ::-webkit-scrollbar {
+    display: none;
+  }
 
   .pageBottom {
     width: 100%;

pages/scanCodeCharge/travelNavigation.vue

@@ -310,7 +310,7 @@
                       </view>
                     </view>
 
-                    <!-- 时代新能源(阳光) -->
+                    <!-- 交控新能源(阳光) -->
                     <view class="chargeItem">
                       <view class="chargeIconBox">
                         <image
@@ -644,6 +644,7 @@ export default {
       };
       this.$refs.popup.close();
       this.isShow = false;
+      this.handleTrafficSearch();
 
       return;
       console.log("obj", obj);
@@ -983,6 +984,7 @@ export default {
 
     // 路况查询
     async handleTrafficSearch() {
+      this.chaegeBoxList = [];
       // let privacyRes = this.handleGetGoDePrivacy();
 
       // this.myTest.navfrom(
@@ -1154,6 +1156,8 @@ export default {
         tolls: tolls,
         haveProgress: ((smoothAcount / allAcount) * 100).toFixed(2),
       };
+
+      uni.hideLoading();
       return;
       let list = [];
 
@@ -1821,6 +1825,9 @@ export default {
   background: #f0f5ff;
   box-sizing: border-box;
   padding: 12px 16px 24rpx;
+
+  padding-bottom: constant(safe-area-inset-bottom);
+  padding-bottom: env(safe-area-inset-bottom);
   .content {
     width: 100%;
     .trafficState {

pages/shopPages/settlement/index.vue

@@ -25,6 +25,7 @@
         <div class="time-title">联系方式</div>
         <view class="radio-box bb1">
           <input
+            style="font-size: 28rpx"
             type="number"
             placeholder="请输入联系号码"
             @input="bindKeyInput"
@@ -57,7 +58,11 @@
           >
             <view class="section">
               <view class="picker">
-                {{ beExpectedTo ? ` 预计(${beExpectedTo})到达` : "-" }}
+                预计(
+                <span style="color: red; font-size: 28rpx">{{
+                  beExpectedTo ? ` ${beExpectedTo}` : "-"
+                }}</span>
+                )到达
 
                 <div style="padding-top: 10rpx">
                   <van-icon name="arrow" size="28rpx" color="#333" />
@@ -132,7 +137,11 @@
           </label>
         </radio-group>
 
-        <view class="repositioning" @click="handleAgainPosition">
+        <view
+          class="repositioning"
+          @click="handleAgainPosition"
+          v-if="hideAgainIcon"
+        >
           <image class="icon" src="/static/images/home/repositioning.svg" />
         </view>
       </div>
@@ -453,6 +462,7 @@ export default {
       ],
       people: 0,
       peopleStr: "", // 人数的具体
+      hideAgainIcon: true, // 是否显示重新定位
     };
   },
   components: {
@@ -518,15 +528,22 @@ export default {
       this.peopleStr = this.packageList[this.people].label;
     },
     async handleAgainPosition() {
-      // uni.showLoading({
+      uni.showLoading({
-      //   title: "更新位置信息...",
+        title: "更新位置信息...",
-      // });
+      });
+      let _this = this;
+      await new Promise((resolve) => {
+        setTimeout(() => {
           console.log("handleAgainPosition");
 
-      this.storeId = this.nowStore.ShopList[1].SERVERPARTSHOP_ID;
+          _this.storeId = _this.nowStore.ShopList[1].SERVERPARTSHOP_ID;
-      console.log("this.storeId ", this.storeId);
+          console.log("_this.storeId ", _this.storeId);
+          _this.hideAgainIcon = false;
+          _this.$forceUpdate();
+          uni.hideLoading();
+        }, 2000);
+      });
 
-      this.$forceUpdate();
       // await this.handleGetRealPosition();
     },
     // 拿到当前的服务区信息 去 计算一下 当前位置距离 服务区还有多远
@@ -1433,7 +1450,7 @@ bodyColor = #CAA97F;
       display: inline-block;
 
       .radio-unit {
-        font-size: 26rpx;
+        font-size: 24rpx;
         line-height: 96rpx;
       }
 
@@ -1441,7 +1458,7 @@ bodyColor = #CAA97F;
         display: flex;
         align-items: center;
         justify-content: space-between;
-        font-size: 28rpx;
+        font-size: 24rpx;
         padding-right: 16rpx;
         height: 96rpx;
         line-height: 96rpx;
@@ -1534,18 +1551,18 @@ bodyColor = #CAA97F;
     color: #333;
 
     .order-name {
-      font-size: 26rpx;
+      font-size: 24rpx;
       // font-weight bolder
       flex: 0.7;
     }
 
     .order-num {
-      font-size: 26rpx;
+      font-size: 24rpx;
       flex: 0.1;
     }
 
     .order-price {
-      font-size: 26rpx;
+      font-size: 24rpx;
       flex: 0.2;
       color: #333;
       text-align: right;
@@ -1557,14 +1574,14 @@ bodyColor = #CAA97F;
     display: flex;
     justify-content: space-between;
     align-items: center;
-    font-size: 26rpx;
+    font-size: 24rpx;
     box-sizing: border-box;
     line-height: 60rpx;
     color: bodyColor;
 
     .coupon-title {
       color: #333;
-      font-size: 26rpx;
+      font-size: 24rpx;
     }
 
     .coupon-right {
@@ -1579,11 +1596,12 @@ bodyColor = #CAA97F;
         white-space: nowrap;
         text-overflow: ellipsis;
         height: 42rpx;
+        font-size: 24rpx;
       }
 
       .priceColor {
         color: bodyColor;
-        font-size: 28rpx;
+        font-size: 26rpx;
       }
     }
   }
@@ -1592,12 +1610,12 @@ bodyColor = #CAA97F;
     box-sizing: border-box;
     background-color: #fff;
     text-align: right;
-    font-size: 26rpx;
+    font-size: 24rpx;
     padding: 22rpx 16rpx;
 
     .pay-price {
       color: #333;
-      font-size: 32rpx;
+      font-size: 28rpx;
       margin-left: 10rpx;
       font-weight: bold;
     }

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

@@ -1902,7 +1902,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"皖美驿站","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"皖美驿站","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -8945,7 +8945,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"皖美驿站","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"皖美驿站","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -8966,14 +8966,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"皖美驿站","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"皖美驿站","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"皖美驿站","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"皖美驿站","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -9069,7 +9069,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"皖美驿站","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"皖美驿站","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));

unpackage/dist/dev/mp-weixin/pages/scanCodeCharge/index.wxss

@@ -262,6 +262,9 @@
   text-align: justify;
   font-style: normal;
 }
+.main .chargeList.data-v-35ae074c ::-webkit-scrollbar {
+  display: none;
+}
 .main .pageBottom.data-v-35ae074c {
   width: 100%;
   height: 120rpx;

unpackage/dist/dev/mp-weixin/pages/shopPages/orderRemark/index.json

@@ -1,3 +1,4 @@
 {
+  "navigationBarTitleText": "订单备注",
   "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pages/shopPages/settlement/index.js

@@ -260,7 +260,9 @@ var _default = {
         value: "5人及以上"
       }],
       people: 0,
-      peopleStr: "" // 人数的具体
+      peopleStr: "",
+      // 人数的具体
+      hideAgainIcon: true // 是否显示重新定位
     };
   },
 
@@ -327,18 +329,26 @@ var _default = {
     handleAgainPosition: function handleAgainPosition() {
       var _this2 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+        var _this;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                // uni.showLoading({
+                uni.showLoading({
-                //   title: "更新位置信息...",
+                  title: "更新位置信息..."
-                // });
+                });
+                _this = _this2;
+                _context.next = 4;
+                return new Promise(function (resolve) {
+                  setTimeout(function () {
                     console.log("handleAgainPosition");
-                _this2.storeId = _this2.nowStore.ShopList[1].SERVERPARTSHOP_ID;
+                    _this.storeId = _this.nowStore.ShopList[1].SERVERPARTSHOP_ID;
-                console.log("this.storeId ", _this2.storeId);
+                    console.log("_this.storeId ", _this.storeId);
-                _this2.$forceUpdate();
+                    _this.hideAgainIcon = false;
-                // await this.handleGetRealPosition();
+                    _this.$forceUpdate();
+                    uni.hideLoading();
+                  }, 2000);
+                });
               case 4:
               case "end":
                 return _context.stop();

unpackage/dist/dev/mp-weixin/pages/shopPages/settlement/index.wxss

@@ -113,14 +113,14 @@
   display: inline-block;
 }
 .settlement .radio-box .radio-list .radio-unit.data-v-43036aa6 {
-  font-size: 26rpx;
+  font-size: 24rpx;
   line-height: 96rpx;
 }
 .settlement .radio-box .radio-list .picker.data-v-43036aa6 {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  font-size: 28rpx;
+  font-size: 24rpx;
   padding-right: 16rpx;
   height: 96rpx;
   line-height: 96rpx;
@@ -202,15 +202,15 @@
   color: #333;
 }
 .settlement .order-list .order-name.data-v-43036aa6 {
-  font-size: 26rpx;
+  font-size: 24rpx;
   flex: 0.7;
 }
 .settlement .order-list .order-num.data-v-43036aa6 {
-  font-size: 26rpx;
+  font-size: 24rpx;
   flex: 0.1;
 }
 .settlement .order-list .order-price.data-v-43036aa6 {
-  font-size: 26rpx;
+  font-size: 24rpx;
   flex: 0.2;
   color: #333;
   text-align: right;
@@ -220,14 +220,14 @@
   display: flex;
   justify-content: space-between;
   align-items: center;
-  font-size: 26rpx;
+  font-size: 24rpx;
   box-sizing: border-box;
   line-height: 60rpx;
   color: #caa97f;
 }
 .settlement .coupon .coupon-title.data-v-43036aa6 {
   color: #333;
-  font-size: 26rpx;
+  font-size: 24rpx;
 }
 .settlement .coupon .coupon-right.data-v-43036aa6 {
   display: flex;
@@ -241,21 +241,22 @@
   white-space: nowrap;
   text-overflow: ellipsis;
   height: 42rpx;
+  font-size: 24rpx;
 }
 .settlement .coupon .coupon-right .priceColor.data-v-43036aa6 {
   color: #caa97f;
-  font-size: 28rpx;
+  font-size: 26rpx;
 }
 .settlement .price-sum.data-v-43036aa6 {
   box-sizing: border-box;
   background-color: #fff;
   text-align: right;
-  font-size: 26rpx;
+  font-size: 24rpx;
   padding: 22rpx 16rpx;
 }
 .settlement .price-sum .pay-price.data-v-43036aa6 {
   color: #333;
-  font-size: 32rpx;
+  font-size: 28rpx;
   margin-left: 10rpx;
   font-weight: bold;
 }