diff --git a/pages/index/index.vue b/pages/index/index.vue
index d412217..069caae 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,21 +1,21 @@
 <style lang="scss" scoped>
-.share-btn {
-	display: flex;
-	align-items: center;
-	position: fixed;
-	width: 60rpx;
-	z-index: 20;
+	.share-btn {
+		display: flex;
+		align-items: center;
+		position: fixed;
+		width: 60rpx;
+		z-index: 20;
 
-	::v-deep.u-button {
-		border: 0;
-		border-color: transparent;
+		::v-deep.u-button {
+			border: 0;
+			border-color: transparent;
 
-		.u-icon__icon {
-			font-size: 60rpx !important;
-			color: #030303;
+			.u-icon__icon {
+				font-size: 60rpx !important;
+				color: #030303;
+			}
 		}
 	}
-}
 </style>
 <template>
 	<view class="content">
@@ -103,7 +103,8 @@
 				<view class="classify">
 					<scroll-view style="height: 90rpx;" scroll-x @scrolltolower="getgoodClassList(leftActive)">
 						<view class="classify-list">
-							<view class="classify-list-item u-line-1" :class="{ 'item-active': rightActive === item.id }"
+							<view class="classify-list-item u-line-1"
+								:class="{ 'item-active': rightActive === item.id }"
 								v-for="(item, index) in goodClassThree" :key="index" @click="changeThree(item, index)">
 								{{ item.name }}
 							</view>
@@ -114,7 +115,8 @@
 						<up-icon name="arrow-down"></up-icon>
 					</view>
 					<view class="order-by">
-						<view class="item" :class="{ 'order-active': where.order == '' }" @click="changeOrder('')">综合</view>
+						<view class="item" :class="{ 'order-active': where.order == '' }" @click="changeOrder('')">综合
+						</view>
 						<view class="item" :class="{ 'order-active': where.order == 'desc' || where.order == 'asc' }"
 							@click="changeOrder(where.order == 'asc' ? 'desc' : 'asc')">价格</view>
 						<view class="item" :class="{ 'order-active': where.order == 'sales' }"
@@ -128,16 +130,18 @@
 							<view class="classify-list">
 								<view class="classify-list-item u-line-1"
 									:class="{ 'item-active': rightActive === item.id }"
-									v-for="(item, index) in goodClassThree" :key="index" @click="changeThree(item, index)">
+									v-for="(item, index) in goodClassThree" :key="index"
+									@click="changeThree(item, index)">
 									{{ item.name }}
 								</view>
 							</view>
 						</scroll-view>
 					</view>
 				</viewPopup>
-				<scroll-view class="list" id='drag_area' style="overscroll-behavior: none;" @scroll="hideHeadView" scroll-y
-					@scrolltolower="loadMoreGood">
-					<view class="shop-item" v-for="(item, index) in goodList" :key="item.id" @click="openGoodPopup(item)">
+				<scroll-view class="list" id='drag_area' style="overscroll-behavior: none;" @scroll="hideHeadView"
+					scroll-y @scrolltolower="loadMoreGood">
+					<view class="shop-item" v-for="(item, index) in goodList" :key="item.id"
+						@click="openGoodPopup(item)">
 						<view class="shop-img"
 							:style="{ backgroundImage: `url(${item.image}?x-oss-process=image/format,webp)` }">
 						</view>
@@ -158,7 +162,13 @@
 								<text class='price' style="font-size: 24rpx;">/{{ item.unit_name }}</text>
 							</view>
 							<view class="price-btn">
-								<view class="price" style="font-size: 24rpx;">￥{{ item.price }}/{{ item.unit_name }}</view>
+								<view class="price" style="font-size: 24rpx;"
+									v-if='userStore?.userInfo?.user_ship == 1'>
+									￥{{ item.price }}/{{ item.unit_name }}
+								</view>
+								<view class="price" v-else>
+									￥{{ item.price }}/{{ item.unit_name }}
+								</view>
 								<view class="btn">
 									<u--icon name="plus-circle-fill" size="20" color="#20b128"></u--icon>
 								</view>
@@ -173,7 +183,12 @@
 			<view class="price-info">
 				<view class="row">
 					<view>合计</view>
-					<view class="price">¥<text style="font-size: 36rpx;">{{ cartInfo.total_price }}</text></view>
+					<view class="price" v-if='cartInfo.pay_price<=0||userStore?.userInfo?.user_ship !=4'>¥<text
+							style="font-size: 36rpx;">{{ cartInfo.total_price }}</text></view>
+					<view class="price" v-else>¥<text style="font-size: 30rpx;">{{ cartInfo.total_price }}</text></view>
+					<view class="price" v-if="cartInfo.pay_price>0 &&userStore?.userInfo?.user_ship == 4"><text
+							style="font-size: 36rpx;">优惠后
+							{{ cartInfo.pay_price }}</text></view>
 				</view>
 				<!-- <view class="row">
           <view style="color: #777;">原价 ¥50.00</view>
@@ -195,814 +210,817 @@
 </template>
 
 <script setup>
-import {
-	onLoad,
-	onShow,
-	onShareAppMessage,
-} from "@dcloudio/uni-app"
-import {
-	reactive,
-	ref,
-	onMounted,
-} from "vue"
-import {
-	goodListApi,
-	goodClassListApi
-} from "@/api/good.js"
-import {
-	cartCreateApi,
-	cartChangeApi,
-	cartListApi
-} from "@/api/cart.js";
-import {
-	productLogApi,
-	userInfoApi,
-	getStoreInfo
-} from "@/api/user.js";
-import viewPopup from "@/components/viewPopup.vue"
-import goodPopup from "@/components/goodPopup.vue"
-import useCartStore from "@/store/cart.js"
-import {
-	getCurrentInstance
-} from 'vue';
-import {
-	shopDetailApi
-} from "@/api/multipleShop.js";
+	import {
+		onLoad,
+		onShow,
+		onShareAppMessage,
+	} from "@dcloudio/uni-app"
+	import {
+		reactive,
+		ref,
+		onMounted,
+	} from "vue"
+	import {
+		goodListApi,
+		goodClassListApi
+	} from "@/api/good.js"
+	import {
+		cartCreateApi,
+		cartChangeApi,
+		cartListApi
+	} from "@/api/cart.js";
+	import {
+		productLogApi,
+		userInfoApi,
+		getStoreInfo
+	} from "@/api/user.js";
+	import viewPopup from "@/components/viewPopup.vue"
+	import goodPopup from "@/components/goodPopup.vue"
+	import useCartStore from "@/store/cart.js"
+	import {
+		getCurrentInstance
+	} from 'vue';
+	import {
+		shopDetailApi
+	} from "@/api/multipleShop.js";
 
-import useUserStore from "@/store/user";
-const userStore = useUserStore();
-const STORE_INFO = reactive({
-	id: 4,
-	store_name: "农(特)产品直营店"
-})
+	import useUserStore from "@/store/user";
+	const userStore = useUserStore();
+	const STORE_INFO = reactive({
+		id: 23,
+		store_name: "农(特)产品直营店"
+	})
 
-const getStoreInfoFn = () => {
-	if (uni.getStorageSync('STORE_INFO').length) {
-		let data = JSON.parse(uni.getStorageSync('STORE_INFO'))
-		for (let key in data) {
-			STORE_INFO[key] = data[key]
+	const getStoreInfoFn = () => {
+		if (uni.getStorageSync('STORE_INFO').length) {
+			let data = JSON.parse(uni.getStorageSync('STORE_INFO'))
+			for (let key in data) {
+				STORE_INFO[key] = data[key]
+			}
 		}
+		getStoreInfo().then(res => {
+			uni.setStorageSync("STORE_INFO", JSON.stringify(res.data));
+			let data = res.data;
+			for (let key in data) {
+				STORE_INFO[key] = data[key]
+			}
+		})
 	}
-	getStoreInfo().then(res => {
-		uni.setStorageSync("STORE_INFO", JSON.stringify(res.data));
-		let data = res.data;
-		for (let key in data) {
-			STORE_INFO[key] = data[key]
+	getStoreInfoFn()
+
+
+	// 分享给好友
+	onShareAppMessage(() => {
+		let shareStr = '?id=' + STORE_INFO.id;
+		if (userStore.userInfo.user_ship == 1) {
+			shareStr = shareStr + '&spread_uid=' + userStore.userInfo.id + '&real_name=' + (userStore.userInfo
+				.real_name || userStore.userInfo.nickname)
 		}
+		let shareInfo = {
+			title: (userStore.userInfo.real_name || userStore.userInfo.nickname) + '的供销个人门店',
+			path: '/pages/index/index' + shareStr,
+			imageUrl: STORE_INFO.image || '',
+			success() {
+				uni.$u.toast('分享成功');
+			},
+			fail() {
+				uni.$u.toast('分享失败');
+			}
+		};
+		return shareInfo;
 	})
-}
-getStoreInfoFn()
 
-
-// 分享给好友
-onShareAppMessage(() => {
-	let shareStr = '?id=' + STORE_INFO.id;
-	if (userStore.userInfo.user_ship == 1) {
-		shareStr = shareStr + '&spread_uid=' + userStore.userInfo.id + '&real_name=' + (userStore.userInfo
-			.real_name || userStore.userInfo.nickname)
+	/*商品列表滚动隐藏头部导航 */
+	const targetHeight = ref(0)
+	let scoHeight = 0
+	const isScroll = ref(false)
+	let lastScollTop = 0
+	const hideHeadView = (e) => {
+		if (e.detail.scrollTop < 100) return
+		if (e.detail.scrollTop <= 0 || e.detail.scrollTop > targetHeight.value)
+			return
+		isScroll.value = e.detail.scrollTop > lastScollTop
+		lastScollTop = e.detail.scrollTop
 	}
-	let shareInfo = {
-		title: (userStore.userInfo.real_name || userStore.userInfo.nickname) + '的供销个人门店',
-		path: '/pages/index/index' + shareStr,
-		imageUrl: STORE_INFO.image || '',
-		success() {
-			uni.$u.toast('分享成功');
-		},
-		fail() {
-			uni.$u.toast('分享失败');
-		}
-	};
-	return shareInfo;
-})
 
-/*商品列表滚动隐藏头部导航 */
-const targetHeight = ref(0)
-let scoHeight = 0
-const isScroll = ref(false)
-let lastScollTop = 0
-const hideHeadView = (e) => {
-	if (e.detail.scrollTop < 100) return
-	if (e.detail.scrollTop <= 0 || e.detail.scrollTop > targetHeight.value)
-		return
-	isScroll.value = e.detail.scrollTop > lastScollTop
-	lastScollTop = e.detail.scrollTop
-}
+	/*商品列表滚动隐藏头部导航结束 */
+	const cartStore = useCartStore();
+	const show = ref(0);
+	const topActive = ref(0);
+	const changeOne = async (item, index) => {
+		topActive.value = item.id;
+		show.value = 0;
+		goodClassTow.value = item?.children || [];
+		goodClassThree.value = goodClassTow.value[0]?.children || [];
+		leftActive.value = goodClassTow.value[0]?.id || '';
+		rightActive.value = goodClassThree.value[0]?.id || '';
+		getGoodList();
+		if (!item.isLoading && item.id) getgoodClassList(topActive.value, 2); // 判断是否加载过数据, 加载过则不进行加载,节约资源
+	}
 
-/*商品列表滚动隐藏头部导航结束 */
-const cartStore = useCartStore();
-const show = ref(0);
-const topActive = ref(0);
-const changeOne = async (item, index) => {
-	topActive.value = item.id;
-	show.value = 0;
-	goodClassTow.value = item?.children || [];
-	goodClassThree.value = goodClassTow.value[0]?.children || [];
-	leftActive.value = goodClassTow.value[0]?.id || '';
-	rightActive.value = goodClassThree.value[0]?.id || '';
-	getGoodList();
-	if (!item.isLoading && item.id) getgoodClassList(topActive.value, 2); // 判断是否加载过数据, 加载过则不进行加载,节约资源
-}
+	const leftActive = ref(0);
+	const changeTwo = (item, index) => {
+		isScroll.value = false;
+		getWXDom(instance)
+		leftActive.value = item.id;
+		show.value = 0;
+		goodClassThree.value = item?.children || [];
+		rightActive.value = goodClassThree.value[0]?.id || '';
+		getGoodList();
+		if (!item.isLoading && item.id) getgoodClassList(leftActive.value, 3); // 判断是否加载过数据, 加载过则不进行加载,节约资源
+	}
 
-const leftActive = ref(0);
-const changeTwo = (item, index) => {
-	isScroll.value = false;
-	getWXDom(instance)
-	leftActive.value = item.id;
-	show.value = 0;
-	goodClassThree.value = item?.children || [];
-	rightActive.value = goodClassThree.value[0]?.id || '';
-	getGoodList();
-	if (!item.isLoading && item.id) getgoodClassList(leftActive.value, 3); // 判断是否加载过数据, 加载过则不进行加载,节约资源
-}
+	const rightActive = ref(0);
+	const changeThree = (item, index) => {
+		rightActive.value = item.id;
+		show.value = 0;
+		getGoodList();
+	}
 
-const rightActive = ref(0);
-const changeThree = (item, index) => {
-	rightActive.value = item.id;
-	show.value = 0;
-	getGoodList();
-}
+	const addCart = (product_id, cart_num) => { //加入购物车
+		cartCreateApi({
+			cart_num: cart_num,
+			is_new: 0, // 是否直接购买0否1是
+			// goods_id: id,
+			store_id: STORE_INFO.id,
+			product_id: product_id
+		}).then(res => {
+			getCartList();
+		}).catch(err => {
+			uni.$u.toast(err.msg || '添加失败')
+		})
+	}
 
-const addCart = (product_id, cart_num) => { //加入购物车
-	cartCreateApi({
-		cart_num: cart_num,
-		is_new: 0, // 是否直接购买0否1是
-		// goods_id: id,
-		store_id: STORE_INFO.id,
-		product_id: product_id
-	}).then(res => {
-		getCartList();
-	}).catch(err => {
-		uni.$u.toast(err.msg || '添加失败')
+	const keyword = ref('');
+
+	const searchKeyword = () => {
+		where.value.name = keyword.value;
+		where.value.store_name = keyword.value;
+		getGoodList();
+	}
+
+	const changeOrder = (order) => {
+		where.value.order = order;
+		getGoodList();
+	}
+
+	const where = ref({
+		page_no: 1,
+		page_size: 15,
+		name: '',
+		order: '',
+		store_name: '',
+		store_id: STORE_INFO.id
 	})
-}
 
-const keyword = ref('');
+	const loading = ref(true);
+	const goodList = ref([]);
+	const getGoodList = (loadmore = false) => {
+		loading.value = true;
+		let class_id = rightActive.value || leftActive.value || topActive.value || '';
+		let class_all = '';
+		// 若分类没有选中时,则直接查询上一级分类
+		if (rightActive.value == '') class_all = leftActive.value;
+		if (leftActive.value == '') class_all = topActive.value;
+		if (topActive.value == '') class_all = '';
+		if (class_all) class_id = ""; //只能带其中一个
+		if (loadmore) where.value.page_no++;
+		else where.value.page_no = 1;
+		goodListApi({
+			...where.value,
+			class_all: class_all,
+			class: class_id,
+			cate_id: class_id,
+		}).then(res => {
+			if (loadmore) goodList.value.push(...res.data.lists);
+			else goodList.value = res.data.lists;
+			// 补充店铺信息
+			// if (!STORE_INFO.store_name || !STORE_INFO.detailed_address) {
+			// 	STORE_INFO.store_name = res.data.store.name;
+			// 	STORE_INFO.value.detailed_address = res.data.store.detailed_address;
+			// }
+		})
+	}
 
-const searchKeyword = () => {
-	where.value.name = keyword.value;
-	where.value.store_name = keyword.value;
-	getGoodList();
-}
+	// 商品列表触底
+	const loadMoreGood = () => {
 
-const changeOrder = (order) => {
-	where.value.order = order;
-	getGoodList();
-}
+		getWXDom(instance)
+		getGoodList(true);
+	}
 
-const where = ref({
-	page_no: 1,
-	page_size: 15,
-	name: '',
-	order: '',
-	store_name: '',
-	store_id: STORE_INFO.id
-})
-
-const loading = ref(true);
-const goodList = ref([]);
-const getGoodList = (loadmore = false) => {
-	loading.value = true;
-	let class_id = rightActive.value || leftActive.value || topActive.value || '';
-	let class_all = '';
-	// 若分类没有选中时,则直接查询上一级分类
-	if (rightActive.value == '') class_all = leftActive.value;
-	if (leftActive.value == '') class_all = topActive.value;
-	if (topActive.value == '') class_all = '';
-	if (class_all) class_id = ""; //只能带其中一个
-	if (loadmore) where.value.page_no++;
-	else where.value.page_no = 1;
-	goodListApi({
-		...where.value,
-		class_all: class_all,
-		class: class_id,
-		cate_id: class_id,
-	}).then(res => {
-		if (loadmore) goodList.value.push(...res.data.lists);
-		else goodList.value = res.data.lists;
-		// 补充店铺信息
-		// if (!STORE_INFO.store_name || !STORE_INFO.detailed_address) {
-		// 	STORE_INFO.store_name = res.data.store.name;
-		// 	STORE_INFO.value.detailed_address = res.data.store.detailed_address;
-		// }
-	})
-}
-
-// 商品列表触底
-const loadMoreGood = () => {
-
-	getWXDom(instance)
-	getGoodList(true);
-}
-
-const goodClassList = ref([]); // 一级分类
-const goodClassTow = ref([]); // 二级分类
-const goodClassThree = ref([]); // 三级分类
-const classMap = new Map();
-const getgoodClassList = (pid = 0, three = 1) => {
-	let page_no = classMap.get(pid) || 1;
-	goodClassListApi({
-		pid: pid,
-		page_no: page_no,
-		page_size: 30,
-		level: three,
-		store_id: STORE_INFO.id // 店铺id，用于获取店铺分类列表，如果为空则获取全部分类列表，否则获取店铺分类列表。
-	}).then(res => {
-		if (pid == 0) { // 加载一级分类时设置全部分类
-			if (!res.data?.lists?.length) return;
-			res.data?.lists?.unshift({
-				id: "",
-				name: "全部",
-				pic: "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/35adb202404271727457954.png",
-				children: []
-			})
-			res.data.lists = res.data.lists.map(item => {
-				if (!item.children) item.children = [];
-				item.children?.unshift({
+	const goodClassList = ref([]); // 一级分类
+	const goodClassTow = ref([]); // 二级分类
+	const goodClassThree = ref([]); // 三级分类
+	const classMap = new Map();
+	const getgoodClassList = (pid = 0, three = 1) => {
+		let page_no = classMap.get(pid) || 1;
+		goodClassListApi({
+			pid: pid,
+			page_no: page_no,
+			page_size: 30,
+			level: three,
+			store_id: STORE_INFO.id // 店铺id，用于获取店铺分类列表，如果为空则获取全部分类列表，否则获取店铺分类列表。
+		}).then(res => {
+			if (pid == 0) { // 加载一级分类时设置全部分类
+				if (!res.data?.lists?.length) return;
+				res.data?.lists?.unshift({
 					id: "",
-					pid: item.id, //子分类的全部选项其实就是它本身
 					name: "全部",
+					pic: "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/35adb202404271727457954.png",
+					children: []
 				})
-				item.children = item.children.map(t => {
-					if (!t.children) t.children = [];
-					t.children?.unshift({
+				res.data.lists = res.data.lists.map(item => {
+					if (!item.children) item.children = [];
+					item.children?.unshift({
 						id: "",
-						pid: t.id,
+						pid: item.id, //子分类的全部选项其实就是它本身
 						name: "全部",
 					})
-					return t;
-				})
-				return item;
-			})
-			// 给所有子级分配
-			goodClassList.value = [...goodClassList.value, ...res.data?.lists];
-			goodClassTow.value = goodClassList.value[0]?.children || [];
-			goodClassThree.value = goodClassTow.value[0]?.children || [];
-			topActive.value = goodClassList.value[0]?.id;
-			leftActive.value = goodClassTow.value[0]?.id;
-			rightActive.value = goodClassThree.value[0]?.id;
-		} else {
-			let flag = 1;
-			goodClassList.value.forEach(item => { // 给相应的一级分类添加子菜单
-				if (item.id == pid) {
-					if (!item.children) {
-						item.children = [];
-						item.children.unshift({
+					item.children = item.children.map(t => {
+						if (!t.children) t.children = [];
+						t.children?.unshift({
 							id: "",
-							pid: item.id,
+							pid: t.id,
 							name: "全部",
 						})
-					}
-					item.children = [...item.children, ...res.data.lists];
-					item.isLoading = true;
-					goodClassTow.value = item.children;
-					flag = 0;
-				}
-			})
-			if (flag) goodClassTow.value.forEach(item => { //给响应的二级子分类添加菜单
-				if (item.id == pid) {
-					if (!item.children) {
-						item.children = [];
-						item.children.unshift({
-							id: "",
-							pid: item.id,
-							name: "全部",
-						})
-					}
-					item.children = [...item.children, ...res.data.lists];
-					item.isLoading = true;
-					goodClassThree.value = item.children;
-				}
-			})
-		}
-		page_no++;
-		classMap.set(pid, page_no);
-	})
-}
-
-const navTo = (url) => {
-	if (!userStore.token || !userStore.userInfo.mobile) return uni.showModal({
-		content: '您需要先登录才可使用该功能, 是否前去登录',
-		success: (e) => {
-			if (e.confirm) {
-				userStore.setToken('');
-				userStore.setUserInfo({});
-				uni.navigateTo({
-					url: '/pages/login/login'
+						return t;
+					})
+					return item;
 				})
+				// 给所有子级分配
+				goodClassList.value = [...goodClassList.value, ...res.data?.lists];
+				goodClassTow.value = goodClassList.value[0]?.children || [];
+				goodClassThree.value = goodClassTow.value[0]?.children || [];
+				topActive.value = goodClassList.value[0]?.id;
+				leftActive.value = goodClassTow.value[0]?.id;
+				rightActive.value = goodClassThree.value[0]?.id;
 			} else {
-				userStore.setToken('');
-				userStore.setUserInfo({});
-			}
-		}
-	})
-	uni.navigateTo({
-		url: url
-	})
-}
-
-// 选择商品相关
-const showGoodPopup = ref(false);
-const goodRef = ref(null);
-const goodData = ref({});
-const openGoodPopup = (item) => { // 打开数量/重量弹窗
-	goodData.value = item;
-	goodRef.value.setData(item);
-	showGoodPopup.value = true;
-
-	//统计商品的访问记录
-	productLogApi({
-		product_id: item.product_id,
-		cate_id: item.cate_id,
-		store_id: STORE_INFO.id
-	});
-};
-const changeGood = (data) => { // 确定选择商品重量
-	showGoodPopup.value = false;
-	if (!userStore.token) return uni.showModal({
-		content: '您需要先登录才可使用该功能, 是否前去登录',
-		success: (e) => {
-			if (e.confirm) {
-				userStore.setToken('');
-				userStore.setUserInfo({});
-				uni.navigateTo({
-					url: '/pages/login/login'
+				let flag = 1;
+				goodClassList.value.forEach(item => { // 给相应的一级分类添加子菜单
+					if (item.id == pid) {
+						if (!item.children) {
+							item.children = [];
+							item.children.unshift({
+								id: "",
+								pid: item.id,
+								name: "全部",
+							})
+						}
+						item.children = [...item.children, ...res.data.lists];
+						item.isLoading = true;
+						goodClassTow.value = item.children;
+						flag = 0;
+					}
+				})
+				if (flag) goodClassTow.value.forEach(item => { //给响应的二级子分类添加菜单
+					if (item.id == pid) {
+						if (!item.children) {
+							item.children = [];
+							item.children.unshift({
+								id: "",
+								pid: item.id,
+								name: "全部",
+							})
+						}
+						item.children = [...item.children, ...res.data.lists];
+						item.isLoading = true;
+						goodClassThree.value = item.children;
+					}
 				})
-			} else {
-				userStore.setToken('');
-				userStore.setUserInfo({});
 			}
-		},
+			page_no++;
+			classMap.set(pid, page_no);
+		})
+	}
+
+	const navTo = (url) => {
+		if (!userStore.token || !userStore.userInfo.mobile) return uni.showModal({
+			content: '您需要先登录才可使用该功能, 是否前去登录',
+			success: (e) => {
+				if (e.confirm) {
+					userStore.setToken('');
+					userStore.setUserInfo({});
+					uni.navigateTo({
+						url: '/pages/login/login'
+					})
+				} else {
+					userStore.setToken('');
+					userStore.setUserInfo({});
+				}
+			}
+		})
+		uni.navigateTo({
+			url: url
+		})
+	}
+
+	// 选择商品相关
+	const showGoodPopup = ref(false);
+	const goodRef = ref(null);
+	const goodData = ref({});
+	const openGoodPopup = (item) => { // 打开数量/重量弹窗
+		goodData.value = item;
+		goodRef.value.setData(item);
+		showGoodPopup.value = true;
+
+		//统计商品的访问记录
+		productLogApi({
+			product_id: item.product_id,
+			cate_id: item.cate_id,
+			store_id: STORE_INFO.id
+		});
+	};
+	const changeGood = (data) => { // 确定选择商品重量
+		showGoodPopup.value = false;
+		if (!userStore.token) return uni.showModal({
+			content: '您需要先登录才可使用该功能, 是否前去登录',
+			success: (e) => {
+				if (e.confirm) {
+					userStore.setToken('');
+					userStore.setUserInfo({});
+					uni.navigateTo({
+						url: '/pages/login/login'
+					})
+				} else {
+					userStore.setToken('');
+					userStore.setUserInfo({});
+				}
+			},
+		});
+
+		addCart(data.product_id, data.cart_num);
+	}
+	// 结算
+	const settleAccounts = () => {
+		uni.navigateTo({
+			url: '/pagesOrder/settle/settle'
+		})
+	}
+
+	// 购物车相关
+	const cartInfo = ref({
+		total_price: '0.00',
+		pay_price: 0,
+		count: 0
+	})
+	const getCartList = (res) => {
+		cartListApi({
+			page_no: 1,
+			page_size: 100,
+		}).then(res => {
+			cartInfo.value = {
+				total_price: res.data?.extend?.total_price || '0.00',
+				pay_price: res.data?.extend?.pay_price || '0.00',
+				count: res.data?.count || 0
+			}
+			cartStore.setCartList(res.data?.lists.map(item => item.id))
+		})
+	}
+
+	// 胶囊布局
+	const btns = ref({
+		height: 0,
+		top: 0,
+		bottom: 0,
+		left: 0
 	});
 
-	addCart(data.product_id, data.cart_num);
-}
-// 结算
-const settleAccounts = () => {
-	uni.navigateTo({
-		url: '/pagesOrder/settle/settle'
-	})
-}
 
-// 购物车相关
-const cartInfo = ref({
-	total_price: '0.00',
-	count: 0
-})
-const getCartList = (res) => {
-	cartListApi({
-		page_no: 1,
-		page_size: 100,
-	}).then(res => {
-		cartInfo.value = {
-			total_price: res.data?.extend?.total_price || '0.00',
-			count: res.data?.count || 0
-		}
-		cartStore.setCartList(res.data?.lists.map(item => item.id))
-	})
-}
+	// 分享信息
+	const shareInfo = ref({
+		uid: '',
+		real_name: '',
+		store_id: ''
+	});
 
-// 胶囊布局
-const btns = ref({
-	height: 0,
-	top: 0,
-	bottom: 0,
-	left: 0
-});
-
-
-// 分享信息
-const shareInfo = ref({
-	uid: '',
-	real_name: '',
-	store_id: ''
-});
-
-const getShareInfo = () => {
-	if (uni.getStorageSync('SHARE_INFO')) {
-		shareInfo.value = (uni.getStorageSync('SHARE_INFO'))
-	}
-}
-getShareInfo()
-
-onLoad(async (opt) => {
-	where.value.store_id = opt.id || STORE_INFO.id;
-	// 店铺id
-	if (opt.id) {
-		where.value.store_id = opt.id;
-		const info = await shopDetailApi({
-			store_id: opt.id
-		});
-		// 分享参数至当前用户参数
-		if (opt.spread_uid) {
-			shareInfo.value.uid = opt.spread_uid;
-			shareInfo.value.real_name = opt.real_name;
-			shareInfo.value.store_id = opt.id;
-			uni.setStorageSync('SHARE_INFO', shareInfo.value);
+	const getShareInfo = () => {
+		if (uni.getStorageSync('SHARE_INFO')) {
+			shareInfo.value = (uni.getStorageSync('SHARE_INFO'))
 		}
 	}
-	getgoodClassList(0);
-	getGoodList();
-	// #ifndef H5
-	// 胶囊布局信息
-	btns.value = uni.getMenuButtonBoundingClientRect();
-	// #endif
-})
+	getShareInfo()
 
-onShow(() => {
-	// 如果后台变更核销人员权限 可以及时切换
-	if (userStore.token && userStore.userInfo.mobile) {
-		userInfoApi().then(res => {
-			const user = res.data;
-			userStore.setUserInfo(user);
-			if (user.is_staff == 1) {
-				uni.reLaunch({
-					url: "/multipleShop/verificationOrder/index"
-				})
-			} else {
-				getCartList();
+	onLoad(async (opt) => {
+		where.value.store_id = opt.id || STORE_INFO.id;
+		// 店铺id
+		if (opt.id) {
+			where.value.store_id = opt.id;
+			const info = await shopDetailApi({
+				store_id: opt.id
+			});
+			// 分享参数至当前用户参数
+			if (opt.spread_uid) {
+				shareInfo.value.uid = opt.spread_uid;
+				shareInfo.value.real_name = opt.real_name;
+				shareInfo.value.store_id = opt.id;
+				uni.setStorageSync('SHARE_INFO', shareInfo.value);
 			}
-		});
-	}
-});
-
-
-let instance; // 获取组件实例
-const getWXDom = () => {
-	let query = uni.createSelectorQuery().in(instance).select("#drag_area");
-	query.fields({
-		size: true,
-		scrollOffset: true,
-	},
-		(data) => {
-			scoHeight = data.scrollHeight
-			targetHeight.value = data.scrollHeight - data.height
 		}
-	).exec();
-}
+		getgoodClassList(0);
+		getGoodList();
+		// #ifndef H5
+		// 胶囊布局信息
+		btns.value = uni.getMenuButtonBoundingClientRect();
+		// #endif
+	})
 
-onMounted(() => {
-	instance = getCurrentInstance(); // 获取组件实例
-	setTimeout(() => {
-		getWXDom(instance)
-	}, 500)
-})
+	onShow(() => {
+		// 如果后台变更核销人员权限 可以及时切换
+		if (userStore.token && userStore.userInfo.mobile) {
+			userInfoApi().then(res => {
+				const user = res.data;
+				userStore.setUserInfo(user);
+				if (user.is_staff == 1) {
+					uni.reLaunch({
+						url: "/multipleShop/verificationOrder/index"
+					})
+				} else {
+					getCartList();
+				}
+			});
+		}
+	});
+
+
+	let instance; // 获取组件实例
+	const getWXDom = () => {
+		let query = uni.createSelectorQuery().in(instance).select("#drag_area");
+		query.fields({
+				size: true,
+				scrollOffset: true,
+			},
+			(data) => {
+				scoHeight = data.scrollHeight
+				targetHeight.value = data.scrollHeight - data.height
+			}
+		).exec();
+	}
+
+	onMounted(() => {
+		instance = getCurrentInstance(); // 获取组件实例
+		setTimeout(() => {
+			getWXDom(instance)
+		}, 500)
+	})
 </script>
 
 <style lang="scss">
-.content {
-	background-color: #fff;
-}
+	.content {
+		background-color: #fff;
+	}
 
-.navbar {
-	padding: 0 20rpx;
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	font-size: 22rpx;
-	color: #777;
-	margin-top: 40rpx;
+	.navbar {
+		padding: 0 20rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		font-size: 22rpx;
+		color: #777;
+		margin-top: 40rpx;
 
-	.nav-item {
+		.nav-item {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			position: relative;
+
+			image {
+				height: 40rpx;
+				width: 40rpx;
+			}
+
+			.badge {
+				position: absolute;
+				top: -10rpx;
+				right: 0;
+				background-color: #FF0000;
+				color: #FFFFFF;
+				padding: 0 8rpx;
+				border-radius: 50rpx;
+				font-size: 18rpx;
+			}
+
+		}
+	}
+
+	.head-view {
+		background-color: #fff;
+		height: 180rpx;
+		width: 750rpx;
+
+		.list {
+			height: 100%;
+			display: flex;
+			align-items: center;
+			padding: 0 20rpx;
+			font-size: 22rpx;
+
+			.item {
+				width: 120rpx;
+				flex-shrink: 0;
+				margin-right: 20rpx;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+
+				.c-img {
+					height: 100rpx;
+					width: 100rpx;
+					flex-shrink: 0;
+					border-radius: 50%;
+					border: 2px solid transparent;
+					overflow: hidden;
+				}
+
+				.c-text {
+					width: 100%;
+					text-align: center;
+					box-sizing: border-box;
+					padding: 2rpx 4rpx 3rpx 4rpx;
+					border-radius: 50rpx;
+					margin-top: 5rpx;
+				}
+			}
+
+			.item-active {
+				.c-img {
+					border: 2px solid #20b128;
+				}
+
+				.c-text {
+					background-color: #20b128;
+					color: #fff;
+				}
+			}
+		}
+	}
+
+	.r-btn {
+		position: absolute;
+		right: 0;
+		top: 0;
+		height: 100%;
+		width: 60rpx;
+		font-size: 24rpx;
+		background-color: #fff;
 		display: flex;
 		flex-direction: column;
 		align-items: center;
 		justify-content: center;
-		position: relative;
-
-		image {
-			height: 40rpx;
-			width: 40rpx;
-		}
-
-		.badge {
-			position: absolute;
-			top: -10rpx;
-			right: 0;
-			background-color: #FF0000;
-			color: #FFFFFF;
-			padding: 0 8rpx;
-			border-radius: 50rpx;
-			font-size: 18rpx;
-		}
-
-	}
-}
-
-.head-view {
-	background-color: #fff;
-	height: 180rpx;
-	width: 750rpx;
-
-	.list {
-		height: 100%;
-		display: flex;
-		align-items: center;
-		padding: 0 20rpx;
-		font-size: 22rpx;
-
-		.item {
-			width: 120rpx;
-			flex-shrink: 0;
-			margin-right: 20rpx;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-
-			.c-img {
-				height: 100rpx;
-				width: 100rpx;
-				flex-shrink: 0;
-				border-radius: 50%;
-				border: 2px solid transparent;
-				overflow: hidden;
-			}
-
-			.c-text {
-				width: 100%;
-				text-align: center;
-				box-sizing: border-box;
-				padding: 2rpx 4rpx 3rpx 4rpx;
-				border-radius: 50rpx;
-				margin-top: 5rpx;
-			}
-		}
-
-		.item-active {
-			.c-img {
-				border: 2px solid #20b128;
-			}
-
-			.c-text {
-				background-color: #20b128;
-				color: #fff;
-			}
-		}
-	}
-}
-
-.r-btn {
-	position: absolute;
-	right: 0;
-	top: 0;
-	height: 100%;
-	width: 60rpx;
-	font-size: 24rpx;
-	background-color: #fff;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-	box-shadow: -10rpx 0 60rpx 1rpx rgba(0, 0, 0, 0.3);
-}
-
-.cateOne {
-	background-color: #fff;
-
-	.head-title {
-		color: #666666;
-		font-size: 30rpx;
-		height: 80rpx;
-		line-height: 80rpx;
-		padding-left: 30rpx;
+		box-shadow: -10rpx 0 60rpx 1rpx rgba(0, 0, 0, 0.3);
 	}
 
-	.list {
-		padding: 20rpx 20rpx;
-		font-size: 22rpx;
-		display: grid;
-		grid-template-columns: repeat(5, 1fr);
-		justify-content: center;
-		grid-gap: 20rpx;
+	.cateOne {
+		background-color: #fff;
 
-
-		.item {
-			width: 120rpx;
-			margin: 0 auto;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-
-			.c-img {
-				height: 100rpx;
-				width: 100rpx;
-				flex-shrink: 0;
-				border-radius: 50%;
-				border: 2px solid transparent;
-				overflow: hidden;
-			}
-
-			.c-text {
-				width: 100%;
-				text-align: center;
-				box-sizing: border-box;
-				padding: 2rpx 4rpx 3rpx 4rpx;
-				border-radius: 50rpx;
-				margin-top: 5rpx;
-			}
-		}
-
-		.item-active {
-			.c-img {
-				border: 2px solid #20b128;
-			}
-
-			.c-text {
-				background-color: #20b128;
-				color: #fff;
-			}
-		}
-	}
-
-	.classify-list {
-		padding: 20rpx 30rpx;
-		font-size: 22rpx;
-		display: grid;
-		grid-template-columns: repeat(3, 1fr);
-		justify-content: center;
-		grid-gap: 20rpx;
-
-		.classify-list-item {
-			flex-shrink: 0;
-			text-align: center;
-			width: 150rpx;
-			height: 42rpx;
-			line-height: 42rpx;
-			background: #F6F6F6;
-			border-radius: 22rpx 22rpx 22rpx 22rpx;
-			border: 1rpx solid transparent;
-		}
-
-		.item-active {
-			border: 1rpx solid #20b128;
-			color: #20b128;
-			background-color: rgba(#20b128, 0.1);
-		}
-	}
-}
-
-.scroll-box {
-	// background-color: red;
-	display: flex;
-
-	.left {
-		height: calc(100vh - var(--window-top) - var(--window-bottom) - 300rpx);
-		/* #ifdef H5 */
-		height: calc(100vh - 44px - 100rpx);
-		/* #endif */
-		width: 170rpx;
-		box-sizing: border-box;
-		background-color: #f6f6f6;
-		font-size: 24rpx;
-
-		.item {
-			height: 96rpx;
-			line-height: 96rpx;
-			text-align: center;
-		}
-
-		.item-active {
-			background-color: #fff;
-			position: relative;
-			color: #20b128;
-
-			&::before {
-				content: '';
-				background-color: #20b128;
-				width: 6rpx;
-				height: 48rpx;
-				border-radius: 10rpx;
-				position: absolute;
-				left: 0;
-				top: 50%;
-				transform: translate(0, -50%);
-			}
-		}
-	}
-
-	.right {
-		height: calc(100vh - var(--window-top) - 300rpx);
-		/* #ifdef H5 */
-		height: calc(100vh - 96px + 20rpx);
-		/* #endif */
-		width: 580rpx;
-		box-sizing: border-box;
-		position: relative;
-		overflow: hidden;
-
-		.classify {
-			height: 150rpx;
-			background-color: #fff;
-			border-bottom: 1rpx solid #f6f6f6;
-			position: relative;
-			font-size: 24rpx;
-
-			.classify-list {
-				display: flex;
-				padding: 20rpx;
-
-				.classify-list-item {
-					flex-shrink: 0;
-					text-align: center;
-					width: 108rpx;
-					height: 42rpx;
-					line-height: 42rpx;
-					background: #F6F6F6;
-					border-radius: 22rpx 22rpx 22rpx 22rpx;
-					margin-right: 20rpx;
-					border: 1rpx solid transparent;
-				}
-
-				.item-active {
-					border: 1rpx solid #20b128;
-					color: #20b128;
-					background-color: rgba(#20b128, 0.1);
-				}
-			}
-
-			.done {
-				height: 90rpx;
-				width: 60rpx;
-				position: absolute;
-				top: 0;
-				right: 0;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				background-color: #fff;
-			}
-
-			.order-by {
-				display: flex;
-				justify-content: flex-end;
-				align-items: center;
-
-				.item {
-					padding-right: 20rpx;
-				}
-
-				.order-active {
-					color: #20b128;
-				}
-			}
+		.head-title {
+			color: #666666;
+			font-size: 30rpx;
+			height: 80rpx;
+			line-height: 80rpx;
+			padding-left: 30rpx;
 		}
 
 		.list {
-			height: calc(100vh - var(--window-top) - 400rpx);
-			/* #ifdef H5 */
-			height: calc(100vh - 44px - 200rpx);
+			padding: 20rpx 20rpx;
+			font-size: 22rpx;
+			display: grid;
+			grid-template-columns: repeat(5, 1fr);
+			justify-content: center;
+			grid-gap: 20rpx;
 
-			/* #endif */
-			.shop-item {
-				padding: 20rpx;
-				border-bottom: 1rpx solid #f6f6f6;
-				background-color: #fff;
+
+			.item {
+				width: 120rpx;
+				margin: 0 auto;
 				display: flex;
+				flex-direction: column;
+				align-items: center;
 
-				.shop-img {
-					height: 120rpx;
-					width: 120rpx;
-					margin-right: 20rpx;
-					border-radius: 14rpx;
+				.c-img {
+					height: 100rpx;
+					width: 100rpx;
+					flex-shrink: 0;
+					border-radius: 50%;
+					border: 2px solid transparent;
 					overflow: hidden;
-					background-size: 100% 100%;
-					// background-image: url();
 				}
 
-				.shop-content {
-					width: 380rpx;
+				.c-text {
+					width: 100%;
+					text-align: center;
+					box-sizing: border-box;
+					padding: 2rpx 4rpx 3rpx 4rpx;
+					border-radius: 50rpx;
+					margin-top: 5rpx;
+				}
+			}
+
+			.item-active {
+				.c-img {
+					border: 2px solid #20b128;
+				}
+
+				.c-text {
+					background-color: #20b128;
+					color: #fff;
+				}
+			}
+		}
+
+		.classify-list {
+			padding: 20rpx 30rpx;
+			font-size: 22rpx;
+			display: grid;
+			grid-template-columns: repeat(3, 1fr);
+			justify-content: center;
+			grid-gap: 20rpx;
+
+			.classify-list-item {
+				flex-shrink: 0;
+				text-align: center;
+				width: 150rpx;
+				height: 42rpx;
+				line-height: 42rpx;
+				background: #F6F6F6;
+				border-radius: 22rpx 22rpx 22rpx 22rpx;
+				border: 1rpx solid transparent;
+			}
+
+			.item-active {
+				border: 1rpx solid #20b128;
+				color: #20b128;
+				background-color: rgba(#20b128, 0.1);
+			}
+		}
+	}
+
+	.scroll-box {
+		// background-color: red;
+		display: flex;
+
+		.left {
+			height: calc(100vh - var(--window-top) - var(--window-bottom) - 300rpx);
+			/* #ifdef H5 */
+			height: calc(100vh - 44px - 100rpx);
+			/* #endif */
+			width: 170rpx;
+			box-sizing: border-box;
+			background-color: #f6f6f6;
+			font-size: 24rpx;
+
+			.item {
+				height: 96rpx;
+				line-height: 96rpx;
+				text-align: center;
+			}
+
+			.item-active {
+				background-color: #fff;
+				position: relative;
+				color: #20b128;
+
+				&::before {
+					content: '';
+					background-color: #20b128;
+					width: 6rpx;
+					height: 48rpx;
+					border-radius: 10rpx;
+					position: absolute;
+					left: 0;
+					top: 50%;
+					transform: translate(0, -50%);
+				}
+			}
+		}
+
+		.right {
+			height: calc(100vh - var(--window-top) - 300rpx);
+			/* #ifdef H5 */
+			height: calc(100vh - 96px + 20rpx);
+			/* #endif */
+			width: 580rpx;
+			box-sizing: border-box;
+			position: relative;
+			overflow: hidden;
+
+			.classify {
+				height: 150rpx;
+				background-color: #fff;
+				border-bottom: 1rpx solid #f6f6f6;
+				position: relative;
+				font-size: 24rpx;
+
+				.classify-list {
 					display: flex;
-					flex-direction: column;
-					justify-content: space-between;
+					padding: 20rpx;
 
-					.title {
-						.name {
-							font-size: 28rpx;
-						}
-
-						.tip {
-							color: #999;
-							font-size: 24rpx;
-							margin: 2rpx 0;
-						}
+					.classify-list-item {
+						flex-shrink: 0;
+						text-align: center;
+						width: 108rpx;
+						height: 42rpx;
+						line-height: 42rpx;
+						background: #F6F6F6;
+						border-radius: 22rpx 22rpx 22rpx 22rpx;
+						margin-right: 20rpx;
+						border: 1rpx solid transparent;
 					}
 
-					.price {
-						font-size: 30rpx;
-						font-weight: bold;
-						color: #F55726;
+					.item-active {
+						border: 1rpx solid #20b128;
+						color: #20b128;
+						background-color: rgba(#20b128, 0.1);
+					}
+				}
+
+				.done {
+					height: 90rpx;
+					width: 60rpx;
+					position: absolute;
+					top: 0;
+					right: 0;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					background-color: #fff;
+				}
+
+				.order-by {
+					display: flex;
+					justify-content: flex-end;
+					align-items: center;
+
+					.item {
+						padding-right: 20rpx;
 					}
 
-					.price-btn {
+					.order-active {
+						color: #20b128;
+					}
+				}
+			}
+
+			.list {
+				height: calc(100vh - var(--window-top) - 400rpx);
+				/* #ifdef H5 */
+				height: calc(100vh - 44px - 200rpx);
+
+				/* #endif */
+				.shop-item {
+					padding: 20rpx;
+					border-bottom: 1rpx solid #f6f6f6;
+					background-color: #fff;
+					display: flex;
+
+					.shop-img {
+						height: 120rpx;
+						width: 120rpx;
+						margin-right: 20rpx;
+						border-radius: 14rpx;
+						overflow: hidden;
+						background-size: 100% 100%;
+						// background-image: url();
+					}
+
+					.shop-content {
+						width: 380rpx;
 						display: flex;
+						flex-direction: column;
 						justify-content: space-between;
 
-						.btn {
-							display: flex;
-							align-items: center;
+						.title {
+							.name {
+								font-size: 28rpx;
+							}
 
-							.num {
-								width: 60rpx;
-								text-align: center;
+							.tip {
+								color: #999;
+								font-size: 24rpx;
+								margin: 2rpx 0;
+							}
+						}
+
+						.price {
+							font-size: 30rpx;
+							font-weight: bold;
+							color: #F55726;
+						}
+
+						.price-btn {
+							display: flex;
+							justify-content: space-between;
+
+							.btn {
+								display: flex;
+								align-items: center;
+
+								.num {
+									width: 60rpx;
+									text-align: center;
+								}
 							}
 						}
 					}
@@ -1010,71 +1028,70 @@ onMounted(() => {
 			}
 		}
 	}
-}
 
-.fiexd-btn-box {
-	box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.1);
-	height: 140rpx;
-	height: calc(constant(safe-area-inset-bottom) + 140rpx);
-	/* 适用于iOS设备 */
-	height: calc(env(safe-area-inset-bottom) + 140rpx);
-	/* 适用于Android设备 */
-	padding-top: 40rpx;
+	.fiexd-btn-box {
+		box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.1);
+		height: 140rpx;
+		height: calc(constant(safe-area-inset-bottom) + 140rpx);
+		/* 适用于iOS设备 */
+		height: calc(env(safe-area-inset-bottom) + 140rpx);
+		/* 适用于Android设备 */
+		padding-top: 40rpx;
 
-	.price-info {
-		.row {
-			display: flex;
-			font-size: 26rpx;
-			align-items: center;
+		.price-info {
+			.row {
+				display: flex;
+				font-size: 26rpx;
+				align-items: center;
 
-			&>view {
-				margin-right: 15rpx;
-			}
+				&>view {
+					margin-right: 15rpx;
+				}
 
-			.price {
-				color: #F55726;
+				.price {
+					color: #F55726;
+				}
 			}
 		}
-	}
 
-	.btn {
-		width: 200rpx;
-	}
-
-	.cart {
-		position: absolute;
-		top: -40rpx;
-		left: 40rpx;
-
-		image {
-			width: 80rpx;
-			height: 80rpx;
+		.btn {
+			width: 200rpx;
 		}
 
-		.badge {
+		.cart {
 			position: absolute;
-			top: 0;
-			right: 0;
-			background-color: #F55726;
-			color: #fff;
-			border-radius: 50%;
-			width: 26rpx;
-			height: 26rpx;
-			text-align: center;
-			line-height: 26rpx;
-			font-size: 18rpx;
+			top: -40rpx;
+			left: 40rpx;
+
+			image {
+				width: 80rpx;
+				height: 80rpx;
+			}
+
+			.badge {
+				position: absolute;
+				top: 0;
+				right: 0;
+				background-color: #F55726;
+				color: #fff;
+				border-radius: 50%;
+				width: 26rpx;
+				height: 26rpx;
+				text-align: center;
+				line-height: 26rpx;
+				font-size: 18rpx;
+			}
 		}
 	}
-}
 
-.headScoll {
-	position: relative;
-	overflow: hidden;
-	transition: 400ms;
-}
+	.headScoll {
+		position: relative;
+		overflow: hidden;
+		transition: 400ms;
+	}
 
-.store-info {
-	margin: 0 0 20rpx 20rpx;
-	margin-top: 20rpx;
-}
+	.store-info {
+		margin: 0 0 20rpx 20rpx;
+		margin-top: 20rpx;
+	}
 </style>
\ No newline at end of file
diff --git a/pagesOrder/detail/detail.vue b/pagesOrder/detail/detail.vue
index d13a27e..bc9e57c 100644
--- a/pagesOrder/detail/detail.vue
+++ b/pagesOrder/detail/detail.vue
@@ -9,8 +9,7 @@
 				@click="callPhone(shopInfo.phone)">
 				<view class="top" style="align-items: flex-start;">
 					<view style="color: #333;display: flex;align-items: center;flex-shrink: 0;">
-						<up-icon name="map"></up-icon>
-						<text style="margin: 0 10rpx;">自提点</text>
+						<text style="margin: 0 10rpx;color:#20B128">推荐自提点</text>
 					</view>
 					<view v-if="shopInfo.id">
 						<view style="color: #333;">