123

components/uni-countdown/uni-countdowns.vue

@@ -183,7 +183,7 @@ $countdown-width: 52rpx;
 	line-height: $countdown-height;
 	margin: 5rpx;
 	text-align: center;
-	font-size: $uni-font-size-sm;
+	font-size: 24rpx;
 	border-radius: 10rpx;
 }
 </style>

pages.json

@@ -18,6 +18,15 @@
 				// #endif
 				"navigationBarTitleText": "商城首页"
 			}
+		},
+		{
+			"path": "pages/product/new",
+			"style": {
+				"navigationBarTitleText": "新品",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
 		},
 		{
 			"path": "pages/index/sign",
@@ -29,7 +38,14 @@
 					}
 				}
 			}
-		},{
+		},
+		{
+			"path": "pages/product/seckill",
+			"style": {
+				"navigationBarTitleText": "限时秒杀"
+			}
+		},
+		{
 			"path": "pages/public/register",
 			"style": {
 				"navigationBarTitleText": "注册",
@@ -49,6 +65,31 @@
 					}
 				}
 			}
+		},
+		{
+			"path": "pages/collection/collection",
+			"style": {
+				"navigationBarTitleText": "银行卡管理"
+			}
+		},
+		{
+			"path": "pages/collection/bank",
+			"style": {
+				"navigationBarTitleText": "添加银行卡"
+			}
+		},
+		{
+			"path": "pages/collection/zfb",
+			"style": {
+				"navigationBarTitleText": "添加支付宝"
+			}
+		},
+		
+		{
+			"path": "pages/collection/wx",
+			"style": {
+			"navigationBarTitleText": "添加微信"
+			}
 		},
 		{
 			"path": "pages/public/wxLogin",
@@ -82,7 +123,7 @@
 					}
 				}
 			}
-		},
+		},
 		{
 			"path": "pages/product/product",
 			"style": {
@@ -110,6 +151,27 @@
 			"style": {
 				"navigationBarTitleText": "商品列表"
 			}
+		},
+		{
+			"path": "pages/product/zero",
+			"style": {
+				"navigationBarTitleText": "0元购",
+				"navigationBarBackgroundColor":"#DC262B",
+				"navigationBarTextStyle":"white"
+				
+			}
+		},
+		{
+			"path": "pages/store/store",
+			"style": {
+				"navigationBarTitleText": "服务专区"
+			}
+		},
+		{
+			"path": "pages/store/storeInfo",
+			"style": {
+				"navigationBarTitleText": "门店信息"
+			}
 		},
 		{
 			"path": "pages/index/message",
@@ -182,6 +244,17 @@
 			"style": {
 				"navigationBarTitleText": ""
 			}
+		},
+		{
+			"path": "pages/set/cropper",
+			"style": {
+				"navigationBarTitleText": "裁剪",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
 		},
 		{
 			"path": "pages/set/phone",
@@ -226,6 +299,12 @@
 					}
 				}
 			}
+		},
+		{
+			"path": "pages/user/gzsq",
+			"style": {
+				"navigationBarTitleText": "馆长申请"
+			}
 		},
 		{
 			"path": "pages/user/withdrawal",
@@ -256,12 +335,27 @@
 				"navigationBarTitleText": "积分明细"
 			}
 		},
+		{
+			"path": "pages/user/scoreAccumulate",
+			"style": {
+				"navigationBarTitleText": "积分明细"
+			}
+		},
+		
 		{
 			"path": "pages/user/xrtd",
 			"style": {
 				"navigationBarTitleText": "新人通道"
 			}
 		},
