Browse Source

no message

zpj 2 years ago
parent
commit
4f7646046a

+ 9 - 0
common/css/common.css

@@ -185,6 +185,9 @@ image {
 .fs-48{
 	font-size: 48rpx;
 }
+.fs-64{
+	font-size: 64rpx;
+}
 
 /* 字体下面横线 */
 .text-underline{
@@ -293,6 +296,9 @@ image {
 .bgc-F5F4F9{
 	background-color: #F5F4F9;
 }
+.bgc-F3F4F6{
+	background-color: #F3F4F6;
+}
 
 .b-b-F9F9F9{
 	border-bottom: 1rpx solid #F9F9F9;
@@ -353,6 +359,9 @@ image {
 .m-24{
 	margin: 24rpx;
 }
+.mt-5{
+	margin-top: 5rpx;
+}
 .mt-24{
 	margin-top: 24rpx;
 }

+ 83 - 0
components/en-utils/en-eva/en-eva.vue

@@ -0,0 +1,83 @@
+<template>
+	<view class="en-eva">
+		<view class="en-eva-box" v-if="type">
+			<view class="n-x">
+				<image v-for="(item,i) in 5" :key="i"
+				 src="@/static/img/index/xing-n.png" mode=""></image>
+			</view>
+			<view class="s-x">
+				<image v-for="(item,i) in num" :key="i"
+				 src="@/static/img/index/index-x.png" mode=""></image>
+			</view>
+		</view>
+		
+		<view class="en-eva-box" v-else>
+			<view class="n-x">
+				<image v-for="(item,i) in 5" :key="i" @click="select(i)"
+				 src="@/static/img/index/xing-n.png" mode=""></image>
+			</view>
+			<view class="s-x">
+				<image v-for="(item,i) in numList" :key="i" @click="select(i)"
+				 src="@/static/img/index/index-x.png" mode=""></image>
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		name:'en-eva',
+		props:{
+			// true 只做显示 false 可编辑
+			type:{
+				type: Boolean,
+				default:true,
+			},
+			num:{
+				type: Number,
+				default:0,
+			},
+		},
+		data(){
+			return{
+				numList:0,
+			}
+		},
+		methods:{
+			select(i){
+				this.numList = i+1
+				this.$nextTick();
+				this.$emit('getEvaNum',this.numList)
+			},
+		},
+	}
+</script>
+
+<style scoped lang="scss">
+	.en-eva{
+		width: 140rpx;
+		height: 24rpx;
+		.en-eva-box{
+			width: 140rpx;
+			height: 24rpx;
+			position: relative;
+			image{
+				width: 24rpx;
+				height: 24rpx;
+				margin-right: 4rpx;
+			}
+			.n-x{
+				display: flex;
+				position: absolute;
+				z-index: 1;
+			}
+			.s-x{
+				display: flex;
+				position: absolute;
+				z-index: 2;
+			}
+		}
+		
+	}
+</style>

+ 54 - 0
pages-takeout/aptitude.vue

@@ -0,0 +1,54 @@
+<template>
+	<view class="aptitude-index iPhone-bottom flex-common-css box-border-box bgc-f">
+		<Nav title='营业资质'></Nav>
+		
+		<view class="scroll-view-css info-list box-border-box p-24 mb-20">
+			<view class="card-box box-border-box p-24">
+				<view class="mb-20 fw-600 fs-32">营业资质</view>
+				<image v-for="(item,i) in 2" :key="i" @click="lookImg(i,item)"
+				src="@/static/img/my/bg.png" mode="scaleToFill"></image>
+			</view>
+			<view class="card-box box-border-box p-24">
+				<view class="mb-20 fw-600 fs-32">许可证</view>
+				<image v-for="(item,i) in 2" :key="i" @click="lookImg(i,item)"
+				src="@/static/img/my/bg.png" mode="scaleToFill"></image>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import tools from "@/service/tools";
+	export default {
+		data(){
+			return{
+				
+			}
+		},
+		methods:{
+			lookImg(i,item){
+				tools.lookBigImg(i,item)
+			},
+		},
+	}
+</script>
+
+<style scoped lang="scss">
+	.aptitude-index{
+		.info-list{
+			height: 100%;
+			background-color: #F5F4F9;
+			.card-box{
+				width: 100%;
+				min-height: 572rpx;
+				background: #FFFFFF;
+				border-radius: 20rpx;
+				image{
+					width: 100%;
+					height: 460rpx;
+					margin-bottom: 20rpx;
+				}
+			}
+		}
+	}
+</style>

+ 150 - 0
pages-takeout/replace-take.vue

@@ -0,0 +1,150 @@
+<template>
+	<view class="replace-take-box iPhone-bottom flex-common-css box-border-box bgc-f">
+		
+		<view class="nav-box">
+			<image class="bg-img" src="@/static/img/takeout/dq-bg.png" mode="scaleToFill"></image>
+			<Nav :leftShow='false' :customNav='true' bgckgroundBox='transparent'>
+				<template>
+					<view slot="custom" class="align-items-center">
+						<uni-icons type="left" size="20" @click="toBack()"></uni-icons>
+						<view class="w-390 text-overflow-ellipsis-one fs-36 fw-400">代重庆邮电大学邮电大代重庆邮电大学邮电大</view>
+					</view>
+				</template>
+			</Nav>
+			<view class="address-box align-items-center box-border-box plr-24">
+				<view class="address-1 flex-justify-space align-items-center">
+					<view class="align-items-center">
+						<image class="qu-image" src="@/static/img/takeout/qu-icon.png" mode=""></image>
+						<view class="fw-600 fs-40">请选择站点</view>
+					</view>
+					<image class="address-box-right" src="@/static/img/toRight.png" mode=""></image>
+				</view>
+			</view>
+		</view>
+		
+		
+		<view class="scroll-view-css list-box box-border-box plr-24">
+			
+		</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="">
+					<span class="fw-600 fs-24 fc-f">¥</span>
+					<span class="fw-600 fs-44 fc-f">19.26</span>
+				</view>
+				<view class="shop-buttom-money-2 text-align-center fs-32 fc-f fw-600">去结算</view>
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	import tools from "@/service/tools";
+	export default {
+		methods:{
+			toBack(){
+				tools.leftClick()
+			},
+			createOrder(){
+				
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.replace-take-box{
+		.w-390{
+			width: 390rpx;
+			margin-left: 38rpx;
+		}
+		.nav-box{
+			height: 490rpx;
+			position: relative;
+			.bg-img{
+				position: absolute;
+				top: 0;
+				left: 0;
+				width: 100%;
+				height: 490rpx;
+				// z-index: -1;
+			}
+			.address-box{
+				z-index: 100;
+				position: absolute;
+				bottom: -64rpx;
+				left: 24rpx;
+				box-sizing: border-box;
+				width: 702rpx;
+				height: 136rpx;
+				background: linear-gradient( 182deg, #F1F9FF 0%, #FFFFFF 100%);
+				box-shadow: 0rpx 0rpx 40rpx 0rpx rgba(172,210,235,0.19);
+				border-radius: 20rpx;
+				border-image: linear-gradient(167deg, rgba(255, 255, 255, 1), rgba(208, 236, 255, 0.61)) 2 2;
+				.address-1{
+					width: 100%;
+					.qu-image{
+						width: 40rpx;
+						height: 49rpx;
+						margin: 10rpx 10rpx 0 0;
+					}
+					.address-box-right{
+						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;
+				}
+			}
+		}
+		
+		.list-box{
+			
+		}
+		
+	}
+</style>

+ 242 - 0
pages-takeout/shop-mod/evaluate.vue

@@ -0,0 +1,242 @@
+<template>
+	<view class="flex-index-css evaluate-box box-border-box">
+		
+		<scroll-view scroll-y="true" class="scroll-view-css" @scrolltolower="scrolltolower">
+			<view>
+				<view class="card-box flex-justify-space align-items-center">
+					<view class="align-items-center">
+						<view class="fs-64 fc-FF7F00 fw-600 mr-12">4.6</view>
+						<EnEva :num="3"></EnEva>
+					</view>
+					<view class="align-items-center">
+						<view class="mr-30">
+							<view class="fs-24 mb-4 fw-400">味道</view>
+							<view class="fs-32 fw-b">4.2</view>
+						</view>
+						<view class="mr-30">
+							<view class="fs-24 mb-4 fw-400">包装</view>
+							<view class="fs-32 fw-b">4.2</view>
+						</view>
+						<view class="">
+							<view class="fs-24 mb-4 fw-400">配送满意度</view>
+							<view class="fs-32 fw-b">91%</view>
+						</view>
+					</view>
+				</view>
+				<view class="card-box align-items-center">
+					<view class="list-item fs-28" @click="selectType(item.id)"
+					:class="type==item.id?'s-item':'n-item'"
+					v-for="(item,i) in list" :key="i">{{item.name}}{{item.num||''}}</view>
+				</view>
+				
+				<view class="card-box" v-for="(item,i) in 5" :key="i">
+					<view class="item-head flex-justify-space mb-22">
+						<view class="display-flex">
+							<image class="left-img mr-16" src="@/static/img/my/bg.png" mode="scaleToFill"></image>
+							<view class="mt-5">
+								<view class="fs-28 fw-600">匿名用户</view>
+								<view class="fs-24 fc-9">2024-05-16</view>
+							</view>
+						</view>
+						<image @click="openPop" class="right-img" src="@/static/img/takeout/ddd.png" mode=""></image>
+					</view>
+					<view class="align-items-center mb-16">
+						<EnEva :num="3"></EnEva>
+						<view class="fs-24 fc-9 ml-16">非常棒</view>
+					</view>
+					<view class="fs-32 fw-400 mb-16">
+						味道好吃就是这个盒子包装不好味道好吃就1是这个盒子包装不好味道好吃就是这个盒子包装1不好味道好吃就是这个盒子包装不好
+					</view>
+					<view class="flex-wrap-wrap">
+						<image v-for="(item,i) in 8" :key="i" @click="lookImg(i,item)"
+						class="list-img" src="@/static/img/my/bg.png" mode="scaleToFill"></image>
+					</view>
+					
+					<view class="bgc-F3F4F6 b-rad-12 box-border-box p-24 ">
+						<view class="flex-justify-space align-items-center mb-12">
+							<view class="fs-28 fw-600 fc-6">商家回复</view>
+							<view class="fs-24 fc-9 fw-400">2024-5-16</view>
+						</view>
+						<view class="fs-24 fc-6 fw-400">
+							感谢亲亲的认可,接到亲的需求,我们就以火箭的速度准备并送出啦,亲亲能否品尝出我们的用心呢?欢迎再来哦!
+						</view>
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+		
+		<uni-popup ref="popup" type="bottom">
+			<view class="pop-box" @click.stop="closePop">
+				<view class="pop-box-1" v-if="tup">
+					<view @click.stop="tup=false" class="text-align-center fs-32 fw-600 mb-20">我要举报</view>
+					<view class="text-align-center fs-32 fw-600">取消</view>
+				</view>
+				<view v-else class="flex-index-css">
+					<view class="flex-1"></view>
+					<view class="pop-box-2 box-border-box p-24">
+						<view class="pop-box-2-1 fs-36 fw-600 text-align-center mb-28">
+							选择举报理由
+							<view class="pop-box-2-2" @click.stop="tup=true">
+								<uni-icons  type="closeempty" size="24"></uni-icons>
+							</view>
+						</view>
+						<view class="pop-item text-align-center fs-32" 
+						v-for="(item,i) in reasonList" :key="i" @click.stop="report(item)">
+							{{item.name}}
+						</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import EnEva from '@/components/en-utils/en-eva/en-eva.vue';
+	import tools from "@/service/tools";
+	export default {
+		name:"evaluate-box",
+		components:{EnEva},
+		data(){
+			return{
+				type:0,
+				list:[
+					{name:'全部',id:0},
+					{name:'很棒',id:1,num:11},
+					{name:'一般',id:2},
+					{name:'有图',id:3},
+				],
+				tup:true,
+				reasonList:[
+					{name:'政治敏感',id:1},
+					{name:'色情低俗',id:2},
+					{name:'恶意辱骂',id:3},
+					{name:'违法违规',id:4},
+					{name:'垃圾广告',id:5},
+					{name:'涉未成年',id:6},
+				]
+			}
+		},
+		methods:{
+			lookImg(i,item){
+				tools.lookBigImg(i,item)
+			},
+			selectType(type){
+				if(this.type != type){
+					this.type = type
+				}
+			},
+			scrolltolower(){
+				console.log('触底');
+			},
+			openPop(){
+				this.$refs.popup.open();
+			},
+			closePop(){
+				this.$refs.popup.close();
+				this.tup = true;
+			},
+			report(item){
+				this.closePop()
+			},
+		},
+	}
+</script>
+
+<style scoped lang="scss">
+	.evaluate-box{
+		background-color: #F5F4F9;
+		padding: 16rpx 24rpx;
+		.card-box{
+			box-sizing: border-box;
+			padding: 24rpx;
+			background-color: #fff;
+			border-radius: 20rpx;
+			margin-bottom: 20rpx;
+		}
+		.list-item{
+			min-width: 56rpx;
+			height: 52rpx;
+			border-radius: 8rpx;
+			text-align: center;
+			line-height: 52rpx;
+			margin-right: 20rpx;
+			padding: 0 16rpx;
+		}
+		.s-item{
+			background: linear-gradient( 117deg, #57CAFF 0%, #41ABF5 100%);
+			color: #fff;
+		}
+		.n-item{
+			background: #F3F4F6;
+			color: #333;
+		}
+		.item-head{
+			.left-img{
+				width: 80rpx;
+				height: 80rpx;
+				border-radius: 50%;
+			}
+			.right-img{
+				width: 30rpx;
+				height: 6rpx;
+			}
+		}
+		.list-img{
+			width: 210rpx;
+			height: 210rpx;
+			border-radius: 12rpx;
+			margin: 0 10rpx 10rpx 0;
+		}
+		.list-img:nth-child(3){
+			margin-right: 0 !important;
+		}
+		.list-img:nth-child(6){
+			margin-right: 0 !important;
+		}
+		.list-img:nth-child(9){
+			margin-right: 0 !important;
+		}
+		
+		.pop-box{
+			width: 100%;
+			height: 100vh;
+			background-color: #333;
+			position: relative;
+			.pop-box-1{
+				position: absolute;
+				bottom: 20rpx;
+				left: 24rpx;
+				view{
+					width: 702rpx;
+					height: 88rpx;
+					line-height: 88rpx;
+					background: #FFFFFF;
+					border-radius: 16rpx;
+				}
+			}
+			.pop-box-2{
+				width: 100%;
+				height: 820rpx;
+				background: #FFFFFF;
+				border-radius: 24rpx 24rpx 0rpx 0rpx;
+				.pop-box-2-1{
+					position: relative;
+					.pop-box-2-2{
+						position: absolute;
+						top: 0;
+						right: 0;
+					}
+				}
+				.pop-item{
+					width: 100%;
+					height: 92rpx;
+					line-height: 92rpx;
+					background: #F3F4F6;
+					border-radius: 200rpx;
+					margin-bottom: 24rpx;
+				}
+			}
+		}
+	}
+</style>

+ 85 - 0
pages-takeout/shop-mod/info.vue

@@ -0,0 +1,85 @@
+<template>
+	<view class="shop-info-box box-border-box">
+		<view class="box-card box-border-box p-24 bgc-f mb-20">
+			<view class="fs-32 fw-500 mb-32">商家信息</view>
+			<view class="mb-40 align-items-center">
+				<image src="@/static/img/takeout/info-address.png" mode=""></image>
+				<view class="fs-28 fw-400">重庆市沙坪坝区陈新村陈新路40号食神.牛油拌饭</view>
+			</view>
+			<view class="mb-40 align-items-center">
+				<image src="@/static/img/takeout/info-class.png" mode=""></image>
+				<view class="fs-28 fw-400">门店类目:快餐便当</view>
+			</view>
+			<view class="mb-40 align-items-center">
+				<image src="@/static/img/takeout/info-time.png" mode=""></image>
+				<view class="fs-28 fw-400">营业时间:周一、二、三、四、五、六、日:09:00- 21:40</view>
+			</view>
+			<view class="mb-40 align-items-center">
+				<image src="@/static/img/takeout/info-phone.png" mode=""></image>
+				<view class="fs-28 fw-400">联系电话: 17323751579 </view>
+			</view>
+			<view class="right-img-f align-items-center">
+				<image src="@/static/img/takeout/info-zz.png" mode=""></image>
+				<view class="fs-28 fw-400">查看营业资质 </view>
+				<image @click="to()" class="right-img" src="@/static/img/toRight.png" mode=""></image>
+			</view>
+		</view>
+		
+		<view class="box-card box-border-box p-24 bgc-f mb-20">
+			<view class="fs-32 fw-500 mb-32">商家公告</view>
+			<view class="mb-40 display-flex">
+				<image src="@/static/img/takeout/info-gg.png" mode=""></image>
+				<view class="fs-28 fw-400">第一次点餐的顾客收餐后-定要搅拌均匀在吃哟!我们的肉和牛油拌饭汁均在碗底</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data(){
+			return{
+				
+			}
+		},
+		onShow() {
+			
+		},
+		methods:{
+			to(){
+				uni.navigateTo({
+					url:'/pages-takeout/aptitude'
+				})
+			},
+		},
+	}
+</script>
+
+<style scoped lang="scss">
+	.shop-info-box{
+		height: 100%;
+		overflow: scroll;
+		background-color: #F5F4F9;
+		padding: 16rpx 24rpx;
+		.box-card{
+			width: 100%;
+			min-height: 10rpx;
+			border-radius: 20rpx;
+			image{
+				width: 40rpx;
+				height: 40rpx;
+				margin-right: 16rpx;
+			}
+			.right-img-f{
+				position: relative;
+				.right-img{
+					position: absolute;
+					top: 10rpx;
+					right: -10rpx;
+					width: 32rpx;
+					height: 32rpx;
+				}
+			}
+		}
+	}
+</style>

+ 89 - 9
pages-takeout/shop.vue

@@ -54,7 +54,9 @@
 		
 		
 		<view class="common-view-css bgc-f" style="overflow: hidden;">
-			<Menu style="height: 100%;" v-show="shopType === 1"></Menu>
+			<Menu style="height: 100%;" v-if="shopType === 1"></Menu>
+			<Evaluate style="height: 100%;" v-else-if="shopType === 2"></Evaluate>
+			<ShopInfo style="height: 100%;" v-else-if="shopType === 3"></ShopInfo>
 		</view>
 		
 		<view class="shop-buttom-money box-border-box" @click="openBuyCrad()">
@@ -69,12 +71,13 @@
 					<!-- <view class="fs-24 fc-ADADAD">免配送</view> -->
 					<view class="fs-24 fc-ff3939">配送费¥10</view>
 				</view>
-				<view class="fs-32 fw-600 fc-f">20元起送</view>
+				<view class="fs-32 fw-600 fc-f mr-30">20元起送</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">
+			<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>
@@ -87,8 +90,43 @@
 						<view class="fs-28 fw-400 fc-9">清空</view>
 					</view>
 				</view>
-				<view class="scroll-view-css">
-					
+				<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-12">[畅销款]奥尔1良烤肉牛油拌饭拌饭[畅销款]奥尔1良烤肉牛油拌饭拌饭</view>
+							<view class="w-514 text-overflow-ellipsis-one fs-24 fw-400 fc-9 mb-18">不辣,加辣</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 class="fs-24 fc-ADADAD">免配送</view> -->
+							<view class="fs-24 fc-ff3939">配送费¥10</view>
+						</view>
+						<!-- <view class="fs-32 fw-600 fc-f mr-30">20元起送</view> -->
+						<view class="shop-buttom-money-2 text-align-center fs-32 fc-f fw-600">去结算</view>
+					</view>
 				</view>
 			</view>
 		</uni-popup>
@@ -97,17 +135,18 @@
 
 <script>
 	import Menu from './shop-mod/menu.vue';
+	import Evaluate from './shop-mod/evaluate.vue';
+	import ShopInfo from './shop-mod/info.vue';
 	
 	import tools from "@/service/tools";
 	export default {
-		components:{Menu},
+		components:{Menu,Evaluate,ShopInfo},
 		data(){
 			return{
 				domHeigjt:224,
 				shopTypeList:[{name:"点菜",id:1},{name:"评价",id:2},{name:"店铺",id:3},],
 				shopType:1,//组件类型
 				shopTypeBsLeft:12,
-				
 			}
 		},
 		onLoad(e) {
@@ -145,6 +184,9 @@
 			openBuyCrad(){
 				this.$refs.popupBuy.open()
 			},
+			createOrder(){
+				
+			},
 		},
 	}
 </script>
@@ -152,6 +194,27 @@
 <style scoped lang="scss">
 	.shop-index{
 		position: relative;
+		.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;
+		}
 		.bg-img{
 			position: absolute;
 			top: 0;
@@ -180,7 +243,7 @@
 				border-radius: 200rpx;
 				box-sizing: border-box;
 				padding-left: 136rpx;
-				padding-right: 32rpx;
+				// padding-right: 32rpx;
 				position: relative;
 				image{
 					position: absolute;
@@ -199,6 +262,13 @@
 					top: 36rpx;
 					left: 82rpx;
 				}
+				.shop-buttom-money-2{
+					width: 200rpx;
+					height: 100rpx;
+					line-height: 100rpx;
+					background: #41ABF5;
+					border-radius: 0rpx 200rpx 200rpx 0rpx;
+				}
 			}
 		}
 		
@@ -304,7 +374,17 @@
 				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;
+				}
 			}
 		}
 		

+ 13 - 0
pages.json

@@ -87,11 +87,24 @@
 						"navigationBarTitleText": "外卖"
 					}
 				},
+				{
+					"path": "replace-take",
+					"style": {
+						"navigationBarTitleText": "代取"
+					}
+				},
 				{
 					"path": "shop",
 					"style": {
 						"navigationBarTitleText": "店铺"
 					}
+				},
+				{
+				
+					"path": "aptitude",
+					"style": {
+						"navigationBarTitleText": "资质"
+					}
 				}
 			]
 		},

+ 6 - 1
pages/index/index.vue

@@ -136,7 +136,7 @@
 				bgckgroundType:'',
 				navList:[
 					{name:"外卖",img:require('@/static/img/index/index-wm.png'),type:2},
-					{name:"代取",img:require('@/static/img/index/index-dq.png'),},
+					{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-tg.png'),},
 					{name:"票务",img:require('@/static/img/index/index-pw.png'),},
@@ -204,6 +204,11 @@
 					uni.navigateTo({
 						url:'/pages-takeout/takeout'
 					})
+				}else if(type === 3){
+					// 去外卖
+					uni.navigateTo({
+						url:'/pages-takeout/replace-take'
+					})
 				}
 			}
 		},

+ 15 - 0
service/tools.js

@@ -16,6 +16,21 @@ tools.sortNumber = function (a, b) {
     return a - b;
 }
 
+// 查看大图
+tools.lookBigImg = function(i,value){
+	let list = []
+	if(typeof(value) === 'string'){
+		list.push(value)
+	}else{
+		list = value
+	}
+	uni.previewImage({
+		current:i,
+		urls:list,
+		loop:true,
+	})
+}
+
 
 //邮箱/手机***过滤
 tools.starPhone = function(value, type) {

BIN
static/img/index/xing-n.png


BIN
static/img/takeout/ddd.png


BIN
static/img/takeout/dq-bg.png


BIN
static/img/takeout/info-address.png


BIN
static/img/takeout/info-class.png


BIN
static/img/takeout/info-gg.png


BIN
static/img/takeout/info-phone.png


BIN
static/img/takeout/info-time.png


BIN
static/img/takeout/info-zz.png


BIN
static/img/takeout/qu-icon.png