no message

my/coupon/index.vue

@@ -114,7 +114,7 @@ export default {
 				})
 			} else {
 				uni.navigateTo({
-					url: '/pages/index/shop/index?shopId=' + item.shopId
+					url: '/pages/index/shop/index?shopId=' + item.shopId + '&shopTypeId=' + item.shopTypeId
 				})
 			}
 		}

my/myPingJia/myPingJia.vue

@@ -1,338 +1,332 @@
-<template>
-	<view style="padding-bottom: 20rpx;">
-		<view class="padding-tb-sm margin-lr u-border-bottom" v-for="(item, index) in EvaluateList" :key='index'>
-			<view class="flex justify-between align-center" @click="gotoShop(item.shopId)">
-				<view class="flex align-center">
-					<u-avatar :src="item.shopCover" size="65"></u-avatar>
-					<view class=" margin-left-sm" style="line-height: 46upx;">{{item.shopName?item.shopName:'匿名'}}
-					</view>
-					<view class="flex margin-left-sm">
-						<u-icon v-for="ite in item.score" :key='ite' color="#FCD202" name="star-fill">
-						</u-icon>
-					</view>
-				</view>
-				<view>{{item.createTime}}</view>
-			</view>
-			<view style="display: flex;">
-				<view class="margin-top-sm" :style="!item.shopReplyMessage ? 'width: 90%;' : ''">{{item.evaluateMessage}}</view>
-				<view class="flex padding-top-sm margin-right" @tap="goShow(index)" v-if="!item.shopReplyMessage">
-					<!-- <image src="../../static/images/order/pinglun.png" style="width: 20px;height: 20px;"></image> -->
-				</view>
-			</view>
-			<view class="margin-top-sm" v-if="item.shopReplyMessage">
-				<view class="flex align-center">
-					<view class=" flex align-center text-df" style="color: #999999;">
-						<view class="text-df">商家回复:</view>{{item.shopReplyMessage}}
-					</view>
-				</view>
-				<!-- <view class="text-lg padding-left margin-left-xl">{{dataDet.shopReplyMessage}}</view> -->
-			</view>
-			<view class="flex" style="width: 100%;margin-top: 20rpx;flex-wrap: wrap;" v-if="item.pictures">
-				<image @click="lookImgs(ind,item.pictures)" :src="ite" v-for="(ite,ind) in item.pictures" :key="ind" style="width: 200rpx;height: 200rpx;margin-right: 10rpx;margin-bottom: 10rpx;" mode=""></image>
-			</view>
-			<view class="flex justify-end" style="width: 100%;color: #999999;" @click="deletePj(item)">
-				删除
-			</view>
-		</view>
-		<empty v-if="EvaluateList.length<=0"></empty>
-	</view>
-</template>
-
-<script>
-	import empty from '../../components/empty.vue'
-	export default {
-		components:{
-			empty
-		},
-		data() {
-			return {
-				pinglun: '',
-				count: 0,
-				show: false,
-				customStyle: {
-					color: '#333333',
-					background: '#FCD202',
-					marginRight: '20rpx',
-					border: 0
-				},
-				customStyle1: {
-					color: '#333333',
-					background: '#F2F2F2',
-					marginRight: '20rpx',
-					border: 0
-				},
-				cashDeposit: [],
-				EvaluateData: {},
-				EvaluateList: [],
-				grade: '',
-				page: 1,
-				size: 10,
-				isShow: false,
-				oneData: [],
-				titleData: [],
-				shopDet: {}
-			}
-		},
-		onShow() {
-			this.getList()
-		},
-		onPullDownRefresh() {
-			this.page = 1
-			this.getList()
-		},
-		onReachBottom: function() {
-			this.page = this.page + 1;
-			this.getList()
-		},
-		methods: {
-			deletepjrequest(id){
-				let data = {
-					id:id
-				}
-				this.$Request.getT("/app/order/deleteEvaluateById", data).then(res => {
-					uni.hideLoading()
-					if (res.code == 0) {
-						uni.showToast({
-							title:'删除成功'
-						})
-						this.page = 1
-						this.getList()
-					}else{
-						uni.showToast({
-							title:res.msg,
-							icon:'none'
-						})
-					}
-				});
-			},
-			//删除评价
-			deletePj(item){
-				let that = this
-				uni.showModal({
-					title:'提示',
-					content:'确定删除此评价?',
-					complete(ret) {
-						if(ret.confirm){
-							//删除评价的接口
-							that.deletepjrequest(item.id)
-						}
-					}
-				})
-			},
-			//去商铺
-			gotoShop(shopId){
-				uni.navigateTo({
-					url:'/pages/index/shop/index?shopId='+shopId
-				})
-			},
-			//预览图片
-			lookImgs(index,imgs){
-				uni.previewImage({
-					current:index,
-					urls:imgs
-				})
-			},
-			goShow(index){
-				this.orderNumber = this.EvaluateList[index].orderNumber;
-				this.show = true;
-			},
-			sel(e) {
-				this.grade = e
-				this.count = e
-				this.page = 1
-				this.getList()
-			},
-			open(data) {
-				console.log(data);
-				this.oneData = data;
-				this.titleData = data.goods
-				this.isShow = true;
-			},
-			close() {
-				this.isShow = false;
-			},
-			// 获取评价列表
-			getList() {
-				let data = {
-					page: this.page,
-					limit: this.size,
-				}
-				this.$Request.getT("/app/order/getEvaluateList", data).then(res => {
-					if (res.code == 0 && res.data) {
-						// this.EvaluateData = res.data
-						res.data.records.map(item=>{
-							if(item.pictures){
-								item.pictures = item.pictures.split(',')
-							}else{
-								item.pictures = []
-							}
-						})
-						if (this.page == 1) {
-							this.EvaluateList = res.data.records
-						} else {
-							this.EvaluateList = [...this.EvaluateList, ...res.data.records]
-						}
-					}
-				});
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	page {
-		background-color: #FFFFFF;
-	}
-
-	.box1 {
-		position: absolute;
-		background: #000000;
-		width: 750rpx;
-		height: 100vh;
-		opacity: 0.4;
-	}
-
-	.moudes {
-		width: 650rpx;
-		position: absolute;
-		background: #FFFFFF;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		margin: auto;
-		height: 700rpx;
-		border-radius: 10rpx;
-
-		.bt {
-			font-size: 30rpx;
-			font-weight: bold;
-		}
-
-		.pjImg {
-			width: 200rpx;
-			height: 200rpx;
-		}
-
-		.navBox {
-			.avtiter {
-				width: 80rpx;
-				height: 80rpx;
-				border-radius: 40rpx;
-				margin-right: 15rpx
-			}
-
-			padding-left: 30rpx;
-			padding-top: 30rpx;
-			display: flex;
-			align-items: center;
-
-			.userName {
-				font-size: 28rpx;
-				font-weight: bold;
-			}
-
-		}
-
-
-	}
-
-	.nrTxt {
-		display: inline-block;
-		width: 500rpx;
-	}
-
-	.navList {
-		text-align: center;
-		margin-top: 30rpx;
-		padding-left: 30rpx;
-		padding-right: 30rpx;
-		display: flex;
-		justify-content: center;
-
-		.xq {
-			font-size: 30rpx;
-			font-weight: bolder;
-			text-align: center;
-		}
-
-
-
-	}
-
-	.contentTxt {
-
-		view {
-			margin-bottom: 30rpx;
-
-			display: flex;
-			align-items: center;
-		}
-
-		.title {
-			font-size: 30rpx;
-			font-weight: bold;
-			color: #000000;
-			margin-right: 15rpx;
-		}
-
-		.imgRsc {
-			width: 100rpx;
-			height: 100rpx;
-			border-radius: 10rpx;
-		}
-	}
-
-	.list_1 {
-		position: absolute;
-	}
-
-	.btn {
-		width: 690upx;
-		height: 88upx;
-		margin: 30upx auto;
-		background: #FCD202;
-		box-shadow: 0px 10upx 20upx 0upx #FFD9B3;
-		border-radius: 16upx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		color: #000000;
-
-	}
-
-	.one {
-		background: #FFFFFF;
-		margin-top: 20rpx;
-		display: flex;
-		justify-content: space-between;
-		padding: 20rpx;
-
-		.imgSrc {
-			width: 100rpx;
-			height: 100rpx;
-			vertical-align: middle;
-			margin-right: 20rpx;
-			border-radius: 10rpx;
-		}
-
-		.name {
-			margin-top: 10rpx;
-			margin-bottom: 20rpx;
-			font-size: 24rpx;
-			color: #000000;
-		}
-
-		.timer {
-			font-size: 20rpx;
-			color: #b3b3c4;
-		}
-
-		.contentTxt {
-
-			font-size: 24rpx;
-			color: #000000;
-		}
-
-	}
-</style>
+<template>
+	<view style="padding-bottom: 20rpx">
+		<view class="padding-tb-sm margin-lr u-border-bottom" v-for="(item, index) in EvaluateList" :key="index">
+			<view class="flex justify-between align-center" @click="gotoShop(item.shopId, item)">
+				<view class="flex align-center">
+					<u-avatar :src="item.shopCover" size="65"></u-avatar>
+					<view class="margin-left-sm" style="line-height: 46upx">{{ item.shopName ? item.shopName : '匿名' }}</view>
+					<view class="flex margin-left-sm">
+						<u-icon v-for="ite in item.score" :key="ite" color="#FCD202" name="star-fill"></u-icon>
+					</view>
+				</view>
+				<view>{{ item.createTime }}</view>
+			</view>
+			<view style="display: flex">
+				<view class="margin-top-sm" :style="!item.shopReplyMessage ? 'width: 90%;' : ''">{{ item.evaluateMessage }}</view>
+				<view class="flex padding-top-sm margin-right" @tap="goShow(index)" v-if="!item.shopReplyMessage">
+					<!-- <image src="../../static/images/order/pinglun.png" style="width: 20px;height: 20px;"></image> -->
+				</view>
+			</view>
+			<view class="margin-top-sm" v-if="item.shopReplyMessage">
+				<view class="flex align-center">
+					<view class="flex align-center text-df" style="color: #999999">
+						<view class="text-df">商家回复:</view>
+						{{ item.shopReplyMessage }}
+					</view>
+				</view>
+				<!-- <view class="text-lg padding-left margin-left-xl">{{dataDet.shopReplyMessage}}</view> -->
+			</view>
+			<view class="flex" style="width: 100%; margin-top: 20rpx; flex-wrap: wrap" v-if="item.pictures">
+				<image
+					@click="lookImgs(ind, item.pictures)"
+					:src="ite"
+					v-for="(ite, ind) in item.pictures"
+					:key="ind"
+					style="width: 200rpx; height: 200rpx; margin-right: 10rpx; margin-bottom: 10rpx"
+					mode=""
+				></image>
+			</view>
+			<view class="flex justify-end" style="width: 100%; color: #999999" @click="deletePj(item)">删除</view>
+		</view>
+		<empty v-if="EvaluateList.length <= 0"></empty>
+	</view>
+</template>
+
+<script>
+import empty from '../../components/empty.vue'
+export default {
+	components: {
+		empty
+	},
+	data() {
+		return {
+			pinglun: '',
+			count: 0,
+			show: false,
+			customStyle: {
+				color: '#333333',
+				background: '#FCD202',
+				marginRight: '20rpx',
+				border: 0
+			},
+			customStyle1: {
+				color: '#333333',
+				background: '#F2F2F2',
+				marginRight: '20rpx',
+				border: 0
+			},
+			cashDeposit: [],
+			EvaluateData: {},
+			EvaluateList: [],
+			grade: '',
+			page: 1,
+			size: 10,
+			isShow: false,
+			oneData: [],
+			titleData: [],
+			shopDet: {}
+		}
+	},
+	onShow() {
+		this.getList()
+	},
+	onPullDownRefresh() {
+		this.page = 1
+		this.getList()
+	},
+	onReachBottom: function () {
+		this.page = this.page + 1
+		this.getList()
+	},
+	methods: {
+		deletepjrequest(id) {
+			let data = {
+				id: id
+			}
+			this.$Request.getT('/app/order/deleteEvaluateById', data).then((res) => {
+				uni.hideLoading()
+				if (res.code == 0) {
+					uni.showToast({
+						title: '删除成功'
+					})
+					this.page = 1
+					this.getList()
+				} else {
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+				}
+			})
+		},
+		//删除评价
+		deletePj(item) {
+			let that = this
+			uni.showModal({
+				title: '提示',
+				content: '确定删除此评价?',
+				complete(ret) {
+					if (ret.confirm) {
+						//删除评价的接口
+						that.deletepjrequest(item.id)
+					}
+				}
+			})
+		},
+		//去商铺
+		gotoShop(shopId, item) {
+			uni.navigateTo({
+				url: '/pages/index/shop/index?shopId=' + shopId + '&shopTypeId=' + item.shopTypeId
+			})
+		},
+		//预览图片
+		lookImgs(index, imgs) {
+			uni.previewImage({
+				current: index,
+				urls: imgs
+			})
+		},
+		goShow(index) {
+			this.orderNumber = this.EvaluateList[index].orderNumber
+			this.show = true
+		},
+		sel(e) {
+			this.grade = e
+			this.count = e
+			this.page = 1
+			this.getList()
+		},
+		open(data) {
+			console.log(data)
+			this.oneData = data
+			this.titleData = data.goods
+			this.isShow = true
+		},
+		close() {
+			this.isShow = false
+		},
+		// 获取评价列表
+		getList() {
+			let data = {
+				page: this.page,
+				limit: this.size
+			}
+			this.$Request.getT('/app/order/getEvaluateList', data).then((res) => {
+				if (res.code == 0 && res.data) {
+					// this.EvaluateData = res.data
+					res.data.records.map((item) => {
+						if (item.pictures) {
+							item.pictures = item.pictures.split(',')
+						} else {
+							item.pictures = []
+						}
+					})
+					if (this.page == 1) {
+						this.EvaluateList = res.data.records
+					} else {
+						this.EvaluateList = [...this.EvaluateList, ...res.data.records]
+					}
+				}
+			})
+		}
+	}
+}
+</script>
+
+<style lang="scss">
+page {
+	background-color: #ffffff;
+}
+
+.box1 {
+	position: absolute;
+	background: #000000;
+	width: 750rpx;
+	height: 100vh;
+	opacity: 0.4;
+}
+
+.moudes {
+	width: 650rpx;
+	position: absolute;
+	background: #ffffff;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	margin: auto;
+	height: 700rpx;
+	border-radius: 10rpx;
+
+	.bt {
+		font-size: 30rpx;
+		font-weight: bold;
+	}
+
+	.pjImg {
+		width: 200rpx;
+		height: 200rpx;
+	}
+
+	.navBox {
+		.avtiter {
+			width: 80rpx;
+			height: 80rpx;
+			border-radius: 40rpx;
+			margin-right: 15rpx;
+		}
+
+		padding-left: 30rpx;
+		padding-top: 30rpx;
+		display: flex;
+		align-items: center;
+
+		.userName {
+			font-size: 28rpx;
+			font-weight: bold;
+		}
+	}
+}
+
+.nrTxt {
+	display: inline-block;
+	width: 500rpx;
+}
+
+.navList {
+	text-align: center;
+	margin-top: 30rpx;
+	padding-left: 30rpx;
+	padding-right: 30rpx;
+	display: flex;
+	justify-content: center;
+
+	.xq {
+		font-size: 30rpx;
+		font-weight: bolder;
+		text-align: center;
+	}
+}
+
+.contentTxt {
+	view {
+		margin-bottom: 30rpx;
+
+		display: flex;
+		align-items: center;
+	}
+
+	.title {
+		font-size: 30rpx;
+		font-weight: bold;
+		color: #000000;
+		margin-right: 15rpx;
+	}
+
+	.imgRsc {
+		width: 100rpx;
+		height: 100rpx;
+		border-radius: 10rpx;
+	}
+}
+
+.list_1 {
+	position: absolute;
+}
+
+.btn {
+	width: 690upx;
+	height: 88upx;
+	margin: 30upx auto;
+	background: #fcd202;
+	box-shadow: 0px 10upx 20upx 0upx #ffd9b3;
+	border-radius: 16upx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	color: #000000;
+}
+
+.one {
+	background: #ffffff;
+	margin-top: 20rpx;
+	display: flex;
+	justify-content: space-between;
+	padding: 20rpx;
+
+	.imgSrc {
+		width: 100rpx;
+		height: 100rpx;
+		vertical-align: middle;
+		margin-right: 20rpx;
+		border-radius: 10rpx;
+	}
+
+	.name {
+		margin-top: 10rpx;
+		margin-bottom: 20rpx;
+		font-size: 24rpx;
+		color: #000000;
+	}
+
+	.timer {
+		font-size: 20rpx;
+		color: #b3b3c4;
+	}
+
+	.contentTxt {
+		font-size: 24rpx;
+		color: #000000;
+	}
+}
+</style>

pages/index/index.vue

@@ -1225,7 +1225,7 @@
 				let items = encodeURIComponent(JSON.stringify(shuzu));
 				// if (this.userId) {
 					uni.navigateTo({
-						url:'/pages/index/shop/index?shopId='+url+'&huoListss='+items
+						url:'/pages/index/shop/index?shopId='+url+'&huoListss='+items+'&shopTypeId='+e.shopTypeId
 					})
 				// } else {
 				// 	uni.navigateTo({

pages/index/shop/index.vue

@@ -141,7 +141,7 @@
 						</view>
 					</view>
 					<view class="VerticalBox" v-if="current == 1">
-						<scroll-view class="VerticalNav nav bg-gray" scroll-y scroll-with-animation :scroll-top="verticalNavTop" @scrolltolower="scrolltolower_left">
+						<scroll-view class="VerticalNav nav bg-gray" scroll-y scroll-with-animation :scroll-top="verticalNavTop">
 							<view
 								style="font-size: 28upx"
 								class="cu-item text-lg"
@@ -160,10 +160,46 @@
 							scroll-with-animation
 							:scroll-into-view="'main-' + mainCur"
 							@scroll="VerticalMainFun"
-							@scrolltolower="scrolltolower_right"
+							@scrolltolower="scrolltolowerRight"
 						>
-							<view class="bg-white padding-sm margin-bottom-sm" v-for="(item, index) in dataList" v-if="item.goodsList.length" :key="item.id" :id="'main-' + index">
-								<view class="flex justify-between padding-bottom-sm" @click="goDet(ite.goodsId)" v-for="(ite, ind) in item.goodsList" :key="ite.goodsId">
+							<view v-if="shopTypeId != 10">
+								<view
+									class="bg-white padding-sm margin-bottom-sm"
+									v-for="(item, index) in dataList"
+									v-if="item.goodsList.length"
+									:key="item.id"
+									:id="'main-' + index"
+								>
+									<view class="flex justify-between padding-bottom-sm" @click="goDet(ite.goodsId)" v-for="(ite, ind) in item.goodsList" :key="ite.goodsId">
+										<image :src="ite.goodsCover" mode="aspectFill" style="width: 184rpx; height: 184rpx; border-radius: 10rpx"></image>
+										<view class="flex-sub margin-left-sm padding-tb-xs flex flex-direction justify-between">
+											<view class="text-black text-lg text-bold" style="font-size: 30upx">
+												{{ ite.goodsName }}
+											</view>
+											<view class="text-gray">已售 {{ ite.sales ? ite.sales : 0 }}</view>
+											<view class="text-gray text-sm u-line-2" style="overflow: hidden; line-clamp: 2; -webkit-line-clamp: 2; width: 100%">
+												{{ ite.goodsDescribe ? ite.goodsDescribe : '' }}
+											</view>
+											<view class="flex justify-between" style="position: relative">
+												<view class="text-sm" style="color: #ff0303">
+													¥
+													<text class="text-lg">{{ ite.goodsMoney }}</text>
+												</view>
+												<view
+													style="width: 80rpx; height: 80rpx; line-height: 80rpx; position: absolute; right: 0; top: -10rpx; text-align: center"
+													@click.stop="selSku(ite)"
+												>
+													<image src="../../../static/images/index/add.png" style="width: 40rpx; height: 40rpx"></image>
+												</view>
+											</view>
+										</view>
+									</view>
+									<view style="height: 30px"></view>
+								</view>
+							</view>
+
+							<view v-else>
+								<view class="flex justify-between padding-bottom-sm" @click="goDet(ite.goodsId)" v-for="(ite, ind) in supermarketGoodsList" :key="ite.goodsId">
 									<image :src="ite.goodsCover" mode="aspectFill" style="width: 184rpx; height: 184rpx; border-radius: 10rpx"></image>
 									<view class="flex-sub margin-left-sm padding-tb-xs flex flex-direction justify-between">
 										<view class="text-black text-lg text-bold" style="font-size: 30upx">
@@ -187,7 +223,6 @@
 										</view>
 									</view>
 								</view>
-								<view style="height: 30px"></view>
 							</view>
 						</scroll-view>
 						<empty v-if="!dataList.length"></empty>
@@ -641,7 +676,7 @@ export default {
 			lng: '',
 			shopName: '',
 			page: 1,
-			limit: 10,
+			limit: 20,
 			total: 0,
 			evaluatePage: 1,
 			evaluateLimit: 10,
@@ -690,10 +725,14 @@ export default {
 			coupons: false,
 			// huoListss: [], //活动
 
-			shop_zhizhao: []
+			shop_zhizhao: [],
+			shopTypeId: '',
+			supermarketGoodsList: []
 		}
 	},
 	onLoad(option) {
+		// console.log(option)
+		this.shopTypeId = option.shopTypeId
 		// if (option.huoListss) {
 		// 	this.huoListss = JSON.parse(decodeURIComponent(option.huoListss))
 		// }
@@ -775,28 +814,17 @@ export default {
 				})
 			}
 		},
-		scrolltolower_left() {
-			// console.log(111)
-			if (this.total > this.dataList.length) {
-				this.page++
-				this.getData()
-			} else {
-				uni.showToast({
-					title: '没有更多数据了',
-					icon: 'none'
-				})
-			}
-		},
-		scrolltolower_right() {
-			// console.log(222)
-			if (this.total > this.dataList.length) {
-				this.page++
-				this.getData()
-			} else {
-				uni.showToast({
-					title: '没有更多数据了',
-					icon: 'none'
-				})
+		scrolltolowerRight() {
+			if (this.shopTypeId == 10) {
+				if (this.total > this.supermarketGoodsList.length) {
+					this.page++
+					this.getSupermarketGoodsList(this.dataList[this.tabCur].classifyId)
+				} else {
+					uni.showToast({
+						title: '没有更多数据了',
+						icon: 'none'
+					})
+				}
 			}
 		},
 		//营业执照点击放大
@@ -875,9 +903,10 @@ export default {
 			this.current = e
 
 			if (this.current == 1) {
+				this.tabCur = 0
 				this.page = 1
 				this.total = 0
-				this.dataList = []
+				this.supermarketGoodsList = []
 				this.getData()
 			} else if (this.current == 2) {
 				this.evaluatePage = 1
@@ -913,26 +942,29 @@ export default {
 		},
 		// 获取店铺信息
 		getData() {
+			let urlreq = ''
+			if (this.shopTypeId == 10) {
+				urlreq = '/app/goods/selectGoodsClassifyList'
+			} else {
+				urlreq = '/app/goods/selectGoodsList'
+			}
+
 			let data = {
 				shopId: this.shopId,
 				lng: this.lng,
-				lat: this.lat,
-				page: this.page,
-				limit: this.limit
+				lat: this.lat
 			}
-			// console.log(data)
-			this.$Request.get('/app/goods/selectGoodsList', data).then((res) => {
+
+			this.$Request.get(urlreq, data).then((res) => {
 				console.log(res, '999')
 				if (res.code == 0 && res.data) {
-					this.dataList = [...this.dataList, ...res.data.list]
+					this.dataList = res.data.list
 					this.shopDet = res.data.goodsShop
-					this.total = res.data.total
 
 					for (let i = 0, len = this.dataList.length; i < len; i++) {
 						// this.$set(this.dataList[i], 'id', i)
 						this.dataList[i].id = i
 					}
-					console.log(this.dataList)
 
 					this.shopDet.shopScore1 = Math.floor(this.shopDet.shopScore)
 					this.shopDet.errandTime = Math.round(this.shopDet.errandTime)
@@ -955,6 +987,27 @@ export default {
 						title: this.shopDet.shopName
 					})
 					uni.hideLoading()
+
+					if ((urlreq = '/app/goods/selectGoodsClassifyList')) {
+						this.getSupermarketGoodsList(this.dataList[0].classifyId)
+					}
+				}
+			})
+		},
+		getSupermarketGoodsList(classifyId) {
+			let dataRight = {
+				shopId: this.shopId,
+				classifyId,
+				page: this.page,
+				limit: this.limit
+			}
+			// console.log(dataRight)
+
+			this.$Request.get('/app/goods/selectSupermarketGoodsList', dataRight).then((res) => {
+				// console.log(res, '9996329')
+				if (res.code == 0) {
+					this.supermarketGoodsList = [...this.supermarketGoodsList, ...res.data.records]
+					this.total = res.data.total
 				}
 			})
 		},
@@ -1193,8 +1246,9 @@ export default {
 			// } else {
 			// 	url = '/app/order/insertOrder'
 			// }
-			// console.log(data, '参数')
+			console.log(data, '参数')
 			this.$Request.post('/app/order/insertOrder', data).then((res) => {
+				console.log(res)
 				if (res.code == 0) {
 					this.$queue.showToast('添加成功')
 					this.skuShow = false
@@ -1291,7 +1345,9 @@ export default {
 				status: 1
 				// orderType: this.orderType
 			}
+			// console.log(data)
 			this.$Request.get('/app/order/selectAllOrderList', data).then((res) => {
+				console.log(res, '741')
 				if (res.code == 0 && res.data.pageUtils.list.length) {
 					this.goodsList = res.data.pageUtils.list[0]
 					console.log(this.goodsList, '888')
@@ -1388,31 +1444,41 @@ export default {
 			this.tabCur = e.currentTarget.dataset.id
 			this.mainCur = e.currentTarget.dataset.id
 			this.verticalNavTop = (e.currentTarget.dataset.id - 1) * 50
+
+			if (this.shopTypeId == 10) {
+				this.page = 1
+				this.total = []
+				this.supermarketGoodsList = []
+				// console.log(this.tabCur)
+				this.getSupermarketGoodsList(this.dataList[this.tabCur].classifyId)
+			}
 		},
 		VerticalMainFun(e) {
-			let tabHeight = 0
-			if (this.load) {
-				for (let i = 0; i < this.dataList.length; i++) {
-					let view = uni.createSelectorQuery().select('#main-' + this.dataList[i].id)
-					view.fields(
-						{
-							size: true
-						},
-						(data) => {
-							this.dataList[i].top = tabHeight
-							tabHeight = tabHeight + data.height
-							this.dataList[i].bottom = tabHeight
-						}
-					).exec()
+			if (this.shopTypeId != 10) {
+				let tabHeight = 0
+				if (this.load) {
+					for (let i = 0; i < this.dataList.length; i++) {
+						let view = uni.createSelectorQuery().select('#main-' + this.dataList[i].id)
+						view.fields(
+							{
+								size: true
+							},
+							(data) => {
+								this.dataList[i].top = tabHeight
+								tabHeight = tabHeight + data.height
+								this.dataList[i].bottom = tabHeight
+							}
+						).exec()
+					}
+					this.load = false
 				}
-				this.load = false
-			}
-			let scrollTop = e.detail.scrollTop
-			for (let i = 0; i < this.dataList.length; i++) {
-				if (scrollTop > this.dataList[i].top && scrollTop < this.dataList[i].bottom) {
-					this.verticalNavTop = (this.dataList[i].id - 1) * 50
-					this.tabCur = this.dataList[i].id
-					return false
+				let scrollTop = e.detail.scrollTop
+				for (let i = 0; i < this.dataList.length; i++) {
+					if (scrollTop > this.dataList[i].top && scrollTop < this.dataList[i].bottom) {
+						this.verticalNavTop = (this.dataList[i].id - 1) * 50
+						this.tabCur = this.dataList[i].id
+						return false
+					}
 				}
 			}
 		},

pages/index/shopList/index.vue

@@ -413,7 +413,7 @@
 				let items = encodeURIComponent(JSON.stringify(shuzu));
 				// if (this.userId) {
 					uni.navigateTo({
-						url:'/pages/index/shop/index?shopId='+url+'&huoListss='+items
+						url:'/pages/index/shop/index?shopId='+url+'&huoListss='+items+'&shopTypeId='+e.shopTypeId
 					})
 				// } else {
 				// 	uni.navigateTo({

pages/index/shopList/indexShop.vue

@@ -388,7 +388,7 @@
 				let items = encodeURIComponent(JSON.stringify(shuzu));
 				if (this.userId) {
 					uni.navigateTo({
-						url:'/pages/index/shop/index?shopId='+url+'&huoListss='+items
+						url:'/pages/index/shop/index?shopId='+url+'&huoListss='+items+'&shopTypeId='+e.shopTypeId
 					})
 				} else {
 					uni.navigateTo({

pages/order/index.vue

@@ -204,7 +204,7 @@
 							<view v-if="item.status == 7" class="btn" @click.stop="cancel(item)">取消订单</view>
 							<view v-if="item.status == 4 && item.commentFlag != 1" class="btn" @click.stop="pingjia(item)">评价订单</view>
 							<view v-if="item.status == 0" class="btn" @click.stop="payFinishCancel(item.orderId)">取消订单</view>
-							<view v-if="item.status != 0" class="btn_" @click.stop="goShop(item.shopId)">再来一单</view>
+							<view v-if="item.status != 0" class="btn_" @click.stop="goShop(item.shopId, item)">再来一单</view>
 							<view v-else class="btn_" @click.stop="goPay_throttle(item)">继续支付</view>
 						</view>
 					</view>
@@ -676,7 +676,7 @@ export default {
 				url: '/pages/order/feedbacks?indentNumber=' + e.indentNumber
 			})
 		},
-		goShop(e) {
+		goShop(e, item) {
 			// #ifdef MP-WEIXIN
 			if (uni.getStorageSync('sendMsg')) {
 				console.log('授权+1')
@@ -696,7 +696,7 @@ export default {
 			}
 			// #endif
 			uni.navigateTo({
-				url: '/pages/index/shop/index?shopId=' + e
+				url: '/pages/index/shop/index?shopId=' + e + '&shopTypeId=' + item.shopTypeId
 			})
 		},
 		// 完成订单

running/huodong/list.vue

@@ -447,7 +447,7 @@
 				let items = encodeURIComponent(JSON.stringify(shuzu));
 				if (this.userId) {
 					uni.navigateTo({
-						url:'/pages/index/shop/index?shopId='+url+'&huoListss='+items
+						url:'/pages/index/shop/index?shopId='+url+'&huoListss='+items+'&shopTypeId='+e.shopTypeId
 					})
 				} else {
 					uni.navigateTo({