i

src/pages/users/account/index.vue

@@ -3,22 +3,28 @@ import { ref } from "vue";
 import { showToast, useLoad, getStorageSync } from "@tarojs/taro";
 import { getIntegralDetail, getBeanDetail } from "@/api/user";
 
-const tabValue = ref(0);
+const tabValue = ref(1);
 
 const tabsList = ref([
     {
-        title: "积分明细",
-        value: 0,
+        title: "兑换明细",
+        value: 1,
+    },
+    {
+        title: "赠送明细",
+        value: 3,
     },
     {
         title: "豆子明细",
-        value: 1,
+        value: 2,
     },
 ]);
 
 const tabChange = (index: number) => {
     tabValue.value = index;
+    data.value = [];
     getList();
+    page.value.PageNum = 1;
 };
 
 const data = ref([]);
@@ -44,16 +50,16 @@ const pageChange = (e: number) => {
 const getList = async () => {
     try {
         let res: any;
-        if (tabValue.value === 0) {
-            res = await getBeanDetail({
-                PageNum: page.value.PageNum,
-                PageSize: page.value.PageSize,
-            });
+        const newData = {
+            PageNum: page.value.PageNum,
+            PageSize: page.value.PageSize,
+            Type: tabValue.value,
+        };
+        if (tabValue.value === 1 || tabValue.value === 3) {
+            res = await getBeanDetail(newData);
         } else {
-            res = await getIntegralDetail({
-                PageNum: page.value.PageNum,
-                PageSize: page.value.PageSize,
-            });
+            delete data.Type;
+            res = await getIntegralDetail(newData);
         }
         data.value = res.data.data || [];
         page.value.ItemCount = res.data.count;
@@ -96,20 +102,24 @@ const getList = async () => {
             </view>
         </view>
         <view v-if="data.length > 0">
-            <view v-if="tabValue === 0">
+            <view v-if="tabValue === 1 || tabValue === 3">
                 <view
                     class="card-list"
                     v-for="(item, index) in (data as any[])"
                     :key="index"
                 >
                     <view class="left">
-                        <view>购买商品：{{ item.goods_name }}</view>
-                        <view>支付时间：{{ item.add_time.slice(0, 10) }}</view>
+                        <view>商品：{{ item.goods_name }}</view>
+                        <view>时间：{{ item.add_time.slice(0, 10) }}</view>
                     </view>
                     <view class="right">
-                        <view style="color: green"
+                        <view v-if="tabValue === 1" style="color: green"
                             >-<text>{{ item.number }}积分</text></view
                         >
+                        <view v-if="tabValue === 3" style="color: red"
+                            >+<text>{{ item.number }}</text
+                            >积分</view
+                        >
                     </view>
                 </view>
             </view>
@@ -120,9 +130,9 @@ const getList = async () => {
                     :key="index"
                 >
                     <view class="left">
-                        <view>购买商品：{{ item.goods_name }}</view>
-                        <view>支付金额：{{ item.order_number }}元</view>
-                        <view>支付时间：{{ item.add_time.slice(0, 10) }}</view>
+                        <view class="text">商品：{{ item.goods_name }}</view>
+                        <view>金额：{{ item.order_number }}元</view>
+                        <view>时间：{{ item.add_time.slice(0, 10) }}</view>
                     </view>
                     <view class="right">
                         <view style="color: red"
@@ -228,5 +238,25 @@ const getList = async () => {
     padding: 20px;
     justify-content: space-between;
     align-items: center;
+
+    .left {
+        width: 500px;
+
+        .text {
+            text-align: left;
+            width: 100%;
+            // 超出一行隐藏
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 1;
+            overflow: hidden;
+            word-break: break-word;
+        }
+    }
+
+    .right {
+        flex: 1;
+        text-align: right;
+    }
 }
 </style>