no message

common/css/common.css

@@ -468,7 +468,9 @@ text {
 .fc-FE9E11 {
 	color: #FE9E11;
 }
-
+.fc-FF8D28 {
+	color: #FF8D28;
+}
 .fc-FCFBF8 {
 	color: #FCFBF8;
 }
@@ -554,6 +556,10 @@ text {
 	background-color: #FAE9E9;
 }
 
+.bgc-9A9898 {
+	background-color: #9A9898;
+}
+
 .bgc-F5541E {
 	background: linear-gradient(-90deg, #F5811E, #F5541E);
 }
@@ -602,6 +608,10 @@ text {
 	background-color: #FCEDED;
 }
 
+.bgc-FFF3F3 {
+	background-color: #FFF3F3;
+}
+
 .bgc-FAE5E2 {
 	background-color: #FAE5E2;
 }
@@ -799,7 +809,9 @@ text {
 .pb-10 {
 	padding-bottom: 10rpx;
 }
-
+.pb-24 {
+	padding-bottom: 24rpx;
+}
 .p-b-20 {
 	padding-bottom: 20rpx;
 }
@@ -847,7 +859,12 @@ text {
 .p-20-32 {
 	padding: 20rpx 32rpx;
 }
-
+.p-16-32{
+	padding: 16rpx 32rpx;
+}
+.p-32-24{
+	padding: 32rpx 24rpx;
+}
 .p-40-32-16 {
 	padding: 40rpx 32rpx 16rpx;
 }
@@ -1139,6 +1156,9 @@ text {
 .b-FF3333 {
 	border: 1rpx solid #FF3333;
 }
+.b-b-d {
+	border: 1rpx solid #ddd;
+}
 .b-FFD7CC {
 	border: 2rpx solid #FFD7CC;
 }

components/en-utils/new-nav/new-nav.vue

@@ -9,10 +9,10 @@
 					<!-- 文本区 -->
 					<view v-if="textType" class="wx-head-mod-nav-content-mian"
 						:style="{width:navTextWidth,lineHeight:customHeight + 'rpx',paddingLeft:textPaddingLeft*scaleFactor+'rpx',fontSize:fontSize*scaleFactor+'rpx',fontWeight:fontWeight,color:titleColor}">
-						{{textContent}}
+						{{textName}}
 					</view>
 					<view v-else :style="{width:navTextWidth}">
-						<slot name="textContent"></slot>
+						<slot name="textContentSlot"></slot>
 					</view>
 					<!-- 返回按钮 -->
 					<view v-if="leftShow" class="wx-head-mod-nav-content-back"
@@ -51,7 +51,7 @@
 				<view class="other-head-mod-mian-title" :style="{width:windowWidth - 184+'rpx',lineHeight:navHeightValue*scaleFactor+'rpx',
 					paddingLeft:textPaddingLeft*scaleFactor+'rpx',fontSize:fontSize*scaleFactor+'rpx',
 					fontWeight:fontWeight,color:titleColor}">
-					{{textContent}}
+					{{textName}}
 				</view>
 			</view>
 		</view>
@@ -78,9 +78,9 @@
 				default: true
 			},
 			// 文本区内容
-			textContent: {
+			textName: {
 				type: String,
-				default: '哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈就啊哈哈好借好还'
+				default: ''
 			},
 			// 文本区离左边的距离
 			textPaddingLeft: {
@@ -95,7 +95,7 @@
 			// 文本区字体大小
 			fontSize: {
 				type: Number,
-				default: 20 //px
+				default: 18 //px
 			},
 			// 文本区字体粗细
 			fontWeight: {
@@ -241,6 +241,7 @@
 		white-space: nowrap;
 		text-overflow: ellipsis;
 		overflow: hidden;
+		text-align: center;
 	}
 
 	/* 返回按钮 */

pages-order/takeout-info.vue

@@ -1,72 +1,28 @@
 <template>
-	<view class="flex-common-css">
-		<Nav title=" " leftIconColor="#333" titleColor="#333" bgckgroundBox='transparent'></Nav>
-		<image class="bg-img" src="@/static/img/order/bg.png" mode=""></image>
-		<view class="p-24-24-0 box-border-box">
-			<view class="mb-24" v-if="infoData.order_status == 1">
+	<view class="flex-common-css iPhone-bottom box-border-box bgc-F5F4F9">
+		<image class="order-bg" src="@/static/img/order-food/ss-bg.png" mode=""></image>
+		<newNav :textType="false" class="mb-20" leftIconColor='#333'></newNav>
+		<view class="p-24-24-0 box-border-box mb-32">
+			<!-- 			<view class="mb-24" v-if="infoData.order_status == 1">
 				<view class="fs-40 fc-3 mb-8">
 					{{infoData.order_status_str}}，剩余{{time.m}}:{{time.s}}
 				</view>
 				<view class="fs-24 fc-FB3D03">
 					10分钟内未支付，订单将自动取消
 				</view>
-			</view>
-			<view class="mb-24" v-else>
+			</view> -->
+			<view class="z-3">
 				<view class="fs-48 fc-3 fw-600">
 					{{infoData.order_status_str}}
 				</view>
 			</view>
-			<view class="bgc-f b-rad-20 p-24 box-border-box">
-				<view class="p-b-20 mb-24 b-b-F9F9F9 fs-32 fc-3" v-show="infoData.order_status == 1">
-					请尽快支付
-				</view>
-				<view class="p-b-20 mb-24 b-b-F9F9F9 fs-32 fc-3"
-					v-if="infoData.order_status == 8 && infoData.refund_status == 1">
-					申请成功，请及时联系商家退款，避免已出餐
-				</view>
-				<view class="p-b-20 mb-24 b-b-F9F9F9 fs-32 fc-3"
-					v-else-if="infoData.order_status == 3 || infoData.order_status == 7 || infoData.order_status == 8 || infoData.order_status == 9 || infoData.order_status == 10">
-					感谢你对君子校园的信任，期待你再次光临
-				</view>
-				<view class="align-items-center flex-wrap-wrap">
-					<view class="w-33 flex-direction align-items-center" @click="pay"
-						v-show="infoData.order_status == 1">
-						<image class="mb-4 icon" src="@/static/img/order/qzf.png" mode=""></image>
-						<view class="fs-24 fc-41ABF5">
-							去支付
-						</view>
-					</view>
-					<view @click="goToUrl" class="w-33 flex-direction align-items-center"
-						v-show="infoData.order_status == 3 || infoData.order_status == 7 || infoData.order_status == 8 || infoData.order_status == 9 || infoData.order_status == 10">
-						<image class="mb-4 icon" src="@/static/img/order/zlyd.png" mode=""></image>
-						<view class="fs-24 fc-41ABF5">
-							再来一单
-						</view>
-					</view>
-					<view class="w-33 flex-direction align-items-center">
-						<button class="item-box-button" open-type="contact" :bindcontact="handleContact"></button>
-						<image class="mb-4 icon" src="@/static/img/order/lxkf.png" mode=""></image>
-						<view class="fs-24 fc-3">
-							联系客服
-						</view>
-					</view>
-					<view class="w-33 flex-direction align-items-center" @click="contactShop(infoData.shop.shop_phone)">
-						<image class="mb-4 icon" src="@/static/img/order/lxsj.png" mode=""></image>
-						<view class="fs-24 fc-3">
-							联系商家
-						</view>
-					</view>
-					<view class="w-33 flex-direction align-items-center"
-						v-show="infoData.order_status == 2 || infoData.order_status == 4" @click="cancelOrder">
-						<image class="mb-4 icon" src="@/static/img/order/qxdd.png" mode=""></image>
-						<view class="fs-24 fc-3">
-							取消订单
-						</view>
-					</view>
-				</view>
+		</view>
+		<view class="plr-24 box-border-box">
+			<view class="bgc-f b-rad-20 p-32-24 box-border-box fs-36 fw-600 fc-3">
+				取单号：80
 			</view>
 		</view>
-		<scroll-view :scroll-y="true" class="scroll-view-css p-24 box-border-box" @scrolltolower="scrolltolower">
+		<scroll-view :scroll-y="true" class="scroll-view-css box-border-box p-24-24-136-24" @scrolltolower="scrolltolower">
 			<view class="bgc-f b-rad-20 p-24 box-border-box mb-20">
 				<view class="w-420 fc-3 fs-32 fw-600 text-overflow-ellipsis-one mb-24">
 					{{infoData.shop.shop_name}}
@@ -120,7 +76,7 @@
 					<view class="align-items-center">
 						<image class="mr-6 icon-right" src="@/static/img/order/yhq.png" mode=""></image>
 						<view class="fs-28 fc-3">
-							优惠券
+							店铺优惠
 						</view>
 					</view>
 					<view class="fs-32 fc-FB3D03">
@@ -132,7 +88,7 @@
 						共{{infoData.goods_number}}件，
 					</view>
 					<view class="fs-28 fc-3">
-						金额
+						实付
 					</view>
 					<view class="fs-24 fw-600 fc-3">
 						￥
@@ -145,26 +101,10 @@
 			<view class="bgc-f b-rad-20 p-24 box-border-box mb-20">
 				<view class="display-flex flex-justify-space mb-26">
 					<view class="fs-28 fc-9">
-						配送地址
-					</view>
-					<view class="fs-28 fc-3 w-480 text-align-right">
-						{{infoData.school_name}}{{infoData.dorm_name}}{{infoData.address}}{{infoData.consignee}}{{infoData.consignee_tel}}
-					</view>
-				</view>
-				<view class="display-flex flex-justify-space mb-26">
-					<view class="fs-28 fc-9">
-						期望时间
-					</view>
-					<view class="fs-28 fc-3 w-480 text-align-right">
-						{{infoData.time}}
-					</view>
-				</view>
-				<view class="display-flex flex-justify-space pb-20 b-b-F9F9F9 mb-26">
-					<view class="fs-28 fc-9">
-						骑手信息
+						备注
 					</view>
 					<view class="fs-28 fc-3 w-480 text-align-right">
-						{{infoData.rider.rider_name?infoData.rider.rider_name:'无'}}{{infoData.rider.phone}}
+						{{infoData.note?infoData.note:'无'}}
 					</view>
 				</view>
 				<view class="display-flex flex-justify-space mb-26">
@@ -195,57 +135,29 @@
 						{{infoData.pay_type_str}}
 					</view>
 				</view>
-				<view class="display-flex flex-justify-space mb-26" v-if="infoData.order_status == 7">
-					<view class="fs-28 fc-9">
-						送达图片
-					</view>
-					<view v-if="infoData.finish_image" class="fs-28 fc-3 w-480 text-align-right fc-41ABF5" @click="lookFinishImage(infoData.finish_image)">
-						点击查看
-					</view>
-					<view v-else class="">
-						无
-					</view>
-				</view>
-				<view class="display-flex flex-justify-space mb-26" v-if="infoData.order_status == 7">
+				<view class="display-flex flex-justify-space mb-26">
 					<view class="fs-28 fc-9">
-						完成时间
+						桌号
 					</view>
 					<view class="fs-28 fc-3 w-480 text-align-right">
-						{{infoData.finish_time?infoData.finish_time:'无'}}
+						{{infoData.pay_type_str}}
 					</view>
 				</view>
-				<view class="display-flex flex-justify-space mb-26">
+				<view class="display-flex flex-justify-space">
 					<view class="fs-28 fc-9">
-						备注
+						取单号
 					</view>
 					<view class="fs-28 fc-3 w-480 text-align-right">
-						{{infoData.note?infoData.note:'无'}}
+						{{infoData.pay_type_str}}
 					</view>
 				</view>
 			</view>
 		</scroll-view>
-		<uni-popup ref="popupReason" type="bottom" :is-mask-click="false" background-color="#fff" border-radius="10px 10px 0 0">
-			<view class="popup-reason-box flex-direction">
-				<view class="text-align-center fs-38 fw-600 fc-3 mb-18">
-					选择取消原因
-				</view>
-				<picker-view @change="bindChange" class="picker-view flex-1" :immediate-change='true'>
-					<picker-view-column>
-						<view class="picker-view-item" v-for="(item,index) in refundReason" :key="index">
-							{{item.refund_msg}}
-						</view>
-					</picker-view-column>
-				</picker-view>
-				<view class="align-items-center flex-justify-space plr-24 box-border-box">
-					<view class="flex-1 mr-20 pop-b text-align-center fs-36 b-r-ccc" @click="popCancel">
-						取消
-					</view>
-					<view class="flex-1 pop-b text-align-center bgc-41ABF5 fc-f fs-36" @click="popSure">
-						确定
-					</view>
-				</view>
+		<view class="bot-box box-border-box align-items-center flex-justify-end bgc-f">
+			<view class="item-but fc-f fs-28 text-align-center b-rad-200">
+				再来一单
 			</view>
-		</uni-popup>
+		</view>
 	</view>
 </template>
 
@@ -269,7 +181,9 @@
 					name: '2'
 				}],
 				goodsShow: true,
-				infoData: {},
+				infoData: {
+					order_status_str: '商家已接单'
+				},
 				time: {
 					day: '',
 					h: "",
@@ -282,29 +196,12 @@
 				refundReason: [] //退款原因
 			};
 		},
-		onLoad(data) {
-			if (data) {
-				// console.log(data);
-				this.orderInfo(data.orderId)
-			}
-		},
+		onLoad(data) {},
 		mounted() {},
-		onUnload() {
-			const takeOutData = {}
-			orderInfo({
-				order_id: this.infoData.id
-			}).then((res) => {
-				if (res.code == 1) {
-					takeOutData.id = this.infoData.id
-					takeOutData.order_status = res.data.order_status
-					takeOutData.order_status_str = res.data.order_status_str
-					uni.$emit('takeOutData', takeOutData)
-				}
-			})
-		},
+		onUnload() {},
 		methods: {
 			lookFinishImage(img) {
-				tools.lookBigImg(1,img)
+				tools.lookBigImg(1, img)
 			},
 			contactShop(phone) {
 				uni.makePhoneCall({
@@ -365,36 +262,6 @@
 				uni.redirectTo({
 					url: `/pages-takeout/pay-page?orderId=${id}`
 				});
-				// if (this.isAJAX) {
-				// 	return
-				// }
-				// this.isAJAX = true;
-				// orderPay({
-				// 	order_id: id
-				// }).then((ret) => {
-				// 	if (ret.code === 1) {
-				// 		uni.requestPayment({
-				// 			provider: "wxpay", //支付类型-固定值
-				// 			timeStamp: ret.data.wx_pay.timeStamp + "", // 时间戳（单位：秒）
-				// 			nonceStr: ret.data.wx_pay.nonceStr, // 随机字符串
-				// 			package: ret.data.wx_pay.package, // 固定值
-				// 			signType: ret.data.wx_pay.signType, //固定值
-				// 			paySign: ret.data.wx_pay.paySign, //签名
-				// 			success: (ren) => {
-				// 				tools.success("支付成功");
-				// 				this.isAJAX = false;
-				// 				this.orderInfo(this.infoData.id)
-				// 			},
-				// 			fail: (err) => {
-				// 				this.isAJAX = false;
-				// 				tools.error("支付失败");
-				// 			},
-				// 		});
-				// 	} else {
-				// 		this.isAJAX = false;
-				// 		tools.error("支付失败");
-				// 	}
-				// })
 			},
 			cancelOrder() {
 				// 外卖取消订单
@@ -487,6 +354,28 @@
 </script>
 
 <style lang="scss" scoped>
+	.p-24-24-136-24{
+		padding: 24rpx 24rpx 136rpx;
+	}
+	.item-but {
+		width: 200rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+		background: linear-gradient(270deg, #FF3333 0%, #FE6122 100%);
+	}
+	.z-3 {
+		position: relative;
+		z-index: 3;
+	}
+
+	.order-bg {
+		width: 100%;
+		height: 14vh;
+		position: fixed;
+		left: 0;
+		top: 0;
+	}
+
 	.bg-img {
 		position: fixed;
 		left: 0;
@@ -501,17 +390,6 @@
 		position: relative;
 	}
 
-	.item-box-button {
-		position: absolute;
-		width: 100%;
-		height: 88rpx;
-		top: 0;
-		left: 0;
-		z-index: 100;
-		background-color: transparent;
-		border: none !important;
-	}
-
 	button::after {
 		border: none !important;
 	}
@@ -566,6 +444,7 @@
 		height: auto;
 		transition: all .5s linear;
 	}
+
 	.popup-reason-box {
 		width: 100%;
 		height: 45vh;
@@ -575,21 +454,11 @@
 		padding: 24rpx 0 0;
 		box-sizing: border-box;
 	}
-	
-	.picker-view {
+	.bot-box{
 		width: 100%;
-		// height: 70%;
-	}
-	
-	.picker-view-item {
-		// height: 90rpx;
-		line-height: 68rpx;
-		text-align: center;
-		background: #F5F5F5;
-	}
-	.pop-b {
-		height: 80rpx;
-		line-height: 80rpx;
-		border-radius: 20rpx;
+		position: fixed;
+		padding: 16rpx 32rpx calc(env(safe-area-inset-bottom) + 16rpx);
+		bottom: 0;
+		left: 0;
 	}
 </style>

pages-takeout/goods-order.vue

@@ -1,141 +1,122 @@
 <template>
-	<view class="confirm-order-box iPhone-bottom flex-common-css box-border-box">
-		<view class="bg-box"></view>
-		<Nav title='订单支付' bgckgroundBox='transparent'></Nav>
-		<view class="scroll-view-css box-border-box p-24">
-			<view class="box-card box-border-box mb-20 bgc-f">
-				<view class="box-input box-border-box p-b-20 mb-20" @click="selectFun(2)">
-					<view class="flex-justify-space mb-12">
-						<view v-if="addressData.id" class="fs-36 fw-600 text-overflow-ellipsis w570">
-							{{addressData.address||''}}{{addressData.school_name||''}}{{addressData.dorm_name||''}}
+	<view class="flex-common-css iPhone-bottom box-border-box bgc-F5F4F9">
+		<image class="order-bg" src="@/static/img/order-food/order-bg.png" mode=""></image>
+		<newNav textName="提交订单" class="mb-20"></newNav>
+		<view class="scroll-view-css plr-24 box-border-box z-3">
+			<view class="way-box bgc-f b-rad-20 mb-20 p-24 box-border-box">
+				<view class="fc-6 fw-400 fs-28 mb-24">
+					请选择就餐方式
+				</view>
+				<view class="align-items-center">
+					<view class="pl-32 pr-24 box-border-box align-items-center flex-justify-space flex-1 mr-18 b-rad-16"
+						:class="wayType === 1?'bgc-FFF3F3 b-FF3333':'b-b-d'" @click="wayTypeStyle(1)">
+						<view class="fw-600 fs-32" :class="wayType === 1?'fc-FF3333':'fc-3'">
+							堂食
 						</view>
-						<view v-else class="fs-36 fw-600 text-overflow-ellipsis w570">请选择地址</view>
-						<image class="right-icon" src="@/static/img/toRight.png" mode=""></image>
+						<image class="ts-img" src="/static/img/order-food/ts-img.png" mode="aspectFill"></image>
 					</view>
-					<view class="" v-if="addressData.id">
-						<span class="mr-24 fs-28 fc-9">{{addressData.consignee||''}}</span><span
-							class="fs-28 fc-9">{{addressData.phone||''}}</span>
+					<view class="pl-32 pr-24 box-border-box align-items-center flex-justify-space flex-1 b-rad-16"
+						:class="wayType === 2?'bgc-FFF3F3 b-FF3333':'b-b-d'" @click="wayTypeStyle(2)">
+						<view class="fw-600 fs-32" :class="wayType === 2?'fc-FF3333':'fc-3'">
+							打包
+						</view>
+						<image class="ts-img" src="/static/img/order-food/db-img.png" mode="aspectFill"></image>
 					</view>
 				</view>
-				<view class="box-input flex-justify-space align-items-center box-border-box p-b-20 mb-20"
-					@click="selectFun(3)">
-					<view class="fs-28 fw-600">预计送达</view>
-					<view class="align-items-center">
-						<view class="fs-28 fw-400 fc-41ABF5"> {{deliverText?'预计'+ deliverText+ '送达':'选择送达时间'}} </view>
-						<image class="right-icon" src="@/static/img/toRight.png" mode=""></image>
-					</view>
+			</view>
+			<view class="align-items-center b-rad-16 bgc-f mb-20 p-20 box-border-box">
+				<uni-icons type="notification" size="15" color="#FF8D28" class="mr-12"></uni-icons>
+				<view class="fs-24 fc-FF8D28">
+					依据法律规定，18周岁以下未成年人限制购买酒类商品
 				</view>
-				<!-- 				<view class="box-input flex-justify-space box-border-box p-b-20 mb-20">
-					<view class="fs-28 fw-600">配送方式</view>
-					<view class="fs-24 fw-400 sd-box fc-FB3D03">送达宿舍</view>
-				</view> -->
 			</view>
 
-			<view class="box-card box-border-box bgc-f mb-20">
-				<view class="mb-32 b-b-F9F9F9">
-					<!-- <view class="fs-28 fw-600 mb-24">宋氏重庆鸡公煲（重工业店）宋氏重庆鸡公煲（重工业店）宋氏重庆鸡公煲（重工业店）</view> -->
+			<view class="box-card bgc-f b-rad-16 p-24 box-border-box mb-16">
+				<view class="align-items-center flex-justify-space pb-24 b-b-F9F9F9">
+					<view class="fs-28 fc-6">
+						店内点单
+					</view>
+					<view class="align-items-center">
+						<image class="zz-icon mr-4" src="@/static/img/order-food/zz-icon.png" mode=""></image>
+						<view class="fs-28 fc-6">
+							桌号：17
+						</view>
+					</view>
+				</view>
+				<view class="mb-24 b-b-F9F9F9">
 					<view class="flex-justify-space mb-28" v-for="(item,i) in cardData.goods_list" :key="i">
 						<image class="goods-img" :src="item.goods_image" mode="aspectFill"></image>
 						<view class="w376">
-							<view class="fs-28 fw-400 mb-4">
+							<view class="fs-28 fw-600 mb-2">
 								{{item.goods_name}}
 							</view>
-							<view class="fs-24 fc-9 mb-4">{{item.goods_desc}}</view>
+							<view class="fs-24 fc-9 mb-2">{{item.goods_desc}}</view>
 							<view class="fs-24 fc-9">x{{item.goods_number}}</view>
 						</view>
-						<view class="fs-32 fw-600">￥{{item.goods_money}}</view>
+						<view class="fs-32 fw-600 fc-3">￥{{item.goods_money}}</view>
 					</view>
 				</view>
-				<view class="flex-justify-space mb-24">
-					<view class="fs-28 fw-400">打包费</view>
-					<view class="fs-32 fw-600">￥{{cardData.pack_price}}</view>
+				<view class="flex-justify-space mb-30">
+					<view class="fs-28 fw-400">就餐人数</view>
+					<view class="align-items-center" @click="openPop">
+						<view class="fs-32 fw-600 fc-3 mr-4">2人</view>
+						<image class="right-b" src="@/static/img/order-food/right-b.png" mode=""></image>
+					</view>
 				</view>
-				<view class="flex-justify-space mb-24">
-					<view class="fs-28 fw-400">配送费</view>
-					<view class="fs-32 fw-600">￥{{delivery_money}}</view>
+				<view class="flex-justify-space mb-30">
+					<view class="fs-28 fw-400">餐位费</view>
+					<view class="fs-32 fw-600 fc-3">￥4</view>
 				</view>
-				<view class="flex-justify-space mb-24 p-b-20 b-b-F9F9F9" @click="selectFun(1)">
-					<view class="align-items-center">
-						<image class="yhq-icons" src="@/static/img/order/yhq.png" mode=""></image>
-						<view class="fs-28 fw-400">优惠券</view>
-					</view>
-					<view class="align-items-center">
-						<view class="" v-if="!fromData.coupon_id && (receiveLength>0 || CouponLength>0)">
-							<view class="fs-28 fc-ED301D" v-if='CouponLength>0'>
-								有{{CouponLength}}张优惠券可用
-							</view>
-							<view class="fs-28 fc-ED301D" v-else>
-								可领{{receiveLength}}张优惠券
-							</view>
-						</view>
-						<view v-else :class="fromData.coupon_id?'fc-FB3D03 fw-600 fs-32':'fw-400 fs-28'">
-							{{fromData.coupon_id?'-￥'+ quanMoney:'暂无可用优惠券'}}
-						</view>
-						<image class="right-icon" src="@/static/img/toRight.png" mode=""></image>
+				<!-- 				<view class="flex-justify-space mb-30">
+					<view class="fs-28 fw-400">店铺优惠</view>
+					<view class="fs-32 fw-600">￥{{cardData.pack_price}}</view>
+				</view> -->
+				<view class="align-items-center flex-justify-end pt-20 b-t-F9F9F9">
+					<view class="fs-28 fc-0 fw-400 mr-4">
+						应付
 					</view>
-				</view>
-				<view class="text-align-right p-b-20">
-					<span class="fc-9 fs-28">共{{cardData.total_num||0}}件，</span>
-					<span class="fw-400 fc-0 fs-28">合计￥</span>
+					<span class="fw-600 fc-0 fs-28">￥</span>
 					<span
 						class="fw-600 fc-0 fs-44">{{(total_price - quanMoney) < 0?'0':(total_price - quanMoney).toFixed(2)||0}}</span>
 				</view>
 			</view>
 
-
-			<view class="box-card box-border-box bgc-f mb-20">
-				<view class="flex-justify-space b-b-F9F9F9">
-					<view class="fs-28 fw-600 w158 mr-12">备注</view>
+			<view class="p-24 box-border-box bgc-f mb-20 b-rad-20 flex-justify-space">
+					<view class="fs-28 fw-600">备注</view>
 					<input v-model="fromData.note" class="flex-1 text-align-right fs-28" type="text"
-						placeholder="请填写你的备注">
-				</view>
-				<!-- <view class="fs-28 fw-600 mb-16">平台将通过服务通知向你推送最新动态</view>
-				<view class="p-16 bgc-F3F4F6 b-rad-12 tz-an-f">
-					<view class="fc-0 fw-400 fs-24 mb-4">是否电话通知</view>
-					<view class="fc-9 fw-400 fs-24">若开启，则订单送达系统自动曝光（电话）通知</view>
-					<view class="tz-an">
-						<view class="r-right" @click="fromData.is_default == 1?fromData.is_default=0:fromData.is_default=1"
-						:class="fromData.is_default == 0?'n-r':'s-r'">
-							<view class="r-y"></view>
-						</view>
-					</view>
-				</view> -->
-				<view class="p-b-20"></view>
+						placeholder="请填写你的需求">
 			</view>
-
-
-
-<!-- 			<view class="box-card box-border-box mb-20 bgc-f flex-justify-space">
-				<view class="fs-28 fw-600 w158">支付方式</view>
-				<view class="wx-box display-flex">
-					<image src="@/static/img/common/wx-zf.png" mode="scaleToFill"></image>
-					<view class="fs-28 fw-400 ml-10">微信支付</view>
+			<view class="p-24 box-border-box bgc-f mb-20 b-rad-20 flex-justify-space">
+				<view class="fs-28 fw-600">备注</view>
+				<view class="align-items-center">
+					<image class="wx-zf mr-6" src="@/static/img/common/wx-zf.png" mode=""></image>
+					<view class="fs-28 fc-3">
+						微信支付
+					</view>
 				</view>
-			</view> -->
+			</view>
 		</view>
 
-		<view class="bottom-box box-border-box p-24">
-			<view class="flex-justify-space">
-				<view class="align-items-flex-end box-1">
-					<span class="fs-28 fc-f fw-600">￥</span>
-					<span
-						class="fs-44 fc-f fw-600">{{(total_price - quanMoney) < 0?'0':(total_price - quanMoney).toFixed(2)||0}}</span>
+		<view class="plr-24	box-border-box">
+			<view class="bottom-box flex-justify-space align-items-center pl-24 box-border-box pr-8 b-rad-200 bgc-f">
+				<view class="align-items-baseline">
+					<view class="fs-28 fc-3 fw-600">￥</view>
+					<view
+						class="fs-44 fc-3 fw-600">{{(total_price - quanMoney) < 0?'0':(total_price - quanMoney).toFixed(2)||0}}</view>
 				</view>
-				<view class="text-align-center box-2 fs-32 fc-f fw-600" @click="toSave()">立即支付</view>
+				<view class="box-2 text-align-center fc-f fs-32 fw-600 b-rad-200" @click="toSave()">立即支付</view>
 			</view>
 		</view>
-
-		<Coupon ref="coupon" @giveCouPon='giveCouPon' @gbCouopnPop='shopOrderCoupon'></Coupon>
-		<SelectAddress ref="selectAddress" @giveAddress='giveAddress'></SelectAddress>
-		<Time ref="selectTime" @giveTime='giveTime' @timeAndType='timeAndType'></Time>
-		<EditCode ref='editCode' v-model="fromData.pickup_code"></EditCode>
+		
+		<uni-popup ref="popup" type="bottom" background-color="transparent" borderRadius='10px 10px 0 0'>
+			<view class="b-rad-20-20-0-0 bgc-f">
+				
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
 <script>
-	import {
-		getAddressDefault
-	} from '@/api/member.js'
 	import {
 		getShopIngList
 	} from '@/api/shopping.js'
@@ -147,23 +128,11 @@
 		orderPay
 	} from '@/api/order.js'
 	import tools from "@/service/tools";
-	import Coupon from './confirm-mod/coupon.vue';
-	import SelectAddress from './confirm-mod/select-address.vue';
-	import Time from './confirm-mod/time.vue';
-	import EditCode from './confirm-mod/edit-code.vue';
-	import {
-		shopOrderCoupon
-	} from '@/api/shop.js'
 	export default {
-		components: {
-			Coupon,
-			SelectAddress,
-			Time,
-			EditCode
-		},
+		components: {},
 		data() {
 			return {
-				type: 1, //1外卖 2代取 3干洗
+				wayType: 1, //1堂食 2打包
 				fromData: {
 					school_id: '',
 					shop_id: '',
@@ -189,46 +158,19 @@
 				receiveLength: 0 // 可领优惠券数量
 			}
 		},
-		onLoad(e) {
-			// if (e) {
-			// 	this.fromData.shop_id = e.shop_id
-			// 	this.getCard(e.shop_id)
-			// 	// this.getDeliveryMoney(e.shop_id)
-			// }
-			// this.getAddressDefault();
-		},
-		onShow() {
-			// let isConfirmAddressFlag = uni.getStorageSync('isConfirmAddressFlag');
-			// console.log("支付完后走了咩", isConfirmAddressFlag);
-			// if (isConfirmAddressFlag.flag) {
-			// 	this.selectFun(2, isConfirmAddressFlag);
-			// }
-			// this.shopOrderCoupon()
-		},
-		onUnload() {
-			uni.removeStorageSync('isConfirmAddressFlag')
-		},
+		onLoad(e) {},
+		onShow() {},
+		onUnload() {},
 		methods: {
-			shopOrderCoupon(shop_id) {
-				// 下单是获取优惠卷
-				let operate_id = uni.getStorageSync('operate_id');
-				shopOrderCoupon({
-					operate_id: operate_id,
-					shop_id: this.fromData.shop_id
-				}).then((res) => {
-					if (res.code === 1) {
-						if (res.data.coupon.length > 0) {
-							this.CouponLength = res.data.coupon.length
-						} else {
-							this.CouponLength = 0
-						}
-						if (res.data.receive.length > 0) {
-							this.receiveLength = res.data.receive.length
-						} else {
-							this.receiveLength = 0
-						}
-					}
-				})
+			openPop(){
+				this.$refs.popup.open()
+			},
+			wayTypeStyle(type) {
+				if (type === this.wayType) {
+					return
+				} else {
+					this.wayType = type
+				}
 			},
 			getDeliveryMoney(shop_id) {
 				// 获取外卖配送费
@@ -255,40 +197,6 @@
 					}
 				})
 			},
-			// 获取默认地址
-			getAddressDefault() {
-				getAddressDefault().then((res) => {
-					if (res.code === 1) {
-						this.addressData = res.data
-						if (this.addressData.id) {
-							this.fromData.address_id = this.addressData.id;
-						}
-					}
-				})
-			},
-			selectFun(type, addressData) {
-				if (type === 1) {
-					// 选择优惠券
-					this.$refs.coupon.getList(this.type, this.fromData.coupon_id, this.fromData.shop_id);
-				} else if (type === 2) {
-					// 选择地址
-					if (this.addressData.id) {
-						this.$refs.selectAddress.id = this.addressData.id;
-					}
-					if (addressData && addressData.is_default == 1) {
-						this.$refs.selectAddress.id = addressData.id;
-						this.$refs.selectAddress.getList(addressData.id);
-					} else {
-						this.$refs.selectAddress.getList();
-					}
-				} else if (type === 3) {
-					// 选择时间
-					this.$refs.selectTime.getList(this.fromData.shop_id);
-				} else if (type === 4) {
-					// 编辑code
-					this.$refs.editCode.getList();
-				}
-			},
 			giveCouPon(e) {
 				if (e.id) {
 					this.quanMoney = Number(e.money);
@@ -298,86 +206,17 @@
 					this.fromData.coupon_id = 0
 				}
 			},
-			timeAndType(type, time) {
-				// 时间选择
-				this.fromData.type = type
-				this.fromData.time = time
-				if (type == 1) {
-					this.deliverText = '今天' + time
-				} else {
-					this.deliverText = '明天' + time
-				}
-				console.log(type, time, '&&&&&&&&&&&&&&&&&&&&&&&&');
-			},
-			giveAddress(e) {
-				this.addressData = e;
-				this.fromData.address_id = this.addressData.id;
-			},
-			giveTime(e) {
-				console.log(e);
-			},
 			toSave() {
-				if (!this.fromData.address_id) {
-					return tools.error('请先选择地址')
-				}
 				if (this.isAJAX) {
 					return
 				}
 				this.isAJAX = true;
 				this.fromData.school_id = uni.getStorageSync('school_id');
-				// this.fromData.site_id = uni.getStorageSync('site_id');
 				orderCreate(this.fromData).then((res) => {
 					if (res.code === 1) {
 						uni.redirectTo({
 							url: `/pages-takeout/pay-page?orderId=${res.data.order_id}`
 						});
-						// orderPay({
-						// 	order_id: res.data.order_id,
-						// 	pay_type: 1
-						// }).then((ret) => {
-						// 	if (ret.code === 1) {
-						// 		uni.requestPayment({
-						// 			provider: "wxpay", //支付类型-固定值
-						// 			timeStamp: ret.data.wx_pay.timeStamp + "", // 时间戳（单位：秒）
-						// 			nonceStr: ret.data.wx_pay.nonceStr, // 随机字符串
-						// 			package: ret.data.wx_pay.package, // 固定值
-						// 			signType: ret.data.wx_pay.signType, //固定值
-						// 			paySign: ret.data.wx_pay.paySign, //签名
-						// 			success: (ren) => {
-						// 				uni.removeStorageSync('isConfirmAddressFlag')
-						// 				tools.success("支付成功");
-						// 				this.isAJAX = false;
-						// 				setTimeout(() => {
-						// 					uni.switchTab({
-						// 						url: '/pages/order/index'
-						// 					})
-						// 					uni.setStorageSync('orderPayType', 1)
-						// 				}, 1000)
-						// 			},
-						// 			fail: (err) => {
-						// 				uni.removeStorageSync('isConfirmAddressFlag')
-						// 				this.isAJAX = false;
-						// 				tools.error("支付失败");
-						// 				setTimeout(() => {
-						// 					uni.switchTab({
-						// 						url: '/pages/order/index'
-						// 					})
-						// 					uni.setStorageSync('orderPayType', 1)
-						// 				}, 1000)
-						// 			},
-						// 		});
-						// 	} else {
-						// 		uni.removeStorageSync('isConfirmAddressFlag')
-						// 		this.isAJAX = false;
-						// 		tools.error("支付失败");
-						// 		setTimeout(() => {
-						// 			uni.switchTab({
-						// 				url: '/pages/order/index'
-						// 			})
-						// 			uni.setStorageSync('orderPayType', 1)
-						// 		}, 1000)
-						// 	}
-						// })
 					} else {
 						this.isAJAX = false;
 						tools.error(res.msg);
@@ -389,74 +228,40 @@
 </script>
 
 <style scoped lang="scss">
-	.yhq-icons {
+	.wx-zf{
+		width: 40rpx;
+		height: 40rpx;
+	}
+	.zz-icon {
 		width: 32rpx;
 		height: 32rpx;
-		margin: 0 6rpx 0 0;
 	}
 
-	.code-box {
-		min-height: 100rpx;
-		background-color: #F3F4F6;
-		border-radius: 12rpx;
-		padding: 24rpx 24rpx 0 24rpx;
-
-		.code-item {
-			width: 156rpx;
-			margin-right: 52rpx;
-			margin-bottom: 16rpx;
-		}
-
-		.code-item:nth-child(3n) {
-			margin-right: 0 !important;
-		}
+	.right-b {
+		width: 32rpx;
+		height: 32rpx;
 	}
 
-	.tz-an-f {
-		position: relative;
-
-		.tz-an {
-			position: absolute;
-			right: 16rpx;
-			top: 0;
-		}
+	.ts-img {
+		width: 128rpx;
+		height: 128rpx;
 	}
 
-	.r-right {
-		margin-top: 24rpx;
-		width: 88rpx;
-		height: 52rpx;
-		border-radius: 200rpx;
-		position: relative;
-
-		.r-y {
-			width: 44rpx;
-			height: 44rpx;
-			background: #FFFFFF;
-			border-radius: 200rpx;
-			position: absolute;
-			top: 4rpx;
-		}
+	.way-box {
+		box-shadow: 0rpx 8rpx 56rpx 0rpx rgba(154, 152, 152, 0.34);
 	}
 
-	.s-r {
-		background-color: #41ABF5;
-		transition: all 1s;
-
-		.r-y {
-			right: 4rpx !important;
-			transition: all 1s;
-		}
+	.z-3 {
+		position: relative;
+		z-index: 3;
 	}
 
-	.n-r {
-		background-color: #ccc;
-		transition: all 1s;
-
-		.r-y {
-			left: 4rpx !important;
-			transition: all 1s;
-		}
+	.order-bg {
+		width: 100%;
+		height: 15vh;
+		position: fixed;
+		left: 0;
+		top: 0;
 	}
 
 	.goods-img {
@@ -487,60 +292,14 @@
 		border-radius: 8rpx 8rpx 8rpx 8rpx;
 	}
 
-	.confirm-order-box {
-		position: relative;
-
-		.bg-box {
-			width: 100%;
-			height: 448rpx;
-			filter: blur(80rpx);
-			background: linear-gradient(to right, rgba(176, 252, 250, 0.6), rgba(249, 246, 224, 0.87), rgba(249, 246, 224, 0.87));
-			position: absolute;
-			top: 0;
-			left: 0;
-			z-index: -1;
-		}
-
-		.bottom-box {
-			background-color: #fff;
-
-			.box-1 {
-				flex: 1;
-				height: 100rpx;
-				background: #333;
-				border-radius: 200rpx 0rpx 0rpx 200rpx;
-				box-sizing: border-box;
-				padding-left: 32rpx;
-				padding-bottom: 20rpx;
-			}
-
-			.box-2 {
-				width: 200rpx;
-				height: 100rpx;
-				line-height: 100rpx;
-				background: #41ABF5;
-				border-radius: 0rpx 200rpx 200rpx 0rpx;
-				text-align: center;
-			}
-		}
-
-		.box-card {
-			width: 100%;
-			min-height: 88rpx;
-			border-radius: 20rpx;
-			padding: 24rpx 24rpx 0 24rpx;
-		}
-
-		.wx-box {
-			image {
-				width: 40rpx;
-				height: 40rpx;
-			}
-		}
-
-		.box-input {
-			border-bottom: 2rpx solid #F9F9F9;
-
-		}
+	.box-2 {
+		width: 200rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+		background: linear-gradient(270deg, #FF3333 0%, #FE6122 100%);
+	}
+	.bottom-box{
+		width: 100%;
+		height: 96rpx;
 	}
 </style>

pages-takeout/new-shop.vue

@@ -7,11 +7,11 @@
 			:style="{height:newNavHeight+'rpx',opacity:opacity}"></image>
 
 		<newNav :leftShow="false" :textType='false' class="z-4 mb-32" @navHeight='navHeight'>
-			<view slot="textContent" class="align-items-center flex-justify-end">
-				<view class="ss-box b-rad-50 mr-24 align-items-center flex-justify-center">
+			<view slot="textContentSlot" class="align-items-center flex-justify-end">
+				<view class="ss-box b-rad-50 mr-24 align-items-center flex-justify-center z-4" @click.stop="goSearch">
 					<image class="shop-search" src="@/static/img/order-food/shop-search.png" mode=""></image>
 				</view>
-				<view class="dd-box align-items-center flex-justify-center b-rad-200 mr-24">
+				<view class="dd-box align-items-center flex-justify-center b-rad-200 mr-24 z-4" @click="goToOrder">
 					<image class="shp-list-img mr-8" src="@/static/img/order-food/shp-list.png" mode=""></image>
 					<view class="fs-28 fc-f">
 						订单
@@ -99,7 +99,8 @@
 										<image class="wh-44" src="@/static/img/order-food/add-img.png"
 											@click="addred(2,info)" mode=""></image>
 									</view>
-									<view v-else class="right-only-right text-align-center" @click="addred(3,info)">
+									<view v-else class="right-only-right text-align-center b-rad-200"
+										@click="addred(3,info)">
 										<view class="fw-600 fs-28 fc-f">
 											选规格
 										</view>
@@ -115,11 +116,12 @@
 			</view>
 
 			<ShopInfo style="height: 100%;" :shopId='shop_id' v-else-if="shopType === 2"></ShopInfo>
-			
+
 		</view>
 
 		<view v-if="shopType === 1" class="shop-buttom-money box-border-box" @click="openBuyCrad()">
-			<view class="shop-buttom-money-1 bgc-f flex-justify-space align-items-center pl-24 box-border-box pr-8 b-rad-200">
+			<view
+				class="shop-buttom-money-1 bgc-f flex-justify-space align-items-center pl-24 box-border-box pr-8 b-rad-200">
 				<view class="align-items-center">
 					<image class="gwc-img mr-36" src="@/static/img/order-food/gwc-img.png" mode="scaleToFill"></image>
 					<view class="shop-buttom-num bgc-FE6B2C fs-24 fc-f text-align-center">{{cartData.total_num}}</view>
@@ -181,7 +183,8 @@
 						message="快去选购商品吧！~"></en-blank>
 				</view>
 				<view class="pop-shop-buttom-money box-border-box" @click="openBuyCrad()">
-					<view class="shop-buttom-money-1 bgc-f flex-justify-space align-items-center pl-24 box-border-box pr-8 b-rad-200">
+					<view
+						class="shop-buttom-money-1 bgc-f flex-justify-space align-items-center pl-24 box-border-box pr-8 b-rad-200">
 						<view class="align-items-center">
 							<image class="gwc-img mr-36" src="@/static/img/order-food/gwc-img.png" mode="scaleToFill">
 							</image>
@@ -380,10 +383,7 @@
 		onShow() {},
 		onLoad(e) {},
 		mounted() {},
-		onReachBottom(e) {
-			console.log(e, '页面触底了');
-			// uni.$emit('shopBottom',true)
-		},
+		onReachBottom(e) {},
 		// 监听页面滚动
 		onPageScroll(e) {
 			// e.scrollTop 获取滚动条距离页面顶部的距离
@@ -402,6 +402,16 @@
 			}
 		},
 		methods: {
+			goToOrder() {
+				uni.navigateTo({
+					url: 'pages/order/index'
+				})
+			},
+			goSearch() {
+				uni.navigateTo({
+					url: 'pages/index/search-record'
+				})
+			},
 			selectType(item, itemTwo) {
 				if (this.type != item.type) {
 					this.type = item.type;
@@ -492,24 +502,12 @@
 					} else {
 						this.addShoppingSave(item, item.num, type)
 					}
-			
+
 				} else if (type === 3) {
 					// 选规格
-					console.log(item, '000000000')
-					console.log(this.selectedSpecification, '1111111111111');
-					this.selectedSpecification.forEach((v, k) => {
-						if (v.goods_id === item.goods_id) {
-							v.quota_num = item.quota_num
-							v.payNum = item.num
-							v.stock = item.stock
-						}
+					uni.navigateTo({
+						url: 'pages-takeout/new-specs-info'
 					})
-					this.popData.is_quota = item.is_quota
-					this.popData.quota_num = item.quota_num
-					this.popData.is_infinite = item.is_infinite
-					this.popData.payNum = item.num
-					this.popData.stock = item.stock
-					this.getShopGoodsSpec(item)
 				} else {
 					let data = JSON.parse(JSON.stringify(this.popData))
 					this.selectedSpecification.push(data)
@@ -589,7 +587,7 @@
 				});
 			},
 			setShoppingSave(item, type) {
-				console.log(item,'11111111');
+				console.log(item, '11111111');
 				if (type === 1) {
 					// 加
 					item.goods_number = item.goods_number + 1
@@ -1169,10 +1167,9 @@
 			flex: 1;
 
 			.right-only-right {
-				width: 100rpx;
+				width: 116rpx;
 				height: 44rpx;
-				background: linear-gradient(117deg, #57CAFF 0%, #41ABF5 100%);
-				border-radius: 12rpx;
+				background: linear-gradient(270deg, #FF3333 0%, #FE6122 100%);
 				line-height: 44rpx;
 				position: relative;
 

pages.json

@@ -500,8 +500,8 @@
 				"query": "balance=2"
 			},
 			{
-				"name": "店铺详情",
-				"path": "pages-takeout/new-specs-info",
+				"name": "dd",
+				"path": "pages-order/takeout-info",
 				"query": ""
 			}
 		]

pages/index/search-record.vue

@@ -1,18 +1,25 @@
 <template>
-	<view class="seacrh-record-index iPhone-bottom flex-common-css box-border-box">
-		<view class="seacrh-bg"></view>
-		<Nav title='搜索' bgckgroundBox='transparent'></Nav>
-
-		<view class="s-input">
-			<!-- <view class="input-icon">
-				<uni-icons type="search" size="18" color="#999"></uni-icons>
-			</view> -->
-			<image class="wh32" src="@/static/img/index/ss.png" mode=""></image>
-			<input v-model="search" type="text" placeholder="店铺名称或者商品名称">
-			<view class="input-buttom fs-28 fc-f fw-500" @click="toList()">搜索</view>
+	<view class="flex-common-css iPhone-bottom box-border-box bgc-f">
+		<image class="order-bg" src="@/static/img/order-food/ss-bg.png" mode=""></image>
+		<newNav textName="提交订单" class="mb-20" titleColor='#333' leftIconColor='#333'></newNav>
+
+		<view class="plr-24 box-border-box">
+			<view class="s-input box-border-box bgc-f align-items-center flex-justify-space b-rad-200 z-3">
+				<view class="align-items-center flex-1 mr-16">
+					<image class="wh36 mr-16 flex-shrink0" src="/static/img/order-food/ss-icon.png" mode=""></image>
+					<input class="input-box fs-32" placeholder-class="fc-9" v-model="search" type="text"
+						placeholder="请搜索商品" @input="clearInput">
+				</view>
+				<view class="align-items-center">
+					<image v-if="showClearIcon" @click="clearIcon" class="qk-icon mr-24"
+						src="@/static/img/order-food/qk-icon.png" mode="">
+					</image>
+					<view class="input-buttom fs-28 fc-f fw-500 b-rad-200 text-align-center" @click="toList()">搜索</view>
+				</view>
+			</view>
 		</view>
 
-		<view class="scroll-view-css bgc-f seacrh-info box-border-box p-32">
+		<view class="scroll-view-css bgc-f seacrh-info box-border-box p-32" v-if="goodsList.length<=0">
 			<view class="flex-justify-space mb-32">
 				<view class="fs-32 fw-600 fc-3">搜索历史</view>
 				<view class="align-items-center" v-if="list.length > 0 && historyType">
@@ -28,8 +35,70 @@
 				<view class="fs-28 list-item text-overflow-ellipsis-one" @click="toList(item)" v-for="(item,i) in list"
 					:key="i">{{item}}</view>
 			</view>
+		</view>
 
+		<view class="scroll-view-css bgc-F5F4F9 p-32 box-border-box" v-else>
+			<view class="" v-for="(item,i) in goodsList" :key="i">
+				<view class="menu-list flex-justify-space bgc-f p-24 box-border-box b-rad-20 mb-16" v-for="(info,k) in item.list" :key="k"
+					:id="'goods_id'+ info.goods_id">
+					<image class="flex-shrink0 goods_img mr-20" :src="info.goods_image" mode="scaleToFill"></image>
+					<view class="menu-list-right flex-direction flex-justify-space">
+						<view class="mb-8">
+							<view class="mb-4 goods-name text-overflow-ellipsis fs-32 fw-600">
+								{{info.goods_name}}
+							</view>
+							<view class="text-overflow-ellipsis-one fw-400 fc-9 fs-24 mb-2 goods-name"
+								v-if="info.spec_type == 1">
+								{{info.goods_desc?info.goods_desc:''}}
+							</view>
+						</view>
+						<view class="flex-justify-space align-items-flex-end">
+							<view class="">
+								<span class="fs-24 fw-400 fc-3">￥</span>
+								<span
+									class="fs-36 fw-b fc-3">{{info.seckill_money>0?info.seckill_money:info.price}}</span>
+									<span class="fs-24 fc-9">/份起</span>
+							</view>
+							<view class="display-flex align-items-center" v-if="info.spec_type == 1">
+								<image v-show="info.num > 0" class="wh-44" @click="addred(1,info)"
+									src="@/static/img/order-food/reduce-img.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/order-food/add-img.png" @click="addred(2,info)"
+									mode=""></image>
+							</view>
+							<view v-else class="right-only-right text-align-center b-rad-200" @click="addred(3,info)">
+								<view class="fw-500 fs-28 fc-f">
+									选规格
+								</view>
+								<view class="selectedNum" v-if="info.num>0">
+									{{info.num}}
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
 
+		<view v-if="goodsList.length>0" class="shop-buttom-money p-24 box-border-box bgc-F5F4F9" @click="openBuyCrad()">
+			<view
+				class="shop-buttom-money-1 bgc-f flex-justify-space align-items-center pl-24 box-border-box pr-8 b-rad-200">
+				<view class="align-items-center">
+					<image class="gwc-img mr-36" src="@/static/img/order-food/gwc-img.png" mode="scaleToFill"></image>
+					<view class="shop-buttom-num bgc-FE6B2C fs-24 fc-f text-align-center">{{cartData.total_num || 0}}
+					</view>
+					<view class="align-items-baseline">
+						<view class="fw-600 fs-28 fc-3 mr-4">￥</view>
+						<view class="fw-600 fs-48 fc-3">{{cartData.total_price || 0}}</view>
+					</view>
+				</view>
+
+				<view class="shop-buttom-money-2 text-align-center fc-f fs-32 fw-600 b-rad-200"
+					:class="cartData.total_num>0?'':'opacity-4'" @click.stop="toConfirmOrder()">去结算
+				</view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -45,22 +114,68 @@
 			return {
 				search: '',
 				isOpen: false,
+				showClearIcon: false,
 				list: [],
+				goodsList: [{
+					type: 0,
+					name: '测试1',
+					list: [{
+						goods_id: 1,
+						goods_name: '测试商品1-1',
+						price: '10',
+						spec_type: 1,
+						goods_number: 0,
+						goods_image: 'https://qcloud.dpfile.com/pc/JvY4fMzO0Km80S9Sn-tNxYin28jkvrNMJV-pUo8YwCctS4AHLKPXFhGyuI2dCwk8.jpg'
+					}, {
+						goods_id: 2,
+						goods_name: '测试商品1-2',
+						price: '10',
+						goods_image: 'https://qcloud.dpfile.com/pc/JvY4fMzO0Km80S9Sn-tNxYin28jkvrNMJV-pUo8YwCctS4AHLKPXFhGyuI2dCwk8.jpg'
+					}, {
+						goods_id: 3,
+						goods_name: '测试商品1-3',
+						price: '10',
+						goods_image: 'https://qcloud.dpfile.com/pc/JvY4fMzO0Km80S9Sn-tNxYin28jkvrNMJV-pUo8YwCctS4AHLKPXFhGyuI2dCwk8.jpg'
+					}]
+				}, {
+					type: 1,
+					name: '测试2',
+					list: [{
+						goods_id: 4,
+						goods_name: '测试商品2-1',
+						price: '10',
+						goods_image: 'https://qcloud.dpfile.com/pc/JvY4fMzO0Km80S9Sn-tNxYin28jkvrNMJV-pUo8YwCctS4AHLKPXFhGyuI2dCwk8.jpg'
+					}, {
+						goods_id: 5,
+						goods_name: '测试商品2-2',
+						price: '10',
+						goods_image: 'https://qcloud.dpfile.com/pc/JvY4fMzO0Km80S9Sn-tNxYin28jkvrNMJV-pUo8YwCctS4AHLKPXFhGyuI2dCwk8.jpg'
+					}, {
+						goods_id: 6,
+						goods_name: '测试商品2-3',
+						price: '10',
+						goods_image: 'https://qcloud.dpfile.com/pc/JvY4fMzO0Km80S9Sn-tNxYin28jkvrNMJV-pUo8YwCctS4AHLKPXFhGyuI2dCwk8.jpg'
+					}]
+				}],
 				historyType: false
 			}
 		},
-		onShow() {
-			this.getList()
-		},
+		onShow() {},
 		mounted() {},
 		methods: {
+			clearIcon() {
+				this.search = '';
+				this.showClearIcon = false;
+			},
+			clearInput(event) {
+				this.search = event.detail.value;
+				if (event.detail.value.length > 0) {
+					this.showClearIcon = true;
+				} else {
+					this.showClearIcon = false;
+				}
+			},
 			history() {
-				// uni.createSelectorQuery().select('.search-history').boundingClientRect(data => {
-				// 	if (data.height > 116) {
-				// 		this.historyType = true
-				// 	}
-				// 	console.log(this.historyType);
-				// }).exec()
 				const query = uni.createSelectorQuery().in(this)
 				query
 					.select('.search-history')
@@ -68,7 +183,6 @@
 						console.log(data.height)
 					})
 					.exec();
-
 			},
 			getList() {
 				getSearchList().then((res) => {
@@ -104,101 +218,197 @@
 </script>
 
 <style scoped lang="scss">
-	.seacrh-record-index {
+	.qk-icon {
+		width: 32rpx;
+		height: 32rpx;
+	}
+
+	.shop-buttom-money {
+		width: 100%;
+		// height: 140rpx;
+	}
+
+	.shop-buttom-money-1 {
+		width: 100%;
+		height: 96rpx;
 		position: relative;
+	}
 
-		.hide-h {
-			height: 232rpx !important;
-			overflow: hidden !important;
-		}
+	.shop-buttom-money-2 {
+		width: 200rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+		background: linear-gradient(270deg, #FF3333 0%, #FE6122 100%);
+	}
 
-		.down {
-			transform: rotate(-90deg);
-			transition: all 0.5s;
-		}
+	.gwc-img {
+		width: 88rpx;
+		height: 88rpx;
+	}
 
-		.up {
-			transform: rotate(90deg);
-			transition: all 0.5s;
-		}
+	.shop-buttom-num {
+		width: 32rpx;
+		height: 32rpx;
+		line-height: 32rpx;
+		border-radius: 50%;
+		position: absolute;
+		top: 0rpx;
+		left: 85rpx;
+		border: 1rpx solid #FFFFFF;
+	}
 
-		.view-x {
-			width: 2rpx;
-			height: 20rpx;
-			background-color: #eee;
-			margin: 0 24rpx;
-		}
+	.z-3 {
+		position: relative;
+		z-index: 3;
+	}
 
-		.find-item {
-			width: 48%;
-			text-align: left;
-		}
+	.order-bg {
+		width: 100%;
+		height: 17vh;
+		position: fixed;
+		left: 0;
+		top: 0;
+	}
 
-		.list-item {
-			max-height: 688rpx;
-			min-width: 10rpx;
-			height: 56rpx;
-			line-height: 56rpx;
-			background: #F7F8FC;
-			border-radius: 200rpx;
-			margin: 0 8rpx 32rpx 0;
-			box-sizing: border-box;
-			padding: 0 24rpx;
-		}
+	.hide-h {
+		height: 232rpx !important;
+		overflow: hidden !important;
+	}
+
+	.down {
+		transform: rotate(-90deg);
+		transition: all 0.5s;
+	}
+
+	.up {
+		transform: rotate(90deg);
+		transition: all 0.5s;
+	}
+
+	.view-x {
+		width: 2rpx;
+		height: 20rpx;
+		background-color: #eee;
+		margin: 0 24rpx;
+	}
+
+	.find-item {
+		width: 48%;
+		text-align: left;
+	}
+
+	.list-item {
+		max-height: 688rpx;
+		min-width: 10rpx;
+		height: 56rpx;
+		line-height: 56rpx;
+		background: #F7F8FC;
+		border-radius: 200rpx;
+		margin: 0 8rpx 32rpx 0;
+		box-sizing: border-box;
+		padding: 0 24rpx;
+	}
+
+	.seacrh-bg {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 376rpx;
+		filter: blur(80rpx);
+		background-image: linear-gradient(to right, #C9F7FC, #F9F6E0, #F6F5F3);
+		z-index: -1;
+	}
+
+	.wh36 {
+		width: 36rpx;
+		height: 36rpx;
+	}
+
+	.input-box {
+		width: 100%;
+	}
 
-		.seacrh-bg {
-			position: absolute;
-			top: 0;
-			left: 0;
-			width: 100%;
-			height: 376rpx;
-			filter: blur(80rpx);
-			background-image: linear-gradient(to right, #C9F7FC, #F9F6E0, #F6F5F3);
-			z-index: -1;
+	.input-buttom {
+		width: 120rpx;
+		height: 60rpx;
+		background: linear-gradient(270deg, #FF3333 0%, #FE6122 100%);
+		line-height: 60rpx;
+	}
+
+	.s-input {
+		width: 100%;
+		height: 72rpx;
+		padding: 6rpx 6rpx 6rpx 24rpx;
+	}
+
+	.seacrh-info {
+		margin-top: 20rpx;
+		border-radius: 24rpx 24rpx 0rpx 0rpx;
+	}
+
+	.seacrh-record-index {
+		position: relative;
+	}
+
+	.wh-44 {
+		width: 44rpx;
+		height: 44rpx;
+	}
+
+	.menu-list {
+		width: 100%;
+
+		.goods_img {
+			width: 168rpx;
+			height: 168rpx;
+			border-radius: 12rpx;
 		}
 
-		.s-input {
-			margin-top: 24rpx;
-			width: 100%;
-			height: 72rpx;
-			padding: 0 24rpx;
-			box-sizing: border-box;
-			position: relative;
-
-			.wh32 {
-				position: absolute;
-				left: 48rpx;
-				top: 20rpx;
-				width: 32rpx;
-				height: 32rpx;
+		.menu-list-right {
+			flex: 1;
+
+			.right-only-right {
+				width: 116rpx;
+				height: 44rpx;
+				background: linear-gradient( 270deg, #FF3333 0%, #FE6122 100%);
+				line-height: 44rpx;
+				position: relative;
+
+				.selectedNum {
+					position: absolute;
+					right: 2rpx;
+					top: -22rpx;
+					font-size: 24rpx;
+					color: #fff;
+					width: 32rpx;
+					height: 32rpx;
+					line-height: 32rpx;
+					background: #FB3D03;
+					border-radius: 50%;
+				}
 			}
 
-			input {
-				font-size: 32rpx;
-				width: 100%;
-				height: 72rpx;
-				background: #FFFFFF;
-				border-radius: 200rpx;
-				box-sizing: border-box;
-				padding: 0 126rpx 0 78rpx;
+			.right-only-right-red {
+				width: 44rpx;
+				height: 44rpx;
+				line-height: 40rpx;
+				border-radius: 12rpx;
+				border: 1rpx solid #41ABF5;
+				color: #41ABF5;
 			}
 
-			.input-buttom {
-				width: 120rpx;
-				height: 60rpx;
-				background: linear-gradient(90deg, #57CAFF 0%, #41ABF5 100%);
-				border-radius: 200rpx;
-				text-align: center;
-				line-height: 60rpx;
-				position: absolute;
-				right: 30rpx;
-				top: 6rpx;
+			.right-only-right-add {
+				width: 44rpx;
+				height: 44rpx;
+				line-height: 40rpx;
+				background: linear-gradient(117deg, #57CAFF 0%, #41ABF5 100%);
+				border-radius: 12rpx;
 			}
-		}
 
-		.seacrh-info {
-			margin-top: 20rpx;
-			border-radius: 24rpx 24rpx 0rpx 0rpx;
+			.right-only-right-2 {
+				min-width: 50rpx;
+			}
 		}
 	}
 </style>

pages/order/index.vue

@@ -1,28 +1,8 @@
 <template>
-	<view class="flex-common-css box-border-box">
-		<Nav class="nav-b" :leftShow='false' :customNav='true' bgckgroundBox='#fff'>
-			<template>
-				<view slot="custom" class="text-align-center fw-600 fs-36">
-					我的订单
-				</view>
-			</template>
-		</Nav>
-		<view class="nav-box box-border-box bgc-f display-flex">
-			<view class="nav-item flex-1 text-align-center" :class="type == item.id?'fs-36 fw-600':'fs-34 fw-400'"
-				v-for="(item,i) in navList" :key="i" @click="selectType(item.id)">
-				{{item.name}}
-				<view v-if="type == item.id" class="nav-item-x"></view>
-			</view>
-		</view>
-		<scroll-view class="nav-type-box bgc-f p-12-24 box-border-box" :scroll-x="true">
-			<view class="nav-type-item text-align-center fs-28" v-for="(item,index) in navTypeData"
-				@click="navTypeClick(item.key)"
-				:class="navTypeKey== item.key?'bgc-E4F3FD fw-600 fc-41ABF5':'bgc-F4F5F7 fw-400 fc-3'">
-				{{item.name}}
-			</view>
-		</scroll-view>
+	<view class="flex-common-css iPhone-bottom box-border-box bgc-F5F4F9">
+		<newNav textName="订单" navBackgroundColor='#fff' titleColor='#333' leftIconColor="#333"></newNav>
 
-		<view v-if="list.length == 0" class="scroll-view-css">
+		<view v-if="list.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>
@@ -31,44 +11,25 @@
 		</view>
 
 		<scroll-view v-else :scroll-y="true" class="scroll-view-css" @scrolltolower="scrolltolower">
-			<view class="list-box">
+			<view class="list-box p-20 box-border-box">
 				<view class="list-item bgc-f b-rad-20 mb-32 p-24 box-border-box" v-for="(item,index) in list"
 					@click="goToInfo(item)">
 					<view class="align-items-center flex-justify-space mb-24">
 						<view class="align-items-center">
-							<image v-if="item.site_logo" class="shops-img" :src="item.site_logo" mode="aspectFit">
-							</image>
-							<image v-else-if="item.shop_logo" class="shops-img" :src="item.shop_logo" mode="aspectFit">
-							</image>
-							<image v-else-if="item.errands.img" class="shops-img" :src="item.errands.img"
-								mode="aspectFit">
-							</image>
-							<image v-else class="shops-img" src="@/static/img/logo/logo.png" mode=""></image>
-							<view v-if="item.site_name" class="fs-32 fc-3 fw-600 shops-name text-overflow-ellipsis-one">
-								{{item.site_name}}
-							</view>
-							<view @click="goToShop(item)" v-else-if="item.shop_name"
-								class="fs-32 fc-3 fw-600 shops-name text-overflow-ellipsis-one">
+							<image class="shops-img mr-4" src="@/static/img/order-food/shop-icon.png" mode=""></image>
+							<view class="fs-30 fc-3 fw-600 shops-name text-overflow-ellipsis-one">
 								{{item.shop_name}}
 							</view>
-							<view v-else-if="item.errands.name"
-								class="fs-32 fc-3 fw-600 shops-name text-overflow-ellipsis-one">
-								{{item.errands.name}}
-							</view>
-							<view v-else class="fs-32 fc-3 fw-600 shops-name text-overflow-ellipsis-one">
-								君子校园
-							</view>
-							<!-- <image class="icons" src="@/static/img/toRight.png" mode=""></image> -->
 						</view>
 						<view class="fc-41ABF5 fs-28">
 							{{item.order_status_str}}
 						</view>
 					</view>
 					<view class="align-items-center flex-justify-space mb-24">
-						<view class="goods-box" v-if="type == 1 || type == 2 || type == 5">
+						<view class="goods-box">
 							<view class="" v-if="item.item.length == 1">
 								<view class="align-items-center" v-for="(itemGoods,indexGoods) in item.item">
-									<image class="goods-img flex-shrink0" :src="itemGoods.goods_img" mode="aspectFit">
+									<image class="goods-img flex-shrink0" :src="itemGoods.goods_img" mode="aspectFill">
 									</image>
 									<view class="fs-28 fc-6 text-overflow-ellipsis">
 										{{itemGoods.goods_name}}
@@ -77,7 +38,7 @@
 							</view>
 							<view class="align-items-center goods-two" v-else>
 								<view class="flex-direction" v-for="(itemGoods,indexGoods) in item.item">
-									<image class="goods-img flex-shrink0" :src="itemGoods.goods_img" mode="aspectFit">
+									<image class="goods-img flex-shrink0" :src="itemGoods.goods_img" mode="aspectFill">
 									</image>
 									<view
 										class="fs-28 fc-6 text-overflow-ellipsis-one goods-two-name text-align-center">
@@ -86,28 +47,7 @@
 								</view>
 							</view>
 						</view>
-						<view class="" v-else-if='type == 3'>
-							<view class="align-items-center">
-								<image class="goods-img flex-shrink0" :src="item.goods_img" mode="aspectFit">
-								</image>
-								<view class="fs-28 fc-6 text-overflow-ellipsis">
-									{{item.goods_name}}
-								</view>
-							</view>
-						</view>
-						<view class="" v-else='type === 4'>
-							{{item.serve_desc}}
-						</view>
-						<view class="goods-box" v-else>
-							<view class="align-items-center">
-								<image class="goods-img flex-shrink0" :src="item.goods_img" mode="aspectFit">
-								</image>
-								<view class="fs-28 fc-6 text-overflow-ellipsis">
-									{{item.goods_name}}
-								</view>
-							</view>
-						</view>
-						<view class="goods-num text-align-center" v-if="type != 4">
+						<view class="goods-num fc-6 fs-24 text-align-center">
 							共 {{item.goods_number}} 件
 						</view>
 					</view>
@@ -115,104 +55,23 @@
 						<view class="fs-24 fc-9">
 							下单时间：{{item.created_at}}
 						</view>
-						<view class="fs-28 fc-9">
-							{{item.order_status == 1?'需付':'实付'}} <text
-								class="fs-32 fc-3 fw-600">￥{{item.pay_money}}</text>
+						<view class="align-items-center">
+							<view class="fs-28 fc-9">
+								实付
+							</view>
+							<view class="fs-32 fc-3 fw-600">
+								￥{{item.pay_money}}
+							</view>
 						</view>
 					</view>
 					<view class="align-items-center flex-justify-end">
-						<view class="item-but but-class-two fs-28 mr-18" @click="assess(item)"
-							v-if="type == 1 && item.order_status == 7 && item.is_comment == 0">
-							评价
-						</view>
-						<view class="item-but but-class-two fs-28 mr-18" @click.stop="tackOut(item)"
-							v-if="type == 1 && item.order_status == 2 || type == 1 && item.order_status == 4">
-							<!-- 外卖 -->
-							取消订单
-						</view>
-						<view class="item-but but-class-two fs-28 mr-18" @click.stop="cancel(item)"
-							v-if="type == 4 && item.order_status == 2">
-							<!-- 跑腿 -->
-							取消订单
-						</view>
-						<view class="item-but but-class-two fs-28 mr-18" @click.stop="expressCancel(item)"
-							v-if="type == 2 && item.order_status == 2">
-							<!-- 代取 -->
-							取消订单
-						</view>
-						<view class="item-but but-class-one fs-28 mr-18" @click.stop="orderPay(item)"
-							v-if="item.order_status == 1">
-							立即支付
-						</view>
-						<view class="item-but but-class-one fs-28" @click.stop="openCode(item)"
-							v-if="type == 5 && item.order_status == 2 || type == 5 && item.order_status == 4">
-							二维码
-						</view>
-						<view class="item-but but-class-two fs-28 mr-18" @click.stop="goCode(item)"
-							v-if="type == 3 && item.order_status == 2">
-							<!-- 代取 -->
-							查看券码
-						</view>
-						<view @click.stop="goToUrl('takeOut', item)" class="item-but but-class-one fs-28 mr-18"
-							v-if="type == 1 && item.order_status == 3 || type == 1 && item.order_status == 7 || type == 1 && item.order_status == 8 || type == 1 && item.order_status == 9 || type == 1 && item.order_status == 10">
-							<!-- 外卖 -->
-							再来一单
-						</view>
-						<view @click.stop="goToUrl('express', item)" class="item-but but-class-one fs-28 mr-18"
-							v-if="type == 2 && item.order_status == 4 || type == 2 && item.order_status == 5 || type == 2 && item.order_status == 6">
-							<!-- 代取 -->
-							再来一单
-						</view>
-						<view @click.stop="goToUrl('group', item)" class="item-but but-class-one fs-28 mr-18"
-							v-if="type == 3 && item.order_status == 2 || type == 3 && item.order_status == 4">
-							<!-- 团购 -->
-							再来一单
-						</view>
-						<view @click.stop="goToUrl('errands', item)" class="item-but but-class-one fs-28 mr-18"
-							v-if="type == 4 && item.order_status == 2 || type == 4 && item.order_status == 4">
-							<!-- 跑腿 -->
-							再来一单
-						</view>
-						<view @click.stop="goToUrl('laundry', item)" class="item-but but-class-one fs-28 mr-18"
-							v-if="type == 5 && item.order_status == 5 || type == 5 && item.order_status == 6 || type == 5 && item.order_status == 7">
-							<!-- 干洗 -->
+						<view @click.stop="goToUrl('takeOut', item)" class="item-but but-class-one fs-28">
 							再来一单
 						</view>
 					</view>
 				</view>
 			</view>
 		</scroll-view>
-		<uni-popup ref="popup" border-radius="10px 10px 10px 10px" @maskClick='maskClick'>
-			<view class="bgc-f p-16 box-border-box b-rad-20" v-if="qrcodeData">
-				<!-- <UniQrcode :text="qrcodeData"></UniQrcode> -->
-				<uv-qrcode class="b-rad-20" ref="qrcode" :value="qrcodeData" :options="options2"></uv-qrcode>
-				<view class="text-align-center fs-38">
-					{{onlyCode}}
-				</view>
-			</view>
-		</uni-popup>
-		<uni-popup ref="popupReason" type="bottom" :is-mask-click="false" background-color="#fff" border-radius="10px 10px 0 0">
-			<view class="popup-reason-box flex-direction">
-				<view class="text-align-center fs-38 fw-600 fc-3 mb-18">
-					选择取消原因
-				</view>
-				<picker-view @change="bindChange" class="picker-view flex-1" :immediate-change='true'>
-					<picker-view-column>
-						<view class="picker-view-item" v-for="(item,index) in refundReason" :key="index">
-							{{item.refund_msg}}
-						</view>
-					</picker-view-column>
-				</picker-view>
-				<view class="align-items-center flex-justify-space">
-					<view class="flex-1 mr-20 pop-b text-align-center fs-36 b-r-ccc" @click="popCancel">
-						取消
-					</view>
-					<view class="flex-1 pop-b text-align-center bgc-41ABF5 fc-f fs-36" @click="popSure">
-						确定
-					</view>
-				</view>
-			</view>
-		</uni-popup>
 	</view>
 </template>
 
@@ -263,25 +122,39 @@
 		data() {
 			return {
 				type: 1,
-				navList: [{
-						name: '外卖',
-						id: 1
-					},
-					{
-						name: '代取',
-						id: 2
-					},
-					{
-						name: '团购',
-						id: 3
+				page: 1,
+				list: [{
+						shop_name: '古茗(回兴店)古茗(回兴店)古茗1...',
+						order_status_str: '商家已接单',
+						goods_number: 1,
+						created_at: '2024.12.05 12:30:09',
+						pay_money: '20',
+						item: [{
+							goods_img: 'https://qcloud.dpfile.com/pc/JvY4fMzO0Km80S9Sn-tNxYin28jkvrNMJV-pUo8YwCctS4AHLKPXFhGyuI2dCwk8.jpg',
+							goods_name: '茉莉花茶茉莉花茶茉莉1111花 茉莉花茶茉莉花茶茉1111...'
+						}]
 					},
 					{
-						name: '跑腿',
-						id: 4
+						shop_name: '古茗(回兴店)古茗(回兴店)古茗1...',
+						order_status_str: '商家已接单',
+						goods_number: 1,
+						created_at: '2024.12.05 12:30:09',
+						pay_money: '20',
+						item: [{
+							goods_img: 'https://qcloud.dpfile.com/pc/JvY4fMzO0Km80S9Sn-tNxYin28jkvrNMJV-pUo8YwCctS4AHLKPXFhGyuI2dCwk8.jpg',
+							goods_name: '茉莉花茶茉莉花茶茉莉1111花 茉莉花茶茉莉花茶茉1111...'
+						}, {
+							goods_img: 'https://qcloud.dpfile.com/pc/JvY4fMzO0Km80S9Sn-tNxYin28jkvrNMJV-pUo8YwCctS4AHLKPXFhGyuI2dCwk8.jpg',
+							goods_name: '茉莉花茶茉莉花茶茉莉1111花 茉莉花茶茉莉花茶茉1111...'
+						}, {
+							goods_img: 'https://qcloud.dpfile.com/pc/JvY4fMzO0Km80S9Sn-tNxYin28jkvrNMJV-pUo8YwCctS4AHLKPXFhGyuI2dCwk8.jpg',
+							goods_name: '茉莉花茶茉莉花茶茉莉1111花 茉莉花茶茉莉花茶茉1111...'
+						}, {
+							goods_img: 'https://qcloud.dpfile.com/pc/JvY4fMzO0Km80S9Sn-tNxYin28jkvrNMJV-pUo8YwCctS4AHLKPXFhGyuI2dCwk8.jpg',
+							goods_name: '茉莉花茶茉莉花茶茉莉1111花 茉莉花茶茉莉花茶茉1111...'
+						}]
 					}
 				],
-				page: 1,
-				list: [],
 				total: 0,
 				navTypeData: [],
 				navTypeKey: 0,
@@ -295,43 +168,10 @@
 				sureType: 0
 			};
 		},
-		onShow() {
-			setTimeout(() => {
-				uni.showTabBar()
-			}, 400)
-			let orderPayType = uni.getStorageSync('orderPayType')
-			let orderInfoType = uni.getStorageSync('orderInfoType')
-			console.log(orderPayType, 'orderPayType');
-			console.log(orderInfoType, 'orderInfoType');
-			if (orderPayType) {
-				this.selectType(orderPayType)
-				console.log('固定type');
-			} else if (orderInfoType) {
-				this.resetList();
-			} else {
-				this.resetList();
-			}
-			uni.$on('takeOutData', (data) => {
-				console.log(data, '^^^^^^^^^^^^^^^^^^^^^^^^^');
-				this.list.forEach((v, k) => {
-					if (v.id == data.id) {
-						v.order_status = data.order_status
-						v.order_status_str = data.order_status_str
-					}
-				})
-				this.$forceUpdate()
-				uni.removeStorageSync('orderInfoType')
-				console.log(this.list, 'this.list');
-			})
-		},
+		onShow() {},
 		onLoad() {},
-		onHide() {
-			console.log("onHide");
-			uni.removeStorageSync('orderPayType')
-		},
-		onUnload() {
-			console.log("onUnload");
-		},
+		onHide() {},
+		onUnload() {},
 		mounted() {},
 		methods: {
 			goCode(item) {
@@ -389,28 +229,9 @@
 				}
 			},
 			goToInfo(item) {
-				if (this.type === 1) {
-					uni.navigateTo({
-						url: `/pages-order/takeout-info?orderId=` + item.id
-					})
-				} else if (this.type === 2) {
-					uni.navigateTo({
-						url: `/pages-order/express-info?orderId=` + item.id
-					})
-				} else if (this.type === 3) {
-					uni.navigateTo({
-						url: `/pages-order/group-info?orderId=` + item.id
-					})
-				} else if (this.type === 4) {
-					uni.navigateTo({
-						url: `/pages-order/run-errands-info?orderId=` + item.id
-					})
-				} else if (this.type === 5) {
-					uni.navigateTo({
-						url: `/pages-order/laundry-info?orderId=` + item.id
-					})
-				}
-				uni.setStorageSync('orderInfoType', this.type)
+				uni.navigateTo({
+					url: `/pages-order/takeout-info?orderId=` + item.id
+				})
 			},
 			orderPay(item) {
 				// 立即支付
@@ -1088,20 +909,13 @@
 		margin: 0;
 	}
 
-	.list-box {
-		padding: 20rpx;
-		box-sizing: border-box;
-	}
-
 	.shops-img {
 		width: 48rpx;
 		height: 48rpx;
-		margin: 0 8rpx 0 0;
-		border-radius: 50%;
 	}
 
 	.shops-name {
-		max-width: 452rpx;
+		max-width: 422rpx;
 		margin: 0 8rpx 0 0;
 	}
 
@@ -1145,7 +959,7 @@
 	}
 
 	.but-class-one {
-		background: linear-gradient(225deg, #41ABF5 0%, #5BD8FB 100%);
+		background: linear-gradient(270deg, #FF3333 0%, #FE6122 100%);
 		color: #fff;
 	}