no message

pages-buy/group-mod/shop-list.vue

@@ -19,7 +19,7 @@
 							{{item.shop_name}}
 						</view>
 						<view class="align-items-center">
-							<image class="dw mr-8" src="@/static/img/group/jl.png" mode=""></image>
+							<image class="dw mr-8" src="/pages-buy/static/jl.png" mode=""></image>
 							<view class="fs-24 fc-a">
 								{{item.address}}
 							</view>
@@ -46,7 +46,7 @@
 					:key="goodsIndex">
 					<view class="align-items-center">
 						<view class="mr-8 discount-box flex-shrink0 text-align-center">
-							<image class="zkbg-img" src="@/static/img/group/zkbg.png" mode=""></image>
+							<image class="zkbg-img" src="/pages-buy/static/zkbg.png" mode=""></image>
 							<view class="zkje fs-24 fc-f">
 								{{toFixedOne(goodsItem.price,goodsItem.line_price)}}折
 							</view>

pages-buy/group.vue

@@ -1,14 +1,14 @@
 <template>
 	<view class="group-box iPhone-bottom box-border-box flex-common-css">
 		<Nav class="nav-b" title='团购专区' bgckgroundBox='transparent' leftColor='#fff' titleColor='#fff'></Nav>
-		<image class="group-bg" src="@/static/img/group/bg.png" mode=""></image>
+		<image class="group-bg" src="/pages-buy/static/group-bg.png" mode=""></image>
 		<scroll-view :scroll-y="true" class="scroll-view-box" @scroll='scroll' @scrolltolower="scrolltolower"
 			:scroll-top='scroll_top' :scroll-with-animation="false">
 			<view class="">
 				<view class="box-border-box p-12-24 search-box">
 					<view class="head-search align-items-center">
 						<!-- <uni-icons class="s-icon" type="search" size="19"></uni-icons> -->
-						<image class="wh-32" src="@/static/img/group/ss.png" mode=""></image>
+						<image class="wh-32" src="/pages-buy/static/ss.png" mode=""></image>
 						<input class="input" v-model="fromData.search" type="text" placeholder="请输入搜索关键字"
 							placeholder-class="fs-24">
 						<view class="head-search-buttom text-align-center fs-28 fw-400 fc-f" @click="searchFun()">搜索
@@ -17,9 +17,9 @@
 				</view>
 				<view class="p-12-30 box-border-box class-b">
 					<view class="class-bg-box">
-						<image class="class-bg" src="@/static/img/group/fl-bg.png" mode=""></image>
+						<image class="class-bg" src="/pages-buy/static/fl-bg.png" mode=""></image>
 						<view class="align-items-center box-border-box class-box-head">
-							<image class="qbfl mr-18" src="@/static/img/group/qbfl.png" mode=""></image>
+							<image class="qbfl mr-18" src="/pages-buy/static/qbfl.png" mode=""></image>
 							<view class="fs-24 fc-FF5022 fw-400">
 								特价拼团尽您选择！
 							</view>
@@ -45,7 +45,7 @@
 							<view class="fs-28 fc-FCFBF8 mr-12">
 								{{siftDistance}}
 							</view>
-							<image class="bottom-icon" src="@/static/img/group/bottom.png" mode=""></image>
+							<image class="bottom-icon" src="/pages-buy/static/bottom.png" mode=""></image>
 						</view>
 					</view>
 					<view class="mr-12 sift-item align-items-center flex-justify-center "
@@ -54,7 +54,7 @@
 							<view class="fs-28 fc-FCFBF8 mr-12">
 								{{siftSort}}
 							</view>
-							<image class="bottom-icon" src="@/static/img/group/bottom.png" mode=""></image>
+							<image class="bottom-icon" src="/pages-buy/static/bottom.png" mode=""></image>
 						</view>
 					</view>
 					<view class="pop-content" :style="[{'top': pop_top + 'px'}]"

pages-buy/save-ticket.vue

