no message

pages-buy/dry-clean.vue

@@ -12,14 +12,15 @@
 				</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>
+						{{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-center" style="margin-left: auto;">
 						<view class="text-align-right">
 							<uni-icons type="location" size="20"></uni-icons>
 						</view>
 						<view class="fs-26 fc-9">{{siteData.distance||'0'}}km</view>
-					</view>
+					</view> -->
 				</view>
 			</view>
 
@@ -45,7 +46,8 @@
 			<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>
+					{{cardData.total_num||'0'}}
+				</view>
 				<view class="">
 					<view class="">
 						<span class="fw-600 fs-24 fc-f">￥</span>
@@ -73,7 +75,7 @@
 				</view>
 				<view class="scroll-view-css box-border-box p-32">
 					<view class="buy-card-item display-flex" v-for="(item,i) in cardData.goods_list" :key="i">
-						<image :src="item.goods_image" mode="scaleToFill"></image>
+						<image class="goods_img" :src="item.goods_image" mode="scaleToFill"></image>
 						<view class="flex-1">
 							<view class="w-514 text-overflow-ellipsis-one fs-34 fw-600 mb-40">{{item.goods_name}}</view>
 							<view class="flex-justify-space">
@@ -82,14 +84,17 @@
 									<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"
+									<!-- 									<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>
+										@click="addred(1,item)">-</view> -->
+									<image v-show="item.number > 0" class="wh-44" @click="addred(1,item)"
+										src="@/static/img/takeout/j.png" mode=""></image>
 									<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>
-
+									<image class="wh-44" src="@/static/img/takeout/add.png" @click="addred(2,item)"
+										mode=""></image>
+<!-- 									<view class="right-only-right-add fw-500 text-align-center fs-36 fc-f"
+										@click="addred(2,item)">+</view> -->
 								</view>
 							</view>
 						</view>
@@ -293,6 +298,10 @@
 </script>
 
 <style scoped lang="scss">
+	.wh-44 {
+		width: 44rpx;
+		height: 44rpx;
+	}
 	.use-box {
 		width: 100%;
 		height: 70vh;
@@ -425,7 +434,7 @@
 				height: 176rpx;
 				margin-bottom: 32rpx;
 
-				image {
+				.goods_img {
 					width: 152rpx;
 					height: 152rpx;
 					border-radius: 12rpx;

pages-buy/dry-mod/menu.vue

@@ -2,34 +2,44 @@
 	<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.id?'bgc-BCEAFF':''"  :id="'scroll'+ item.id">
+				<view class="menu-type-list fs-28 box-border-box text-align-center flex-justify-center"
+					v-for="(item,i) in typeList" :key="i" @click="selectType(item)"
+					:class="type ===  item.id?'bgc-f fc-3 fw-600':'fc-6 fw-400'" :id="'scroll'+ item.id">
 					{{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="mb-16 fs-32 fw-600">{{item.name}}</view>
 					<view class="menu-list flex-justify-space" v-for="(info,k) in item.list" :key="k">
-						<image :src="info.image" mode="aspectFill"></image>
+						<image class="info_img" :src="info.image" mode="aspectFill"></image>
 						<view class="menu-list-right flex-index-css flex-justify-space">
 							<view class="mb-40 text-overflow-ellipsis fs-34 fw-600">{{info.name}}</view>
-							
+
 							<view class="flex-justify-space align-items-flex-end">
 								<view class="">
-									<span class="fs-24 fw-400 fc-FB3D03">￥</span>
+									<span class="fs-24 fw-600 fc-FB3D03">￥</span>
 									<span class="fs-40 fw-b fc-FB3D03">{{info.price}}</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,item,info)">-</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,item,info)">+</view>
+									<!-- 									<view v-show="info.num > 0"
+										class="right-only-right-red fw-500 text-align-center fs-36 fc-f"
+										@click="addred(1,item,info)">-</view> -->
+									<image v-show="info.num > 0" class="wh-44" @click="addred(1,item,info)"
+										src="@/static/img/takeout/j.png" mode="">
+									</image>
+									<view v-show="info.num > 0"
+										class="right-only-right-2 text-align-center fs-28 fw-400">{{info.num}}</view>
+									<image class="wh-44" src="@/static/img/takeout/add.png" @click="addred(2,item,info)"
+										mode=""></image>
+									<!-- 									<view class="right-only-right-add fw-500 text-align-center fs-36 fc-f"
+										@click="addred(2,item,info)">+</view> -->
 								</view>
 							</view>
 						</view>
@@ -37,76 +47,89 @@
 				</view>
 			</view>
 		</scroll-view>
-		
-		
-		
-		
 	</view>
 </template>
 
 <script>
-	import {setShopIngAdd,setShopIngNumber,getShopIngList} from '@/api/shopping.js'
-	
-	import {getLaundry} from '@/api/category.js';
-	import {laundryList} from '@/api/laundry.js';
+	import {
+		setShopIngAdd,
+		setShopIngNumber,
+		getShopIngList
+	} from '@/api/shopping.js'
+
+	import {
+		getLaundry
+	} from '@/api/category.js';
+	import {
+		laundryList
+	} from '@/api/laundry.js';
 	import tools from "@/service/tools";
 	export default {
-		name:'menu-box',
-		props:['cardList'],
-		data(){
-			return{
-				idMark:'',//滚动自适应参数
-				
-				type:1,//分类标识
-				typeList:[],
-				
-				menuList:[],
-				isAJAX:false,
-				
-				cardData:{
-					goods_list:[],
-					total_num:0,
-					total_price:0,
+		name: 'menu-box',
+		props: ['cardList'],
+		data() {
+			return {
+				idMark: '', //滚动自适应参数
+
+				type: 1, //分类标识
+				typeList: [],
+
+				menuList: [],
+				isAJAX: false,
+
+				cardData: {
+					goods_list: [],
+					total_num: 0,
+					total_price: 0,
 				},
 			}
 		},
 		mounted() {
-			
+
 			this.getTypeList();
 		},
-		methods:{
-			
-			getTypeList(){
+		methods: {
+
+			getTypeList() {
 				let school_id = uni.getStorageSync('school_id');
-				getLaundry({school_id: school_id}).then((res)=>{
-					if(res.code === 1){
+				getLaundry({
+					school_id: school_id
+				}).then((res) => {
+					if (res.code === 1) {
 						this.typeList = res.data;
 						this.type = this.typeList[0].id;
-						this.idMark = 'scroll'+ this.type;
-						this.typeList.forEach((v)=>{
+						this.idMark = 'scroll' + this.type;
+						this.typeList.forEach((v) => {
 							v.num = 0
 						})
-						laundryList({school_id: school_id}).then((res)=>{
-							if(res.code === 1){
+						laundryList({
+							school_id: school_id
+						}).then((res) => {
+							if (res.code === 1) {
 								this.menuList = res.data
-								getShopIngList({type:3}).then((res)=>{
-									if(res.code === 1){
+								getShopIngList({
+									type: 3
+								}).then((res) => {
+									if (res.code === 1) {
 										this.cardData = res.data;
-										if(this.cardData.goods_list.length > 0){
-											this.cardData.goods_list.forEach(v=>{
-												this.menuList.forEach(n=>{
-													n.list.forEach(t=>{
-														if(v.goods_id == t.goods_id){
-															t.num = v.number
+										if (this.cardData.goods_list.length > 0) {
+											this.cardData.goods_list.forEach(v => {
+												this.menuList.forEach(n => {
+													n.list.forEach(t => {
+														if (v.goods_id == t
+															.goods_id) {
+															t.num = v
+																.number
 														}
 													})
 												})
 											})
-											
-											this.menuList.forEach(n=>{
-												n.list.forEach(t=>{
-													this.typeList.forEach((v)=>{
-														if(v.id == n.type){
+
+											this.menuList.forEach(n => {
+												n.list.forEach(t => {
+													this.typeList.forEach((v) => {
+														if (v.id == n
+															.type) {
 															v.num += t.num
 														}
 													})
@@ -115,29 +138,29 @@
 										}
 									}
 								})
-							}else {
+							} else {
 								tools.error(res.msg)
 							}
 						})
-					}else {
+					} else {
 						tools.error(res.msg)
 					}
 				})
 			},
-			
-			
-			selectType(item){
-				if(this.type != item.id){
+
+
+			selectType(item) {
+				if (this.type != item.id) {
 					this.type = item.id;
-					this.idMark = 'scroll'+ item.id
+					this.idMark = 'scroll' + item.id
 				}
 			},
-			menuScroll(){
+			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){
+				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]);
@@ -145,138 +168,161 @@
 					})
 				}).exec();
 			},
-			addred(type,item,info){
-				if(this.isAJAX){
+			addred(type, item, info) {
+				if (this.isAJAX) {
 					return
 				}
 				this.isAJAX = true;
-				if(type === 1){
+				if (type === 1) {
 					// 减
-					setShopIngNumber({type:3,goods_id:info.goods_id,category_id:item.type,operation:2}).then((res)=>{
-						if(res.code === 1){
+					setShopIngNumber({
+						type: 3,
+						goods_id: info.goods_id,
+						category_id: item.type,
+						operation: 2
+					}).then((res) => {
+						if (res.code === 1) {
 							this.isAJAX = false;
 							info.num -= 1;
 							this.setSub(item);
 							this.$emit('relCardBuy')
-						}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:item.type}).then((res)=>{
-						if(res.code === 1){
+					setShopIngAdd({
+						type: 3,
+						goods_id: info.goods_id,
+						category_id: item.type
+					}).then((res) => {
+						if (res.code === 1) {
 							this.isAJAX = false;
 							info.num += 1;
 							this.setSub(item);
 							this.$emit('relCardBuy')
-						}else{
+						} else {
 							this.isAJAX = false;
 							tools.error(res.msg)
 						}
 					})
-					
+
 				}
 			},
 			// 设置角标
-			setSub(item){
+			setSub(item) {
 				console.log(item);
 				let num = 0;
-				item.list.forEach((n)=>{
+				item.list.forEach((n) => {
 					num += n.num
 				})
-				this.typeList.forEach((v)=>{
-					if(v.id == item.type){
+				this.typeList.forEach((v) => {
+					if (v.id == item.type) {
 						v.num = num
 					}
 				})
 			},
-			
-			
+
+
 		},
 	}
 </script>
 
 <style scoped lang="scss">
-		.menu-box{
+	.wh-44 {
+		width: 44rpx;
+		height: 44rpx;
+	}
+
+	.menu-box {
+		height: 100%;
+
+		.menu-box-left {
+			width: 160rpx;
 			height: 100%;
-			
-			.menu-box-left{
-				width: 176rpx;
+			background-color: #F7F8FA;
+			// border-radius: 0rpx 20rpx 0 0rpx;
+
+			.menu-type-list-f {
+				width: 160rpx;
 				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-type-list {
+					width: 160rpx;
+					min-height: 108rpx;
+					padding: 32rpx 34rpx;
+					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%;
+		}
+
+		.menu-box-right {
+			flex: 1;
+			height: 100%;
+			box-sizing: border-box;
+			padding: 0 12rpx 0 16rpx;
+
+			.menu-list {
+				width: 100%;
+				height: 200rpx;
+				margin-bottom: 40rpx;
+
+				.info_img {
+					width: 200rpx;
 					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;
-						margin-right: 16rpx;
+						line-height: 44rpx;
 					}
-					.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;
-						}
+
+					.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>

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

@@ -5,7 +5,7 @@
 		<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)">
-				<image v-if="true" class="jlzj-box" src="@/static/img/buy/jlzj.png" mode=""></image>
+				<!-- <image v-if="true" class="jlzj-box" src="@/static/img/buy/jlzj.png" mode=""></image> -->
 
 				<view class="align-items-center mr-18">
 					<view class="list-item-s">
@@ -23,7 +23,7 @@
 				<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 class="fs-26 fc-9">距您你{{item.distance}}km</view> -->
 					</view>
 
 				</view>

pages-buy/ticket.vue

@@ -7,14 +7,16 @@
 				<template>
 					<view slot="custom" class="align-items-center">
 						<uni-icons type="left" size="20" @click="toBack()" color="#fff"></uni-icons>
-						<view class="w-390 text-overflow-ellipsis-one fs-36 fw-400 fc-f">票务</view>
+						<!-- <view class="w-390 text-overflow-ellipsis-one fs-36 fw-400 fc-f">票务</view> -->
+						<image class="pw-imgage" src="@/static/img/index/pw.png" mode=""></image>
 					</view>
 				</template>
 			</Nav>
 
 			<view class="box-border-box plr-24 mb-32">
-				<view class="head-search">
-					<uni-icons class="s-icon" type="search" size="19"></uni-icons>
+				<view class="head-search align-items-center">
+					<!-- <uni-icons class="s-icon" type="search" size="19"></uni-icons> -->
+					<image class="wh32" src="@/static/img/index/ss.png" mode=""></image>
 					<input v-model="search" type="text" placeholder="搜一搜带你玩周边">
 					<view class="head-search-buttom text-align-center fs-28 fw-500 fc-f" @click="searchFun()">搜索</view>
 				</view>
@@ -46,8 +48,8 @@
 					<view class="w-470 text-overflow-ellipsis fw-600 fs-32 mb-48">{{item.title}}</view>
 					<view class=" flex-justify-space align-items-flex-end">
 						<view class="">
-							<span class="fs-24 fw-400 fc-FB3D03">￥</span>
-							<span class="fw-b fs-40 fc-FB3D03">{{item.price}}</span>
+							<span class="fs-24 fw-600 fc-FB3D03">￥</span>
+							<span class="fw-b fs-40 fc-FB3D03 mr-4">{{item.price}}</span>
 							<span class="text-line-through fs-24 fc-9 fw-400">￥{{item.line_price}}</span>
 						</view>
 						<view class="to-box fs-28 fw-400 fc-f text-align-center">马上抢</view>
@@ -156,6 +158,17 @@
 	}
 </style>
 <style scoped lang="scss">
+	.pw-imgage{
+		width: 85rpx;
+		height: 45rpx;
+	}
+	.wh32 {
+		position: absolute;
+		left: 24rpx;
+		top: 20rpx;
+		width: 32rpx;
+		height: 32rpx;
+	}
 	.w-470 {
 		width: 470rpx;
 	}
@@ -185,7 +198,7 @@
 
 		.nav-box {
 			width: 100%;
-			height: 452rpx;
+			// height: 452rpx;
 			position: relative;
 
 			.head-bg {
@@ -193,7 +206,7 @@
 				top: 0;
 				left: 0;
 				width: 100%;
-				height: 452rpx;
+				height: 400rpx;
 				z-index: -1;
 			}
 
@@ -231,6 +244,7 @@
 
 			.nav-list {
 				overflow-x: scroll;
+				margin: 0 0 36rpx 0;
 
 				.nav-item {
 					width: 96rpx !important;

pages-my/ticket-centre.vue

@@ -4,17 +4,15 @@
 		<image class="lqzx-bg" src="@/static/img/my/lqzx-bg.png" mode=""></image>
 		<image @click="goToUrl" class="wdyhq" src="@/static/img/my/wdyhq.png" mode=""></image>
 		<view class="lqzx-blank"></view>
-		
-		<view v-if="itemData.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>
-		
-		<scroll-view v-else :scroll-y="true" class="scroll-view-css" @scrolltolower="scrolltolower">
-			<view class="liat-box ">
+		<scroll-view :scroll-y="true" class="scroll-view-css" @scrolltolower="scrolltolower">
+			<view v-if="itemData.length === 0" class="scroll-view-css liat-box">
+				<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 class="liat-box" v-else>
 				<view class="item-box display-flex mb-20" v-for="(item,index) in itemData" :key="index">
 					<view class="item-right flex-direction flex-justify-center flex-1 bgc-f">
 						<view class="fs-28 mb-12 ticket-name text-overflow-ellipsis fc-3 fw-600">
@@ -44,47 +42,57 @@
 </template>
 
 <script>
-	import {couponGrant,receiveCoupon} from '@/api/coupon.js';
+	import {
+		couponGrant,
+		receiveCoupon
+	} from '@/api/coupon.js';
 	import tools from "@/service/tools";
 	import EnBlank from "@/components/en-utils/en-blank/en-blank";
 	export default {
-		components: {EnBlank},
+		components: {
+			EnBlank
+		},
 		data() {
 			return {
 				itemData: [],
-				isAJAX:false,
+				isAJAX: false,
 			};
 		},
-		onShow(){
+		onShow() {
 			this.getList();
 		},
 		methods: {
-			getList(){
+			getList() {
 				let operate_id = uni.getStorageSync('operate_id');
-				couponGrant({operate_id:operate_id}).then((res)=>{
-					if(res.code === 1){
+				couponGrant({
+					operate_id: operate_id
+				}).then((res) => {
+					if (res.code === 1) {
 						this.itemData = res.data;
 					}
 				})
 			},
-			
+
 			goToUrl() {
 				uni.navigateTo({
-					url:'/pages-my/my-ticket'
+					url: '/pages-my/my-ticket'
 				})
 			},
 			scrolltolower() {},
 			receive(item) {
-				if(this.isAJAX){
+				if (this.isAJAX) {
 					return
 				}
 				this.isAJAX = true;
-				receiveCoupon({grant_id:item.grant_id,coupon_id:item.coupon_id}).then((res)=>{
-					if(res.code === 1){
+				receiveCoupon({
+					grant_id: item.grant_id,
+					coupon_id: item.coupon_id
+				}).then((res) => {
+					if (res.code === 1) {
 						this.isAJAX = false;
 						tools.success('领取成功');
 						this.getList();
-					}else{
+					} else {
 						this.isAJAX = false;
 						tools.success('领取失败');
 					}
@@ -158,7 +166,7 @@
 
 	.ball-two {
 		width: 24rpx;
-		height: 24rpx; 
+		height: 24rpx;
 		border-radius: 50%;
 		position: absolute;
 		background: #F5F5F5;

pages-takeout/shop-mod/evaluate.vue

@@ -17,8 +17,8 @@
 							<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="pj-num">
+							<view class="fs-24 mb-4 fc-9 fw-400">评价数量</view>
 							<view class="fs-32 fw-b">{{commentTotal}}</view>
 						</view>
 					</view>
@@ -201,6 +201,10 @@
 </script>
 
 <style scoped lang="scss">
+	.pj-num{
+		padding: 0 24rpx 0 52rpx;
+		border-left: 2rpx solid #F5F5F5;
+	}
 	.evaluate-box {
 		background-color: #F5F4F9;
 		padding: 16rpx 24rpx;

pages-takeout/shop-mod/info.vue

@@ -12,11 +12,11 @@
 			</view>
 			<view class="mb-40 align-items-center">
 				<image src="@/static/img/takeout/info-time.png" mode=""></image>
-				<view class="fs-28 fw-400">营业时间:{{shopInfoData.business_hours}}</view>
+				<view class="fs-28 fw-400">营业时间：{{timeData}}</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">联系电话: {{shopInfoData.shop_phone}} </view>
+				<view class="fs-28 fw-400">联系电话：{{shopInfoData.shop_phone}} </view>
 			</view>
 			<view class="right-img-f align-items-center">
 				<image src="@/static/img/takeout/info-zz.png" mode=""></image>
@@ -27,7 +27,7 @@
 
 		<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">
+			<view class="display-flex">
 				<image class="flex-shrink0" src="@/static/img/takeout/info-gg.png" mode=""></image>
 				<view class="fs-28 fw-400">{{shopInfoData.notice}}</view>
 			</view>
@@ -45,7 +45,9 @@
 		},
 		data() {
 			return {
-				shopInfoData: {}
+				shopInfoData: {},
+				timeData: '',
+				array: ''
 			}
 		},
 		onShow() {
@@ -62,9 +64,30 @@
 			},
 			shopInfo() {
 				const operate_id = uni.getStorageSync('operate_id')
-				shopInfo({shop_id: this.shopId,operate_id: operate_id}).then((res) => {
-					if(res.code == 1) {
+				shopInfo({
+					shop_id: this.shopId,
+					operate_id: operate_id
+				}).then((res) => {
+					if (res.code == 1) {
 						this.shopInfoData = res.data
+						res.data.business_hours.forEach((v, k) => {
+							// let time = 
+							v.forEach((i, j) => {
+								let time = ''
+								if (j == 0 || j == 3) {
+									time = i + '-'
+								} else {
+									time = i
+								}
+								this.array = this.array + time
+							})
+							if (res.data.business_hours.length === k + 1) {
+								this.timeData = this.timeData + this.array
+							} else {
+								this.timeData = this.timeData + this.array + ','
+							}
+							this.array = ''
+						})
 					}
 				})
 			}

pages-takeout/shop-mod/menu.vue

@@ -10,30 +10,31 @@
 				</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 categoryData" :key="i" :id="'scroll'+ item.type">
 					<view class="mb-32 fs-30">{{item.name}}</view>
 					<view class="menu-list flex-justify-space" v-for="(info,k) in item.list" :key="k">
-						<image class="flex-shrink0" :src="info.goods_image" mode="scaleToFill"></image>
+						<image class="flex-shrink0 goods_img" :src="info.goods_image" mode="scaleToFill"></image>
 						<view class="menu-list-right">
 							<view class="mb-4 goods-name text-overflow-ellipsis fs-34 fw-600">{{info.goods_name}}</view>
 							<view class="mb-20 fw-400 fc-9 fs-24">月销{{info.sales}}</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">{{info.seckill_money>0?info.seckill_money:info.price}}</span>
-									<span class="fs-24 fc-9 fw-400 text-line-through">￥{{info.line_price}}</span>
+									<span
+										class="fs-40 fw-b fc-FB3D03">{{info.seckill_money>0?info.seckill_money:info.price}}</span>
+									<view class="">
+										<span class="fs-24 fc-9 fw-400 text-line-through">￥{{info.line_price}}</span>
+									</view>
 								</view>
 								<view class="display-flex align-items-center" v-if="info.spec_type == 1">
-									<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,info)">-</view>
+									<image v-show="info.num > 0" class="wh-44" @click="addred(1,i,k,info)"
+										src="@/static/img/takeout/j.png" mode=""></image>
 									<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,info)">+</view>
+									<image class="wh-44" src="@/static/img/takeout/add.png" @click="addred(2,i,k,info)"
+										mode=""></image>
 								</view>
 								<view v-else class="right-only-right text-align-center fw-600 fs-28 fc-f"
 									@click="addred(3,i,k,info)">选规格</view>
@@ -43,9 +44,6 @@
 				</view>
 			</view>
 		</scroll-view>
-
-
-
 		<uni-popup ref="popupGG" type="bottom">
 			<view class="gg-box  flex-index-css">
 				<view class="flex-justify-space  box-border-box p-32">
@@ -55,27 +53,27 @@
 					</view>
 				</view>
 				<view class="goods-info flex-justify-space mb-32 box-border-box plr-32">
-					<image v-if="popData.goodsItem.goods_image" :src="popData.goodsItem.goods_image" mode="scaleToFill"></image>
+					<image v-if="popData.goodsItem.goods_image" :src="popData.goodsItem.goods_image" mode="scaleToFill">
+					</image>
 					<view class="flex-1">
-						<view style="width: 446rpx;" class="fw-600 fs-34 text-overflow-ellipsis-one">{{popData.goodsItem.goods_name}}
+						<view style="width: 446rpx;" class="fw-600 fs-34 text-overflow-ellipsis-one">
+							{{popData.goodsItem.goods_name}}
 						</view>
 						<view class="fw-400 fc-9 fs-24">月销{{popData.goodsItem.sales}}</view>
 					</view>
 				</view>
-
 				<view class="scroll-view-css box-border-box plr-32">
 					<view class="" v-for="(item,i) in popData.spec_attr" :key="i">
 						<view class="fs-32 fw-500 fc-0 mb-32">{{item.group_name}}</view>
 						<view class="flex-wrap-wrap">
-							<view class="spec-item text-align-center fs-28" :class="popData.spec_ids.indexOf(info.item_id)>=0?'s-item':'n-item'"
+							<view class="spec-item text-align-center fs-28"
+								:class="popData.spec_ids.indexOf(info.item_id)>=0?'s-item':'n-item'"
 								v-for="(info,k) in item.spec_items" :key="k" @click="selectSpec(info,i)">
 								{{info.spec_value}}
 							</view>
 						</view>
-
 					</view>
 				</view>
-
 				<view class="pop-buttom box-border-box plr-32">
 					<view class="flex-justify-space mb-28">
 						<view class="pop-buttom-left">
@@ -89,9 +87,11 @@
 							</view>
 						</view>
 						<view class="display-flex align-items-center">
-							<view class="right-only-right-red fw-500 text-align-center fs-36 fc-f" @click.stop="setSpecNum(1)">-</view>
+							<image class="wh-44" @click.stop="setSpecNum(1)" src="@/static/img/takeout/j.png" mode="">
+							</image>
 							<view class="right-only-right-2 text-align-center fs-28 fw-400">{{popData.num}}</view>
-							<view class="right-only-right-add fw-500 text-align-center fs-36 fc-f" @click.stop="setSpecNum(2)">+</view>
+							<image class="wh-44" src="@/static/img/takeout/add.png" @click.stop="setSpecNum(2)" mode="">
+							</image>
 						</view>
 					</view>
 					<view class="pop-buttom-2  text-align-center fs-32 fw-600 fc-f" @click="addred(4)">选好了</view>
@@ -103,199 +103,209 @@
 
 <script>
 	import tools from "@/service/tools";
-  import {shopCategory, shopGoods, shopGoodsSpec} from "@/api/shop";
-  import {getShopIngList, setShopIngAdd, setShopIngDel, setShopIngNumber} from "@/api/shopping";
+	import {
+		shopCategory,
+		shopGoods,
+		shopGoodsSpec
+	} from "@/api/shop";
+	import {
+		getShopIngList,
+		setShopIngAdd,
+		setShopIngDel,
+		setShopIngNumber
+	} from "@/api/shopping";
 	export default {
 		name: 'menu-box',
-    props:{
-      'shop_id':{
-        default:0
-      }
-    },
+		props: {
+			'shop_id': {
+				default: 0
+			}
+		},
 		data() {
 			return {
 				idMark: '', //滚动自适应参数
-
 				type: 1, //分类标识
 				typeList: [],
-        categoryData: [],
-
+				categoryData: [],
 				menuList: [],
 				cartData: {
-          total_price:0,
-          total_num:0,
-          total_goods_money:0,
-          pack_price:0,
-          must_category:0,
-          is_place_order:0,
-          err_msg:0,
-          goods_list:[],
-        },
-        isAjax:false,
-        operate_id: '',
-
+					total_price: 0,
+					total_num: 0,
+					total_goods_money: 0,
+					pack_price: 0,
+					must_category: 0,
+					is_place_order: 0,
+					err_msg: 0,
+					goods_list: [],
+				},
+				isAjax: false,
+				operate_id: '',
 				popData: {
 					goodsItem: {},
-          price: '0.00',
-          line_price: '',
-          num: 0,
+					price: '0.00',
+					line_price: '',
+					num: 0,
 					goods_id: '',
-          spec_key: '',
-          goods_spec_id: '',
+					spec_key: '',
+					goods_spec_id: '',
 					spec_name: [],
 					spec_ids: [],
-          spec_list: [],
-          spec_attr: [],
-
+					spec_list: [],
+					spec_attr: [],
 				},
 			}
 		},
-    watch:{
-      'shop_id':function () {
-        this.getShopGoods();
-      }
-    },
+		watch: {
+			'shop_id': function() {
+				this.getShopGoods();
+			}
+		},
 		mounted() {
-      this.operate_id = uni.getStorageSync('operate_id')
+			this.operate_id = uni.getStorageSync('operate_id')
 			this.getShopGoods();
 			this.getShopIngList(true);
 
 		},
 		methods: {
-      setSpecNum(type){
-        console.log(this.popData.goods_spec_id)
-        if(!this.popData.goods_spec_id){
-          tools.error('请选择规格')
-          return;
-        }
-        if(this.isAjax){
-          return
-        }
-        this.isAjax=true
-        if (type === 1) {
-          // 减
-          if(this.popData.num>0){
-            --this.popData.num;
-          }else {
-            this.isAjax=false
-            return
-          }
-        } else {
-          // 加
-          ++this.popData.num;
-        }
-        let cartKey=this.cartData.goods_list.findIndex(row=>this.popData.goods_spec_id===row.goods_spec_id)
-        console.log(cartKey)
-        console.log(type===2 && cartKey<0)
-        if(type===2 && cartKey<0){
-          this.setShopIngAdd(this.popData.goods_id,this.popData.goodsItem.category_id,this.popData.goods_spec_id)
-        }else {
-          this.setShopIngNumber(this.popData.goods_id,this.popData.goodsItem.category_id,type,this.popData.goods_spec_id)
-        }
-      },
-      getShopGoodsSpec(item){
-        shopGoodsSpec({
-          'goods_id':item.goods_id
-        }).then(res=>{
-          this.popData.goodsItem=item
-          if(this.popData.goods_id!==item.goods_id){
-            this.popData.goods_id=item.goods_id
-            this.popData.spec_name=[]
-            this.popData.price='0.00'
-            this.popData.line_price=''
-            this.popData.spec_key=''
-            this.popData.num=0
-            this.popData.spec_ids=[]
-          }
-          this.popData.spec_list=res.data.spec_list
-          this.popData.spec_attr=res.data.spec_attr
-          this.$refs.popupGG.open();
-          this.setGoodsSpecPrice()
-          this.isAjax=false
-        }).catch(()=>{
-          tools.error('规格信息异常')
-          this.isAjax=false
-        })
-      },
-      setGoodsSpecPrice(){
-        if(this.popData.spec_ids.length>0){
-          let spec_ids=JSON.parse(JSON.stringify(this.popData.spec_ids))
-          spec_ids.sort((a, b) => a - b);
-          let spec_key=spec_ids.join('_')
-          this.popData.spec_key=spec_key
-          console.log(this.popData.spec_list[spec_key])
-          if(this.popData.spec_list[spec_key]!==undefined){
-            this.popData.price=this.popData.spec_list[spec_key].seckill_money>0?this.popData.spec_list[spec_key].seckill_money:this.popData.spec_list[spec_key].price
-            this.popData.line_price=this.popData.spec_list[spec_key].line_price
-            this.popData.goods_spec_id=this.popData.spec_list[spec_key].goods_spec_id+''
-            let cartKey=this.cartData.goods_list.findIndex(row=>this.popData.goods_spec_id===row.goods_spec_id)
-            if(cartKey>=0){
-              this.popData.num=this.cartData.goods_list[cartKey].goods_number
-            }
-          }
-        }
-      },
-      setShopIngList(cartData){
-        this.cartData=cartData
-        this.setGoodsNum()
-      },
-      getShopIngList(isStart){
-        getShopIngList({
-          'shop_id':this.shop_id,
-        }).then(res=>{
-          if(res.code===1){
-            this.cartData=res.data
-            this.$emit('setCartData',this.cartData)
-           if(isStart) this.setGoodsNum()
-          }
-        })
-      },
-      setGoodsNum(){
-        if(this.cartData.goods_list.length>0){
-          this.cartData.goods_list.forEach(item=>{
-            this.categoryData.forEach(categoryItem=>{
-              if(categoryItem.type===item.category_id){
-                categoryItem.list.forEach(goodsItem=>{
-                  console.log(item.goods_id,goodsItem.goods_id)
-                  if(item.goods_id===goodsItem.goods_id){
-                    goodsItem.num=item.goods_number*1
-                  }
-                })
-              }
-
-            })
-          })
-        }else {
-          //购物车数据清除
-          this.categoryData.forEach(categoryItem=>{
-            categoryItem.list.forEach(goodsItem=>{
-              goodsItem.num=0
-            })
-          })
-        }
-      },
-      getShopGoods(){
-          if(this.shop_id<0 || !this.operate_id){
-            return;
-          }
-        shopGoods({'shop_id':this.shop_id,	operate_id: this.operate_id,}).then(res=>{
-          if(res.code===1){
-            this.categoryData=res.data
-            if(this.categoryData.length>0){
-              this.selectType(this.categoryData[0])
-            }
-            this.categoryData.forEach(categoryItem=>{
-              categoryItem.list.forEach(goodsItem=>{
-                goodsItem.payNum=0
-                goodsItem.spec=[]
-              })
-            })
-            // console.log(res)
-          }
-        })
-      },
-
-
+			setSpecNum(type) {
+				console.log(this.popData.goods_spec_id)
+				if (!this.popData.goods_spec_id) {
+					tools.error('请选择规格')
+					return;
+				}
+				if (this.isAjax) {
+					return
+				}
+				this.isAjax = true
+				if (type === 1) {
+					// 减
+					if (this.popData.num > 0) {
+						--this.popData.num;
+					} else {
+						this.isAjax = false
+						return
+					}
+				} else {
+					// 加
+					++this.popData.num;
+				}
+				let cartKey = this.cartData.goods_list.findIndex(row => this.popData.goods_spec_id === row.goods_spec_id)
+				console.log(cartKey)
+				console.log(type === 2 && cartKey < 0)
+				if (type === 2 && cartKey < 0) {
+					this.setShopIngAdd(this.popData.goods_id, this.popData.goodsItem.category_id, this.popData
+						.goods_spec_id)
+				} else {
+					this.setShopIngNumber(this.popData.goods_id, this.popData.goodsItem.category_id, type, this.popData
+						.goods_spec_id)
+				}
+			},
+			getShopGoodsSpec(item) {
+				shopGoodsSpec({
+					'goods_id': item.goods_id
+				}).then(res => {
+					this.popData.goodsItem = item
+					if (this.popData.goods_id !== item.goods_id) {
+						this.popData.goods_id = item.goods_id
+						this.popData.spec_name = []
+						this.popData.price = '0.00'
+						this.popData.line_price = ''
+						this.popData.spec_key = ''
+						this.popData.num = 0
+						this.popData.spec_ids = []
+					}
+					this.popData.spec_list = res.data.spec_list
+					this.popData.spec_attr = res.data.spec_attr
+					this.$refs.popupGG.open();
+					this.setGoodsSpecPrice()
+					this.isAjax = false
+				}).catch(() => {
+					tools.error('规格信息异常')
+					this.isAjax = false
+				})
+			},
+			setGoodsSpecPrice() {
+				if (this.popData.spec_ids.length > 0) {
+					let spec_ids = JSON.parse(JSON.stringify(this.popData.spec_ids))
+					spec_ids.sort((a, b) => a - b);
+					let spec_key = spec_ids.join('_')
+					this.popData.spec_key = spec_key
+					console.log(this.popData.spec_list[spec_key])
+					if (this.popData.spec_list[spec_key] !== undefined) {
+						this.popData.price = this.popData.spec_list[spec_key].seckill_money > 0 ? this.popData.spec_list[
+							spec_key].seckill_money : this.popData.spec_list[spec_key].price
+						this.popData.line_price = this.popData.spec_list[spec_key].line_price
+						this.popData.goods_spec_id = this.popData.spec_list[spec_key].goods_spec_id + ''
+						let cartKey = this.cartData.goods_list.findIndex(row => this.popData.goods_spec_id === row
+							.goods_spec_id)
+						if (cartKey >= 0) {
+							this.popData.num = this.cartData.goods_list[cartKey].goods_number
+						}
+					}
+				}
+			},
+			setShopIngList(cartData) {
+				this.cartData = cartData
+				this.setGoodsNum()
+			},
+			getShopIngList(isStart) {
+				getShopIngList({
+					'shop_id': this.shop_id,
+				}).then(res => {
+					if (res.code === 1) {
+						this.cartData = res.data
+						this.$emit('setCartData', this.cartData)
+						if (isStart) this.setGoodsNum()
+					}
+				})
+			},
+			setGoodsNum() {
+				if (this.cartData.goods_list.length > 0) {
+					this.cartData.goods_list.forEach(item => {
+						this.categoryData.forEach(categoryItem => {
+							if (categoryItem.type === item.category_id) {
+								categoryItem.list.forEach(goodsItem => {
+									console.log(item.goods_id, goodsItem.goods_id)
+									if (item.goods_id === goodsItem.goods_id) {
+										goodsItem.num = item.goods_number * 1
+									}
+								})
+							}
+
+						})
+					})
+				} else {
+					//购物车数据清除
+					this.categoryData.forEach(categoryItem => {
+						categoryItem.list.forEach(goodsItem => {
+							goodsItem.num = 0
+						})
+					})
+				}
+			},
+			getShopGoods() {
+				if (this.shop_id < 0 || !this.operate_id) {
+					return;
+				}
+				shopGoods({
+					'shop_id': this.shop_id,
+					operate_id: this.operate_id,
+				}).then(res => {
+					if (res.code === 1) {
+						this.categoryData = res.data
+						if (this.categoryData.length > 0) {
+							this.selectType(this.categoryData[0])
+						}
+						this.categoryData.forEach(categoryItem => {
+							categoryItem.list.forEach(goodsItem => {
+								goodsItem.payNum = 0
+								goodsItem.spec = []
+							})
+						})
+						// console.log(res)
+					}
+				})
+			},
 			selectType(item) {
 				if (this.type != item.type) {
 					this.type = item.type;
@@ -316,112 +326,108 @@
 				}).exec();
 			},
 			addred(type, i, k, item) {
-        if(this.isAjax){
-          return
-        }
-        this.isAjax=true
+				if (this.isAjax) {
+					return
+				}
+				this.isAjax = true
 				if (type === 1) {
 					// 减
-          if(item.num>0){
-            --item.num;
-            this.setSub(item,type);
-          }else {
-            this.isAjax=false
-          }
-
+					if (item.num > 0) {
+						--item.num;
+						this.setSub(item, type);
+					} else {
+						this.isAjax = false
+					}
 				} else if (type === 2) {
 					// 加
-          if(item.is_infinite===1 || item.stock>item.num){
-            ++item.num;
-            this.setSub(item,type);
-          }else {
-            this.isAjax=false
-          }
+					if (item.is_infinite === 1 || item.stock > item.num) {
+						++item.num;
+						this.setSub(item, type);
+					} else {
+						this.isAjax = false
+					}
 					// this.menuList[i].list[k].num += 1;
 					// this.setSub(item);
 				} else if (type === 3) {
 					// 选规格
-          this.getShopGoodsSpec(item)
+					this.getShopGoodsSpec(item)
 				} else {
 					this.$refs.popupGG.close();
-          this.isAjax=false
+					this.isAjax = false
 				}
 			},
-
-
-			setSub(item,type) {
-        let cartKey=this.cartData.goods_list.findIndex(row=>row.goods_id===item.goods_id)
-        if(type===2 && cartKey<0){
-          this.setShopIngAdd(item.goods_id,item.category_id,'')
-        }else {
-          this.setShopIngNumber(item.goods_id,item.category_id,type,'')
-        }
-
+			setSub(item, type) {
+				let cartKey = this.cartData.goods_list.findIndex(row => row.goods_id === item.goods_id)
+				if (type === 2 && cartKey < 0) {
+					this.setShopIngAdd(item.goods_id, item.category_id, '')
+				} else {
+					this.setShopIngNumber(item.goods_id, item.category_id, type, '')
+				}
+			},
+			setShopIngAdd(goodsId, categoryId, goodsSpecId) {
+				setShopIngAdd({
+					'type': 1,
+					'goods_id': goodsId,
+					'shop_id': this.shop_id,
+					'category_id': categoryId,
+					'goods_spec_id': goodsSpecId,
+				}).then(res => {
+					this.isAjax = false
+					this.getShopIngList()
+				}).catch(() => {
+					this.isAjax = false
+				})
+			},
+			setShopIngNumber(goodsId, categoryId, operation, goodsSpecId) {
+				setShopIngNumber({
+					'type': 1,
+					'goods_id': goodsId,
+					'shop_id': this.shop_id,
+					'category_id': categoryId,
+					'goods_spec_id': goodsSpecId,
+					'operation': operation === 2 ? 1 : 2,
+				}).then(res => {
+					this.isAjax = false
+					this.getShopIngList()
+				}).catch(() => {
+					this.isAjax = false
+				})
 			},
-      setShopIngAdd(goodsId,categoryId,goodsSpecId){
-        setShopIngAdd({
-          'type':1,
-          'goods_id':goodsId,
-          'shop_id':this.shop_id,
-          'category_id':categoryId,
-          'goods_spec_id':goodsSpecId,
-        }).then(res=>{
-          this.isAjax=false
-          this.getShopIngList()
-        }).catch(()=>{
-          this.isAjax=false
-        })
-      },
-      setShopIngNumber(goodsId,categoryId,operation,goodsSpecId){
-        setShopIngNumber({
-          'type':1,
-          'goods_id':goodsId,
-          'shop_id':this.shop_id,
-          'category_id':categoryId,
-          'goods_spec_id':goodsSpecId,
-          'operation':operation===2?1:2,
-        }).then(res=>{
-          this.isAjax=false
-          this.getShopIngList()
-        }).catch(()=>{
-          this.isAjax=false
-        })
-      },
-
-      setShopIngDel(){
-
-      },
 
+			setShopIngDel() {},
 			// -------弹窗选择规格-----------
-			selectSpec( info,groupKey) {
-          let  specKey=this.popData.spec_ids.indexOf(info.item_id)
-        if(specKey>=0){
-          this.popData.spec_ids.splice(specKey,1)
-          this.popData.spec_name.splice(specKey,1)
-        }else {
-          this.popData.spec_ids.push(info.item_id)
-          this.popData.spec_name.push(info.spec_value)
-          for (const attrKey in this.popData.spec_attr[groupKey].spec_items) {
-            if(this.popData.spec_attr[groupKey].spec_items[attrKey].item_id!==info.item_id){
-              let  oldKey=this.popData.spec_ids.indexOf(this.popData.spec_attr[groupKey].spec_items[attrKey].item_id)
-              if(oldKey>=0){
-                this.popData.spec_ids.splice(oldKey,1)
-                this.popData.spec_name.splice(oldKey,1)
-              }
-            }
-
-          }
-
-        }
+			selectSpec(info, groupKey) {
+				let specKey = this.popData.spec_ids.indexOf(info.item_id)
+				if (specKey >= 0) {
+					this.popData.spec_ids.splice(specKey, 1)
+					this.popData.spec_name.splice(specKey, 1)
+				} else {
+					this.popData.spec_ids.push(info.item_id)
+					this.popData.spec_name.push(info.spec_value)
+					for (const attrKey in this.popData.spec_attr[groupKey].spec_items) {
+						if (this.popData.spec_attr[groupKey].spec_items[attrKey].item_id !== info.item_id) {
+							let oldKey = this.popData.spec_ids.indexOf(this.popData.spec_attr[groupKey].spec_items[attrKey]
+								.item_id)
+							if (oldKey >= 0) {
+								this.popData.spec_ids.splice(oldKey, 1)
+								this.popData.spec_name.splice(oldKey, 1)
+							}
+						}
+					}
+				}
 				// this.spec_ids = this.popData.spec_list.join('_')
-        this.setGoodsSpecPrice()
-
+				this.setGoodsSpecPrice()
 			},
 		},
 	}
 </script>
 
 <style scoped lang="scss">
+	.wh-44 {
+		width: 44rpx;
+		height: 44rpx;
+	}
+
 	.menu-box {
 		height: 100%;
 
@@ -461,7 +467,7 @@
 			// flex: 1;
 			width: 100%;
 			height: 100%;
-			padding: 16rpx;
+			padding: 16rpx 12rpx 16rpx 16rpx;
 			box-sizing: border-box;
 
 			.menu-list {
@@ -469,7 +475,7 @@
 				// height: 200rpx;
 				margin-bottom: 40rpx;
 
-				image {
+				.goods_img {
 					width: 200rpx;
 					height: 200rpx;
 					border-radius: 12rpx;
@@ -593,7 +599,8 @@
 			}
 		}
 	}
-	.goods-name{
+
+	.goods-name {
 		max-width: 310rpx;
 	}
 </style>

pages-takeout/shop.vue

@@ -12,7 +12,6 @@
 				</template>
 			</Nav>
 		</view>
-
 		<view class="head-box bgc-f box-border-box plr-24" :style="{height:domHeigjt + 'rpx'}">
 			<view id="shopInfoBox" class="shop-info-box bgc-f box-border-box p-24">
 				<view class="info-box-top flex-justify-space mb-10">
@@ -20,7 +19,7 @@
 						<view class="top-left-1 fs-40 fw-600 text-overflow-ellipsis-one">{{shopsInfo.shop_name}}
 						</view>
 						<view class="align-items-center mb-8">
-							<image class="img-x mr-12" src="@/static/img/my/wdpj.png" mode=""></image>
+							<image class="img-x mr-12" src="@/static/img/index/index-x.png" mode=""></image>
 							<view class="fs-26 fw-600 fc-FF7F00 mr-12">{{shopsInfo.shop_score}}分</view>
 							<view class="fc-6 fs-24 mr-12">| 预计{{shopsInfo.delivery_time}}分钟 |</view>
 							<view class="fc-6 fs-24 mr-12">{{shopsInfo.shop_sales}}人购买</view>
@@ -44,7 +43,6 @@
 				</view>
 			</view>
 		</view>
-
 		<view class="head-box-1 bgc-f box-border-box plr-24">
 			<view class="align-items-center shop-type-list">
 				<view class="shop-item fs-36" @click="seletShopType(item)"
@@ -55,8 +53,6 @@
 				<view class="shop-item-bs" :style="{left:shopTypeBsLeft+'rpx'}"></view>
 			</view>
 		</view>
-
-
 		<view class="common-view-css bgc-f" style="overflow: hidden;">
 			<Menu style="height: 100%;" v-if="shopType === 1" :shop_id="shop_id" @setCartData="setCartData"
 				ref="goodsMenu"></Menu>
@@ -64,8 +60,7 @@
 				v-else-if="shopType === 2"></Evaluate>
 			<ShopInfo style="height: 100%;" :shopId='shop_id' v-else-if="shopType === 3"></ShopInfo>
 		</view>
-
-		<view class="shop-buttom-money box-border-box" @click="openBuyCrad()">
+		<view v-if="shopType === 1" 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">{{cartData.total_num}}</view>
@@ -75,13 +70,13 @@
 						<span class="fw-600 fs-44 fc-f">{{cartData.total_price}}</span>
 					</view>
 					<view class="fs-24 fc-ADADAD" v-if="delivery_money<=0">免配送</view>
-					<view class="fs-24 fc-ff3939" v-else>配送费￥{{delivery_money}}</view>
+					<view class="fs-24 fc-f" v-else>配送费￥{{delivery_money}}</view>
 				</view>
 				<view class="fs-32 fw-600 fc-f mr-30" v-else>{{cartData.err_msg}}</view>
-				<view class="shop-buttom-money-2 text-align-center fc-f fs-32 fw-600" @click.stop="toConfirmOrder()">去结算</view>
+				<view class="shop-buttom-money-2 text-align-center fc-f fs-32 fw-600" @click.stop="toConfirmOrder()">去结算
+				</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">
@@ -99,33 +94,32 @@
 				</view>
 				<view class="scroll-view-css box-border-box p-32">
 					<view class="buy-card-item display-flex" v-for="(goods,i) in cartData.goods_list" :key="i">
-						<image :src="goods.goods_image" mode="scaleToFill"></image>
+						<image class="goods_img" :src="goods.goods_image" mode="scaleToFill"></image>
 						<view class="flex-1">
 							<view class="w-514 text-overflow-ellipsis-one fs-34 fw-600 mb-12">
 								{{goods.goods_name}}
 							</view>
 							<view class="w-514 text-overflow-ellipsis-one fs-24 fw-400 fc-9 mb-18">{{goods.goods_attr}}
 							</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">{{goods.price}}</span>
 								</view>
 								<view class="display-flex align-items-center">
-									<view class="right-only-right-red fw-500 text-align-center fs-36 fc-f"
-										@click.stop="setShopIngNumber(goods,2)">-</view>
+									<image class="wh-44" @click.stop="setShopIngNumber(goods,2)"
+										src="@/static/img/takeout/j.png" mode=""></image>
 									<view class="right-only-right-2 text-align-center fs-28 fw-400">
-										{{goods.goods_number}}</view>
-									<view class="right-only-right-add fw-500 text-align-center fs-36 fc-f"
-										@click.stop="setShopIngNumber(goods,1)">+</view>
+										{{goods.goods_number}}
+									</view>
+									<image class="wh-44" src="@/static/img/takeout/add.png"
+										@click.stop="setShopIngNumber(goods,1)" mode=""></image>
 								</view>
 							</view>
 						</view>
 					</view>
 					<en-blank v-if="cartData.goods_list.length<=0" message="快去选购商品吧！~"></en-blank>
 				</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>
@@ -136,7 +130,7 @@
 								<span class="fw-600 fs-44 fc-f">{{cartData.total_price}}</span>
 							</view>
 							<view class="fs-24 fc-ADADAD" v-if="delivery_money<=0">免配送</view>
-							<view class="fs-24 fc-ff3939" v-else>配送费￥{{delivery_money}}</view>
+							<view class="fs-24 fc-f" v-else>配送费￥{{delivery_money}}</view>
 						</view>
 						<view class="fs-32 fw-600 fc-f mr-30" v-else>{{cartData.err_msg}}</view>
 						<view class="shop-buttom-money-2 text-align-center fs-32 fc-f fw-600">
@@ -145,7 +139,6 @@
 				</view>
 			</view>
 		</uni-popup>
-
 		<uni-popup ref="popupCoupon" type="bottom">
 			<view class="pop-coupon box-border-box p-24">
 				<view class="text-align-center fs-36 fw-600 box-title mb-32">
@@ -197,7 +190,6 @@
 	import Evaluate from './shop-mod/evaluate.vue';
 	import ShopInfo from './shop-mod/info.vue';
 	import tools from "@/service/tools";
-
 	import EnBlank from "@/components/en-utils/en-blank/en-blank";
 	import {
 		receiveCoupon
@@ -378,10 +370,7 @@
 			openBuyCrad() {
 				this.$refs.popupBuy.open()
 			},
-			createOrder() {
-
-			},
-
+			createOrder() {},
 			openCoupon() {
 				this.$refs.popupCoupon.open()
 			},
@@ -428,6 +417,11 @@
 </script>
 
 <style scoped lang="scss">
+	.wh-44 {
+		width: 44rpx;
+		height: 44rpx;
+	}
+
 	.blank-text {
 		line-height: 32vh;
 	}
@@ -739,7 +733,7 @@
 				height: 176rpx;
 				margin-bottom: 32rpx;
 
-				image {
+				.goods_img {
 					width: 152rpx;
 					height: 152rpx;
 					border-radius: 12rpx;

pages.json

@@ -420,7 +420,7 @@
 		},
 			{
 				"name": "店铺详情",
-				"path": "pages-school/school-circle",
+				"path": "pages-buy/ticket",
 				"query": "shop_id=1"
 			}
 		]

pages/index/index.vue

@@ -279,24 +279,24 @@
 		},
 
 		onShow() {
-			let lon = uni.getStorageSync('lon');
-			let lat = uni.getStorageSync('lat');
-			if (!lon || !lat) {
-				uni.getLocation({
-					type: "gcj02",
-					success: (res) => {
-						if (res.errMsg === 'getLocation:ok') {
-							uni.setStorageSync('lon', res.longitude);
-							uni.setStorageSync('lat', res.latitude);
-						} else {
-							tools.error('位置授权失败，请检查是否开始授权')
-						}
-					},
-					fail: (res) => {
-						tools.error('位置授权失败，请检查是否开始授权')
-					},
-				})
-			}
+			// let lon = uni.getStorageSync('lon');
+			// let lat = uni.getStorageSync('lat');
+			// if (!lon || !lat) {
+			// 	uni.getLocation({
+			// 		type: "gcj02",
+			// 		success: (res) => {
+			// 			if (res.errMsg === 'getLocation:ok') {
+			// 				uni.setStorageSync('lon', res.longitude);
+			// 				uni.setStorageSync('lat', res.latitude);
+			// 			} else {
+			// 				tools.error('位置授权失败，请检查是否开始授权')
+			// 			}
+			// 		},
+			// 		fail: (res) => {
+			// 			tools.error('位置授权失败，请检查是否开始授权')
+			// 		},
+			// 	})
+			// }
 
 			let school_id = uni.getStorageSync('school_id');
 			let operate_id = uni.getStorageSync('operate_id');