From 6dbecca385c24a21a033f4e3cac8fa7ac01dad9e Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期五, 20 九月 2024 09:34:47 +0800
Subject: [PATCH] update 购物券的

---
 sub_pages/customer/coupon/good-all.vue      |   18 +++++++--
 sub_pages/customer/coupon/point-history.vue |   56 +++++++++++++++++++++++++--
 2 files changed, 65 insertions(+), 9 deletions(-)

diff --git a/sub_pages/customer/coupon/good-all.vue b/sub_pages/customer/coupon/good-all.vue
index 79c975d..48098c8 100644
--- a/sub_pages/customer/coupon/good-all.vue
+++ b/sub_pages/customer/coupon/good-all.vue
@@ -85,8 +85,9 @@
 							<view class="t-red">
 								{{item.point||'0'}}积分
 							</view>
-							<view class="button m-l-a m-r-15" @click="exchange('coupon',item)">
-								兑换
+							<view class="button m-l-a m-r-15" :class="[item.stock===0?'over':'']"
+								@click="exchange('coupon',item)">
+								{{item.stock===0?'已售磬':'兑换'}}
 							</view>
 						</view>
 					</view>
@@ -101,7 +102,7 @@
 <script>
 	export default {
 		computed: {
-		
+
 			self_point() {
 				if (this.currentInfo.currentPoint) {
 					if (this.currentInfo.currentPoint >= 10000) {
@@ -110,7 +111,7 @@
 						return this.currentInfo.currentPoint
 					}
 				}
-		
+
 				return 0
 			}
 		},
@@ -122,6 +123,10 @@
 				this.refreshList()
 			},
 			async exchange(type, item) {
+				if (item.stock === 0) {
+					this.$message.showToast('库存为0,无法兑换')
+					return
+				}
 				var api = ''
 				if (type == 'good') {
 					api = '/api/customer/point/goods/exchange'
@@ -275,6 +280,11 @@
 					text-align: center;
 					line-height: 46rpx;
 				}
+
+				.button.over {
+					color: #747374;
+					border: 2rpx solid #747374;
+				}
 			}
 
 			.good-item:nth-child(2n+1) {
diff --git a/sub_pages/customer/coupon/point-history.vue b/sub_pages/customer/coupon/point-history.vue
index 6fe0ef2..8f4b8a0 100644
--- a/sub_pages/customer/coupon/point-history.vue
+++ b/sub_pages/customer/coupon/point-history.vue
@@ -1,10 +1,18 @@
 <template>
 	<!-- 列表页面 -->
 	<view>
-		<view class="m-t-12 m-b-12 text-center" :class="[query.recordDateStart?'':'desc-gray']"
-			@click="show_time_picker_time=true">
-			{{query.recordDateStart&&( (query.recordDateStart||'') + ' ~ ' + (query.recordDateEnd || '')) || '请选择日期'}}
 
+		<!-- 查询条件 -->
+		<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 || '')) || '请选择日期'}}
+				<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>
 		<view class="p15" style="min-height: calc(100vh - 260rpx);">
 			<no-data v-if="!list||list.length==0" style="width: 100%;"></no-data>
@@ -37,6 +45,30 @@
 			minDate="2024-07-01" :maxDate="maxDate" toolTip="选择日期">
 		</u-calendar>
 
+		<uni-popup ref="popup_level" type="bottom">
+			<view class="component-popup_input_all">
+				<view class="text-center m-b-40" style="font-size: 48rpx;font-weight: 600;">点击选择不同类型</view>
+				<view v-for="(item,i) in type_columns" :key="i" class="m-t-20">
+					<view class="m-t-12 flex value-items">
+						<view class="value-item" @click="()=>{
+							if(each.value!==query.value){
+								query.type = each.value
+								query.typeStr = each.label
+								refreshList()
+								$refs.popup_level.close()
+							}																																						
+						}" :class="[query.type==each.value?'cur':'']" v-for="(each, j) in item" :key="j">
+							{{ each.label || '-' }}
+						</view>
+					</view>
+				</view>
+				<view class="button-space"></view>
+				<view>
+					<view class="button-green" @click="$refs.popup_level.close()">关闭
+					</view>
+				</view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
@@ -47,15 +79,29 @@
 				query: {
 					// status: ''
 					recordDateStart: '',
-					recordDateEnd: ''
+					recordDateEnd: '',
+					type: '',
+					typeStr: '',
 				},
 				show_time_picker_time: false,
 				maxDate: '',
+				type_columns: [],
 			}
 		},
 		onLoad() {
 			this.maxDate = this.$util.toDate(new Date())
-
+			this.$http.request('get', '/api/code/value', {
+				params: {
+					type: 'point_type'
+				}
+			}).then(res => {
+				var data = res.data
+				this.type_columns = [data || []]
+				this.type_columns[0].unshift({
+					label: '全部',
+					value: ''
+				})
+			})
 			this.listApi = '/api/customer/point/list'
 
 			this.getList()

--
Gitblit v1.9.3