支付宝支付ddd

doum

6 天以前 3f2a7cb1dab1b9dda4a5667675672f171c793987

支付宝支付ddd

 admin/src/components/business/OperaShopInfoWindow.vue

@@ -1,9 +1,9 @@
<template>
  <GlobalWindow
    :title="title"
    :withFooter="false"
    :visible.sync="visible"
    width="calc(100% - 255px )"
      :title="title"
      :withFooter="false"
      :visible.sync="visible"
      width="calc(100% - 255px )"
  >
    <div class="store-header" v-if="storeInfo">
      <div class="store-header-left">
@@ -292,6 +292,7 @@
    return {
      activeTab: 'performance',
      storeInfo: {},
      visible:false,
      searchForm: {
        orderNo: '',
        goodsInfo: '',
@@ -312,20 +313,25 @@
    })
  },
  methods: {
    handleDateChange (val) {
      this.searchForm.createStartTime = val ? val[0] : ''
      this.searchForm.createEndTime = val ? val[1] : ''
      this.search()
    },
    open (title, row) {
      this.searchForm.memberId = row.id
      detail(row.id)
        .then(res => {
          this.storeInfo = res
          this.activeTab = 'performance'
          this.title = title
          this.visible = true
          this.searchForm.shopId = row.id
          this.search()
        })
        .catch(e => {
          this.$tip.apiFailed(e)
        })
          .then(res => {
            this.storeInfo = res
            this.activeTab = 'performance'
            this.title = title
            this.visible = true
            this.searchForm.shopId = row.id
            this.search()
          })
          .catch(e => {
            this.$tip.apiFailed(e)
          })
    }
  }
}

 admin/src/views/business/driverVerification.vue

@@ -26,10 +26,10 @@
    </el-form>
    <template v-slot:table-wrap>
      <el-table
        :height="tableHeightNew"
        v-loading="isWorking.search"
        :data="tableData.list"
        stripe
          :height="tableHeightNew"
          v-loading="isWorking.search"
          :data="tableData.list"
          stripe
      >
        <el-table-column prop="name" label="司机姓名" min-width="100px"></el-table-column>
        <el-table-column label="性别" min-width="60px">
@@ -50,18 +50,18 @@
            <span style="color: #13ce66;" v-else >审批通过</span>
          </template>
        </el-table-column>
        <el-table-column label="状态" min-width="80px">
          <template slot-scope="{row}">
            <el-switch
              @change="handleStatusChange($event, row)"
              v-model="row.status"
              active-color="#13ce66"
              inactive-color="#ff4949"
              :active-value="0"
              :inactive-value="1"
            ></el-switch>
          </template>
        </el-table-column>
        <!--        <el-table-column label="状态" min-width="80px">
                  <template slot-scope="{row}">
                    <el-switch
                      @change="handleStatusChange($event, row)"
                      v-model="row.status"
                      active-color="#13ce66"
                      inactive-color="#ff4949"
                      :active-value="0"
                      :inactive-value="1"
                    ></el-switch>
                  </template>
                </el-table-column>-->
        <el-table-column label="操作" min-width="100" fixed="right">
          <template slot-scope="{row}">
            <el-button type="text" @click="handleDetail(row)">详情</el-button>
@@ -69,9 +69,9 @@
        </el-table-column>
      </el-table>
      <pagination
        @size-change="handleSizeChange"
        @current-change="handlePageChange"
        :pagination="tableData.pagination"
          @size-change="handleSizeChange"
          @current-change="handlePageChange"
          :pagination="tableData.pagination"
      ></pagination>
    </template>
    <OperaDriverApproval ref="operaDriverApproval" @success="handleApprovalSuccess" />
@@ -145,16 +145,16 @@
    handleExport () {
      this.isWorking.export = true
      exportExcel(this.getTableParams())
        .then(res => {
          this.download(res)
          this.$tip.apiSuccess('导出成功')
        })
        .catch(e => {
          this.$tip.apiFailed(e)
        })
        .finally(() => {
          this.isWorking.export = false
        })
          .then(res => {
            this.download(res)
            this.$tip.apiSuccess('导出成功')
          })
          .catch(e => {
            this.$tip.apiFailed(e)
          })
          .finally(() => {
            this.isWorking.export = false
          })
    }
  }
}

 admin/src/views/business/sysParams.vue

