1.积分兑换详情

pages/integral/recordDetail.vue

@@ -1,40 +1,74 @@
 <template>
 	<view class="box">
-	
-		<!-- 自定义导航 -->
-		<view class="zdyNavBox">
-			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
-			<view class="zdyNav">
-				<view class="zdyNavLeft">
-					<image src="../../static/img/nav_icon_back.png" mode="aspectFit" class="backImg" @click="goback"></image>
-					<image src="../../static/img/nav_icon_home.png" mode="" class="homeImg" @click="gohome"></image>
-				</view>
-				<view class="zdyNavTitle">订单详情</view>
-				<view style="width: 100px;"></view>
-			</view>
-		</view>
-		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
-		<view style="height: 44px;"></view>
-		
-		
+
+		<!-- 自定义导航 -->
+		<view class="zdyNavBox">
+			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+			<view class="zdyNav">
+				<view class="zdyNavLeft">
+					<image src="../../static/img/nav_icon_back.png" mode="aspectFit" class="backImg" @click="goback">
+					</image>
+					<!-- <image src="../../static/img/nav_icon_home.png" mode="" class="homeImg" @click="gohome"></image> -->
+				</view>
+				<view class="zdyNavTitle">详情</view>
+				<view style="width: 50px;"></view>
+			</view>
+		</view>
+		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+		<view style="height: 44px;"></view>
+
+
 		<view class="top">
 			<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>
-				<view class="SheetState" v-if="orderData.data.sheetState == 4">已取消</view>
+				<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>
+
 
 			</view>
 
 
 		</view>
 
+		<!-- 兑换码 -->
+		<view class="orderTop">
+
+			<view class="maBox">
+
+				<view class="timeLeft">
+					<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>
+					<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>
+			<!-- 兑换码 -->
+			<view class="querenMa" v-if="isShowMa==true && orderData.SheetState==4">
+				<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"
+						: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}}
+				</view>
+			</view>
+
+		</view>
+
+
 		<!-- 店铺信息 -->
 		<view class="shopBox">
-			<image src="../../../static/img/icon_store.png" mode="" class="shopBoximg"></image>
+			<image src="../../static/img/icon_store.png" mode="" class="shopBoximg"></image>
 			<view class="shopCont">
 				<view class="shopName">{{orderData.shopInfo.shopName}}</view>
 				<view class="Address">
@@ -44,188 +78,79 @@
 			</view>
 			<view class="shopRightBox" @click="map">
 
-				<image src="../../../static/img/icon_ditu.png" mode="" class="shopRightImg"></image>
+				<image src="../../static/img/icon_ditu.png" mode="" class="shopRightImg"></image>
 
 				<view class="shopRihgtTxt">地图</view>
 			</view>
 			<view class="shopsx"></view>
 			<view class="shopRightBox" @click="call">
 
-				<image src="../../../static/img/icon_phone.png" mode="" class="shopRightImg"></image>
+				<image src="../../static/img/icon_phone.png" mode="" class="shopRightImg"></image>
 
 				<view class="shopRihgtTxt">电话</view>
 			</view>
 		</view>
 
-		<!-- 订单内容 -->
+	
+		<!-- 商品明细 -->
 		<view class="information">
-			<view class="detailedTitle">订单内容</view>
-			<view v-if="orderData.openSheetDetail.length>0" v-for="(item,index) in orderData.openSheetDetail" :key="index">
-				
-					<view class="goodsName">{{item.itemName}}</view>
-					<view class="informationLine2">
-						<view class="salePrice"><span
-								class="informationNum">￥</span>{{item.salePrice}}</view>
-						<view class="informationNum" style="color: #999999;">
-							x{{item.itemQty}}</view>
-					</view>
-				
-			</view>
-			<view v-if="orderData.data.sheetState != 1 && orderData.data.sheetState != 4" class="line"></view>
-			<view v-if="orderData.data.sheetState != 1 && orderData.data.sheetState != 4">
-				<view class="goodsName">
-					券码信息（{{quanMaList.length?quanMaList.length:0}}张可用）
-				</view>
-				<view class="detailedLine" v-for="(v,index) in orderData.OpenSheetQRCode">
-
-					<view v-if="v.writeoffState==1" class="detailedName">
-						<view class="redPoint"></view>
-						<view class="code">{{v.qrCode}}</view>
-						<view class="quanState">待使用</view>
-
-					</view>
-					<view v-if="v.writeoffState==3" class="detailedName">
-						<view class="redPoint"></view>
-						<view class="code old" >{{v.qrCode}}</view>
-						<view class="quanState2">已使用</view>
-					
-					</view>
-					
-					<image src="../../../static/img/icon_erweima.png" mode="" style="width: 36rpx;height: 36rpx;"
-						v-if="v.writeoffState==1" @click="isShowMa=true"></image>
-				</view>
-			</view>
-
-		</view>
-
-		<!-- 套餐内容 -->
-		<view class="information" v-if="SheetType==3">
-			<view class="detailedTitle">套餐内容</view>
-			<!-- 项目 -->
-			<view class="itemBox" v-if="orderData.projectList.length>0">
-				<!-- 头 -->
-				<view class="itemTop">
-					<view class="leftItem">项目名称</view>
-					<view class="topTitle">数量</view>
-					<view class="topTitle">有效期</view>
-				</view>
 
