From 47e65241cbd0e725592692fab09a90e1a55ca0fa Mon Sep 17 00:00:00 2001
From: h30830569 <30830569@qq.com>
Date: Tue, 31 May 2022 13:40:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E4=BD=A3=E9=87=91=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pageB/comm_rec/index.vue | 31 +++++++++++++++++++++++++------
 src/pages/me/me.vue          |  2 +-
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/pageB/comm_rec/index.vue b/src/pageB/comm_rec/index.vue
index c2947ae..8f28a3c 100644
--- a/src/pageB/comm_rec/index.vue
+++ b/src/pageB/comm_rec/index.vue
@@ -2,16 +2,16 @@
   <view class="px-30rpx pt-20rpx">
     <view class="sticky top-0 z-1500 bg-hex-F5F5F5 rounded-full grid grid-cols-3 text-28rpx text-hex-333 leading-40rpx py-10rpx">
       <view class="text-center">时间</view>
-      <view class="text-center">金额</view>
-      <view class="text-center">信息</view>
+      <view class="text-center">佣金</view>
+      <view class="text-center">状态</view>
     </view>
     <mescroll-body :height="height" ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :down="downOption"
       :up="upOption">
       <block v-for="(item,index) in dataList" :key="index">
         <view  class="grid grid-cols-3 text-28rpx text-h666 py-18rpx mt-16rpx ">
-          <view class="text-center line-1 ">{{item.name}}</view>
-          <view class="text-center price-text">{{item.price}}</view>
-          <view class="text-center " v-if="item.success_time">{{item.success_time.substring(0,10)}}</view>
+          <view class="text-center line-1 ">{{item.created_at*1000 | date('yyyy-mm-dd')}}</view>
+          <view class="text-center price-text">{{item.money}}</view>
+          <view class="text-center ">{{item.status |StatusText}}</view>
         </view>
         <u-line></u-line>
       </block>
@@ -37,6 +37,25 @@
         dataList: [], //获取到的数据
       };
     },
+    filters:{
+      StatusText(value){
+        const status = [{
+          value: 0,
+          label: '待付款'
+        }, {
+          value: 1,
+          label: ' 付款中'
+        }, {
+          value: 2,
+          label: '已付款'
+        }, , {
+          value: 3,
+          label: '付款失败'
+        }]
+        const obj = status.find((e) => e?.value == value) ?? {}
+        return obj?.label ?? value
+      }
+    },
     computed:{
       height() {
         const {
@@ -54,7 +73,7 @@
         this.loadData(page);
       },
       loadData(page) {
-        this.$api.get(`/v1/vip/buy`, {
+        this.$api.get(`/v1/profit`, {
           params: {
             page: page.num,
             per_page: page.size
diff --git a/src/pages/me/me.vue b/src/pages/me/me.vue
index a12c1ce..a2718f9 100644
--- a/src/pages/me/me.vue
+++ b/src/pages/me/me.vue
@@ -147,7 +147,7 @@
           <view class="mt-5rpx">签到积分</view>
         </view> -->
         <view
-           @tap="$u.route('/pages/web_view/index', { url: config.about_us })"
+           @tap="$u.route('/pages/web_view/index', { url: config.article_profit })"
           class="my-base flex items-center justify-center flex-col text-md text-txBase"
         >
           <image class="w-58rpx h-58rpx" src="@/static/images/user/commission.png" mode=""></image>