@@ -1,354 +0,0 @@
-<template>
-	<view class="save-order-box iPhone-bottom flex-common-css box-border-box">
-		<view class="bg-box"></view>
-		<Nav title='提交订单' bgckgroundBox='transparent'></Nav>
-
-		<view class="scroll-view-css box-border-box p-24">
-			<view class="box-card box-border-box mb-20 bgc-f">
-				<view class="box-input align-items-center box-border-box p-b-20 mb-20">
-					<view class="fs-28 fw-600 w158">姓名</view>
-					<input v-model="fromData.name" type="text" placeholder="请输入姓名">
-				</view>
-				<view class="box-input align-items-center box-border-box p-b-20 mb-20">
-					<view class="fs-28 fw-600 w158">手机号</view>
-					<input v-model="fromData.phone" type="number" placeholder="请输入手机号">
-					<view class="fs-28 fc-41ABF5 code-box" @click="getCode()">{{codeText}}{{isCode?'s':''}}</view>
-				</view>
-				<view class="box-input align-items-center box-border-box p-b-20 mb-20">
-					<view class="fs-28 fw-600 w158">验证码</view>
-					<input v-model="fromData.code" type="number" placeholder="请输入验证码">
-
-				</view>
-				<view class="box-input align-items-center box-border-box p-b-20 mb-20">
-					<view class="fs-28 fw-600 w158">联系地址</view>
-					<input v-model="fromData.address" type="text" placeholder="请输入联系地址（选填）">
-				</view>
-			</view>
-
-			<view class="box-card box-border-box mb-20 bgc-f">
-				<view class="box-top box-border-box flex-justify-space">
-					<view class="box-left display-flex">
-						<image :src="goodsData.cover_img" mode="aspectFill"></image>
-						<view class="w336 fs-28 fw-400">{{goodsData.title||''}}</view>
-					</view>
-					<view class="box-right">
-						<view class="fs-32 fw-600 text-align-right mb-12">￥{{goodsData.price||''}}</view>
-						<view class="display-flex align-items-center">
-							<!-- 							<view class="right-only-right-red fw-500 text-align-center fs-36 fc-f" @click="setNum(1)">-
-							</view> -->
-							<image class="wh-44" @click="setNum(1)" src="@/static/img/takeout/j.png" mode=""></image>
-							<view class="right-only-right-2 text-align-center fs-28 fw-400">{{fromData.number}}</view>
-							<image class="wh-44" src="@/static/img/takeout/add.png" @click="setNum(2)" mode=""></image>
-							<!-- <view class="right-only-right-add fw-500 text-align-center fs-36 fc-f" @click="setNum(2)">+
-							</view> -->
-						</view>
-					</view>
-				</view>
-				<view class="box-buttom text-align-right">
-					<span class="fs-28 fc-9 fw-400">共{{fromData.number}}件，</span>
-					<span class="fs-28 fc-0 fw-400">合计￥</span>
-					<span
-						class="fs-44 fc-0 fw-b">{{goodsData.price?(Number(goodsData.price)*fromData.number).toFixed(2):''}}</span>
-				</view>
-			</view>
-
-			<view class="box-card box-border-box mb-20 bgc-f flex-justify-space">
-				<view class="fs-28 fw-600 w158">备注</view>
-				<input v-model="fromData.note" class="text-align-right" type="text" placeholder="请填写你的备注">
-			</view>
-
-			<view class="box-card box-border-box mb-20 bgc-f flex-justify-space">
-				<view class="fs-28 fw-600 w158">支付方式</view>
-				<view class="wx-box display-flex">
-					<image src="@/static/img/common/wx-zf.png" mode="scaleToFill"></image>
-					<view class="fs-28 fw-400 ml-10">微信支付</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">{{goodsData.price?(Number(goodsData.price)*fromData.number).toFixed(2):''}}</span>
-				</view>
-				<view class="text-align-center box-2 fs-32 fc-f fw-600" @click="toSave()">立即支付</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		ticketOrderFoster
-	} from '@/api/ticket.js'
-	import {
-		getCode
-	} from '@/api/common.js'
-	import {
-		ticketCreate,
-		ticketPay
-	} from '@/api/ticket.js';
-	import tools from "@/service/tools";
-
-	export default {
-		data() {
-			return {
-				isCode: false,
-				codeText: '获取验证码',
-				fromData: {
-					name: '',
-					id: '',
-					phone: '',
-					school_id: '',
-					code: '',
-					note: '',
-					address: '',
-					number: 1,
-				},
-				isAJAX: false,
-
-				goodsData: {},
-			}
-		},
-		onLoad(e) {
-			if (e.goodsData) {
-				let obj = JSON.parse(decodeURIComponent(e.goodsData));
-				this.goodsData = obj;
-				this.fromData.id = obj.id;
-			}
-		},
-		mounted() {
-			this.ticketOrderFoster()
-		},
-		methods: {
-			ticketOrderFoster() {
-				ticketOrderFoster().then((res) => {
-					if (res.code == 1) {
-						console.log(res);
-						this.fromData.address = res.data.address
-						this.fromData.name = res.data.name
-						this.fromData.phone = res.data.phone
-					}
-				})
-			},
-			getCode() {
-				if (this.isCode) {
-					return
-				}
-				this.isCode = true;
-				getCode({
-					phone: this.fromData.phone,
-					send_type: 'ticket_order'
-				}).then((res) => {
-					if (res.code === 1) {
-						this.codeText = 60;
-						let timer = setInterval(() => {
-							this.codeText -= 1;
-							if (this.codeText <= 0) {
-								clearInterval(timer);
-								this.isCode = false;
-								this.codeText = '获取验证码'
-							}
-						}, 1000);
-					} else {
-						this.isCode = false;
-						tools.error('获取验证码失败，请稍后重试')
-					}
-				})
-
-			},
-			setNum(type) {
-				if (type == 1) {
-					if (this.fromData.number <= 1) {
-						return
-					} else {
-						this.fromData.number -= 1;
-					}
-				} else {
-					this.fromData.number += 1;
-				}
-			},
-			toSave() {
-				if (this.isAJAX) {
-					return
-				}
-				this.isAJAX = true;
-				this.fromData.school_id = uni.getStorageSync('school_id');
-				ticketCreate(this.fromData).then((res) => {
-					if (res.code === 1) {
-						ticketPay({
-							order_id: res.data.order_id
-						}).then((ret) => {
-							if (ret.code === 1) {
-								uni.requestPayment({
-									provider: "wxpay", //支付类型-固定值
-									timeStamp: ret.data.wx_pay.timeStamp + "", // 时间戳（单位：秒）
-									nonceStr: ret.data.wx_pay.nonceStr, // 随机字符串
-									package: ret.data.wx_pay.package, // 固定值
-									signType: ret.data.wx_pay.signType, //固定值
-									paySign: ret.data.wx_pay.paySign, //签名
-									success: (ren) => {
-										tools.success("支付成功");
-										this.isAJAX = false;
-										setTimeout(() => {
-											uni.switchTab({
-												url: "/pages/order/index"
-											})
-											uni.setStorageSync('orderPayType', 4)
-										}, 1000)
-									},
-									fail: (err) => {
-										this.isAJAX = false;
-										tools.error("支付失败");
-										setTimeout(() => {
-											uni.switchTab({
-												url: "/pages/order/index"
-											})
-											uni.setStorageSync('orderPayType', 4)
-										}, 1000)
-									},
-								});
-							} else {
-								this.isAJAX = false;
-								tools.error("支付失败");
-								setTimeout(() => {
-									uni.switchTab({
-										url: "/pages/order/index"
-									})
-									uni.setStorageSync('orderPayType', 4)
-								}, 1000)
-							}
-						})
-					} else {
-						this.isAJAX = false;
-						tools.error(res.msg);
-					}
-				})
-			},
-		},
-	}
-</script>
-
-<style scoped lang="scss">
-	.wh-44 {
-		width: 44rpx;
-		height: 44rpx;
-	}
-
-	.save-order-box {
-		position: relative;
-
-		.right-only-right-red {
-			width: 44rpx;
-			height: 44rpx;
-			line-height: 40rpx;
-			border-radius: 12rpx;
-			border: 1rpx solid #41ABF5;
-			color: #41ABF5;
-		}
-
-		.right-only-right-add {
-			width: 44rpx;
-			height: 44rpx;
-			line-height: 40rpx;
-			background: linear-gradient(117deg, #57CAFF 0%, #41ABF5 100%);
-			border-radius: 12rpx;
-		}
-
-		.right-only-right-2 {
-			min-width: 50rpx;
-		}
-
-		.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;
-
-			.box-top {
-				padding-bottom: 24rpx;
-				border-bottom: 2rpx solid #F9F9F9;
-				margin-bottom: 24rpx;
-
-				.box-left {
-					image {
-						width: 108rpx;
-						height: 108rpx;
-						border-radius: 8rpx;
-						margin-right: 16rpx;
-					}
-
-					.w336 {
-						width: 336rpx;
-					}
-				}
-			}
-
-			.box-buttom {
-				padding-bottom: 24rpx;
-			}
-		}
-
-		.box-input {
-			border-bottom: 2rpx solid #F9F9F9;
-			position: relative;
-
-			.w158 {
-				width: 158rpx;
-			}
-
-			input {
-				font-size: 28rpx;
-			}
-
-			.code-box {
-				position: absolute;
-				right: 0;
-				top: 0;
-			}
-		}
-
-		.wx-box {
-			image {
-				width: 40rpx;
-				height: 40rpx;
-			}
-		}
-	}
-</style>

