1.兑换详情

pages/integral/exchangeRecord.vue

@@ -20,7 +20,7 @@
 				<view class="goodsRight">
 					<view class="goodsName">{{item.goodsName}}</view>
 					<view class="goodsCount">
-						<view class="jifen">{{item.integral}}<span
+						<view class="jifen">{{item.integral/item.qty}}<span
 								style="font-size: 24rpx; color: #333333; margin-left: 5rpx;">积分</span>
 						</view>
 						<view class="count">x{{item.qty}}</view>
@@ -31,7 +31,7 @@
 			<view class="sum">
 				<span style="font-size: 24rpx; color: #666666; margin-right: 10rpx;">总计</span>
 				<span style="font-size: 32rpx; color: #FF0000; 
-font-weight: 500; margin-right: 5rpx;">553</span>
+font-weight: 500; margin-right: 5rpx;">{{item.integral}}</span>
 				<span style=" font-size: 24rpx; color: #FF0000;">积分</span>
 			</view>
 

pages/integral/recordDetail.vue

@@ -22,10 +22,10 @@
 			<view class="orderState">
 				<image src="../../static/img/icon_order_def.png" mode="" style="width: 44rpx;height: 44rpx;"></image>
 
-
-				<view class="SheetState" v-if="orderData.data.sheetState == 1">未兑换</view>
-				<view class="SheetState" v-if="orderData.data.sheetState == 2">已兑换</view>
-				<view class="SheetState" v-if="orderData.data.sheetState == 3">已取消</view>
+				<!--  hState 0已取消1未兑换2已兑换 -->
+				<view class="SheetState" v-if="orderData.hState == 1">未兑换</view>
+				<view class="SheetState" v-if="orderData.hState == 2">已兑换</view>
+				<view class="SheetState" v-if="orderData.hState == 0">已取消</view>
 
 
 			</view>
@@ -34,7 +34,7 @@
 		</view>
 
 		<!-- 兑换码 -->
-		<view class="orderTop">
+		<view class="orderTop" v-if="orderData.hState==1 || orderData.hState==2">
 
 			<view class="maBox">
 
@@ -42,24 +42,24 @@
 					<span>兑换码</span>
 				</view>
 				<view style="text-decoration:line-through; color: #999999; font-size: 26rpx;"
-					v-if="orderData.SheetState==5 && orderData.ServiceCode!=null">{{orderData.ServiceCode}}</view>
-				<view class="rightShou" v-if="orderData.SheetState==4">
-					<view class="timeRight" style="color: #FF2400;" @click="showMa">收起</view>
+					v-if="orderData.hState==2 && orderData.qrCode!=null">{{orderData.qrCode}}</view>
+				<view class="rightShou" v-if="orderData.hState==1">
+					<view class="timeRight" style="color: #FF2400;" @click="showMa">{{isShowMa==true?'收起':'展开'}}</view>
 					<image src="../../static/img/icon_arrow_up_orange.png" style="width: 17rpx; height: 11rpx;">
 					</image>
 				</view>
-				<view style="color: #999999; font-size: 26rpx;" v-if="orderData.SheetState==5">已使用</view>
+				<view style="color: #999999; font-size: 26rpx;" v-if="orderData.hState==2">已使用</view>
 			</view>
 			<!-- 兑换码 -->
-			<view class="querenMa" v-if="isShowMa==true && orderData.SheetState==4">
+			<view class="querenMa" v-if="isShowMa==true && orderData.hState==1">
 				<view style="color: #FF2400; font-size: 24rpx; text-align: center;">请到店出示券码即可开始服务</view>
 				<view class="maBoximg">
-					<tki-qrcode cid="qrcode1" ref="qrcode" :val="orderData.ServiceCode" :size="308" :unit="unit"
+					<tki-qrcode cid="qrcode1" ref="qrcode" :val="orderData.qrCode" :size="308" :unit="unit"
 						:pdground="pdground" :icon="icon" :iconSize="iconsize" :lv="lv" :onval="onval"
 						:loadMake="loadMake" :usingComponents="true" @result="qrR" />
 				</view>
 				<view style="color: #333333; font-size: 26rpx; font-weight: bold; text-align: center;">
