合伙人订单详细

pages-mine/components/partner-order-item.vue

@@ -1,11 +1,11 @@
 <template>
     <view class="order-item">
         <view class="order-no">
-            订单编号：{{ order.orderNo }}
-            <text class="status">{{ order.status }}</text>
+            订单编号：{{ order.orderId }}
+            <text class="status">{{ statusList[order.status] }}</text>
         </view>
         <view class="book-list">
-            <image v-for="(book, index) in order.books" :key="index" :src="book.cover" mode="aspectFill" class="book-cover"/>
+            <image v-for="(book, index) in order.detailCoverList" :key="index" :src="book" mode="aspectFill" class="book-cover"/>
         </view>
         <view class="order-info">
             <view class="info-row">
@@ -14,19 +14,19 @@
             </view>
             <view class="info-row">
                 <text>买书订单预估金额</text>
-                <text class="amount">¥{{ order.estimatedAmount }}</text>
+                <text class="amount">¥{{ order.orderExpectMoney }}</text>
             </view>
             <view class="info-row">
                 <text>我的预估佣金</text>
-                <text class="commission">¥{{ order.estimatedCommission }}</text>
+                <text class="commission">¥{{ order.expectSettlementMoney }}</text>
             </view>
-            <view class="info-row" v-if="order.finalAmount">
+            <view class="info-row" v-if="order.status==2||order.status==3">
                 <text>买书订单核算金额</text>
-                <text class="amount">¥{{ order.finalAmount }}</text>
+                <text class="amount">¥{{ order.orderFinalMoney || '-' }}</text>
             </view>
-            <view class="info-row" v-if="order.finalCommission">
+            <view class="info-row" v-if="order.status==2||order.status==3">
                 <text>我的结算佣金</text>
-                <text class="commission">¥{{ order.finalCommission }}</text>
+                <text class="commission">¥{{ order.settlementMoney || '-' }}</text>
             </view>
         </view>
         <view class="order-time">创建时间：{{ order.createTime }}</view>
@@ -41,6 +41,16 @@ export default {
             type: Object,
             default: () => ({})
         }
+    },
+    data() {
+        return {
+            statusList: {
+                1: '未结算',
+                2: '已结算',
+                3: '已到账',
+                4: '已失效'
+            }
+        }
     }
 }
 </script>
