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 | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/sub_pages/customer/coupon/point-history.vue b/sub_pages/customer/coupon/point-history.vue
index 92eaacf..e0107f5 100644
--- a/sub_pages/customer/coupon/point-history.vue
+++ b/sub_pages/customer/coupon/point-history.vue
@@ -1,6 +1,12 @@
<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">
@@ -16,8 +22,8 @@
<view class="form-item-value">{{item.point || ''}}</view>
</view>
<view class="form-item">
- <view class="form-item-label">备注</view>
- <view class="form-item-value">{{item.remarks || ''}}</view>
+ <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>
--
Gitblit v1.9.3