Browse Source

接口调试

lilei 2 years ago
parent
commit
2e23f52822

+ 3 - 3
pages/digitalShelf/choosePart.vue

@@ -231,7 +231,7 @@
 				<view style="position: relative;">
 					<u-image src="/static/hb.png" width="700" height="657" @click="toSuccess"></u-image>
 					<view style="font-size: 60rpx;color:#fff;position: absolute;top:50%;text-align: center;width: 100%;">
-						25.00 <text style="font-size: 26rpx;margin-left: 10rpx;">元</text>
+						{{tempData&&tempData.shelfOrder&&tempData.shelfOrder.totalRewardAmount||'0.00'}} <text style="font-size: 26rpx;margin-left: 10rpx;">元</text>
 					</view>
 				</view>
 			</view>
@@ -616,8 +616,8 @@
 						if(res.status == 200){
 							this.tempData = res.data
 							// 有红包活动
-							if(this.hasRedPacket){
-								this.showMask = true
+							if(this.hasRedPacket&&res.data.shelfOrder){
+								this.showMask = !!res.data.shelfOrder.totalRewardAmount
 							}else{
 								this.toSuccess()
 							}

+ 5 - 0
pages/digitalShelf/choosePartResult.vue

@@ -9,6 +9,9 @@
 						<text>{{statusText}}</text>
 					</view>
 					<view class="messageText" v-html="info&&info.shelfOrder&&info.shelfOrder.remindMessage||''"></view>
+					<view class="messageText" v-if="info&&info.shelfOrder&&info.shelfOrder.totalRewardAmount">
+						您已获得<text>{{info.shelfOrder.totalRewardAmount}}</text>元红包奖励,可在“更多-红包奖励”中查看
+					</view>
 					<!-- <view class="button-group"> -->
 						<!-- <button :hover-stop-propagation="true" @click="toScan" v-if="state == 1&&partList.length" class="back" size="mini">扫码拿货</button> -->
 						<!-- <button :hover-stop-propagation="true" :loading="loading" @click="onceQh" v-if="state == 1&&partList.length" class="action" size="mini">一键拿货</button> -->
@@ -258,6 +261,7 @@
 				}
 				.status-row{
 					font-size: 42upx;
+					margin-top: 10rpx;
 					text{
 						margin-left: 10rpx;
 					}
@@ -265,6 +269,7 @@
 				.messageText{
 					font-size: 30upx;
 					text-align: center;
+					color: #f1dfac;
 					text{
 						color: #ffaa00;
 					}

+ 23 - 14
pages/morePage/redPacket.vue

@@ -4,18 +4,18 @@
 			<u-image src="/static/hbheader.jpg" width="750" height="578"></u-image>
 			<!-- 滚动区域 -->
 			<view class="scroll-list" v-if="slist.length">
-				<scrollBox :list="slist" placeText="刚刚得到了1.5元 红包奖励" bgColor="rgba(250, 224, 188, 0.6)"></scrollBox>
+				<scrollBox :list="slist" bgColor="rgba(250, 224, 188, 0.6)"></scrollBox>
 			</view>
 			<view class="amount-box">
-				345.5
+				{{rewardData?rewardData.rewardAmount:'0.00'}}
 				<text>元</text>
 			</view>
 			<view class="view-gz" @click="showModal = true">查看活动规则>></view>
 		</view>
 		<view class="list-box">
 			<view class="codes flex align_center">
-				<view @click="openImg('/static/codetemp.jpg')">
-					<u-image src="/static/codetemp.jpg" width="160" height="160"></u-image>
+				<view @click="openImg()">
+					<u-image :src="hasRedPacket&&hasRedPacket.serviceQrcode" width="160" height="160"></u-image>
 				</view>
 				<view>
 					<view>扫描添加客服微信,领取待发放红包</view>
@@ -31,18 +31,20 @@
 				<swiper class="tablist">
 					<swiper-item class="swiper-item" style="height: 100%;width: 100%;overflow: hidden;">
 						<scroll-view scroll-y style="height: 100%;width: 100%;overflow: auto;" @scrolltolower="onreachBottom">
-							<view class="totalBar" v-if="curTab==1">共<text>20</text>个红包,合计<text>200</text>元</view>
-							<view class="flex align_center justify_between itemlist" v-for="item in 12">
+							<view class="totalBar" v-if="rewardData&&curTab==1&&total">
+								共<text>{{total}}</text>个红包,合计<text>{{rewardData.paidAmount}}</text>元
+							</view>
+							<view class="flex align_center justify_between itemlist" v-for="item in list" :key="item.id">
 								<view class="flex align_center">
-									<view class="imgs">
+									<view class="imgs flex align_center">
 										<u-icon size="30" color="#fff" name="red-packet"></u-icon>
 									</view>
 									<view class="txts">
 										<view class="txts-name">扫描VIN码下单得红包</view>
-										<view class="txts-time">2022-10-28 12:36</view>
+										<view class="txts-time">{{item.rewardCreateDate}}</view>
 									</view>
 								</view>
-								<view class="amount">+0.50</view>
+								<view class="amount">+{{item.totalRewardAmount}}</view>
 							</view>
 							<view style="padding: 20upx;">
 								 <u-empty :src="`/static/nodata.png`" icon-size="180" :text="noDataText" img-width="120" v-if="list.length==0 && status!='loading'" mode="list"></u-empty>
@@ -88,7 +90,7 @@
 				rewardData: null, // 奖励信息
 				slist:[],
 				status: 'loading',
-				noDataText: '暂无红包数据',
+				noDataText: '暂无数据',
 				pageNo: 1,
 				pageSize: 30,
 				total: 0,
@@ -102,10 +104,15 @@
 			this.getUserReward()
 			this.getEwardOrder()
 		},
+		computed: {
+			hasRedPacket(){
+				return this.$store.state.vuex_rewardRule
+			}
+		},
 		methods: {
 			openImg(url){
 				uni.previewImage({
-					urls:[url]
+					urls:[this.hasRedPacket&&this.hasRedPacket.serviceQrcode||'']
 				})
 			},
 			// 活动奖励信息
@@ -116,6 +123,8 @@
 			},
 			tabChange(i){
 				this.curTab = i
+				this.list = []
+				this.total = 0
 				this.getEwardOrder(1)
 			},
 			// 查询列表
@@ -159,9 +168,9 @@
 			// 获取上方滚动扫描记录
 			getScrollLog(){
 				getRewardRollList({pageNo:1,pageSize:1000}).then(res => {
-					this.slist = res.data.list || []
+					this.slist = res.data || []
 					this.slist.map(item => {
-						item.placeText = item.userName + '刚刚得到了1.5元 红包奖励'
+						item.placeText = item.userName + '刚刚得到了'+item.totalRewardAmount+'元 红包奖励'
 					})
 				})
 			},
@@ -198,7 +207,7 @@
 				width:100%;
 				position: absolute;
 				left:10rpx;
-				top:0;
+				top:-10rpx;
 			}
 		}
 		.list-box{