From b54aa03dcb58bf05e7b8f05b42e6668ef06aeb56 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Wed, 21 Feb 2024 10:52:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                |  4 ++--
 pages/gather/gather.vue      |  1 +
 pages/order_details/stay.vue | 11 ++++++-----
 pages/store/settled/unit.vue |  6 +++---
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/manifest.json b/manifest.json
index e927935..244d374 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "惠农生活",
     "appid" : "__UNI__3A527D1",
     "description" : "",
-    "versionName" : "1.8.8",
-    "versionCode" : 188,
+    "versionName" : "1.8.9",
+    "versionCode" : 189,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index 6714595..f04ba10 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -72,6 +72,7 @@
 			<view class="locationb"> 用于向你推荐最近门店 </view>
 			<view class="locationx" @click.stop="isshow=false">x</view>
 		</view>
+    <!-- <view>sss</view> -->
 		<u-picker :defaultIndex="[0, 0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
 			@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
 		<!-- <m-tabbar native>
diff --git a/pages/order_details/stay.vue b/pages/order_details/stay.vue
index 2c3cc14..0077399 100644
--- a/pages/order_details/stay.vue
+++ b/pages/order_details/stay.vue
@@ -16,7 +16,6 @@
 					</view>
 					<view class='data' v-else>
 						<view class='state'>已逾期{{this.be_overdue}}天{{this.be_overhours}}时,请尽快完成支付!</view>
-
 						<view>{{orderInfo.add_time_y}}<text class='time'>{{orderInfo.create_time}}</text></view>
 					</view>
 				</view>
@@ -73,8 +72,10 @@
 							<view class="item">
 								<image :src="goods.cart_info.product.image"></image>
 								<view class="info-box">
-									<view class="name line1"><text
-											class="event_name event_bg">预售</text>{{goods.cart_info.product.store_name}}
+									<view class="name line1">
+                    <!-- <text
+											class="event_name event_bg">预售</text> -->
+                      {{goods.cart_info.product.store_name}}
 									</view>
 									<view class="msg">{{goods.cart_info.productAttr.sku}}</view>
 									<view class="event_ship event_color">发货时间：
@@ -89,9 +90,9 @@
 								<view class="num"><text
 										class="font-color">￥{{goods.cart_info.productPresellAttr.presell_price}}</text></br>x{{goods.product_num}}
 								</view>
-								<view class="bnt">
+								<!-- <view class="bnt">
 									立即付款
-								</view>
+								</view> -->
 							</view>
 							<view class="event_progress" v-if="goods.cart_info.productPresell.presell_type !=1">
 								<view class="progress_list">
diff --git a/pages/store/settled/unit.vue b/pages/store/settled/unit.vue
index 81bac3c..1c82d13 100644
--- a/pages/store/settled/unit.vue
+++ b/pages/store/settled/unit.vue
@@ -1008,9 +1008,9 @@ import { Toast } from '../../../libs/uniApi';
 				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(this.merchantData.phone)) return this.$util.Tips({
 					title: '请输入正确的手机号码'
 				});
-				if (!this.isAgree) return this.$util.Tips({
-					title: '请勾选并同意入驻协议'
-				});
+				// if (!this.isAgree) return this.$util.Tips({
+				// 	title: '请勾选并同意入驻协议'
+				// });
 				this.$refs.verify.show();
 			}
 		}