12-29

api/whole.js

@@ -52,4 +52,13 @@ export function upEvaluation() {
 		method: 'post',
 		data
 	});
+}
+
+// 获取新人礼包
+export function getNewList(data) {
+	return request({
+		url: '/api/whole/news',
+		method: 'get',
+		data
+	});
 }

pages/index/child/wholesale.vue

@@ -7,32 +7,35 @@
 			<view class="title-t"> 批发专区 </view>
 			<view class="about"> 限时抢购 </view>
 		</view>
-		<view class="date">
-			<view class="date-item" @click="navto('/pages/product/wholesale?bin=' + encodeURI(list[0].time) + '&stp=' + list[0].stop + '&status=' + list[0].status + '&state=' + list[0].state)">
+		<view class="date" v-if="list.length > 0">
+			<view class="date-item"
+				@click="navto('/pages/product/wholesale?bin=' + encodeURI(list[0].time) + '&stp=' + list[0].stop + '&status=' + list[0].status + '&state=' + list[0].state + '&wid=' + list[0].state)">
 				<image src="../../../static/img/mom.png"></image>
 				<view class="item-name">
 					上午场
 				</view>
 				<view class="item-time">
-					{{list[0].time}}~{{list[0].stop | time}}
+					{{list[0].time}}~{{list[0].stop | timet}}
 				</view>
 			</view>
-			<view class="date-item" @click="navto('/pages/product/wholesale?bin=' + encodeURI(list[1].time) + '&stp=' + list[1].stop + '&status=' + list[1].status  + '&state=' + list[1].state)">
+			<view class="date-item"
+				@click="navto('/pages/product/wholesale?bin=' + encodeURI(list[1].time) + '&stp=' + list[1].stop + '&status=' + list[1].status  + '&state=' + list[1].state + '&wid=' + list[1].state)">
 				<image src="../../../static/img/aft.png"></image>
 				<view class="item-name">
 					下午场
 				</view>
 				<view class="item-time">
-					{{list[1].time}}~{{list[1].stop | time}}
+					{{list[1].time}}~{{list[1].stop | timet}}
 				</view>
 			</view>
-			<view class="date-item" @click="navto('/pages/product/wholesale?bin=' + encodeURI(list[2].time) + '&stp=' + list[2].stop + '&status=' + list[2].status  + '&state=' + list[2].state)">
+			<view class="date-item"
+				@click="navto('/pages/product/wholesale?bin=' + encodeURI(list[2].time) + '&stp=' + list[2].stop + '&status=' + list[2].status  + '&state=' + list[2].state + '&wid=' + list[2].state)">
 				<image src="../../../static/img/eve.png"></image>
 				<view class="item-name">
 					晚上场
 				</view>
 				<view class="item-time">
-					{{list[2].time}}~{{list[2].stop | time}}
+					{{list[2].time}}~{{list[2].stop | timet}}
 				</view>
 			</view>
 		</view>
