diff --git a/common/api.js b/common/api.js
index 8752ef3..b541fe6 100644
--- a/common/api.js
+++ b/common/api.js
@@ -152,6 +152,9 @@ module.exports = (vm) => {
       buildMaQrcode:params => vm.$u.http.get( freightAdmin + '/woss/freightOrder/buildMaQrcode', {params}),
       supplementTrailerVehicle: params => vm.$u.http.get( freightAPI + '/freightOrder/supplementTrailerVehicle', params), // 绑定车挂
       getLatestRemark: params => vm.$u.http.get( freightAPI + '/freightOrder/getLatestRemark', params), // 使用的历史备注
+      getFreightRisk: params => vm.$u.http.get( freightAPI + '/freightRiskException/page', {params}), // 风控异常
+      riskAppeal: params => vm.$u.http.post( freightAPI + '/freightRiskException/complaint', params), // 风控异常-申诉
+      maModifyRemark: params => vm.$u.http.post( freightAPI + '/freightOrder/maModifyRemark', params), // 修改备注
     },
     freightMaRecord: {
       add: params => vm.$u.http.post( freightAPI + '/freightMaRecord/add', params,{custom: {toast:true}}), // 出发到达记录日志
diff --git a/pages.json b/pages.json
index bac2217..5f76892 100644
--- a/pages.json
+++ b/pages.json
@@ -73,6 +73,18 @@
 			}
 		},
 		{
+			"path": "pages/order/risk-abnormal",
+			"style": {
+				"navigationBarTitleText": "风控异常"
+			}
+		},
+		{
+			"path": "pages/order/risk-appeal",
+			"style": {
+				"navigationBarTitleText": "异常申诉"
+			}
+		},
+		{
 			"path": "pages/order/select-remark",
 			"style": {
 				"navigationBarTitleText": "填写备注"
diff --git a/pages/global/search-driver.vue b/pages/global/search-driver.vue
index d3cb1be..db5a622 100644
--- a/pages/global/search-driver.vue
+++ b/pages/global/search-driver.vue
@@ -28,6 +28,9 @@
       </List>
     </template>
     <template #footer>
+      <view style="display: flex; justify-content: center; padding-bottom: 20upx">
+        <u-checkbox-group shape="circle" v-model="checkbox"><u-checkbox label="带入司机最近使用[车牌号]" name="have"></u-checkbox></u-checkbox-group>
+      </view>
       <u-button type="primary" @click="onSelect">确定</u-button>
     </template>
   </Page>
@@ -37,22 +40,31 @@
 import payee from '../../components/card/payee.vue';
 import UText from '../../uni_modules/uview-ui/components/u-text/u-text.vue';
 export default {
-  name: 'change-payee',
+  name: 'change-driver',
   components: { UText, payee },
   data() {
     return {
+      checkbox: [],
       choseIndex: '',
       list: [],
       query: '',
     };
   },
+  onLoad() {
+    let useFlagCache = uni.getStorageSync('FREIGHT_MP_SELECT_DRIVER_USE_FLAG');
+    if (useFlagCache) {
+      this.checkbox = ['have'];
+    }
+  },
   methods: {
     searchAPI(params) {
       return uni.$u.api.filter.freightDriverCommonSelect({ query: this.query, ...params });
     },
     onSelect() {
+      let useFlagCache = this.checkbox.includes('have');
+      uni.setStorageSync('FREIGHT_MP_SELECT_DRIVER_USE_FLAG', useFlagCache);
       let item = this.list[this.choseIndex];
-      uni.$emit('select-driver', item);
+      uni.$emit('select-driver', { ...item, useVehicle: this.checkbox.length > 0 });
       uni.navigateBack();
     },
   },
diff --git a/pages/order/add.vue b/pages/order/add.vue
index b88c3be..bbe5262 100644
--- a/pages/order/add.vue
+++ b/pages/order/add.vue
@@ -364,7 +364,6 @@ export default {
     },
     selectRemark() {
       uni.$once('select-remark', remark => {
-        console.info(remark);
         this.form.remark = remark || '';
       });
       uni.navigateTo({
@@ -376,9 +375,15 @@ export default {
         this.form.driverName = driver.name;
         this.form.driverMobile = driver.mobile;
         this.form.mobile = driver.mobile;
+
         if (driver.mobile) {
           this.mobileChange();
         }
+        if (driver.useVehicle && driver.latestVehicleNo) {
+          this.form.licenseNumber = driver.latestVehicleNo;
+          this.typeCar = 'licenseNumber';
+          this.vehicleChange(driver.latestVehicleNo);
+        }
       });
       uni.navigateTo({
         url: `/pages/global/search-driver`,
diff --git a/pages/order/card.vue b/pages/order/card.vue
index b055ca4..8b0eeed 100644
--- a/pages/order/card.vue
+++ b/pages/order/card.vue
@@ -11,7 +11,10 @@
         <render-dict v-if="item.status" class="status" :style="{ color: colorMap[item.status] }" dict="FREIGHT_ORDER_STATUS" :value="item.status"></render-dict>
       </view>
     </view>
-    <view class="card-order__item"> {{ item.projectName }} | {{ item.loadTime }}装货 </view>
+    <view class="card-order__item-title">
+      <view> {{ item.projectName }} | {{ item.loadTime }}装货 </view>
+      <view v-if="item.waitHandleExceptionNumber" class="exception">{{ item.waitHandleExceptionNumber }}个异常待处理</view>
+    </view>
     <view class="card-order__steps">
       <view class="step">
         <view class="step-item">
@@ -52,6 +55,9 @@
       <view class="amount">
         运费<text class="red">￥{{ item.freightAmount }}</text>
       </view>
+      <view class="status" :style="{ color: payStatusColorMap[item.payStatus], background: bgPayStatusColorMap[item.payStatus] }">
+        <render-dict dict="ONLINE_FREIGHT_ORDER_PAY_PROCESS" :value="item.payStatus"></render-dict>
+      </view>
       <view class="action">
         <zb-tooltip placement="bottom" :visible="visible" @update:visible="e => (visible = e)">
           <template #content>
@@ -105,6 +111,16 @@ export default {
         COMPLETED: '#00B87A',
         CANCEL: '#999999',
       },
+      payStatusColorMap: {
+        PAY_PART_SUCCESS: '#2673FB',
+        PAY_SUCCESS: '#00B87A',
+        NOT_PAY: '#999999',
+      },
+      bgPayStatusColorMap: {
+        PAY_PART_SUCCESS: 'rgba(38, 115, 251, 0.1)',
+        PAY_SUCCESS: 'rgba(0, 184, 122, 0.1)',
+        NOT_PAY: 'rgba(153, 153, 153, 0.1)',
+      },
     };
   },
   methods: {
@@ -185,6 +201,18 @@ export default {
       color: $color-red;
     }
   }
+  &__item-title {
+    margin-top: $padding-xs;
+    display: flex;
+    font-size: 26upx;
+    color: #999999;
+    align-items: baseline;
+    justify-content: space-between;
+    .exception {
+      font-size: 24upx;
+      color: #ffcc00;
+    }
+  }
   &__item {
     margin-top: $padding-xs;
     display: flex;
@@ -280,6 +308,12 @@ export default {
         color: #ff4f3b;
       }
     }
+    .status {
+      font-size: 24upx;
+      padding: 0 $padding-base;
+      border-radius: $radius-md;
+      margin-left: $padding-base;
+    }
     .action {
       flex: 1;
       display: flex;
@@ -304,7 +338,7 @@ export default {
         display: flex;
         align-items: center;
         justify-content: center;
-        margin-left: $padding-sm;
+        margin-left: $padding-base;
         .sx-img {
           height: 12upx;
           width: 14upx;
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index c72b0be..c008777 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -86,7 +86,12 @@
         </view>
         <view class="card__item">
           <view class="card__item_field">订单备注</view>
-          <view class="card__item_content">{{ item.remark ? item.remark : '' }}</view>
+          <view class="card__item_content">
+            <view class="text"> {{ item.remark ? item.remark : '' }} </view>
+            <view v-if="$permission('/freightOrder/modifyGoods')" class="action" @tap="modifyRemark">
+              <u--text text="修改" suffixIcon="arrow-right"></u--text>
+            </view>
+          </view>
         </view>
         <view class="card__item">
           <view class="card__item_field">回单照片</view>
@@ -180,6 +185,16 @@
           </view>
         </view>
       </view>
+      <view v-if="item.waitHandleExceptionNumber" class="card">
+        <view class="card__header" style="margin-bottom: 0; padding-bottom: 0; border-bottom: none">
+          <view class="label"> 风控异常 </view>
+          <view class="action" @tap="toRisk">
+            <view class="color-red">
+              <u--text :text="item.waitHandleExceptionNumber + '个待处理异常'" suffixIcon="arrow-right"></u--text>
+            </view>
+          </view>
+        </view>
+      </view>
       <view class="card">
         <view class="card__header">
           <view class="label"> 订单费用 </view>
@@ -418,6 +433,11 @@ export default {
         url: '/pages/global/search-payee',
       });
     },
+    toRisk() {
+      uni.navigateTo({
+        url: '/pages/order/risk-abnormal?code=' + this.item.code,
+      });
+    },
     modifyCustomerFun() {
       uni.$u.api.freightOrder.modifyCustomerOrderCode({ customerOrderCode: this.customerOrderCode, code: this.item.code }).then(res => {
         if (res.success) {
@@ -426,6 +446,24 @@ export default {
         }
       });
     },
+    modifyRemark() {
+      uni.$once('select-remark', remark => {
+        this.modifyRemarkHttp(remark);
+      });
+      uni.navigateTo({
+        url: `/pages/order/select-remark?remark=${this.item.remark}`,
+      });
+    },
+    modifyRemarkHttp(remark) {
+      uni.$u.api.freightOrder
+        .maModifyRemark({
+          code: this.item.code,
+          remark: remark,
+        })
+        .then(r => {
+          this.item.remark = remark || '';
+        });
+    },
   },
 };
 </script>
@@ -545,6 +583,7 @@ export default {
         font-style: normal;
         display: flex;
         justify-content: space-between;
+        overflow-wrap: anywhere;
         &_text {
           font-weight: 400;
           font-size: 28upx;
diff --git a/pages/order/risk-abnormal.vue b/pages/order/risk-abnormal.vue
new file mode 100644
index 0000000..0a0c99a
--- /dev/null
+++ b/pages/order/risk-abnormal.vue
@@ -0,0 +1,160 @@
+<template>
+  <Page name="risk-abnormal" flank>
+    <template #content>
+      <List ref="list" v-model="list" :api="searchAPI">
+        <template v-for="(item, index) in list">
+          <view class="risk-card" :key="index">
+            <view class="risk-card__heard">
+              <view>异常编号:{{ item.orderCode }}</view>
+              <view :style="{ color: statusColorMap[item.status] }"><render-dict dict="ONLINE_FREIGHT_RISK_EXCEPTION_STATUS" :value="item.status"></render-dict></view>
+            </view>
+            <view class="risk-card__body">
+              <view class="item">
+                <view class="item_field">异常类型</view>
+                <view class="item_content"><render-dict dict="ONLINE_FREIGHT_RISK_EXCEPTION_TYPE" :value="item.exceptionType"></render-dict></view>
+              </view>
+              <view class="item">
+                <view class="item_field">异常描述</view>
+                <view class="item_content">{{ item.exceptionDesc }}</view>
+              </view>
+              <view class="item">
+                <view class="item_field">异常时间</view>
+                <view class="item_content" style="color: #999">{{ item.riskTime }}</view>
+              </view>
+              <template v-if="!['WAIT_HANDLE'].includes(item.status)">
+                <view class="item item-top-border">
+                  <view class="item_field">申诉说明</view>
+                  <view class="item_content">{{ item.complaintDesc }}</view>
+                </view>
+                <view class="item">
+                  <view class="item_field">申诉时间</view>
+                  <view class="item_content" style="color: #999">{{ item.complaintTime }}</view>
+                </view>
+                <view class="item">
+                  <view class="item_field">申诉举证</view>
+                  <view class="item_content">
+                    <text class="color-primary" @click="previewImage(item.complaintAttachment)">查看图片</text>
+                  </view>
+                </view>
+              </template>
+              <view v-if="['FAIL'].includes(item.status)" class="err-item">
+                <view class="item">
+                  <view class="item_field">审核说明</view>
+                  <view class="item_content">{{ item.auditDesc }}</view>
+                </view>
+                <view class="item">
+                  <view class="item_field">审核时间</view>
+                  <view class="item_content">{{ item.auditTime }}</view>
+                </view>
+              </view>
+            </view>
+            <view v-if="['WAIT_HANDLE', 'FAIL'].includes(item.status)" class="risk-card__foot">
+              <u-button @click="toRisk(item.id)" type="primary">去申诉</u-button>
+            </view>
+          </view>
+        </template>
+      </List>
+    </template>
+  </Page>
+</template>
+
+<script>
+export default {
+  name: 'risk-abnormal',
+  data() {
+    return {
+      statusColorMap: {
+        WAIT_HANDLE: '#ed6a0c',
+        HANDLING: '#1989fa',
+        SUCCESS: '#07c160',
+        FAIL: '#FDD108',
+      },
+      code: '',
+      list: [],
+    };
+  },
+  onLoad(options) {
+    this.code = options.code;
+  },
+  methods: {
+    // 预览图片
+    previewImage(value) {
+      uni.previewImage({ urls: value.replace(/^(\s|\,)+|(\s|\,)+$/g, '').split(',') });
+    },
+    searchAPI(params) {
+      return uni.$u.api.freightOrder.getFreightRisk({ orderCodes: this.code, ...params });
+    },
+    toRisk(id) {
+      uni.navigateTo({
+        url: '/pages/order/risk-appeal?id=' + id,
+        events: {
+          refreshData: () => {
+            this.onSearch();
+          },
+        },
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.page-risk-abnormal {
+  &__content {
+    .risk-card {
+      background: $color-white;
+      border-radius: $radius-md;
+      box-shadow: $shadow-normal;
+      font-size: $font-md;
+      margin-bottom: $padding-md;
+      &__heard {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        border-bottom: 1px solid $color-border;
+        padding: $padding-sm;
+      }
+      &__body {
+        padding: 0 $padding-sm 1upx;
+        .item {
+          display: flex;
+          font-size: 26upx;
+          color: #999999;
+          align-content: baseline;
+          margin: $padding-sm 0;
+          &_field {
+            font-weight: 400;
+            font-size: 28upx;
+            color: #999999;
+            width: 170upx;
+            text-align: left;
+          }
+          &_content {
+            flex: 1;
+            font-weight: 400;
+            font-size: 28upx;
+            color: #2b2a27;
+            text-align: left;
+            font-style: normal;
+            display: flex;
+            justify-content: space-between;
+            overflow-wrap: anywhere;
+          }
+        }
+        .err-item {
+          background: $color-border;
+          padding: 1upx $padding-sm;
+          margin-bottom: $padding-sm;
+        }
+        .item-top-border {
+          border-top: 1px dashed $color-border;
+          padding-top: $padding-sm;
+        }
+      }
+      &__foot {
+        padding: 0 $padding-sm $padding-sm;
+      }
+    }
+  }
+}
+</style>
diff --git a/pages/order/risk-appeal.vue b/pages/order/risk-appeal.vue
new file mode 100644
index 0000000..3fc758a
--- /dev/null
+++ b/pages/order/risk-appeal.vue
@@ -0,0 +1,90 @@
+<template>
+  <Page name="risk-appeal">
+    <template #content>
+      <u-form :model="form" ref="uForm" labelWidth="100">
+        <view class="card">
+          <u-form-item label="申诉说明" required> </u-form-item>
+          <u-textarea v-model="form.desc" border="none" placeholder="申诉说明" />
+        </view>
+        <view class="card">
+          <u-form-item label="申诉举证" required> </u-form-item>
+          <z-upload v-model="form.attachment" :limit="20"></z-upload>
+        </view>
+      </u-form>
+    </template>
+    <template #footer>
+      <u-button type="primary" @tap="submit" :loading="loading">申诉</u-button>
+    </template>
+  </Page>
+</template>
+
+<script>
+import ZUpload from '../../components/zee/z-upload.vue';
+import dayjs from 'dayjs';
+
+export default {
+  name: 'risk-appeal',
+  components: { ZUpload },
+  data() {
+    return {
+      loading: false,
+      form: {
+        desc: '',
+        attachment: '',
+      },
+      id: '',
+    };
+  },
+  onLoad(options) {
+    this.id = options.id;
+  },
+  methods: {
+    submit() {
+      if (!this.form.desc) {
+        uni.showToast({ title: '备注不能为空', icon: 'none' });
+        return;
+      }
+      if (!this.form.attachment) {
+        uni.showToast({ title: '申诉举证附件不能为空', icon: 'none' });
+        return;
+      }
+      if (this.loading) return;
+      this.loading = true;
+      uni.$u.api.freightOrder
+        .riskAppeal({ ...this.form, idList: [this.id] })
+        .then(res => {
+          if (res.success) {
+            this.getOpenerEventChannel().emit('refreshData');
+            setTimeout(() => uni.navigateBack(), 500);
+          }
+        })
+        .catch(e => {
+          this.loading = false;
+        });
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.page-risk-appeal {
+  &__content {
+    padding-top: 0 !important;
+  }
+  &__footer {
+    background: $color-white;
+  }
+  .card {
+    color: #999999;
+    margin: $padding-md;
+    padding: $padding-md;
+    background-color: $color-white;
+    border-radius: $radius-md;
+    box-shadow: $shadow-normal;
+    //.u-form-item {
+    //  padding-left: $padding-md !important;
+    //  padding-right: $padding-sm !important;
+    //}
+  }
+}
+</style>
diff --git a/pages/order/select-remark.vue b/pages/order/select-remark.vue
index c5c044e..ecdb56f 100644
--- a/pages/order/select-remark.vue
+++ b/pages/order/select-remark.vue
@@ -5,8 +5,8 @@
       <view class="his-title">历史备注</view>
       <view class="his-card">
         <view @click="clickItem(item)" class="his-item" v-for="(item, index) in hisList" :key="index">
-			<text>{{ item }}</text>
-		</view>
+          <text>{{ item }}</text>
+        </view>
       </view>
     </template>
     <template #footer>
@@ -23,7 +23,8 @@ export default {
       hisList: [],
     };
   },
-  onLoad() {
+  onLoad(option) {
+    this.remark = option.remark || '';
     this.getHis();
   },
   methods: {
@@ -57,9 +58,9 @@ export default {
         padding: $padding-xs 0;
         color: $color-text-minor;
         border-bottom: 1px solid $color-border;
-		text {
-			overflow-wrap: anywhere;
-		}
+        text {
+          overflow-wrap: anywhere;
+        }
       }
       .his-item:last-child {
         border-bottom: none;
--
libgit2 0.21.0