Merge branch '3.0.1' of http://139.186.142.91:10010/r/productDev/parkBike i...

MrShi

5 小时以前 658107c8a09e2ef74bab1ad7114eeaf367848a25

 admin/src/views/business/wxBill.vue

@@ -13,6 +13,10 @@
          format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss"
          @change="selectDate"
        ></el-date-picker>
        <el-button-group class="date-shortcuts">
          <el-button size="mini" @click="setDateRange(7)">近7天</el-button>
          <el-button size="mini" @click="setDateRange(30)">近30天</el-button>
        </el-button-group>
      </el-form-item>
      <section>
        <el-button type="primary" @click="search">搜索</el-button>
@@ -55,6 +59,14 @@
          <div>结算金额(元)</div>
          <div>{{ sumData.total }}</div>
        </div>
        <div class="sum-value">
          <div>骑行收入(元)</div>
          <div>{{ sumData.bikeFee }}</div>
        </div>
        <div class="sum-value">
          <div>套餐收入(元)</div>
          <div>{{ sumData.discountFee }}</div>
        </div>
      </div>
      <el-table
        v-loading="isWorking.search"
@@ -70,12 +82,9 @@
        <el-table-column prop="sumRefundBill" label="退款笔数" min-width="100px" align="center"></el-table-column>
        <el-table-column prop="sumRefundFee" label="退款金额(元)" min-width="100px" align="center"></el-table-column>
        <el-table-column prop="sumRefundCmmsAmt" label="退款手续费(元)" min-width="100px" align="center"></el-table-column>

        <!-- <el-table-column prop="sumSuccessFee" label="应结订单总金额" min-width="100px" align="center"></el-table-column>
        <el-table-column prop="sumCouponRefundFee" label="充值券退款总金额" min-width="100px" align="center"></el-table-column>
        <el-table-column prop="sumApplyRefundFee" label="申请退款总金额" min-width="100px" align="center"></el-table-column> -->
        <el-table-column prop="total" label="结算金额(元)" min-width="100px" align="center"></el-table-column>
        <el-table-column prop="bikeFee" label="自行车收入(元)" min-width="100px" align="center"></el-table-column>
        <el-table-column prop="bikeFee" label="骑行收入(元)" min-width="100px" align="center"></el-table-column>
        <el-table-column prop="discountFee" label="套餐收入(元)" min-width="100px" align="center"></el-table-column>
      </el-table>
      <pagination
        @size-change="handleSizeChange"
@@ -107,7 +116,6 @@
        startDate: ''
      },
      sumData: {

      },
      pickerOptions: {}
    }
@@ -145,6 +153,23 @@
        this.searchForm.startDate = v[0]
        this.searchForm.endDate = v[1]
      }
      this.search()
    },
    setDateRange (days) {
      const end = new Date()
      end.setHours(23, 59, 59, 999)
      const start = new Date()
      start.setTime(start.getTime() - 3600 * 1000 * 24 * (days - 1))
      start.setHours(0, 0, 0, 0)
      const formatDate = (date) => {
        const y = date.getFullYear()
        const m = String(date.getMonth() + 1).padStart(2, '0')
        const d = String(date.getDate()).padStart(2, '0')
        return `${y}-${m}-${d}`
      }
      this.value1 = [`${formatDate(start)} 00:00:00`, `${formatDate(end)} 00:00:00`]
      this.searchForm.startDate = this.value1[0]
      this.searchForm.endDate = this.value1[1]
      this.search()
    },
    // 页码变更处理
@@ -197,4 +222,7 @@
    }
  }
}
.date-shortcuts {
  margin-left: 10px;
}
</style>