1-6

api/index.js

@@ -40,4 +40,22 @@ export function storeList(data) {
 		method: 'get',
 		data
 	})
+}
+
+// 获取文章列表
+export function getArticleList(data,cid) {
+	return request({
+		url:'/api/article/list/'+ cid,
+		method: 'get',
+		data
+	})
+}
+
+//getArtDetai
+export function getArtDetai(data,id) {
+	return request({
+		url:'/api/article/details/'+ id,
+		method: 'get',
+		data
+	})
 }

pages.json

@@ -39,6 +39,37 @@
 				// #endif
 				"navigationBarTitleText": "商城首页"
 			}
+		},
+		{
+			"path": "pages/index/artList",
+			"style": {
+				"navigationBarTitleText": "列表",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
+			
+		},
+		{
+			"path": "pages/index/cpzq",
+			"style": {
+				"navigationBarTitleText": "产品专区"
+			}
+			
+		},
+		{
+			"path": "pages/index/artDetail",
+			"style": {
+				"navigationBarTitleText": "详情"
+				// "app-plus": {
+				// 	"titleNView": {
+				// 		"type": "transparent"
+				// 	}
+				// }
+			}
+			
 		},
 		 {
 			"path": "pages/public/register",
@@ -105,14 +136,17 @@
 		{
 			"path": "pages/product/jindouProduct",
 			"style": {
-				"navigationBarBackgroundColor": "transparent",
+				// "navigationBarBackgroundColor": "transparent",
 				"navigationBarTextStyle": "white",
 				"app-plus": {
-					"titleNView": {
-						"type": "float",
-						"titleText": "金豆专区"
-					}
+					"titleNView": false
 				}
+				// "app-plus": {
+				// 	"titleNView": {
+				// 		"type": "float",
+				// 		"titleText": "金豆专区"
+				// 	}
+				// }
 			}
 		},
 		{

pages/category/fillTable.vue

@@ -1,321 +1,359 @@
-<template>
-	<view class="content">
-		<view class="item">
-			<view class="item-tit">店铺名称</view>
-			<input type="text" v-model="store.name" placeholder="请输入店铺名称" />
-		</view>
-		<view class="item">
-			<view class="item-tit">店铺logo</view>
-			<view class="up-wrapper">
-				<image :src="store.image" mode="" v-if="store.image" @click.stop="upImg"></image>
-				<image src="../../static/img/add.png" mode="" v-else @click.stop="upImg"></image>
-			</view>
-		</view>
-		<view class="item">
-			<view class="item-tit">联系电话</view>
-			<input type="number" v-model="store.phone" placeholder="请输入商家电话" />
-		</view>
-		<view class="item">
-			<view class="item-tit">营业时间</view>
-			<picker mode="time" :value="bgtime" @change="bindBgtimeChange" class="picker">
-				<view class="uni-input">{{ bgtime }}</view>
-			</picker>
-			<view class="line">至</view>
-			<picker mode="time" :value="edtime" @change="bindEdtimeChange" class="picker prcker-t">
-				<view class="uni-input">{{ edtime }}</view>
-			</picker>
-		</view>
-		<view class="item" @click="getLocation" v-if="type == 'add'">
-			<view class="item-tit">经纬度</view>
-			<input type="text" v-model="store.latlng" placeholder="请选择经纬度" />
-		</view>
-		<view class="item">
-			<view class="item-tit">详细地址</view>
-			<input type="text" v-model="store.detailed_address" placeholder="请输入详细地址" />
-		</view>
-
-		<view class="sub" @click="sub" v-if="type == 'edit'">确认修改</view>
-		<view class="sub" @click="add" v-if="type == 'add'">提交</view>
-	</view>
-</template>
-
-<script>
-import { myStore, editStore } from '@/api/user.js';
-import { upload } from '@/api/order.js';
-export default {
-	data() {
-		return {
-			store: {
-				name: '',
-				phone: '',
-				id: '',
-				image: '',
-				id: '',
-				detailed_address: '',
-				day_time: '',
-				latlng: ''
-			},
-			bgtime: '请选择时间',
-			edtime: '请选择时间',
-			detailed_address: '',
-			type: 'edit'
-		};
-	},
-	onLoad(opt) {
-		if (opt.type == 'edit') {
-			this.loadData();
-		}
-		if (opt.type == 'add') {
-			this.type = 'add';
-			this.bgtime = '00:00';
-			this.edtime = '00:00';
-		}
-	},
-	methods: {
-		loadData() {
-			myStore().then(({ data }) => {
-				this.store = data[0];
-				let time = this.store.day_time.split(' - ');
-				this.bgtime = time[0].substring(0, 5);
-				this.edtime = time[1].substring(0, 5);
-			});
-			
-		},
-		// 选择当前位置
-		getLocation() {
-			console.log('选择当前位置');
-			let obj = this;
-			uni.chooseLocation({
-				success: function(res) {
-					// obj.addressData.area = res.name;
-					console.log('位置名称：' + res.name);
-					console.log('详细地址：' + res.address);
-					console.log('纬度：' + res.latitude);
-					console.log('经度：' + res.longitude);
-					// obj.addressData.latitude = res.latitude;
-					// obj.addressData.longitude = res.longitude;
-					obj.$set(obj.store, 'latlng', res.latitude + ',' + res.longitude);
-					// obj.store.latlng = res.latitude + ',' + res.longitude
-				}
-			});
-		},
-		bindBgtimeChange(e) {
-			console.log(e);
-			this.bgtime = e.detail.value;
-		},
-		bindEdtimeChange(e) {
-			console.log(e);
-			this.edtime = e.detail.value;
-		},
-		indicatorStyle() {},
-		// 修改logo
-		upImg() {
-			let obj = this;
-			upload({
-				filename: ''
-			}).then(res => {
-				console.log(res[0].url);
-				obj.store.image = res[0].url;
-			});
-		},
-		//提交
-		sub() {
-			let obj = this;
-			let store = obj.store;
-			if (store.name == '') {
-				obj.$api.msg('请输入店铺名称');
-				return;
-			}
-			if (store.phone == '') {
-				obj.$api.msg('请输入店铺电话');
-				return;
-			}
-			if (store.image == '') {
-				obj.$api.msg('请选择店铺logo');
-				return;
-			}
-			if (store.day_time == '') {
-				obj.$api.msg('请输入营业时间');
-				return;
-			}
-			if (store.detailed_address == '') {
-				obj.$api.msg('请输入店铺地址');
-				return;
-			}
-			uni.showLoading({
-				title: '提交中...',
-				mask: true
-			});
-			let day_time = obj.bgtime + ':00 - ' + obj.edtime + ':00';
-			editStore({
-				id: store.id,
-				name: store.name,
-				detailed_address: store.detailed_address,
-				image: store.image,
-				phone: store.phone,
-				day_time: day_time,
-				latlng: store.latitude + ',' + store.longitude
-			})
-				.then(res => {
-					uni.hideLoading();
-					uni.showToast({
-						title: '提交成功',
-						duration: 2000
-					});
-					obj.$api.prePage().refreshList();
-					setTimeout(function() {
-						uni.navigateBack();
-					}, 800);
-				})
-				.catch(err => {
-					uni.hideLoading();
-					console.log(err);
-				});
-		},
-		add() {
-			let obj = this;
-			let store = obj.store;
-			if (store.name == '') {
-				obj.$api.msg('请输入店铺名称');
-				return;
-			}
-			if (store.phone == '') {
-				obj.$api.msg('请输入店铺电话');
-				return;
-			}
-			if (store.image == '') {
-				obj.$api.msg('请选择店铺头像');
-				return;
-			}
-			// if (store.day_time == '') {
-			// 	obj.$api.msg('请输入营业时间');
-			// 	return;
-			// }
-			if (store.introduction == '') {
-				obj.$api.msg('请输入店铺简介');
-				return;
-			}
-			if (store.detailed_address == '') {
-				obj.$api.msg('请输入店铺地址');
-				return;
-			}
-			let day_time = obj.bgtime + ':00 - ' + obj.edtime + ':00';
-			editStore({
-				id: 0,
-				name: store.name,
-				introduction: store.introduction,
-				image: store.image,
-				phone: store.phone,
-				day_time: day_time,
-				latlng: store.latlng,
-				detailed_address: store.detailed_address,
-				is_show: 0
-			})
-				.then(res => {
-					uni.hideLoading();
-					uni.showToast({
-						title: '提交成功',
-						duration: 2000
-					});
-					obj.$api.prePage().refreshList();
-					setTimeout(function() {
-						uni.navigateBack();
-					}, 800);
-				})
-				.catch(err => {
-					uni.hideLoading();
-					console.log(err);
-				});
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-page {
-	height: 100%;
-	background-color: #f8f6f6;
-}
-.item {
-	background-color: #fff !important;
-	min-height: 100rpx;
-	display: flex;
-	width: 750px;
-	border: 1px #f4f4f4 solid;
-	.line {
-		display: inline-block;
-		line-height: 100rpx;
-	}
-	.item-tit {
-		height: 100rpx;
-		line-height: 100rpx;
-		padding-left: 30rpx;
-		width: 200rpx;
-		font-size: 30rpx;
-		font-family: PingFang SC;
-		font-weight: 500;
-		color: #666666;
-		flex-shrink: 0;
-	}
-	input {
-		width: 550rpx;
-		height: 100rpx;
-		line-height: 100rpx;
-		font-size: 30rpx;
-		font-family: PingFang SC;
-		font-weight: 500;
-		color: #333333;
-	}
-	textarea {
-		width: 550rpx;
-		height: 257rpx;
-		padding-top: 25rpx;
-		padding-right: 30rpx;
-		line-height: 50rpx;
-		font-size: 30rpx;
-		font-family: PingFang SC;
-		font-weight: 500;
-		color: #333333;
-	}
-	.up-wrapper {
-		height: 352rpx;
-		width: 550rpx;
-		position: relative;
-		image {
-			position: absolute;
-			height: 160rpx;
-			width: 160rpx;
-			top: 0;
-			bottom: 0;
-			left: 94rpx;
-			margin: auto;
-		}
-	}
-}
-.sub {
-	width: 674rpx;
-	height: 88rpx;
-	background: #ff4c4c;
-	border-radius: 44rpx;
-	line-height: 88rpx;
-	text-align: center;
-	font-size: 36rpx;
-	font-family: PingFang SC;
-	font-weight: 500;
-	color: #ffffff;
-	position: absolute;
-	bottom: 35rpx;
-	left: 0;
-	right: 0;
-	margin: auto;
-}
-.picker {
-	display: inline-block;
-	padding-right: 40rpx;
-	height: 100rpx;
-	line-height: 100rpx;
-}
-.prcker-t {
-	padding-left: 40rpx;
-}
+<template>
+	<view class="content">
+		<view class="item">
+			<view class="item-tit">店铺名称</view>
+			<input type="text" v-model="store.name" placeholder="请输入店铺名称" />
+		</view>
+		<view class="item">
+			<view class="item-tit">店铺logo</view>
+			<view class="up-wrapper">
+				<image :src="store.image" mode="" v-if="store.image" @click.stop="upImg"></image>
+				<image src="../../static/img/add.png" mode="" v-else @click.stop="upImg"></image>
+			</view>
+		</view>
+		<view class="item">
+			<view class="item-tit">联系电话</view>
+			<input type="number" v-model="store.phone" placeholder="请输入商家电话" />
+		</view>
+		<view class="item">
+			<view class="item-tit">营业时间</view>
+			<picker mode="time" :value="bgtime" @change="bindBgtimeChange" class="picker">
+				<view class="uni-input">{{ bgtime }}</view>
+			</picker>
+			<view class="line">至</view>
+			<picker mode="time" :value="edtime" @change="bindEdtimeChange" class="picker prcker-t">
+				<view class="uni-input">{{ edtime }}</view>
+			</picker>
+		</view>
+		<view class="item" @click="getLocation" v-if="type == 'add'">
+			<view class="item-tit">经纬度</view>
+			<input type="text" v-model="store.latlng" placeholder="请选择经纬度" />
+		</view>
+		<view class="item">
+			<view class="item-tit">详细地址</view>
+			<input type="text" v-model="store.detailed_address" placeholder="请输入详细地址" />
+		</view>
+		<view class="item">
+			<view class="item-tit">申请等级</view>
+			<input type="text" v-model="chooselevel" placeholder="请选择申请等级" disabled v-if="type=='edit'"/>
+			<template v-if="type == 'add'">
+				<picker mode="selector" :range="levelList" @change="bindLevelChange" class="picker">
+					<input type="text" v-model="chooselevel" placeholder="请选择申请等级" disabled />
+				</picker>
+			</template>
+			
+		</view>
+		<view class="sub" @click="sub" v-if="type == 'edit'">确认修改</view>
+		<view class="sub" @click="add" v-if="type == 'add'">提交</view>
+	</view>
+</template>
+
+<script>
+	import {
+		myStore,
+		editStore
+	} from '@/api/user.js';
+	import {
+		upload
+	} from '@/api/order.js';
+	export default {
+		data() {
+			return {
+				store: {
+					name: '',
+					phone: '',
+					id: '',
+					image: '',
+					id: '',
+					detailed_address: '',
+					day_time: '',
+					latlng: ''
+				},
+				chooselevel: '',
+				levelList: ['美容院', '美容院B'],
+				bgtime: '请选择时间',
+				edtime: '请选择时间',
+				detailed_address: '',
+				type: 'edit'
+			};
+		},
+		onLoad(opt) {
+			if (opt.type == 'edit') {
+				this.loadData();
+			}
+			if (opt.type == 'add') {
+				this.type = 'add';
+				this.bgtime = '00:00';
+				this.edtime = '00:00';
+			}
+		},
+		methods: {
+			bindLevelChange(e) {
+				console.log(e)
+				this.chooselevel = this.levelList[e.detail.value];
+			},
+			loadData() {
+				myStore().then(({
+					data
+				}) => {
+					this.store = data[0];
+					this.chooselevel = this.store.level == 3? '美容院': '美容院B'
+					let time = this.store.day_time.split(' - ');
+					this.bgtime = time[0].substring(0, 5);
+					this.edtime = time[1].substring(0, 5);
+				});
+
+			},
+			// 选择当前位置
+			getLocation() {
+				console.log('选择当前位置');
+				let obj = this;
+				uni.chooseLocation({
+					success: function(res) {
+						// obj.addressData.area = res.name;
+						console.log('位置名称：' + res.name);
+						console.log('详细地址：' + res.address);
+						console.log('纬度：' + res.latitude);
+						console.log('经度：' + res.longitude);
+						// obj.addressData.latitude = res.latitude;
+						// obj.addressData.longitude = res.longitude;
+						obj.$set(obj.store, 'latlng', res.latitude + ',' + res.longitude);
+						// obj.store.latlng = res.latitude + ',' + res.longitude
+					}
+				});
+			},
+			bindBgtimeChange(e) {
+				console.log(e);
+				this.bgtime = e.detail.value;
+			},
+			bindEdtimeChange(e) {
+				console.log(e);
+				this.edtime = e.detail.value;
+			},
+			indicatorStyle() {},
+			// 修改logo
+			upImg() {
+				let obj = this;
+				upload({
+					filename: ''
+				}).then(res => {
+					console.log(res[0].url);
+					obj.store.image = res[0].url;
+				});
+			},
+			//提交
+			sub() {
+				let obj = this;
+				let store = obj.store;
+				if (store.name == '') {
+					obj.$api.msg('请输入店铺名称');
+					return;
+				}
+				if (store.phone == '') {
+					obj.$api.msg('请输入店铺电话');
+					return;
+				}
+				if (store.image == '') {
+					obj.$api.msg('请选择店铺logo');
+					return;
+				}
+				if (store.day_time == '') {
+					obj.$api.msg('请输入营业时间');
+					return;
+				}
+				if (store.detailed_address == '') {
+					obj.$api.msg('请输入店铺地址');
+					return;
+				}
+				if (obj.chooselevel == '') {
+					obj.$api.msg('请选择申请等级');
+					return;
+				}
+				uni.showLoading({
+					title: '提交中...',
+					mask: true
+				});
+				let day_time = obj.bgtime + ':00 - ' + obj.edtime + ':00';
+				editStore({
+						id: store.id,
+						name: store.name,
+						detailed_address: store.detailed_address,
+						image: store.image,
+						phone: store.phone,
+						day_time: day_time,
+						latlng: store.latitude + ',' + store.longitude,
+						level: obj.chooselevel == '美容院' ? 3 : 4
+					})
+					.then(res => {
+						uni.hideLoading();
+						uni.showToast({
+							title: '提交成功',
+							duration: 2000
+						});
+						obj.$api.prePage().refreshList();
+						setTimeout(function() {
+							uni.navigateBack();
+						}, 800);
+					})
+					.catch(err => {
+						uni.hideLoading();
+						console.log(err);
+					});
+			},
+			add() {
+				let obj = this;
+				let store = obj.store;
+				if (store.name == '') {
+					obj.$api.msg('请输入店铺名称');
+					return;
+				}
+				if (store.phone == '') {
+					obj.$api.msg('请输入店铺电话');
+					return;
+				}
+				if (store.image == '') {
+					obj.$api.msg('请选择店铺头像');
+					return;
+				}
+				// if (store.day_time == '') {
+				// 	obj.$api.msg('请输入营业时间');
+				// 	return;
+				// }
+				if (store.introduction == '') {
+					obj.$api.msg('请输入店铺简介');
+					return;
+				}
+				if (store.detailed_address == '') {
+					obj.$api.msg('请输入店铺地址');
+					return;
+				}
+				let day_time = obj.bgtime + ':00 - ' + obj.edtime + ':00';
+				editStore({
+						id: 0,
+						name: store.name,
+						introduction: store.introduction,
+						image: store.image,
+						phone: store.phone,
+						day_time: day_time,
+						latlng: store.latlng,
+						detailed_address: store.detailed_address,
+						is_show: 0
+					})
+					.then(res => {
+						uni.hideLoading();
+						uni.showToast({
+							title: '提交成功',
+							duration: 2000
+						});
+						obj.$api.prePage().refreshList();
+						setTimeout(function() {
+							uni.navigateBack();
+						}, 800);
+					})
+					.catch(err => {
+						uni.hideLoading();
+						console.log(err);
+					});
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	page {
+		height: 100%;
+		background-color: #f8f6f6;
+	}
+
+	.item {
+		background-color: #fff !important;
+		min-height: 100rpx;
+		display: flex;
+		width: 750px;
+		border: 1px #f4f4f4 solid;
+
+		.line {
+			display: inline-block;
+			line-height: 100rpx;
+		}
+
+		.item-tit {
+			height: 100rpx;
+			line-height: 100rpx;
+			padding-left: 30rpx;
+			width: 200rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #666666;
+			flex-shrink: 0;
+		}
+
+		input {
+			width: 550rpx;
+			height: 100rpx;
+			line-height: 100rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #333333;
+		}
+
+		textarea {
+			width: 550rpx;
+			height: 257rpx;
+			padding-top: 25rpx;
+			padding-right: 30rpx;
+			line-height: 50rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #333333;
+		}
+
+		.up-wrapper {
+			height: 352rpx;
+			width: 550rpx;
+			position: relative;
+
+			image {
+				position: absolute;
+				height: 160rpx;
+				width: 160rpx;
+				top: 0;
+				bottom: 0;
+				left: 94rpx;
+				margin: auto;
+			}
+		}
+	}
+
+	.sub {
+		width: 674rpx;
+		height: 88rpx;
+		background: #ff4c4c;
+		border-radius: 44rpx;
+		line-height: 88rpx;
+		text-align: center;
+		font-size: 36rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #ffffff;
+		position: absolute;
+		bottom: 35rpx;
+		left: 0;
+		right: 0;
+		margin: auto;
+	}
+
+	.picker {
+		display: inline-block;
+		padding-right: 40rpx;
+		height: 100rpx;
+		line-height: 100rpx;
+	}
+
+	.prcker-t {
+		padding-left: 40rpx;
+	}
 </style>

pages/index/artDetail.vue

@@ -0,0 +1,42 @@
+<template>
+	<view class="contet">
+		<view class="" v-html="content">
+			
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		loadIndexs,
+		getArticleList,
+		getArtDetai
+	} from '@/api/index.js';
+	export default {
+		data() {
+			return {
+				content: '',
+				id: 0,
+			}
+		},
+		onLoad(opt) {
+			this.id = opt.id
+			this.getDetai()
+		},
+		methods: {
+			getDetai() {
+				let obj = this
+				getArtDetai({},obj.id).then(res => {
+					console.log(res)
+					obj.content = res.data.content
+					if(obj.content != null){
+						obj.content = obj.content.replace(/<img/g,"<img style='max-width:100%;height:auto;min-width:100%;'");
+					}//小程序商品详情图超出屏幕问题
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+</style>

pages/index/artList.vue

@@ -0,0 +1,113 @@
+<template>
+	<view class="jj-wrap">
+		<view class="jj" v-for="cp in list" @click="navto('/pages/index/artDetail?id=' + cp.id)">
+			<image :src="cp.image_input[0]" mode="" class="jj-img"></image>
+			<view class="jj-info">
+				<view class="jj-tit-tit clamp2">
+					{{cp.title}}
+				</view>
+				<view class="jj-val clamp">
+					更新时间{{cp.add_time}}
+				</view>
+			</view>
+		</view>
+		<uni-load-more :status="loadingType"></uni-load-more>
+	</view>
+</template>
+
+<script>
+	import {
+		loadIndexs,
+		getArticleList
+	} from '@/api/index.js';
+	export default {
+		data() {
+			return {
+				list: [],
+				page: 1,
+				limit: 10,
+				loadingType: 'more',
+				cid: 0,
+			}
+		},
+		onLoad(opt) {
+			this.cid = opt.cid
+			this.getArticleList()
+		},
+		methods: {
+			navto(url) {
+				uni.navigateTo({
+					url: url
+				})
+			},
+			getArticleList() {
+				let obj = this
+				if(obj.loadingType == 'noMore' || obj.loadingType == 'loading') {
+					return
+				}
+				obj.loadingType = 'loading'
+				getArticleList({
+					page: obj.page,
+					limit: obj.limit
+				},obj.cid).then(({data}) => {
+					obj.list = obj.list.concat(data)
+					obj.page++
+					if(data.length == obj.limit) {
+						obj.loadingType = 'more'
+					}else {
+						obj.loadingType = 'noMore'
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		background-color: #fff;
+		min-height: 100%;
+	}
+	.jj-wrap {
+		background-color: #fff;
+		// margin: 20rpx 0;
+		.jj {
+			margin: auto;
+			width: 689rpx;
+			height: 202rpx;
+			border-bottom: 1px solid #e5e5e5;
+			padding: 20rpx;
+			padding-left: 0;
+			display: flex;
+			&:last-of-type {
+				border-bottom: none;
+			}
+			.jj-img {
+				flex-shrink: 0;
+				width: 222rpx;
+				height: 158rpx;
+				background-color: #bfa;
+				border-radius: 10rpx;
+			}
+			.jj-info {
+				width: 450rpx;
+				// flex-shrink: 0;
+				padding: 10rpx;
+				padding-left: 15rpx;
+				font-size: 32rpx;
+				font-weight: bold;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				.jj-tit-tit {
+					
+				}
+				.jj-val {
+					padding-top: 20rpx;
+					font-size: 28rpx;
+					font-weight: 500;
+				}
+			}
+		}
+	}
+</style>

pages/index/child/wholesale.vue

@@ -1,41 +1,31 @@
-<template>
-	<view class="wholesale">
+<!-- <template>
+	<view class="wholesale" v-if="goodList.length > 0">
 		<view class="title">
-			<view class="img">
-				<image src="../../../static/img/list1.png" mode=""></image>
-			</view>
-			<view class="title-t"> 批发专区 </view>
-			<view class="about"> 限时抢购 </view>
-		</view>
-		<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].id)">
-				<image src="../../../static/img/mom.png"></image>
-				<view class="item-name">
-					上午场
-				</view>
-				<view class="item-time">
-					{{list[0].time}}~{{list[0].stop | timet}}
+			<view class="left">
+				<view class="img">
+					<image src="../../../static/img/list1.png" mode=""></image>
 				</view>
+				<view class="title-t"> 批发专区 </view>
+				<view class="about"> 限时抢购 </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 + '&wid=' + list[1].id)">
-				<image src="../../../static/img/aft.png"></image>
-				<view class="item-name">
-					下午场
-				</view>
-				<view class="item-time">
-					{{list[1].time}}~{{list[1].stop | timet}}
+			
+			<view class="right" @click="navto('/pages/product/wholesale')">
+				<view class="jj-more-tit">
+					更多
 				</view>
+				<image src="../../../static/img/img39.png" class="jj-more"></image>
 			</view>
+		</view>
+		<view class="date" v-if="goodList.length > 0">
 			<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].id)">
-				<image src="../../../static/img/eve.png"></image>
-				<view class="item-name">
-					晚上场
+				v-for="item in goodList.slice(0,3)"
+				@click="navto('/pages/product/realyWhole?id=' + item.id + '&time=' + item.time_id)">
+				<image :src="item.whole.image"></image>
+				<view class="item-tit clamp">
+					{{item.whole.title}}
 				</view>
-				<view class="item-time">
-					{{list[2].time}}~{{list[2].stop | timet}}
+				<view class="item-price">
+					￥{{item.price}}
 				</view>
 			</view>
 		</view>
@@ -44,12 +34,14 @@
 
 <script>
 	import {
-		getWholeTimeArea
+		getWholeTimeArea,
+		getWholeList
 	} from '@/api/whole.js'
 	export default {
 		data() {
 			return {
-				list: []
+				list: [],
+				goodList: []
 			}
 		},
 		filters: {
@@ -73,11 +65,19 @@
 					url: url
 				})
 			},
+			
 			getTimeArea() {
 				getWholeTimeArea().then(({
 					data
 				}) => {
 					this.list = data.seckillTime
+					this.list.forEach(item => {
+						// this.
+						getWholeList({},item.id).then(res => {
+							console.log(res.data.data)
+							this.goodList = this.goodList.concat(res.data.data)
+						})
+					})
 				})
 			}
 		}
@@ -97,7 +97,11 @@
 		.title {
 			display: flex;
 			line-height: 40rpx;
-
+			justify-content: space-between;
+			.left {
+				display: flex;
+				align-items: center;
+			}
 			.title-t {
 				color: $text;
 				font-weight: bold;
@@ -114,23 +118,38 @@
 				width: 40rpx;
 				height: 40rpx;
 			}
+			.right {
+				display: flex;
+				width: 200rpx;
+				font-size: 22rpx;
+				// justify-content: sp;
+				justify-content: flex-end;
+				align-items: center;
+				padding-right: 20rpx;
+				color: #999;
+				.jj-more {
+					margin-left: 10rpx;
+					width: 15rpx;
+					height: 22rpx;
+				}
+			}
 		}
 
 		.date {
 			padding: 30rpx 0;
 			display: flex;
-			justify-content: space-between;
+			justify-content: flex-start;
 
 			.date-item {
 				width: 220rpx;
-				height: 300rpx;
+				height: 270rpx;
 				position: relative;
-
+				margin-right: 20rpx;
 				image {
 					border-radius: 20rpx;
 					// max-width: 32%;
 					width: 220rpx;
-					height: 300rpx;
+					height: 222rpx;
 				}
 
 				.item-name {
@@ -153,6 +172,19 @@
 					top: 80rpx;
 					padding-left: 30rpx;
 				}
+				.item-price {
+					padding-left: 10rpx;
+					font-size: 28rpx;
+					color: $red;
+					font-weight: bold;
+				}
+				.item-tit {
+					padding-left: 10rpx;
+					font-size: 30rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #333333;
+				}
 			}
 
 			// image {
@@ -164,3 +196,171 @@
 		}
 	}
 </style>
+ -->
+ 
+ <template>
+ 	<view class="wholesale">
+ 		<view class="title">
+ 			<view class="img">
+ 				<image src="../../../static/img/list1.png" mode=""></image>
+ 			</view>
+ 			<view class="title-t"> 批发专区 </view>
+ 			<view class="about"> 限时抢购 </view>
+ 		</view>
+ 		<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].id)">
+ 				<image src="../../../static/img/mom.png"></image>
+ 				<view class="item-name">
+ 					上午场
+ 				</view>
+ 				<view class="item-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 + '&wid=' + list[1].id)">
+ 				<image src="../../../static/img/aft.png"></image>
+ 				<view class="item-name">
+ 					下午场
+ 				</view>
+ 				<view class="item-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 + '&wid=' + list[2].id)">
+ 				<image src="../../../static/img/eve.png"></image>
+ 				<view class="item-name">
+ 					晚上场
+ 				</view>
+ 				<view class="item-time">
+ 					{{list[2].time}}~{{list[2].stop | timet}}
+ 				</view>
+ 			</view>
+ 		</view>
+ 	</view>
+ </template>
+ 
+ <script>
+ 	import {
+ 		getWholeTimeArea
+ 	} from '@/api/whole.js'
+ 	export default {
+ 		data() {
+ 			return {
+ 				list: []
+ 			}
+ 		},
+ 		filters: {
+ 			timet(val) {
+ 				let str = ''
+ 				if (val) {
+ 					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
+ 			}
+ 		},
+ 		mounted() {
+ 			this.getTimeArea()
+ 		},
+ 		methods: {
+ 			navto(url) {
+ 				uni.navigateTo({
+ 					url: url
+ 				})
+ 			},
+ 			getTimeArea() {
+ 				getWholeTimeArea().then(({
+ 					data
+ 				}) => {
+ 					this.list = data.seckillTime
+ 				})
+ 			}
+ 		}
+ 	}
+ </script>
+ 
+ <style lang="scss" scoped>
+ 	$grey: #95A0B1;
+ 	$text: #333333;
+ 	$red: #FF4C4C;
+ 
+ 	.wholesale {
+ 		padding: 20rpx;
+ 		background-color: #fff;
+ 		margin: 20rpx 0;
+ 
+ 		.title {
+ 			display: flex;
+ 			line-height: 40rpx;
+ 
+ 			.title-t {
+ 				color: $text;
+ 				font-weight: bold;
+ 				margin: 0 20rpx;
+ 				font-size: 34rpx;
+ 			}
+ 
+ 			.about {
+ 				font-size: 24rpx;
+ 				color: $grey;
+ 			}
+ 
+ 			image {
+ 				width: 40rpx;
+ 				height: 40rpx;
+ 			}
+ 		}
+ 
+ 		.date {
+ 			padding: 30rpx 0;
+ 			display: flex;
+ 			justify-content: space-between;
+ 
+ 			.date-item {
+ 				width: 220rpx;
+ 				height: 300rpx;
+ 				position: relative;
+ 
+ 				image {
+ 					border-radius: 20rpx;
+ 					// max-width: 32%;
+ 					width: 220rpx;
+ 					height: 300rpx;
+ 				}
+ 
+ 				.item-name {
+ 					font-size: 32rpx;
+ 					font-family: PingFang SC;
+ 					font-weight: 500;
+ 					color: #FFFFFF;
+ 					position: absolute;
+ 					top: 36rpx;
+ 					padding-left: 30rpx;
+ 
+ 				}
+ 
+ 				.item-time {
+ 					font-size: 22rpx;
+ 					font-family: PingFang SC;
+ 					font-weight: 500;
+ 					color: #FFFFFF;
+ 					position: absolute;
+ 					top: 80rpx;
+ 					padding-left: 30rpx;
+ 				}
+ 			}
+ 
+ 			// image {
+ 			// 	border-radius: 20rpx;
+ 			// 	// max-width: 32%;
+ 			// 	width: 220rpx;
+ 			// 	height: 300rpx;
+ 			// }
+ 		}
+ 	}
+ </style>

pages/index/cpzq.vue

@@ -0,0 +1,184 @@
+<template>
+	<view class="content">
+		<view class="" style="height: 20rpx;">
+			
+		</view>
+		<view class="jj-tit" v-if="gsjjList.length > 0">
+			<view class="left">
+				<image src="../../static/icon/gsjj.png" mode="" class="jj-log"></image>
+				<view class="jj-title">
+					公司简介
+				</view>
+			</view>
+			<view class="right" @click="navto('/pages/index/artList?cid=1')">
+				<view class="jj-more-tit">
+					更多
+				</view>
+				<image src="../../static/img/img39.png" mode="" class="jj-more"></image>
+			</view>
+		</view>
+		<view class="jj-wrap" v-if="gsjjList.length > 0">
+			<view class="jj" v-for="gs in gsjjList" @click="navto('/pages/index/artDetail?id=' + gs.id)">
+				<image :src="gs.image_input[0]" mode="" class="jj-img"></image>
+				<view class="jj-info">
+					<view class="jj-tit-tit clamp">
+						{{gs.title}}
+					</view>
+					<view class="jj-val clamp2">
+						更新时间{{gs.add_time}}
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 产品简介 -->
+		<view class="jj-tit" style="margin-top: 20rpx;" v-if="cpjjList.length > 0">
+			<view class="left">
+				<image src="../../static/icon/cpjj.png" mode="" class="jj-log"></image>
+				<view class="jj-title">
+					产品简介
+				</view>
+			</view>
+			<view class="right" @click="navto('/pages/index/artList?cid=2')">
+				<view class="jj-more-tit">
+					更多
+				</view>
+				<image src="../../static/img/img39.png" mode="" class="jj-more"></image>
+			</view>
+		</view>
+		<view class="jj-wrap" v-if="cpjjList.length > 0">
+			<view class="jj" v-for="cp in cpjjList" @click="navto('/pages/index/artDetail?id=' + cp.id)">
+				<image :src="cp.image_input[0]" mode="" class="jj-img"></image>
+				<view class="jj-info">
+					<view class="jj-tit-tit clamp2">
+						{{cp.title}}
+					</view>
+					<view class="jj-val clamp">
+						更新时间{{cp.add_time}}
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		loadIndexs,
+		getArticleList
+	} from '@/api/index.js';
+	export default {
+		data() {
+			return {
+				cpjjList: [],
+				gsjjList: []
+			}
+		},
+		onShow() {
+			this.getArticleList()
+		},
+		methods: {
+			navto(url) {
+				console.log(url)
+				uni.navigateTo({
+					url: url
+				})
+			},
+			getArticleList() {
+				getArticleList({
+					pages: 1,
+					limit: 3
+				},2).then(({data}) => {
+					console.log(data)
+					this.cpjjList = data
+				})
+				getArticleList({
+					pages: 1,
+					limit: 3
+				},1).then(({data}) => {
+					console.log(data)
+					this.gsjjList = data
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.jj-tit {
+		display: flex;
+		// height: 50rpx;
+		justify-content: space-between;
+		background-color: #fff;
+		padding-top: 20rpx;
+		.left {
+			padding-left: 20rpx;
+			display: flex;
+			.jj-log {
+				width: 45rpx;
+				height: 45rpx;
+			}
+			.jj-title {
+				font-weight: bold;
+				font-size: 32rpx;
+				padding-left: 15rpx;
+			}
+		}
+		.right {
+			display: flex;
+			width: 200rpx;
+			font-size: 22rpx;
+			// justify-content: sp;
+			justify-content: flex-end;
+			align-items: center;
+			padding-right: 20rpx;
+			color: #999;
+			.jj-more {
+				margin-left: 10rpx;
+				width: 15rpx;
+				height: 22rpx;
+			}
+		}
+	}
+	.jj-wrap {
+		background-color: #fff;
+		// margin: 20rpx 0;
+		.jj {
+			margin: auto;
+			width: 689rpx;
+			height: 202rpx;
+			border-bottom: 1px solid #e5e5e5;
+			padding: 20rpx;
+			padding-left: 0;
+			display: flex;
+			&:last-of-type {
+				border-bottom: none;
+			}
+			.jj-img {
+				flex-shrink: 0;
+				width: 222rpx;
+				height: 158rpx;
+				background-color: #bfa;
+				border-radius: 10rpx;
+			}
+			.jj-info {
+				width: 450rpx;
+				// flex-shrink: 0;
+				padding: 10rpx;
+				padding-left: 15rpx;
+				font-size: 32rpx;
+				font-weight: bold;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				.jj-tit-tit {
+					
+				}
+				.jj-val {
+					padding-top: 20rpx;
+					font-size: 28rpx;
+					font-weight: 500;
+				}
+			}
+		}
+	}
+</style>

pages/index/index.vue

@@ -15,7 +15,7 @@
 			<!-- 标题栏和状态栏占位符 -->
 			<view class="titleNview-placing"></view>
 			<!-- 背景色区域 -->
-			<view class="titleNview-background" :style="{ backgroundColor: '#5DBC7C' }"></view>
+			<view class="titleNview-background" ></view>
 			<swiper class="carousel" autoplay="true" duration="400" interval="5000" @change="swiperChange">
 				<swiper-item v-for="(item, index) in carouselList" :key="index" class="carousel-item">
 					<image :src="item.pic" />
@@ -30,12 +30,12 @@
 		</view>
 		<!-- 分类 -->
 		<view class="cate-section">
-			<navigator url="/pages/product/newPeople" v-if="userInfo.is_whole == 0">
+			<!-- <navigator url="/pages/product/newPeople" v-if="userInfo.is_whole == 0">
 				<view class="cate-item">
 					<image src="/static/img/index-nav1.png"></image>
 					<text>新人专区</text>
 				</view>
-			</navigator>
+			</navigator> -->
 			<navigator url="/pages/product/exchange">
 				<view class="cate-item">
 					<image src="/static/img/index-nav2.png"></image>
@@ -53,68 +53,62 @@
 					<image src="/static/img/index-nav4.png"></image>
 					<text>邀请有礼</text>
 				</view>
+			</navigator>
+			<navigator url="/pages/index/cpzq">
+				<view class="cate-item">
+					<image src="../../static/icon/cpzq.png"></image>
+					<text>产品专区</text>
+				</view>
 			</navigator>
 		</view>
 		<!-- 金豆专区 -->
 		<golden-bean :data='jdList'></golden-bean>
 		<!-- 批发专区 -->
-		<wholesale></wholesale>
-		<!-- 公司简介 -->
-		<view class="jj-tit" v-if="gsjjList.length > 0">
-			<view class="left">
-				<image src="../../static/icon/gsjj.png" mode="" class="jj-log"></image>
-				<view class="jj-title">
-					公司简介
-				</view>
-			</view>
-			<view class="right">
-				<view class="jj-more-tit">
-					更多
+		<!-- <wholesale></wholesale> -->
+		<view class="wholesale">
+			<view class="title">
+				<view class="img">
+					<image src="../../static/img/list1.png" mode=""></image>
 				</view>
-				<image src="../../static/img/img39.png" mode="" class="jj-more"></image>
+				<view class="title-t"> 批发专区 </view>
+				<view class="about"> 限时抢购 </view>
 			</view>
-		</view>
-		<view class="jj-wrap" v-if="gsjjList.length > 0">
-			<view class="jj" v-for="item in 1">
-				<view class="jj-img"></view>
-				<view class="jj-info">
-					<view class="jj-tit-tit clamp">
-						哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈
+			<view class="date" v-if="timeList.length > 0">
+				<view class="date-item"
+					v-for="itemt in timeList"
+					@click="navto('/pages/product/wholesale?bin=' + encodeURI(itemt.time) + '&stp=' + itemt.stop + '&status=' + itemt.status + '&state=' + itemt.state + '&wid=' + itemt.id)">
+					<image :src="itemt.slide"></image>
+					<view class="item-name">
+						{{itemt.time < '12:00' ? '上午场':(itemt.time > '17:00' ? '晚上场' : '下午场') }}
 					</view>
-					<view class="jj-val clamp2">
-						体贴体贴体贴体贴体贴体贴体贴体贴体贴体贴体贴体贴体贴
+					<view class="item-time">
+						{{itemt.time}}~{{itemt.stop | timet}}
 					</view>
 				</view>
-			</view>
-		</view>
-		<!-- 产品简介 -->
-		<view class="jj-tit" style="margin-top: 20rpx;" v-if="cpjjList.length > 0">
-			<view class="left">
-				<image src="../../static/icon/cpjj.png" mode="" class="jj-log"></image>
-				<view class="jj-title">
-					产品简介
-				</view>
-			</view>
-			<view class="right">
-				<view class="jj-more-tit">
-					更多
-				</view>
-				<image src="../../static/img/img39.png" mode="" class="jj-more"></image>
-			</view>
-		</view>
-		<view class="jj-wrap" v-if="cpjjList.length > 0">
-			<view class="jj" v-for="item in 1">
-				<view class="jj-img"></view>
-				<view class="jj-info">
-					<view class="jj-tit-tit clamp">
-						哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈
+				<!-- <view class="date-item"
+					@click="navto('/pages/product/wholesale?bin=' + encodeURI(timeList[1].time) + '&stp=' + timeList[1].stop + '&status=' + timeList[1].status  + '&state=' + timeList[1].state + '&wid=' + timeList[1].id)">
+					<image src="../../static/img/aft.png"></image>
+					<view class="item-name">
+						下午场
 					</view>
-					<view class="jj-val clamp2">
-						体贴体贴体贴体贴体贴体贴体贴体贴体贴体贴体贴体贴体贴
+					<view class="item-time">
+						{{timeList[1].time}}~{{timeList[1].stop | timet}}
 					</view>
 				</view>
+				<view class="date-item"
+					@click="navto('/pages/product/wholesale?bin=' + encodeURI(timeList[2].time) + '&stp=' + timeList[2].stop + '&status=' + timeList[2].status  + '&state=' + timeList[2].state + '&wid=' + timeList[2].id)">
+					<image src="../../static/img/eve.png"></image>
+					<view class="item-name">
+						晚上场
+					</view>
+					<view class="item-time">
+						{{timeList[2].time}}~{{timeList[2].stop | timet}}
+					</view>
+				</view> -->
 			</view>
-		</view>
+		</view>
+		<!-- 公司简介 -->
+		
 	</view>
 </template>
 
@@ -127,7 +121,8 @@
 	import wholesale from './child/wholesale.vue';
 	import recommend from './child/recommend.vue';
 	import {
-		loadIndexs
+		loadIndexs,
+		getArticleList
 	} from '@/api/index.js';
 	import {
 		getUserInfo
@@ -142,7 +137,9 @@
 	import {
 		mapState
 	} from 'vuex';
-
+	import {
+		getWholeTimeArea
+	} from '@/api/whole.js'
 	export default {
 		components: {
 			goldenBean,
@@ -165,14 +162,28 @@
 				page: 1,
 				limit: 3,
 				gsjjList: [],
-				cpjjList: []
+				cpjjList: [],
+				timeList: []
 			};
 		},
 		computed: {
 			...mapState(['loginInterceptor']),
 			...mapState('user', ['hasLogin', 'userInfo'])
+		},
+		filters: {
+			timet(val) {
+				let str = ''
+				if (val) {
+					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
+			}
 		},
-		onLoad: function(option) {
+		onLoad: function(option) {
+			console.log('binloading')
 			// #ifndef MP
 			if (option.spread) {
 				// 存储其他邀请人
@@ -187,18 +198,22 @@
 					data: option.scene
 				});
 			}
-			// #endif
+			// #endif
+			// this.getArticleList()
 		},
-		onShow: function() {
+		onShow: function() {
+			console.log('show')
 			// 判断是否强制登录
 			if (this.loginInterceptor && !this.hasLogin) {
+				console.log('show123')
 				saveUrl()
 				// 登录拦截
-				// interceptor();
+				interceptor();
 				return
 			}
 			this.loadData();
-			this.getBargainList();
+			this.getBargainList();
+			this.getTimeArea()
 		},
 		//下拉刷新
 		onPullDownRefresh() {
@@ -230,7 +245,36 @@
 			}
 		},
 		// #endif
-		methods: {
+		methods: {
+			getTimeArea() {
+				getWholeTimeArea().then(({
+					data
+				}) => {
+					this.timeList = data.seckillTime
+				})
+			},
+			navto(url) {
+				console.log(url)
+				uni.navigateTo({
+					url: url
+				})
+			},
+			getArticleList() {
+				getArticleList({
+					pages: 1,
+					limit: 3
+				},2).then(({data}) => {
+					console.log(data)
+					this.cpjjList = data
+				})
+				getArticleList({
+					pages: 1,
+					limit: 3
+				},1).then(({data}) => {
+					console.log(data)
+					this.gsjjList = data
+				})
+			},
 			getUserInfo() {
 				getUserInfo().then(res => {
 					console.log(res)
@@ -390,44 +434,44 @@
 	}
 
 	/* 头部 轮播图 */
-	.carousel-section {
-		position: relative;
-		padding-top: 10px;
-		overflow: hidden;
-
-		.titleNview-placing {
-			height: var(--status-bar-height);
-			padding-top: 44px;
-			box-sizing: content-box;
-		}
-
-		.titleNview-background {
-			position: absolute;
-			top: 0;
-			left: 0;
-			width: 100%;
-			height: 426rpx;
-			transition: 0.4s;
-		}
-
-		.carousel {
-			width: 100%;
-			height: 240rpx;
-
-			.carousel-item {
-				width: 100%;
-				height: 100%;
-				padding: 0 28rpx;
-				overflow: hidden;
-			}
-
-			image {
-				width: 100%;
-				height: 100%;
-				border-radius: $border-radius-sm;
-			}
-		}
-	}
+	// .carousel-section {
+	// 	position: relative;
+	// 	padding-top: 10px;
+	// 	overflow: hidden;
+
+	// 	.titleNview-placing {
+	// 		height: var(--status-bar-height);
+	// 		padding-top: 44px;
+	// 		box-sizing: content-box;
+	// 	}
+
+	// 	.titleNview-background {
+	// 		position: absolute;
+	// 		top: 0;
+	// 		left: 0;
+	// 		width: 100%;
+	// 		height: 426rpx;
+	// 		transition: 0.4s;
+	// 	}
+
+	// 	.carousel {
+	// 		width: 100%;
+	// 		height: 240rpx;
+
+	// 		.carousel-item {
+	// 			width: 100%;
+	// 			height: 100%;
+	// 			padding: 0 28rpx;
+	// 			overflow: hidden;
+	// 		}
+
+	// 		image {
+	// 			width: 100%;
+	// 			height: 100%;
+	// 			border-radius: $border-radius-sm;
+	// 		}
+	// 	}
+	// }
 
 	.swiper-dots {
 		display: flex;
@@ -540,7 +584,7 @@
 			margin: auto;
 			width: 689rpx;
 			height: 202rpx;
-			border-bottom: 1px solid #999;
+			border-bottom: 1px solid #e5e5e5;
 			padding: 20rpx;
 			padding-left: 0;
 			display: flex;
@@ -558,9 +602,12 @@
 				width: 450rpx;
 				// flex-shrink: 0;
 				padding: 10rpx;
+				padding-left: 15rpx;
 				font-size: 32rpx;
 				font-weight: bold;
-				
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
 				.jj-tit-tit {
 					
 				}
@@ -571,5 +618,119 @@
 				}
 			}
 		}
+	}
+	.carousel-section {
+		position: relative;
+		// padding-top: 10px;
+		overflow: hidden;
+	
+		.titleNview-placing {
+			height: var(--status-bar-height);
+			// padding-top: 44px;
+			box-sizing: content-box;
+		}
+	
+		.titleNview-background {
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 426rpx;
+			transition: 0.4s;
+		}
+		.carousel {
+			width: 100%;
+			height: 426rpx;
+			.carousel-item {
+				width: 100%;
+				height: 100%;
+				// padding: 0 28rpx;
+				overflow: hidden;
+			}
+	
+			image {
+				width: 100%;
+				height: 100%;
+				// border-radius: $border-radius-sm;
+			}
+		}
+	}
+	$grey: #95A0B1;
+	$text: #333333;
+	$red: #FF4C4C;
+	 
+	.wholesale {
+		padding: 20rpx;
+		background-color: #fff;
+		margin: 20rpx 0;
+	 
+		.title {
+			display: flex;
+			line-height: 40rpx;
+	 
+			.title-t {
+				color: $text;
+				font-weight: bold;
+				margin: 0 20rpx;
+				font-size: 34rpx;
+			}
+	 
+			.about {
+				font-size: 24rpx;
+				color: $grey;
+			}
+	 
+			image {
+				width: 40rpx;
+				height: 40rpx;
+			}
+		}
+	 
+		.date {
+			padding: 30rpx 0;
+			display: flex;
+			justify-content: space-between;
+	 
+			.date-item {
+				width: 220rpx;
+				height: 300rpx;
+				position: relative;
+	 
+				image {
+					border-radius: 20rpx;
+					// max-width: 32%;
+					width: 220rpx;
+					height: 300rpx;
+				}
+	 
+				.item-name {
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #FFFFFF;
+					position: absolute;
+					top: 36rpx;
+					padding-left: 30rpx;
+	 
+				}
+	 
+				.item-time {
+					font-size: 22rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #FFFFFF;
+					position: absolute;
+					top: 80rpx;
+					padding-left: 30rpx;
+				}
+			}
+	 
+			// image {
+			// 	border-radius: 20rpx;
+			// 	// max-width: 32%;
+			// 	width: 220rpx;
+			// 	height: 300rpx;
+			// }
+		}
 	}
 </style>

pages/product/realyWhole.vue

@@ -12,8 +12,8 @@
 			</view>
 		</view>
 		<!-- 标题 -->
-		<view class="good-tit">
-			{{goodItem.title}}
+		<view class="good-tit" v-if="goodItem.whole">
+			{{goodItem.whole.title}}
 		</view>
 		<content-text :description="description"></content-text>
 		<view class="btn-ts" style="height: 130rpx; background-color: #fff;"></view>

pages/product/wholesale.vue

@@ -2,15 +2,11 @@
 	<view class="content">
 		<image src="../../static/img/wh-bg.png" mode="" class="to-bg"></image>
 		<view class="top-tit">
-			{{state}}
+			{{gooditem.state}}
 		</view>
-		<view class="top-time" v-if="status != 1">
-			{{showTime}}
+		<view class="top-time" v-if="gooditem.time">
+			{{gooditem.time + ' ' + '~' + ' '}}{{gooditem.stop | time}}
 		</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="../../static/icon/pf-logo.png" mode="" class="center-logo"></image>
 			<view class="center-tit">
@@ -23,10 +19,26 @@
 			</view>
 			<image src="../../static/img/img74.png" mode="" class="look-more"></image>
 		</view>
-		<scroll-view scroll-y="true" class="swiper-box" :style="{'height': height}">
-			<!-- <empty v-if="loadingType == 'noMore' && list.length === 0"></empty> -->
+		<scroll-view scroll-y="true" class="swiper-box" :style="{'height': height}" @scrolltolower="getWholeList()">
 			<view class="good-wrap">
-
+				<template v-if="userInfo && userInfo.is_whole == 0">
+					<!-- <template> -->
+					<view class="good" v-for="itemt in newlist" @click="navto('/pages/product/wholesaleDetail?id=' + itemt.id + '&time=' + itemt.time_id + '&status=' + itemt.status + '&is_new=' + is_new)">
+						<image :src="itemt.image" mode="" class="goo-img"></image>
+						<view class="xrlb">
+							新人礼包
+						</view>
+						<view class="good-tit clamp">
+							{{itemt.title}}
+						</view>
+						<view class="good-price flex">
+							<view class="new-price">
+								¥{{itemt.price}}
+							</view>
+						</view>
+					</view>
+				</template>
+				
 				<view class="good" v-for="item in list" @click="gotoDetail(item)">
 					<image :src="item.whole.image" mode="" class="goo-img"></image>
 					<view class="good-tit clamp">
@@ -42,19 +54,27 @@
 					</view>
 				</view>
 			</view>
-			<uni-load-more :status="loadingType" v-if="loadingType == 'loading'"></uni-load-more>
+			<uni-load-more :status="loadingType"></uni-load-more>
 		</scroll-view>
 	</view>
 </template>
 
 <script>
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
 	import {
 		timeComputed
 	} from '@/utils/rocessor.js'
 	import {
-		getWholeList
+		getWholeList,
+		getNewList,
+		getWholeTimeArea,
 	} from '@/api/whole.js'
-
+	import {
+		getUserInfo
+	} from '@/api/user.js'
 	import uniCountdown from '@/components/uni-countdown/uni-countdown.vue';
 	import empty from '@/components/empty';
 
@@ -65,11 +85,12 @@
 		},
 		data() {
 			return {
+				newlist: [],
 				height: '',
 				list: [],
 				page: 1,
 				limit: 10,
-				loadingType: 'loading',
+				loadingType: 'more',
 				loaded: false,
 				bin: '',
 				stop: '',
@@ -79,7 +100,11 @@
 				stopTimeM: '',
 				stopTimeS: '',
 				timer: '',
-				wid: ''
+				wid: '',
+				time_id: 0,
+				gooditem: {},
+				is_new: 'non',
+				userInfo: {}
 			}
 		},
 		onReady(res) {
@@ -103,90 +128,127 @@
 			obj.status = opt.status
 			obj.state = opt.state
 			obj.wid = opt.wid
-
-			obj.getWholeList()
+			obj.getNewList()
 			console.log(obj.bin, obj.stop, obj.status)
 		},
 		onShow() {
 			let obj = this
-			if (obj.status == 1) {
-				if (obj.timer) {
-					clearTimeout(obj.timer)
-				}
-				this.getSyTime()
-			}
+			obj.getUserInfo()
+			obj.getTimeArea()
 		},
-		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
+		filters: {
+			time(val) {
+				let str = ''
+				if(val) {
+					let date = new Date(val*1000)
+					let m = date.getHours() > 9 ? date.getHours() : ( '0'+ date.getHours())
+					let s = date.getMinutes() > 9 ? date.getMinutes() : ( '0'+ date.getMinutes())
+					str = m + ':' + s
 				}
+				return str
 			}
 		},
 		methods: {
+			...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
+			getUserInfo() {
+				getUserInfo().then(res => {
+					console.log(res)
+					this.setUserInfo(res.data);
+					this.userInfo = res.data
+					this.is_new = res.data.is_whole == 0? 'isn': 'non'
+				})
+			},
+			getTimeArea() {
+				let obj = this
+				getWholeTimeArea().then(({
+					data
+				}) => {
+					
+					// this.list = data.seckillTime
+					console.log(data.seckillTime[0])
+					data.seckillTime.forEach(item => {
+						if(obj.wid == item.id) {
+							obj.gooditem = item
+						}
+					})
+					// this.gooditem = data.seckillTime[0]
+					// this.wid = this.gooditem.id
+					console.log('时间获取成功',this.gooditem.id)
+					this.getWholeList()
+					// this.list.forEach(item => {
+						
+					// })
+				})
+			},
+			getNewList() {
+				getNewList({
+					page: 1,
+					limit: 100
+				}).then(res => {
+					console.log(res, 'getNewList')
+					this.newlist = res.data
+				})
+			},
 			gotoDetail(item) {
 				let obj = this
 				obj.navto('/pages/product/realyWhole?id=' + item.id + '&time=' + item.time_id)
-				// if(obj.status == 1 ) {
-				// 	obj.navto('/pages/product/wholesaleDetail?id=' + item.id)
-				// }
-				// if(obj.status == 0) {
-				// 	obj.$api.msg('今日该场次已结束')
-				// }
-				// if(obj.status == 2) {
-				// 	obj.$api.msg('今日该场次未开始，请稍后')
-				// }
 			},
 			navto(url) {
 				uni.navigateTo({
 					url: url
 				})
 			},
-			// 获取剩余时间
-			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.timer) {
-					if (obj.status == 1) {
-						obj.timer = setTimeout(this.getSyTime, 1000)
-					}
+			// // 获取剩余时间
+			// 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.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)
-					}
-				}
+			// 	} else {
+			// 		clearTimeout(obj.timer)
+			// 		if (obj.status == 1) {
+			// 			obj.timer = setTimeout(this.getSyTime, 1000)
+			// 		}
+			// 	}
 
-				// console.log(obj.stopTimeH + ':' + obj.stopTimeM + ':' + obj.stopTimeS)
-			},
+			// 	// console.log(obj.stopTimeH + ':' + obj.stopTimeM + ':' + obj.stopTimeS)
+			// },
 			getWholeList() {
 				let obj = this
+				console.log('开始加载')
 				// obj.loadingType == 'loading'
-				getWholeList({}, obj.wid).then(({
+				if(obj.loadingType == 'noMore' || obj.loadingType == 'loading') {
+					return
+				}
+				obj.loadingType = 'loading'
+				getWholeList({
+					page: obj.page,
+					limit: obj.limit
+				}, obj.wid).then(({
 					data
 				}) => {
-					obj.list = data.data
-					// if()
-					obj.loadingType = 'noMore'
-					console.log(obj.loadingType)
-					console.log(obj.list, 'obj.list+++++')
+					console.log('结束')
+					obj.list = obj.list.concat(data.data)
+					obj.page++
+					if(data.data.length == obj.limit) {
+						obj.loadingType = 'more'
+					}else {
+						obj.loadingType = 'noMore'
+					}
 				})
+			},
+			loadmore() {
+				console.log('加载更多')
 			}
 		}
 	}
@@ -281,7 +343,19 @@
 		background: #FFFFFF;
 		box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
 		border-radius: 10rpx;
-
+		position: relative;
+		.xrlb {
+			position: absolute;
+			display: inline-block;
+			padding: 5rpx 10rpx;
+			background-color: #FF4C4C;
+			color: #fff;
+			text-align: center;
+			border-radius: 0 10rpx 10rpx 0;
+			// width: 100rpx;
+			top: 0;
+			left: 0;
+		}
 		.goo-img {
 			width: 345rpx;
 			height: 345rpx;

pages/product/wholesaleDetail.vue

@@ -30,7 +30,9 @@
 	import topSwiper from './common/topSwiper.vue';
 	// 图文详情
 	import contentText from './common/contentText.vue';
-
+	import {
+		getUserInfo
+	} from '@/api/user.js'
 	import {
 		getWholeDetai,
 		reservePackage,
@@ -48,7 +50,7 @@
 				good_id: '',
 				time_id: '',
 				status: 1,
-				is_new: '',
+				is_new: 'non',
 				description: '',
 				loading: false,
 			}
@@ -64,13 +66,21 @@
 				this.status = opt.status
 			}
 
-			if (opt.is_new) {
-				this.is_new = opt.is_new
-			}
-
+			// if (opt.is_new) {
+			// 	this.is_new = opt.is_new
+			// }
+			this.getUserInfo()
 			this.getWholeDetai()
 		},
 		methods: {
+			getUserInfo() {
+				getUserInfo().then(res => {
+					console.log(res)
+					// this.setUserInfo(res.data);
+					// this.userInfo = res.data
+					this.is_new = res.data.is_whole == 0? 'isn': 'non'
+				})
+			},
 			getWholeDetai() {
 				let obj = this
 				if (obj.is_new) {
@@ -100,6 +110,10 @@
 			// 预约包
 			reservePackage() {
 				let obj = this
+				if(obj.is_new == 'non') {
+					this.$api.msg('您已不是新人，无法购买新人专属商品')
+					return
+				}
 				let updata = {
 					whole_id: obj.good_id,
 					time_id: obj.time_id,

pages/set/userinfo.vue

@@ -132,8 +132,8 @@
 						if (e.confirm) {
 							logout({}).then(e => {
 								obj.logout();
-								uni.navigateTo({
-									url:'/pages/public/login'
+								uni.switchTab({
+									url: '/pages/index/index'
 								})
 							})
 							.catch(e => {

pages/user/JDcool.vue

@@ -5,7 +5,7 @@
 				<view class="goback-box" @click="toBack">
 					<image class="goback" src="../../static/img/fanhui.png" mode=""></image>
 				</view>
-				<view class="header">金豆池</view>
+				<view class="header">基金池</view>
 				<image class="money_bg" src="../../static/img/anchor8.png"></image>
 				<view class="money">{{jd}}</view>
 				<view class="tip">

pages/user/buySellDetail.vue

@@ -181,6 +181,8 @@
 				}).then(data => {
 					this.upimg = data[0].url;
 					// this.$set(this, text, data[0].url)
+				}).catch(res => {
+					this.$api.msg('上传的图片过大')
 				});
 			},
 			upnew() {

pages/user/myWholesale.vue

@@ -21,8 +21,7 @@
 								@click="deleteOrder(index)"></text>
 						</view>
 						<view class="goods-box-single">
-							<image class="goods-img" :src="item.whole.image" mode="scaleToFill"
-								@click="lookimg(item.whole.image)"></image>
+							<image class="goods-img" :src="item.whole.image" mode="scaleToFill"></image>
 							<view class="right">
 								<view class="flex-start" style="justify-content: space-between;">
 									<text class="title clamp">{{ item.whole.title }}</text>

store/index.js

@@ -9,7 +9,7 @@ const store = new Vuex.Store({
 		baseURL:'http://tl.liuniu946.com',//请求地址配置 
 		urlFile:'/index',//项目部署所在文件夹
 		userInfo: {}, //登录信息
-		loginInterceptor:true,//是否打开强制登录
+		loginInterceptor:false,//是否打开强制登录
 		// #ifdef H5 || MP-WEIXIN
 		weichatInfo:{},//保存微信注册信息
 		weichatObj:'',//微信对象

unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>商城</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.6808189b.js></script><script src=/index/static/js/index.28975970.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.6808189b.js></script><script src=/index/static/js/index.5270aa87.js></script></body></html>