From 3a7417af2982bb9720e1b300a01749b479376d6d Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Wed, 25 Sep 2024 15:31:59 +0800
Subject: [PATCH] 9.25

---
 .../pagesHome/PointsMall/PointsMall.vue       | 12 ++--
 .../pagesHome/PointsRedemption/index.vue      | 70 +++++++++++++++++--
 .../pagesHome/goodsDetails/goodsDetails.vue   | 16 +++--
 gasStation-uni/pagesHome/order/order.vue      |  1 +
 4 files changed, 85 insertions(+), 14 deletions(-)

diff --git a/gasStation-uni/pagesHome/PointsMall/PointsMall.vue b/gasStation-uni/pagesHome/PointsMall/PointsMall.vue
index 3685eb3f6..761092b6c 100644
--- a/gasStation-uni/pagesHome/PointsMall/PointsMall.vue
+++ b/gasStation-uni/pagesHome/PointsMall/PointsMall.vue
@@ -34,18 +34,18 @@
 							<view class="hui-time">
 								<view style="color: #FC1708; font-size: 14px;">
 									<span
-										v-if="item.exchangeMethod == '积分' || item.exchangeMethod == '积分+金额' || item.exchangeMethod == '积分+加钱购'">{{item.exchangePoints}}</span>
+										v-if="item.exchangeMethod == '积分' || item.exchangeMethod == '积分+金额' || item.exchangeMethod == '积分+加钱购'">{{item.exchangePoints}}积分</span>
 									<span v-if="item.exchangeMethod == '积分+金额'">+</span>
 									<span
 										v-if="item.exchangeMethod == '金额' || item.exchangeMethod == '积分+金额'">￥{{item.exchangeAmount}}</span>
 
-									<span>积分</span>
+									<!-- <span>积分</span> -->
 								</view>
 
 							</view>
 							<view style="display: flex;align-items: center;justify-content: space-between;">
 								<view class="hui_">
-									￥3.5
+									￥{{item.market || 0}}
 								</view>
 								<view class="anniux">
 									<text v-if="!item.remainingInventory || item.remainingInventory==0"