@@ -1,76 +1,76 @@
<template>
  <TableLayout>
    <template v-slot:table-wrap>
      <div class="params-container">
      <div class="section">
        <h3 class="section-title">司机规则</h3>
        <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="label">次，超过次数后，今日不可抢单</span>
      <div class="params-container" :style="' height: '+contentHeight+'px;'">
        <div class="section">
          <h3 class="section-title">司机规则</h3>
          <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="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="label">个，超过该数量不允许抢单<span class="red">（即订单状态=待取件/配送中）</span></span>
          </div>
          <div class="form-item">
            <span class="label">客户下单后每隔</span>
            <el-input-number v-model="form.noGrabNotifyTime" :min="0" controls-position="right"></el-input-number>
            <span class="label">分钟未有司机抢单，系统推送平台管理员</span>
            <el-select v-model="userIds"   multiple  clearable placeholder="请选择">
              <el-option
                  v-for="item in userList"
                  :key="item.id"
                  :label="item.realname"
                  :value="item.id+''" />
            </el-select>
            <span class="label">提醒加急派单处理。</span>
          </div>
          <div class="form-item">
            <span class="label">门店默认配送范围</span>
            <el-input-number v-model="form.defaultDeliveryRange" :min="0" controls-position="right"></el-input-number>
            <span class="label">（公里）</span>
          </div>
        </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 class="red">（即订单状态=待取件/配送中）</span></span>
        </div>
        <div class="form-item">
          <span class="label">客户下单后每隔</span>
          <el-input-number v-model="form.noGrabNotifyTime" :min="0" controls-position="right"></el-input-number>
          <span class="label">分钟未有司机抢单，系统推送平台管理员</span>
          <el-select v-model="userIds"   multiple  clearable placeholder="请选择">
            <el-option
                v-for="item in userList"
                :key="item.id"
                :label="item.realname"
                :value="item.id+''" />
          </el-select>
          <span class="label">提醒加急派单处理。</span>
        </div>
        <div class="form-item">
          <span class="label">门店默认配送范围</span>
          <el-input-number v-model="form.defaultDeliveryRange" :min="0" controls-position="right"></el-input-number>
          <span class="label">（公里）</span>
        </div>
      </div>

      <div class="section">
        <h3 class="section-title">订单规则</h3>
        <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="label">分钟未支付，订单自动取消</span>
        <div class="section">
          <h3 class="section-title">订单规则</h3>
          <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="label">分钟未支付，订单自动取消</span>
          </div>
          <div class="form-item">
            <span class="label">急速达订单计价系数</span>
            <el-input-number v-model="form.urgentCoefficient" :min="0" :precision="2" controls-position="right"></el-input-number>
          </div>
          <div class="form-item">
            <span class="label">物品保费比例</span>
            <el-input-number v-model="form.insuranceRate" :min="0" :precision="2" controls-position="right"></el-input-number>
            <span class="desc">%</span>
          </div>
          <div class="form-item">
            <span class="label">同城寄送模式下，若物品已送达，而客户当天未取件，则后续系统按</span>
            <el-input-number v-model="form.unpickedDiscount" :min="0" :precision="2" controls-position="right"></el-input-number>
            <span class="desc">折扣系数计算</span>
          </div>
          <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="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="label">天后系统结算订单，并给与参与角色按比例分成</span>
          </div>
        </div>
        <div class="form-item">
          <span class="label">急速达订单计价系数</span>
          <el-input-number v-model="form.urgentCoefficient" :min="0" :precision="2" controls-position="right"></el-input-number>
        </div>
        <div class="form-item">
          <span class="label">物品保费比例</span>
          <el-input-number v-model="form.insuranceRate" :min="0" :precision="2" controls-position="right"></el-input-number>
          <span class="desc">%</span>
        </div>
        <div class="form-item">
          <span class="label">同城寄送模式下，若物品已送达，而客户当天未取件，则后续系统按</span>
          <el-input-number v-model="form.unpickedDiscount" :min="0" :precision="2" controls-position="right"></el-input-number>
          <span class="desc">折扣系数计算</span>
        </div>
        <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="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="label">天后系统结算订单，并给与参与角色按比例分成</span>
        </div>
      </div>

      <div class="footer">
        <el-button type="primary" @click="handleSave" :loading="isWorking.save">保存</el-button>
        <div class="footer">
          <el-button type="primary" @click="handleSave" :loading="isWorking.save">保存</el-button>
        </div>
      </div>
    </div>
    </template>
  </TableLayout>
</template>
@@ -85,6 +85,7 @@
  components: { TableLayout },
  data () {
    return {
      contentHeight: 600,
      form: {
        autoCancelTime: '',
        autoConfirmReceipt: '',
@@ -108,6 +109,7 @@
  created () {
    this.loadData()
    this.loadUserlist()
    this.contentHeight =  window.innerHeight -110;
  },
  methods: {
    loadUserlist () {
@@ -160,6 +162,14 @@
<style scoped>
.params-container {
  padding: 20px;
  overflow: auto;
  display: block;
}
/deep/ .el-main{
  width: 100%;
//height: 100%;
  overflow-y: auto  !important ;
  height: calc(100% - 94px);
}
.section {
  margin-bottom: 40px;