我的页面 车牌处理

pages/charginfo/charginfo.wxml

@@ -67,7 +67,7 @@
     <view style='line-height: 30rpx'>
       <text decode='true' style='font-size:20rpx;color:#aaaaaa;'>尖峰：7\8月11:00-13:00&nbsp;&nbsp;16:00-17:00</text>
     </view>
--->
+-->    <text class="parkingfee">充电即减免 2 小时停车费</text>
     <scroll-view class='pictureScroll' scroll-x='true'>
       <view wx:for="{{chargfeatureList}}" wx:key="unique" data-index="{{index}}" bindtap="previewImage" class="chargfeatureImage">
       <image src="{{item}}" ></image>
@@ -84,9 +84,11 @@
 			  <view class="status">空闲 {{slowFree}} / 共 {{slowSum}}</view>
 	  </view>
     </view>
+    
     </view>
 
   </view>
+
   <view class="title_list">终端列表</view>
 
   <scroll-view class='context' scroll-y='true' bindscrolltolower="bindScrollTolowerEvent" >

pages/charginfo/charginfo.wxss

@@ -306,3 +306,8 @@ text.price {
 .rtable .rtr .rtd.t2{
   width: 180rpx
 }
+.parkingfee{
+  color: #d57a80;
+  font-size: 28rpx;
+  padding-bottom:10rpx;
+}

pages/index/index.js

@@ -115,6 +115,7 @@ Page({
           },
           method: 'POST',
           success(res) {
+            return
             let {
               data
             } = res;
@@ -1061,6 +1062,7 @@ Page({
         },
         method: 'POST',
         success(res) {
+          return
           let {
             data
           } = res;

pages/index/index.wxml

@@ -48,8 +48,13 @@
         <text class='inline yellow'>{{textData.chargprice == null? '暂无电费' : textData.chargprice}}</text>
         <text decode="true" class='inline price'>&nbsp;{{textData.chargprice == null? '' : '元/度'}}</text>
       </view>
+      <view style="width: 100%;height: 40rpx;display: flex;flex-direction: row;">
       <text class='inline border'>服务费：{{textData.serviceprice == null? '暂无服务费' : textData.serviceprice + ' 元/度'}}</text>
+      <view class="parkingfee"><image src="/images/v2_rxmjcu.png" style="height:30rpx;width:30rpx"/><text class='inline'>减免停车费</text></view>
+    </view>
       <!-- <text class='inline border'>停车费：{{textData.stopprice}}元/小时</text> -->
+     
+      
     </view>
     <view class='navigationTap' catchtap="getRoute"></view>
     <view class='navigation_info'>

pages/index/index.wxss

@@ -491,4 +491,17 @@ rich-text{
   color: rgba(3,155,229,1);
   font-size: 26rpx;
 }
+
+
 /* 通知相关 end */
+.parkingfee{
+  display: inline;
+  margin-left: 30rpx;
+}
+
+.parkingfee text{
+  line-height: 20rpx;
+  color: #9d9d9d;
+  line-height: 25rpx;
+  padding-left: 5rpx;
+}

pages/scan_result/scan_result.wxml

@@ -76,15 +76,15 @@
     <view wx:if="{{chargPile.showinfo}}">
       <rich-text style='line-height:48rpx;color:red;font-size:32rpx;word-break:break-all;'>信息展现：{{chargPile.showinfo}}</rich-text> 
     </view> -->
-    <view wx:if="{{chargPile.showinfo}}" style='margin-top:20rpx;'>
-    <rich-text style='line-height:48rpx;color:#1D9BF7;font-size:32rpx;word-break:break-all;font-weight: bold;'>{{chargPile.showinfo}}</rich-text>
+    <view wx:if="{{chargPile.showinfo}}" style='margin-top:10rpx;'>
+    <rich-text style='line-height:36rpx;color:#1D9BF7;font-size:30rpx;word-break:break-all;font-weight: bold;'>{{chargPile.showinfo}}</rich-text>
   </view>
-  <view  style='margin-top:20rpx;'>
-    <rich-text style='line-height:48rpx;color:red;font-size:32rpx;word-break:break-all;'>您当前余额为：{{repaidbalance}}元。建议参考充电总费用（元/度电）与您爱车的电池容量（度），避免因费用不足导致充电量不足的情况发生。</rich-text><rich-text style='line-height:48rpx;color:black;font-size:32rpx;word-break:break-all;'></rich-text>
+  <view  style='margin-top:10rpx;'>
+    <rich-text style='line-height:36rpx;color:red;font-size:30rpx;word-break:break-all;'>您当前余额为：{{repaidbalance}}元。建议参考充电总费用（元/度电）与您爱车的电池容量（度），避免因费用不足导致充电量不足的情况发生。</rich-text><rich-text style='line-height:48rpx;color:black;font-size:32rpx;word-break:break-all;'></rich-text>
   </view>
   <!-- <text style='line-height:48rpx;color:red;font-size:32rpx;'>2</text>  -->
-  <view  style='margin-top:20rpx;'>
-    <rich-text style='line-height:48rpx;color:#1D9BF7;font-size:32rpx;word-break:break-all;'>充电即减免 {{repaidbalance}}小时停车费。请您确认入场车辆与启动充电时录入的车牌信息保持一致，如录入不一致将无法享受充电减免停车费优惠。</rich-text>
+  <view  style='margin-top:10rpx;'>
+    <rich-text style='line-height:36rpx;color:#1D9BF7;font-size:30rpx;word-break:break-all;'>充电即减免 <text class="richHourNum">{{repaidbalance}}</text>小时停车费。请您确认入场车辆与启动充电时录入的车牌信息保持一致，如录入不一致将无法享受充电减免停车费优惠。</rich-text>
   </view>
   <button wx:if="{{chargPile}}" class='charg_button' bindtap="beginCharge" >开始充电</button>
   </scroll-view>

pages/scan_result/scan_result.wxss

@@ -1,7 +1,6 @@
 /* pages/scan_result/scan_result.wxss */
 page {
   height: 100%;
-  overflow-y:hidden; 
 }
 
 view.inline {
@@ -93,7 +92,7 @@ text.inline {
 }
 .charg_button {
   font-size: 32rpx;
-  margin: 50rpx 65rpx;
+  margin: 20rpx 65rpx;
   height: 90rpx;
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
@@ -156,3 +155,9 @@ text.inline {
   height: 1400rpx;
   width: 100%;
 }
+.richHourNum{
+  display: inline;
+  color: red;
+  padding-left: 10rpx;
+  padding-right: 20rpx;
+}

pages/ucenter/car/bindCar.js

@@ -49,11 +49,51 @@ Page({
     console.info(this.data.updateFlag)
     if(this.data.updateFlag){
       console.info("更新车牌号:" + carNum + ",用户:" + userInfo.loginName + ",车牌号:" + this.data.carId)
-      wx.navigateBack({
-        delta: 1
+
+      wx.request({
+        url: getApp().globalData.postHeadAgreement + '/restapi/wechat/carAlter?loginName=' + userInfo.loginName,
+        data: {
+          defaultType: 1,
+          carId: idx.carId,
+          plateNumber: idx.plateNumber
+        },
+        method: 'POST',
+        success: function (res) {
+          console.info(res)
+          wx.navigateBack({
+            delta: 1
+          });
+        },
+        fail(e) {
+        console.log("更新车牌号失败");
+        log.info('[更新车牌号]','[fail]', e);
+        }
       });
+
+
     }else{
       console.info("新增车牌号:" + carNum + ",用户:" + userInfo.loginName + "")
+
+      wx.request({
+        url: getApp().globalData.postHeadAgreement + '/restapi/wechat/saveCar?loginName=' + userInfo.loginName + '&plateNumber=' + idx.plateNumber + '&defaultType=0',
+        // data: {
+        //   defaultType: 1,
+        //   carId: idx.carId,
+        //   plateNumber: idx.plateNumber
+        // },
+        method: 'POST',
+        success: function (res) {
+          console.info(res)
+          wx.navigateBack({
+            delta: 1
+          });
+        },
+        fail(e) {
+        console.log("新增车牌号失败");
+        log.info('[新增车牌号]','[fail]', e);
+        }
+      });
+
     }
     
     

pages/ucenter/car/car.js

@@ -2,6 +2,7 @@
 
 var selectPopup;
 var idx;
+var plateNumber;
 
 Page({
 
@@ -11,80 +12,11 @@ Page({
   data: {
     textArray : ["设为默认","修改车牌号","删除车牌号"],
     textArrayColor : ["#576B95","#576B95","#576B95"],
-    userCarList: [{
-      "carId":1,
-      "sysUser":{},
-      "plateNumber":'绯·ABCDEFG',
-      "defaultType":1,
-      "status":0
-      },
-      {
-      "carId":2,
-      "sysUser":{},
-      "plateNumber":'绯·ABCDEFG',
-      "defaultType":0,
-      "status":0
-      },
-      {
-      "carId":3,
-      "sysUser":{},
-      "plateNumber":'绯·ABCDEFG',
-      "defaultType":0,
-      "status":0
-      },
-      {
-      "carId":1,
-      "sysUser":{},
-      "plateNumber":'绯·ABCDEFG',
-      "defaultType":0,
-      "status":0
-      },
-      {
-        "carId":0,
-        "sysUser":{},
-        "plateNumber":'绯·ABCDEFG',
-        "defaultType":0,
-        "status":0
-        },
-      {
-        "carId":0,
-        "sysUser":{},
-        "plateNumber":'绯·ABCDEFG',
-        "defaultType":0,
-        "status":0
-        },
-        {
-          "carId":0,
-          "sysUser":{},
-          "plateNumber":'绯·ABCDEFG',
-          "defaultType":0,
-          "status":0
-          },
-          {
-            "carId":0,
-            "sysUser":{},
-            "plateNumber":'绯·ABCDEFG',
-            "defaultType":0,
-            "status":0
-            },
-            {
-              "carId":0,
-              "sysUser":{},
-              "plateNumber":'绯·ABCDEFG',
-              "defaultType":0,
-              "status":0
-              },
-              {
-                "carId":0,
-                "sysUser":{},
-                "plateNumber":'绯·ABCDEFG',
-                "defaultType":0,
-                "status":0
-                },
-    ]
+    userCarList: []
   },
   showMore(e){
     idx = e.currentTarget.dataset.idx;
+    plateNumber = e.currentTarget.dataset.plateNumber;
     selectPopup.show(this.data.textArray,this.data.textArrayColor);
   },
   /**
@@ -105,15 +37,19 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow() {
+    let that = this;
     let userInfo = wx.getStorageSync('userInfo');
 		wx.request({
-		  url: getApp().globalData.postHeadAgreement + '/restapi/wechat/carList',
-		  data: {
-			loginName: userInfo.loginName
-		  },
+		  url: getApp().globalData.postHeadAgreement + '/restapi/wechat/carList?loginName=' + userInfo.loginName,
+		  // data: {
+			// loginName: userInfo.loginName
+		  // },
 		  method: 'POST',
 		  success: function (res) {
         console.info(res)
+        that.setData({
+          userCarList: res.data
+        })
 		  },
 		  fail(e) {
 			console.log("查询车辆失败");
@@ -173,25 +109,26 @@ Page({
     let userInfo = wx.getStorageSync('userInfo');
     if(index==0){
       console.info("设为默认")
-      // wx.request({
-      //   url: getApp().globalData.postHeadAgreement + '/restapi/wechat/carAlter',
-      //   data: {
-      //     loginName: userInfo.loginName,
-      //     carId: idx,
-
-      //   },
-      //   method: 'POST',
-      //   success: function (res) {
-      //     console.info(res)
-      //   },
-      //   fail(e) {
-      //   console.log("查询车辆失败");
-      //   log.info('[查询车辆]','[fail]', e);
-      //   }
-      // });
+      wx.request({
+        url: getApp().globalData.postHeadAgreement + '/restapi/wechat/carAlter?loginName=' + userInfo.loginName,
+        data: {
+          defaultType: 1,
+          carId: idx.carId,
+          plateNumber: idx.plateNumber
+        },
+        method: 'POST',
+        success: function (res) {
+          console.info(res)
+          this.onShow()
+        },
+        fail(e) {
+        console.log("查询车辆失败");
+        log.info('[查询车辆]','[fail]', e);
+        }
+      });
     }else if(index==1){
       console.info("修改车牌号")
-      let url = '/pages/ucenter/car/bindCar?carId=' + idx
+      let url = '/pages/ucenter/car/bindCar?carId=' + idx.carId
       wx.navigateTo({
         url
       });
@@ -205,10 +142,29 @@ Page({
         confirmColor:'#00AADD',
         cancelColor:'#00AADD',
         success: function (res1) {
-          console.info("调用删除车牌号")
+          wx.request({
+            url: getApp().globalData.postHeadAgreement + '/restapi/wechat/carRemove?loginName=' + userInfo.loginName + '&carId=' + idx.carId,
+            // data: {
+            // loginName: userInfo.loginName
+            // },
+            method: 'POST',
+            success: function (res) {
+              console.log("删除车辆成功");
+              console.info(res)
+              this.onShow()
+              // that.setData({
+              //   userCarList: res.data
+              // })
+            },
+            fail(e) {
+            console.log("删除车辆失败");
+            log.info('[删除车辆]','[fail]', e);
+            }
+          });
         }
       });
     }
+    
     // console.log("选择的item下标："+e.detail[0])
     // console.log("组件标识："+e.detail[1])
   },

pages/ucenter/car/car.wxml

@@ -12,7 +12,7 @@
 <view class="hascar" wx:if="{{userCarList.length>0}}" >
   <scroll-view class='context' scroll-y='true'>
     <block wx:for="{{userCarList}}" wx:key="*this">
-      <view data-idx="{{item.carId}}" class="carView" bindtap="showMore">
+      <view data-idx="{{item}}"  data-idn="{{item.plateNumber}}" class="carView" bindtap="showMore">
         <text class="title">{{item.plateNumber}}</text>
         <text class="def" wx:if="{{item.defaultType==1}}">默认</text>
         <image src="/images/car_more.png"/>