소스 검색

no message

zpj 2 년 전
부모
커밋
e1053b445b

+ 235 - 4
pages-buy/dry-clean.vue

@@ -1,17 +1,248 @@
 <template>
-	<view class="dry-clean-box">
-
+	<view class="dry-clean-box iPhone-bottom flex-common-css box-border-box">
+		<Nav title='干洗'></Nav>
+		<view class="head-box box-border-box p-24 flex-justify-space">
+			<image src="@/static/img/my/lqzx-bg.png" mode=""></image>
+			<view class="flex-1">
+				<view class="display-flex mb-16">
+					<view class="w410 fs-40 fw-600">干洗店干洗店干洗111干 干洗店干洗店</view>
+					<view class="fs-28 fw-400 fc-41ABF5" @click="selectsShop()">【切换门店】</view>
+				</view>
+				<view class="display-flex">
+					<view class="w410 fs-26 fw-400 fc-9">兴科大道252号兴科大道252号兴科大道252号</view>
+					<view class="text-align-center" style="margin-left: auto;">
+						<view class="">
+							<uni-icons type="location" size="20"></uni-icons>
+						</view>
+						<view class="fs-26 fc-9">1km</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		
+		<view class="box-border-box p-24">
+			<view class="sy-box flex-justify-space box-border-box p-16">
+				<view class="align-items-center">
+					<uni-icons type="help" size="20" color="#666"></uni-icons>
+					<view class="fc-6 fs-28 ml-10">使用需知</view>
+				</view>
+				<image src="@/static/img/toRight.png" mode=""></image>
+			</view>
+		</view>
+		
+		
+		<view class="common-view-css bgc-f" style="overflow: hidden;">
+			<Menu style="height: 100%;"></Menu>
+		</view>
+		
+		
+		<view class="shop-buttom-money box-border-box" @click="openBuyCrad()">
+			<view class="shop-buttom-money-1 flex-justify-space align-items-center">
+				<image src="@/static/img/takeout/buy-icon.png" mode="scaleToFill"></image>
+				<view class="shop-buttom-num fs-24 fc-f text-align-center">3</view>
+				<view class="">
+					<view class="">
+						<span class="fw-600 fs-24 fc-f">¥</span>
+						<span class="fw-600 fs-44 fc-f">19.26</span>
+					</view>
+				</view>
+				<view class="shop-buttom-money-2 text-align-center fc-f fs-32 fw-600">去结算</view>
+			</view>
+		</view>
+		
+		
+		
+		<uni-popup ref="popupBuy" type="bottom">
+			<view class="buy-card flex-index-css">
+				<view class="buy-card-top box-border-box plr-32 flex-justify-space align-items-center">
+					<view class="">
+						<span class="fs-32 fc-3 mr-12">已选商品</span>
+						<span class="fs-32 fc-9">(打包费<span class="fs-32 fc-FB3D03">8元</span>)</span>
+					</view>
+					<view class="fs-28 fw-400 fc-9 align-items-center">
+						<view class="">
+							<uni-icons type="trash" size="18" color="#999"></uni-icons>
+						</view>
+						<view class="fs-28 fw-400 fc-9">清空</view>
+					</view>
+				</view>
+				<view class="scroll-view-css box-border-box p-32">
+					<view class="buy-card-item display-flex" v-for="(item,i) in 5" :key="i">
+						<image src="@/static/img/my/bg.png" mode="scaleToFill"></image>
+						<view class="flex-1">
+							<view class="w-514 text-overflow-ellipsis-one fs-34 fw-600 mb-40">[畅销款]奥尔1良烤肉牛油拌饭拌饭[畅销款]奥尔1良烤肉牛油拌饭拌饭</view>
+							
+							
+							<view class="flex-justify-space">
+								<view class="">
+									<span class="fs-24 fc-FB3D03 fw-400">¥</span>
+									<span class="fs-40 fc-FB3D03 fw-b">3.99</span>
+								</view>
+								<view class="display-flex align-items-center">
+									<view class="right-only-right-red fw-500 text-align-center fs-36 fc-f">-</view>
+									<view class="right-only-right-2 text-align-center fs-28 fw-400">1</view>
+									<view class="right-only-right-add fw-500 text-align-center fs-36 fc-f">+</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				
+				<view class="shop-buttom-money box-border-box" @click="createOrder()">
+					<view class="shop-buttom-money-1 flex-justify-space align-items-center">
+						<image src="@/static/img/takeout/buy-icon.png" mode="scaleToFill"></image>
+						<view class="shop-buttom-num fs-24 fc-f text-align-center">3</view>
+						<view class="">
+							<view class="">
+								<span class="fw-600 fs-24 fc-f">¥</span>
+								<span class="fw-600 fs-44 fc-f">19.26</span>
+							</view>
+						</view>
+						<view class="shop-buttom-money-2 text-align-center fs-32 fc-f fw-600" @click="toConfirmOrder()">去结算</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
 <script>
