From 6b51ffe40bcbeb74c0b88d07286a02c5d3d7e978 Mon Sep 17 00:00:00 2001
From: LGX <365820713@qq.com>
Date: Thu, 5 Sep 2024 11:12:29 +0800
Subject: [PATCH] 1

---
 components/productWindow/index.vue  | 2 +-
 pages/goods/order_confirm/index.vue | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/components/productWindow/index.vue b/components/productWindow/index.vue
index efe68be..e7f0d15 100644
--- a/components/productWindow/index.vue
+++ b/components/productWindow/index.vue
@@ -129,7 +129,7 @@
 		<view class="mask" @touchmove.stop.prevent="moveHandle" :hidden="attr.cartAttr === false" @click="closeAttr"></view>
 		<!-- 选择门店 -->
 		<view class="product-window" :class="isStore?'store':''">
-			<view class="storeTitle">选择1门店<text class="iconfont icon-guanbi5" @click="closeStore"></text></view>
+			<view class="storeTitle">选择门店<text class="iconfont icon-guanbi5" @click="closeStore"></text></view>
 			<view class="storeList">
 				<view class="item" :class="active == index?'on':''" v-for="(item,index) in storeList" :key="index" @click="tapStore(index,item)">
 					<view class="name line1">{{item.name}}</view>
diff --git a/pages/goods/order_confirm/index.vue b/pages/goods/order_confirm/index.vue
index 6b2829a..40cf5d7 100644
--- a/pages/goods/order_confirm/index.vue
+++ b/pages/goods/order_confirm/index.vue
@@ -56,6 +56,11 @@
 								<view :class="deliveryType==2?'colorhuang':'colorfff'">到店自提</view>
 								<view v-if="deliveryType==2" class="hengxian"></view>
 							</view>
+							<view class=""
+								:class="deliveryType==3?'colorhuang':'colorfff'"
+								v-if="isDisplay.includes('3')"
+								@tap="addressType(0,3)"
+								>门店配送</view>
 						</view>
 					</view>
 					<view v-else class="bg--w111-fff rd-t-24rpx text--w111-999 fs-24">
@@ -164,7 +169,7 @@
 		<view class='address add1 flex-between-center ml-20 mr-20 rd-16rpx mt-20'
 			@tap='onAddress(addressInfo.real_name)' v-if='deliveryType == 3 && !tableId'>
 			<view v-if="addressInfo.real_name">
-				<view class="fs-30 text--w111-333 fw-500 acea-row row-middle">
+				<view class="fs-30 colorhui1 fw-500 acea-row row-middle">
 					<text>{{addressInfo.real_name}}</text> <text class='pl-20'>{{addressInfo.phone}}</text>
 					<text class='default font-num acea-row row-center-wrapper ml-8'
 						v-if="addressInfo.is_default">默认</text>