-				<view v-for="(item,index) in orderData.projectList" :key="index">
-					<view class="itemContent">
-						<view class="leftItem">{{item.flowName}}</view>
-						<view class="topTitle">{{item.flowQty}}</view>
-						<view class="topTitle">{{item.date}}</view>
+			
+			<view class="goodsBox">
+				<image :src="item.url" mode="" style="width: 120rpx;height: 120rpx;"></image>
+				<view class="goodsRight">
+					<view class="goodsName">{{item.goodsName}}</view>
+					<view class="goodsCount">
+						<view class="jifen">{{item.integral}}<span
+								style="font-size: 24rpx; color: #333333; margin-left: 5rpx;">积分</span>
+						</view>
+						<view class="count">x{{item.qty}}</view>
 					</view>
 				</view>
 			</view>
 
-			<!-- 商品 -->
-			<view class="itemBox" v-if="orderData.shopList.length>0">
-				<!-- 头 -->
-				<view class="itemTop">
-					<view class="leftItem">商品名称</view>
-					<view class="topTitle">数量</view>
-					<view class="topTitle">有效期</view>
-				</view>
-
-				<view v-for="(item,index) in orderData.shopList" :key="index">
-					<view class="itemContent">
-						<view class="leftItem">{{item.flowName}}</view>
-						<view class="topTitle">{{item.flowQty}}</view>
-						<view class="topTitle">{{item.date}}</view>
-					</view>
-				</view>
+			<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>
+				<span style=" font-size: 24rpx; color: #FF0000;">积分</span>
 			</view>
 
 		</view>
 
-		<!-- 实付款 -->
-		<view class="money">
-			<view class="informationNum">实付款：</view>
-			<view class="informationNum" style="color: #FF0000;font-weight: bold;">￥{{orderData.data.realMoney}}</view>
-		</view>
+		
 
 		<!-- 订单信息 -->
 		<view class="information">
 			<view class="detailedTitle">订单信息</view>
 			<view class="informationLine">
-				<view class="informationTxt">订单单号：</view>
+				<view class="informationTxt">申请单号：</view>
 				<view class="informationNum">{{orderData.data.code}}<span class="codeCopy"
 						@click="copy(orderData.data.code)">复制</span></view>
 			</view>
 			<view class="informationLine">
-				<view class="informationTxt">下单人：</view>
+				<view class="informationTxt">手机号：</view>
 				<view class="informationNum">{{orderData.data.userMobilePhone}}</view>
 			</view>
 			<view class="informationLine">
-				<view class="informationTxt">下单时间：</view>
+				<view class="informationTxt">申请时间：</view>
 				<view class="informationNum">{{orderData.data.createTime}}</view>
 			</view>
 
-			<view class="informationLine">
-				<view class="informationTxt">订单备注：</view>
-				<view class="informationNum" style="width: 510rpx;">{{orderData.data.comment?orderData.data.comment:''}}</view>
-			</view>
-
-		</view>
-
-		<!-- 支付信息 -->
-		<view class="information">
-			<view class="detailedTitle">支付信息</view>
-			<view class="informationLine">
-				<view class="informationTxt">支付状态：</view>
-				<view class="informationNum" v-if="orderData.data.payState==1">未支付</view>
-				<view class="informationNum" v-if="orderData.data.payState==2">已支付</view>
-			</view>
-			<view class="informationLine">
-				<view class="informationTxt">支付方式：</view>
-				<view class="informationNum" v-if="orderData.data.payType==1">在线支付</view>
-				<view class="informationNum" v-if="orderData.data.payType==2">线下支付</view>
-			</view>
-			<view class="informationLine">
-				<view class="informationTxt">支付时间：</view>
-				<view class="informationNum">{{orderData.data.payTime?orderData.data.payTime:'-'}}</view>
-			</view>
+			
 
 		</view>
 
