no message

my/setting/chat.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view style="width: 100%; padding-bottom: 140rpx">
+		<view style="width: 100%; padding-bottom: 160rpx">
 			<view style="display: flex; flex-direction: column" v-for="(item, index) in ListItem" :key="index">
 				<view style="margin-top: 15rpx; width: 100%; text-align: center; font-size: 26rpx; color: #999999">
 					{{ item.createTime }}
@@ -195,7 +195,7 @@
 		</view>
 		<!-- 底部聊天输入框 -->
 		<view class="input-box">
-			<view class="justify-between padding-lr" style="display: flex; margin-top: 15rpx; width: 100%; background-color: #eee; padding-top: 4upx">
+			<view class="justify-between padding-lr" style="display: flex; width: 100%; height: 100%; background-color: #fff9ed; align-items: center">
 				<image
 					src="../../static/images/index/add.png"
 					@click="chooseImage()"
@@ -206,7 +206,8 @@
 					@confirm="setChatSave(1)"
 					type="text"
 					v-model="content"
-					style="width: 72%; height: 70rpx; background: #fff; margin: 4rpx 10rpx 0; border-radius: 70rpx; padding-left: 10rpx; color: #000000"
+					style="width: 72%; height: 70rpx; background: #fff; margin: 4rpx 10rpx 0; border-radius: 8rpx; padding-left: 10rpx; color: #000000"
+					placeholder="请输入您的问题"
 				/>
 				<view class="save" @tap="setChatSave(1)">发送</view>
 			</view>
