Merge remote-tracking branch 'origin/master'

rk

2025-08-21 37b1176f4b37260bd455891898ed1258c6421607

 admin/src/components/business/OperaMemberDetailWindow.vue

@@ -82,7 +82,11 @@
        </el-table-column>
        <el-table-column prop="createTime" label="收支时间" min-width="150px"  align="center"></el-table-column>
        <el-table-column prop="typeName" label="业务类型" min-width="100px"  align="center"></el-table-column>
        <el-table-column prop="transactionNo" label="订单/交易号" min-width="100px"  align="center">  </el-table-column>
        <el-table-column prop="transactionNo" label="订单/交易号" min-width="100px"  align="center">
          <template slot-scope="{row}">
            <span >{{ row.transactionNo  }}</span>
          </template>
        </el-table-column>
      </el-table>
      <el-pagination
          @current-change="handleCurrentChange0"
@@ -207,7 +211,7 @@
      total: 0,
      tableData: {},
      tableData1: {},
      tableData2:[],
      tableData2: [],
      page0: 1,
      page1: 1,
      loading: false,
@@ -359,7 +363,7 @@
    changeType (e) {
      this.searchForm.acceptMemberId = -1
      this.searchForm.releaseMemberId = -1
      if (e == 0) {
      if (e == 1) {
        this.searchForm.releaseMemberId = this.info.id || -1
        this.searchForm.acceptMemberId = null
      } else {