@@ -109,7 +109,7 @@
 		methods: {
 			transferIndex(index, categoryId) {
 				this.qhindex = index
-				if (categoryId == undefined || categoryId == null) {
+				if (!categoryId) {
 					this.query.categoryId = ''
 				} else {
 					this.query.categoryId = categoryId
@@ -139,7 +139,9 @@
 				}).then((res) => {
 					if (res.code == 200) {
 						this.integralGiftList = res.data.records
-						console.log(this.integralGiftList,142);
+						console.log(res.data, 142);
+					}else{
+						this.integralGiftList = []
 					}
 				})
 			},
diff --git a/gasStation-uni/pagesHome/PointsRedemption/index.vue b/gasStation-uni/pagesHome/PointsRedemption/index.vue
index 6156c3d45..a725358ba 100644
--- a/gasStation-uni/pagesHome/PointsRedemption/index.vue
+++ b/gasStation-uni/pagesHome/PointsRedemption/index.vue
@@ -6,13 +6,14 @@
 				<view class="">积分余额</view>
 				<view class="d-s">{{cardBalance.points || 0}}<u-icon name="arrow-right"></u-icon> </view>
 			</view>
-			<view class="f-box" v-for="(item,index) in 3" :key="index" @click="goDetails()">
-				<view class="f-top">中建锦绣二期站可用</view>
+			<view class="f-box" v-for="(item,index) in integralGiftList" :key="index" @click="goDetails(item)">
+				<view class="f-top">{{item.storeName}}可用</view>
 				<view class="f-bs">
-					<image src="../../static/logo.png" style="width: 60px; height: 60px; "></image>
+					<image v-if="item.coverImage" :src="baseUrl+item.coverImage" mode="aspectFit" style="width: 60px; height: 60px; "></image>
+					<image v-else src="../../static/logo.png" style="width: 60px; height: 60px; "></image>
 					<view class="r-box">
 						<view class="">
-							<view class="m_">虚拟</view>
+							<view class="m_">{{item.giftName}}</view>
 							<view class="p_">300ml瓶装</view>
 							<view class="q_">兑换券</view>
 						</view>
@@ -26,15 +27,21 @@
 					</view>
 				</view>
 			</view>
+
+			<u-empty v-if="integralGiftList.length == 0" style="margin: 5px auto;" mode="data"
+				icon="http://cdn.uviewui.com/uview/empty/data.png">
+			</u-empty>
 		</view>
 	</view>
 </template>
 
 <script>
+	import config from '@/config'
 	import request from '../../utils/request'
 	export default {
 		data() {
 			return {
+				baseUrl: config.baseUrl,
 				query: {
 					chainStoreId: '',
 					couponType: '',
@@ -43,13 +50,66 @@
 					pageSize: 10
 				},
 				cardBalance: {},
+				queryParam: {
+					storeId: uni.getStorageSync('storeId'),
+					status: '启用',
+					categoryId: '',
+					giftName: '',
+					deliveryMethod: '',
+					page: 1,
+					pageSize: 30
+				},
+				integralGiftList:[],
+				total:0
+			}
+		},
+		onPullDownRefresh() {
+			//下拉刷新
+			this.queryParam = {
+				storeId: uni.getStorageSync('storeId'),
+				status: '启用',
+				categoryId: '',
+				giftName: '',
+				deliveryMethod: '',
+				page: 1,
+				pageSize: 30
+			}
+			this.getIntegralGiftList()
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			// 触底加载
+			if (this.queryParam.page >= this.total) {
+				uni.showToast({
+					title: '没有下一页数据',
+					icon: 'none'
+				})
+			} else {
+				this.queryParam.page++
+				this.getIntegralGiftList()
 			}
 		},
 		onShow() {
 			this.query.chainStoreId = uni.getStorageSync('chainStoreId');
 			this.getUserBalance()
+			this.getIntegralGiftList()
 		},
 		methods: {
+
+			// 获取积分商城列表
+			getIntegralGiftList() {
+				request({
+					url: 'business/integral/integralGift/queryByPageByStoreId',
+					method: 'get',
+					params: this.queryParam
+				}).then((res) => {
+					if (res.code == 200) {
+						this.integralGiftList = res.data.records
+						this.total = res.data.total
+						console.log(res,100);
+					}
+				})
+			},
 			// 获取余额信息
 			getUserBalance() {
 				request({
@@ -67,7 +127,7 @@
 					url: '/pagesMy/integral/integral'
 				})
 			},
-			goDetails() {
+			goDetails(data) {
 				uni.navigateTo({
 					url: '/pagesHome/PointsRedemption/details'
 				})
diff --git a/gasStation-uni/pagesHome/goodsDetails/goodsDetails.vue b/gasStation-uni/pagesHome/goodsDetails/goodsDetails.vue
index 448953ac1..1b19003f7 100644
--- a/gasStation-uni/pagesHome/goodsDetails/goodsDetails.vue
+++ b/gasStation-uni/pagesHome/goodsDetails/goodsDetails.vue
@@ -12,13 +12,20 @@
 			</view>
 			<view class="bai-box">
 				<view class="box-title">{{goodsInfo.giftName}}</view>
-				<view class="price_num">100积分</view>
+				<view class="price_num">
+					<span
+						v-if="goodsInfo.exchangeMethod == '积分' || goodsInfo.exchangeMethod == '积分+金额' || goodsInfo.exchangeMethod == '积分+加钱购'">{{goodsInfo.exchangePoints}}积分</span>
+					<span v-if="goodsInfo.exchangeMethod == '积分+金额'">+</span>
+					<span
+						v-if="goodsInfo.exchangeMethod == '金额' || goodsInfo.exchangeMethod == '积分+金额'">￥{{goodsInfo.exchangeAmount}}</span>
+				</view>
+
 				<view class="dt-box">
 					<view class="hui_">
-						￥3.5
+						￥{{goodsInfo.market}}
 					</view>
-					<view class="or_size">
-						门店自提
+					<view class="or_size" v-if="goodsInfo.deliveryMethod">
+						{{JSON.parse(goodsInfo.deliveryMethod)}}
 					</view>
 				</view>
 			</view>
@@ -64,6 +71,7 @@
 				}
 			})
 			uni.$emit('un')
+			console.log(this.goodsInfo,67);
 		},
 
 		methods: {
diff --git a/gasStation-uni/pagesHome/order/order.vue b/gasStation-uni/pagesHome/order/order.vue
index e78db4fda..428c69148 100644
--- a/gasStation-uni/pagesHome/order/order.vue
+++ b/gasStation-uni/pagesHome/order/order.vue
@@ -191,6 +191,7 @@
 
 
 		methods: {
+
 			goAddress(){
 				uni.navigateTo({
 					url:'/pagesHome/Address/Address'