From 1439d37eef76a7e5770fd5d0805f3e2ed4154b5e Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期五, 20 九月 2024 16:14:33 +0800
Subject: [PATCH] update 积分兑换的细节

---
 sub_pages/customer/coupon/good-all.vue      |   10 ++++++++--
 sub_pages/customer/coupon/point-history.vue |   14 ++++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/sub_pages/customer/coupon/good-all.vue b/sub_pages/customer/coupon/good-all.vue
index 48098c8..54bdd00 100644
--- a/sub_pages/customer/coupon/good-all.vue
+++ b/sub_pages/customer/coupon/good-all.vue
@@ -56,8 +56,11 @@
 						{{item.name}}
 					</view>
 					<view class="flex score-info">
-						<view><span class="score">{{item.point||'-'}}</span>积分</view>
-						<view class="button m-l-a m-r-0" @click.stop="exchange('good',item)">兑换</view>
+						<view>
+							<view><span class="score">{{item.point||'-'}}</span> 积分</view>
+							<view class="desc-gray">库存:<span class="">{{item.stock||'0'}}</span></view>
+						</view>
+						<view class="button m-l-a m-r-0 m-t-20" @click.stop="exchange('good',item)">兑换</view>
 					</view>
 				</view>
 			</view>
@@ -85,6 +88,9 @@
 							<view class="t-red">
 								{{item.point||'0'}}积分
 							</view>
+							<view class="m-l-10 desc-gray">
+								库存:{{item.stock||'0'}}
+							</view>
 							<view class="button m-l-a m-r-15" :class="[item.stock===0?'over':'']"
 								@click="exchange('coupon',item)">
 								{{item.stock===0?'已售磬':'兑换'}}
diff --git a/sub_pages/customer/coupon/point-history.vue b/sub_pages/customer/coupon/point-history.vue
index 8f4b8a0..eed335b 100644
--- a/sub_pages/customer/coupon/point-history.vue
+++ b/sub_pages/customer/coupon/point-history.vue
@@ -6,12 +6,22 @@
 		<view class="component-filter-container m-t-12 flex">
 			<view class="flex1 w-fit m-l-a m-r-0" @click="show_time_picker_time=true"
 				:class="[query.recordDateStart?'':'desc-gray']">
-				{{query.recordDateStart&&( (query.recordDateStart||'') + ' ~ ' + (query.recordDateEnd || '')) || '请选择日期'}}
+				<!-- {{query.recordDateStart&&( (query.recordDateStart||'') + ' ~ ' + (query.recordDateEnd || '')) || '请选择日期'}} -->
+				{{query.recordDateStart || '请选择日期'}}
 				<image src="@/static/common/icon-arrow-down.png" class="icon-arrow-down"></image>
 			</view>
 			<view class="flex1 w-fit m-l-a m-r-0" @click.stop="$refs.popup_level.open()">
 				{{ query.typeStr || '积分类型' }}
 				<image src="@/static/common/icon-arrow-down.png" class="icon-arrow-down"></image>
+			</view>
+			<view class="flex1 w-fit m-l-a m-r-0" @click.stop="()=>{
+				query.typeStr = ''
+				query.type = ''
+				query.recordDateStart = ''
+				query.recordDateEnd = ''
+				refreshList()
+			}">
+				重置
 			</view>
 		</view>
 		<view class="p15" style="min-height: calc(100vh - 260rpx);">
@@ -40,7 +50,7 @@
 		<!-- 判断是否到底了,自动吧 -->
 		<footer-msg :more="page.total>0&&page.total>page.current*page.size"></footer-msg>
 
-		<u-calendar :show="show_time_picker_time" mode="range" @confirm="select_time_picker_time" :monthNum="3"
+		<u-calendar :show="show_time_picker_time" mode="single" @confirm="select_time_picker_time" :monthNum="3"
 			@cancel="show_time_picker_time = false" rowHeight="100" @close="show_time_picker_time = false"
 			minDate="2024-07-01" :maxDate="maxDate" toolTip="选择日期">
 		</u-calendar>

--
Gitblit v1.9.3