+		
 		<view style="height: 50rpx;background-color: #F4F5F7;"></view>
 
 		<view class="bottom" v-if="orderData.data.sheetState == 1">
 
 			<view class="cancel" @click="cancelBespeak">取消订单</view>
-			<view class="defer" @click="pay">立即支付</view>
+			
 		</view>
 
 
-		<!-- 券码 -->
-		<view class="maBox" v-if="isShowMa==true" @click="isShowMa=false">
-			<view class="querenMa">
-				<view class="maTop">
-					<view class="maTitle">请到店出示券码即可开始服务</view>
-					<image @click="isShowMa=false" src="../../../static/img/icon_delete.png" mode=""
-						style="width: 26rpx;height: 26rpx;margin-left: 10rpx;"></image>
-
-				</view>
-				<swiper class="swiper" circular  :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#D53533">
-					<swiper-item v-for="(item,index) in quanMaList">
-						<view class="swiper-item">
-							<view class="maCode">{{item}}</view>
-							<view class="maBoximg">
-								<tki-qrcode cid="qrcode1" ref="qrcode" :val="item" :size="400" :unit="unit"
-									:pdground="pdground" :icon="icon" :iconSize="iconsize" :lv="lv" :onval="onval"
-									:loadMake="loadMake" :usingComponents="true" @result="qrR" />
-							</view>
-						</view>
-					</swiper-item>
-					
-					
-				</swiper>
-				
-			
-			</view>
-		</view>
-
 
 	</view>
 </template>
@@ -239,8 +164,8 @@
 		data() {
 			return {
 
-				id: '',
-				iStatusBarHeight:'',
+				id: '',
+				iStatusBarHeight: '',
 				SheetType: '', //SheetType 1 商品2项目3套餐4救援5钣喷6集客
 				orderData: '',
 
@@ -260,28 +185,28 @@
 				iconsize: 40, // 二维码图标大小
 				lv: 3, // 二维码容错级别 ， 一般不用设置，默认就行
 				src: '', // 二维码生成后的图片地址或base64
-				isShowMa: false,
-				quanMaList:[],
-				
+				isShowMa: false,
+
+
 			}
 		},
 		onLoad(opt) {
-			 this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
+			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
 			this.id = opt.id
 			this.SheetType = opt.SheetType
 
 			if (this.id) {
-				this.getData()
-			}
-			
+				// this.getData()
+			}
+
+
+		},
+
+
+		methods: {
+
 
-		},
-		
 
-		methods: {
-			
-			
-			
 			copy(txt) {
 				uni.setClipboardData({
 					data: txt,
@@ -294,47 +219,47 @@
 					}
 				});
 			},
-			
-			cancelBespeak(){
-				var that = this
-				uni.showModal({
-				    title: '提示',
-				    content: '是否取消该订单',
-					cancelText:'否',
-					confirmText:'是',
-				    success: function (res) {
-				        if (res.confirm) {
-							
-								uni.showLoading({
-									title: '加载中'
-								})
-								
-								that.$http('openOrderManagement/updateSheetState', {
-							
-									id: that.id,
-							
-								}, 'POST').then(res => {
-									uni.hideLoading();
-									// var list = res.data.Items
-									
-									uni.showToast({
-										title: '取消成功',
-										icon: 'none',
-										duration: 2000
-									});
-									setTimeout(function() {
-										that.getData();
-									}, 1000);
-								})
-							
-				          
-				        } else if (res.cancel) {
-				           
-				        }
-				    }
-				});
+
+			cancelBespeak() {
+				var that = this
+				uni.showModal({
+					title: '提示',
+					content: '是否取消该订单',
+					cancelText: '否',
+					confirmText: '是',
+					success: function(res) {
+						if (res.confirm) {
+
+							uni.showLoading({
+								title: '加载中'
+							})
+
+							that.$http('openOrderManagement/updateSheetState', {
+
+								id: that.id,
+
+							}, 'POST').then(res => {
+								uni.hideLoading();
+								// var list = res.data.Items
+
+								uni.showToast({
+									title: '取消成功',
+									icon: 'none',
+									duration: 2000
+								});
+								setTimeout(function() {
+									that.getData();
+								}, 1000);
+							})
+
+
+						} else if (res.cancel) {
+
+						}
+					}
+				});
 			},
-			
+
 			map() {
 				console.log("打开地图")
 				var that = this;
@@ -380,32 +305,32 @@
 				}, '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);
-					
+					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);
+
 				})
 			},