-					{{orderData.ServiceCode}}
+					{{orderData.qrCode}}
 				</view>
 			</view>
 
@@ -67,7 +67,7 @@
 
 
 		<!-- 店铺信息 -->
-		<view class="shopBox">
+		<view class="shopBox" :class="{wuMa:orderData.hState==0}">
 			<image src="../../static/img/icon_store.png" mode="" class="shopBoximg"></image>
 			<view class="shopCont">
 				<view class="shopName">{{orderData.shopInfo.shopName}}</view>
@@ -95,16 +95,16 @@
 		<!-- 商品明细 -->
 		<view class="information">
 
-			
+			<view class="detailedTitle">商品明细</view>
 			<view class="goodsBox">
-				<image :src="item.url" mode="" style="width: 120rpx;height: 120rpx;"></image>
+				<image :src="orderData.integralGoods.img" mode="" style="width: 120rpx;height: 120rpx;"></image>
 				<view class="goodsRight">
-					<view class="goodsName">{{item.goodsName}}</view>
+					<view class="goodsName">{{orderData.integralGoods.name}}</view>
 					<view class="goodsCount">
-						<view class="jifen">{{item.integral}}<span
+						<view class="jifen">{{orderData.integral/orderData.qty}}<span
 								style="font-size: 24rpx; color: #333333; margin-left: 5rpx;">积分</span>
 						</view>
-						<view class="count">x{{item.qty}}</view>
+						<view class="count">x{{orderData.qty}}</view>
 					</view>
 				</view>
 			</view>
@@ -112,7 +112,7 @@
 			<view class="sum">
 				<span style="font-size: 24rpx; color: #666666; margin-right: 10rpx;">总计</span>
 				<span style="font-size: 32rpx; color: #FF0000; 
-			font-weight: 500; margin-right: 5rpx;">553</span>
+			font-weight: 500; margin-right: 5rpx;">{{orderData.integral}}</span>
 				<span style=" font-size: 24rpx; color: #FF0000;">积分</span>
 			</view>
 
@@ -125,16 +125,16 @@
 			<view class="detailedTitle">订单信息</view>
 			<view class="informationLine">
 				<view class="informationTxt">申请单号：</view>
-				<view class="informationNum">{{orderData.data.code}}<span class="codeCopy"
-						@click="copy(orderData.data.code)">复制</span></view>
+				<view class="informationNum">{{orderData.code}}<span class="codeCopy"
+						@click="copy(orderData.code)">复制</span></view>
 			</view>
 			<view class="informationLine">
 				<view class="informationTxt">手机号：</view>
-				<view class="informationNum">{{orderData.data.userMobilePhone}}</view>
+				<view class="informationNum">{{orderData.mobilephone}}</view>
 			</view>
 			<view class="informationLine">
 				<view class="informationTxt">申请时间：</view>
-				<view class="informationNum">{{orderData.data.createTime}}</view>
+				<view class="informationNum">{{orderData.createtime}}</view>
 			</view>
 
 			
@@ -144,7 +144,7 @@
 		
 		<view style="height: 50rpx;background-color: #F4F5F7;"></view>
 
-		<view class="bottom" v-if="orderData.data.sheetState == 1">
+		<view class="bottom" v-if="orderData.hState == 1">
 
 			<view class="cancel" @click="cancelBespeak">取消订单</view>
 			
@@ -185,7 +185,7 @@
 				iconsize: 40, // 二维码图标大小
 				lv: 3, // 二维码容错级别 ， 一般不用设置，默认就行
 				src: '', // 二维码生成后的图片地址或base64
-				isShowMa: false,
+				isShowMa: true,
 
 
 			}
@@ -196,7 +196,7 @@
 			this.SheetType = opt.SheetType
 
 			if (this.id) {
-				// this.getData()
+				this.getData()
 			}
 
 
