小程序微调

pages/charging/charging.js

@@ -485,7 +485,11 @@ Page({
       });
     }, 5000);
   },
-
+  phoneCall(e) {
+    wx.makePhoneCall({
+      phoneNumber: getApp().globalData.helpPhoneNum
+    });
+  },
   /**
    * 生命周期函数--监听页面隐藏
    */

pages/charging/charging.wxml

@@ -6,7 +6,11 @@
       <text class='h1'>终端编号：{{chargPileId}}</text>
     </view>
   </view>
-  <text class="left">地址：{{chargPile.address}}</text>
+  <view class="adress_df">地址：{{chargPile.address}}</view>
+  <view class="desc_text">充电过程中禁止拔枪，如发生火灾请拨打119报警！</view>
+  <view class="desc_text">如发生异常情况请联系客服</view>
+  <view class="desc_text" style="color:#8F8E94" bindtap="phoneCall">客服电话：4009608068</view>
+
   <view class='chargeover'>
     <image src='/images/chargeover_1.png'></image>
     <ec-canvas class="progress_canvas" id="mychart-dom-bar" canvas-id="mychart-bar" ec="{{ ec }}"></ec-canvas>
@@ -34,6 +38,7 @@
     </view>
   </view>
   <!-- <text class="help" decode='true'>客服电话：4009608068&nbsp;&nbsp;&nbsp;&nbsp;工作时间：工作日 08:30-17:00</text> -->
+
 </view>
 
 <button class='{{chargingOrder.chargPileStatus==2?"charg_button":"charg_button_disable"}}' bindtap='{{chargingOrder.chargPileStatus==2?"stopCharging":""}}'>停止充电</button>

pages/charging/charging.wxss