-			
+
 			goback() {
-				uni.navigateBack({
-				 	delta: 1
+				uni.navigateBack({
+					delta: 1
+				})
+			},
+			gohome() {
+				uni.switchTab({
+					url: '../index/index'
 				})
-			},
-			gohome(){
-				uni.switchTab({
-					url:'../index/index'
-				})
 			},
 
 		},
@@ -425,47 +350,52 @@
 		min-height: 100vh;
 		background: #F4F5F7;
 		padding-bottom: 135rpx;
-	}
-	.zdyNavBox{
-		width: 100vw;
-		background: #FFFFFF;
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 9999999;
-	}
-	.zdyNav{
-		height: 44px;
-		display: flex;
-		justify-content: space-between;
-		
-		align-items: center;
-	}
-	
-	.backImg{
-		width: 44rpx;
-		height: 44rpx;
-		margin-left: 10rpx;
-		margin-right: 20rpx;
-	}
-	.homeImg{
-		width: 44rpx;
-		height: 44rpx;
-		
-	}
-	.zdyNavLeft{
-		display: flex;
-		align-items: center;
-	}
-	.zdyNavTitle{
-		width: 100vw;
-		height: 44px;
-		background: #FFFFFF;
-		text-align: center;
-		font-size: 34rpx;
-		line-height: 44px;
-	}
-	
+	}
+
+	.zdyNavBox {
+		width: 100vw;
+		background: #FFFFFF;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 9999999;
+	}
+
+	.zdyNav {
+		height: 44px;
+		display: flex;
+		justify-content: space-between;
+
+		align-items: center;
+	}
+
+	.backImg {
+		width: 44rpx;
+		height: 44rpx;
+		margin-left: 10rpx;
+		margin-right: 20rpx;
+	}
+
+	.homeImg {
+		width: 44rpx;
+		height: 44rpx;
+
+	}
+
+	.zdyNavLeft {
+		display: flex;
+		align-items: center;
+	}
+
+	.zdyNavTitle {
+		width: 100vw;
+		height: 44px;
+		background: #FFFFFF;
+		text-align: center;
+		font-size: 34rpx;
+		line-height: 44px;
+	}
+
 
 	.top {
 		height: 190rpx;
@@ -490,6 +420,63 @@
 
 	}
 