+	import Menu from './dry-mod/menu.vue';
+	import tools from "@/service/tools";
 	export default {
-		
+		components:{Menu},
+		data(){
+			return{
+				
+			}
+		},
+		onLoad() {
+			
+		},
+		methods:{
+			selectsShop(){
+				uni.navigateTo({
+					url:'/pages-buy/dry-mod/select-shop'
+				})
+			},
+			openBuyCrad(){
+				this.$refs.popupBuy.open()
+			},
+			createOrder(){
+				
+			},
+		},
 	}
 </script>
 
 <style scoped lang="scss">
 	.dry-clean-box{
-		
+		background-color: #fff;
+		.right-only-right-red{
+			width: 44rpx;
+			height: 44rpx;
+			line-height: 40rpx;
+			border-radius: 12rpx;
+			border: 1rpx solid #41ABF5;
+			color: #41ABF5;
+		}
+		.right-only-right-add{
+			width: 44rpx;
+			height: 44rpx;
+			line-height: 40rpx;
+			background: linear-gradient( 117deg, #57CAFF 0%, #41ABF5 100%);
+			border-radius: 12rpx;
+		}
+		.right-only-right-2{
+			min-width: 50rpx;
+		}
+		.w-514{
+			width: 514rpx;
+		}
+		.w410{
+			width: 410rpx;
+		}
+		.head-box{
+			background-color: #fff;
+			box-shadow: 0rpx 8rpx 8rpx 0rpx rgba(51,51,51,0.06);
+			image{
+				width: 100rpx;
+				height: 100rpx;
+				border-radius: 8rpx;
+				margin-right: 18rpx;
+			}
+		}
+		.sy-box{
+			width: 100%;
+			height: 60rpx;
+			background: #F2F2F2;
+			border-radius: 16rpx 16rpx 16rpx 16rpx;
+			image{
+				width: 32rpx;
+				height: 32rpx;
+			}
+		}
+		.shop-buttom-money{
+			width: 100%;
+			height: 140rpx;
+			background: rgba(255,255,255,0.8);
+			padding: 20rpx 24rpx;
+			.shop-buttom-money-1{
+				width: 100%;
+				height: 100%;
+				background: #333333;
+				border-radius: 200rpx;
+				box-sizing: border-box;
+				padding-left: 136rpx;
+				// padding-right: 32rpx;
+				position: relative;
+				image{
+					position: absolute;
+					bottom: 0;
+					left: 8rpx;
+					width: 128rpx;
+					height: 128rpx;
+				}
+				.shop-buttom-num{
+					width: 32rpx;
+					height: 32rpx;
+					line-height: 32rpx;
+					background: #FB3D03;
+					border-radius: 50%;
+					position: absolute;
+					top: 36rpx;
+					left: 82rpx;
+				}
+				.shop-buttom-money-2{
+					width: 200rpx;
+					height: 100rpx;
+					line-height: 100rpx;
+					background: #41ABF5;
+					border-radius: 0rpx 200rpx 200rpx 0rpx;
+				}
+			}
+		}
+		.buy-card{
+			height: 828rpx;
+			background-color: #fff;
+			border-radius: 24rpx 24rpx 0rpx 0rpx;
+			.buy-card-top{
+				width: 100%;
+				height: 92rpx;
+				background: #FCF5DB;
+				border-radius: 24rpx 24rpx 0rpx 0rpx;
+			}
+			.buy-card-item{
+				width: 100%;
+				height: 176rpx;
+				margin-bottom: 32rpx;
+				image{
+					width: 152rpx;
+					height: 152rpx;
+					border-radius: 12rpx;
+					margin-right: 20rpx;
+				}
+			}
+		}
 	}
 </style>

+ 231 - 0
pages-buy/dry-mod/menu.vue

@@ -0,0 +1,231 @@
+<template>
+	<view class="menu-box flex-justify-space">
+		<scroll-view scroll-y="true" class="menu-box-left" :scroll-into-view="idMark" :scroll-with-animation='true'>
+			<view class="menu-type-list-f">
+				<view class="menu-type-list fs-28 fc-6 text-align-center" v-for="(item,i) in typeList" :key="i" @click="selectType(item)"
+				:class="type ===  item.type?'bgc-BCEAFF':''"  :id="'scroll'+ item.type">
+					{{item.name}}
+					<view class="menu-type-num fc-f" v-show="item.num > 0">{{item.num > 99?'99+':item.num}}</view>
+				</view>
+			</view>
+			
+		</scroll-view>
+		
+		<scroll-view scroll-y="true" :scroll-with-animation='true' :scroll-into-view="idMark" @scroll="menuScroll">
+			<view class="menu-box-right">
+				<view class="menu-box-only" v-for="(item,i) in menuList" :key="i" :id="'scroll'+ item.type">
+					<view class="mb-18 fs-34 fw-600">{{item.name}}</view>
+					<view class="menu-list flex-justify-space" v-for="(info,k) in item.list" :key="k">
+						<image src="@/static/img/my/bg.png" mode="scaleToFill"></image>
+						<view class="menu-list-right">
+							<view class="mb-40 text-overflow-ellipsis fs-34 fw-600">[畅销款]奥尔1良烤肉 牛油拌饭[畅销款]奥尔1良烤肉 牛油拌饭[畅销款]奥尔1良烤肉 牛油拌饭[畅销款]奥尔1良烤肉 牛油拌饭</view>
+							
+							<view class="flex-justify-space align-items-flex-end">
+								<view class="">
+									<span class="fs-24 fw-400 fc-FB3D03">¥</span>
+									<span class="fs-40 fw-b fc-FB3D03">3.9</span>
+									<span class="fs-24 fc-9 fw-400 text-line-through">¥12</span>
+								</view>
+								<view class="display-flex align-items-center">
+									<view v-show="info.num > 0" class="right-only-right-red fw-500 text-align-center fs-36 fc-f" @click="addred(1,i,k,item)">-</view>
+									<view v-show="info.num > 0" class="right-only-right-2 text-align-center fs-28 fw-400">{{info.num}}</view>
+									<view class="right-only-right-add fw-500 text-align-center fs-36 fc-f" @click="addred(2,i,k,item)">+</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+		
+		
+		
+		
+	</view>
+</template>
+
+<script>
+	import tools from "@/service/tools";
+	export default {
+		name:'menu-box',
+		data(){
+			return{
+				idMark:'',//滚动自适应参数
+				
+				type:1,//分类标识
+				typeList:[],
+				
+				menuList:[],
+				
+				
+			}
+		},
+		mounted() {
+			this.getTypeList();
+		},
+		methods:{
+			getTypeList(){
+				this.typeList = [
+					{
+						"category_id": 1,
+						"name": "爆品推荐",
+						"type": 1,
+					},
+					{
+						"category_id": 2,
+						"name": "必点口味",
+						"type": 2
+					},
+				]
+				this.type = this.typeList[0].type;
+				this.idMark = 'scroll'+ this.type;
+				this.typeList.forEach((v)=>{
+					v.num = 0
+				})
+				
+				this.menuList = [
+					{
+						name:'分类1',
+						type:1,
+						list:[
+							{name:1,num:0,spec:1},{name:2,num:0},{name:3,num:0},{name:4,num:0},
+						]
+					},
+					{
+						name:'分类2',
+						type:2,
+						list:[
+							{name:1,num:0},{name:2,num:0,spec:1},{name:3,num:0},{name:4,num:0},
+						]
+					},
+				]
+			},
+			
+			selectType(item){
+				if(this.type != item.type){
+					this.type = item.type;
+					this.idMark = 'scroll'+ item.type
+				}
+			},
+			menuScroll(){
+				let _this = this;
+				let query = uni.createSelectorQuery().in(this);
+				query.selectAll(".menu-box-only").boundingClientRect(data=>{
+					data.forEach((v)=>{
+						if(v.top < 329&&v.top>0){
+							_this.idMark = v.id;
+							let arr = v.id.split('scroll');
+							_this.type = Number(arr[1]);
+						}
+					})
+				}).exec();
+			},
+			addred(type,i,k,item){
+				if(type === 1){
+					// 减
+					this.menuList[i].list[k].num -= 1;
+					this.setSub(item);
+				}else if(type === 2){
+					// 加
+					this.menuList[i].list[k].num += 1;
+					this.setSub(item);
+				}
+			},
+			setSub(item){
+				let num = 0;
+				item.list.forEach((n)=>{
+					num += n.num
+				})
+				this.typeList.forEach((v)=>{
+					if(v.type == item.type){
+						v.num = num
+					}
+				})
+			},
+			
+			
+		},
+	}
+</script>
+
+<style scoped lang="scss">
+		.menu-box{
+			height: 100%;
+			
+			.menu-box-left{
+				width: 176rpx;
+				height: 100%;
+				background-color: #F7F8FA;
+				border-radius: 0rpx 20rpx 0 0rpx;
+				.menu-type-list-f{
+					width: 176rpx;
+					height: 100%;
+					.menu-type-list{
+						width: 176rpx;
+						min-height: 10rpx;
+						box-sizing: border-box;
+						padding: 14rpx 32rpx;
+						position: relative;
+						.menu-type-num{
+							position: absolute;
+							top: 2rpx;
+							right: 8rpx;
+							padding: 0 6rpx;
+							min-width: 20rpx;
+							height: 32rpx;
+							text-align: center;
+							line-height: 32rpx;
+							background: #FB3D03;
+							border-radius: 50%;
+						}
+					}
+				}
+			}
+			
+			.menu-box-right{
+				flex: 1;
+				height: 100%;
+				box-sizing: border-box;
+				padding: 0 16rpx;
+				.menu-list{
+					width: 100%;
+					height: 200rpx;
+					margin-bottom: 40rpx;
+					image{
+						width: 200rpx;
+						height: 200rpx;
+						border-radius: 12rpx;
+						margin-right: 16rpx;
+					}
+					.menu-list-right{
+						flex: 1;
+						.right-only-right{
+							width: 100rpx;
+							height: 44rpx;
+							background: linear-gradient( 117deg, #57CAFF 0%, #41ABF5 100%);
+							border-radius: 12rpx;
+							line-height: 44rpx;
+						}
+						.right-only-right-red{
+							width: 44rpx;
+							height: 44rpx;
+							line-height: 40rpx;
+							border-radius: 12rpx;
+							border: 1rpx solid #41ABF5;
+							color: #41ABF5;
+						}
+						.right-only-right-add{
+							width: 44rpx;
+							height: 44rpx;
+							line-height: 40rpx;
+							background: linear-gradient( 117deg, #57CAFF 0%, #41ABF5 100%);
+							border-radius: 12rpx;
+						}
+						.right-only-right-2{
+							min-width: 50rpx;
+						}
+					}
+				}
+			}
+		}
+</style>

+ 118 - 0
pages-buy/dry-mod/select-shop.vue

@@ -0,0 +1,118 @@
+<template>
+	<view class="select-site-box iPhone-bottom flex-common-css box-border-box">
+		<Nav title='选择门店'></Nav>
+		
+		<scroll-view class="scroll-view-css box-border-box p-24" scroll-y="true" @scrolltolower="scrolltolower">
+			<view class="list-item" :class="id == item.id?'s-b':''"
+			v-for="(item,i) in list" :key="i" @click="selectFun(item)">
+				<image v-if="true" class="jlzj-box" src="@/static/img/buy/jlzj.png" mode=""></image>
+			
+				<view class="display-flex mr-18">
+					<view class="list-item-s">
+						<image v-if="id == item.id" src="@/static/img/common/y-select.png" mode=""></image>
+						<image v-else src="@/static/img/common/n-select.png" mode=""></image>
+					</view>
+					<image class="img-1" src="@/static/img/my/bg.png" mode="scaleToFill"></image>
+					<view class="w292">
+						<view class="fs-32 fw-600 fc-0">菜鸟驿站菜鸟驿站菜</view>
+						<view class="fs-26 fw-400 fc-9">菜鸟驿站菜鸟驿站菜鸟驿站菜鸟驿站菜鸟驿站菜鸟驿站菜鸟驿站菜鸟驿站</view>
+					</view>
+				</view>
+				
+				
+				<view class="box-right text-align-center" >
+					<view class="">
+						<view class="fs-28 mb-12">去下单</view>
+						<view class="fs-26 fc-9">距您你1km</view>
+					</view>
+					
+				</view>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data(){
+			return{
+				id:'1',
+				list:[
+					{id:1},{id:2},
+				]
+			}
+		},
+		onLoad(e) {
+			if(e.id){
+				this.id = Number(e.id);
+			}
+		},
+		methods:{
+			scrolltolower(){
+				console.log('触底');
+			},
+			selectFun(item){
+				this.id = item.id;
+				uni.reLaunch({
+					url:'/pages-buy/dry-clean?id=' + this.id
+				})
+			},
+		},
+	}
+</script>
+
+<style scoped lang="scss">
+	.select-site-box{
+		.box-right{
+			border-left: 2rpx solid #eee;
+			display: flex;
+			align-items: center;
+			box-sizing: border-box;
+			padding-left: 42rpx;
+		}
+		.w292{
+			width: 292rpx;
+		}
+		.list-item{
+			width: 100%;
+			min-height: 162rpx;
+			background: #FFFFFF;
+			border-radius: 20rpx 20rpx 20rpx 20rpx;
+			
+			margin-bottom: 20rpx;
+			box-sizing: border-box;
+			padding: 24rpx 32rpx 20rpx 80rpx;
+			position: relative;
+			display: flex;
+			.jlzj-box{
+				width: 118rpx;
+				height: 44rpx;
+				position: absolute;
+				right: 0rpx;
+				top: -1rpx;
+			}
+			.img-1{
+				width: 80rpx;
+				height: 80rpx;
+				border-radius: 8rpx;
+				margin-right: 20rpx;
+			}
+			.w-490{
+				width: 490rpx;
+			}
+			.list-item-s{
+				position: absolute;
+				left: 24rpx;
+				top: 45%;
+				image{
+					width: 32rpx;
+					height: 32rpx;
+				}
+			}
+			
+		}
+		.s-b{
+			border: 2rpx solid #41ABF5;
+		}
+	}
+</style>

+ 275 - 0
pages-school/school-circle.vue

@@ -0,0 +1,275 @@
+<template>
+	<view class="school-circle iPhone-bottom flex-common-css box-border-box ">
+		<image class="circle-add" src="@/static/img/school/add.png" mode="" @click="openPop()"></image>
+		
+		
+		<view class="bg-box"></view>
+		<Nav title='圈子' bgckgroundBox='transparent'></Nav>
+		
+		<view class="ts-box mt-24 align-items-center box-border-box plr-12 mb-20">
+			<image src="@/static/img/school/ts.png" mode=""></image>
+			<view class="fs-26 fw-400 fc-FB3D03">警惕骗钱骗色,保护自身安全,不轻信陌生人</view>
+		</view>
+		
+		<view class="nav-box display-flex box-border-box mb-20">
+			<view class="nav-item view-nowrap" :class="id == i?'h130':''" v-for="(item,i) in 10" :key="i">
+				<image class="nav-icon" src="@/static/img/school/icon.png" mode=""></image>
+				<view class="fs-24 plr-24 " :class="id==i?'fw-600 fc-41ABF5':''">全部帖子</view>
+				<image v-if="id == i" class="nav-bg" src="@/static/img/school/bg.png" mode=""></image>
+			</view>
+		</view>
+		
+		<view class="flex-justify-space type-box mb-24">
+			<view class="display-flex">
+				<view class="box-1" :class="id == 0?'box-s':''">最新</view>
+				<view class="box-1">最热</view>
+				<view class="box-1">评论最多</view>
+			</view>
+			<view class="box-2 fs-24 fc-41ABF5">逛其他学校</view>
+		</view>
+		
+		<scroll-view scroll-y="true" class="scroll-view-css" @scrolltolower="scrolltolower">
+			<view class="card-box box-border-box p-24 bgc-f flex-justify-space" v-for="(item,i) in 5" :key="i">
+				<image class="card-head" src="@/static/img/my/lqzx-bg.png" mode="scaleToFill"></image>
+				<view class="flex-1">
+					<view class="card-1 flex-justify-space mb-16">
+						<view class="">
+							<view class="w-400 fs-28 fw-600 mb-8">恒生科技和半导体恒生科技和半导体恒生科技和半导体恒生科技和半导体</view>
+							<view class="fs-24 fc-9">1小时前</view>
+						</view>
+						<view class="">
+							<image class="dian-img" src="@/static/img/school/dian.png" mode=""></image>
+							<view class="align-items-center">
+								<image class="hot-img" src="@/static/img/school/hot.png" mode=""></image>
+								<view class="fs-26 fw-400 fc-9">125</view>
+							</view>
+						</view>
+					</view>
+					<view class="card-2 fs-30 fw-400 mb-16">
+						欢迎打脸,科技类型很顽强,不是刚刚说11吧,换着领涨,这个季节玩什么光伏储白酒,普
+					</view>
+					<view class="card-3 flex-wrap-wrap mb-32">
+						<image class="card-3-img" src="@/static/img/my/lqzx-bg.png" v-for="(item,i) in 9" mode="scaleToFill"></image>
+					</view>
+					<view class="card-4 flex-wrap-wrap mb-40">
+						<view class="">重庆工商职业学校</view>
+						<view class="">买卖闲置</view>
+						<view class="">买卖闲置</view>
+						<view class="">买卖闲置</view>
+						<view class="">买卖闲置</view>
+						<view class="">买卖闲置</view>
+						<view class="">买卖闲置</view>
+						<view class="">买卖闲置</view>
+						<view class="">买卖闲置</view>
+					</view>
+					
+					<view class="card-5 flex-justify-space">
+						<view class="align-items-center">
+							<image src="@/static/img/school/fx.png" mode=""></image>
+							<view class="fs-24 fc-9">分享</view>
+						</view>
+						<view class="align-items-center" @click="handUp()">
+							<uni-icons type="hand-up" size="22" color="#999"></uni-icons>
+							<view class="fs-24 fc-9">12</view>
+						</view>
+						<view class="align-items-center">
+							<image src="@/static/img/school/info.png" mode=""></image>
+							<view class="fs-24 fc-9">6</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+		
+		
+		<uni-popup ref="popup" type="bottom">
+			<view class="pop-box box-border-box p-24">
+				<view class="head-pop flex-justify-space align-items-center">
+					<uni-icons type="closeempty" size="24"></uni-icons>
+					<view class="fs-36 fc-0 fw-600">选发布类型</view>
+					<view class="fs-28 fw-600 fc-41ABF5">确定</view>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		data(){
+			return{
+				id:0,
+			}
+		},
+		onLoad() {
+			
+		},
+		methods:{
+			scrolltolower(){
+				console.log('触底');
+			},
+			handUp(){
+				
+			},
+			openPop(){
+				this.$refs.popup.open();
+			},
+		},
+	}
+</script>
+
+<style scoped lang="scss">
+	.school-circle{
+		padding-left: 24rpx;
+		padding-right: 24rpx;
+		position: relative;
+		
+		.pop-box{
+			width: 100%;
+			height: 50vh;
+			background-color: #fff;
+			border-radius: 24rpx 24rpx 0rpx 0rpx;
+			display: flex;
+			flex-direction: column;
+		}
+		
+		.circle-add{
+			width: 88rpx;
+			height: 88rpx;
+			position: absolute;
+			right: 0;
+			bottom: 20vh;
+			z-index: 100;
+		}
+		.w-400{
+			width: 400rpx;
+		}
+		.bg-box{
+			width: 100%;
+			height: 260rpx;
+			filter: blur(80rpx);
+			background: linear-gradient(to right,#E1F2FD,#E0F3FA,#DBF8EF);
+			position: absolute;
+			top: 0;
+			left: 0;
+			z-index: -1;
+		}
+		.ts-box{
+			width: 100%;
+			height: 72rpx;
+			background: linear-gradient( 180deg, #FFDBD0 0%, #FFFFFF 100%);
+			border-radius: 16rpx;
+			image{
+				width: 44rpx;
+				height: 44rpx;
+				margin-right: 8rpx;
+			}
+		}
+		.nav-box{
+			width: 100%;
+			overflow-x: scroll;
+			.h130{
+				height: 130rpx !important;
+			}
+			.nav-item{
+				margin-right: 12rpx;
+				width: 144rpx;
+				height: 114rpx;
+				text-align: center;
+				border-radius: 20rpx;
+				position: relative;
+				.nav-icon{
+					width: 64rpx;
+					height: 64rpx;
+					margin: 12rpx auto 0 auto;
+				}
+				.nav-bg{
+					width: 144rpx;
+					height: 130rpx;
+					position: absolute;
+					top: 0;
+					left: 0;
+					z-index: -1;
+				}
+			}
+		}
+		.type-box{
+			.box-s{
+				font-weight: 600 !important;
+				color: #41ABF5;
+				background: #E0F1FF !important; 
+				box-sizing: border-box;
+				border: 1rpx solid #70C0F8;
+			}
+			.box-1{
+				padding: 8rpx 32rpx;
+				margin-right: 20rpx;
+				background-color: #fff;
+				border-radius: 12rpx;
+				font-size: 24rpx;
+				font-weight: 400;
+			}
+			.box-2{
+				width: 168rpx;
+				height: 50rpx;
+				line-height: 50rpx;
+				text-align: center;
+				border-radius: 12rpx 12rpx 12rpx 12rpx;
+				border: 1rpx solid #41ABF5;
+			}
+		}
+		.card-box{
+			width: 100%;
+			min-height: 100rpx;
+			border-radius: 20rpx;
+			margin-bottom: 20rpx;
+			.card-head{
+				width: 80rpx;
+				height: 80rpx;
+				border-radius: 50%;
+				margin-right: 16rpx;
+			}
+			.dian-img{
+				width: 30rpx;
+				height: 6rpx;
+				margin-bottom: 24rpx;
+				margin-left: auto;
+			}
+			.hot-img{
+				width: 40rpx;
+				height: 40rpx;
+				margin-left: auto;
+			}
+			.card-3{
+				.card-3-img{
+					width: 182rpx;
+					height: 182rpx;
+					border-radius: 12rpx;
+					margin-right: 6rpx;
+					margin-bottom: 6rpx;
+				}
+				.card-3-img:nth-child(3n){
+					margin-right: 0rpx;
+				}
+			}
+			.card-4{
+				view{
+					padding: 4rpx 16rpx;
+					background: #F2F2F2;
+					border-radius: 200rpx;
+					font-size: 24rpx;
+					color: #999;
+					margin-right: 20rpx;
+					margin-bottom: 10rpx;
+				}
+			}
+			.card-5{
+				image{
+					width: 40rpx;
+					height: 40rpx;
+					margin-right: 8rpx;
+				}
+			}
+		}
+	}
+</style>

+ 6 - 2
pages-takeout/replace-mod/select-site.vue

@@ -3,7 +3,8 @@
 		<Nav title='选择站点'></Nav>
 		
 		<scroll-view class="scroll-view-css box-border-box p-24" scroll-y="true" @scrolltolower="scrolltolower">
-			<view class="list-item" v-for="(item,i) in list" :key="i" @click="selectFun(item)">
+			<view class="list-item" :class="id == item.id?'s-b':''"
+			v-for="(item,i) in list" :key="i" @click="selectFun(item)">
 				<view class="list-item-s">
 					<image v-if="id == item.id" src="@/static/img/common/y-select.png" mode=""></image>
 					<image v-else src="@/static/img/common/n-select.png" mode=""></image>
@@ -52,7 +53,7 @@
 			min-height: 162rpx;
 			background: #FFFFFF;
 			border-radius: 20rpx 20rpx 20rpx 20rpx;
-			border: 2rpx solid #41ABF5;
+			
 			margin-bottom: 20rpx;
 			box-sizing: border-box;
 			padding: 24rpx 32rpx 20rpx 80rpx;
@@ -77,5 +78,8 @@
 				}
 			}
 		}