pages-buy/ticket-det.vue

@@ -1,191 +0,0 @@
-<template>
-	<view class="ticket-det-box iPhone-bottom flex-common-css box-border-box">
-		<view class="nav-box">
-			<Nav :leftShow='false' :customNav='true' bgckgroundBox='transparent'>
-				<template>
-					<view slot="custom" class="align-items-center">
-						<view class="yuan-bg">
-							<uni-icons type="left" size="20" @click="toBack()" color="#000"></uni-icons>
-						</view>
-					</view>
-				</template>
-			</Nav>
-		</view>
-
-		<view class="scroll-view-css">
-			<swiper class="swiper " circular :autoplay="true" :interval="3000" :duration="500" @change="onSwiperChange">
-				<swiper-item v-for="(item,i) in obj.image" :key="i">
-					<image class="swiper-item" :src="item" mode="aspectFill" @click="lookImg(obj.image,i)"></image>
-					<view class="swiper-num fc-f">{{BanenerCurrent}}/{{obj.image.length}}</view>
-				</swiper-item>
-			</swiper>
-
-			<view class="box-border-box p-24">
-				<view class="box-card box-border-box p-24">
-					<view class="mb-12">
-						<span class="fs-28 fc-FB3D03 fw-600">￥</span>
-						<span class="fs-44 fc-FB3D03 fw-600">{{obj.price||''}}</span>
-					</view>
-					<view class="fs-36 fw-600">{{obj.title||''}}</view>
-				</view>
-			</view>
-
-			<image class="pwxq" src="@/static/img/buy/pwxq.png" mode="scaleToFill"></image>
-
-			<view class="box-border-box richText plr-24">
-				<!-- <view class="box-card box-border-box p-24 fs-30 fc-0" v-html="obj.content"></view> -->
-				<rich-text :nodes="obj.content"></rich-text>
-			</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">{{obj.price||''}}</span>
-				</view>
-				<view class="text-align-center box-2 fs-32 fc-f fw-600" @click="toSave()">立即抢购</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		ticketInfo
-	} from '@/api/ticket.js';
-	import tools from "@/service/tools";
-	export default {
-		data() {
-			return {
-				BanenerCurrent: 1,
-				id: "",
-				obj: {
-					image: [],
-				},
-			}
-		},
-		onLoad(e) {
-			if (e.id) {
-				this.id = e.id;
-				this.getInfo();
-			}
-		},
-		methods: {
-			getInfo() {
-				ticketInfo({
-					id: this.id
-				}).then((res) => {
-					if (res.code === 1) {
-						this.obj = res.data;
-						let zfc = res.data.content
-						let a = zfc.replace(/font color="#c24f4a"/g, "p style='color:#c24f4a'")
-						this.obj.content = a.replace(/\font/g, "\p")
-					}
-				})
-			},
-			lookImg(list, i) {
-				tools.lookBigImg(i, list);
-			},
-			toBack() {
-				tools.leftClick()
-			},
-			onSwiperChange(e) {
-				this.BanenerCurrent = (e.detail.current + 1);
-			},
-			toSave() {
-				if (!this.isTimeEnd) {
-					let goodsData = {
-						title: this.obj.title,
-						cover_img: this.obj.cover_img,
-						price: this.obj.price,
-						id: this.obj.id,
-					}
-					uni.navigateTo({
-						url: '/pages-buy/save-ticket?goodsData=' + encodeURIComponent(JSON.stringify(goodsData))
-					})
-				}
-			},
-		},
-	}
-</script>
-
-<style scoped lang="scss">
-	::deep .richText p {
-		color: red;
-	}
-
-	.ticket-det-box {
-		position: relative;
-
-		.nav-box {
-			position: absolute;
-
-			.yuan-bg {
-				width: 60rpx;
-				height: 60rpx;
-				background-color: #B3B3B4;
-				border-radius: 50%;
-				text-align: center;
-				line-height: 62rpx;
-			}
-		}
-
-		.bottom-box {
-			.box-1 {
-				flex: 1;
-				height: 100rpx;
-				background: #333333;
-				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;
-			}
-		}
-
-		.swiper {
-			width: 100%;
-			height: 750rpx;
-			position: relative;
-
-			.swiper-item {
-				width: 100%;
-				height: 750rpx;
-			}
-
-			.swiper-num {
-				position: absolute;
-				right: 24rpx;
-				bottom: 24rpx;
-				width: 120rpx;
-				height: 48rpx;
-				background: rgba(51, 51, 51, 0.6);
-				border-radius: 200rpx;
-				text-align: center;
-				line-height: 48rpx;
-			}
-		}
-
-		.box-card {
-			width: 100%;
-			min-height: 100rpx;
-			background: #FFFFFF;
-			border-radius: 20rpx;
-		}
-
-		.pwxq {
-			width: 146rpx;
-			height: 46rpx;
-			margin: 38rpx auto 24rpx auto;
-		}
-	}
-</style>