+		{
+			"path": "pages/user/approve",
+			"style": {
+				"navigationBarTitleText": "实名认证",
+				"navigationBarBackgroundColor":"#ff0000",
+				"navigationBarTextStyle":"white"
+			}
+		},
 		{
 			"path": "pages/user/sqjl",
 			"style": {
@@ -487,38 +581,38 @@
 	},
 	"tabBar": {
 		"color": "#C0C4CC",
-		"selectedColor": "#375AFE",
+		"selectedColor": "#f42b4e",
 		"borderStyle": "black",
 		"backgroundColor": "#ffffff",
 		"list": [{
-				"pagePath": "pages/index/index"
-				// "iconPath": "static/tabBar/tab-home.png",
-				// "selectedIconPath": "static/tabBar/tab-home-current.png",
-				// "text": "首页"
+				"pagePath": "pages/index/index",
+				"iconPath": "static/tabBar/tab-home.png",
+				"selectedIconPath": "static/tabBar/tab-home-current.png",
+				"text": "首页"
 			},
 			{
-				"pagePath": "pages/order/order"
-				// "iconPath": "static/tabBar/tab-cate.png",
-				// "selectedIconPath": "static/tabBar/tab-cate-current.png",
-				// "text": "订单"
+				"pagePath": "pages/category/category",
+				"iconPath": "static/tabBar/tab-cate.png",
+				"selectedIconPath": "static/tabBar/tab-cate-current.png",
+				"text": "分类"
 			},
 			{
-				"pagePath": "pages/hall/hall"
-				// "iconPath": "static/tabBar/tab-pink.png",
-				// "selectedIconPath": "static/tabBar/tab-pink.png",
-				// "text": "趣豆会馆"
+				"pagePath": "pages/cart/cart",
+				"iconPath": "static/tabBar/tab-pink.png",
+				"selectedIconPath": "static/tabBar/tab-pink-current.png",
+				"text": "购物车"
 			},
 			{
-				"pagePath": "pages/money/money"
-				// "iconPath": "static/tabBar/tab-cart.png",
-				// "selectedIconPath": "static/tabBar/tab-cart-current.png",
-				// "text": "财务"
+				"pagePath": "pages/product/new",
+				"iconPath": "static/tabBar/tab-cart.png",
+				"selectedIconPath": "static/tabBar/tab-cart-current.png",
+				"text": "新品"
 			},
 			{
-				"pagePath": "pages/user/user"
-				// "iconPath": "static/tabBar/tab-my.png",
-				// "selectedIconPath": "static/tabBar/tab-my-current.png",
-				// "text": "我的"
+				"pagePath": "pages/user/user",
+				"iconPath": "static/tabBar/tab-my.png",
+				"selectedIconPath": "static/tabBar/tab-my-current.png",
+				"text": "我的"
 			}
 		]
 	}

pages/collection/bank.vue

@@ -0,0 +1,149 @@
+<template>
+	<view class="content">
+		<view class="box">
+			<view class="item ">
+				<text>姓名</text>
+				<input type="text" v-model="name" value="" placeholder="请输入真实姓名" />
+			</view>
+			<view class="item top">
+				<text>银行卡号</text>
+				<input type="text" v-model="id" value="" placeholder="请输入银行卡账号" />
+			</view>
+			<view class="item">
+				<text>所属银行</text>
+				<input type="text" v-model="idName" value="" placeholder="请输入银行" />
+			</view>
+		</view>
+		<view class="button" @click="confirm()">确认</view>
+	</view>
+</template>
+
+<script>
+import { userEdit } from '@/api/set.js';
+import { orderData,getUserInfo } from '@/api/user.js';
+import { mapState, mapMutations } from 'vuex';
+export default {
+	computed: {
+		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin']),
+	},
+	data() {
+		return {
+			name:'',
+			id:'',
+			idName:'',
+		};
+	},
+	onLoad() {
+		if(this.userInfo.bank_code != null){
+			this.id = this.userInfo.bank_code
+		}
+		if(this.userInfo.bank_name != null){
+			this.idName = this.userInfo.bank_name
+		}
+		if(this.userInfo.bank_user_name != null){
+			this.name = this.userInfo.bank_user_name
+		}
+	},
+	methods: {
+		...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
+		confirm() {
+			let obj = this;
+			if (!obj.name) {
+				return this.$api.msg('请输入提款人姓名');
+			}
+			if (!obj.idName) {
+				return this.$api.msg('请输入所属银行');
+			}
+			if (!obj.id) {
+				return this.$api.msg('请输入银行卡号');
+			}
+			userEdit({
+				bank_user_name: obj.name,
+				bank_name: obj.idName,
+				bank_code: obj.id
+			}).then(e => {
+				obj.$api.msg('修改成功');
+				obj.getUserInfo();
+			});
+		},
+		// 更新用户信息
+		getUserInfo() {
+			getUserInfo({})
+				.then(({ data }) => {
+					console.log(data)
+					this.setUserInfo(data);
+					// 获取用户数据完毕后在获取订单数据防止多次跳转到登录页
+					orderData({})
+						.then(({ data }) => {
+							this.setOrderInfo(data);
+							uni.navigateBack({
+								delta: 1
+							});
+						})
+						.catch(e => {
+							this.setOrderInfo({
+								complete_count: 0, //完成
+								received_count: 0, //待收货
+								unshipped_count: 0, //待发货
+								order_count: 0, //订单总数
+								unpaid_count: 0 //待付款
+							});
+						});
+				})
+				.catch(e => {
+					console.log(e);
+				});
+		},
+	}
+};
+</script>
+
+<style lang="scss">
+page,
+.content {
+	height: 100%;
+	padding: 0;
+	margin: 0;
+}
+.top {
+	border-top: 1rpx solid #f3f3f3;
+	border-bottom: 1rpx solid #f3f3f3;
+}
+.box {
+	background: #ffffff;
+	margin: 20rpx 0 70rpx 0;
+	.item {
+		display: flex;
+		align-items: center;
+		text {
+			margin: 0 40rpx 0 25rpx;
+			width: 150rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			color: #333333;
+			line-height: 100rpx;
+		}
+		input {
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			color: #999999;
+			line-height: 100rpx;
+		}
+	}
+}
+.button {
+	text-align: center;
+	width: 560rpx;
+	height: 80rpx;
+	background: linear-gradient(0deg, #2e58ff, #32c6ff);
+	border-radius: 40rpx;
+	font-size: 30rpx;
+	font-family: PingFangSC;
+	font-weight: 500;
+	color: #ffffff;
+	line-height: 80rpx;
+	margin: 0 auto;
+}
+</style>

pages/collection/collection.vue

@@ -0,0 +1,142 @@
+<template>
+	<view class="content">
+		<view class="collection-box">
+			<view class="collection-item">
+				<view class="left">
+					<view class="img"><image src="../../static/user/mybank.png" mode=""></image></view>
+					<view class="bank">银行卡</view>
+				</view>
+				<view class="gg" @click="nav('/pages/collection/bank')">
+					<view class="status" v-if="bankData.fullname != null">{{ bankData.fullname}}</view>
+					<view class="status" v-else>未添加</view>
+					<view class="img1"><text class="iconfont iconenter"></text></view>
+				</view>
+			</view>
+			<view class="collection-item">
+				<view class="left">
+					<view class="img"><image src="../../static/user/zfb.png" mode=""></image></view>
+					<view class="bank">支付宝</view>
+				</view>
+				<view class="gg" @click="nav('/pages/collection/zfb')">
+					<view class="status" v-if="aliData.fullname != null">{{aliData.fullname}}</view>
+					<view class="status" v-else>未添加</view>
+					<view class="img1"><text class="iconfont iconenter"></text></view>
+				</view>
+			</view>
+			<!-- <view class="collection-item">
+				<view class="left">
+					<view class="img">
+						<image src="../../static/user/wx.png" mode=""></image>
+					</view>
+					<view class="bank">
+						微信
+					</view>
+				</view>
+				<view class="gg" @click="nav('/pages/collection/wx')">
+					<view class="status">
+						未添加
+					</view>
+					<view class="img1">
+						<text class="iconfont iconenter"></text>
+					</view>
+				</view>
+			</view> -->
+		</view>
+	</view>
+</template>
+
+<script>
+import { mapState, mapMutations } from 'vuex';
+export default {
+	data() {
+		return {
+			aliData: {fullname:'',alino:''},
+			bankData: {fullname:'',bank:'',bankno:''},
+		};
+	},
+	computed: {
+		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin']),
+	},
+	onShow() {
+		this.aliData.fullname = this.userInfo.alipay_name;
+		console.log(this.aliData.fullname);
+		this.aliData.alino = this.userInfo.alipay_code
+		this.bankData.fullname = this.userInfo.bank_user_name;
+		this.bankData.bank = this.userInfo.bank_name;
+		this.bankData.bankno = this.userInfo.bank_code;
+	},
+	methods: {
+		nav(url) {
+			uni.navigateTo({
+				url
+			});
+		}
+	}
+};
+</script>
+<style lang="scss">
+page,
+.content {
+	height: 100%;
+	margin: 0;
+	height: 0;
+}
+
+.collection-box {
+	background: #ffffff;
+	margin: 50rpx 20rpx;
+	width: 710rpx;
+	display: flex;
+	flex-direction: column;
+
+	.collection-item {
+		margin: 35rpx 30rpx;
+		display: flex;
+		justify-content: space-between;
+
+		.left {
+			display: flex;
+
+			.img {
+				height: 40rpx;
+				width: 40rpx;
+
+				image {
+					height: 100%;
+					width: 100%;
+				}
+			}
+
+			.bank {
+				margin-left: 25rpx;
+				font-size: 26rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #333333;
+			}
+		}
+
+		.gg {
+			display: flex;
+
+			.status {
+				font-size: 26rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+				margin-right: 20rpx;
+			}
+
+			.img1 {
+				width: 15rpx;
+				height: 25rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+	}
+}
+</style>

pages/collection/wx.vue

@@ -0,0 +1,105 @@
+<template>
+	<view class="content">
+		<view class="box">
+			<view class="wx">
+				<text>微信号</text>
+				<input type="text" value="" placeholder="请输入微信号" />
+			</view>
+			<view class="erweima">
+				<text>微信收款码</text>
+				<view class="img" @click="upload()">
+					<image src="../../static/user/erweima.png" mode="" v-if="image == ''"></image>
+					<image :src="image" mode="" v-else></image>
+				</view>
+			</view>
+		</view>
+		<view class="button">
+			确认
+		</view>
+	</view>
+</template>
+
+<script>
+	import { uploads } from '@/api/user.js'
+	export default {
+		data() {
+			return {
+				image:''
+			};
+		},
+		methods: {
+			upload(){
+				uploads({
+					filename: ''
+				}).then(data => {
+					this.image = data[0].url;
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+page , .content{
+	height: 100%;
+	margin: 0;
+	padding: 0;
+	
+}
+.box{
+	margin:20rpx 0  100rpx 0;
+	width: 100%;
+	background: #FFFFFF;
+	
+	.wx{
+		border-bottom: #F0F0F0 solid 1rpx;
+		padding: 20rpx 0 30rpx 0;
+		display: flex;
+		text{
+			width: 150rpx;
+			margin: 0 30rpx;
+		}
+		input{
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			color: #999999;
+			line-height: 100rpx;
+		}
+	}
+	.erweima{
+		padding: 30rpx 0;
+		display: flex;
+		text{
+			margin: 0 30rpx;
+			width: 150rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			color: #333333;
+			
+		}
+		.img{
+			width: 160rpx;
+			height: 160rpx;
+			image{
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+}
+.button{
+	margin: 0 auto;
+	width: 560rpx;
+	height: 80rpx;
+	background: linear-gradient(0deg, #2E58FF, #32C6FF);
+	border-radius: 40rpx;
+	font-size: 30rpx;
+	font-family: PingFangSC;
+	font-weight: 500;
+	color: #FFFFFF;
+	line-height: 80rpx;
+	text-align: center;
+}
+</style>

pages/collection/zfb.vue

@@ -0,0 +1,140 @@
+<template>
+	<view class="content">
+		<view class="box">
+			<view class="item top">
+				<text>真实姓名</text>
+				<input type="text" v-model="name" value="" placeholder="请输入真实姓名" />
+			</view>
+			<view class="item">
+				<text>支付宝账号</text>
+				<input type="text" v-model="id" value="" placeholder="请输入支付宝账号" />
+			</view>
+		</view>
+		<view class="button" @click="confirm()">确认</view>
+	</view>
+</template>
+
+<script>
+import { orderData, getUserInfo } from '@/api/user.js';
+import { mapState, mapMutations } from 'vuex';
+import { userEdit } from '@/api/set.js';
+export default {
+	computed: {
+		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+	},
+	data() {
+		return {
+			name: '',
+			id: ''
+		};
+	},
+	onLoad() {
+		if (this.userInfo.alipay_code != null) {
+			this.id = this.userInfo.alipay_code;
+		}
+		if (this.userInfo.alipay_name != null) {
+			this.name = this.userInfo.alipay_name;
+		}
+	},
+	methods: {
+		...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
+		confirm() {
+			let obj = this;
+			if (!obj.name) {
+				return this.$api.msg('请输入提款人姓名');
+			}
+			if (!obj.id) {
+				return this.$api.msg('请输入支付宝账号');
+			}
+			userEdit({
+				alipay_name: obj.name,
+				alipay_code: obj.id
+			})
+				.then(e => {
+					obj.$api.msg('修改成功');
+					obj.getUserInfo();
+				})
+				.catch(e => {
+					console.log(e);
+				});
+		},
+		// 更新用户信息
+		getUserInfo() {
+			getUserInfo({})
+				.then(({ data }) => {
+					console.log(data)
+					this.setUserInfo(data);
+					// 获取用户数据完毕后在获取订单数据防止多次跳转到登录页
+					orderData({})
+						.then(({ data }) => {
+							this.setOrderInfo(data);
+							uni.navigateBack({
+								delta: 1
+							});
+						})
+						.catch(e => {
+							this.setOrderInfo({
+								complete_count: 0, //完成
+								received_count: 0, //待收货
+								unshipped_count: 0, //待发货
+								order_count: 0, //订单总数
+								unpaid_count: 0 //待付款
+							});
+						});
+				})
+				.catch(e => {
+					console.log(e);
+				});
+		},
+	}
+};
+</script>
+
+<style lang="scss">
+page,
+.content {
+	height: 100%;
+	padding: 0;
+	margin: 0;
+}
+.top {
+	border-bottom: 1rpx solid #f3f3f3;
+}
+.box {
+	background: #ffffff;
+	margin: 20rpx 0 70rpx 0;
+	.item {
+		display: flex;
+		align-items: center;
+		text {
+			margin: 0 40rpx 0 25rpx;
+			width: 150rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			color: #333333;
+			line-height: 100rpx;
+		}
+		input {
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			color: #999999;
+			line-height: 100rpx;
+		}
+	}
+}
+.button {
+	text-align: center;
+	width: 560rpx;
+	height: 80rpx;
+	background: linear-gradient(0deg, #2e58ff, #32c6ff);
+	border-radius: 40rpx;
+	font-size: 30rpx;
+	font-family: PingFangSC;
+	font-weight: 500;
+	color: #ffffff;
+	line-height: 80rpx;
+	margin: 0 auto;
+}
+</style>

pages/index/index.vue

@@ -12,29 +12,59 @@
 		<swiper class="carousel" autoplay="true" duration="400" interval="5000" @change="swiperChange">
 			<swiper-item v-for="(item, index) in carouselList" :key="index" class="carousel-item" @click="bannerNavToUrl(item)"><image :src="item.pic" /></swiper-item>
 		</swiper>
+		<view class="tongz flex">
+			<view>
+				<view class="tongz-bg"><image src="../../static/img/tongz-bg.png" mode=""></image></view>
+				<view class="tongz-left flex">
+					<image class="image-left" src="../../static/img/ling.png" mode=""></image>
+					<u-notice-bar
+						style="width: 100%;"
+						mode="vertical"
+						type="none"
+						:volume-icon="false"
+						:more-icon="true"
+						:list="text"
+						@click="goDetails"
+						@getMore="nav('/pages/index/message')"
+					></u-notice-bar>
+				</view>
+			</view>
+		</view>
 		<view class="navbar flex">
 			<view class="navbar-item" @click="nav('/pages/product/classify')">
-				<image class="nitem-image" src="../../static/img/autotrophy.png" mode=""></image>
-				<view class="nitem-font">趣豆自营</view>
+				<image class="nitem-image" src="../../static/img/index-inco1.png" mode=""></image>
+				<view class="nitem-font">随意嗨购</view>
 			</view>
 			<view class="navbar-item" @click="nav('/pages/product/classify')">
-				<image class="nitem-image" src="../../static/img/integral.png" mode=""></image>
-				<view class="nitem-font">积分商城</view>
+				<image class="nitem-image" src="../../static/img/index-inco2.png" mode=""></image>
+				<view class="nitem-font">赠艺金券</view>
 			</view>
 			<view class="navbar-item" @click="nav('/pages/product/classify')">
-				<image class="nitem-image" src="../../static/img/replacement.png" mode=""></image>
-				<view class="nitem-font">置换商城</view>
+				<image class="nitem-image" src="../../static/img/index-inco3.png" mode=""></image>
+				<view class="nitem-font">置换</view>
 			</view>
-			<view class="navbar-item" @click="nav('/pages/product/classify')">
-				<image class="nitem-image" src="../../static/img/Hang.png" mode=""></image>
-				<view class="nitem-font">挂售商城</view>
+			<!-- <view class="navbar-item" @click="nav('/pages/product/classify')">
+				<image class="nitem-image" src="../../static/img/index-inco4.png" mode=""></image>
+				<view class="nitem-font">趣豆购</view>
+			</view> -->
+			<view class="navbar-item" @click="nav('/pages/product/seckill')">
+				<image class="nitem-image" src="../../static/img/index-inco5.png" mode=""></image>
+				<view class="nitem-font">秒杀</view>
+			</view>
+			<!-- <view class="navbar-item" @click="nav('/pages/product/zero')">
+				<image class="nitem-image" src="../../static/img/index-inco6.png" mode=""></image>
+				<view class="nitem-font">0元购</view>
+			</view> -->
+			<view class="navbar-item" @click="nav('/pages/store/store')">
+				<image class="nitem-image" src="../../static/img/index-inco7.png" mode=""></image>
+				<view class="nitem-font">服务专区</view>
 			</view>
 			<view class="navbar-item" @click="nav('/pages/hall/hall')">
-				<image class="nitem-image" src="../../static/img/offline.png" mode=""></image>
-				<view class="nitem-font">线下会馆</view>
+				<image class="nitem-image" src="../../static/img/index-inco8.png" mode=""></image>
+				<view class="nitem-font">大品牌区</view>
 			</view>
 		</view>
-		<view class="product"><image class="product-image" src="../../static/img/index-product.png" mode=""></image></view>
+		<!-- <view class="product"><image class="product-image" src="../../static/img/index-product.png" mode=""></image></view> -->
 		<view class="shingle">
 			<view class="shingle-top flex">
 				<view class="shingle-title">艺术品挂牌交易区</view>
@@ -71,42 +101,90 @@
 				<image class="right-bottom" src="../../static/img/right-bottom.png" mode=""></image>
 			</view>
 		</view>
-		<view class="good-title" v-if="dataList.length > 0"><image src="../../static/img/goodtitle.png" mode=""></image></view>
-		<view class="main" v-if="dataList.length > 0">
-			<view class="list-box-h">
-				<view v-for="(item, index) in dataList" :key="index" class="guess-item" @click="navToDetailPage(item)">
-					<image :src="item.image"></image>
-					<view class="guess-box">
-						<view class="title clamp2">{{ item.store_name }}</view>
-						<view class="price-box flex">
-							<view class="yuanprice">{{ item.ot_price }}</view>
-							<image src="../../static/img/jiantou.png" mode=""></image>
-							<view class="jiang">直降{{ (item.ot_price - item.price).toFixed(2) }}元</view>
-						</view>
-						<view class="price" v-if="item.integral != 0">￥{{ item.price }} + {{ item.integral }}消费补贴券</view>
-						<view class="price" v-else>￥{{ item.price }}</view>
-						<view class="btn">立即购买</view>
+		<view class="seckill-box">
+			<view class="seckill-title flex">
+				<view class="seckill-left flex">
+					<image class="seckill-inco" src="../../static/img/seckill-inco.png" mode=""></image>
+					<view class="seckill-font">限时秒杀</view>
+					<view class="djs flex">
+						<view>距结束：</view>
+						<uni-countdowns
+							color="#FFFFFF"
+							splitor-color="#000000"
+							background-color="#000000"
+							border-color="#000000"
+							:show-day="false"
+							:hour="stopTime.stopTimeH"
+							:minute="stopTime.stopTimeM"
+							:second="stopTime.stopTimeS"
+						></uni-countdowns>
+					</view>
+				</view>
+				<view class="seckill-right" @click="nav('/pages/product/seckill')">
+					<view class="seckill-rfont">更多</view>
+					<image class="seckill-back" src="../../static/img/back.png" mode=""></image>
+				</view>
+			</view>
+			<view class="seckill-main-box flex">
+				<view class="seckill-item" v-for="(item, index) in 3" :key="index">
+					<image class="item-price" src="" mode=""></image>
+					<view class="clamp item-title">护肤品套装</view>
+					<view class="jdt"><u-line-progress :percent="bzb" activeColor="#F13A88"></u-line-progress></view>
+					<view class="price-box flex">
+						<view class="new-price">￥69.9</view>
+						<view class="ot-price">￥89.9</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="ge">
+		</view>
+		<view class="serve">
+			<view class="seckill-title flex">
+				<view class="seckill-left flex">
+					<image class="seckill-inco" src="../../static/img/serve.png" mode=""></image>
+					<view class="seckill-font">服务专区推荐</view>
+				</view>
+				<view class="seckill-right" @click="nav('/pages/store/store')">
+					<view class="seckill-rfont">更多</view>
+					<image class="seckill-back" src="../../static/img/back.png" mode=""></image>
+				</view>
+			</view>
+			<view class="serve-main flex">
+				<view class="serve-item" @click="nav('/pages/store/store')" v-for="(item, index) in 3" :key="index">
+					<image class="serve-price" src="" mode=""></image>
+					<view class="clamp serve-title">护肤品套装</view>
+					<view class="serve-address flex">
+						<image class="saddress-inco" src="../../static/img/address.png" mode=""></image>
+						<view class="saddress-font">距离0.3KM</view>
 					</view>
 				</view>
 			</view>
 		</view>
-		<u-tabbar activeColor="#375AFE" v-model="current" :list="tabbar" :mid-button="true"></u-tabbar>
 	</view>
 </template>
 
 <script>
 import { loadIndexs } from '@/api/index.js';
-import { tabbar } from '@/utils/tabbar.js';
+import uniCountdowns from '@/components/uni-countdown/uni-countdowns.vue';
 export default {
+	components: {
+		uniCountdowns
+	},
 	data() {
 		return {
 			titleNViewBackground: '',
 			swiperCurrent: 0,
 			swiperLength: 0,
 			dataList: '',
-			carouselList:[],//轮播图列表
-			tabbar: tabbar,
-			current: 0
+			carouselList: [], //轮播图列表
+			text: ['恭喜黑白灰用户拼团成功￥353元！', '恭喜黑白灰用户拼团成功￥353元！'],
+			stopTime: {
+				stopTimeH: 0,
+				stopTimeM: 24,
+				stopTimeS: 59
+			},
+			bzb: 30
 		};
 	},
 	onLoad() {
@@ -122,6 +200,12 @@ export default {
 				})
 				.catch(e => {});
 		},
+		goDetails(e){
+			console.log(e,'123456');
+			uni.navigateTo({
+				url:'/pages/index/messageInfo'
+			})
+		},
 		nav(url) {
 			uni.navigateTo({
 				url,
@@ -144,8 +228,7 @@ export default {
 				url: '/pages/product/search'
 			});
 		},
-	
-		
+
 		//详情页
 		navToDetailPage(item) {
 			let id = item.id;
@@ -162,7 +245,7 @@ page,
 .center {
 	min-height: 100%;
 	height: auto;
-	background-color: #ffffff;
+	background: #FFFFFF;
 }
 .top {
 	position: relative;
@@ -201,11 +284,65 @@ page,
 		}
 	}
 }
+.carousel {
+	width: 700rpx;
+	height: 300rpx;
+	margin: -260rpx auto 0;
+	image {
+		width: 700rpx;
+		height: 300rpx;
+	}
+}
+.tongz {
+	width: 690rpx;
+	height: 70rpx;
+	margin: 32rpx auto 0;
+	padding: 18rpx 30rpx 18rpx 24rpx;
+	align-items: center;
+	position: relative;
+	.tongz-bg {
+		position: absolute;
+		top: 0;
+		right: 0;
+		left: 0;
+		width: 690rpx;
+		height: 70rpx;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.tongz-left {
+		width: 640rpx;
+		.image-left {
+			width: 28rpx;
+			height: 34rpx;
+		}
+		.tongz-font {
+			margin-left: 22rpx;
+			font-size: 28rpx;
+			font-family: Source Han Sans CN;
+			font-weight: 400;
+			color: #0f253a;
+		}
+	}
+	.tongz-right {
+		position: relative;
+		z-index: 11;
+		width: 12rpx;
+		height: 26rpx;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+}
 .navbar {
-	margin-top: 42rpx;
-	justify-content: space-around;
+	justify-content: flex-start;
+	flex-wrap: wrap;
 	.navbar-item {
-		width: 20%;
+		margin-top: 42rpx;
+		width: 25%;
 		display: flex;
 		flex-direction: column;
 		align-items: center;
@@ -214,7 +351,6 @@ page,
 			height: 90rpx;
 		}
 		.nitem-font {
-			margin-top: 16rpx;
 			font-size: 24rpx;
 			font-family: PingFang SC;
 			font-weight: 500;
@@ -223,39 +359,39 @@ page,
 	}
 }
 .product {
-	width: 750rpx;
-	height: 350rpx;
-	margin-top: 50rpx;
+	width: 662rpx;
+	height: 180rpx;
+	margin: 44rpx auto;
 	.product-image {
-		width: 750rpx;
-		height: 350rpx;
+		width: 662rpx;
+		height: 180rpx;
 	}
 }
 .shingle {
-	width: 690rpx;
-	background: #efefef;
+	width: 750rpx;
+	background: #f8f8f8;
 	border-radius: 10rpx;
-	margin: 60rpx auto;
-	padding: 28rpx 20rpx 40rpx;
+	margin: 60rpx auto 0rpx;
+	padding: 44rpx 50rpx 40rpx;
 	.shingle-top {
 		padding-left: 2rpx;
 		.shingle-title {
 			font-size: 36rpx;
 			font-family: PingFang SC;
 			font-weight: bold;
-			color: #375afe;
+			color: #dc262b;
 		}
 		.shingle-btn {
 			width: 248rpx;
 			height: 50rpx;
-			border: 2rpx solid #375afe;
+			border: 2rpx solid #dc262b;
 			border-radius: 10rpx;
 			padding: 0 16rpx;
 			text-align: left;
 			font-size: 24rpx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #375afe;
+			color: #dc262b;
 			line-height: 50rpx;
 			text {
 				display: inline-block;
@@ -348,130 +484,152 @@ page,
 		}
 	}
 }
-.good-title {
-	width: 376rpx;
-	height: 34rpx;
-	margin: 44rpx auto 0;
-	image {
-		width: 100%;
-		height: 100%;
+.seckill-left {
+	justify-content: flex-start;
+	.seckill-inco {
+		width: 36rpx;
+		height: 36rpx;
+		flex-shrink: 0;
+	}
+	.seckill-font {
+		margin-left: 8rpx;
+		font-size: 32rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #333333;
+	}
+	.djs {
+		margin-left: 12rpx;
+		font-size: 20rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #dc262b;
 	}
 }
-.guess-item {
+.seckill-right {
 	display: flex;
-	width: 710rpx;
-	height: 300rpx;
-	background: #ffffff;
-	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-	border-radius: 10rpx;
-	padding: 15rpx;
-	padding-bottom: 150rpx;
-	margin: 20rpx auto 0;
-	position: relative;
-	image {
-		width: 200rpx;
-		height: 200rpx;
-		border-radius: 10rpx;
+	justify-content: flex-start;
+	align-items: center;
+	.seckill-rfont {
+		font-size: 24rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #999999;
+		margin-right: 8rpx;
 	}
-	.guess-box {
-		padding: 12rpx 0 0 24rpx;
-		width: 436rpx;
-		.title {
-			font-size: 36rpx;
-			padding-left: 4rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #333333;
-			width: 368rpx;
-			line-height: 36rpx;
-			.tuanF {
-				display: inline-block;
-				margin-right: 4rpx;
-				position: relative;
-				top: -6rpx;
-				.tuan {
-					display: flex;
-					align-items: center;
-					padding: 10rpx;
-					height: 36rpx;
-					background: #ffebe9;
-					border-radius: 18rpx;
-					.tuan-image {
-						width: 18rpx;
-						height: 18rpx;
-					}
-					.tuan-font {
-						display: inline;
-						font-size: 20rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #ff1135;
-						margin-left: 2rpx;
-					}
+	.seckill-back {
+		width: 10rpx;
+		height: 20rpx;
+	}
+}
+.seckill-box {
+	padding: 40rpx 30rpx;
+	background: #ffffff;
+
+	.seckill-main-box {
+		margin-top: 24rpx;
+		flex-wrap: wrap;
+		justify-content: flex-start;
+		.seckill-item:first-child {
+			margin-left: 0rpx;
+		}
+		.seckill-item {
+			margin-left: 14rpx;
+			width: 220rpx;
+			background: #ffffff;
+			border: 4rpx solid #f2e6a5;
+			border-radius: 10rpx;
+			padding: 40rpx 14rpx 34rpx;
+			display: flex;
+			justify-content: center;
+			flex-direction: column;
+			align-items: center;
+			.item-price {
+				width: 126rpx;
+				height: 108rpx;
+				background: #2979ff;
+			}
+			.item-title {
+				margin-top: 20rpx;
+				text-align: left;
+				width: 100%;
+			}
+			.jdt {
+				margin-top: 14rpx;
+				width: 100%;
+			}
+			.price-box {
+				margin-top: 20rpx;
+				.new-price {
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: 800;
+					color: #dc262b;
+				}
+				.ot-price {
+					margin-left: 8rpx;
+					font-size: 24rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					text-decoration: line-through;
+					color: #969696;
 				}
 			}
 		}
-		.ping-box {
-			margin-top: 15rpx;
-			justify-content: flex-start;
-			.ping {
-				margin-left: 10rpx;
-				height: 39rpx;
-				background: #fdf7eb;
-				border-radius: 5rpx;
-				font-size: 22rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #ff911f;
-				display: flex;
-				align-items: center;
-				padding: 0 10rpx;
-			}
+	}
+}
+.ge {
+	height: 20rpx;
+	width: 750rpx;
+	background: #F8F8F8;
+}
+.serve {
+	padding: 32rpx 30rpx;
+	background: #ffffff;
+	.serve-main {
+		margin-top: 24rpx;
+		flex-wrap: wrap;
+		justify-content: flex-start;
+		.serve-item:first-child {
+			margin-left: 0rpx;
 		}
-		.price-box {
-			margin-top: 50rpx;
-			justify-content: flex-start;
-			.yuanprice {
+		.serve-item {
+			width: 220rpx;
+			background: #f6f6f6;
+			border-radius: 10rpx;
+			margin-left: 14rpx;
+			padding-bottom: 22rpx;
+			.serve-price {
+				width: 220rpx;
+				height: 220rpx;
+				border-radius: 10rpx 10rpx 0px 0px;
+				background: #03a9f4;
+			}
+			.serve-title {
+				margin-top: 16rpx;
+				padding: 0 14rpx;
 				font-size: 26rpx;
 				font-family: PingFang SC;
 				font-weight: 500;
-				text-decoration: line-through;
-				color: #999999;
-				padding-right: 6rpx;
-			}
-			image {
-				width: 14rpx;
-				height: 16rpx;
+				color: #0a122b;
 			}
-			.jiang {
-				padding-left: 2rpx;
-				font-size: 24rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #b59467;
+			.serve-address {
+				justify-content: flex-start;
+				margin-top: 10rpx;
+				padding: 0 14rpx;
+				.saddress-inco {
+					width: 18rpx;
+					height: 24rpx;
+				}
+				.saddress-font {
+					margin-left: 4rpx;
+					font-size: 20rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #666666;
+				}
 			}
 		}
-		.price {
-			font-size: 36rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #ff1135;
-		}
-		.btn {
-			width: 137rpx;
-			height: 56rpx;
-			background: linear-gradient(0deg, rgba(60, 237, 237, 0.99), #04b8ff, #375afe);
-			border-radius: 28rpx;
-			font-size: 28rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #ffffff;
-			line-height: 56rpx;
-			text-align: center;
-			position: absolute;
-			bottom: 10rpx;
-			right: 25rpx;
-		}
 	}
 }
 </style>

pages/money/money.vue

@@ -6,7 +6,7 @@
 			<view class="num">0.00</view>
 		</view>
 		<view class="navbar">
-			<view class="navbar-item" @click="navTo('')">
+			<view class="navbar-item" @click="navTo('/pages/money/qudou')">
 				<view class="navbar-font">
 					<image class="navbar-image" src="../../static/img/been.png" mode=""></image>
 					<view class="font">趣豆</view>
@@ -17,7 +17,7 @@
 
 			</view>
 			<view class="navbar-item">
-				<view class="navbar-font">
+				<view class="navbar-font" @click="navTo('/pages/user/scoreAccumulate')">
 					<image class="navbar-image" src="../../static/money/m03.png" mode=""></image>
 					<view class="font">积分</view>
 				</view>

pages/product/new.vue

@@ -0,0 +1,76 @@
+<template>
+	<view class="center">
+		<view class="top">
+			<image class="top-bg" src="../../static/img/top-bg.png" mode=""></image>
+			<view class="title">
+				新品
+			</view>
+		</view>
+		<swiper class="carousel" autoplay="true" duration="400" interval="5000" @change="swiperChange">
+			<swiper-item class="carousel-item" @click="bannerNavToUrl(item)"><image src="../../static/img/new.png" /></swiper-item>
+		</swiper>
+		<view class="hotgoods" v-if="firstList.length != 0">
+			<view class="hotgoods-item" v-for="item in firstList" :key="item.id" @click="navToDetailPage(item)">
+				<view class="image-wrapper"><image :src="item.image" mode="scaleToFill"></image></view>
+				<view class="title clamp margin-c-20">{{ item.store_name }}</view>
+				<view class="hot-price">
+					<view class="price">
+						<text class="font-size-sm">￥</text>
+						{{ item.price }}
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			firstList:[],
+		}
+	}
+}
+</script>
+
+<style lang="less">
+page,
+.center {
+	min-height: 100%;
+	height: auto;
+	background: #FFFFFF;
+}
+.top {
+	position: relative;
+	width: 100%;
+	height: 400rpx;
+	.top-bg {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		width: 100%;
+		height: 100%;
+	}
+	.title {
+		position: relative;
+		z-index: 2;
+		padding: 30rpx 0;
+		font-size: 34rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #FFFFFF;
+		text-align: center;
+	}
+}
+.carousel {
+	width: 700rpx;
+	height: 300rpx;
+	margin: -280rpx auto 0;
+	image {
+		width: 700rpx;
+		height: 300rpx;
+	}
+}
+</style>

pages/product/product.vue

@@ -107,13 +107,13 @@
 				<text>收藏</text>
 			</view> -->
 
-			<!-- <view class="action-btn-group">
+			<view class="action-btn-group">
 				<button type="primary" class=" action-btn no-border buy-now-btn" @click="toggleSpec(2)">加入购物车</button>
 				<button type="primary" class=" action-btn no-border  add-cart-btn" @click="toggleSpec(1)">立即购买</button>
-			</view> -->
-			<view class="action-btn-group">
-				<button type="primary" class=" action-btn no-border  add-cart-btn" style="width: 750rpx;" @click="toggleSpec(1)">立即购买</button>
 			</view>
+			<!-- <view class="action-btn-group">
+				<button type="primary" class=" action-btn no-border  add-cart-btn" style="width: 750rpx;" @click="toggleSpec(1)">立即购买</button>
+			</view> -->
 		</view>
 		<!-- 秒杀商品购买 -->
 		<view class="goods-pay-box flex" :class="{ stop: seckillObj.stop }" v-if="goodsType == 1">

pages/product/seckill.vue

@@ -0,0 +1,424 @@
+<template>
+	<view class="seckillBox">
+		<view class="top"></view>
+		<view class="seckill-bg">
+			<image src="../../static/img/seckill.png" mode=""></image>
+		</view>
+		<scroll-view scroll-x="true" class="class-box flex b-t" :scroll-left="scrollLeft" :scroll-with-animation="true">
+			<view @click="tabClass(idx)" class="item" :style="{ width: topNavWidth }" v-for="(item, idx) in indexList" :key="idx">
+				<view class="time" :class="{ action: idx == classIndex }">{{ item.time }}</view>
+				<view class="status" :class="{ action: idx == classIndex }">{{ item.state }}</view>
+			</view>
+		</scroll-view>
+		<swiper class="list-Box" :current="classIndex" @change="swiperChange" duration="500">
+			<swiper-item class="list-item" v-for="(ls, idx) in indexList">
+				<view class=" b-b position-relative">
+					<view class="title-box flex ">
+						<view class="title-box-left">
+							<text v-if="ls.status == 1">抢购中先下先得哦！</text>
+							<text v-if="ls.status == 2">精品好货即将开抢！</text>
+							<text v-if="ls.status == 0">本场已结束，下次早点来哦！</text>
+						</view>
+						<view class="title-box-right flex">
+							<text class="tip" v-if="ls.status == 1">距离结束</text>
+							<text class="tip" v-if="ls.status == 2">距离开始</text>
+							<uni-countdown
+								color="#F9F9F8"
+								background-color="#666666"
+								v-if="ls.status == 1 || ls.status == 2"
+								:show-day="false"
+								:hour="ls.stopTimeH"
+								:minute="ls.stopTimeM"
+								:second="ls.stopTimeS"
+							></uni-countdown>
+						</view>
+					</view>
+				</view>
+				<scroll-view scroll-y="true" class="list" @scrolltolower="getList(classIndex)">
+					<view class="goodsList-item flex" :key="ind" v-for="(lss, ind) in ls.dataList">
+						<image :src="lss.image" lazy-load mode="scaleToFill"></image>
+						<view class="goodsList-content">
+							<view class="title clamp">
+								<text>{{ lss.title }}</text>
+							</view>
+							<view class="slider flex">
+								<view class="slider-box"><view class="slider-action" :style="{ width: lss.percent + '%' }"></view></view>
+								<view class="sales-nub">已抢{{ lss.percent + '%' }}</view>
+							</view>
+							<view class="goods-money flex">
+								<view class="money-box">
+									<view class="money">
+										<text class="font-size-sm">￥</text>
+										{{ lss.price }}
+									</view>
+									<view class="otMoney-box">
+										<text class="otMoney">￥{{ lss.ot_price }}</text>
+									</view>
+								</view>
+								<view @click="navProduct(ls, ind)" class="cart" :class="{ 'seckill-action': ls.status == 1 }">
+									{{ ls.status == 1 ? '去抢购' : ls.status == 2 ? '未开始' : '已结束' }}
+								</view>
+							</view>
+						</view>
+					</view>
+					<uni-load-more :status="ls.loadingType"></uni-load-more>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+
+<script>
+import { getSeckillList, getSeckillClass } from '@/api/product.js';
+import uniCountdown from '@/components/uni-countdown/uni-countdown.vue';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import { timeComputed } from '@/utils/rocessor.js';
+export default {
+	components: {
+		uniCountdown,
+		uniLoadMore
+	},
+	data() {
+		return {
+			indexList: [], //分类列表
+			showTime: '', //显示的时间
+			showTImeId: '', //显示时间id用于查询数据
+			// 判断是否所有活动已经结束
+			stop: false, //活动是否已经结束
+			show: false, //是否显示活动
+			status: 0, //获取状态值1为有活动开始中 2为活动未开始 0为活动已经结束
+			topNavWidth: '25%', //设置导航默认宽度
+			classIndex: 0, //当前进行中的活动
+			itemWidht: 0 //顶部分类宽度
+		};
+	},
+	computed: {
+		// 计算左侧距离
+		scrollLeft() {
+			if (this.classIndex > 1) {
+				return this.itemWidht * (this.classIndex - 1.5);
+			} else {
+				return 0;
+			}
+		}
+	},
+	onLoad: function(e) {
+		// 载入分类
+		this.getClass();
+	},
+	methods: {
+		//抢购时间切换时触发效果
+		swiperChange(e) {
+			this.classIndex = e.target.current;
+			this.getList(this.classIndex, 'tabChange');
+		},
+		// 获取项目宽度
+		numClassWidht() {
+			uni.createSelectorQuery()
+				.select('.seckillBox')
+				.fields(
+					{
+						size: true
+					},
+					data => {
+						// 设置项目宽度
+						this.itemWidht = Math.floor((data.width / 750) * 187.5);
+					}
+				)
+				.exec();
+		},
+		// 切换当前选中的秒杀活动
+		tabClass(ind) {
+			// 保存当前选中的对象
+			this.classIndex = ind;
+		},
+		// 跳转到商品详情
+		navProduct(ls, ind) {
+			if (ls.status == 1) {
+				let data = ls.dataList[ind];
+
+				uni.navigateTo({
+					url: '/pages/product/product?id=' + data.id + '&type=1'
+				});
+			}
+		},
+		// 获取商品
+		getList(ind, source) {
+			// 获取数据对象
+			let date = this.indexList[ind];
+			console.log(date, source);
+			if (source === 'tabChange' && date.loaded === true) {
+				//tab切换只有第一次需要加载数据
+				return;
+			}
+			if (date.loadingType === 'noMore') {
+				//防止重复加载
+				return;
+			}
+			if (date.loadingType === 'loading') {
+				//防止重复加载
+				return;
+			}
+			// 修改当前对象状态为加载中
+			date.loadingType = 'loading';
+			getSeckillList(
+				{
+					page: date.page,
+					limit: date.limit
+				},
+				date.id
+			)
+				.then(e => {
+					date.dataList.push(...e.data);
+					// 查询翻页增加
+					date.page++;
+					// 判断是否可以继续加载
+					if (date.limit == e.data.length) {
+						date.loadingType = 'more';
+					} else {
+						date.loadingType = 'noMore';
+					}
+					// 设置当前数据已加载完毕
+					this.$set(date, 'loaded', true);
+				})
+				.catch(e => {
+					console.log(e);
+				});
+		},
+		// 获取秒杀时间段
+		getClass() {
+			let obj = this;
+			getSeckillClass({})
+				.then(({ data }) => {
+					obj.indexList = data.seckillTime.map((e, ind) => {
+						console.log(e, 'eeee');
+						// 初始化翻页页数
+						e.page = 1;
+						// 初始每次加载的数据条数
+						e.limit = 6;
+						// 创建储存订单数据
+						e.dataList = [];
+						// 初始化加载
+						// e.loadingType = 'more';
+						let ar = e;
+						// 判断是否为进行中的活动
+						if (ar.status === 1) {
+							// 计算倒计时时间
+							obj.timeComputed(ar.stop * 1000, ar);
+						} else {
+							// 获取距离开始还需要多少时间
+							let arTime = ar.time.split(':');
+							let h = arTime[0];
+							let m = arTime[1];
+							let time = new Date();
+							// 设置时间
+							time.setHours(h, m, 0);
+							// 计算倒计时时间
+							obj.timeComputed(time.getTime(), ar);
+						}
+
+						return e;
+					});
+					// 获取当前活动中的下标值
+					obj.classIndex = data.seckillTimeIndex;
+					// 获取当前显示中对象的数据
+					obj.$nextTick(() => {
+						obj.getList(obj.classIndex);
+					});
+					if (obj.indexList.length <= 4) {
+						// 当数量小于等于4的时候自适应宽度
+						obj.topNavWidth = 100 / obj.indexList.length + '%';
+					} else {
+						// 页面渲染完毕后加载scroll-view左侧距离
+						obj.$nextTick(() => {
+							obj.numClassWidht();
+						});
+					}
+				})
+				.catch(e => {
+					console.log(e);
+				});
+		},
+		// 计算倒计时时间
+		timeComputed(da, ar) {
+			let obj = this;
+			// 计算时间，保存需要多少时间到期
+			let stopTime = timeComputed(da);
+			console.log(stopTime);
+			ar.stopTimeH = stopTime.hours;
+			ar.stopTimeM = stopTime.minutes;
+			ar.stopTimeS = stopTime.seconds;
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page,
+.seckillBox {
+	min-height: 100%;
+	height: 100%;
+}
+.top {
+	width: 750rpx;
+	height: 300rpx;
+	background: #e83323;
+	border-bottom-left-radius: 150rpx;
+	border-bottom-right-radius: 150rpx;
+}
+.seckill-bg {
+	width: 700rpx;
+	height: 300rpx;
+	margin: -260rpx auto 0;
+	image {
+		width: 100%;
+		height: 100%;
+	}
+}
+// 头部时间段样式
+.class-box {
+	white-space: nowrap;
+	height: 60px;
+	.item {
+		text-align: center;
+		display: inline-block;
+		color: $font-color-base;
+		padding: 11.5px 5px;
+		background-color: #ffffff;
+		line-height: 1;
+		.time {
+			font-size: 16px;
+			padding-bottom: 3px;
+			&.action {
+				color: $color-red;
+			}
+		}
+		.status {
+			font-size: 12px;
+			margin: 0 auto;
+			width: 60px;
+			padding: 3px 0;
+			&.action {
+				color: #ffffff;
+				border-radius: 99px;
+				background-color: $color-red;
+			}
+		}
+	}
+}
+// 列表上方标题样式
+.title-box {
+	margin-top: 10px;
+	padding: 10px;
+	background-color: #ffffff;
+	.title-box-left {
+		font-size: 15px;
+		color: $font-color-base;
+	}
+	.title-box-right {
+		.tip {
+			font-size: 15px;
+			color: #999999;
+			padding-right: 5px;
+		}
+
+		/deep/ .uni-countdown__number {
+			border-radius: 3px;
+			width: 22px;
+		}
+		/deep/ .uni-countdown__splitor,
+		/deep/ .uni-countdown__number {
+			height: 20px;
+			line-height: 18px;
+		}
+	}
+}
+// 列表样式
+.list-Box {
+	height: calc(100% - 60px);
+	.list {
+		height: calc(100% - 55px);
+	}
+}
+// 商品列表
+$slider-color: #fe9398; //滑块左侧颜色
+.goodsList-item {
+	background-color: #ffffff;
+	padding: 30rpx;
+	border-bottom: 1px solid $border-color-light;
+	image {
+		flex-shrink: 0;
+		border-radius: $border-radius-sm;
+		height: 180rpx;
+		width: 180rpx;
+	}
+	.slider {
+		margin-top: 15rpx;
+		justify-content: flex-start;
+		.slider-box {
+			width: 196rpx;
+			border-radius: 99px;
+			border: 1px solid $slider-color;
+			height: 16rpx;
+			.slider-action {
+				background-color: $slider-color;
+				height: 100%;
+			}
+		}
+		.sales-nub {
+			color: $font-color-light;
+			font-size: 24rpx;
+			padding-left: 20rpx;
+		}
+	}
+	.goodsList-content {
+		margin-left: 20rpx;
+		flex-grow: 1;
+		height: 180rpx;
+		position: relative;
+		.title {
+			font-size: $font-base;
+			color: $font-color-dark;
+			font-weight: 500;
+			width: 0;
+			min-width: 100%;
+		}
+		.goods-money {
+			position: absolute;
+			left: 0;
+			bottom: 0;
+			width: 100%;
+			.money-box {
+				.money {
+					font-size: $font-lg + 10rpx;
+					color: $color-red;
+					font-weight: bold;
+				}
+				.otMoney-box {
+					font-size: $font-sm;
+					.otMoney {
+						color: $font-color-light;
+						padding-right: 20rpx;
+						text-decoration: line-through;
+					}
+					.sales {
+						color: $font-color-light;
+					}
+				}
+			}
+			.cart {
+				font-size: $font-base;
+				border-radius: 99px;
+				padding: 15rpx 30rpx;
+				line-height: 1;
+				color: #ffffff;
+				background-color: $color-gray;
+				&.seckill-action {
+					border: 1px solid $color-red;
+					background-color: $color-red;
+				}
+			}
+		}
+	}
+}
+</style>

pages/product/zero.vue

@@ -0,0 +1,118 @@
+<template>
+	<view class="content">
+		<view class="navbar">
+			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
+		</view>
+		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab" :style="{ height: maxheight + 'px' }">
+			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
+				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
+					<!-- 空白页 -->
+					<empty v-if="tabItem.orderList.length === 0"></empty>
+
+					<!-- 订单列表 -->
+					<view v-for="(ls, index) in tabItem.orderList"></view>
+					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+
+<script>
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import empty from '@/components/empty';
+export default {
+	components: {
+		empty,
+		uniLoadMore
+	},
+	// 计算剩余高度
+	onReady(res) {
+		var _this = this;
+		uni.getSystemInfo({
+			success: resu => {
+				const query = uni.createSelectorQuery();
+				query.select('.swiper-box').boundingClientRect();
+				query.exec(function(res) {
+					console.log(res, 'ddddddddddddd');
+					_this.maxheight = resu.windowHeight - res[0].top + 'px';
+					console.log('打印页面的剩余高度', _this.maxheight);
+				});
+			},
+			fail: res => {}
+		});
+	},
+	data() {
+		return {
+			// 头部图高度
+			maxheight: '',
+			tabCurrentIndex: 0,
+			navList: [
+				{
+					text: '首页',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10 //每次信息条数
+				},
+				{
+					text: '我的抢购',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10 //每次信息条数
+				}
+			]
+		};
+	},
+	methods: {
+		tabClick(index) {
+			this.tabCurrentIndex = index;
+		}
+	}
+};
+</script>
+
+<style lang="less">
+.content,page {
+	
+}
+.navbar {
+	display: flex;
+	height: 40px;
+	padding: 0 5px;
+	background: #fff;
+	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
+	position: relative;
+	z-index: 10;
+	.nav-item {
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 15px;
+		color: #999999;
+		position: relative;
+		&.current {
+			color: #dc262b;
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 44px;
+				height: 0;
+				border-bottom: 2px solid #dc262b;
+			}
+		}
+	}
+}
+.swiper-box {
+	.order-item {
+		padding: 20rpx 30rpx;
+		line-height: 1.5;
+	}
+}
+</style>

pages/set/cropper.vue

@@ -0,0 +1,74 @@
+<template>
+  <view class="container">
+    <web-view
+      :webview-styles="webviewStyles"
+      @message="handleMessage"
+      :src="webviewSrc"
+    >
+    </web-view>
+  </view>
+</template>
+
+<script>
+
+export default {
+  name: "buuug7-img-cropper",
+  data() {
+    return {
+      webviewStyles: {},
+      platform: "",
+      webviewSrc:
+        "https://zhibo.liuniu946.com/index/hybrid/html/cropper/index.html",
+    };
+  },
+
+  mounted() {
+    const { platform } = uni.getSystemInfoSync();
+    this.platform = platform;
+    console.log(platform,'获取系统对象');
+
+    if (platform === "windows" || platform === "mac") {
+      this.handleH5Message();
+    }
+	// #ifdef H5
+	window.addEventListener("message", this.handleMessage, false);
+	// #endif
+  },
+
+  methods: {
+    handleMessage(event) {
+	  console.log('消息传输',event);
+	  // uni.navigateBack({
+	  // 	delta: 1,
+	  // });
+      const platform = this.platform;
+	  // #ifdef H5
+	  if(!event.data.data.type){
+		 return; 
+	  }
+      const data = event.data.data;
+	  // #endif
+	  // #ifndef H5
+	  const data = event.detail.data[0];
+	  // #endif
+	  console.log(platform,"myself")
+      if (platform === "android" || platform === "ios" || platform === 'devtools') {
+        const eventChannel = this.getOpenerEventChannel();
+        eventChannel.emit("imgCropped", { data: data.dataUrl });
+      }
+    },
+    handleH5Message(e) {
+      console.log(`H5Message`);
+      window.addEventListener("message", (event) => {
+        const data = event.data.data;
+        if (data && data.type === "croppedData") {
+          const eventChannel = this.getOpenerEventChannel();
+          eventChannel.emit("imgCropped", { data: data.dataUrl });
+        }
+      });
+    },
+  },
+};
+</script>
+
+<style></style>

pages/set/set.vue

@@ -2,23 +2,8 @@
 	<view class="container">
 		<uni-list>
 		    <uni-list-item title="个人资料" @click="navTo('/pages/set/userinfo')" ></uni-list-item>
-			<uni-list-item title="修改密码" @click="navTo('/pages/set/password')" ></uni-list-item>
-		    <uni-list-item title="实名认证" @click="navTo('/pages/set/phone')" ></uni-list-item>
 		    <uni-list-item title="收货地址" @click="navTo('/pages/set/address')" ></uni-list-item>
 		</uni-list>
-		<uni-list class="margin-t-20">
-		    <uni-list-item title="消息推送" :switch-checked='true' :show-switch="true" :show-arrow="false" switch-color='#5dbc7c'  @switchChange='switchChange'> 
-			</uni-list-item>
-		</uni-list>
-		
-		<uni-list class="margin-t-20">
-		    <uni-list-item title="清除缓存" ></uni-list-item>
-		    <uni-list-item title="检查更新" >
-				<template slot="right">
-					当前版本 1.0.3
-				</template>
-			</uni-list-item>
-		</uni-list>
 		<view class="list-cell log-out-btn" @click="toLogout">
 			<text class="cell-tit">退出登录</text>
 		</view>
@@ -91,7 +76,7 @@
 		&.log-out-btn{
 			margin-top: 40rpx;
 			.cell-tit{
-				color: $uni-color-primary;
+				color: $base-color;
 				text-align: center;
 				margin-right: 0;
 			}

pages/set/userinfo.vue

@@ -1,35 +1,66 @@
 <template>
 	<view class="content">
-		<view class="row b-b">
+		<view class="row1">
+			<text class="tit">头像</text>
+			<view class="background-img" @click.stop="imgsub"><image class="background-img" v-model="userInfo.avatar" :src="userInfo.avatar" mode="aspectFill"></image></view>
+		</view>
+		<view class="row">
 			<text class="tit">昵称</text>
-			<input class="input" type="text" v-model="name" placeholder="修改昵称" placeholder-class="placeholder" />
+			<input class="input" type="text" v-model="userInfo.nickname" placeholder-class="placeholder" />
+		</view>
+		<view class="row">
+			<text class="tit">ID</text>
+			<input class="input" type="text"  disabled="true" v-model="userInfo.uid" placeholder-class="placeholder" />
 		</view>
-		<button class="add-btn" @click="confirm">提交</button>
+		<view class="row">
+			<text class="tit">账户</text>
+			<input class="input" type="text"  disabled="true" v-model="userInfo.phone" placeholder-class="placeholder" />
+		</view>
+		<view class="add-btn" @click="confirm">提交</view>
+		<!-- <view class="out" @click="cancel">注销账户</view> -->
+		<uni-popup ref="popup" type="center">
+			<view class="psw-wrapper">
+				<view class="psw-title">请输入自己的账户</view>
+				<input type="text" v-model="password" class="psw-ipt" />
+				<view class="psw-btn">
+					<text @click.stop="qx">取消</text>
+					<text class="psw-qd" @click.stop="pswQd">确定</text>
+				</view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
 <script>
-import { mapState } from 'vuex';
-import { userEdit } from '@/api/set.js';
+import { mapState,mapMutations } from 'vuex';
+import { upload } from '@/api/order.js';
+import {userEdit,logout} from '@/api/set.js';
 export default {
-	data() {
-		return {
-			name: ''
-		};
+	data(){
+		return{
+			show:false,
+			password: '',
+		}
 	},
-
-	computed: {
-		...mapState('user', ['userInfo'])
+	onLoad() {
+		console.log(this.userInfo)
 	},
-	onShow(option) {
-		this.name = this.userInfo.nickname + '';
+	computed: {
+		...mapState('user',['userInfo'])
 	},
 	methods: {
-		switchChange(e) {
-			this.addressData.default = e.value;
+		...mapMutations('user',['logout']),
+		imgsub() {
+			console.log('上传头像')
+			upload({
+				filename: ''
+			}).then(data => {
+				console.log("data",data);
+				this.userInfo.avatar = data[0].url;
+			})
 		},
 		confirm() {
-			userEdit({ nickname: this.name, avatar: this.userInfo.avatar })
+			userEdit({ avatar: this.userInfo.avatar ,nickname: this.userInfo.nickname})
 				.then(e => {
 					this.$api.msg('修改成功');
 					setTimeout(()=> {
@@ -42,52 +73,141 @@ export default {
 				.catch(e => {
 					console.log(e);
 				});
+		},
+		toLogout(){
+			let obj = this;
+			uni.showModal({
+			    content: '确定要退出登录么',
+			    success: (e)=>{
+			    	if(e.confirm){
+						logout({}).then((e) => {
+							uni.navigateBack();
+						}).catch((e) => {
+							console.log(e);
+						})
+			    		obj.logout();
+			    	}
+			    }
+			});
+		},
+		cancel(){
+			this.$refs.popup.open();
+		},
+		qx() {
+			this.password = '';
+			this.$refs.popup.close();
+		},
+		pswQd() {
+			if(this.password != this.userInfo.phone){
+				this.$refs.popup.close();
+				this.password = '';
+				this.$api.msg("请输入自己的账户")
+				return
+			}
+			this.$refs.popup.close();
+			this.password = '';
+			this.$api.msg("申请注销成功，请耐心等待审核")
 		}
 	}
-};
+}
 </script>
 
 <style lang="scss">
-page {
-	background: $page-color-base;
-	padding-top: 16upx;
-}
-
-.row {
-	display: flex;
-	align-items: center;
-	position: relative;
-	padding: 0 30upx;
-	height: 110upx;
-	background: #fff;
-
-	.tit {
-		flex-shrink: 0;
-		width: 120upx;
-		font-size: 30upx;
-		color: $font-color-dark;
+	.row1 {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		position: relative;
+		padding: 0 30upx;
+		height: 110upx;
+		background: #fff;
+		margin-bottom: 20upx;
+		.tit {
+			flex-shrink: 0;
+			width: 120upx;
+			font-size: $font-lg;
+			color: $font-color-dark;
+		}
+		
+		.background-img {
+			width: 80rpx;
+			height: 80rpx;
+			border-radius: 50%;
+			background: #f2f2f2;
+		}
 	}
-	.input {
-		flex: 1;
-		font-size: 30upx;
-		color: $font-color-dark;
+	.row {
+		display: flex;
+		align-items: center;
+		padding: 0 30upx;
+		height: 110upx;
+		background: #fff;
+	
+		.tit {
+			flex-shrink: 0;
+			width: 120upx;
+			font-size: $font-lg;
+			color: $font-color-dark;
+		}
+		.input {
+			flex: 1;
+			text-align: right;
+			font-size: $font-base;
+			color: $color-gray;
+		}
 	}
-	.iconlocation {
-		font-size: 36upx;
-		color: $font-color-light;
+	.add-btn {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin: 158rpx auto 30rpx;
+		width: 560rpx;
+		height: 80rpx;
+		background: #DC262B;
+		border-radius: 40px;
+		color: #FFFFFF;
+	}
+	.out {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin: 0 auto 30rpx;
+		width: 560rpx;
+		height: 80rpx;
+		border: 1px solid #32C6FF;
+		background: #FFFFFF;
+		border-radius: 40px;
+		color: #32C6FF;
+	}
+	.psw-wrapper {
+		width: 548rpx;
+		height: 344rpx;
+		background-color: #ffffff;
+		.psw-title {
+			width: 100%;
+			font-size: 35rpx;
+			padding: 43rpx 0 49rpx;
+			text-align: center;
+			font-weight: 800;
+		}
+		.psw-ipt {
+			display: block;
+			background-color: #dce3ed;
+			height: 90rpx;
+			width: 464rpx;
+			padding-left: 30rpx;
+			margin: 0 auto;
+			font-size: 80rpx;
+		}
+		.psw-btn text {
+			display: inline-block;
+			text-align: center;
+			width: 50%;
+			padding-top: 29rpx;
+			font-size: 35rpx;
+		}
+		.psw-qd {
+			color: #32C6FF;
+		}
 	}
-}
-.add-btn {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	width: 690upx;
-	height: 80upx;
-	margin: 60upx auto;
-	font-size: $font-lg;
-	color: #fff;
-	background-color: $base-color;
-	border-radius: 10upx;
-	// box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
-}
 </style>

pages/store/store.vue

@@ -0,0 +1,290 @@
+<template>
+	<view class="center">
+		<view class="search-top">
+			<view class="search flex">
+				<view class="shop-name clamp">椒江区</view>
+				<image class="shop-jt" src="../../static/icon/dsjh.png" mode=""></image>
+				<view class="input-box flex">
+					<view class=" input-content flex">
+						<image src="../../static/icon/search-h.png" mode="" class="" style="width: 32rpx;height: 32rpx;"></image>
+						<view class="input"><input type="text" value="输入关键字搜索" /></view>
+					</view>
+				</view>
+				<view class="search-tit" @click.stop="clickSearch">搜索</view>
+			</view>
+			<view class="shop">
+				<view class="shop-title">
+					<view class="shop-item">
+						<view class="sitem-font">智能排序</view>
+						<image class="jt-down" src="../../static/index/index06.png" mode=""></image>
+					</view>
+					<view class="shop-item">
+						<view class="sitem-font">位置距离</view>
+						<image class="jt-down" src="../../static/index/index06.png" mode=""></image>
+					</view>
+					<view class="shop-item">
+						<view class="sitem-font">折扣优惠</view>
+						<image class="jt-down" src="../../static/index/index06.png" mode=""></image>
+					</view>
+					<view class="shop-item">
+						<view class="sitem-font">筛选</view>
+						<image class="jt-down" src="../../static/index/index06.png" mode=""></image>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="jg" style="height: 120rpx;"></view>
+		<view class="shop">
+			<view class="shop-main flex" v-for="(item, index) in 100" :key="index" @click="navTo('/pages/store/storeInfo')">
+				<image class="main-left" src="../../static/index/index13.png" mode=""></image>
+				<view class="main-right flex">
+					<view class="shopm-info">
+						<view class="shopm-title">
+							<view class="shopmt-font clamp">李家烤肉11111111111111111111111111111111111111111111</view>
+						</view>
+						<!-- <view class="address">椒江区市府大道200号</view> -->
+						<view class="shopmt-tip">椒江区市府大道200号</view>
+					</view>
+					<view class="right">
+						<view class="mright-top">
+							<image class="mrt-image" src="../../static/index/index10.png" mode=""></image>
+							<view class="mrt-font">距离0.3KM</view>
+						</view>
+						<view class="mright-bottom">
+							<image class="mrb-item" src="../../static/index/index14.png" mode=""></image>
+							<image class="mrb-item" src="../../static/index/index11.png" mode=""></image>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {};
+	},
+	methods:{
+		navTo(url){
+			uni.navigateTo({
+				url,
+				fail() {
+					uni.switchTab({
+						url
+					})
+				}
+			})
+		}
+	}
+};
+</script>
+
+<style lang="less">
+.kong {
+	height: 100vh;
+}
+.search-top {
+	position: fixed;
+	top: 0;
+	z-index: 99;
+}
+.search {
+	justify-content: flex-start;
+	padding: 10rpx 32rpx 20rpx;
+	align-items: center;
+	background-color: #fff;
+
+	.address {
+		width: 32rpx;
+		height: 38rpx;
+	}
+
+	.shop-name {
+		height: 38rpx;
+		position: relative;
+		top: -4rpx;
+		z-index: 100;
+		font-size: 30rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #666;
+		padding-left: 10rpx;
+	}
+
+	.shop-jt {
+		margin-left: 8rpx;
+		width: 16rpx;
+		height: 10rpx;
+	}
+
+	.input-box {
+		margin-left: 10rpx;
+		position: relative;
+		z-index: 99;
+		width: 520rpx;
+		height: 60rpx;
+		// background: rgba(255, 255, 255, 0.4);
+		border-radius: 30rpx;
+
+		.input-content {
+			position: relative;
+			z-index: 11;
+			// border-radius: 99rpx;
+			flex-grow: 1;
+			padding: 5rpx 30rpx;
+			background: #f6f6f6;
+
+			.iconsearch {
+				font-size: 50rpx;
+				color: #ffffff;
+			}
+
+			.input {
+				margin-left: 19rpx;
+				flex-grow: 1;
+				color: #666;
+				background: #f6f6f6;
+
+				input {
+					font-size: 28rpx;
+				}
+			}
+		}
+
+		.input-button {
+			padding-left: 20rpx;
+			// font-size: $font-base;
+			height: 100%;
+		}
+	}
+
+	.search-tit {
+		font-size: 28rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #666666;
+		flex-shrink: 0;
+		padding-left: 10rpx;
+	}
+}
+
+.shop {
+	// margin-top: 20rpx;
+	background: #ffffff;
+	padding: 0 12rpx;
+
+	.shop-title {
+		padding: 30rpx 0 20rpx;
+		display: flex;
+		align-items: center;
+		border-bottom: 1px solid #e3e6e7;
+
+		.shop-item {
+			width: 25%;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+
+			.sitem-font {
+				font-size: 26rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #333333;
+			}
+
+			.jt-down {
+				width: 10rpx;
+				height: 8rpx;
+				margin-left: 12rpx;
+			}
+		}
+	}
+
+	.shop-main {
+		padding: 32rpx 18rpx 0 12rpx;
+		align-items: flex-start;
+		justify-content: flex-start;
+
+		.main-left {
+			width: 180rpx;
+			height: 180rpx;
+			border-radius: 10rpx;
+		}
+
+		.main-right {
+			width: 500rpx;
+			justify-content: space-between;
+			align-items: flex-start;
+			margin-left: 20rpx;
+			padding: 13rpx 0 35rpx;
+			border-bottom: 1px solid #eaeced;
+
+			.shopm-info {
+				max-width: 60%;
+				line-height: 1;
+
+				.shopm-title {
+					display: flex;
+					justify-content: flex-start;
+
+					.shopmt-font {
+						font-size: 34rpx;
+						font-family: PingFang SC;
+						font-weight: bold;
+						color: #333333;
+					}
+
+				}
+				.shopmt-tip {
+					position: relative;
+					margin-top: 92rpx;
+					font-size: 24rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #666666;
+				}
+			}
+
+			.right {
+				height: 100%;
+				margin-top: 5rpx;
+				display: flex;
+				flex-direction: column;
+
+				.mright-top {
+					display: flex;
+					justify-content: flex-end;
+					align-items: center;
+
+					.mrt-image {
+						width: 20rpx;
+						height: 28rpx;
+					}
+
+					.mrt-font {
+						margin-left: 8rpx;
+						font-size: 22rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #666666;
+					}
+				}
+
+				.mright-bottom {
+					margin-top: 80rpx;
+					display: flex;
+					justify-content: flex-end;
+
+					.mrb-item {
+						width: 46rpx;
+						height: 46rpx;
+						margin-left: 14rpx;
+					}
+				}
+			}
+		}
+	}
+}
+</style>

pages/store/storeInfo.vue

@@ -0,0 +1,168 @@
+<template>
+	<view class="center">
+		<view class="store-info flex">
+			<view class="store-top flex">
+				<image class="simage" src="" mode=""></image>
+				<view class="stop-main">
+					<view class="stop-title">巴黎莎士比亚书店</view>
+					<view class="stop-address">
+						<image class="mrt-image" src="../../static/index/index10.png" mode=""></image>
+						<view class="mrt-font">距离0.3KM</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="store-item">
+			<image class="store-image1" src="../../static/img/store2.png" mode=""></image>
+			<view class="store-font">营业时间：10:00-21:00</view>
+		</view>
+		<view class="store-item">
+			<image class="store-image2" src="../../static/img/store3.png" mode=""></image>
+			<view class="store-font">商家电话：14255212336</view>
+		</view>
+		<view class="store-item">
+			<image class="store-image3" src="../../static/img/store1.png" mode=""></image>
+			<view class="store-font">门店地址：椒江区市府大道200号</view>
+		</view>
+		<view class="store-main">
+			<view class="smain-title">门头照片</view>
+			<scroll-view class="scroll-box flex" @scroll="scroll" scroll-x="true" :scroll-with-animation="true" scroll-left="10px">
+				<view class="scroll-item" v-for="(item,index) in 4" :key="index">
+					<image class="scroll-image" src="" mode="heightFix"></image>
+				</view>
+			</scroll-view>
+		</view>
+		<view class="store-main">
+			<view class="smain-title">店内图片</view>
+			<scroll-view class="scroll-box flex" @scroll="scroll" scroll-x="true" :scroll-with-animation="true" scroll-left="10px">
+				<view class="scroll-item" v-for="(item,index) in 4" :key="index">
+					<image class="scroll-image" src="" mode="heightFix"></image>
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {};
+	},
+	methods: {
+		scroll(e) {
+			console.log(e,"123456");
+		}
+	}
+};
+</script>
+
+<style lang="less">
+.center,
+page {
+	background: #f8f8f8;
+	height: 100%;
+}
+.store-info {
+	background: #ffffff;
+	.store-top {
+		padding: 40rpx 20rpx;
+		justify-content: flex-start;
+		.simage {
+			width: 130rpx;
+			height: 130rpx;
+			background: #f44939;
+		}
+		.stop-main {
+			height: 130rpx;
+			padding: 6rpx 0;
+			margin-left: 20rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+			align-items: flex-start;
+			.stop-title {
+				font-size: 36rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #000000;
+			}
+			.stop-address {
+				display: flex;
+				justify-content: flex-end;
+				align-items: center;
+
+				.mrt-image {
+					width: 20rpx;
+					height: 28rpx;
+				}
+
+				.mrt-font {
+					margin-left: 8rpx;
+					font-size: 22rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #666666;
+				}
+			}
+		}
+	}
+}
+.store-item {
+	background: #ffffff;
+	display: flex;
+	justify-content: flex-start;
+	align-items: center;
+	padding: 30rpx 30rpx 30rpx 44rpx;
+	.store-image1 {
+		width: 36rpx;
+		height: 36rpx;
+	}
+	.store-image2 {
+		margin: 0 1rpx;
+		width: 34rpx;
+		height: 34rpx;
+	}
+	.store-image3 {
+		margin: 0 7rpx;
+		width: 22rpx;
+		height: 28rpx;
+	}
+	.store-font {
+		margin-left: 22rpx;
+		font-size: 26rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #2d2d2d;
+	}
+}
+.store-main {
+	margin-top: 16rpx;
+	background: #FFFFFF;
+	padding: 30rpx 42rpx 40rpx;
+	.smain-title {
+		font-size: 30rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #464646;
+	}
+}
+.scroll-box {
+	white-space: nowrap;
+	margin-top: 30rpx;
+	height: 240rpx;
+	.scroll-item:first-child {
+		margin-left: 0;
+	}
+	.scroll-item {
+		margin-left: 20rpx;
+		display: inline-block;
+		height: 240rpx;
+		width: 240rpx;
+	}
+	.scroll-image {
+		height: 240rpx;
+		width: 240rpx;
+		background: #5AC725;
+	}
+}
+</style>

pages/user/approve.vue

@@ -0,0 +1,200 @@
+<template>
+	<view class="content">
+		<view class="bgimg"><image class="img" src="https://zhibo.liuniu946.com/img/bgRz.png" mode="widthFix"></image></view>
+		<u-form class="user" :model="form" ref="uForm">
+			<u-form-item label="姓名"><u-input v-model="form.name" placeholder="请输入真实姓名" /></u-form-item>
+			<u-form-item label="身份证号" label-width="150"><u-input placeholder="请输入身份证号" v-model="form.card" /></u-form-item>
+		</u-form>
+		<view class="userBox">
+			<view class="title">上传人脸正面照片</view>
+			<view class="imgUp" @click.stop="upImg"><image class="img" :src="form.img || 'https://zhibo.liuniu946.com/img/upImgbg.png'" mode="scaleToFill"></image></view>
+		</view>
+		<button class="add-btn" @click="pushData('add')">提交</button>
+	</view>
+</template>
+
+<script>
+import { realName } from '@/api/set.js';
+export default {
+	data() {
+		return {
+			loding: false, //判断是否在点击中
+			form: {
+				name: '',
+				card: '',
+				img: ''
+			}
+		};
+	},
+	onLoad(option) {},
+	methods: {
+		upImg(e) {
+			console.log('上传图片');
+			const that = this;
+			uni.navigateTo({
+				url: '/pages/set/cropper',
+				events: {
+					imgCropped(event) {
+						console.log(event,"123456")
+						// 监听裁剪完成
+						// 返回的 event 中包含了已经裁剪好图片的base64编码字符串
+						// 你可以使用 <image :src="imgDataUrl" mode="aspectFit"></image> 组件来展示裁剪后的图片
+						// 或者你可以将该字符串通过接口上传给服务器用来保存
+						that.$nextTick(function() {
+							that.form.img = event.data;
+							console.log(that.form.img, '图片');
+						});
+					}
+				},
+				fail(e) {
+					console.log(e, '错误');
+				}
+			});
+		},
+		ToIndex() {
+			let obj = this;
+			let ur = uni.getStorageSync('present') || '/pages/index/index';
+			// 用于处理缓存bug
+			if (ur == 'pages/product/product') {
+				ur = '/pages/index/index';
+			}
+			uni.switchTab({
+				url: ur,
+				fail(e) {
+					uni.navigateTo({
+						url: ur,
+						fail(e) {
+							uni.navigateTo({
+								url: '/pages/index/index'
+							});
+						}
+					});
+				}
+			});
+		},
+		pushData() {
+			const da = this.form;
+			if (this.loding) {
+				return;
+			}
+			if (!da.name) {
+				uni.showModal({
+					title: '提示',
+					content: '请填写名称',
+					showCancel: false
+				});
+				return;
+			}
+			if (!da.card) {
+				uni.showModal({
+					title: '提示',
+					content: '请填写身份证',
+					showCancel: false
+				});
+				return;
+			}
+			if (!da.img) {
+				uni.showModal({
+					title: '提示',
+					content: '请选择图片',
+					showCancel: false
+				});
+				return;
+			}
+			const data = {
+				face_image: da.img.replace(/^data:image\/[a-z,A-Z]*;base64,/, ''),
+				real_name: da.name,
+				id_card: da.card
+			};
+			uni.showLoading({
+				title: '审核中',
+				mask: true
+			});
+			this.loding = true;
+			// 上传
+			realName(data)
+				.then(e => {
+					uni.showModal({
+						title: '提示',
+						content: '实名成功过',
+						showCancel: false,
+						success: res => {
+							uni.switchTab({
+								url: '/pages/index/index'
+							});
+						}
+					});
+					uni.hideLoading();
+					this.loding = false;
+					console.log(e);
+				})
+				.catch(e => {
+					this.$api.msg("审核失败")
+					this.loding = false;
+					console.log(e);
+					uni.hideLoading();
+				});
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.content {
+	height: 100%;
+	padding: 0 $page-row-spacing;
+}
+.add-btn {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 690rpx;
+	height: 80rpx;
+	margin: 60rpx auto;
+	font-size: $font-lg;
+	color: #fff;
+	background: #ff0000;
+	border-radius: 10rpx;
+	// box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
+}
+.bgimg {
+	text-align: center;
+	width: 1200rpx;
+	margin-left: -260rpx;
+	height: 400rpx;
+	background: #ff0000;
+	border-bottom-right-radius: 999999rpx;
+	border-bottom-left-radius: 999999rpx;
+	.img {
+		width: 400rpx;
+		margin-top: 50rpx;
+	}
+}
+.user {
+	margin-top: -100rpx !important;
+	border-radius: 10rpx !important;
+	padding: 0 30rpx;
+}
+.userBox,
+.user {
+	box-shadow: 0px 2px 16px 1px rgba(89, 89, 89, 0.24) !important;
+	background-color: white !important;
+}
+.userBox {
+	margin-top: 20rpx;
+	padding: 30rpx;
+	.imgUp {
+		min-height: 100rpx;
+		text-align: center;
+		margin-top: 30rpx;
+		.img {
+			width: 300rpx;
+			height: 400rpx;
+		}
+	}
+}
+.imglist /deep/ * {
+	margin-left: auto !important;
+	margin-right: auto !important;
+}
+</style>

pages/user/gzsq.vue

@@ -0,0 +1,193 @@
+<template>
+	<view class="content">
+		<view class="tab-wrapper">
+			<view class="itemx">
+				<view class="item-tit">公司名称：</view>
+				<input type="text" v-model="name" placeholder="请输入您的姓名" />
+			</view>
+			<view class="itemx">
+				<view class="item-tit">负责人姓名：</view>
+				<input type="text" v-model="phone" placeholder="请输入您的手机号" />
+			</view>
+			<view class="itemx">
+				<view class="item-tit">联系方式：</view>
+				<input type="text" v-model="phone" placeholder="请输入您的手机号" />
+			</view>
+			<view class="itemx">
+				<view class="item-tit">身份证号：</view>
+				<input type="text" v-model="area" placeholder="请输入店长区域" />
+			</view>
+		</view>
+		<view class="scsfz-wrap">
+			<image src="../../static/img/sfzzm.png" mode=""></image>
+			<view class="" style="padding-bottom: 33rpx;">
+				添加身份证正面
+			</view>
+			<image src="../../static/img/sfzzm.png" mode=""></image>
+			<view class="">
+				添加身份证反面
+			</view>
+		</view>
+		<view class="tab-wrapper" style="padding-top: 0;">
+			<view class="itemx">
+				<view class="item-tit">店铺地址：</view>
+				<input type="text" v-model="name" placeholder="请输入您的姓名" />
+			</view>
+			<view class="itemx"  style="height: 250rpx;">
+				<view class="item-tit">营业执照：</view>
+				<!-- <input type="text" v-model="name" placeholder="请输入您的姓名" /> -->
+				<image src="../../static/img/add.png" mode=""></image>
+			</view>
+		</view>
+		<view class="tab-wrapper" style="padding-top: 0;">
+			<view class="itemx"  style="height: 250rpx;">
+				<view class="item-tit">门店照片：</view>
+				<!-- <input type="text" v-model="name" placeholder="请输入您的姓名" /> -->
+				<image src="../../static/img/add.png" mode=""></image>
+			</view>
+		</view>
+		<view class="sq-xz" @click="dagou = !dagou">
+			<text class="sq-gou"  v-if="!dagou"></text>
+			<image src="../../static/icon/gou.png" mode="" class="sq-gou-g" v-else></image>
+			<text>我已阅读并同意</text><text @click.stop="lookXz" style="color: #375AFE;">《馆长申请须知》</text>
+		</view>
+		<view class="sq-btn" @click="subSq()">
+			提交申请
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				dagou: false,
+			}
+		},
+		methods: {
+			lookXz() {
+				this.$api.msg('瞅啥瞅！')
+			},
+			subSq() {
+				let obj = this
+				if(!obj.dagou) {
+					return this.$api.msg('打勾去啊，愣着干啥')
+				}
+				
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.tab-wrapper {
+		padding: 20rpx 30rpx;
+		// background-color: #f2f3f5;
+
+	}
+
+	.itemx {
+		margin: 0 auto;
+		width: 100%;
+		background-color: #fff !important;
+		height: 100rpx;
+		display: flex;
+		// width: 690px;
+		border: 1px #f4f4f4 solid;
+		image {
+			margin-top: 63rpx;
+			margin-left: 55rpx;
+			width: 160rpx;
+			height: 160rpx;
+		}
+		.code {
+			width: 150rpx;
+			flex-shrink: 0;
+			text-align: center;
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #FF4C4C;
+			line-height: 100rpx;
+		}
+
+		.item-tit {
+			height: 100rpx;
+			line-height: 100rpx;
+			padding-left: 30rpx;
+			width: 220rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #666666;
+			flex-shrink: 0;
+		}
+
+		input {
+			width: 530rpx;
+			padding-right: 20rpx;
+			height: 100rpx;
+			line-height: 100rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #333333;
+		}
+	}
+
+	.scsfz-wrap {
+		width: 690rpx;
+		height: 673rpx;
+		background: #FFFFFF;
+		box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+		border-radius: 10rpx;
+		margin: 0 auto 20rpx;
+		font-size: 29rpx;
+		font-family: SourceHanSansCN;
+		font-weight: 400;
+		color: #B2B2B2;
+		text-align: center;
+		padding-top: 33rpx;
+		image {
+			display: block;
+			width: 354rpx;
+			height: 240rpx;
+			margin: auto;
+		}
+	}
+	.sq-btn {
+		width: 750rpx;
+		height: 98rpx;
+		line-height: 98rpx;
+		background: linear-gradient(0deg, rgba(60, 237, 237, 0.99), #04B8FF, #375AFE);
+		text-align: center;
+		font-size: 36rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #FFFFFF;
+	}
+	.sq-xz {
+		height: 32rpx;
+		line-height: 32rpx;
+		display: flex;
+		margin: 21rpx 0 75rpx 30rpx;
+		font-size: 24rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #0C1732;
+		.sq-gou {
+			display: inline-block;
+			width: 32rpx;
+			height: 32rpx;
+			border-radius: 50%;
+			border: 1px solid #999;
+			margin-right: 15rpx;
+		}
+		.sq-gou-g {
+			width: 32rpx;
+			height: 32rpx;
+			border-radius: 50%;
+			margin-right: 15rpx;
+		}
+	}
+</style>

pages/user/user.vue

@@ -55,15 +55,15 @@
 			</view>
 		</view>
 		<uni-list class="tool-list">
-			<uni-list-item title="收款信息" @click="navTo('/pages/money/wallet')" thumb="/static/icon/skxx.png">
+			<uni-list-item title="收款信息" @click="navTo('/pages/collection/collection')" thumb="/static/icon/skxx.png">
 			</uni-list-item>
-			<uni-list-item title="实名认证" @click="navTo('/pages/user/coupon')" thumb="/static/icon/bdsj.png">
+			<uni-list-item title="实名认证" @click="navTo('/pages/user/approve')" thumb="/static/icon/bdsj.png">
 			</uni-list-item>
-			<uni-list-item title="收货地址" @click="navTo('/pages/user/favorites')" thumb="/static/icon/shdz.png">
+			<uni-list-item title="收货地址" @click="navTo('/pages/set/address')" thumb="/static/icon/shdz.png">
 			</uni-list-item>
 			<uni-list-item title="客服" @click="openKf()" thumb="/static/icon/kf.png">
 			</uni-list-item>
-			<uni-list-item title="设置" @click="navTo('/pages/user/shareQrCode')" thumb="/static/icon/uset.png">
+			<uni-list-item title="设置" @click="navTo('/pages/set/set')" thumb="/static/icon/uset.png">
 			</uni-list-item>
 			<!-- <uni-list-item title="关于我们" @click="navTo('/pages/shareQrCode/index')" thumb="/static/icon/img09.png"> -->
 			</uni-list-item>
@@ -107,7 +107,6 @@
 				<image src="../../static/img/Close.png"></image>
 			</view> -->
 		</uni-popup>
-		<u-tabbar activeColor="#375AFE" v-model="current" :list="tabbar" :mid-button="true"></u-tabbar>
 	</view>
 </template>
 <script>
@@ -125,9 +124,6 @@
 		saveUrl,
 		interceptor
 	} from '@/utils/loginUtils.js';
-	import {
-		tabbar
-	} from '@/utils/tabbar.js'
 	let startY = 0,
 		moveY = 0,
 		pageAtTop = true;
@@ -139,8 +135,6 @@
 		data() {
 			return {
 				qded: false, //是否已签到
-				tabbar: tabbar,
-				current: 4,
 				text:'',//客服微信
 				today_integral:'',//签到获得的数值
 				today_type:'',//签到获得的数值单位
@@ -170,7 +164,7 @@
 						width: '68rpx',
 						heigt: '53rpx',
 						img: '../../static/icon/tool-3.png',
-						path: ''
+						path: '/pages/user/myfans'
 					},
 					{
 						id: 't4',
@@ -186,7 +180,7 @@
 						width: '50rpx',
 						heigt: '58rpx',
 						img: '../../static/icon/tool-5.png',
-						path: ''
+						path: '/pages/order/order'
 					},
 					{
 						id: 't6',
@@ -194,7 +188,7 @@
 						width: '59rpx',
 						heigt: '56rpx',
 						img: '../../static/icon/tool-6.png',
-						path: ''
+						path: '/pages/user/gzsq'
 					}
 				]
 			};
@@ -314,10 +308,6 @@
 	};
 </script>
 <style lang="scss">
-	page {
-		height: 100%;
-	}
-
 	%flex-center {
 		display: flex;
 		flex-direction: column;
@@ -333,14 +323,12 @@
 		border-radius: 10rpx;
 	}
 
-	.container {
-		height: 100%;
+	.container,page {
+		min-height: 100%;
+		height: auto;
 		background-color: $page-color-base;
 	}
 
-	.content-box {
-		height: 100%;
-	}
 
 	.vheigh {
 		height: var(--status-bar-height);
@@ -755,6 +743,8 @@
 
 				.tool-logo {
 					position: absolute;
+					width: 56rpx;
+					height: 56rpx;
 					top: 0;
 					left: 0;
 					bottom: 0;

uni.scss

@@ -5,7 +5,7 @@ $page-row-spacing: 30rpx;
 $page-color-base: #f8f8f8;//页面背景颜色
 $page-color-light: #f8f6fc;
 // 主题颜色
-$base-color: #5dbc7c;//项目颜色
+$base-color: #DC262B;//项目颜色
 $box-shadow-color:#5dbc7c;//阴影颜色
 $font-color:#5dbc7c;//字体颜色
 $font-color-spec: #5dbc7c;//可操作文字颜色