@@ -205,7 +205,9 @@
 
 		methods: {
 
-
+			showMa() {
+				this.isShowMa = !this.isShowMa
+			},
 
 			copy(txt) {
 				uni.setClipboardData({
@@ -299,25 +301,13 @@
 					title: '加载中'
 				});
 
-				this.$http('openOrderManagement/queryOpenSheet', {
+				this.$http('openIntegralMall/exchangeDetail', {
 
 					id: this.id,
 				}, 'GET').then(res => {
 					uni.hideLoading();
 					this.orderData = res.data;
-					if (this.quanMaList) {
-						this.quanMaList = [];
-					}
-					let maList = this.orderData.OpenSheetQRCode;
-					if (maList) {
-						maList.forEach(item => {
-							if (item.writeoffState == 1) {
-								this.quanMaList.push(item.qrCode);
-							}
-						})
-					}
-
-					console.log('可用券码--', this.quanMaList);
+					
 
 				})
 			},
@@ -358,7 +348,7 @@
 		position: fixed;
 		top: 0;
 		left: 0;
-		z-index: 9999999;
+		z-index: 999;
 	}
 
 	.zdyNav {
@@ -423,7 +413,9 @@
 	.orderTop {
 		background: #FFFFFF;
 		border-radius: 10rpx;
-		margin: 20rpx 24rpx;
+		margin: 20rpx 24rpx;
+		
+		margin-top: -60rpx;
 	}
 
 	.timeLeft {
@@ -434,7 +426,8 @@
 
 	.timeRight {
 		font-size: 26rpx;
-		color: #3F90F7;
+		color: #3F90F7;
+		margin-right: 8rpx;
 	}
 
 
@@ -447,7 +440,7 @@
 	.maBox {
 		display: flex;
 		justify-content: space-between;
-		padding: 24rpx 20rpx;
+		padding: 26rpx 20rpx;
 	}
 
 	.querenMa {
@@ -510,10 +503,12 @@
 		display: flex;
 		padding: 30rpx 20rpx;
 		margin: 0rpx 24rpx;
-		margin-top: -60rpx;
 		background-color: #FFFFFF;
 		border-radius: 10rpx;
 
+	}
+	.wuMa{
+		margin-top: -60rpx;
 	}
 
 	.shopCont {
@@ -644,7 +639,7 @@
 
 	.goodsBox {
 		display: flex;
-		padding: 30rpx 0;
+		padding: 30rpx 20rpx;
 
 		border-bottom: 1rpx solid #EEEEEE;
 	}
@@ -694,7 +689,8 @@
 		margin-top: 34rpx;
 		display: flex;
 		justify-content: flex-end;
-		align-items: center;
+		align-items: center;
+		padding-right: 20rpx;
 	}
 
 	.informationLine {
@@ -731,12 +727,7 @@
 		border-bottom: 1rpx solid #EEEEEE;
 	}
 
-	.goodsName {
-		padding: 20rpx 20rpx 15rpx;
-
-		color: #333333;
-		font-size: 26rpx;
-	}
+	
 
 	.informationNum {
 		color: #333333;
@@ -856,66 +847,5 @@
 		align-content: center;
 	}
 
-	.maBox {
-		width: 100%;
-		height: 100vh;
-		background: rgba(0, 0, 0, 0.4);
-		position: fixed;
-		left: 0;
-		top: 0;
-		z-index: 9999;
-	}
-
-	.querenMa {
-		width: 578;
-		height: 640rpx;
-		background: #ffffff;
-		margin: 0 86rpx;
-		margin-top: 50%;
-		border-radius: 24rpx;
-	}
-
-	.maTop {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 30rpx 20rpx 15rpx;
-	}
-
-
-	.maTitle {
-		color: #666666;
-		font-size: 26rpx;
-		text-align: center;
-		padding-left: 100rpx;
-	}
-
-	.swiper {
-		width: 100%;
-		height: 85%;
-		background: #FFFFFF;
-
-	}
-
-	.swiper-item {
-		width: 100%;
-		height: 100%;
-	}
-
-
-	.maCode {
-
-		font-size: 30rpx;
-		font-weight: 500;
-		color: #333333;
-		line-height: 42rpx;
-		margin-bottom: 40rpx;
-		text-align: center;
-	}
-
-	.maBoximg {
-		width: 400rpx;
-		height: 400rpx;
-		margin-left: 86rpx;
-	}
+	
 </style>