pages-buy/ticket.vue

@@ -1,268 +0,0 @@
-<template>
-	<!-- 票务 -->
-	<view class="ticket-box iPhone-bottom flex-common-css box-border-box">
-		<view class="nav-box">
-			<image class="head-bg" src="@/static/img/buy/ticket-bg.png" mode="scaleToFill"></image>
-			<Nav :leftShow='false' :customNav='true' bgckgroundBox='transparent'>
-				<template>
-					<view slot="custom" class="align-items-center">
-						<uni-icons type="left" size="20" @click="toBack()" color="#fff"></uni-icons>
-						<!-- <view class="w-390 text-overflow-ellipsis-one fs-36 fw-400 fc-f">票务</view> -->
-						<image class="pw-imgage" src="@/static/img/index/pw.png" mode=""></image>
-					</view>
-				</template>
-			</Nav>
-
-			<view class="box-border-box plr-24 mb-32">
-				<view class="head-search align-items-center">
-					<!-- <uni-icons class="s-icon" type="search" size="19"></uni-icons> -->
-					<image class="wh32" src="@/static/img/index/ss.png" mode=""></image>
-					<input v-model="search" type="text" placeholder="搜一搜带你玩周边">
-					<view class="head-search-buttom text-align-center fs-28 fw-500 fc-f" @click="searchFun()">搜索</view>
-				</view>
-			</view>
-
-			<view class="display-flex box-border-box plr-24 nav-list">
-				<view class="text-align-center nav-item" v-for="(item,i) in navList" :key="i"
-					@click="selectType(item.id)">
-					<image class="nav-img" :src="item.img" mode="scaleToFill"></image>
-					<view class="fs-24 w-96" :class="type == item.id?'fw-600 fc-41ABF5':'fw-400'">{{item.name}}</view>
-				</view>
-			</view>
-		</view>
-
-
-		<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>
-				</template>
-			</EnBlank>
-		</view>
-
-		<scroll-view v-else class="scroll-view-css box-border-box plr-24" scroll-y="true"
-			@scrolltolower="scrolltolower">
-			<view class="list-item display-flex" v-for="(item,i) in list" :key="i" @click="toDet(item)">
-				<image :src="item.cover_img" mode="aspectFill"></image>
-				<view class="flex-1 flex-direction flex-justify-space">
-					<view class="w-470 text-overflow-ellipsis fw-600 fs-32 mb-48">{{item.title}}</view>
-					<view class=" flex-justify-space align-items-flex-end">
-						<view class="">
-							<span class="fs-24 fw-600 fc-FB3D03">￥</span>
-							<span class="fw-b fs-40 fc-FB3D03 mr-4">{{item.price}}</span>
-							<span class="text-line-through fs-24 fc-9 fw-400">￥{{item.line_price}}</span>
-						</view>
-						<view class="to-box fs-28 fw-400 fc-f text-align-center">马上抢</view>
-					</view>
-				</view>
-			</view>
-		</scroll-view>
-	</view>
-</template>
-
-<script>
-	import {
-		ticketList
-	} from '@/api/ticket.js';
-	import {
-		getTicket
-	} from '@/api/category.js';
-	import EnBlank from "@/components/en-utils/en-blank/en-blank";
-	import tools from "@/service/tools";
-	export default {
-		components: {
-			EnBlank
-		},
-		data() {
-			return {
-				type: 0,
-				navList: [{
-					name: "全部",
-					id: 0,
-					img: require('@/static/img/buy/t-all.png')
-				}, ],
-
-				page: 1,
-				total: 0,
-				list: [],
-				search: '',
-			}
-		},
-		onShow() {},
-		mounted() {
-			this.getTicket();
-			this.page = 1;
-			this.list = [];
-			this.getList();
-		},
-		methods: {
-			getTicket() {
-				let operate_id = uni.getStorageSync('operate_id');
-				getTicket({
-					operate_id: operate_id
-				}).then((res) => {
-					if (res.code === 1) {
-						this.navList = [...this.navList, ...res.data]
-					}
-				})
-			},
-			getList() {
-				let operate_id = uni.getStorageSync('operate_id');
-				ticketList({
-					category_id: this.type,
-					page: this.page,
-					operate_id: operate_id,
-					search: this.search
-				}).then((res) => {
-					if (res.code === 1) {
-						this.list = [...this.list, ...res.data.items];
-						this.total = res.data.total;
-					}
-				})
-			},
-			searchFun() {
-				this.page = 1;
-				this.list = [];
-				this.getList();
-			},
-			selectType(id) {
-				if (this.type != id) {
-					this.type = id;
-					this.page = 1;
-					this.list = [];
-					this.getList();
-				}
-			},
-			toBack() {
-				tools.leftClick()
-			},
-			scrolltolower() {
-				if (this.list.length < this.total) {
-					this.page += 1;
-					this.getList();
-				}
-			},
-			toDet(item) {
-				uni.navigateTo({
-					url: "/pages-buy/ticket-det?id=" + item.id
-				})
-			},
-		},
-	}
-</script>
-
-<style>
-	body {
-		background-color: #fff;
-	}
-</style>
-<style scoped lang="scss">
-	.head-search {
-		width: 100%;
-		position: relative;
-	
-		.s-icon {
-			position: absolute;
-			left: 24rpx;
-			top: 20rpx;
-		}
-	
-		input {
-			width: 100%;
-			height: 72rpx;
-			background: #FFFFFF;
-			border-radius: 200rpx;
-			box-sizing: border-box;
-			padding: 0 130rpx 0 68rpx;
-			font-size: 32rpx;
-		}
-	
-		.head-search-buttom {
-			width: 120rpx;
-			height: 60rpx;
-			background: linear-gradient(90deg, #2CE6F8 0%, #41ABF5 100%);
-			border-radius: 200rpx;
-			line-height: 60rpx;
-			position: absolute;
-			right: 6rpx;
-			top: 6rpx;
-		}
-	}
-	.pw-imgage {
-		width: 85rpx;
-		height: 45rpx;
-	}
-
-	.wh32 {
-		position: absolute;
-		left: 24rpx;
-		top: 20rpx;
-		width: 32rpx;
-		height: 32rpx;
-	}
-
-	.w-470 {
-		width: 470rpx;
-	}
-
-	.ticket-box {
-		.list-item {
-			width: 100%;
-			min-height: 200rpx;
-			margin-bottom: 40rpx;
-			background-color: #fff;
-
-			image {
-				width: 200rpx;
-				height: 200rpx;
-				border-radius: 20rpx;
-				margin-right: 20rpx;
-			}
-
-			.to-box {
-				width: 132rpx;
-				height: 52rpx;
-				line-height: 52rpx;
-				background: linear-gradient(225deg, #41ABF5 0%, #5BD8FB 100%);
-				border-radius: 200rpx;
-			}
-		}
-
-		.nav-box {
-			width: 100%;
-			// height: 452rpx;
-			position: relative;
-
-			.head-bg {
-				position: absolute;
-				top: 0;
-				left: 0;
-				width: 100%;
-				height: 400rpx;
-				z-index: -1;
-			}
-
-			.nav-list {
-				overflow-x: scroll;
-				margin: 0 0 36rpx 0;
-
-				.nav-item {
-					width: 96rpx !important;
-					height: 126rpx;
-					margin-right: 48rpx;
-
-					.nav-img {
-						width: 80rpx;
-						height: 80rpx;
-						margin: 0 auto 12rpx auto;
-						z-index: 10;
-					}
-
-					.w-96 {
-						width: 96rpx;
-					}
-				}
-			}
-		}
-	}
-</style>

pages-takeout/takeout.vue

@@ -98,56 +98,87 @@
 						</view>
 					</scroll-view>
 				</view>
-
-
 				<scroll-view :scroll-y="true" class="box-border-box plr-24 mt-24" @scrolltolower="scrollList">
 					<EnBlank :customSrc='true' v-if="listData<= 0">
 						<template v-slot:blankImg>
 							<image class="black-custom-img" src="@/static/img/common/no-order.png" mode=""></image>
 						</template>
 					</EnBlank>
-					<view v-else class="goos-list-box box-border-box p-24 display-flex" v-for="(item,i) in listData"
-						:key='i' @click="toShop(item)">
-						<view class="left-img-box">
-							<image class="left-img" :src="item.shop_logo" mode="aspectFill"></image>
-							<view class="status-box fc-f" v-if="item.status != 1">
-								休息中
-							</view>
-						</view>
-						<view class="flex-1">
-							<view class="align-items-center mb-8">
-								<view class="right-box-title fs-32 fw-600 text-overflow-ellipsis-one">
-									{{item.shop_name}}
+					<view class="" v-else>
+						<view class="goos-list-box box-border-box" v-for="(item,i) in listData" :key='i' @click="toShop(item)">
+							<view class="display-flex p-b-20 mb-26 b-b-EFF2F5">
+								<view class="left-img-box mr-24">
+									<image class="left-img" :src="item.shop_logo" mode="aspectFill"></image>
+									<view class="status-box fc-f" v-if="item.status != 1">
+										休息中
+									</view>
 								</view>
-								<image class="right-box-title-img" src="@/static/img/toRight.png" mode=""></image>
-							</view>
-							<view class="align-items-center mb-8">
-								<image class="img-x mr-12" src="@/static/img/my/wdpj.png" mode=""></image>
-								<view class="fs-26 fw-600 fc-FF7F00 mr-12">{{item.shop_score}}分</view>
-								<view class="fc-6 fs-24 mr-12">| 预计{{item.delivery_time}}分钟 |</view>
-								<view class="fc-6 fs-24 mr-12">{{item.shop_sales}}人购买</view>
-							</view>
-							<view class="align-items-center flex-wrap-wrap">
-								<view class="quan-list display-flex mr-12 mb-12"
-									v-for="(itemCoupon,iCoupon) in item.coupon" :key="iCoupon">
-									<view class="quan-list-1 fs-24 fc-f">券</view>
-									<view class="quan-list-2 fs-24 fc-FB3D03">{{itemCoupon.money}}元</view>
+								<view class="flex-1">
+									<view class="align-items-center mb-8">
+										<view class="right-box-title fs-28 fw-600 text-overflow-ellipsis-one">
+											{{item.shop_name}}
+										</view>
+										<image class="right-box-title-img" src="@/static/img/toRight.png" mode="">
+										</image>
+									</view>
+									<view class="align-items-center mb-12">
+										<image class="img-x mr-8" src="@/static/img/my/wdpj.png" mode=""></image>
+										<view class="fs-24 fw-600 fc-FF7F00 mr-12">{{item.shop_score}}</view>
+										<view class="fc-0 fs-24 mr-12">预计{{item.delivery_time}}分钟 |</view>
+										<view class="fc-0 fs-24 mr-12">{{item.shop_sales}}人购买</view>
+									</view>
+									<view class="align-items-center flex-wrap-wrap">
+										<view class="quan-list b-F5541E box-border-box bgc-f align-items-center b-rad-5 mr-10" v-for="(info1,index1) in item.coupon" :key="index1">
+											<image class="quan-list-1" src="@/static/img/index/q.png" mode=""></image>
+											<view class="quan-list-2 fs-24 fc-F5531E">{{info1.money}}元</view>
+										</view>
+									</view>
 								</view>
 							</view>
-
-							<view class="goods-items-list display-flex view-nowrap">
-								<view class="goods-items-list-box" v-for="(info,iGoods) in item.goods" :key='iGoods'>
-									<image class="mb-12" :src="info.goods_image" mode="scaleToFill"></image>
-									<view class="mb-8 fw-600 text-overflow-ellipsis-one fs-26">{{info.goods_name}}
+							<view class="goods-items-list display-flex">
+								<view class="goods-items-list-box" v-for="(info2,index2) in item.goods" :key="index2">
+									<view v-show="info2.label === 3"
+										class="label-box text-align-center bgc-F5811E fs-24 fc-f">
+										推荐</view>
+									<view v-show="info2.label === 2"
+										class="label-box text-align-center bgc-FF5555 fs-24 fc-f">
+										新品</view>
+									<view v-show="info2.label === 1"
+										class="label-box text-align-center bgc-48D3C5 fs-24 fc-f">
+										折扣</view>
+									<view v-show="info2.label === 4"
+										class="label-box text-align-center bgc-4db8ff fs-24 fc-f">
+										招牌</view>
+									<image class="mb-18" :src="info2.goods_image" mode="aspectFill"></image>
+									<view class="mb-12 fw-600 text-overflow-ellipsis-one fs-24">{{info2.goods_name}}
 									</view>
 									<view class="">
-										<span class="fs-24 fc-FB3D03">￥</span>
-										<span class="fs-32 fc-FB3D03 fw-b">{{info.price}}</span>
+										<span class="fs-24 fc-FD5D05 fw-b">￥</span>
+										<span class="fs-32 fc-FD5D05 fw-b">{{info2.price}}</span>
 									</view>
 								</view>
 							</view>
 						</view>
+						<view class="pt-40 flex-direction align-items-center" v-if="listData.length === listTotal">
+							<view class="fs-32 fc-0 fw-b">
+								小主都到这里了
+							</view>
+							<view class="fs-32 fc-0 fw-b mb-26">
+								还没有找到满意的店铺吗？
+							</view>
+							<view class="fs-24 fc-0 mb-32">
+								可以提交你意见与反馈哟。我们一定尽快努力达成！
+							</view>
+							<view class="list-but align-items-center flex-justify-center bgc-5CC2FF"
+								@click="goFeedback">
+								<view class="fs-28 fc-f mr-10">
+									去提交
+								</view>
+								<view class="sj-fff"></view>
+							</view>
+						</view>
 					</view>
+
 				</scroll-view>
 				<!-- 				<view class="box-border-box plr-24 mt-24">
 
@@ -226,7 +257,6 @@
 			},
 			scrollList() {},
 			scrolltolower() {
-				console.log(this.listTotal, this.listData.length);
 				if (this.listTotal > this.listData.length) {
 					++this.page
 					this.getGoodsList()
@@ -286,6 +316,22 @@
 </script>
 
 <style scoped lang="scss">
+	.list-but {
+		width: 140rpx;
+		height: 48rpx;
+		line-height: 48rpx;
+		border-radius: 24rpx;
+	}
+
+	.sj-fff {
+		width: 0;
+		height: 0;
+		border-top: 8rpx solid transparent;
+		border-right: 8rpx solid transparent;
+		border-left: 8rpx solid #fff;
+		border-bottom: 8rpx solid transparent;
+	}
+
 	.index-search-box-buttom {
 		width: 120rpx;
 		height: 60rpx;
@@ -476,24 +522,36 @@
 
 		.goos-list-box {
 			width: 100%;
-			// min-height: 428rpx;
+			min-height: 100rpx;
+			padding: 28rpx 30rpx 35rpx;
 			background: #FFFFFF;
 			box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(51, 51, 51, 0.1);
 			border-radius: 20rpx;
 			margin-bottom: 20rpx;
 
 			.goods-items-list {
-				width: 530rpx;
+				width: 100%;
 				overflow-y: scroll;
 
 				.goods-items-list-box {
-					width: 140rpx;
-					margin-right: 16rpx;
+					width: 33.3%;
+					margin-right: 13rpx;
+					position: relative;
+
+					.label-box {
+						position: absolute;
+						left: 0;
+						top: 0;
+						width: 66rpx;
+						height: 31rpx;
+						line-height: 31rpx;
+						border-radius: 10rpx 2rpx 10rpx 2rpx;
+					}
 
 					image {
-						width: 140rpx;
-						height: 140rpx;
-						border-radius: 12rpx
+						width: 201rpx;
+						height: 200rpx;
+						border-radius: 10rpx
 					}
 				}
 			}
@@ -501,14 +559,13 @@
 		}
 
 		.left-img-box {
-			width: 100rpx;
-			height: 100rpx;
-			margin-right: 16rpx;
+			width: 120rpx;
+			height: 120rpx;
 			position: relative;
 
 			.left-img {
-				width: 100rpx;
-				height: 100rpx;
+				width: 120rpx;
+				height: 120rpx;
 				border-radius: 12rpx;
 			}
 
@@ -526,8 +583,8 @@
 		}
 
 		.img-x {
-			width: 24rpx;
-			height: 24rpx;
+			width: 16rpx;
+			height: 16rpx;
 		}
 
 		.right-box-title {
@@ -541,40 +598,38 @@
 		}
 
 		.quan-list {
+			min-width: 88rpx;
+			height: 28rpx;
+			line-height: 28rpx;
+
 			.quan-list-1 {
-				width: 32rpx;
-				height: 34rpx;
-				background: #FB3D03;
-				border-radius: 5rpx 0rpx 0rpx 5rpx;
-				text-align: center;
+				width: 38rpx;
+				height: 28rpx;
 			}
+		}
+	}
 
-			.quan-list-2 {
-				box-sizing: border-box;
-				padding: 0 2rpx;
-				height: 34rpx;
-				border-radius: 0 5rpx 5rpx 0;
-				border: 1rpx solid #FB3D03;
+	.index-search {
+		position: sticky;
+		left: 0;
+		z-index: 10;
+		padding: 0 24rpx 20rpx 24rpx;
+
+		.index-search-box {
+			width: 100%;
+			height: 72rpx;
+			padding: 0 6rpx 0 24rpx;
+			border-radius: 200rpx;
+
+			.index-search-box-buttom {
+				width: 120rpx;
+				height: 60rpx;
+				background: linear-gradient(-90deg, #3BB5FE, #62C4FF);
+				border-radius: 200rpx;
+				margin-left: auto;
+				line-height: 60rpx;
 				text-align: center;
 			}
 		}
 	}
-
-	// .index-search-box {
-	// 	width: 100%;
-	// 	height: 72rpx;
-	// 	padding: 0 6rpx 0 24rpx;
-	// 	border-radius: 200rpx;
-	// 	border: 2rpx solid #4FB3EF;
-
-	// 	.index-search-box-buttom {
-	// 		width: 120rpx;
-	// 		height: 60rpx;
-	// 		background: linear-gradient(90deg, #57CAFF 0%, #41ABF5 100%);
-	// 		border-radius: 200rpx;
-	// 		margin-left: auto;
-	// 		line-height: 60rpx;
-	// 		text-align: center;
-	// 	}
-	// }
 </style>

pages.json

@@ -88,19 +88,7 @@
 		},
 		{
 			"root": "pages-buy",
-			"pages": [{
-					"path": "ticket",
-					"style": {
-						"navigationBarTitleText": "票务",
-						"disableScroll": true
-					}
-				},
-				{
-					"path": "ticket-det",
-					"style": {
-						"navigationBarTitleText": "票务详情"
-					}
-				},
+			"pages": [
 				{
 					"path": "group",
 					"style": {
@@ -150,12 +138,6 @@
 						"navigationBarTitleText": "团购券码"
 					}
 				},
-				{
-					"path": "save-ticket",
-					"style": {
-						"navigationBarTitleText": "票务提交订单"
-					}
-				},
 				{
 					"path": "dry-clean",
 					"style": {

pages/index/index.vue

@@ -247,7 +247,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="pt-40 flex-direction align-items-center" v-if="this.goodsList.length === this.total">
+				<view class="pt-40 flex-direction align-items-center" v-if="goodsList.length === total">
 					<view class="fs-32 fc-0 fw-b">
 						小主都到这里了
 					</view>
@@ -795,6 +795,7 @@
 					if (res.code === 1) {
 						this.goodsList = [...this.goodsList, ...res.data.items];
 						this.total = res.data.total;
+						console.log(this.total, 'this.total');
 					}
 				})
 			},
@@ -1370,16 +1371,6 @@
 						width: 38rpx;
 						height: 28rpx;
 					}
-
-					// .quan-list-2 {
-					// 	box-sizing: border-box;
-					// 	height: 34rpx;
-					// 	line-height: 34rpx;
-					// 	padding: 0 4rpx;
-					// 	border-radius: 0 5rpx 5rpx 0;
-					// 	border: 1rpx solid #FB3D03;
-					// 	text-align: center;
-					// }
 				}
 			}
 		}

pages/index/search-list.vue

@@ -11,57 +11,99 @@
 		</view>
 		<scroll-view scroll-y="true" class="scroll-view-css seacrh-info box-border-box p-24"
 			@scrolltolower="scrolltolower">
-			<view class="goos-list-box box-border-box p-24 display-flex" v-for="(item,i) in list" :key="i"
-				@click="toShop(item)">
-				<view class="left-img-box">
-					<image class="left-img" :src="item.shop_logo" mode="aspectFill"></image>
-					<view class="status-box fc-f" v-if="item.status != 1">
-						休息中
-					</view>
-				</view>
-				<view class="flex-1">
-					<view class="align-items-center mb-8">
-						<view class="right-box-title fs-32 fw-600 text-overflow-ellipsis-one">{{item.shop_name}}</view>
-						<image class="right-box-title-img" src="@/static/img/toRight.png" mode=""></image>
-					</view>
-					<view class="align-items-center mb-8">
-						<image class="img-x mr-12" src="@/static/img/my/wdpj.png" mode=""></image>
-						<view class="fs-26 fw-600 fc-FF7F00 mr-12">{{item.shop_score}}分</view>
-						<view class="fc-6 fs-24 mr-12">| 预计{{item.delivery_time}}分钟 |</view>
-						<view class="fc-6 fs-24 mr-12">{{item.shop_sales}}人购买</view>
-					</view>
-					<view class="align-items-center flex-wrap-wrap">
-						<view class="quan-list display-flex mr-12 mb-12" v-for="(info1,index1) in item.coupon"
-							:key="index1">
-							<view class="quan-list-1 fs-24 fc-f">券</view>
-							<view class="quan-list-2 fs-24 fc-FB3D03">{{info1.money}}元</view>
+			<EnBlank :customSrc='true' v-if="list<= 0">
+				<template v-slot:blankImg>
+					<image class="black-custom-img" src="@/static/img/common/no-order.png" mode=""></image>
+				</template>
+			</EnBlank>
+
+			<view class="" v-else>
+				<view class="goos-list-box box-border-box" v-for="(item,i) in list" :key='i' @click="toShop(item)">
+					<view class="display-flex p-b-20 mb-26 b-b-EFF2F5">
+						<view class="left-img-box mr-24">
+							<image class="left-img" :src="item.shop_logo" mode="aspectFill"></image>
+							<view class="status-box fc-f" v-if="item.status != 1">
+								休息中
+							</view>
+						</view>
+						<view class="flex-1">
+							<view class="align-items-center mb-8">
+								<view class="right-box-title fs-28 fw-600 text-overflow-ellipsis-one">
+									{{item.shop_name}}
+								</view>
+								<image class="right-box-title-img" src="@/static/img/toRight.png" mode="">
+								</image>
+							</view>
+							<view class="align-items-center mb-12">
+								<image class="img-x mr-8" src="@/static/img/my/wdpj.png" mode=""></image>
+								<view class="fs-24 fw-600 fc-FF7F00 mr-12">{{item.shop_score}}</view>
+								<view class="fc-0 fs-24 mr-12">预计{{item.delivery_time}}分钟 |</view>
+								<view class="fc-0 fs-24 mr-12">{{item.shop_sales}}人购买</view>
+							</view>
+							<view class="align-items-center flex-wrap-wrap">
+								<view class="quan-list b-F5541E box-border-box bgc-f align-items-center b-rad-5 mr-10"
+									v-for="(info1,index1) in item.coupon" :key="index1">
+									<image class="quan-list-1" src="@/static/img/index/q.png" mode=""></image>
+									<view class="quan-list-2 fs-24 fc-F5531E">{{info1.money}}元</view>
+								</view>
+							</view>
 						</view>
 					</view>
 					<view class="goods-items-list display-flex">
 						<view class="goods-items-list-box" v-for="(info2,index2) in item.goods" :key="index2">
-							<image class="mb-12" :src="info2.goods_image" mode="aspectFill"></image>
-							<view class="mb-8 fw-600 text-overflow-ellipsis-one fs-26">{{info2.goods_name}}</view>
+							<view v-show="info2.label === 3" class="label-box text-align-center bgc-F5811E fs-24 fc-f">
+								推荐</view>
+							<view v-show="info2.label === 2" class="label-box text-align-center bgc-FF5555 fs-24 fc-f">
+								新品</view>
+							<view v-show="info2.label === 1" class="label-box text-align-center bgc-48D3C5 fs-24 fc-f">
+								折扣</view>
+							<view v-show="info2.label === 4" class="label-box text-align-center bgc-4db8ff fs-24 fc-f">
+								招牌</view>
+							<image class="mb-18" :src="info2.goods_image" mode="aspectFill"></image>
+							<view class="mb-12 fw-600 text-overflow-ellipsis-one fs-24">{{info2.goods_name}}
+							</view>
 							<view class="">
-								<span class="fs-24 fc-FB3D03">￥</span>
-								<span class="fs-32 fc-FB3D03 fw-b">{{info2.price}}</span>
+								<span class="fs-24 fc-FD5D05 fw-b">￥</span>
+								<span class="fs-32 fc-FD5D05 fw-b">{{info2.price}}</span>
 							</view>
 						</view>
 					</view>
 				</view>
+				<view class="pt-40 flex-direction align-items-center" v-if="list.length === total">
+					<view class="fs-32 fc-0 fw-b">
+						小主都到这里了
+					</view>
+					<view class="fs-32 fc-0 fw-b mb-26">
+						还没有找到满意的店铺吗？
+					</view>
+					<view class="fs-24 fc-0 mb-32">
+						可以提交你意见与反馈哟。我们一定尽快努力达成！
+					</view>
+					<view class="list-but align-items-center flex-justify-center bgc-5CC2FF" @click="goFeedback">
+						<view class="fs-28 fc-f mr-10">
+							去提交
+						</view>
+						<view class="sj-fff"></view>
+					</view>
+				</view>
 			</view>
 		</scroll-view>
 	</view>
 </template>
 
 <script>
+	import EnBlank from "@/components/en-utils/en-blank/en-blank";
 	import {
 		getSearch
 	} from '@/api/goods.js';
 	import {
-	  shopInfo
+		shopInfo
 	} from "@/api/shop.js"
 	import tools from "@/service/tools";
 	export default {
+		components: {
+			EnBlank
+		},
 		data() {
 			return {
 				fromData: {
@@ -120,10 +162,24 @@
 </script>
 
 <style scoped lang="scss">
-	.seacrh-record-index {
-		position: relative;
+	.list-but {
+		width: 140rpx;
+		height: 48rpx;
+		line-height: 48rpx;
+		border-radius: 24rpx;
+	}
 
+	.sj-fff {
+		width: 0;
+		height: 0;
+		border-top: 8rpx solid transparent;
+		border-right: 8rpx solid transparent;
+		border-left: 8rpx solid #fff;
+		border-bottom: 8rpx solid transparent;
+	}
 
+	.seacrh-record-index {
+		position: relative;
 
 		.seacrh-bg {
 			position: absolute;
@@ -182,55 +238,67 @@
 		.goos-list-box {
 			width: 100%;
 			min-height: 100rpx;
+			padding: 28rpx 30rpx 35rpx;
 			background: #FFFFFF;
 			box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(51, 51, 51, 0.1);
 			border-radius: 20rpx;
 			margin-bottom: 20rpx;
 
+
 			.goods-items-list {
-				width: 530rpx;
+				width: 100%;
 				overflow-y: scroll;
 
 				.goods-items-list-box {
-					width: 140rpx;
-					margin-right: 16rpx;
+					width: 33.3%;
+					margin-right: 13rpx;
+					position: relative;
+
+					.label-box {
+						position: absolute;
+						left: 0;
+						top: 0;
+						width: 66rpx;
+						height: 31rpx;
+						line-height: 31rpx;
+						border-radius: 10rpx 2rpx 10rpx 2rpx;
+					}
 
 					image {
-						width: 140rpx;
-						height: 140rpx;
-						border-radius: 12rpx
+						width: 201rpx;
+						height: 200rpx;
+						border-radius: 10rpx
 					}
 				}
 			}
 
-				.left-img-box {
-					width: 100rpx;
-					height: 100rpx;
-					margin-right: 16rpx;
-					position: relative;
+			.left-img-box {
+				width: 120rpx;
+				height: 120rpx;
+				position: relative;
 
-					.left-img {
-						width: 100rpx;
-						height: 100rpx;
-						border-radius: 12rpx;
-					}
+				.left-img {
+					width: 120rpx;
+					height: 120rpx;
+					border-radius: 12rpx;
+				}
 
-					.status-box {
-						position: absolute;
-						bottom: 0;
-						left: 0;
-						width: 100%;
-						padding: 4rpx 0;
-						text-align: center;
-						background: rgba(0, 0, 0, 0.5);
-						font-size: 17rpx;
-						border-radius: 0 0 12rpx 12rpx;
-					}
+				.status-box {
+					position: absolute;
+					bottom: 0;
+					left: 0;
+					width: 100%;
+					padding: 4rpx 0;
+					text-align: center;
+					background: rgba(0, 0, 0, 0.5);
+					font-size: 17rpx;
+					border-radius: 0 0 12rpx 12rpx;
 				}
+			}
 
 			.img-x {
-				width: 24rpx;
-				height: 24rpx;
+				width: 16rpx;
+				height: 16rpx;
 			}
 
 			.right-box-title {
@@ -244,21 +312,13 @@
 			}
 
 			.quan-list {
-				.quan-list-1 {
-					width: 32rpx;
-					height: 34rpx;
-					background: #FB3D03;
-					border-radius: 5rpx 0rpx 0rpx 5rpx;
-					text-align: center;
-				}
+				min-width: 88rpx;
+				height: 28rpx;
+				line-height: 28rpx;
 
-				.quan-list-2 {
-					box-sizing: border-box;
-					padding: 0 2rpx;
-					height: 34rpx;
-					border-radius: 0 5rpx 5rpx 0;
-					border: 1rpx solid #FB3D03;
-					text-align: center;
+				.quan-list-1 {
+					width: 38rpx;
+					height: 28rpx;
 				}
 			}
 		}