小程序车牌调整

pages/charginfo/charginfo.js

@@ -50,8 +50,8 @@ Page({
         // carParkingRate: false,
         // parkTime: 0,
         console.info(res)
-        let dataSharePlatform = res.data.dataSharePlatform;
-        if(!dataSharePlatform){
+        let reduceTime = res.data?.reduceTime;
+        if(!reduceTime){
           that.setData({
             carParkingRate:false
           })
@@ -62,7 +62,7 @@ Page({
         })
         try{
           that.setData({
-            parkTime: parseFloat((dataSharePlatform.chargeUserId/ 3600).toFixed(2))
+            parkTime: parseFloat((reduceTime/ 3600).toFixed(2))
           })
         }catch(e){
           that.setData({

pages/charginfo/charginfo.wxss

@@ -289,7 +289,7 @@ text.price {
   color: #9d9d9d;
 }
 .rtable .rtr.active{
-  color:#d57a80;
+  color:#f06c6c;
   font-weight: bold;
   font-size: 28rpx;
   font-style: italic;
@@ -307,7 +307,8 @@ text.price {
   width: 180rpx
 }
 .parkingfee{
-  color: #d57a80;
+  color:#f06c6c;
+  font-weight: bold;
   font-size: 28rpx;
   padding-bottom:10rpx;
 }

pages/index/index.js

@@ -236,8 +236,7 @@ Page({
   },
 
   onLoad(e) {
-
-   this.scanFlag = false;
+   this.data.scanFlag = false;
     wx.hideLoading();
     if (e.q) {
       //console.log(decodeURIComponent(e.q));
@@ -600,8 +599,8 @@ Page({
         // carParkingRate: false,
         // parkTime: 0,
         console.info(res)
-        let dataSharePlatform = res.data.dataSharePlatform;
-        if(!dataSharePlatform){
+        let reduceTime = res.data?.reduceTime;
+        if(!reduceTime){
           that.setData({
             carParkingRate:false
           })
@@ -612,7 +611,7 @@ Page({
         })
         try{
           that.setData({
-            parkTime: parseFloat((dataSharePlatform.chargeUserId/ 3600).toFixed(2))
+            parkTime: parseFloat((reduceTime/ 3600).toFixed(2))
           })
         }catch(e){
           that.setData({
@@ -755,10 +754,10 @@ Page({
   },
 
   click_scan_control(scanResult,inner) {
-    if(this.scanFlag){
+    if(this.data.scanFlag){
       return;
     }
-    this.scanFlag = true;
+    this.data.scanFlag = true;
     wx.showLoading({
       title: '努力加载中...',
     })
@@ -770,7 +769,7 @@ Page({
     if (!this.data.isLogin) {
       log.info('[首页]', '[未登陆跳转登录界面]');
       let url = `/pages/login/phone_login/phone_login`;
-      that.scanFlag = false;
+      that.data.scanFlag = false;
       wx.hideLoading();
       wx.navigateTo({
         url
@@ -796,7 +795,7 @@ Page({
           } = data;
           log.info('[首页]', '[获取用户是否有未支付订单]', '[响应]', data);
           if (data && order && data.code == 200) {
-            that.scanFlag = false;
+            that.data.scanFlag = false;
             wx.hideLoading();
             log.info('[首页]', '[用户有未支付订单跳转订单支付界面]');
             wx.showModal({
@@ -827,7 +826,7 @@ Page({
               wx.pro.scanCode().then(d=>{
                 that.afterScanCode(d,that,inner)
               }).catch(e=>{
-                that.scanFlag = false;
+                that.data.scanFlag = false;
                 wx.hideLoading();
               });
             }else{
@@ -839,7 +838,7 @@ Page({
           }
         },
         fail(e) {
-          that.scanFlag = false;
+          that.data.scanFlag = false;
           wx.hideLoading();
           getApp().showNetworkError();
         }
@@ -885,7 +884,7 @@ Page({
       success(res) {
         log.info('[首页]', '[获取扫一扫充电桩]', '[响应]', res.data);
         if (!res.data || res.data.code == 500) {
-          that.scanFlag = false;
+          that.data.scanFlag = false;
           wx.hideLoading();
           //没有该充电桩信息
           wx.showModal({
@@ -916,13 +915,13 @@ Page({
             });
             log.info('[首页]', '[扫一扫充电桩空闲跳转去充电界面]');
             let url = `/pages/scan_result/scan_result`;
-            that.scanFlag = false;
+            that.data.scanFlag = false;
             wx.hideLoading();
             wx.navigateTo({
               url
             });
           }
-          that.scanFlag = false;
+          that.data.scanFlag = false;
           wx.hideLoading();
         }
       },
@@ -1058,9 +1057,8 @@ Page({
   },
 
   phoneCheck(){
-
-
     if (this.data.userInfo.bindingPhone==0) {
+      wx.hideLoading();
       wx.showModal({
         title: '提示',
         content: '当前账户未绑定手机号，请您进行手机号绑定操作',
@@ -1084,6 +1082,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
+    this.data.scanFlag = false;
     let userInfo = wx.getStorageSync('userInfo');
     let isLogin = wx.getStorageSync('isLogin');
     // 页面显示

pages/scan_result/scan_result.js

@@ -117,8 +117,8 @@ Page({
         // carParkingRate: false,
         // parkTime: 0,
         console.info(res)
-        let dataSharePlatform = res.data.dataSharePlatform;
-        if(!dataSharePlatform){
+        let reduceTime = res.data?.reduceTime;
+        if(!reduceTime){
           that.setData({
             carParkingRate:false
           })
@@ -129,7 +129,7 @@ Page({
         })
         try{
           that.setData({
-            parkTime: parseFloat((dataSharePlatform.chargeUserId/ 3600).toFixed(2))
+            parkTime: parseFloat((reduceTime/ 3600).toFixed(2))
           })
         }catch(e){
           that.setData({
@@ -331,12 +331,8 @@ Page({
               console.info(res1)
             }
           });
-
-
-
         }
 
-
 		  },
 		  fail(e) {
 			console.log("查询车辆失败");

pages/scan_result/scan_result.wxml

@@ -1,6 +1,5 @@
 <!--pages/scan_result/scan_result.wxml-->
   <view wx:if="{{chargPile}}"  class="map_text" hover-class='active' >
-    <scroll-view class='context' scroll-y='true' >
     <!-- <view class="map-1" bindtap="getRoute">
       <image src="/images/jt.png"></image>
       <view>路线</view>
@@ -84,12 +83,11 @@
   </view>
   <!-- <text style='line-height:48rpx;color:red;font-size:32rpx;'>2</text>  -->
   <view  style='margin-top:10rpx;' wx:if="{{carParkingRate}}">
-    <rich-text style='line-height:36rpx;color:#1D9BF7;font-size:30rpx;word-break:break-all;'>充电即减免 <text class="richHourNum">{{parkTime}}</text>小时停车费。请您确认入场车辆与启动充电时录入的车牌信息保持一致，如录入不一致将无法享受充电减免停车费优惠。</rich-text>
-  </view>
-  <button wx:if="{{chargPile}}" class='charg_button' bindtap="beginCharge" >开始充电</button>
-  </scroll-view>
+    <rich-text style='line-height:36rpx;color:#1D9BF7;font-size:30rpx;word-break:break-all;font-weight: bold;'>充电即减免 <text class="richHourNum">{{parkTime}}</text>小时停车费。请您确认入场车辆与启动充电时录入的车牌信息保持一致，如录入不一致将无法享受充电减免停车费优惠。</rich-text>
   </view>
 
+  </view>
+  <button wx:if="{{chargPile}}" class='charg_button' bindtap="beginCharge" >开始充电</button>
 
 <!-- <view style="width: 100%;margin-top:50rpx">
   <ad unit-id="adunit-8eb13875bcf592b0" ad-intervals="30"></ad>

pages/scan_result/scan_result.wxss

@@ -108,6 +108,9 @@ text.inline {
   border-radius: 45rpx;
   box-shadow: 0rpx 16rpx 0rpx #edf5fd;
   border: none;
+  position: absolute;
+  bottom: 10rpx;
+  width: 80%;
 }
 
 .charg_button.button-hover {
@@ -133,7 +136,7 @@ text.inline {
   font-size: 26rpx;
 }
 .rtable .rtr.active{
-  color:#d57a80;
+  color:#f06c6c;
   font-weight: bold;
   font-size: 28rpx;
   font-style: italic;

pages/search_result/search_result.js

@@ -483,36 +483,68 @@ Page({
   },
   goIndex(e) {
     //console.log(e);
+    let that = this;
     let markerId = e.currentTarget.id;
     let pages = getCurrentPages();
     let prevPage = pages[0]; //首页
     let markers =  this.data.markers; //首页
     this.data.markers.forEach((item, index) => {
       if (markerId && markerId == item.id) {
-        let {
-          latitude,
-          longitude
-        } = item;
-        prevPage.setData({
-          markers,
-          markerId,
-          latitude,
-          longitude,
-          keywords: this.data.keywords,
-          textData: item
-        });
-        console.info({
-          markers,
-          markerId,
-          latitude,
-          longitude,
-          keywords: this.data.keywords,
-          textData: item
-        })
 
         wx.navigateBack({
           delta: pages.length
         });
+        wx.request({
+          url: getApp().globalData.postHeadAgreement + '/restapi/wechat/carParkingRate?stationId=' + item.id,
+          method: 'POST',
+          success: function (res) {
+            // 是否减免停车费
+            let carParkingRate =  false
+            let parkTime = 0;
+            console.info(res)
+            let reduceTime = res.data?.reduceTime;
+            if(!reduceTime){
+              carParkingRate = false
+            }else{
+              carParkingRate = true
+            }
+            try{
+              parkTime = parseFloat((reduceTime/ 3600).toFixed(2))
+            }catch(e){
+              carParkingRate = false
+            }
+
+            let {
+              latitude,
+              longitude
+            } = item;
+            prevPage.setData({
+              markers,
+              markerId,
+              latitude,
+              longitude,
+              carParkingRate,
+              parkTime,
+              keywords: that.data.keywords,
+              textData: item
+            });
+            console.info({
+              markers,
+              markerId,
+              latitude,
+              longitude,
+              keywords: that.data.keywords,
+              textData: item
+            })
+
+    
+          },
+          fail(e) {
+          console.log("用户数据同步失败");
+          log.info('[扫码]', '[同步用户数据]', '[fail]', e);
+          }
+        });
+
       }
     });
   },

pages/ucenter/car/car.js

@@ -17,6 +17,15 @@ Page({
   showMore(e){
     idx = e.currentTarget.dataset.idx;
     plateNumber = e.currentTarget.dataset.plateNumber;
+    if(idx.defaultType==0){
+      this.setData({
+        textArray : ["设为默认","修改车牌号","删除车牌号"],
+      })
+    }else{
+      this.setData({
+        textArray : ["修改车牌号","删除车牌号"],
+      })
+    }
     selectPopup.show(this.data.textArray,this.data.textArrayColor);
   },
   /**
@@ -105,10 +114,10 @@ Page({
       return;
     }
     let index = e.detail[0]
-    this.data.textArray[index]
+    let textArrVal = this.data.textArray[index]
     // ["设为默认","修改车牌号","删除车牌号"],
     let userInfo = wx.getStorageSync('userInfo');
-    if(index==0){
+    if(textArrVal=="设为默认"){
       console.info("设为默认")
       wx.request({
         url: getApp().globalData.postHeadAgreement + '/restapi/wechat/carAlter?loginName=' + userInfo.loginName,
@@ -127,13 +136,13 @@ Page({
         log.info('[查询车辆]','[fail]', e);
         }
       });
-    }else if(index==1){
+    }else if(textArrVal=="修改车牌号"){
       console.info("修改车牌号")
       let url = '/pages/ucenter/car/bindCar?carId=' + idx.carId + '&plateNumber=' + idx.plateNumber
       wx.navigateTo({
         url
       });
-    }else if(index==2){
+    }else if(textArrVal=="删除车牌号"){
       console.info("删除车牌号")
       wx.showModal({
         title: '提示',
@@ -143,6 +152,9 @@ Page({
         confirmColor:'#00AADD',
         cancelColor:'#00AADD',
         success: function (res1) {
+          if(!res1.confirm){
+            return;
+          }
           wx.request({
             url: getApp().globalData.postHeadAgreement + '/restapi/wechat/carRemove?loginName=' + userInfo.loginName + '&carId=' + idx.carId,
             // data: {