@@ -58,7 +58,7 @@ page {
 }
 
 text {
-  margin: 0 0 20rpx 0;
+  margin: 0 0 10rpx 0;
   display: block;
   font-size: 24rpx;
   font-family: 'Lucida Sans',
@@ -95,9 +95,9 @@ text.inline {
   height: 48rpx;
   min-height: 48rpx;
 }
-text.left {
-  float: left;
-  padding-top: 40rpx;
+.adress_df {
+  padding-top: 20rpx;
+  padding-bottom: 20rpx;
   margin: 0;
   color: #666666;
 }
@@ -156,7 +156,7 @@ text.left {
 }
 
 .text1 {
-  margin: 0rpx 0rpx 20rpx 0rpx;
+  margin: 0rpx 0rpx 10rpx 0rpx;
   color: #03a9dc;
   font-size: 22rpx;
 }
@@ -171,11 +171,11 @@ text.left {
 }
 
 .text3 {
-  margin: 0rpx 0rpx 50rpx 0rpx;
+  /* margin: 0rpx 0rpx 50rpx 0rpx; */
   font-size: 30rpx;
-  line-height: 48rpx;
-  height: 48rpx;
-  min-height: 48rpx;
+  line-height: 38rpx;
+  height: 38rpx;
+  min-height: 38rpx;
   color: #03a9dc;
   font-weight: bold;
 }
@@ -193,10 +193,10 @@ text.left {
 .context{
   background: #fff;
   /* margin-top: 60rpx; */
-  height: 178rpx;
+  height: 168rpx;
   width: 100%;
   text-align: center;
-  min-height: 178rpx;
+  min-height: 168rpx;
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
                  'Lucida Grande',
@@ -212,7 +212,7 @@ text.left {
 .context_view {
   width: 25%;
   /* width: 30%; */
-  height: 178rpx;
+  height: 168rpx;
   display: inline-block;
 }
 .context_view1 {
@@ -243,3 +243,9 @@ text.left {
   margin: 0;
 }
 
+.desc_text{
+  width: 100%;
+  text-align: center;
+  font-size: 22rpx;
+  color:#f06c6c;
+}

pages/reservation/reservation.js

@@ -28,6 +28,7 @@ Page({
     dayFlag3:'',
     dayFlag4:'',
     reservationBtn: false,
+    breakPunishCount: 0
   },
   goReservation(){
     let {
@@ -148,6 +149,11 @@ Page({
         maxEarlyExerciseTime = maxEarlyExerciseTime?maxEarlyExerciseTime:0;
         let maxReservOvertime = res?.data?.result?.reservationConfig?.maxReservOvertime
         maxReservOvertime = maxReservOvertime?maxReservOvertime:0;
+        let breakPunishCount = res?.data?.result?.reservationConfig?.breakPunishCount
+        breakPunishCount = breakPunishCount?breakPunishCount:0;
+
+
+
         let nowZero = new Date();
         nowZero.setMilliseconds(0)
         nowZero.setSeconds(0)
@@ -244,6 +250,7 @@ Page({
           maxReservTime,
           maxEarlyExerciseTime,
           maxReservOvertime,
+          breakPunishCount,
           current,
           second,
           three,

pages/reservation/reservation.wxml

@@ -34,7 +34,7 @@
   </view>
 </view>
 <view class="title2">已被预约时段</view>
-<view class="title2_sub">(显示近4天已被预约时段，以下时段无法重复预约，请酌情选择预约时间)</view>
+<view class="title2_sub">(显示近4天已被预约时段，以下时段无法重复预约，请酌情选择预约时间。预约开始时间前 {{maxEarlyExerciseTime}} 分钟至后 {{maxReservOvertime}} 分钟内启动充电视为履约，其它时间启充或未充电视为违约，违约 {{breakPunishCount}} 次后暂停预约功能)</view>
 <view class="title2_line"></view>
 <scroll-view class="scrollView" scroll-y='true' wx:if="{{timeList.length > 0}}">
   <view wx:for="{{timeList}}" wx:key="unique" data-index="{{index}}" class="card">{{item.starttime}} ~ {{item.endtime}}

pages/reservation/reservation.wxss

@@ -124,6 +124,7 @@ text.inline {
   color: #F06C6C;
   margin-top: 10rpx;
   font-size: 22rpx;
+  width: calc(100% - 20rpx)
 }
 
 .title2_line{
@@ -135,7 +136,7 @@ text.inline {
 
 .scrollView{
   width: calc(100% - 40rpx);
-  height: calc(100vh - 600rpx);
+  height: calc(100vh - 700rpx);
 }
 
 .scrollView .card{

pages/reservation/reservationEdit.js

@@ -149,7 +149,7 @@ Page({
     }
     reservChargeEndTime = reservChargeEndTime + ':00'
     wx.requestSubscribeMessage({
-      tmplIds: ['DA80dlHRpvYMfZVICp-SVPPKuZOKtUd8PT0Rl7PZzuI'],
+      tmplIds: ['DA80dlHRpvYMfZVICp-SVFEqo6v7_7S9wPM4nndHyjE'],
       success (res) { 
         wx.request({
           // url: getApp().globalData.postHeadAgreement +'/restapi/wechat/reserv2?reservChargeStartTime=' + reservChargeStartTime +

pages/scan_result/scan_result.js

@@ -272,7 +272,7 @@ Page({
   beginCharge(e) {
     let that = this
     wx.requestSubscribeMessage({
-      tmplIds: ['3FR5XRyycT81ZWMdVi_ZQYKJcVatZr2Tm7DgcLwCD1I'],
+      tmplIds: ['3FR5XRyycT81ZWMdVi_ZQYKJcVatZr2Tm7DgcLwCD1I','KWHBIONCrdumgTkE1dpIpAZRgrN5TuhpHuZ0uU-Eud4','XWj70eHMLAjLlufPuhE_NQmdSQzhrOwEXIblWveH0bk'],
       success (res33333) {
         
         let userInfo = wx.getStorageSync('userInfo');
@@ -347,6 +347,9 @@ Page({
           log.info('[查询车辆]','[fail]', e);
           }
         });
+      },fail(reee){
+        console.info("ffffffffffffff")
+        console.info(reee)
       }
     })
   

pages/ucenter/yuyt/yuyt.wxss

@@ -19,7 +19,7 @@ page {
   color:#E99D42;
   font-size: 28rpx;
   right: 20rpx;
-  top: 20rpx;
+  top: 60rpx;
 }
 
 .downBtn{