+		.s-b{
+			border: 2rpx solid #41ABF5;
+		}
 	}
 </style>

+ 17 - 0
pages.json

@@ -128,6 +128,23 @@
 					"style": {
 						"navigationBarTitleText": "干洗"
 					}
+				},
+				{
+					"path": "dry-mod/select-shop",
+					"style": {
+						"navigationBarTitleText": "切换门店"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages-school",
+			"pages": [
+				{
+					"path": "school-circle",
+					"style": {
+						"navigationBarTitleText": "校友圈"
+					}
 				}
 			]
 		},

+ 6 - 1
pages/index/index.vue

@@ -137,7 +137,7 @@
 				navList:[
 					{name:"外卖",img:require('@/static/img/index/index-wm.png'),type:2},
 					{name:"代取",img:require('@/static/img/index/index-dq.png'),type:3},
-					{name:"校友圈",img:require('@/static/img/index/index-xyq.png'),},
+					{name:"校友圈",img:require('@/static/img/index/index-xyq.png'),type:7},
 					{name:"团购",img:require('@/static/img/index/index-tg.png'),type:5},
 					{name:"票务",img:require('@/static/img/index/index-pw.png'),type:4},
 					{name:"干洗",img:require('@/static/img/index/index-gx.png'),type:6},
@@ -224,6 +224,11 @@
 					uni.navigateTo({
 						url:'/pages-buy/dry-clean'
 					})
+				}else if(type === 7){
+					// 去校友圈
+					uni.navigateTo({
+						url:'/pages-school/school-circle'
+					})
 				}else{
 					tools.error('暂未开放')
 				}

+ 49 - 6
pages/order/index.vue

@@ -1,7 +1,17 @@
 <template>
-	<view class="flex-common-css">
-		<Nav title="" leftIconColor="#333" titleColor="#333"></Nav>
+	<view class="flex-common-css iPhone-bottom flex-common-css box-border-box">
+		<Nav title="订单" leftIconColor="#333" titleColor="#333"></Nav>
+		
+		<view class="nav-box box-border-box bgc-f display-flex">
+			<view class="nav-item" :class="type == item.id?'fs-36 fw-600':'fs-34 fw-400'" 
+			v-for="(item,i) in navList" :key="i">
+				{{item.name}}
+				<view v-if="type == item.id" class="nav-item-x"></view>
+			</view>
+		</view>
+		
 		<scroll-view :scroll-y="true" class="scroll-view-css" @scrolltolower="scrolltolower">
+			
 		</scroll-view>
 	</view>
 </template>
@@ -10,10 +20,26 @@
 	export default {
 		components: {},
 		data() {
-			return {};
+			return {
+				type:2,
+				navList:[
+					{name:'外卖',id:2},
+					{name:'外卖',id:1},
+					{name:'外卖',id:1},
+					{name:'外卖',id:1},
+					{name:'外卖',id:1},
+					{name:'外卖',id:1},
+					{name:'外卖',id:1},
+					{name:'外卖',id:1},
+				]
+			};
+		},
+		onLoad(e) {
+			
+		},
+		mounted() {
+			
 		},
-		onLoad(data) {},
-		mounted() {},
 		methods: {
 			scrolltolower() {
 				console.log('触底');
@@ -23,5 +49,22 @@
 </script>
 
 <style lang="scss" scoped>
-
+	.nav-box{
+		padding: 26rpx 44rpx;
+		overflow-x: scroll;
+		.nav-item{
+			margin-right: 76rpx;
+			white-space: nowrap;
+			position: relative;
+			.nav-item-x{
+				position: absolute;
+				width: 48rpx;
+				height: 6rpx;
+				border-radius: 20rpx;
+				background-color: #41ABF5;
+				left: 12rpx;
+				bottom: -10rpx;
+			}
+		}
+	}
 </style>

BIN
static/img/buy/jlzj.png


BIN
static/img/school/add.png


BIN
static/img/school/bg.png


BIN
static/img/school/dian.png


BIN
static/img/school/fx.png


BIN
static/img/school/hot.png


BIN
static/img/school/icon.png


BIN
static/img/school/info.png


BIN
static/img/school/ts.png