no message

common/css/common.css

@@ -388,6 +388,9 @@ image {
 .p-12-24 {
 	padding: 12rpx 24rpx;
 }
+.pl-24 {
+	padding-left: 24rpx;
+}
 
 /* 外边距 */
 .m-24{
@@ -416,7 +419,9 @@ image {
 	margin-left: 40rpx;
 }
 
-
+.mr-4{
+	margin-right: 4rpx;
+}
 .mr-6{
 	margin-right: 6rpx;
 }

pages-buy/dry-clean.vue

@@ -6,11 +6,13 @@
 			<image v-else :src="siteData.logo" mode="aspectFill"></image>
 			<view class="flex-1">
 				<view class="display-flex mb-16">
-					<view class="w410 fs-40 fw-600 text-overflow-ellipsis-one">{{siteData.name?siteData.name:'请选择站点'}}</view>
+					<view class="w410 fs-40 fw-600 text-overflow-ellipsis-one">{{siteData.name?siteData.name:'请选择站点'}}
+					</view>
 					<view class="fs-28 fw-400 fc-41ABF5 text-align-right" @click="selectsShop()">【切换站点】</view>
 				</view>
 				<view class="display-flex">
-					<view v-if="siteData.city_name||siteData.address" class="w410 fs-26 fw-400 fc-9">{{siteData.city_name}}{{siteData.address}}</view>
+					<view v-if="siteData.city_name||siteData.address" class="w410 fs-26 fw-400 fc-9">
+						{{siteData.city_name}}{{siteData.address}}</view>
 					<view v-else class="w410 fs-26 fw-400 fc-9">请选择站点已提供服务</view>
 					<view class="text-align-center" style="margin-left: auto;">
 						<view class="text-align-right">
@@ -20,9 +22,9 @@
 					</view>
 				</view>
 			</view>
-			
+
 		</view>
-		
+
 		<view class="box-border-box p-24" @click="openText()">
 			<view class="sy-box flex-justify-space box-border-box p-16">
 				<view class="align-items-center">
@@ -32,17 +34,18 @@
 				<image src="@/static/img/toRight.png" mode=""></image>
 			</view>
 		</view>
-		
+
 		<!-- 列表 -->
 		<view class="common-view-css bgc-f" style="overflow: hidden;">
 			<Menu ref="menuBox" style="height: 100%;" @relCardBuy='relCardBuy'></Menu>
 		</view>
-		
-		
+
+
 		<view class="shop-buttom-money box-border-box">
 			<view class="shop-buttom-money-1 flex-justify-space align-items-center">
 				<image src="@/static/img/takeout/buy-icon.png" mode="scaleToFill" @click="openBuyCrad()"></image>
-				<view class="shop-buttom-num fs-24 fc-f text-align-center" @click="openBuyCrad()">{{cardData.total_num||'0'}}</view>
+				<view class="shop-buttom-num fs-24 fc-f text-align-center" @click="openBuyCrad()">
+					{{cardData.total_num||'0'}}</view>
 				<view class="">
 					<view class="">
 						<span class="fw-600 fs-24 fc-f">￥</span>
@@ -52,9 +55,9 @@
 				<view class="shop-buttom-money-2 text-align-center fc-f fs-32 fw-600" @click="createOrder()">去结算</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">
@@ -79,16 +82,20 @@
 									<span class="fs-40 fc-FB3D03 fw-b">{{item.price}}</span>
 								</view>
 								<view class="display-flex align-items-center">
-									<view v-show="item.number > 0" class="right-only-right-red fw-500 text-align-center fs-36 fc-f" @click="addred(1,item)">-</view>
-									<view v-show="item.number > 0" class="right-only-right-2 text-align-center fs-28 fw-400">{{item.number}}</view>
-									<view class="right-only-right-add fw-500 text-align-center fs-36 fc-f" @click="addred(2,item)">+</view>
+									<view v-show="item.number > 0"
+										class="right-only-right-red fw-500 text-align-center fs-36 fc-f"
+										@click="addred(1,item)">-</view>
+									<view v-show="item.number > 0"
+										class="right-only-right-2 text-align-center fs-28 fw-400">{{item.number}}</view>
+									<view class="right-only-right-add fw-500 text-align-center fs-36 fc-f"
+										@click="addred(2,item)">+</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>
@@ -104,7 +111,7 @@
 				</view>
 			</view>
 		</uni-popup>
-		
+
 		<uni-popup ref="popupText" type="bottom">
 			<view class="use-box box-border-box p-16">
 				<view class="head-pop flex-justify-space align-items-center mb-24">
@@ -119,37 +126,46 @@
 </template>
 
 <script>
-	import {setShopIngNumber,setShopIngDel,getShopIngList,setShopIngAdd,} from '@/api/shopping.js'
-	import {getCommonText} from '@/api/common.js';
-	
+	import {
+		setShopIngNumber,
+		setShopIngDel,
+		getShopIngList,
+		setShopIngAdd,
+	} from '@/api/shopping.js'
+	import {
+		getCommonText
+	} from '@/api/common.js';
+
 	import Menu from './dry-mod/menu.vue';
 	import tools from "@/service/tools";
 	export default {
-		components:{Menu},
-		data(){
-			return{
-				laundry_str:'',
-				siteData:{
-					id:'',
-					school_id:'',
-					name:'',
-					logo:'',
-					distance:0,
-					city_name:'',
-					address:'',
+		components: {
+			Menu
+		},
+		data() {
+			return {
+				laundry_str: '',
+				siteData: {
+					id: '',
+					school_id: '',
+					name: '',
+					logo: '',
+					distance: 0,
+					city_name: '',
+					address: '',
 				},
-				
-				cardData:{
-					goods_list:[],
-					total_num:0,
-					total_price:0,
+
+				cardData: {
+					goods_list: [],
+					total_num: 0,
+					total_price: 0,
 				},
-				
-				isAJAX:false,
+
+				isAJAX: false,
 			}
 		},
 		onLoad(e) {
-			if(e.data){
+			if (e.data) {
 				this.siteData = JSON.parse(decodeURIComponent(e.data));
 			}
 		},
@@ -157,105 +173,119 @@
 			this.getText();
 			this.getCardList();
 		},
-		methods:{
-			cardAllDel(){
-				if(this.cardData.goods_list.length > 0){
-					setShopIngDel({type:3}).then((res)=>{
-						if(res.code === 1){
+		methods: {
+			cardAllDel() {
+				if (this.cardData.goods_list.length > 0) {
+					setShopIngDel({
+						type: 3
+					}).then((res) => {
+						if (res.code === 1) {
 							this.cardData.goods_list = [];
 							this.getCardList();
 							this.$refs.menuBox.getTypeList();
-						}else{
+						} else {
 							tools.error('清空失败')
 						}
 					})
-				}else{
+				} else {
 					tools.error('暂未选择商品')
 				}
-				
+
 			},
-			
-			relCardBuy(){
+
+			relCardBuy() {
 				// 重置购物车
 				this.getCardList();
 			},
-			getCardList(){
-				getShopIngList({type:3}).then((res)=>{
-					if(res.code === 1){
+			getCardList() {
+				getShopIngList({
+					type: 3
+				}).then((res) => {
+					if (res.code === 1) {
 						this.cardData = res.data;
 					}
 				})
 			},
-			
-			getText(){
-				getCommonText().then((res)=>{
-					if(res.code === 1){
+
+			getText() {
+				getCommonText().then((res) => {
+					if (res.code === 1) {
 						this.laundry_str = res.data.laundry_str
 					}
 				})
 			},
-			
-			selectsShop(){
+
+			selectsShop() {
 				uni.navigateTo({
-					url:'/pages-buy/dry-mod/select-shop?id=' + this.siteData.id
+					url: '/pages-buy/dry-mod/select-shop?id=' + this.siteData.id
 				})
 			},
-			openText(){
+			openText() {
 				this.$refs.popupText.open()
 			},
-			closeMsg(){
+			closeMsg() {
 				this.$refs.popupText.close()
 			},
 
-			openBuyCrad(){
+			openBuyCrad() {
 				this.$refs.popupBuy.open()
 			},
-			
-			addred(type,info){
-				if(this.isAJAX){
+
+			addred(type, info) {
+				if (this.isAJAX) {
 					return
 				}
 				this.isAJAX = true;
-				if(type === 1){
+				if (type === 1) {
 					// 减
-					setShopIngNumber({type:3,goods_id:info.goods_id,category_id:info.category_id,operation:2}).then((res)=>{
-						if(res.code === 1){
+					setShopIngNumber({
+						type: 3,
+						goods_id: info.goods_id,
+						category_id: info.category_id,
+						operation: 2
+					}).then((res) => {
+						if (res.code === 1) {
 							this.isAJAX = false;
 							info.num -= 1;
 							this.getCardList();
 							this.$refs.menuBox.getTypeList();
-						}else{
+						} else {
 							this.isAJAX = false;
 							tools.error(res.msg)
 						}
 					})
-					
-				}else if(type === 2){
+
+				} else if (type === 2) {
 					// 加
-					setShopIngAdd({type:3,goods_id:info.goods_id,category_id:info.category_id}).then((res)=>{
-						if(res.code === 1){
+					setShopIngAdd({
+						type: 3,
+						goods_id: info.goods_id,
+						category_id: info.category_id
+					}).then((res) => {
+						if (res.code === 1) {
 							this.isAJAX = false;
 							info.num += 1;
 							this.getCardList();
 							this.$refs.menuBox.getTypeList();
-						}else{
+						} else {
 							this.isAJAX = false;
 							tools.error(res.msg)
 						}
 					})
-					
+
 				}
 			},
-			
-			createOrder(){
-				if(this.cardData.goods_list.length == 0){
+
+			createOrder() {
+				if (this.cardData.goods_list.length == 0) {
 					return tools.error('请选择商品')
 				}
-				if(!this.siteData.id){
+				if (!this.siteData.id) {
 					return tools.error('请选择站点')
 				}
 				uni.navigateTo({
-					url:'/pages-buy/save-dry?id=' + this.siteData.id
+					url: '/pages-buy/save-dry?id=' + this.siteData.id + '&siteData_logo=' + this.siteData.logo +
+						'&siteData_name=' + this.siteData.name
 				})
 			},
 		},
@@ -263,22 +293,24 @@
 </script>
 
 <style scoped lang="scss">
-	.use-box{
+	.use-box {
 		width: 100%;
 		height: 70vh;
 		background-color: #fff;
 		border-radius: 24rpx 24rpx 0rpx 0rpx;
 		display: flex;
 		flex-direction: column;
-		.head-pop{
+
+		.head-pop {
 			padding-bottom: 34rpx !important;
 			border-bottom: 1rpx solid #F2F2F2;
 		}
 	}
-	
-	.dry-clean-box{
+
+	.dry-clean-box {
 		background-color: #fff;
-		.right-only-right-red{
+
+		.right-only-right-red {
 			width: 44rpx;
 			height: 44rpx;
 			line-height: 40rpx;
@@ -286,48 +318,58 @@
 			border: 1rpx solid #41ABF5;
 			color: #41ABF5;
 		}
-		.right-only-right-add{
+
+		.right-only-right-add {
 			width: 44rpx;
 			height: 44rpx;
 			line-height: 40rpx;
-			background: linear-gradient( 117deg, #57CAFF 0%, #41ABF5 100%);
+			background: linear-gradient(117deg, #57CAFF 0%, #41ABF5 100%);
 			border-radius: 12rpx;
 		}
-		.right-only-right-2{
+
+		.right-only-right-2 {
 			min-width: 50rpx;
 		}
-		.w-514{
+
+		.w-514 {
 			width: 514rpx;
 		}
-		.w410{
+
+		.w410 {
 			width: 410rpx;
 		}
-		.head-box{
+
+		.head-box {
 			background-color: #fff;
-			box-shadow: 0rpx 8rpx 8rpx 0rpx rgba(51,51,51,0.06);
-			image{
+			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{
+
+		.sy-box {
 			width: 100%;
 			height: 60rpx;
 			background: #F2F2F2;
 			border-radius: 16rpx 16rpx 16rpx 16rpx;
-			image{
+
+			image {
 				width: 32rpx;
 				height: 32rpx;
 			}
 		}
-		.shop-buttom-money{
+
+		.shop-buttom-money {
 			width: 100%;
 			height: 140rpx;
-			background: rgba(255,255,255,0.8);
+			background: rgba(255, 255, 255, 0.8);
 			padding: 20rpx 24rpx;
-			.shop-buttom-money-1{
+
+			.shop-buttom-money-1 {
 				width: 100%;
 				height: 100%;
 				background: #333333;
@@ -336,14 +378,16 @@
 				padding-left: 136rpx;
 				// padding-right: 32rpx;
 				position: relative;
-				image{
+
+				image {
 					position: absolute;
 					bottom: 0;
 					left: 8rpx;
 					width: 128rpx;
 					height: 128rpx;
 				}
-				.shop-buttom-num{
+
+				.shop-buttom-num {
 					width: 32rpx;
 					height: 32rpx;
 					line-height: 32rpx;
@@ -353,7 +397,8 @@
 					top: 36rpx;
 					left: 82rpx;
 				}
-				.shop-buttom-money-2{
+
+				.shop-buttom-money-2 {
 					width: 200rpx;
 					height: 100rpx;
 					line-height: 100rpx;
@@ -362,21 +407,25 @@
 				}
 			}
 		}
-		.buy-card{
+
+		.buy-card {
 			height: 828rpx;
 			background-color: #fff;
 			border-radius: 24rpx 24rpx 0rpx 0rpx;
-			.buy-card-top{
+
+			.buy-card-top {
 				width: 100%;
 				height: 92rpx;
 				background: #FCF5DB;
 				border-radius: 24rpx 24rpx 0rpx 0rpx;
 			}
-			.buy-card-item{
+
+			.buy-card-item {
 				width: 100%;
 				height: 176rpx;
 				margin-bottom: 32rpx;
-				image{
+
+				image {
 					width: 152rpx;
 					height: 152rpx;
 					border-radius: 12rpx;

pages-buy/dry-mod/select-shop.vue

@@ -1,13 +1,13 @@
 <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">
-			<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" :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="align-items-center 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>
@@ -18,14 +18,14 @@
 						<view class="fs-26 fw-400 fc-9">{{item.city_name}}{{item.address}}</view>
 					</view>
 				</view>
-				
-				
-				<view class="box-right text-align-center" >
+
+
+				<view class="box-right text-align-center">
 					<view class="">
 						<view class="fs-28 mb-12">去下单</view>
 						<view class="fs-26 fc-9">距您你{{item.distance}}km</view>
 					</view>
-					
+
 				</view>
 			</view>
 		</scroll-view>
@@ -33,41 +33,43 @@
 </template>
 
 <script>
-	import {laundrySite} from '@/api/laundry.js';
+	import {
+		laundrySite
+	} from '@/api/laundry.js';
 	import tools from "@/service/tools";
 	export default {
-		data(){
-			return{
-				id:'',
-				list:[],
+		data() {
+			return {
+				id: '',
+				list: [],
 			}
 		},
 		onLoad(e) {
-			if(e.id){
+			if (e.id) {
 				this.id = Number(e.id);
 			}
 			this.getList();
 		},
-		methods:{
-			getList(){
+		methods: {
+			getList() {
 				let obj = {
-					school_id:uni.getStorageSync('school_id'),
-					lon:uni.getStorageSync('lon'),
-					lat:uni.getStorageSync('lat'),
+					school_id: uni.getStorageSync('school_id'),
+					lon: uni.getStorageSync('lon'),
+					lat: uni.getStorageSync('lat'),
 				}
 
-				laundrySite(obj).then((res)=>{
-					if(res.code === 1){
+				laundrySite(obj).then((res) => {
+					if (res.code === 1) {
 						this.list = res.data;
 					}
 				})
 			},
-			
-			selectFun(item){
+
+			selectFun(item) {
 				let obj = JSON.stringify(item);
 				this.id = item.id;
 				uni.reLaunch({
-					url:'/pages-buy/dry-clean?data=' + encodeURIComponent(obj)
+					url: '/pages-buy/dry-clean?data=' + encodeURIComponent(obj)
 				})
 			},
 		},
@@ -75,56 +77,64 @@
 </script>
 
 <style scoped lang="scss">
-	.select-site-box{
-		.box-right{
+	.select-site-box {
+		.box-right {
 			border-left: 2rpx solid #eee;
 			display: flex;
 			align-items: center;
 			box-sizing: border-box;
 			padding-left: 42rpx;
 		}
-		.w292{
+
+		.w292 {
 			width: 292rpx;
 		}
-		.list-item{
+
+		.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{
+
+			.jlzj-box {
 				width: 118rpx;
 				height: 44rpx;
 				position: absolute;
 				right: 0rpx;
 				top: -1rpx;
 			}
-			.img-1{
+
+			.img-1 {
 				width: 80rpx;
 				height: 80rpx;
 				border-radius: 8rpx;
 				margin-right: 20rpx;
 			}
-			.w-490{
+
+			.w-490 {
 				width: 490rpx;
 			}
-			.list-item-s{
+
+			.list-item-s {
 				position: absolute;
 				left: 24rpx;
 				top: 45%;
-				image{
+
+				image {
 					width: 32rpx;
 					height: 32rpx;
 				}
 			}
-			
+
 		}
-		.s-b{
+
+		.s-b {
 			border: 2rpx solid #41ABF5;
 		}
 	}

pages-buy/group-det.vue

@@ -25,7 +25,7 @@
 					<image src="@/static/img/buy/tg-det-bg.png" mode="scaleToFill"></image>
 					
 					<view class="card-money">
-						<view class="">
+						<view class="mb-4">
 							<span class="fs-28 fc-f fw-600">￥</span><span class="fs-48 fc-f fw-600">{{obj.price||''}}</span>
 						</view>
 						<view class="fs-24 fw-400 fc-f text-line-through">原价{{obj.line_price||''}}</view>
@@ -44,8 +44,8 @@
 					</view>
 				</view>
 				<view class="card-bottom box-border-box">
-					<view class="fs-36 fc-3 fw-600 text-overflow-ellipsis mb-32">{{obj.title||''}}</view>
-					<view class="jd-f mb-12">
+					<view class="fs-36 fc-3 fw-600 text-overflow-ellipsis mb-24">{{obj.title||''}}</view>
+					<view class="jd-f mb-24">
 						<view class="jd-1"></view>
 						<view class="jd-2" :style="{width:setWidth(obj.number,obj.sales)+'rpx'}"></view>
 					</view>
@@ -276,13 +276,13 @@
 				}
 			}
 			.card-bottom{
-				padding: 24rpx 24rpx 0 24rpx;
+				padding: 24rpx;
 				width: 702rpx;
-				height: 234rpx;
+				max-height: 234rpx;
 				border-radius: 20rpx;
 				background-color: #fff;
 				position: absolute;
-				bottom: 0;
+				top: 145rpx;
 				left: 24rpx;
 				z-index: 2;
 			}
@@ -306,8 +306,8 @@
 				top: 0;
 				left: 0;
 				height: 18rpx;
-				// background: linear-gradient( 90deg, #3FF9F9 0%, #E0FEA4 100%);
-				background-color: #FF2652;
+				background: linear-gradient( 90deg, #FF545D 0%, #FF4B84 100%);
+				// background-color: #FF2652;
 				border-radius: 200rpx 200rpx 200rpx 200rpx;
 				z-index: 12;
 			}
@@ -322,7 +322,7 @@
 				font-size: 26rpx;
 				font-weight: 400;
 				color: rgba(255,255,255,0.8);
-				margin-right: 20rpx;
+				margin-right: 8rpx;
 				margin-top: 30rpx;
 			}
 			.time-day{

pages-buy/group.vue

@@ -4,10 +4,10 @@
 		
 		<image class="head-img" src="@/static/img/buy/group-bg.png" mode="scaleToFill"></image>
 		
-		<view class="box-border-box p-24">
-			<view class="box-card box-border-box p-24 mb-20" v-for="(item,i) in list" :key="i" @click="todet(item)">
+		<view class="box-border-box content-b">
+			<view class="box-card box-border-box mb-20" v-for="(item,i) in list" :key="i" @click="todet(item)">
 				<image class="goods-img mb-16" :src="item.cover_img" mode="aspectFill"></image>
-				<view class="text-overflow-ellipsis fs-36 fw-600 mb-20 w-100100">
+				<view class="text-overflow-ellipsis fs-32 fw-600 mb-20 w-100100">
 					{{item.title}}
 				</view>
 				<view class="mb-40 flex-justify-space align-items-center">
@@ -92,6 +92,9 @@
 </script>
 
 <style scoped lang="scss">
+	.content-b{
+		padding: 0 24rpx 24rpx;
+	}
 	.jd-f{
 		position: relative;
 		width: 434rpx;
@@ -111,8 +114,8 @@
 			top: 0;
 			left: 0;
 			height: 18rpx;
-			// background: linear-gradient( 90deg, #3FF9F9 0%, #E0FEA4 100%);
-			background-color: #FF2652;
+			background: linear-gradient( 90deg, #FF545D 0%, #FF4B84 100%);
+			// background-color: #FF2652;
 			border-radius: 200rpx 200rpx 200rpx 200rpx;
 			z-index: 12;
 		}
@@ -130,12 +133,14 @@
 			width: 100%;
 			min-height: 100rpx;
 			background: #FFFFFF;
+			padding: 16rpx;
 			box-shadow: 0rpx 0rpx 12rpx 0rpx rgba(51,51,51,0.1);
 			border-radius: 20rpx;
 			.goods-img{
 				width: 100%;
 				height: 452rpx;
 				border-radius: 20rpx;
+				// margin-top: 24rpx;
 			}
 			.info-box{
 				width: 100%;

pages-buy/save-dry.vue

@@ -2,9 +2,9 @@
 	<view class="save-order-box iPhone-bottom flex-common-css box-border-box">
 		<view class="bg-box"></view>
 		<Nav title='提交订单' bgckgroundBox='transparent'></Nav>
-		
+
 		<view class="scroll-view-css box-border-box p-24">
-			<view class="box-card box-border-box mb-20 bgc-f">
+			<!-- 			<view class="box-card box-border-box mb-20 bgc-f">
 				<view class="box-input align-items-center box-border-box p-b-20 mb-20">
 					<view class="fs-28 fw-600 w158">姓名</view>
 					<input v-model="fromData.name" type="text" placeholder="请输入姓名">
@@ -23,21 +23,33 @@
 					<view class="fs-28 fw-600 w158">联系地址</view>
 					<input v-model="fromData.address" type="text" placeholder="请输入联系地址（选填）">
 				</view>
-			</view>
-			
+			</view> -->
+
 			<view class="box-card box-border-box mb-20 bgc-f">
-				<view class="box-top box-border-box flex-justify-space" v-for="(item,i) in cardData.goods_list" :key="i">
-					<view class="box-left display-flex">
+				<view class="align-items-center mb-18">
+					<image class="mr-8 wh48" :src="siteData_logo" mode=""></image>
+					<view class="fs-32 fw-600 fc-3">
+						{{siteData_name}}
+					</view>
+				</view>
+				<view class="box-top box-border-box flex-justify-space" v-for="(item,i) in cardData.goods_list"
+					:key="i">
+					<view class="box-left">
 						<image :src="item.goods_image" mode="aspectFill"></image>
-						<view class="w336 fs-28 fw-400">{{item.goods_name||''}}</view>
 					</view>
-					<view class="box-right">
-						<view class="fs-32 fw-600 text-align-right mb-12">￥{{item.price||''}}</view>
-						<view class="display-flex align-items-center">
+					<view class="box-right flex-1">
+						<view class="flex-1 align-items-center flex-justify-space mb-8">
+							<view class="w336 fs-28 fw-400">{{item.goods_name||''}}</view>
+							<view class="fs-32 fw-600 text-align-right mb-12">￥{{item.price||''}}</view>
+						</view>
+						<view class="">
+							x {{item.number}}
+						</view>
+						<!-- 						<view class="display-flex align-items-center">
 							<view class="right-only-right-red fw-500 text-align-center fs-36 fc-f" @click="addred(1,item)">-</view>
 							<view class="right-only-right-2 text-align-center fs-28 fw-400">{{item.number}}</view>
 							<view class="right-only-right-add fw-500 text-align-center fs-36 fc-f" @click="addred(2,item)">+</view>
-						</view>
+						</view> -->
 					</view>
 				</view>
 				<view class="box-buttom text-align-right">
@@ -46,12 +58,12 @@
 					<span class="fs-44 fc-0 fw-b">{{cardData.total_price||'0'}}</span>
 				</view>
 			</view>
-			
+
 			<view class="box-card box-border-box mb-20 bgc-f flex-justify-space">
 				<view class="fs-28 fw-600 w158">备注</view>
 				<input v-model="fromData.note" class="text-align-right" type="text" placeholder="请填写你的备注">
 			</view>
-			
+
 			<view class="box-card box-border-box mb-20 bgc-f flex-justify-space">
 				<view class="fs-28 fw-600 w158">支付方式</view>
 				<view class="wx-box display-flex">
@@ -60,7 +72,7 @@
 				</view>
 			</view>
 		</view>
-		
+
 		<view class="bottom-box box-border-box p-24">
 			<view class="flex-justify-space">
 				<view class="align-items-flex-end box-1">
@@ -74,154 +86,180 @@
 </template>
 
 <script>
-	import {getCode} from '@/api/common.js';
-	import {setShopIngNumber,getShopIngList,setShopIngAdd,} from '@/api/shopping.js';
-	import {laundryCreate} from '@/api/laundry.js';
-	import {laundryPay} from '@/api/laundryOrder.js';
-	
+	import {
+		getCode
+	} from '@/api/common.js';
+	import {
+		setShopIngNumber,
+		getShopIngList,
+		setShopIngAdd,
+	} from '@/api/shopping.js';
+	import {
+		laundryCreate
+	} from '@/api/laundry.js';
+	import {
+		laundryPay
+	} from '@/api/laundryOrder.js';
+
 	import tools from "@/service/tools";
-	
+
 	export default {
-		data(){
-			return{
-				isCode:false,
-				codeText:'获取验证码',
-				
-				fromData:{
-					name:'',
-					code:'',
-					address:'',
-					phone:'',
-					
-					note:'',
-					site_id:'',
-					school_id:'',
+		data() {
+			return {
+				isCode: false,
+				codeText: '获取验证码',
+				fromData: {
+					name: '',
+					code: '',
+					address: '',
+					phone: '',
+					note: '',
+					site_id: '',
+					school_id: '',
 				},
-				isAJAX:false,
-				
-				goodsData:{},
-				
-				cardData:{
-					goods_list:[],
-					total_num:0,
-					total_price:0,
+				isAJAX: false,
+				goodsData: {},
+				cardData: {
+					goods_list: [],
+					total_num: 0,
+					total_price: 0,
 				},
+				siteData_logo: '',
+				siteData_name: ''
 			}
 		},
 		onLoad(e) {
 			this.fromData.site_id = e.id;
+			this.siteData_logo = e.siteData_logo
+			this.siteData_name = e.siteData_name
 			this.getCardList();
 		},
-		methods:{
-			getCardList(){
-				getShopIngList({type:3}).then((res)=>{
-					if(res.code === 1){
+		methods: {
+			getCardList() {
+				getShopIngList({
+					type: 3
+				}).then((res) => {
+					if (res.code === 1) {
 						this.cardData = res.data;
 					}
 				})
 			},
-			
-			getCode(){
+
+			getCode() {
 				if (this.isCode) {
 					return
 				}
 				this.isCode = true;
-				getCode({phone:this.fromData.phone,send_type:'ticket_order'}).then((res)=>{
-					if(res.code === 1){
+				getCode({
+					phone: this.fromData.phone,
+					send_type: 'ticket_order'
+				}).then((res) => {
+					if (res.code === 1) {
 						this.codeText = 60;
 						let timer = setInterval(() => {
-						  this.codeText -= 1;
-						  if (this.codeText <= 0) {
-						    clearInterval(timer);
-							this.isCode = false;
-							this.codeText = '获取验证码'
-						  }
+							this.codeText -= 1;
+							if (this.codeText <= 0) {
+								clearInterval(timer);
+								this.isCode = false;
+								this.codeText = '获取验证码'
+							}
 						}, 1000);
-					}else{
+					} else {
 						this.isCode = false;
 						tools.error('获取验证码失败，请稍后重试')
 					}
 				})
-				
+
 			},
-			
-			toSave(){
+
+			toSave() {
 				if (this.isAJAX) {
 					return
 				}
 				this.isAJAX = true;
 				this.fromData.school_id = uni.getStorageSync('school_id');
-				laundryCreate(this.fromData).then((res)=>{
-					if(res.code === 1){
-						laundryPay({order_id:res.data.order_id}).then((ret)=>{
-							if(ret.code === 1){
+				laundryCreate(this.fromData).then((res) => {
+					if (res.code === 1) {
+						laundryPay({
+							order_id: res.data.order_id
+						}).then((ret) => {
+							if (ret.code === 1) {
 								uni.requestPayment({
-								  provider: "wxpay", //支付类型-固定值
-								  timeStamp: ret.data.wx_pay.timeStamp + "", // 时间戳（单位：秒）
-								  nonceStr: ret.data.wx_pay.nonceStr, // 随机字符串
-								  package: ret.data.wx_pay.package, // 固定值
-								  signType: ret.data.wx_pay.signType, //固定值
-								  paySign: ret.data.wx_pay.paySign, //签名
-								  success: (ren) => {
-								    tools.success("支付成功");
-									this.isAJAX = false;
-									setTimeout(()=>{
-										uni.switchTab({
-											url:"/pages/order/index"
-										})
-									},1500)
-								  },
-								  fail: (err) =>{
-									this.isAJAX = false;
-								    tools.error("支付失败");
-								  },
+									provider: "wxpay", //支付类型-固定值
+									timeStamp: ret.data.wx_pay.timeStamp + "", // 时间戳（单位：秒）
+									nonceStr: ret.data.wx_pay.nonceStr, // 随机字符串
+									package: ret.data.wx_pay.package, // 固定值
+									signType: ret.data.wx_pay.signType, //固定值
+									paySign: ret.data.wx_pay.paySign, //签名
+									success: (ren) => {
+										tools.success("支付成功");
+										this.isAJAX = false;
+										setTimeout(() => {
+											uni.switchTab({
+												url: "/pages/order/index"
+											})
+										}, 1500)
+									},
+									fail: (err) => {
+										this.isAJAX = false;
+										tools.error("支付失败");
+									},
 								});
-							}else{
+							} else {
 								this.isAJAX = false;
 								tools.error("支付失败");
 							}
 						})
-					}else{
+					} else {
 						this.isAJAX = false;
 						tools.error(res.msg);
 					}
 				})
 			},
-			
-			addred(type,info){
-				if(this.isAJAX){
+
+			addred(type, info) {
+				if (this.isAJAX) {
 					return
 				}
 				this.isAJAX = true;
-				if(type === 1){
-					if(info.number <= 1){
+				if (type === 1) {
+					if (info.number <= 1) {
 						this.isAJAX = false;
-					}else{
+					} else {
 						// 减
-						setShopIngNumber({type:3,goods_id:info.goods_id,category_id:info.category_id,operation:2}).then((res)=>{
-							if(res.code === 1){
+						setShopIngNumber({
+							type: 3,
+							goods_id: info.goods_id,
+							category_id: info.category_id,
+							operation: 2
+						}).then((res) => {
+							if (res.code === 1) {
 								this.isAJAX = false;
 								info.number -= 1;
 								this.getCardList();
-							}else{
+							} else {
 								this.isAJAX = false;
 								tools.error(res.msg)
 							}
 						})
 					}
-				}else if(type === 2){
+				} else if (type === 2) {
 					// 加
-					setShopIngAdd({type:3,goods_id:info.goods_id,category_id:info.category_id}).then((res)=>{
-						if(res.code === 1){
+					setShopIngAdd({
+						type: 3,
+						goods_id: info.goods_id,
+						category_id: info.category_id
+					}).then((res) => {
+						if (res.code === 1) {
 							this.isAJAX = false;
 							info.number += 1;
 							this.getCardList();
-						}else{
+						} else {
 							this.isAJAX = false;
 							tools.error(res.msg)
 						}
 					})
-					
+
 				}
 			},
 		},
@@ -229,10 +267,15 @@
 </script>
 
 <style scoped lang="scss">
-	.save-order-box{
+	.wh48{
+		width: 48rpx;
+		height: 48rpx;
+		border-radius: 50%;
+	}
+	.save-order-box {
 		position: relative;
-		
-		.right-only-right-red{
+
+		.right-only-right-red {
 			width: 44rpx;
 			height: 44rpx;
 			line-height: 40rpx;
@@ -240,30 +283,34 @@
 			border: 1rpx solid #41ABF5;
 			color: #41ABF5;
 		}
-		.right-only-right-add{
+
+		.right-only-right-add {
 			width: 44rpx;
 			height: 44rpx;
 			line-height: 40rpx;
-			background: linear-gradient( 117deg, #57CAFF 0%, #41ABF5 100%);
+			background: linear-gradient(117deg, #57CAFF 0%, #41ABF5 100%);
 			border-radius: 12rpx;
 		}
-		.right-only-right-2{
+
+		.right-only-right-2 {
 			min-width: 50rpx;
 		}
-		
-		.bg-box{
+
+		.bg-box {
 			width: 100%;
 			height: 448rpx;
 			filter: blur(80rpx);
-			background: linear-gradient(to right,rgba(176, 252, 250, 0.6),rgba(249,246,224,0.87),rgba(249,246,224,0.87));
+			background: linear-gradient(to right, rgba(176, 252, 250, 0.6), rgba(249, 246, 224, 0.87), rgba(249, 246, 224, 0.87));
 			position: absolute;
 			top: 0;
 			left: 0;
 			z-index: -1;
 		}
-		.bottom-box{
+
+		.bottom-box {
 			background-color: #fff;
-			.box-1{
+
+			.box-1 {
 				flex: 1;
 				height: 100rpx;
 				background: #333;
@@ -272,7 +319,8 @@
 				padding-left: 32rpx;
 				padding-bottom: 20rpx;
 			}
-			.box-2{
+
+			.box-2 {
 				width: 200rpx;
 				height: 100rpx;
 				line-height: 100rpx;
@@ -281,48 +329,58 @@
 				text-align: center;
 			}
 		}
-		.box-card{
+
+		.box-card {
 			width: 100%;
 			min-height: 88rpx;
 			border-radius: 20rpx;
 			padding: 24rpx 24rpx 0 24rpx;
-			.box-top{
+
+			.w336 {
+				width: 336rpx;
+			}
+
+			.box-top {
 				padding-bottom: 24rpx;
 				border-bottom: 2rpx solid #F9F9F9;
 				margin-bottom: 24rpx;
-				.box-left{
-					image{
+
+				.box-left {
+					image {
 						width: 108rpx;
 						height: 108rpx;
 						border-radius: 8rpx;
 						margin-right: 16rpx;
 					}
-					.w336{
-						width: 336rpx;
-					}
 				}
 			}
-			.box-buttom{
+
+			.box-buttom {
 				padding-bottom: 24rpx;
 			}
 		}
-		.box-input{
+
+		.box-input {
 			border-bottom: 2rpx solid #F9F9F9;
 			position: relative;
-			.w158{
+
+			.w158 {
 				width: 158rpx;
 			}
-			input{
+
+			input {
 				font-size: 28rpx;
 			}
-			.code-box{
+
+			.code-box {
 				position: absolute;
 				right: 0;
 				top: 0;
 			}
 		}
-		.wx-box{
-			image{
+
+		.wx-box {
+			image {
 				width: 40rpx;
 				height: 40rpx;
 			}

pages-school/school-circle.vue

@@ -147,7 +147,14 @@
 				<!-- ----- -->
 				<view class="head-pop flex-justify-space align-items-center mb-24">
 					<view class=""></view>
-					<view class="fs-36 fc-0 fw-600">评论内容</view>
+					<view class="align-items-center">
+						<view class="fs-36 fc-0 fw-600 mr-4">
+							评论
+						</view>
+						<view class="fs-24 fc-9">
+							({{remarkData.list.length}})
+						</view>
+					</view>
 					<uni-icons @click.stop="closeMsg()" type="closeempty" size="24"></uni-icons>
 				</view>
 
@@ -169,18 +176,19 @@
 										{{item.nickname}}
 										<span v-if="item.is_author == 1"
 											class='only-box text-align-center fs-24 fc-41ABF5 ml-10'>作者</span>
-										<view class="ml-10" v-if="item.is_self == 1" @click="delInfo(item)">
-											<uni-icons type="trash" size="18"></uni-icons>
-										</view>
-
+											<span v-if="item.is_self == 1" class="fs-28 fc-6 ml-10">我</span>
 									</view>
 									<view class="fs-30 fw-400 mb-8" @click.stop="openInput(1,item)">
 										{{item.content}}
 									</view>
-									<view class="fs-24 fw-400 fc-9 mb-8">{{item.created_date}}</view>
+									<view class="display-flex mb-8">
+										<view class="fs-24 fw-400 fc-9 mr-6">{{item.created_date}}</view>
+										<uni-icons v-if="item.is_self == 1" @click="delInfo(item)" type="trash"
+											size="16"></uni-icons>
+									</view>
 								</view>
 								<view class="display-flex" @click.stop="handUp(2,item)">
-									<uni-icons type="hand-up" size="20"
+									<uni-icons class="mr-8" type="hand-up" size="20"
 										:color="item.is_like==1?'#FD5C02':'#999'"></uni-icons>
 									<view class="fs-24 fw-400 mt-5" :class="item.is_like==1?'fc-FD5C02':'fc-9'">
 										{{item.like}}
@@ -201,14 +209,16 @@
 													{{info.nickname}}
 													<span v-if="info.is_author == 1"
 														class='only-box text-align-center fs-24 fc-41ABF5 ml-10'>作者</span>
-													<view class="ml-10" v-if="info.is_self == 1" @click="delInfo(info)">
-														<uni-icons type="trash" size="18"></uni-icons>
-													</view>
+														<span v-if="info.is_self == 1" class="fs-28 fc-6 ml-10">我</span>
 												</view>
 												<view class="fs-30 fw-400 mb-8" @click.stop="openInput(2,info)">
 													{{info.content}}
 												</view>
-												<view class="fs-24 fw-400 fc-9 mb-8">{{info.created_date}}</view>
+												<view class="display-flex mb-8">
+													<view class="fs-24 fw-400 fc-9 mr-6">{{info.created_date}}</view>
+													<uni-icons class="fs-24" v-if="info.is_self == 1"
+														@click="delInfo(item)" type="trash"></uni-icons>
+												</view>
 											</view>
 											<view class="display-flex" @click.stop="handUp(2,info)">
 												<uni-icons type="hand-up" size="20"
@@ -661,9 +671,8 @@
 		}
 
 		.pop-box {
-
 			width: 100%;
-			height: 50vh;
+			height: 60vh;
 			background-color: #fff;
 			border-radius: 24rpx 24rpx 0rpx 0rpx;
 			display: flex;
@@ -681,13 +690,13 @@
 		}
 
 		.pop-msg {
-			height: 70vh;
+			height: 80vh;
 			position: relative;
 
 			.pop-input {
 				position: absolute;
 				width: 100%;
-				height: 70vh;
+				height: 80vh;
 				background-color: #fff;
 				bottom: 0;
 				left: 0;

pages/index/index.vue

@@ -32,10 +32,10 @@
 		<view class="index-box-1 ">
 			<!-- 轮播 -->
 			<view class="box-border-box plr-24 mb-32">
-				<uni-swiper-dot :info="bannerList" mode="dot" :dotsStyles="dotStyle">
-					<swiper class="swiper">
+				<uni-swiper-dot :info="bannerList" mode="dot" :dotsStyles="dotStyle" :current="current">
+					<swiper class="swiper" @change="change">
 						<swiper-item v-for="(item,i) in bannerList" :key="i">
-							<image class="swiper-item" :src="item.image" mode="aspectFill"></image>
+							<image class="swiper-item" :src="item.image" mode="aspectFill" @click="bannerClock(item)"></image>
 						</swiper-item>
 					</swiper>
 				</uni-swiper-dot>
@@ -148,20 +148,23 @@
 							<view class="fs-28 mb-12 ticket-name text-overflow-ellipsis fc-3 fw-600">
 								{{item.name}}
 							</view>
-							<view class="fs-24 fc-6">
-								有效时间：{{item.start_time}} - {{item.end_time}}
+							<view class="fs-22 fc-6 mb-12">
+								有效时间：{{item.time_type_str}}
+							</view>
+							<view class="fs-22 fc-6">
+								券类型：{{item.scene == 1?'外卖卷':'代取卷'}}
 							</view>
 						</view>
 						<view class="item-hr"></view>
 						<view class="item-left flex-direction align-items-center flex-justify-center bgc-FCE7E2">
 							<view class="align-items-center">
-								<view class="fs-30 fw-600 fc-FB3D03">￥</view>
+								<view class="fs-24 fw-600 fc-FB3D03">￥</view>
 								<view class="fs-48 fw-600 fc-FB3D03">{{item.money}}</view>
 							</view>
-							<view class="fs-24 mb-18 fc-6">
-								{{item.desc}}
+							<view class="fs-22 fc-6 mb-4">
+								需满{{item.full_money}}元
 							</view>
-							<view class="but-box fs-28 fc-f" @click="receive(item,index)">立即领取</view>
+							<view class="but-box fs-26 fc-f" @click="receive(item,index)">立即领取</view>
 							<view class="ball"></view>
 							<view class="ball-two"></view>
 						</view>
@@ -248,7 +251,6 @@
 						type: 8
 					},
 				],
-
 				schoolData: {
 					school_name: '',
 				},
@@ -270,8 +272,9 @@
 					border: '1px rgba(51, 51, 51,0.3) solid',
 					color: '#fff',
 					selectedBackgroundColor: 'rgba(79, 179, 239,0.9)',
-					selectedBorder: '1px rgba(255, 255, 255,0.9) solid'
-				}
+					selectedBorder: '1px rgba(0,0,0,0) solid'
+				},
+				current: 0
 			}
 		},
 
@@ -353,6 +356,59 @@
 			this.couponHome()
 		},
 		methods: {
+			change(e) {
+				this.current = e.detail.current
+			},
+			bannerClock(item) {
+				if(item.type == 1) {
+					// 外卖首页
+					uni.navigateTo({
+						url: '/pages-takeout/takeout'
+					})
+				}else if(item.type == 2) {
+					if(item.to_id != 0) {
+						// 外卖商家
+						uni.navigateTo({
+							url: '/pages-takeout/shop?shop_id=' + item.to_id
+						})
+					}else {
+						// 外卖首页
+						uni.navigateTo({
+							url: '/pages-takeout/takeout'
+						})
+					}
+				}else if(item.type == 3) {
+					// 代取页
+					uni.navigateTo({
+						url: '/pages-takeout/replace-take'
+					})
+				}else if (item.type === 4) {
+					// 团购页
+					uni.navigateTo({
+						url: '/pages-buy/group'
+					})
+				}else if(item.type === 5) {
+					// 票务页
+					uni.navigateTo({
+						url: '/pages-buy/ticket'
+					})
+				}else if(item.type === 6) {
+					// 干洗页
+					uni.navigateTo({
+						url: '/pages-buy/dry-clean'
+					})
+				}else if(item.type === 7) {
+					// 校友圈
+					uni.navigateTo({
+						url: '/pages-school/school-circle'
+					})
+				}else if(item.type === 8) {
+					// 骑手申请页
+					uni.navigateTo({
+						url: '/pages-my/rider-recruit'
+					})
+				}
+			},
 			receive(item,index) {
 				receiveCoupon({grant_id: item.grant_id,coupon_id: item.coupon_id}).then((res) => {
 					if(res.code == 1) {
@@ -452,7 +508,7 @@
 						url: '/pages-takeout/takeout'
 					})
 				} else if (type === 3) {
-					// 去外卖
+					// 去代取
 					uni.navigateTo({
 						url: '/pages-takeout/replace-take'
 					})
@@ -867,9 +923,9 @@
 	}
 
 	.item-left {
-		width: 200rpx;
+		width: 171rpx;
 		height: auto;
-		padding: 20rpx 24rpx;
+		padding: 20rpx 18rpx;
 		box-sizing: border-box;
 		position: relative;
 		border-radius: 0 20rpx 20rpx 0;
@@ -905,9 +961,9 @@
 	}
 
 	.but-box {
-		width: 152rpx;
-		height: 52rpx;
-		line-height: 52rpx;
+		width: 136rpx;
+		height: 48rpx;
+		line-height: 48rpx;
 		text-align: center;
 		background: linear-gradient(225deg, #FB3D03 0%, #FF6901 100%);
 		border-radius: 200rpx;