Merge remote-tracking branch 'origin/master'

rk

2 天以前 c313a253b1fcdc75b6be5db575fc2b29fb407021

 admin/src/views/business/sysParams.vue

@@ -7,12 +7,19 @@
        <div class="form-item">
          <span class="label">司机每日可取消订单次数为</span>
          <el-input-number v-model="form.driverDailyCancelLimit" :min="0" controls-position="right"></el-input-number>
          <span class="desc">次，超过次数后，今日不可抢单</span>
          <span class="label">次，超过次数后，今日不可抢单</span>
        </div>
        <div class="form-item">
          <span class="label">司机最大同时进行中订单数量为</span>
          <el-input-number v-model="form.orderAcceptLimit" :min="0" controls-position="right"></el-input-number>
          <span class="desc">个，超过该数量不允许抢单<span class="red">（即订单状态=待取件/配送中）</span></span>
          <span class="label">个，超过该数量不允许抢单<span class="red">（即订单状态=待取件/配送中）</span></span>
        </div>
        <div class="form-item">
          <span class="label">客户下单后每隔</span>
          <el-input-number v-model="form.orderAcceptLimit" :min="0" controls-position="right"></el-input-number>
          <span class="label">分钟未有司机抢单，系统推送平台管理员</span>
          <el-input-number v-model="form.orderAcceptLimit" :min="0" controls-position="right"></el-input-number>
          <span class="label">提醒加急派单处理。</span>
        </div>
      </div>

@@ -21,7 +28,7 @@
        <div class="form-item">
          <span class="label">超时</span>
          <el-input-number v-model="form.autoCancelTime" :min="0" controls-position="right"></el-input-number>
          <span class="desc">分钟未支付，订单自动取消</span>
          <span class="label">分钟未支付，订单自动取消</span>
        </div>
        <div class="form-item">
          <span class="label">急速达订单计价系数</span>
@@ -40,12 +47,12 @@
        <div class="form-item">
          <span class="label">订单送达后默认</span>
          <el-input-number v-model="form.autoConfirmReceipt" :min="0" controls-position="right"></el-input-number>
          <span class="desc">天后自动确认收货<span class="red">（仅限收件地址不是服务点的情况）</span></span>
          <span class="label">天后自动确认收货<span class="red">（仅限收件地址不是服务点的情况）</span></span>
        </div>
        <div class="form-item">
          <span class="label">订单完成后</span>
          <el-input-number v-model="form.settlementDate" :min="0" controls-position="right"></el-input-number>
          <span class="desc">天后系统结算订单，并给与参与角色按比例分成</span>
          <span class="label">天后系统结算订单，并给与参与角色按比例分成</span>
        </div>
      </div>