no message

common/css/common.css

@@ -327,6 +327,9 @@ image {
 	color: #F93435;
 }
 
+.fc-F75820 {
+	color: #F75820;
+}
 
 .fc-FF7F00 {
 	color: #FF7F00;
@@ -445,7 +448,9 @@ image {
 .b-b-F9F9F9 {
 	border-bottom: 1rpx solid #F9F9F9;
 }
-
+.b-b-eee {
+	border-bottom: .5rpx solid #eee;
+}
 .b-b-999 {
 	border-bottom: 1rpx solid #999;
 }

components/en-utils/en-blank/en-blank.vue

@@ -57,7 +57,7 @@
 <style scoped lang="scss">
   @import url("../../static/css/en-common.css") ;
 	.blank-page {
-		width: 100vw;
+		// width: 100vw;
 		padding-top: 200rpx;
 		z-index: 2;
 		display: flex;

manifest.json

@@ -68,6 +68,9 @@
             "minified" : true
         },
         "usingComponents" : true,
+		"optimization": {
+			"subPackages": true
+		},
         "permission" : {
             "scope.userLocation" : {
                 "desc" : "获取您的位置授权，用于更准确的，更快捷的为您服务"

pages-buy/group-shop.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="flex-common-css iPhone-bottom">
+	<view class="flex-common-css iPhone-bottom box-border-box group-shop-box">
 		<Nav :leftShow='false' :customNav='true' :bgckgroundBox='scrollTopNum>30?"#fff":"transparent"' class="nav-box">
 			<template>
 				<view slot="custom" class="align-items-center">
@@ -14,103 +14,123 @@
 				</view>
 			</template>
 		</Nav>
+		<image :src="shopInfo.shop_logo" mode="scaleToFill" class="nav-img" :class="scrollTopNum>30?'nav-img-false':'nav-img-true'"></image>
 		<scroll-view :scroll-y="true" class="scroll-view-box" @scroll='scroll' @scrolltolower="scrolltolower">
-			<image src="@/static/img/my/bg.png" mode="scaleToFill" class="nav-img"></image>
 			<view class="shop-box p-24 box-border-box">
-				<view class="align-items-center mb-18">
-					<image :src="shopInfo.shop_logo" mode="aspectFill" class="shop_logo mr-10"></image>
-					<view class="flex-1">
-						<view class="fs-38 fw-600 fc-3 letter-spacing-6 mb-18">
-							{{shopInfo.shop_name || ''}}
+				<view class="bgc-f top-box box-border-box b-rad-20 mb-24">
+					<view class="display-flex p-b-20 b-b-eee mb-30">
+						<image :src="shopInfo.shop_logo" mode="aspectFill" class="shop_logo mr-24"></image>
+						<view class="flex-1 flex-direction">
+							<view class="display-flex flex-justify-space mb-30">
+								<view class="fs-38 fw-b fc-0 letter-spacing-6">
+									{{shopInfo.shop_name || ''}}
+								</view>
+								<image src="/pages-buy/static/dh.png" mode="" class="dh-img"
+									@click="phoneBut(shopInfo.shop_phone)"></image>
+							</view>
+							<view class="align-items-center">
+								<view class="align-items-center">
+									<image class="dw-class mr-6" src="@/static/img/index/dw.png" mode=""></image>
+									<view class="fs-24 fc-0">
+										距离{{shopInfo.distance}}Km
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="mb-30">
+						<view class="align-items-center mb-30">
+							<view class="fs-24">
+								营业时间：
+							</view>
+							<view class="fs-24 time-item" v-for="(item,index) in shopInfo.business_hours">
+								{{item[0]+'-'+item[1]}}
+							</view>
 						</view>
-						<view class="align-items-center flex-justify-space b-b-F9F9F9">
-							<view class="">
-								营业时间：{{timeData}}
+
+						<view class="align-items-center flex-justify-space">
+							<view class="fs-24 fc-a mr-8">
+								{{shopInfo.city_name || ''}} {{shopInfo.address || ''}}
 							</view>
-							<image src="@/static/img/takeout/info-phone.png" mode="" class="phone"
-								@click="phoneBut(shopInfo.shop_phone)"></image>
+							<image src="/pages-buy/static/fz.png" mode="" class="fz-icon"
+								@click="copy(shopInfo.city_name+shopInfo.address)"></image>
 						</view>
 					</view>
+					<scroll-view class="uni-margin-wrap mb-18" scroll-x="true" v-if="shopInfo.shop_album.length>0">
+						<image v-for="(item,index) in shopInfo.shop_album" :src="item" mode="heightFix"
+							class="swiper-img mr-10" @click="lookImg(shopInfo.shop_album,index)"></image>
+					</scroll-view>
 				</view>
-				<view class="p-b-20 b-b-F9F9F9">
-					<view class="align-items-center mb-10">
-						<view class="fs-26 fc-3 mr-8">
-							{{shopInfo.city_name || ''}} {{shopInfo.address || ''}}
+
+				<view class="list-box bgc-f b-rad-16 box-border-box">
+					<image src="/pages-buy/static/bg.png" mode="" class="list-box-bg"></image>
+					<view class="align-items-center mb-40">
+						<view class="tg-box">
+							<view class=" fs-38 fw-b fc-0 z-2">
+								团购
+							</view>
+							<view class="title-hr"></view>
 						</view>
-						<image src="@/static/img/order/fz.png" mode="" class="fz-icon"
-							@click="copy(shopInfo.city_name+shopInfo.address)"></image>
-					</view>
-					<view class="align-items-center">
-						<image class="dw mr-4" src="@/static/img/my/wz-two.png" mode=""></image>
-						<view class="fs-24 fc-9">
-							距离{{shopInfo.distance ||  ''}}Km
+						<view class="fc-F75820 fs-38 fw-b mr-20">
+							推荐
+						</view>
+						<view class="fs-24 fc-a">
+							限时团购尽情抢购!
 						</view>
 					</view>
-				</view>
-				<scroll-view class="uni-margin-wrap mb-18" scroll-x="true" v-if="shopInfo.shop_album.length>0">
-					<image v-for="(item,index) in shopInfo.shop_album" :src="item" mode="heightFix"
-						class="swiper-img mr-6" @click="lookImg(shopInfo.shop_album,index)"></image>
-				</scroll-view>
-				<!-- 				<view class="uni-margin-wrap mb-18" v-if="shopInfo.shop_album.length>0">
-					<swiper class="swiper" :circular='true' :autoplay="true" :interval="3000" :duration="500">
-						<swiper-item v-for="(item,index) in shopInfo.shop_album">
-							<image :src="item" mode="aspectFit" class="swiper-img"></image>
-						</swiper-item>
-					</swiper>
-				</view> -->
-				<view class="align-items-center mb-18">
-					<view class="hr mr-8"></view>
-					<view class="fs-32 fw-600 fc-3 letter-spacing-6">
-						团购
+					<view v-if="shopList.length == 0" class="scroll-view-css">
+						<EnBlank :customSrc='true'>
+							<template v-slot:blankImg>
+								<image class="black-custom-img" src="@/static/img/common/no-order.png" mode=""></image>
+							</template>
+						</EnBlank>
 					</view>
-				</view>
-				<view class="list-box bgc-f b-rad-16 p-24 box-border-box">
-					<view class="item-box align-items-flex-start" v-for="(item,index) in shopList" :key="index"
+					<view class="item-box align-items-flex-start z-2" v-for="(item,index) in shopList" :key="index"
 						@click="goToUrl(item)">
-						<image :src="item.cover_img" mode="aspectFit" class="shop-img mr-16 flex-shrink0"></image>
-						<view class="flex-1">
-							<view class="align-items-center mb-10">
-								<view class="fs-32 fs-32 flex-1 mr-16 text-overflow-ellipsis-one w-380">
-									{{item.title}}
-								</view>
-								<uni-icons type="right" size="16"></uni-icons>
+						<view class="shop-img-box mr-24">
+							<image :src="item.cover_img" mode="aspectFill" class="shop-img flex-shrink0"></image>
+							<view class="zk-box fs-20 fc-f text-align-center">
+								6.3折
 							</view>
-							<view class="align-items-center mb-18">
-								<view class="align-items-center mr-12" v-show="item.usable_time === 1">
-									<view class="fc-9">
-										24小时可用
-									</view>
-									<view class="d-calss bgc-9 ml-10"></view>
-								</view>
-								<view class="align-items-center mr-12">
-									<view class="fc-9">
-										{{item.pre_book === 1?'免预约':'需预约'}}
-									</view>
-									<view class="d-calss bgc-9 ml-10"></view>
-								</view>
-								<view class="fc-9" v-show="item.is_quota == 1">
-									限购{{item.quota_num}}份
-								</view>
+						</view>
+						<view class="flex-1">
+							<view class="fs-28 fw-b fc-0 text-overflow-ellipsis-one w-390 mb-22">
+								{{item.title}}
 							</view>
 							<view class="align-items-center flex-justify-space">
-								<view class="align-items-center">
-									<view class="fs-30 fw-600 fc-ff3939 mr-8 flex-shrink0">
-										<span class="fs-24 fc-ff3939">￥</span>
-										{{item.price}}
-									</view>
-									<view class="mr-8 fs-20 fc-ff3939 discount-box flex-shrink0">
-										6.3折
+								<view class="">
+									<view class="align-items-center mb-24">
+										<view class="align-items-center mr-12" v-show="item.usable_time === 1">
+											<view class="fc-9">
+												24小时可用
+											</view>
+											<view class="d-calss bgc-9 ml-10"></view>
+										</view>
+										<view class="align-items-center mr-12">
+											<view class="fc-9">
+												{{item.pre_book === 1?'免预约':'需预约'}}
+											</view>
+										</view>
 									</view>
-									<view class="mr-8 fc-9 fs-24 flex-shrink0 line-price">
-										￥{{item.line_price}}
+									<view class="align-items-flex-end">
+										<view class="fs-30 fw-600 fc-F93435 mr-8 flex-shrink0">
+											<span class="fs-24 fc-F93435 fw-b">￥</span>
+											{{item.price}}
+										</view>
+										<view class="fc-a fs-24 flex-shrink0 line-price">
+											￥{{item.line_price}}
+										</view>
 									</view>
 								</view>
-								<view class="">
-									<view class="fs-26 fc-9 mb-8 text-align-right">
-										销量 {{item.sales}}+
+								<view class="qg-box flex-direction align-items-center" @click.stop="goTOPay(item)">
+									<view class="align-items-center mb-8">
+										<image src="/pages-buy/static/qg.png" mode="" class="sd-img mr-6"></image>
+										<view class="fs-28 fc-f fw-b">
+											抢购
+										</view>
 									</view>
-									<view class="item-but fc-f fs-32" @click.stop="goTOPay(item)">
-										抢购
+									<view class="fs-20 fc-f">
+										销量 {{item.sales}}+
 									</view>
 								</view>
 							</view>
@@ -123,13 +143,16 @@
 </template>
 
 <script>
+	import EnBlank from "@/components/en-utils/en-blank/en-blank";
 	import {
 		groupShopInfo,
 		groupList
 	} from '@/api/group.js'
 	import tools from '@/service/tools';
 	export default {
-		components: {},
+		components: {
+			EnBlank
+		},
 		data() {
 			return {
 				scrollTopNum: 0, //当前滚动条高度
@@ -243,19 +266,94 @@
 </script>
 
 <style lang="scss" scoped>
+	.time-item {
+		margin-right: 15rpx;
+		padding-right: 15rpx;
+		border-right: .5rpx solid #EEEEEE;
+	}
+
+	.time-item:last-child {
+		margin-right: 0;
+		padding: 0;
+		border-right: none;
+	}
+
+	.qg-box {
+		width: 130rpx;
+		height: 80rpx;
+		background: linear-gradient(-90deg, #FF7D2D, #F54F1D);
+		box-shadow: 0rpx 3rpx 8rpx 0rpx rgba(246, 83, 30, 0.32);
+		border-radius: 20rpx;
+		padding-top: 14rpx;
+	}
+
+	.tg-box {
+		position: relative;
+	}
+
+	.title-hr {
+		width: 72rpx;
+		height: 10rpx;
+		border-radius: 5rpx;
+		background: linear-gradient(to right, #F75820, #FEEEE8);
+		position: absolute;
+		bottom: 2rpx;
+		left: 0;
+		z-index: 1;
+	}
+
+	.z-2 {
+		position: relative;
+		z-index: 2;
+	}
+
+	.list-box {
+		padding: 36rpx 25rpx 0;
+		position: relative;
+	}
+
+	.list-box-bg {
+		width: 633rpx;
+		height: 189rpx;
+		position: absolute;
+		right: 0;
+		top: 0;
+	}
+
+	.dw-class {
+		width: 16rpx;
+		height: 17rpx;
+	}
+
+	.dh-img {
+		width: 48rpx;
+		height: 48rpx;
+	}
+
+	.top-box {
+		padding: 33rpx 20rpx 15rpx;
+	}
+
+	.group-shop-box {
+		position: relative;
+		background: transparent;
+	}
+
 	.fz-icon {
-		width: 30rpx;
-		height: 30rpx;
+		width: 20rpx;
+		height: 20rpx;
 	}
 
 	.shop_logo {
-		width: 100rpx;
-		height: 100rpx;
+		width: 120rpx;
+		height: 120rpx;
 		border-radius: 20rpx;
 	}
 
 	.item-box {
-		margin-bottom: 20rpx;
+		padding-bottom: 39rpx;
+		border-bottom: .5rpx solid #EDEEF2;
+		margin-bottom: 39rpx;
 	}
 
 	.item-box:last-child {
@@ -286,14 +384,32 @@
 		border-radius: 50%;
 	}
 
-	.w-380 {
-		width: 380rpx;
+	.w-390 {
+		width: 390rpx;
+	}
+
+	.shop-img-box {
+		width: 220rpx;
+		height: 150rpx;
+		border-radius: 10rpx;
+		position: relative;
 	}
 
 	.shop-img {
-		width: 180rpx;
-		height: 180rpx;
-		border-radius: 15rpx;
+		width: 220rpx;
+		height: 150rpx;
+		border-radius: 10rpx;
+	}
+
+	.zk-box {
+		width: 70rpx;
+		height: 28rpx;
+		line-height: 28rpx;
+		background: linear-gradient(-90deg, #FF7D2D, #F54F1D);
+		position: absolute;
+		left: -3rpx;
+		top: -4rpx;
+		border-radius: 20rpx 0 20rpx 0;
 	}
 
 	.hr {
@@ -316,7 +432,7 @@
 	.scroll-view-box {
 		width: 100%;
 		height: 100vh;
-		position: fixed;
+		// position: fixed;
 		overflow: auto;
 	}
 
@@ -326,7 +442,18 @@
 
 	.nav-img {
 		width: 100%;
-		height: 200rpx;
+		height: 422rpx;
+		position: fixed;
+		left: 0;
+		top: 0;
+		border-radius: 0 0 200rpx 200rpx;
+		transition: all 0.3s ease-in-out;
+	}
+	.nav-img-true{
+		opacity: 1;
+	}
+	.nav-img-false{
+		opacity: 0;
 	}
 
 	.uni-margin-wrap {
@@ -345,7 +472,7 @@
 
 	.swiper-img {
 		width: 25%;
-		height: 230rpx;
+		height: 190rpx;
 		display: inline-block;
 	}
 
@@ -379,6 +506,11 @@
 		position: relative;
 		top: -10rpx;
 		border-radius: 15rpx 15rpx 0 0;
-		background: #F6F6F6;
+		// background: #F6F6F6;
+	}
+
+	.sd-img {
+		width: 15rpx;
+		height: 28rpx;
 	}
 </style>

pages-buy/group.vue

@@ -41,14 +41,20 @@
 					@touchmove.stop.prevent="stopScroll">
 					<view class="mr-20 sift-item align-items-center flex-justify-center"
 						@click="siftClick(1)">
-						<view class="fs-28 fc-FCFBF8">
-							{{siftDistance}}
+						<view class="align-items-center">
+							<view class="fs-28 fc-FCFBF8 mr-12">
+								{{siftDistance}}
+							</view>
+							<image class="bottom-icon" src="@/static/img/group/bottom.png" mode=""></image>
 						</view>
 					</view>
 					<view class="mr-12 sift-item align-items-center flex-justify-center "
 						@click="siftClick(2)">
-						<view class="fs-28 fc-FCFBF8">
-							{{siftSort}}
+						<view class="align-items-center">
+							<view class="fs-28 fc-FCFBF8 mr-12">
+								{{siftSort}}
+							</view>
+							<image class="bottom-icon" src="@/static/img/group/bottom.png" mode=""></image>
 						</view>
 					</view>
 					<view class="pop-content" :style="[{'top': pop_top + 'px'}]"
@@ -311,6 +317,10 @@
 </script>
 
 <style scoped lang="scss">
+	.bottom-icon{
+		width: 16rpx;
+		height: 10rpx;
+	}
 	.class-box-head {
 		position: relative;
 		// z-index: 2;
@@ -326,7 +336,7 @@
 		padding: 36rpx 8rpx 8rpx 38rpx;
 		border-radius: 20rpx;
 		box-sizing: border-box;
-		background: linear-gradient(to bottom, white, rgba(255, 255, 255, 0.95));
+		background: linear-gradient(to top, white, rgba(255, 255, 255, 0.65));
 	}
 
 	.qbfl {

pages-buy/ticket.vue

@@ -157,6 +157,37 @@
 	}
 </style>
 <style scoped lang="scss">
+	.head-search {
+		width: 100%;
+		position: relative;
+	
+		.s-icon {
+			position: absolute;
+			left: 24rpx;
+			top: 20rpx;
+		}
+	
+		input {
+			width: 100%;
+			height: 72rpx;
+			background: #FFFFFF;
+			border-radius: 200rpx;
+			box-sizing: border-box;
+			padding: 0 130rpx 0 68rpx;
+			font-size: 32rpx;
+		}
+	
+		.head-search-buttom {
+			width: 120rpx;
+			height: 60rpx;
+			background: linear-gradient(90deg, #2CE6F8 0%, #41ABF5 100%);
+			border-radius: 200rpx;
+			line-height: 60rpx;
+			position: absolute;
+			right: 6rpx;
+			top: 6rpx;
+		}
+	}
 	.pw-imgage {
 		width: 85rpx;
 		height: 45rpx;

pages.json

@@ -455,8 +455,8 @@
 		"current": 0,
 		"list": [{
 				"name": "列表调试",
-				"path": "pages-buy/group",
-				"query": ""
+				"path": "pages-buy/group-shop",
+				"query": "shop_id=23"
 			},
 			{
 				"name": "店铺详情",