优化图标大小

otherPages/loadAppoint/allocation.wxml

@@ -12,7 +12,7 @@
           <block wx:for="{{resData}}" wx:key="index">
             <navigator url="" class="listItem">
               <view class="title van-ellipsis">
-                <van-icon class='iconfont' name='/images/menuImg1.png' size="36rpx"></van-icon>
+                <van-icon class='iconfont' name='location-o' size="36rpx"></van-icon>
                 <text>{{item.loadPoint}}</text>
               </view>
               <view class="user"><van-icon name="user-o" size="18"/><text> {{ item.userName }}</text></view>

otherPages/loadAppoint/dispatch.wxml

@@ -12,7 +12,7 @@
           <block wx:for="{{resData}}" wx:key="index">
             <navigator url="" class="listItem">
               <view class="title van-ellipsis">
-                <van-icon class='iconfont' name='/images/menuImg1.png' size="36rpx"></van-icon>
+                <van-icon class='iconfont' name='location-o' size="36rpx"></van-icon>
                 <text>{{item.loadPoint}}</text>
               </view>
               <!-- <view class="user"><van-icon name="user-o" size="18"/><text> {{ item.userName }}</text></view> -->

pages/index/index.js

@@ -610,6 +610,40 @@ Page({
     })
   },
 
+  //司机取消预约
+  driverCancelFun: function (e) {
+    let _this = this
+    let { id, licenseNumber } = e.currentTarget.dataset
+    wx.showModal({
+      title: '提示！',
+      content: `取消【${licenseNumber}】后不可恢复。确定要取消吗？`,
+      confirmColor: '#FF5B5B',
+      success: function (res) {
+        if (res.confirm) {
+          app.request.POST({
+            url: app.API.stoneAppointCancel,
+            params: {
+              id: id
+            },
+            page: _this,
+            isLoadingTxt: '取消中...',
+            successFun: true
+          }).then(res => {
+            wx.showToast({
+              title: '取消成功',
+              icon: 'success',
+              duration: 1000,
+              mask: true
+            })
+            _this.getListFun(); //刷新列表
+          })
+        } else if (res.cancel) {
+
+        }
+      }
+    })
+  },
+  
   //充电结束预约
   overFun: function (e) {
     let _this = this
@@ -814,11 +848,11 @@ Page({
   onReachBottom: function () {
     this.data.page++;
     let params = {
-      current: this.data.page,
-      size: this.data.limit,
-      licenseNumber: this.data.searchVal,
-      reservationStatus: this.data.applyData[this.data.setIndex].value,
-      reservationType: this.data.typeArray[this.data.typeIndex].code,
+      current           : this.data.page,
+      size              : this.data.limit,
+      licenseNumber     : this.data.searchVal,
+      appointmentStatus : this.data.appointmentStatusArray[this.data.appointmentStatusIndex].dictValue,
+      type              : this.data.appointmentType
     }
     app.request.pageOther({
       url: app.API.appointmentPage,

pages/index/index.wxml

@@ -97,7 +97,7 @@
 
                   <van-button data-index="{{index}}" type="info" data-url="sign?id={{item.recordId}}" catchtap="toLink" size="small" wx:if="{{ item.status == '8' }}">司机确认</van-button>
 
-                  <van-button type="warning" size="small" data-id="{{item.id}}" data-license-number="{{item.licenseNumber}}" catchtap="cancelFun" wx:if="{{ item.status == '8' }}">司机取消</van-button>
+                  <van-button type="warning" size="small" data-id="{{item.id}}" data-license-number="{{item.licenseNumber}}" catchtap="driverCancelFun" wx:if="{{ roleCodeList=='driver' && item.orderType == '1' && item.status == '8' }}">司机取消</van-button>
                   
                   <van-button type="info" size="small" data-url="signFor?id={{item.recordId}}&index={{index}}" catchtap="toLink" wx:if="{{ item.status == '10' && item.orderType == '1' }}">司机回签</van-button>
                 </view>

utils/api.js

@@ -51,7 +51,11 @@ const api = {
   'loadTimeYY':'/biz/bizorderload/getLoadTimeList',//装卸时间列表
 
   //砂石预约
-  'stoneAppointCancel':'/biz/bizappointmentrecord/cloudCancel',//司机取消预约
+  'stoneAppointCancel':'/biz/bizappointmentrecord/cloudCancel',//司机取消：司机如果想要重新装货或者卸货，必须点击司机取消按钮，取消后下发mqtt，等待回应变为一次过磅状态，可重新装卸货，铲车司机确认后重新过二次磅
+  'stoneAppointReplace':'/biz/bizappointmentrecord/replaceAppoint',//  POST  司机调度
+  'stoneAppointSupplierList':'/biz/bizordersupplier/getListBySupplier',//  GET   查询车牌对应供应商的物流订单 ?licenseNumber=
+  'stoneAppointPointList':'/biz/bizorderload/getPointList',//   GET  物流订单装卸点 ?orderId=
+  'stoneAppointLoadTimeList':'/biz/bizorderload/getLoadTimeList',//  GET   物流订单装卸时间 ?orderId=&loadPointId=
 
   //临时预约
   'tempAdd':'/biz/bizappointmentrecord/addTemp',//临时预约-新增

utils/iconfont.wxss

@@ -1,9 +1,9 @@
 /* 在线链接服务仅供平台体验和调试使用，平台不承诺服务的稳定性，企业客户需下载字体包自行发布使用并做好备份。 */
 @font-face {
-  font-family: 'iconfont';  /* Project id 4871829     4970389 */
-  src: url('//at.alicdn.com/t/c/font_4871829_yjqn1hl80a.woff2?t=1749087103293') format('woff2'),
-       url('//at.alicdn.com/t/c/font_4871829_yjqn1hl80a.woff?t=1749087103293') format('woff'),
-       url('//at.alicdn.com/t/c/font_4871829_yjqn1hl80a.ttf?t=1749087103293') format('truetype');
+  font-family: 'iconfont';  /* Project id 4871829 */
+  src: url('//at.alicdn.com/t/c/font_4871829_5w1yb196xl4.woff2?t=1752458683306') format('woff2'),
+       url('//at.alicdn.com/t/c/font_4871829_5w1yb196xl4.woff?t=1752458683306') format('woff'),
+       url('//at.alicdn.com/t/c/font_4871829_5w1yb196xl4.ttf?t=1752458683306') format('truetype');
 }
 
 .iconfont {