@@ -50,12 +53,12 @@
 			}
 		},
 		filters: {
-			time(val) {
+			timet(val) {
 				let str = ''
 				if (val) {
-					let time = new Date(val * 1000);
-					let h = time.getHours() >= 10 ? time.getHours() : ('0' + time.getHours())
-					let m = time.getMinutes() >= 10 ? time.getMinutes() : ('0' + time.getMinutes())
+					let date = new Date(val * 1000);
+					let h = date.getHours() >= 10 ? date.getHours() : ('0' + date.getHours())
+					let m = date.getMinutes() >= 10 ? date.getMinutes() : ('0' + date.getMinutes())
 					str = h + ':' + m
 				}
 				return str

pages/product/newPeople.vue

@@ -1,36 +1,56 @@
 <template>
 	<view class="newPeople">
-		<view class="header">
+		<!-- <view class="header">
 			<view class="inputSearch" @click="clickSearch">
 				<image src="@/static/img/search.png"></image>
 				请输入关键词
 			</view>
+		</view> -->
+		<!-- <data-list :data='data'></data-list> -->
+		<view class="good-wrap">
+			<view class="good" v-for="item in 9" @click="navto('/pages/product/wholesaleDetail')">
+				<image src="" mode="" class="goo-img"></image>
+				<view class="good-tit clamp">
+					无患子植物家居眼罩无患子植物家居眼罩无患子植物家居眼罩
+				</view>
+				<view class="good-price flex">
+					<view class="new-price">
+						¥2690
+					</view>
+					<view class="old-price">
+						¥3600
+					</view>
+				</view>
+			</view>
 		</view>
-		<data-list :data='data'></data-list>
 	</view>
 </template>
 
 <script>
 import { loadIndexs } from '@/api/index.js';
-import dataList from '@/components/datalist.vue'
+import dataList from '@/components/datalist.vue'
+import { getNewList } from '@/api/whole.js'
 	export default {
 		data() {
 			return {
-				data: {
-					page: 1,
-					limit: 10,
-					sum: 0,
-					loadingType: 'loadmore',
-					data: []
-				}
+				// data: {
+				// 	page: 1,
+				// 	limit: 10,
+				// 	sum: 0,
+				// 	loadingType: 'loadmore',
+				// 	data: []
+				// }
 			}
 		},
 		components: {
 			dataList
+		},
+		onLoad() {
+			this.getNewList()
 		},
-		mounted() {
-			this.init()
-		},
+		// mounted() {
+		// 	this.init()
+		// },
 		methods: {
 			// 點擊搜索框
 			clickSearch() {
@@ -40,6 +60,11 @@ import dataList from '@/components/datalist.vue'
 			},
 			init() {
 				this.getData()
+			},
+			getNewList() {
+				getNewList().then(res => {
+					console.log(res,'getNewList')
+				})
 			},
 			getData() {
 				loadIndexs().then(res => {
@@ -122,5 +147,60 @@ $red: #FF4C4C;
 			color: $grey;
 			font-size: 28rpx;
 		}
+	}
+	.good-wrap {
+		display: flex;
+		// padding: 0 0 20rpx 20rpx;
+		padding-left: 20rpx;
+		padding-top: 20rpx;
+		flex-wrap: wrap;
+	}
+	
+	.good {
+		width: 345rpx;
+		height: 480rpx;
+		margin-right: 20rpx;
+		margin-bottom: 20rpx;
+		background: #FFFFFF;
+		box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+		border-radius: 10rpx;
+	
+		.goo-img {
+			width: 345rpx;
+			height: 345rpx;
+			border-radius: 10rpx 10rpx 0 0;
+			background-color: #bfa;
+		}
+	
+		.good-tit {
+			padding: 15rpx 20rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #333333;
+			line-height: 35rpx;
+		}
+	
+		.good-price {
+			padding-left: 20rpx;
+			justify-content: flex-start;
+	
+			.new-price {
+				font-size: 36rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #FF4C4C;
+			}
+	
+			.old-price {
+				padding-left: 8rpx;
+				font-size: 26rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				text-decoration: line-through;
+				color: #999999;
+	
+			}
+		}
 	}
 </style>

pages/product/wholesale.vue

@@ -1,12 +1,16 @@
 <template>
 	<view class="content">
-		<image src="" mode="" class="to-bg"></image>
+		<image src="../../static/img/wh-bg.png" mode="" class="to-bg"></image>
 		<view class="top-tit">
 			{{state}}
 		</view>
-		<view class="top-time">
-			{{showTime()}}
+		<view class="top-time" v-if="status != 1">
+			{{showTime}}
 		</view>
+		<view class="top-time" v-if="status == 1">
+			{{stopTimeH + ':' + stopTimeM + ':' + stopTimeS}}
+		</view>
+
 		<view class="center-btn flex" @click="navto('/pages/user/myWholesale')">
 			<image src="" mode="" class="center-logo"></image>
 			<view class="center-tit">
@@ -42,6 +46,11 @@
 </template>
 
 <script>
+	import {
+		timeComputed
+	} from '@/utils/rocessor.js'
+	import uniCountdown from '@/components/uni-countdown/uni-countdown.vue';
+	import { getWholeList } from '@/api/whole.js'
 	export default {
 		data() {
 			return {
@@ -53,8 +62,13 @@
 				loaded: false,
 				bin: '',
 				stop: '',
-				status: 0,
-				state: ''
+				status: '',
+				state: '',
+				stopTimeH: '',
+				stopTimeM: '',
+				stopTimeS: '',
+				timer: '',
+				wid: ''
 			}
 		},
 		onReady(res) {
@@ -75,9 +89,36 @@
 			let obj = this
 			obj.bin = decodeURI(opt.bin)
 			obj.stop = opt.stp
-			obj.stauts = opt.status
+			obj.status = opt.status
 			obj.state = opt.state
-			console.log(obj.bin, obj.stop)
+			obj.wid = opt.wid
+			
+			obj.getWholeList()
+			console.log(obj.bin, obj.stop, obj.status)
+		},
+		onShow() {
+			let obj = this
+			if (obj.status == 1) {
+				if(obj.timer) {
+					clearTimeout(obj.timer)
+				}
+				this.getSyTime()
+			}
+		},
+		computed: {
+			showTime() {
+				let obj = this
+				console.log(obj.status, obj.state, 'obj.status++++++++')
+				if (obj.status == 1) {
+					return ''
+				}
+				if (obj.status == 0) {
+					return ''
+				}
+				if (obj.status == 2) {
+					return obj.bin
+				}
+			}
 		},
 		methods: {
 			navto(url) {
@@ -85,18 +126,36 @@
 					url: url
 				})
 			},
-			showTime() {
-				let obj =this
-				console.log(obj.status,'obj.status++++++++')
-				if(obj.status == 1) {
-					return '距离结束'
+			// 获取剩余时间
+			getSyTime() {
+				let obj = this
+				let stopTime = timeComputed(obj.stop * 1000)
+				console.log(stopTime, 'stopTime')
+				obj.stopTimeH = stopTime.hours
+				obj.stopTimeM = stopTime.minutes >= 10 ? stopTime.minutes : ('0' + stopTime.minutes)
+				obj.stopTimeS = stopTime.seconds >= 10 ? stopTime.seconds : ('0' + stopTime.seconds)
+				if(stopTime.hours == 0 && stopTime.minutes == 0 && stopTime.seconds == 0) {
+					obj.status = 0
 				}
-				if(obj.status == 0) {
-					return ''
-				}
-				if(obj.status == 2) {
-					return obj.bin + '开始'
+				if(!obj.timer) {
+					if(obj.status == 1) {
+						obj.timer = setTimeout(this.getSyTime,1000)
+					}
+					
+				}else {
+					clearTimeout(obj.timer)
+					if(obj.status == 1) {
+						obj.timer = setTimeout(this.getSyTime,1000)
+					}
 				}
+				
+				// console.log(obj.stopTimeH + ':' + obj.stopTimeM + ':' + obj.stopTimeS)
+			},
+			getWholeList() {
+				let obj = this
+				getWholeList({},obj.wid).then(res => {
+					console.log(res)
+				})
 			}
 		}
 	}
@@ -106,7 +165,7 @@
 	.to-bg {
 		width: 750rpx;
 		height: 427rpx;
-		background-color: #ff8a57;
+		background-color: #fff;
 	}
 
 	.top-tit {