积分商城

pages.json

@@ -324,6 +324,18 @@
 				"navigationBarTitleText": "爱车估价"
 			}
 		}
+        ,{
+            "path" : "pages/integral/integral",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "积分商城",
+                "enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#38394E",
+				"navigationBarTextStyle": "white"
+				 // "navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"tabBar": {
 		"color": "#8a8a8a",

pages/index/onlineBooking.vue

@@ -309,6 +309,9 @@
 .swiper{
 	height: 500rpx;
 }
+.shopTop{
+	height: 500rpx;
+}
 .newshopNames{
 	width: 702rpx;
 	margin-left: 24rpx;
@@ -369,7 +372,7 @@
 }
 .newshopDadressBpx{
   display: flex;
-  padding: 30rpx 20rpx;
+  padding: 20rpx 20rpx;
   background: url(http://dmsphoto.66km.com.cn/thFiles/010748B7-5678-46C3-941B-60B3CD4D10CB.png) no-repeat;
   background-size: 100% 100%;
 }

pages/integral/integral.vue

@@ -0,0 +1,117 @@
+<template>
+	<view class="box">
+		<view class="topBox">
+			<view class="topCont">
+				<view class="jfgz">
+					<view class="jfgzTxt">积分规则</view>
+					<img src="../../static/timg/jthei.png" alt="" class="jfjt">
+				</view>
+				<view class="kyjf">
+					<view class="kyjfTitle">可用积分</view>
+					<view class="kyjfCont">
+						<view class="kyjfNum">79999</view>
+						<view class="kyjfDq">333积分即将过期</view>
+					</view>
+				</view>
+				
+			</view>
+			<view class="topBottom">
+				
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style scoped>
+.box{
+	background: #F4F5F7;
+	min-height: 100vh;
+}
+.jfjt{
+   width: 24rpx;height: 24rpx;margin-top: 12rpx;
+}
+.jfgz{
+	display: flex;
+	width: 150rpx;
+	height: 48rpx;
+	background: #FFF9F1 linear-gradient(90deg, #FCF0D9 0%, #FFFBF3 49%, #FFE5D3 100%);
+	border-radius: 0px 2rpx 0px 26rpx;
+	font-size: 24rpx;
+	line-height: 48rpx;
+	color: #573400;
+	position: absolute;
+	top: 0;
+	right: 0;
+}
+.jfgzTxt{
+	padding-left: 18rpx;
+}
+.topBox{
+	width: 100%;
+	height: 410rpx;
+	background:#38394E;
+	padding-top: 30rpx;
+	position: relative;
+}
+.topCont{
+	width: 702rpx;
+	height: 200rpx;
+	background: url('http://dmsphoto.66km.com.cn/thFiles/DCCDB197-4F64-4711-89C0-E5034B2F1788.png') no-repeat;
+	background-size: 100% 100%;
+	margin-left: 24rpx;
+	position: relative;
+	border-radius: 20rpx;
+	overflow: hidden;
+}
+.topBottom{
+	width: 750rpx;
+	height: 180rpx;
+	background: #FFFFFF;
+	border-radius: 26rpx 26rpx 0px 0px;
+	position: absolute;
+	left: 0;
+	bottom: 0;
+}
+.kyjf{
+	padding-top: 46rpx;
+	padding-left: 40rpx;
+}
+.kyjfTitle{
+	color: #523509;font-size: 28rpx;
+}
+.kyjfNum{
+	font-size: 60rpx;
+	font-family: PingFangSC-Medium, PingFang SC;
+	font-weight: 500;
+	color: #523509;
+	line-height: 84rpx;
+}
+.kyjfDq{
+	width: 224rpx;
+	height: 44rpx;
+	background: linear-gradient(135deg, #FFC81B 0%, #FFA800 100%);
+	border-radius: 22rpx 22rpx 22rpx 0px;
+	text-align: center;
+	color: #573400;
+	line-height: 44rpx;
+	font-size: 24rpx;
+	margin-left:10rpx ;
+	margin-top: 22rpx;
+}
+.kyjfCont{
+	display: flex;
+}
+</style>

pages/shop/goodsDetail.vue

@@ -104,7 +104,7 @@
 		<!-- <view v-html="info.details" style="background: #fff;"></view> -->
 		 <rich-text :nodes="info.details" style="background: #fff;"></rich-text>
 	</view>
-	<view style="height: 120rpx;padding-bottom: env(safe-area-inset-bottom)"></view>
+	<view style="height: 200rpx;padding-bottom: env(safe-area-inset-bottom)"></view>
 	<view class="bottomHz">
 		<view class="timeTbox" v-if="!activityEnd">
 		  <view class="timeK">{{shengyuD}}</view>
@@ -114,7 +114,7 @@
 		  <view class="timeK">{{shengyuM}}</view>
 		  <view class="timeviewTxt" > 分 &nbsp;&nbsp; 后结束抢购</view>
 		</view>
-		<view class="timeTbox" v-if="activityEnd"></view>
+		<view class="timeTbox2" v-if="activityEnd"></view>
 		<view class="bottomBox">
 			<view class="bottomImgBox" @click="goINdex">
 				<image src="../../static/timg/home.png" mode="" class="bottomImg"></image>
@@ -128,8 +128,9 @@
 				<image src="../../static/timg/share.png" mode="" class="bottomImg"></image>
 				<view class="bottomTxt">分享</view>
 			</button>
-			<view class="bottomBtn" @click="ljbuy">立即购买</view>
-			
+			<view class="bottomBtn" @click="ljbuy" v-if="!activityEnd&&info.goodsDownTime">立即购买</view>
+			<view class="bottomBtn" @click="ljbuy" v-if="activityEnd&&!info.goodsDownTime">立即购买</view>
+			<view class="bottomBtn2"  v-if="activityEnd&&info.goodsDownTime">抢购结束</view>
 		</view>
 	</view>
 
@@ -231,6 +232,7 @@
 				shengyuD:1,
 				shengyuH:12,
 				shengyuM:21,
+				//snapup:
 			}
 		},
 		onLoad(opt) {
@@ -286,22 +288,31 @@
 						this.$store.commit('mutationsckshopInfo', '')
 						this.szShop()
 						if(this.info.goodsDownTime){
-							this.activityEnd=false;
-							this.clock()
+							if (Number(new Date().getTime()) > (Number(new Date(this.info.goodsDownTime.replace(/-/g, '/')).getTime()) || 0)) {
+							  console.log("现在时间大于结束时间")
+							   this.activityEnd = true
+							} else {
+								this.activityEnd=false;
+								//this.info.goodsDownTime="2022-08-18 11:57:00"
+								this.clock()
+							 
+							}
+							
 						}
 						
 				 })
 			},
 			clock(){
+				
 				let _this = this
 				let today = new Date() // 当前时间
 				let h = today.getHours()
 				let m = today.getMinutes()
 				let s = today.getSeconds()
 				let stopTime = new Date(_this.info.goodsDownTime.replace(/-/g, '/')) // 结束时间
-				if (Number(new Date(_this.info.goodsDownTime).getTime()) < Number(new Date().getTime())) {
+				if (Number(new Date().getTime()) >(Number(new Date(this.info.goodsDownTime.replace(/-/g, '/')).getTime()) || 0) ) {
 				  this.activityEnd = true
-				  return
+				  return false;
 				}
 							
 				let stopH = stopTime.getHours()
@@ -466,6 +477,9 @@
 		color: #764D49;
 	
 	}
+	.timeTbox2{
+		height: 60rpx;
+	}
 	.timeviewTxt{
 			line-height: 41rpx;
 			padding-top: 10rpx;
@@ -488,11 +502,10 @@
 	}
 	.bottomHz{
 		width: 750rpx;
-		height: 180rpx;
+		/* height: 180rpx; */
 		position: fixed;left: 0;
 		bottom: 0;
-		padding-bottom: env(safe-area-inset-bottom);
-		background: #FFFFFF;
+		
 		border-radius: 24rpx 24rpx 0px 0px;
 	}
 .box{
@@ -691,7 +704,8 @@
 	height: 120rpx;
 	background: #FFFFFF;
 	box-shadow: 0px -2px 10px 0px rgba(153,153,153,0.2000);
-	
+	padding-bottom: env(safe-area-inset-bottom);
+	background: #FFFFFF;
 	display: flex;
 	
 }
@@ -747,6 +761,18 @@ button{
 	margin-top: 23rpx;
 	margin-left: 70rpx;
 }
+.bottomBtn2{
+	width: 450rpx;
+	height: 74rpx;
+	background: #DDDDDD;
+	border-radius: 37rpx;
+	line-height: 74rpx;
+	text-align: center;
+	color: #FFFFFF;
+	font-size: 30rpx;
+	margin-top: 23rpx;
+	margin-left: 70rpx;
+}
 .goodsDetailTitle{
 	color: #333333;
 	font-size: 30rpx;

pages/shop/shop.vue

@@ -62,7 +62,7 @@
 						  <view class="timeK">{{item.shengyuH}}</view>
 						  <view class="timeviewTxt"> 时</view>
 						  <view class="timeK">{{item.shengyuM}}</view>
-						  <view class="timeviewTxt" > 分 &nbsp;&nbsp; 后结束抢购</view>
+						  <view class="timeviewTxt" > 分 &nbsp;后结束抢购</view>
 						</view>
 	   				   <view class="hotGoodsLineRIghtBottom">
 	   				   	<view class="goodsPrice">
@@ -448,7 +448,7 @@
 			
 			height: 60rpx;
 			display: flex;
-			
+			padding-top: 15rpx;
 			font-size: 24rpx;
 			font-family: PingFangSC-Regular, PingFang SC;
 			font-weight: 400;
@@ -472,8 +472,8 @@
 			background: #F03B3B;
 			border-radius: 6rpx;
 			margin-top: 9rpx;
-			margin-left: 15rpx;
-			margin-right: 15rpx;
+			margin-left: 10rpx;
+			margin-right: 10rpx;
 		}
 .hotGoodsLineRIghtBottom{
 	display: flex;

pages/user/user.vue

@@ -19,7 +19,7 @@
 					<view class="numStr">{{numList.count?numList.count:0}}</view>
 					<view class="nameStr">优惠券</view>
 				</view>
-				<view class="quan">
+				<view class="quan" @click="gonavigateTo('../integral/integral')">
 					<view class="numStr">{{numList.totalIntegral?numList.totalIntegral:0}}</view>
 					<view class="nameStr">积分</view>
 				</view>