+	.orderTop {
+		background: #FFFFFF;
+		border-radius: 10rpx;
+		margin: 20rpx 24rpx;
+	}
+
+	.timeLeft {
+		font-size: 32rpx;
+		color: #3C3C3C;
+
+	}
+
+	.timeRight {
+		font-size: 26rpx;
+		color: #3F90F7;
+	}
+
+
+	.rightShou {
+		display: flex;
+		justify-content: flex-start;
+		align-items: center;
+	}
+
+	.maBox {
+		display: flex;
+		justify-content: space-between;
+		padding: 24rpx 20rpx;
+	}
+
+	.querenMa {
+
+		margin: 20rpx 0;
+		padding-bottom: 30rpx;
+	}
+
+	.maBoximg {
+		width: 308rpx;
+		height: 308rpx;
+		margin: 30rpx 197rpx;
+
+
+	}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 	.timeEditImg {
@@ -601,8 +588,8 @@
 	.code {
 		font-size: 26rpx;
 		color: #333333;
-		font-weight: bold;
-		width: 180rpx
+		font-weight: bold;
+		width: 180rpx
 	}
 
 	.old {
@@ -630,15 +617,16 @@
 		border-radius: 4rpx;
 		margin-left: 20rpx;
 	}
-	.quanState2{
-		font-size: 22rpx;
-		color: #999999;
-		padding: 0 10rpx;
-		
-		border: 1rpx solid #DDDDDD;
-		
-		border-radius: 4rpx;
-		margin-left: 20rpx;
+
+	.quanState2 {
+		font-size: 22rpx;
+		color: #999999;
+		padding: 0 10rpx;
+
+		border: 1rpx solid #DDDDDD;
+
+		border-radius: 4rpx;
+		margin-left: 20rpx;
 	}
 
 
@@ -652,39 +640,85 @@
 		padding-bottom: 15rpx;
 	}
 
-	.informationLine {
+
+
+	.goodsBox {
 		display: flex;
+		padding: 30rpx 0;
 
-		padding: 15rpx 20rpx;
+		border-bottom: 1rpx solid #EEEEEE;
 	}
 
-	.informationLine2 {
+	.goodsRight {
+		margin-left: 20rpx;
 		display: flex;
+		flex-direction: column;
 		justify-content: space-between;
-		font-size: 26rpx;
-		padding: 0 20rpx;
 	}
 
-	.salePrice {
+	.goodsName {
+		width: 522rpx;
 
 		font-size: 26rpx;
+		font-weight: 400;
+		color: #3C3C3C;
+		line-height: 37rpx;
+		margin-bottom: 15rpx;
+	}
+
+	.goodsCount {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.jifen {
+
+		height: 45rpx;
+		font-size: 32rpx;
 		font-weight: 500;
 		color: #333333;
 		line-height: 45rpx;
+
 	}
 
-	.money {
-		background: #FFFFFF;
-		border-radius: 10rpx;
+	.count {
+		height: 33rpx;
+		font-size: 24rpx;
+		font-weight: 400;
+		color: #999999;
+		line-height: 33rpx;
+	}
 
-		margin: 20rpx 24rpx;
+	.sum {
+		margin-top: 34rpx;
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+	}
 
+	.informationLine {
+		display: flex;
+
+		padding: 15rpx 20rpx;
+	}
+
+	.informationLine2 {
 		display: flex;
 		justify-content: space-between;
 		font-size: 26rpx;
-		padding: 30rpx 20rpx;
+		padding: 0 20rpx;
+	}
+
+	.salePrice {
+
+		font-size: 26rpx;
+		font-weight: 500;
+		color: #333333;
+		line-height: 45rpx;
 	}
 
+	
 	.informationTxt {
 		width: 190rpx;
 		font-size: 26rpx;
@@ -718,7 +752,7 @@
 		color: #333333;
 		text-align: center;
 		line-height: 33rpx;
-		padding: 0 15rpx;
+		padding: 0 15rpx;
 		margin-left: 20rpx;
 	}
 
@@ -783,7 +817,7 @@
 	}
 
 	.itemTop {
-		padding: 18rpx 20rpx;
+		padding: 18rpx 20rpx;
 		padding-right: 0;
 		background-color: #FFEFD5;
 
@@ -796,24 +830,24 @@
 		width: 104rpx;
 		font-size: 26rpx;
 		color: #333333;
-		margin-right: 20rpx;
+		margin-right: 20rpx;
 		text-align: right;
-	}
-	
+	}
 
-	.leftItem {
-		font-size: 26rpx;
-		color: #333333;
+
+	.leftItem {
+		font-size: 26rpx;
+		color: #333333;
 		margin-right: 20rpx;
-		flex-grow: 1;
-		/* 隐藏文字显示 ...不换行 */
-		overflow: hidden;
-		text-overflow: ellipsis;
+		flex-grow: 1;
+		/* 隐藏文字显示 ...不换行 */
+		overflow: hidden;
+		text-overflow: ellipsis;
 		white-space: nowrap;
 	}
 
 	.itemContent {
-		padding: 20rpx;
+		padding: 20rpx;
 		padding-right: 0;
 		background-color: #FFFFFF;
 
@@ -854,26 +888,28 @@
 		font-size: 26rpx;
 		text-align: center;
 		padding-left: 100rpx;
-	}
-	.swiper{
-		width: 100%;
-		height: 85%;
-		background: #FFFFFF;
-		
-	}
-	.swiper-item{
-		width: 100%;
-		height: 100%;
-	}
-	
-	
+	}
+
+	.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;
+		margin-bottom: 40rpx;
 		text-align: center;
 	}