Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

k94314517

2025-03-19 5b1b663f77cb59599302a93fb6cb2da208602c34

 admin/src/views/business/wxBillDetail.vue

@@ -60,9 +60,14 @@
            <span>{{scope.row.total == 0 ? '-' : scope.row.total }}</span>
          </template>
        </el-table-column>
        <el-table-column prop="bikefee" label="自行车收入（元）" min-width="100px" align="center">
        <el-table-column prop="bikefee" label="骑行收入（元）" min-width="100px" align="center">
          <template slot-scope="scope">
            <span>{{scope.row.bikeFee == 0 ? '-' : scope.row.bikeFee }}</span>
          </template>
        </el-table-column>
        <el-table-column label="套餐收入(元)" min-width="100px" align="center">
          <template slot-scope="scope">
            <span>{{scope.row.discountFee == 0 ? '-' : scope.row.discountFee }}</span>
          </template>
        </el-table-column>
        <!-- v-if="containPermissions(['business:pricingparam:update', 'business:pricingparam:delete'])" -->
@@ -81,7 +86,6 @@
          </template>
        </el-table-column>
      </el-table>

    </template>
    <BillDetailWindow ref="billDetailWindow"/>
  </TableLayout>
@@ -192,7 +196,6 @@
    search () {
      fetchList(this.searchForm)
        .then(res => {
          console.log(res)
          this.tableData.list = [
            { billType: '交易实收', ...res[0], cmmsAmt: (res[0].sumCmmsAmt + res[0].sumRefundCmmsAmt).toFixed(2) },
            { billType: '退款', ...res[1], cmmsAmt: (res[1].sumCmmsAmt + res[1].sumRefundCmmsAmt).toFixed(2) },
@@ -212,7 +215,7 @@
      this.search()
    },
    arraySpanMethod ({ row, column, rowIndex, columnIndex }) {
      if (rowIndex == 3) {
      if (rowIndex === 3) {
        if (columnIndex === 0) {
          return [1, 8]
        } else {