@@ -703,7 +704,7 @@ page {
 	position: fixed;
 	bottom: 0;
 	left: 0;
-	height: 100rpx;
+	height: 160rpx;
 	width: 100%;
 	display: flex;
 	box-sizing: content-box;

pages/index/index.vue

@@ -159,7 +159,7 @@
 			<view class="hd flex justify-center" v-if="hdlist.length>0">
 				<view class="hd-box">
 					<scroll-view scroll-x="true" class="scroll-view_H">
-						<view class="hd-box-item" :style="currenthd==index?'background-color:#558C83;':''"
+						<view class="hd-box-item" :style="currenthd==index?'background-color:#9ACAB9;':''"
 							@click="searchhd(index,item.id)" v-for="(item,index) in hdlist" :key="index">
 							{{item.title}}
 						</view>
@@ -179,15 +179,20 @@
 								<text class="text-lg" style="color: #FF8205;"> {{item.shopScore?item.shopScore:0}}分</text>
 								<text
 									class="text-gray flex-sub margin-left-xs">销量{{item.shopSales?item.shopSales:0}}</text>
-								<text class="text-gray margin-left-xs">{{item.errandTime}}分钟</text>
-								<text class="text-gray margin-left-xs">{{item.distance}}</text>
+								<view style="font-size:20rpx;color:#707070;border: 2rpx solid #CCC6C6;border-radius: 8rpx;padding: 5rpx 8rpx;">{{item.autoSendOrder==1?'商家配送':'平台配送'}}</view>
 							</view>
 							<view class="text-gray margin-top-xs flex justify-between">
 								<view>起送 ¥{{item.minimumDelivery}} 配送 ¥{{item.errandMoney?item.errandMoney:0}}</view>
-								<view style="color: #558C83;">{{item.autoSendOrder==1?'商家配送':'平台配送'}}</view>
+								<view>
+									<text class="text-gray margin-left-xs">{{item.errandTime}}分钟</text>
+									<text class="text-gray margin-left-xs">{{item.distance}}</text>
+								</view>
 							</view>
-							<view class="text-gray margin-top-xs" style="background-color: #FFF5EB;color: #FF8205;" v-if="item.businessHours&&item.lockHours">
-								营业时间：{{item.businessHours}}-{{item.lockHours}}</view>
+							<view style="display: flex;" v-if="item.businessHours&&item.lockHours">
+								<view class="text-gray margin-top-xs" style="background-color: #FFF5EB;color: #FF8205;border-radius: 8rpx;padding: 5rpx 16rpx;" >
+									营业时间：{{item.businessHours}}-{{item.lockHours}}
+								</view>
+								</view>
 							<view class="flex margin-top-xs justify-between align-start" style="width: 100%;">
 								<view class="flex flex-wrap align-center"
 									style="width: 100%;height: 100%;overflow: hidden;">
@@ -196,7 +201,7 @@
 									<view class="lable flex justify-center align-center" v-if="item.enableFullReductionFlag==0&&item.exemptMinMoney">
 										满{{item.exemptMinMoney}}免配送费</view>
 									<view v-for="(ite,ind) in item.shopActivityList" :key='ind' v-if="item.shopActivityList && ite.activityType!='1'">
-										<view class="lable flex justify-center align-center" style="border-radius: 4rpx;background-color: #ffffff;color: red;box-sizing: border-box;">
+										<view class="lable flex justify-center align-center" style="border-radius: 8rpx;border: 2rpx solid #F97A7A;background-color: #ffffff;color: #FF0000;box-sizing: border-box;">
 											<text v-if="ite.activityType=='2'">时段</text>
 											<text v-if="ite.activityType=='3'">满额</text>
 											<text v-if="ite.activityType=='4'">全场</text>
@@ -212,7 +217,7 @@
 										v-if="item.shopLable">
 										{{ite}}
 									</view>
-									<view class="lable flex justify-center align-center" v-if="item.couponList" style="border-radius: 4rpx;border: 1rpx solid red;background-color: #ffffff;color: red;box-sizing: border-box;" v-for="(it,ide) in item.couponList" :key="ide">
+									<view class="lable flex justify-center align-center" v-if="item.couponList" style="border-radius: 8rpx;border: 1rpx solid #F97A7A;background-color: #ffffff;color: #FF0000;box-sizing: border-box;" v-for="(it,ide) in item.couponList" :key="ide">
 										<text>优惠券</text>
 										<text style="margin-left: 3px;">|</text>
 										<text style="margin-left: 3px;">满{{it.minMoney}}减{{it.money}}</text>
@@ -1531,10 +1536,10 @@
 
 			.hd-box-item {
 				display: inline-block;
-				padding: 10rpx 20rpx 10rpx 20rpx;
+				padding: 6rpx 20rpx 6rpx 20rpx;
 				background-color: #F7F5F6;
 				font-size: 24rpx;
-				border-radius: 8rpx;
+				border-radius: 16rpx;
 				margin-right: 10rpx;
 			}
 
@@ -1542,7 +1547,9 @@
 	}
 
 	.select {
-		color: #558C83;
+		padding: 6rpx 15rpx;
+		color: #000;
+		border-bottom: 6rpx solid #568D84;
 	}
 
 	.jxShop {

pages/index/shop/goodsDet.vue

@@ -13,25 +13,25 @@
 		<view class="info">
 			<view class="info-box">
 				<view class="info-box-con">
-					<view class="info-box-con-name">
-						{{ goodsDet.goodsName }}
+					<view style="color: #ff0303">
+						<span style="font-size: 24rpx">¥</span>
+						<text style="font-size: 36rpx; font-weight: bold">{{ goodsDet.goodsMoney }}</text>
 					</view>
 					<view class="info-box-con-cart" v-if="goodsDet.goodsLabel && goodsDet.goodsLabel.length">
 						<view v-for="(item, index) in goodsDet.goodsLabel">{{ item }}</view>
-						<!-- <view>香辣</view>
-						<view>本店销量第一</view> -->
 					</view>
-					<view class="info-box-con-num">已售{{ goodsDet.sales }}</view>
+					<view class="info-box-con-name">
+						{{ goodsDet.goodsName }}
+					</view>
+
 					<view class="info-box-con-select">
 						<view class="info-box-con-select-l">
 							<view>
-								<span>¥</span>
-								<text>{{ goodsDet.goodsMoney }}</text>
-							</view>
-							<view>
 								<span>打包费</span>
 								<text>￥{{ goodsDet.packMoney }}/份</text>
 							</view>
+
+							<view>已售{{ goodsDet.sales }}</view>
 						</view>
 						<view class="info-box-con-select-r" @click="skuShow = true">加入购物车</view>
 					</view>
@@ -47,7 +47,7 @@
 				</view>
 			</view>
 		</view>
-		<view v-if="current == 0">
+		<view v-if="current == 0" style="background-color: #fff9ed">
 			<view class="goodsInfo">
 				<view class="goodsInfo-box">
 					<view class="goodsInfo-box-c">
@@ -91,48 +91,16 @@
 					<view class="pingjia-box-title">商品评价</view>
 					<view class="" style="width: 600rpx" v-if="current == 1">
 						<view class="pingjia-box-btn">
-							<u-button
-								hover-class="none"
-								@click="sel(0)"
-								type="primary"
-								shape="circle"
-								size="mini"
-								:plain="false"
-								:custom-style="count == 0 ? customStyle : customStyle1"
-							>
+							<u-button hover-class="none" @click="sel(0)" shape="circle" size="mini" :plain="false" :custom-style="count == 0 ? customStyle : customStyle1">
 								全部评论
 							</u-button>
-							<u-button
-								hover-class="none"
-								@click="sel(1)"
-								type="primary"
-								shape="circle"
-								size="mini"
-								:plain="false"
-								:custom-style="count == 1 ? customStyle : customStyle1"
-							>
+							<u-button hover-class="none" @click="sel(1)" shape="circle" size="mini" :plain="false" :custom-style="count == 1 ? customStyle : customStyle1">
 								好评({{ EvaluateData.goodReputation ? EvaluateData.goodReputation : 0 }})
 							</u-button>
-							<u-button
-								hover-class="none"
-								@click="sel(2)"
-								type="primary"
-								shape="circle"
-								size="mini"
-								:plain="false"
-								:custom-style="count == 2 ? customStyle : customStyle1"
-							>
+							<u-button hover-class="none" @click="sel(2)" shape="circle" size="mini" :plain="false" :custom-style="count == 2 ? customStyle : customStyle1">
 								中评({{ EvaluateData.mediumReview ? EvaluateData.mediumReview : 0 }})
 							</u-button>
-							<u-button
-								hover-class="none"
-								@click="sel(3)"
-								type="primary"
-								shape="circle"
-								size="mini"
-								:plain="false"
-								:custom-style="count == 3 ? customStyle : customStyle1"
-							>
+							<u-button hover-class="none" @click="sel(3)" shape="circle" size="mini" :plain="false" :custom-style="count == 3 ? customStyle : customStyle1">
 								差评({{ EvaluateData.negativeComment ? EvaluateData.negativeComment : 0 }})
 							</u-button>
 						</view>
@@ -229,35 +197,36 @@
 		</view>
 		<!-- 购物车弹窗 -->
 		<u-popup v-model="popupShow" mode="bottom" border-radius="20">
-			<view class="padding">
-				<view class="flex justify-between align-center margin-bottom-sm">
+			<view style="padding-bottom: 30rpx">
+				<view class="flex justify-between align-center" style="height: 90rpx; padding: 0 30rpx; background-color: #b2d5c6">
 					<view class="text-bold text-black text-df">已选餐品</view>
 					<view class="flex align-center">
 						<image src="../../../static/images/index/delete.png" style="width: 28rpx; height: 31rpx" mode=""></image>
 						<text class="margin-left-xs" @click="empty">清空购物车</text>
 					</view>
 				</view>
-				<scroll-view scroll-y="true" class="popup">
+				<scroll-view scroll-y="true" style="padding: 0 30rpx; background-color: #fff9ed">
 					<view v-for="(item, ind) in goodsList.orderGoodsList[0]" :key="ind">
-						<view class="flex align-center margin-tb-sm">
+						<view class="flex margin-tb-sm">
 							<image mode="aspectFill" :src="item.goodsPicture[0]" style="width: 96rpx; height: 96rpx; border-radius: 10rpx"></image>
-							<view class="margin-left-sm">
+							<view class="margin-left-sm" style="display: flex; flex-direction: column; justify-content: space-between">
 								<view>{{ item.goodsName }}</view>
 								<view v-if="item.skuMessage">{{ item.skuMessage }}</view>
-							</view>
-						</view>
-						<view class="flex justify-between align-center">
-							<view class="text-bold text-sm">
-								¥
-								<text class="text-lg">{{ item.goodsPrice }}</text>
-							</view>
-							<view class="flex align-center justify-between">
-								<view @click.stop="noAdd(item, ind)">
-									<image src="../../../static/images/index/jian.png" style="width: 54rpx; height: 54rpx"></image>
+								<view class="text-bold text-sm" style="color: #ff0303">
+									¥
+									<text class="text-lg">{{ item.goodsPrice }}</text>
 								</view>
-								<view class="text-center margin-lr-xs">{{ item.goodsNum }}</view>
-								<view @click.stop="add(item, ind)">
-									<image src="../../../static/images/index/add.png" style="width: 50rpx; height: 50rpx"></image>
+							</view>
+
+							<view class="flex justify-between align-center" style="margin-left: auto">
+								<view class="flex align-center justify-between">
+									<view @click.stop="noAdd(item, ind)">
+										<image src="../../../static/images/index/jian.png" style="width: 54rpx; height: 54rpx"></image>
+									</view>
+									<view class="text-center margin-lr-xs">{{ item.goodsNum }}</view>
+									<view @click.stop="add(item, ind)">
+										<image src="../../../static/images/index/add.png" style="width: 50rpx; height: 50rpx"></image>
+									</view>
 								</view>
 							</view>
 						</view>
@@ -293,7 +262,7 @@
 				</view>
 				<view class="flex justify-between padding-lr padding-top">
 					<view>
-						<view class="text-xl text-bold text-black">
+						<view class="text-xl text-bold" style="color: #ff0303">
 							<text class="text-sm">￥</text>
 							{{ price }}
 						</view>
@@ -1011,12 +980,12 @@ export default {
 	display: flex;
 	justify-content: center;
 	margin-top: 20rpx;
+	background-color: #fff9ed;
 
 	// padding-bottom: 50rpx;
 	.pingjia-box {
 		width: 686rpx;
 		height: auto;
-		background-color: #ffffff;
 		border-radius: 16rpx;
 		display: flex;
 		justify-content: center;
@@ -1070,19 +1039,20 @@ export default {
 	.info-box {
 		width: 686rpx;
 		height: 100%;
-		background-color: #ffffff;
+		background-color: #fff9ed;
 		border-radius: 16rpx;
 		display: flex;
 		justify-content: center;
 	}
 
 	.info-box-con {
+		padding: 24rpx 0;
 		width: 615rpx;
 		height: 100%;
 
 		.info-box-con-name {
 			width: 100%;
-			margin-top: 30rpx;
+			margin-top: 16rpx;
 			color: #333333;
 			font-size: 38rpx;
 			font-weight: 800;
@@ -1113,14 +1083,8 @@ export default {
 			}
 		}
 
-		.info-box-con-num {
-			font-size: 28rpx;
-			font-weight: 500;
-			color: #999999;
-			margin-top: 20rpx;
-		}
-
 		.info-box-con-select {
+			margin-top: 16rpx;
 			width: 100%;
 			height: 56rpx;
 			display: flex;
@@ -1131,27 +1095,12 @@ export default {
 				align-items: center;
 
 				view:nth-of-type(1) {
-					color: #ff3d33;
-					font-weight: bold;
-
-					span {
-						font-size: 24rpx;
-					}
-
-					text {
-						font-size: 38rpx;
-					}
+					color: #707070;
 				}
 
 				view:nth-of-type(2) {
-					color: #999999;
-					font-weight: 500;
-					font-size: 24rpx;
+					color: #988251;
 					margin-left: 20rpx;
-
-					text {
-						margin-left: 10rpx;
-					}
 				}
 			}
 
@@ -1174,14 +1123,19 @@ export default {
 
 .tabs {
 	width: 100%;
+	height: 86rpx;
 	display: flex;
 	justify-content: center;
 	margin-top: 44rpx;
+	background-color: #fff9ed;
+	border-bottom: 2rpx solid #e9e9e9;
+	border-radius: 32rpx 32rpx 0 0;
 
 	.tabs-box {
 		width: 686rpx;
 		height: 100%;
 		display: flex;
+		align-items: center;
 
 		.tabs-box-item:nth-of-type(1) {
 			margin-left: 0;
@@ -1199,9 +1153,9 @@ export default {
 
 			view {
 				width: 55rpx;
-				height: 10rpx;
+				height: 6rpx;
 				background-color: #568d84;
-				margin-top: 9rpx;
+				margin-top: 6rpx;
 				border-radius: 10rpx;
 			}
 		}
@@ -1213,12 +1167,10 @@ export default {
 	height: auto;
 	display: flex;
 	justify-content: center;
-	margin-top: 20rpx;
 
 	.goodsInfo-box {
 		width: 686rpx;
 		height: 100%;
-		background: #ffffff;
 		border-radius: 16rpx 16rpx 0 0;
 		display: flex;
 		justify-content: center;
@@ -1264,7 +1216,6 @@ export default {
 
 	.imgInfo-box {
 		width: 686rpx;
-		background-color: #ffffff;
 		border-radius: 0 0 16rpx 16rpx;
 
 		.imgInfo-box-title {
@@ -1287,7 +1238,7 @@ export default {
 
 .settlement {
 	width: 94%;
-	background-color: rgba(129, 189, 179, 0.4);
+	background-color: #b2d5c6;
 	line-height: 3.4;
 	border-radius: 49rpx;
 	position: fixed;

pages/index/shop/index.vue

@@ -3,15 +3,48 @@
 		<view>
 			<view class="food_all">
 				<!-- banner -->
-				<view style="height: 100%; padding-bottom: 10px">
-					<swiper class="swiper" :autoplay="true" interval="2000" duration="500" :circular="true" style="width: 100%; z-index: 1; height: 128px">
+				<view style="width: 100%; padding-bottom: 20rpx; background-color: #fff">
+					<!-- <swiper class="swiper" :autoplay="true" interval="2000" duration="500" :circular="true" style="width: 100%; z-index: 1; height: 128px">
 						<swiper-item v-for="(item, index) in shopDet.shopBanner" :key="index">
 							<image :src="item" mode="scaleToFill" style="width: 100%"></image>
 						</swiper-item>
 					</swiper>
-					<view style="position: relative; height: 34px; z-index: 1; margin-top: -50px"></view>
-					<view class="shop padding">
-						<view class="flex justify-between">
+					<view style="position: relative; height: 34px; z-index: 1; margin-top: -50px"></view> -->
+					<view class="shop" style="padding: 26rpx">
+						<image style="width: 184rpx; height: 184rpx; border-radius: 32rpx" :src="shopDet.shopCover" mode="aspectFill"></image>
+
+						<view style="margin-left: 34rpx; width: 490rpx; display: flex; flex-direction: column">
+							<view class="text-bold">{{ shopDet.shopName }}</view>
+							<view style="display: flex; margin: 10rpx 0 20rpx">
+								<view style="border-right: 2rpx solid #707070; padding-right: 28rpx; display: flex; flex-direction: column; justify-content: space-between">
+									<span style="color: #707070; font-size: 24rpx">评分</span>
+									<view class="text-bold">{{ shopDet.shopScore ? shopDet.shopScore : 0 }}分</view>
+								</view>
+								<view style="border-right: 2rpx solid #707070; padding: 0 28rpx 0 20rpx; display: flex; flex-direction: column; justify-content: space-between">
+									<span style="color: #707070; font-size: 24rpx">销量</span>
+									<view class="text-bold">{{ shopDet.shopSales ? shopDet.shopSales : 0 }}</view>
+								</view>
+								<view style="padding-left: 20rpx; display: flex; flex-direction: column; justify-content: space-between">
+									<span style="color: #707070; font-size: 24rpx">平台配送</span>
+									<view class="text-bold">{{ shopDet.errandTime }}分钟</view>
+								</view>
+							</view>
+							<view class="flex align-center margin-top-xs" v-if="shopDet.shopNotice">
+								<text style="width: 90rpx; color: #707070">公告：</text>
+								<view style="width: 400rpx">
+									<u-notice-bar
+										color="#707070"
+										:speed="100"
+										type="none"
+										padding="0rpx 0rpx"
+										mode="horizontal"
+										:volume-icon="false"
+										:list="shopDet.shopNotice.split(',')"
+									></u-notice-bar>
+								</view>
+							</view>
+						</view>
+						<!-- <view class="flex justify-between">
 							<view style="width: 500rpx">
 								<view class="text-xl text-bold u-line-1">{{ shopDet.shopName }}</view>
 								<view class="flex align-center margin-top-xs">
@@ -26,11 +59,8 @@
 								</view>
 
 								<view class="flex align-center margin-top-xs">
-									<!-- <view style="color: #FCD202;margin-right: 8rpx;">{{shopDet.autoSendOrder==1?'商家配送':'平台配送'}}</view> -->
 									<view style="margin-right: 8rpx">{{ shopDet.autoSendOrder == 1 ? '商家配送：' : '平台配送：' }}</view>
 									<view style="margin-right: 8rpx">配送费{{ shopDet.errandMoney ? shopDet.errandMoney : 0 }}元</view>
-									<!-- <view class="lable text-gray" v-if="shopDet.enableFullReductionFlag==1">
-											不参与配送费满减</view> -->
 									<view class="lable" v-if="shopDet.enableFullReductionFlag == 0 && shopDet.exemptMinMoney">满{{ shopDet.exemptMinMoney }}元免配送费</view>
 								</view>
 							</view>
@@ -55,7 +85,6 @@
 						</view>
 						<view style="display: flex; margin-top: 3px" class="flex flex-wrap align-center" @click="clickGong">
 							<view v-for="(ite, ind) in huoListss" :key="ind" v-if="huoListss && ite.activityType != '1'">
-								<!-- -->
 								<view class="lable flex justify-center align-center" style="border-radius: 4rpx; background-color: #ffffff; color: red; box-sizing: border-box">
 									<text v-if="ite.activityType == '2'">时段</text>
 									<text v-if="ite.activityType == '3'">满额</text>
@@ -63,10 +92,6 @@
 									<text style="margin-left: 3px">|</text>
 									<text style="margin-left: 3px">{{ ite.activityName }}</text>
 								</view>
-								<!-- <view class="lable flex justify-center align-center"
-									style="border-radius: 4rpx;border: 1rpx solid red;background-color: #ffffff;color: red;box-sizing: border-box;"
-									>{{ite.activityName}}
-								</view> -->
 							</view>
 						</view>
 
@@ -82,11 +107,8 @@
 									<view style="margin-right: 20rpx">满{{ item.minMoney }}可用</view>
 									<view style="font-weight: bold">领</view>
 								</view>
-								<!-- <view class="flex align-center" style="width: 100%;height: 100%;">
-									
-								</view> -->
 							</scroll-view>
-						</view>
+						</view> -->
 					</view>
 				</view>
 				<!-- 食品 -->
@@ -119,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" style="height: calc(100vh - 590upx)">
+						<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"
@@ -132,14 +154,7 @@
 								{{ item.classifyName }}
 							</view>
 						</scroll-view>
-						<scroll-view
-							class="VerticalMain"
-							scroll-y
-							scroll-with-animation
-							style="height: calc(100vh - 590rpx)"
-							:scroll-into-view="'main-' + mainCur"
-							@scroll="VerticalMain"
-						>
+						<scroll-view class="VerticalMain" scroll-y scroll-with-animation :scroll-into-view="'main-' + mainCur" @scroll="VerticalMain">
 							<view class="bg-white padding-sm margin-bottom-sm" v-for="(item, index) in dataList" v-if="item.goodsList.length" :key="index" :id="'main-' + index">
 								<view class="flex justify-between padding-bottom-sm" @click="goDet(ite.goodsId)" v-for="(ite, ind) in item.goodsList" :key="ind">
 									<image :src="ite.goodsCover" mode="aspectFill" style="width: 184rpx; height: 184rpx; border-radius: 10rpx"></image>
@@ -152,7 +167,7 @@
 											{{ ite.goodsDescribe ? ite.goodsDescribe : '' }}
 										</view>
 										<view class="flex justify-between" style="position: relative">
-											<view class="text-sm text-red">
+											<view class="text-sm" style="color: #ff0303">
 												¥
 												<text class="text-lg">{{ ite.goodsMoney }}</text>
 											</view>
@@ -170,14 +185,14 @@
 						</scroll-view>
 						<empty v-if="!dataList.length"></empty>
 					</view>
-					<view class="" v-if="current == 2">
+					<view style="background-color: #fff9ed" v-if="current == 2">
 						<view class="flex margin-lr padding-tb-sm u-border-bottom" v-if="shopDet.shopScore">
 							<view class="flex padding-right">
 								<view class="text-sl" style="color: #fd6416">{{ shopDet.shopScore }}</view>
 								<view class="flex flex-direction justify-around margin-left-sm">
 									<view>商家评分</view>
 									<view class="flex">
-										<u-icon v-for="ite in shopDet.shopScore1" :key="ite" color="#568D84" name="star-fill"></u-icon>
+										<u-icon v-for="ite in shopDet.shopScore1" :key="ite" color="#F2CB51" name="star-fill"></u-icon>
 									</view>
 								</view>
 							</view>
@@ -281,7 +296,7 @@
 						</view>
 						<empty v-if="!EvaluateList.length"></empty>
 					</view>
-					<view class="padding-bottom" v-if="current == 3">
+					<view style="background-color: #fff9ed" class="padding-bottom" v-if="current == 3">
 						<view class="shop_xiang">
 							<view class="shopDizhi margin-lr">
 								<image :src="Tupian('/shopXiang/address.png')" class="radius" style="width: 44rpx; height: 44rpx; float: left; margin-top: 20rpx"></image>
@@ -367,8 +382,8 @@
 				</view>
 				<!-- 购物车弹窗 -->
 				<u-popup v-model="popupShow" mode="bottom" border-radius="20">
-					<view class="padding">
-						<view class="flex justify-between align-center margin-bottom-sm">
+					<view style="padding: 0 0 30rpx">
+						<view class="flex justify-between align-center margin-bottom-sm" style="height: 90rpx; background-color: #b2d5c6; padding: 0 30rpx">
 							<view class="text-bold text-black text-df">已选餐品</view>
 							<view class="flex align-center">
 								<image src="../../../static/images/index/delete.png" style="width: 28rpx; height: 31rpx" mode=""></image>
@@ -377,25 +392,26 @@
 						</view>
 						<scroll-view scroll-y="true" class="popup">
 							<view v-for="(item, ind) in goodsList.orderGoodsList[0]" :key="ind">
-								<view class="flex align-center margin-tb-sm">
+								<view class="flex margin-tb-sm">
 									<image mode="aspectFill" :src="item.goodsPicture[0]" style="width: 96rpx; height: 96rpx; border-radius: 10rpx"></image>
-									<view class="margin-left-sm">
+									<view class="margin-left-sm" style="display: flex; flex-direction: column; justify-content: space-between">
 										<view>{{ item.goodsName }}</view>
 										<view v-if="item.skuMessage">{{ item.skuMessage }}</view>
-									</view>
-								</view>
-								<view class="flex justify-between align-center">
-									<view class="text-bold text-sm">
-										¥
-										<text class="text-lg">{{ item.goodsPrice }}</text>
-									</view>
-									<view class="flex align-center justify-between">
-										<view @click.stop="noAdd(item, ind)">
-											<image src="../../../static/images/index/jian.png" style="width: 54rpx; height: 54rpx"></image>
+										<view class="text-bold text-sm" style="color: #ff0303">
+											¥
+											<text class="text-lg">{{ item.goodsPrice }}</text>
 										</view>
-										<view class="text-center margin-lr-xs">{{ item.goodsNum }}</view>
-										<view @click.stop="add(item, ind)">
-											<image src="../../../static/images/index/add.png" style="width: 50rpx; height: 50rpx"></image>
+									</view>
+
+									<view class="flex justify-between align-center" style="margin-left: auto">
+										<view class="flex align-center justify-between">
+											<view @click.stop="noAdd(item, ind)">
+												<image src="../../../static/images/index/jian.png" style="width: 54rpx; height: 54rpx"></image>
+											</view>
+											<view class="text-center margin-lr-xs">{{ item.goodsNum }}</view>
+											<view @click.stop="add(item, ind)">
+												<image src="../../../static/images/index/add.png" style="width: 50rpx; height: 50rpx"></image>
+											</view>
 										</view>
 									</view>
 								</view>
@@ -432,7 +448,7 @@
 						</view>
 						<view class="flex justify-between padding-lr padding-top">
 							<view>
-								<view class="text-xl text-bold text-black">
+								<view class="text-xl text-bold" style="color: #ff0303">
 									<text class="text-sm">￥</text>
 									{{ price }}
 								</view>
@@ -597,7 +613,7 @@ export default {
 			},
 			customStyle1: {
 				color: '#333333',
-				background: '#F2F2F2',
+				background: '#fff',
 				marginRight: '20rpx',
 				border: 0
 			},
@@ -1239,7 +1255,7 @@ export default {
 			this.$Request.get('/app/order/selectAllOrderList', data).then((res) => {
 				if (res.code == 0 && res.data.pageUtils.list.length) {
 					this.goodsList = res.data.pageUtils.list[0]
-					// console.log(this.goodsList, '888')
+					console.log(this.goodsList, '888')
 
 					if (this.goodsList && this.goodsList.orderGoodsList && this.goodsList.orderGoodsList[0]) {
 						this.totalPrice = res.data.money
@@ -1583,14 +1599,15 @@ page {
 }
 
 .shop {
-	position: relative;
-	z-index: 2;
-	margin-top: -80rpx;
-	left: 0;
-	right: 0;
-	width: 686rpx;
+	// position: relative;
+	// z-index: 2;
+	// margin-top: -80rpx;
+	// left: 0;
+	// right: 0;
+	display: flex;
+	width: 100%;
 	margin: auto;
-	border-radius: 20rpx;
+	border-radius: 40rpx;
 	box-shadow: 0 0 20rpx #cccccc;
 	background: linear-gradient(135deg, #81bdb3 0%, #ecf6ce 100%);
 }
@@ -1613,7 +1630,7 @@ page {
 
 .active1 {
 	/* width: 82rpx; */
-	height: 16rpx;
+	height: 6rpx;
 	background: #568d84;
 	position: relative;
 	top: -10rpx;
@@ -1623,15 +1640,19 @@ page {
 .popup {
 	/* height: 500rpx; */
 	max-height: 500rpx;
+	padding: 0 30rpx;
 	/* overflow-y: auto; */
 }
 
 .tabBtn {
-	/* background-color: #f6f6fa; */
 	height: 60rpx;
 	line-height: 60rpx;
 	color: #999999;
 	font-size: 38rpx;
+
+	.title {
+		background-color: #fff9ed;
+	}
 }
 
 .Switch {
@@ -1697,13 +1718,15 @@ page {
 
 .VerticalNav.nav {
 	width: 200upx;
+	height: calc(100% - 120rpx);
 	white-space: initial;
+	background-color: #fff;
 }
 
 .VerticalNav.nav .cu-item {
 	width: 100%;
 	text-align: center;
-	background-color: #f1f1f1;
+	background-color: #fff;
 	margin: 0;
 	border: none;
 	height: 50px;
@@ -1712,16 +1735,19 @@ page {
 }
 
 .VerticalNav.nav .cu-item.cur {
-	background-color: #fff;
+	background-color: #fff9ed;
 	line-height: 25px;
 }
 
 .VerticalBox {
 	display: flex;
+	height: calc(100% - 120rpx);
+	background-color: #fff9ed;
 }
 
 .VerticalMain {
-	background-color: #f1f1f1;
+	height: calc(100% - 120rpx);
+	background-color: #fff9ed;
 	flex: 1;
 }
 
@@ -1768,10 +1794,11 @@ page {
 /* 食物 */
 .food {
 	width: 100%;
+	height: calc(100vh - 260rpx);
 	overflow: hidden;
 	// position: absolute;
 	// top: 350rpx;
-	// background-color: #FFFFFF;
+	background-color: #fff9ed;
 	border-top-left-radius: 18rpx;
 	border-top-right-radius: 18rpx;
 }
@@ -1783,7 +1810,7 @@ page {
 	justify-content: space-between;
 	align-items: center;
 	// margin-top: 190rpx;
-	background-color: #ffffff;
+	background-color: #fff9ed;
 	// padding-bottom: 3%;
 	padding: 3%;
 }
@@ -1913,10 +1940,10 @@ page {
 
 .settlement_ri1 {
 	width: 35%;
-	background-color: #333333;
+	background-color: #75a599;
 	font-family: PingFang SC;
 	font-weight: 800;
-	color: #999999;
+	color: #333333;
 	text-align: center;
 	border-top-right-radius: 49rpx;
 	border-bottom-right-radius: 49rpx;
@@ -2149,7 +2176,6 @@ page {
 
 //下方店铺详情
 .shop_xiang {
-	background-color: rgba(255, 255, 255, 1);
 	width: 100%;
 	margin-top: 8px;
 }
@@ -2166,7 +2192,6 @@ page {
 	// border: 1rpx solid rgba(242,242,242,0.5);
 }
 .shop_zheng {
-	background-color: rgba(255, 255, 255, 1);
 	width: 100%;
 	margin-top: 8px;
 	height: 100%;

pages/index/shopList/index.vue

@@ -49,32 +49,36 @@
 				<view class="shopli" v-for="(item,index) in shopList" :key='index'>
 					<view class="margin-tb-sm flex justify-between bg-white padding"
 						@click="goNav(item.shopId,item,item.shopActivityList)">
-						<image :src="item.shopCover" class="radius" style="width: 160rpx;height: 160rpx;"></image>
+						<image :src="item.shopCover" class="radius" style="width: 160rpx;height: 160rpx;" mode="aspectFill"></image>
 						<view class=" margin-left-sm" style="width: 450rpx;">
 							<view class=" flex flex-direction justify-between">
 								<view class="text-lg text-bold text-black">{{item.shopName}}</view>
 								<view class="flex align-center margin-top-xs" style="width: 100%;">
-									<u-icon name="star-fill" color="#FD6416" size="28"></u-icon>
-									<text class="text-lg" style=""> {{item.shopScore?item.shopScore:0}}</text>
+									<text style="color: #FF8205;"> {{item.shopScore?item.shopScore:0}}分</text>
 									<text
 										class="text-gray flex-sub margin-left-xs">销量{{item.shopSales?item.shopSales:0}}</text>
-									<text class="text-gray margin-left-xs">{{item.errandTime}}分钟</text>
-									<text class="text-gray margin-left-xs">{{item.distance}}</text>
+									<view style="border: 2rpx solid #CCC6C6; border-radius: 8rpx;color: #707070;font-size: 20rpx;padding: 5rpx 8rpx; ">{{item.autoSendOrder==1?'商家配送':'平台配送'}}</view>
 								</view>
 								<view class="text-gray margin-top-xs flex justify-between">
 									<view>起送 ¥{{item.minimumDelivery}} 配送 ¥{{item.errandMoney?item.errandMoney:0}}
 									</view>
-									<view style="color: #FCD202;">{{item.autoSendOrder==1?'商家配送':'平台配送'}}</view>
+									<view>
+										<text class="text-gray margin-left-xs">{{item.errandTime}}分钟</text>
+										<text class="text-gray margin-left-xs">{{item.distance}}</text>
+									</view>
 								</view>
-								<view class="text-gray margin-top-xs" v-if="item.businessHours&&item.lockHours">
-									营业时间：{{item.businessHours}}-{{item.lockHours}}</view>
+								<view style="display: flex;" v-if="item.businessHours&&item.lockHours">
+									<view class="text-gray margin-top-xs" style="background-color: #FFF5EB;color: #FF8205;border-radius: 8rpx;padding: 5rpx 16rpx;">
+										营业时间：{{item.businessHours}}-{{item.lockHours}}
+									</view>
+									</view>
 								<view class="flex margin-top-xs justify-between align-start" style="width: 100%;">
 									<view class="flex flex-wrap align-center" style="width: 100%;height: 100%;overflow: hidden;">
 										<view class="lable flex justify-center align-center" v-if="item.enableFullReductionFlag==0&&item.exemptMinMoney">
 											满{{item.exemptMinMoney}}免配送费</view>
 										<!-- <view class="lable flex justify-center align-center" v-if="item.exemptMinMoney">满{{item.exemptMinMoney}}免配送费</view> -->
 										<view v-for="(ite,ind) in item.shopActivityList" :key='ind' v-if="item.shopActivityList && ite.activityType!='1'">
-											<view class="lable flex justify-center align-center" style="border-radius: 4rpx;background-color: #ffffff;color: red;box-sizing: border-box;">
+											<view class="lable flex justify-center align-center" style="border-radius: 8rpx;background-color: #ffffff;color: #FF0000;box-sizing: border-box;">
 												<text v-if="ite.activityType=='2'">时段</text>
 												<text v-if="ite.activityType=='3'">满额</text>
 												<text v-if="ite.activityType=='4'">全场</text>
@@ -90,7 +94,7 @@
 											v-if="item.shopLable">
 											{{ite}}
 										</view>
-										<view class="lable flex justify-center align-center" v-if="item.couponList" style="border-radius: 4rpx;border: 1rpx solid red;background-color: #ffffff;color: red;box-sizing: border-box;" v-for="(it,ide) in item.couponList" :key="ide">
+										<view class="lable flex justify-center align-center" v-if="item.couponList" style="border-radius: 8rpx;border: 1rpx solid #F97A7A;background-color: #ffffff;color: #FF0000;box-sizing: border-box;" v-for="(it,ide) in item.couponList" :key="ide">
 											<text>优惠券</text>
 											<text style="margin-left: 3px;">|</text>
 											<text style="margin-left: 3px;">满{{it.minMoney}}减{{it.money}}</text>
@@ -507,7 +511,8 @@
 		
 	}
 	.select {
-		color: #558C83;
+		padding-bottom: 5rpx;
+		border-bottom: 6rpx solid #568D84;
 	}
 
 	.tabs {

pages/order/feedback.vue

@@ -409,7 +409,7 @@ page {
 .store {
 	box-sizing: border-box;
 	padding: 20rpx;
-	background-color: #fff;
+	background-color: #fff9ed;
 }
 
 .store_box {
@@ -472,7 +472,7 @@ page {
 	align-items: center;
 	justify-content: center;
 	height: 250rpx;
-	background-color: #fff;
+	/* background-color: #fff; */
 }
 
 .btn {

pages/order/index.vue

@@ -1,19 +1,19 @@
 <template>
 	<view class="pages" style="position: relative">
 		<view style="position: fixed; top: 0; left: 0; right: 0; z-index: 99; width: 100%" class="bg">
-			<view class="flex bg justify-between padding-lr-xl">
+			<view class="flex justify-between padding-lr-xl">
 				<view @click="switchTab(2)" :class="orderType == 2 ? 'select' : ''" class="tabBtn" v-if="XCXIsSelect == '是'">
 					<view class="title">外卖配送</view>
-					<view :class="orderType == 2 ? 'active' : ''"></view>
+					<!-- <view :class="orderType == 2 ? 'active' : ''"></view> -->
 				</view>
 				<view @click="switchTab(1)" :class="orderType == 1 ? 'select' : ''" class="tabBtn" v-if="XCXIsSelect == '是'">
 					<view class="title">到店取餐</view>
-					<view :class="orderType == 1 ? 'active' : ''"></view>
+					<!-- <view :class="orderType == 1 ? 'active' : ''"></view> -->
 				</view>
 
 				<view @click="switchTab(3)" :class="orderType == 3 ? 'select' : ''" class="tabBtn" v-if="XCXIsSelect == '是'">
 					<view class="title">跑腿订单</view>
-					<view :class="orderType == 3 ? 'active' : ''"></view>
+					<!-- <view :class="orderType == 3 ? 'active' : ''"></view> -->
 				</view>
 			</view>
 			<view>
@@ -29,16 +29,8 @@
 				<view class="cont" v-if="item.orderType == 1">
 					<view class="order_title" v-if="item.expectDeliveryTime">预约订单：{{ item.expectDeliveryTime }}送达</view>
 					<view class="order_success">
-						<view class="order_name" v-if="item.status == 3 && item.indentState != 3 && item.indentState != 4">待取餐</view>
-
-						<view class="order_name" v-if="item.status == 3 && item.indentState == 2">待骑手接单</view>
-
-						<view class="order_name" v-if="item.status == 6 && item.indentState == 2">制作中</view>
-
-						<view class="order_name" v-if="(item.status == 3 || item.status == 6) && item.indentState == 3">骑手已接单</view>
-
-						<view class="order_name" v-if="(item.status == 3 || item.status == 6) && item.indentState == 4">骑手配送中</view>
-
+						<view class="order_name" v-if="item.status == 3">待取餐</view>
+						<view class="order_name" v-if="item.status == 6">制作中</view>
 						<view class="order_name" v-if="item.status == 4">已完成</view>
 						<view class="order_name" v-if="item.status == 5">已取消</view>
 						<view class="order_name" v-if="item.status == 7">待接单</view>
@@ -88,7 +80,7 @@
 						<view v-if="item.status == 0" class="btn_" @click.stop="goPay_throttle(item)">继续支付</view>
 					</view>
 				</view>
-				<view class="cont" v-if="item.orderType == 2">
+				<!-- <view class="cont" v-if="item.orderType == 2">
 					<view class="order_title" v-if="item.expectDeliveryTime">预约订单：{{ item.expectDeliveryTime }}送达</view>
 					<view class="order_success">
 						<view class="order_name" v-if="item.status == 3 && item.indentState != 3 && item.indentState != 4">
@@ -148,6 +140,66 @@
 						</view>
 						<view class="flex padding-tb-sm">
 							<view v-if="item.status == 3" class="btn" @click.stop="finish(item)">确认收货</view>
+							
+							<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-else class="btn_" @click.stop="goPay_throttle(item)">继续支付</view>
+						</view>
+					</view>
+				</view> -->
+
+				<view class="cont" v-if="item.orderType == 2">
+					<view style="height: 72rpx; display: flex; align-items: center; padding: 0 24rpx; justify-content: space-between">
+						<view style="color: #001713; font-weight: bold">{{ item.shopName }}</view>
+						<view class="order_name" v-if="item.status == 3 && item.indentState != 3 && item.indentState != 4">
+							配送中
+							<text style="color: #666666; margin-left: 10upx">{{ item.autoSendOrder == 1 ? '商家配送' : '平台配送' }}</text>
+						</view>
+						<view class="order_name" v-if="item.status == 4">已完成</view>
+						<view class="order_name" v-if="item.status == 5">已取消</view>
+						<view class="order_name" v-if="item.status == 3 && item.indentState == 2">待骑手接单</view>
+						<view class="order_name" v-if="item.status == 6 && item.indentState == 2">制作中</view>
+						<view class="order_name" v-if="(item.status == 3 || item.status == 6) && item.indentState == 3">骑手已接单</view>
+						<view class="order_name" v-if="(item.status == 3 || item.status == 6) && item.indentState == 4">骑手配送中</view>
+						<view class="order_name" v-if="item.status == 7">待接单</view>
+						<view class="order_name" v-if="item.status == 8">已退款</view>
+						<view class="order_name" v-if="item.status == 13">待骑手接单</view>
+						<view class="order_name" v-if="item.status == 0">待结算</view>
+					</view>
+					<view style="padding: 0 24rpx; display: flex">
+						<image style="width: 140rpx; height: 140rpx; border-radius: 8rpx" :src="item.shopCover" mode="aspectFill"></image>
+						<view style="margin-left: 16rpx; color: #707070">
+							<view v-if="item.payTime">{{ item.payTime }}</view>
+
+							<view v-for="(ite, ind) in item.orderGoodsList" :key="ind">
+								<view class="flex">
+									<view class="flex flex-direction justify-between" style="margin-right: 10rpx">
+										<view>{{ ite.goodsName }}</view>
+										<view v-if="ite.skuMessage">{{ ite.skuMessage }}</view>
+									</view>
+								</view>
+							</view>
+
+							<view v-if="item.riderPhone" @click.stop="bindphone(item.riderPhone)">骑手电话：{{ item.riderPhone }}</view>
+							<view>
+								{{ item.orderTypeExtra == 1 ? '到店取餐' : item.orderTypeExtra == 2 ? '骑手配送' : item.orderTypeExtra == 3 ? '商家配送' : '' }} #{{
+									item.orderSequence
+								}}
+							</view>
+						</view>
+						<view style="margin-left: auto; height: 100%; margin-top: auto">
+							<view style="font-weight: bold">
+								¥
+								<text style="font-size: 36rpx">{{ item.payMoney }}</text>
+							</view>
+						</view>
+					</view>
+					<view class="flex justify-between align-center padding-lr-sm">
+						<view></view>
+						<view class="flex padding-tb-sm">
+							<view v-if="item.status == 3" class="btn" @click.stop="finish(item)">确认收货</view>
 							<!-- item.status == 6|| -->
 							<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>
@@ -1134,17 +1186,18 @@ export default {
 </script>
 
 <style scoped>
-.active {
-	/* width: 82rpx; */
+/* .active {
+	
 	height: 16rpx;
 	background: #568d84;
 	position: relative;
 	top: -20rpx;
 	z-index: 9;
-}
+} */
 
 .bg {
-	background-color: #ffffff;
+	/* background: linear-gradient(135deg, #81bdb3 0%, #ecf6ce 100%); */
+	background-color: #fff;
 }
 
 /* 切换选项 */
@@ -1210,7 +1263,6 @@ export default {
 .select {
 	color: #000000;
 	font-weight: bold;
-	background-color: #fff;
 	z-index: 10;
 }
 
@@ -1231,7 +1283,9 @@ export default {
 /* 内容 */
 /* 全部订单 */
 .cont_one {
+	height: calc(100vh - 160rpx);
 	margin-top: 160rpx;
+	background-color: #fff9ed;
 }
 
 /* .cont_one image {
@@ -1558,13 +1612,13 @@ export default {
 }
 
 .order_name {
-	flex: 1;
 	display: flex;
 	justify-content: left;
 	align-items: center;
 	font-weight: bold;
-	font-size: 31rpx;
 	letter-spacing: 1upx;
+	color: #707070;
+	font-size: 24rpx;
 }
 
 .order_data {