@@ -55,9 +65,10 @@ export default {
     .order-no {
         display: flex;
         justify-content: space-between;
-        font-size: 14px;
-        color: #333;
         margin-bottom: 12px;
+        font-size: 28rpx;
+        color: #333333;
+        line-height: 36rpx;
 
         .status {
             color: #FF0000;
@@ -65,14 +76,16 @@ export default {
     }
 
     .book-list {
+        width: 100%;
         display: flex;
-        gap: 8px;
-        margin-bottom: 12px;
+        gap: 16rpx;
+        margin-bottom: 20rpx;
+        overflow-x: auto;
 
         .book-cover {
-            width: 60px;
-            height: 80px;
-            border-radius: 4px;
+            width: 132rpx;
+            height: 185rpx;
+            border-radius: 10rpx;
         }
     }
 

pages-mine/pages/partner/income-detail.vue

@@ -1,13 +1,19 @@
 <template>
     <view class="income-detail">
-        <page-scroll ref="pageScroll" url="/api/mock/income-detail" :immediate="true" :slot-empty="true">
+        <page-scroll
+            ref="pageScroll"
+            url="/token/userPartner/incomeList"
+            :immediate="true"
+            :slot-empty="true"
+            @updateList="handleUpdateList"
+        >
             <view class="income-list">
                 <view class="income-item" v-for="(item, index) in mockData" :key="index">
                     <view class="item-left">
-                        <view class="income-title">推广收入</view>
-                        <view class="income-time">{{ item.time }}</view>
+                        <view class="income-title">{{ item.title }}</view>
+                        <view class="income-time">{{ item.createTime }}</view>
                     </view>
-                    <view class="income-amount">+{{ item.amount }}</view>
+                    <view class="income-amount">+{{ item.changeMoney }}</view>
                 </view>
             </view>
         </page-scroll>
@@ -15,17 +21,21 @@
 </template>
 
 <script>
+import pageScroll from '@/components/pageScroll/index.vue'
 export default {
+    components: {
+        pageScroll
+    },
     data() {
         return {
-            mockData: Array(6)
-                .fill()
-                .map(() => ({
-                    time: "2021.2.25 10:48:32",
-                    amount: "100.00",
-                })),
+            mockData: [],
         };
     },
+    methods: {
+        handleUpdateList(data) {
+            this.mockData = data;
+        },
+    },
 };
 </script>
 

pages-mine/pages/partner/order-detail.vue

@@ -8,7 +8,7 @@
 
         <!-- 订单列表 -->
         <page-scroll :page-size="12" @updateList="handleUpdateList" ref="pageRef" slotEmpty
-            url="/token/partner/order/list" :params="params" :immediate="false">
+            url="/token/userPartner/geOrderList" :params="params" :immediate="false">
             <view v-if="orderList.length > 0" class="pad-20">
                 <partner-order-item v-for="order in orderList" :key="order.orderNo" :order="order"></partner-order-item>
             </view>
@@ -29,93 +29,30 @@ export default {
         return {
             tabList: [{
                 name: '全部',
-                status: "-1"
+                status: "NULL"
             },
             {
                 name: '未结算',
-                status: "0"
+                status: "1"
             },
             {
                 name: '未到账',
-                status: "1"
+                status: "2"
             },
             {
                 name: '已到账',
-                status: "2"
+                status: "3"
             },
             {
                 name: '已失效',
-                status: "3"
+                status: "4"
             }
             ],
             currentTab: 0,
             orderList: [],
             params: {},
             // 模拟数据
-            mockOrders: [{
-                orderNo: '54631435441',
-                status: '未结算',
-                books: [
-                    { cover: '/static/book1.jpg' },
-                    { cover: '/static/book2.jpg' },
-                    { cover: '/static/book3.jpg' },
-                    { cover: '/static/book4.jpg' },
-                    { cover: '/static/book5.jpg' }
-                ],
-                orderStatus: '已提交',
-                estimatedAmount: '63.00',
-                estimatedCommission: '6.30',
-                createTime: '2024-12-06 15:00:00'
-            },
-            {
-                orderNo: '54631435441',
-                status: '已失效',
-                books: [
-                    { cover: '/static/book1.jpg' },
-                    { cover: '/static/book2.jpg' },
-                    { cover: '/static/book3.jpg' },
-                    { cover: '/static/book4.jpg' },
-                    { cover: '/static/book5.jpg' }
-                ],
-                orderStatus: '订单取消',
-                estimatedAmount: '63.00',
-                estimatedCommission: '6.30',
-                createTime: '2024-12-06 15:00:00'
-            },
-            {
-                orderNo: '54631435441',
-                status: '未到账',
-                books: [
-                    { cover: '/static/book1.jpg' },
-                    { cover: '/static/book2.jpg' },
-                    { cover: '/static/book3.jpg' },
-                    { cover: '/static/book4.jpg' },
-                    { cover: '/static/book5.jpg' }
-                ],
-                orderStatus: '已结算',
-                estimatedAmount: '63.00',
-                estimatedCommission: '6.30',
-                finalAmount: '58.00',
-                finalCommission: '5.80',
-                createTime: '2024-12-06 15:00:00'
-            },
-            {
-                orderNo: '54631435441',
-                status: '已到账',
-                books: [
-                    { cover: '/static/book1.jpg' },
-                    { cover: '/static/book2.jpg' },
-                    { cover: '/static/book3.jpg' },
-                    { cover: '/static/book4.jpg' },
-                    { cover: '/static/book5.jpg' }
-                ],
-                orderStatus: '已结算',
-                estimatedAmount: '63.00',
-                estimatedCommission: '6.30',
-                finalAmount: '58.00',
-                finalCommission: '5.80',
-                createTime: '2024-12-06 15:00:00'
-            }]
+            mockOrders: []
         }
     },
     onLoad(options) {
@@ -128,9 +65,7 @@ export default {
     },
     methods: {
         loadOrders(bool = false, params = {}) {
-            // 模拟数据，实际开发时删除这行，使用下面的接口调用
-            this.orderList = this.mockOrders
-            // this.$refs.pageRef?.loadData(bool, params);
+            this.$refs.pageRef?.loadData(bool, params);
         },
 
         handleTabChange(index) {