From 92a4759e242421f578d463e457fcea33893c6c2a Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期六, 14 九月 2024 18:33:12 +0800
Subject: [PATCH] 完成合并并解决冲突
---
sub_pages/customer/coupon/point-history.vue | 83 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 78 insertions(+), 5 deletions(-)
diff --git a/sub_pages/customer/coupon/point-history.vue b/sub_pages/customer/coupon/point-history.vue
index 8183fd0..e0107f5 100644
--- a/sub_pages/customer/coupon/point-history.vue
+++ b/sub_pages/customer/coupon/point-history.vue
@@ -1,6 +1,36 @@
<template>
+ <!-- 列表页面 -->
<view>
-
+ <view class="m-t-12 m-b-12 flex">
+ <!-- v-if="!selecttoday" -->
+ <view class="m-l-a m-r-20 w-fit" :class="[query.date?'':'desc-gray']" @click="show_time_picker_time=true">
+ {{query.date || '请选择日期'}}
+ </view>
+ </view>
+ <view class="p15" style="min-height: calc(100vh - 260rpx);">
+ <no-data v-if="!list||list.length==0" style="width: 100%;"></no-data>
+ <view v-for="(item,index) in list" :key="index" class="m-b-24">
+ <view @click.stop="toDetail(item)" class="notice-item">
+ <view v-if="item.typeStr" class="type">{{item.typeStr||'-'}}</view>
+ <view class="time">{{item.recordDate || ''}}</view>
+ <view class="form-item">
+ <view class="form-item-label">变更类型</view>
+ <view class="form-item-value">{{item.changeTypeStr || ''}}</view>
+ </view>
+ <view class="form-item">
+ <view class="form-item-label">积分</view>
+ <view class="form-item-value">{{item.point || ''}}</view>
+ </view>
+ <view class="form-item">
+ <view class="form-item-label" style="min-width: 80rpx;">备注</view>
+ <view class="form-item-value" style="word-break: break-word;">{{item.remarks || ''}}</view>
+ </view>
+ </view>
+ </view>
+ </view>
+
+ <!-- 判断是否到底了，自动吧 -->
+ <footer-msg :more="page.total>0&&page.total>page.current*page.size"></footer-msg>
</view>
</template>
@@ -8,15 +38,58 @@
export default {
data() {
return {
-
+ query: {
+ // status: ''
+ }
}
},
+ onLoad() {
+
+
+ this.listApi = '/api/customer/point/list'
+
+ this.getList()
+
+ },
+ onReachBottom() {
+ this.getMore()
+ },
+ async onPullDownRefresh() {
+ this.page.current = 1
+ await this.getList()
+ uni.stopPullDownRefresh()
+ },
methods: {
-
+
}
}
</script>
-<style>
+<style lang="scss" scoped>
+ .notice-item {
+ padding: 20rpx;
+ font-size: 28rpx;
+ background-color: #fff;
-</style>
+ .type {
+ font-weight: 600;
+
+ }
+
+ .time {
+ font-size: 24rpx;
+ color: darkgray;
+ }
+
+ .form-item {
+ display: flex;
+
+ .form-item-label {}
+
+ .form-item-value {
+ flex: 1;
+ text-align: right;
+ }
+ }
+ }
+</style>
\ No newline at end of file
--
Gitblit v1.9.3