e43c64e21dc15acb024124347cd3ecf9e131877e..f655afbaae65c67c8a719a88d2d07501515339cd
2025-07-21 doum
前端
f655af 对比 | 目录
2025-07-19 jiangping
Merge remote-tracking branch 'origin/master'
1d3acb 对比 | 目录
2025-07-19 jiangping
前端
c5d1a8 对比 | 目录
已修改6个文件
21 ■■■■■ 文件已修改
admin/src/components/business/OperaMemberDetailWindow.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/admin/src/main/java/com/doumee/api/business/OrdersController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
small-program/pages/balance-details/balance-details.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
small-program/pages/employment-certification/employment-certification.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
small-program/pages/order-details/order-details.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
small-program/utils/http.interceptor.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
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"
@@ -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 {
server/admin/src/main/java/com/doumee/api/business/OrdersController.java
@@ -85,7 +85,7 @@
        ExcelExporter.build(Orders.class).export(ordersList, "订单信息记录", response);
    }
    @ApiOperation("根据ID查询")
    @ApiOperation("根据ID查询 ")
    @GetMapping("/{id}")
    @RequiresPermissions("business:orders:query")
    public ApiResponse findById(@PathVariable Integer id) {
small-program/pages/balance-details/balance-details.vue
@@ -10,7 +10,7 @@
            <view v-if="dataList && dataList.length" class="mx-list-item" v-for="(item, index) in dataList" :key="index">
                <view class="mx-list-item-a">
                    <text>{{item.remark || ''}}</text>
                    <text>{{(item.optType||1 * (item.amount||0)/100).toFixed(2) }}元</text>
                    <text>{{((item.optType||1) * (item.amount||0)/100).toFixed(2) }}元</text>
                </view>
                <view class="mx-list-item-b">
                    <text>交易号:{{item.transactionNo || '-'}}</text>
small-program/pages/employment-certification/employment-certification.vue
@@ -350,8 +350,8 @@
                                    icon: "none",
                                    duration: 2000
                                });
                                uni.navigateBack({
                                    delta: 1
                                uni.switchTab({
                                    url:'/pages/mine/mine'
                                });
                            }
                        }).finally(() => {
small-program/pages/order-details/order-details.vue
@@ -58,7 +58,7 @@
            <view class="order-info-address">
                <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
                <view class="order-info-address-info">
                    <text>{{info.startDate || ''}}-{{info.endDate || ''}}({{info.totalDays||0}}天)</text>
                    <text>{{info.startDate || ''}}{{' 至 '}}{{info.endDate || ''}}({{info.totalDays||0}}天)</text>
                </view>
            </view>
            <view class="address" v-if="info.type===1 && wayList && wayList.length>0">
@@ -445,7 +445,6 @@
                    if(res.code ===200){
                        that.show=false
                        uni.showToast({ title: '订单取消成功', icon: 'error', duration: 2000 });
                        that.getOrderData()
                        if(that.userInfo.id !== that.info.releaseMemberId){
                            uni.navigateBack({ delta: 1 })
                        }else{
small-program/utils/http.interceptor.js
@@ -27,7 +27,7 @@
                title: response.data.message,
                icon: "none",
                duration: 2000
            });
            });
        } 
        return response.data
    }, (response) => {