From 518f1a9aa828627334c6cf877a930cc86019448e Mon Sep 17 00:00:00 2001
From: "3321822538@qq.com" <3321822538@qq.com>
Date: Sat, 15 Feb 2025 16:46:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8C=B6=E5=AE=A4=E9=A1=B5=E9=9D=A2=E5=B0=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue        |  9 +++++----
 pages/nearbystores/index.vue | 28 ++++++++++++++++++++++++++--
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index a8df1cc..f95a5b7 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
 		<u-navbar :title="shopobj.name" :border-bottom="false" :background="bgc" back-icon-color="#262B37" title-color='#262B37'
-			:custom-back="btns" title-size='36' height='36' id="navbar">
+			:custom-back="btns" title-size='36' height='40' id="navbar">
 		</u-navbar>
 		<image src="https://api.ccttiot.com/smartmeter/img/static/u3lZnmhqSqkMd7gHKtMD" mode="" class="imgbj"></image>
 		<view class="lunbo">
@@ -225,8 +225,9 @@
 		data() {
 			return {
 				bgc: {
-					backgroundColor: "",
+					backgroundColor: "rgba(195, 221, 189, 1)",
 				},
+				navflag:true,
 				list: [{
 					image: 'https://api.ccttiot.com/smartmeter/img/static/uuoqWaq7HnXBteQayaz4'
 				}],
@@ -254,7 +255,6 @@
 				sceneValue:'',
 				cesuolist:[],
 				cesuoflag:false,
-				csindex:-1,
 			}
 		},
 		onLoad(option) {
@@ -1156,6 +1156,7 @@
 		border-radius: 0rpx 0rpx 0rpx 0rpx;
 		height: 100vh;
 		overflow: hidden;
+		overflow: scroll;
 	}
 
 	/deep/ .u-indicator-item-number {
@@ -1225,7 +1226,7 @@
 
 		.shoplist {
 			max-height: 710rpx;
-			overflow: scroll;
+			// overflow: scroll;
 			padding-bottom: 40rpx;
 			box-sizing: border-box;
 
diff --git a/pages/nearbystores/index.vue b/pages/nearbystores/index.vue
index aeae9ea..14f6343 100644
--- a/pages/nearbystores/index.vue
+++ b/pages/nearbystores/index.vue
@@ -73,12 +73,15 @@
 						</view>
 					</view>
 				</view>
-				<view class="" style="width: 100%;text-align: center;margin-top: 100rpx;font-size: 34rpx;color: #ccc;">
+				<view class="" style="width: 100%;text-align: center;margin-top: 40rpx;font-size: 34rpx;color: #ccc;">
 					没有更多门店啦，敬请期待吧...
 				</view>
 			</view>
 		</view>
-		<view class="jiameng" @click="btnjiameng">
+		<view class="jiameng" v-if="guangaoflag" @click="btnjiameng">
+			<view class="gb" @click.stop="guangaoflag = false">
+				关闭 <text>×</text>
+			</view>
 			<image src="https://api.ccttiot.com/smartmeter/img/static/uuoqWaq7HnXBteQayaz4" mode=""></image>
 		</view>
 		<view class="xuanfu" v-if="imgflag">
@@ -153,6 +156,7 @@
 	export default {
 		data() {
 			return {
+			   guangaoflag:true,
 			   jinxintxt:'开包厢',
                imgflag:true,
 			   longitude:'',
@@ -193,6 +197,9 @@
             this.getinfo()
 			this.getorder()
 		},
+		onShow() {
+			this.guangaoflag = true
+		},
 		methods: {
 			// 点击切换门店类型
 			btntabindex(num){
@@ -508,6 +515,7 @@
 			},
 			// 点击输入框确定执行搜索
 			confirm(){
+				this.pagesum = 1
 				this.getshop()
 			},
 			// 根据定位来获取门店
@@ -875,9 +883,25 @@
 			position: fixed;
 			bottom: 0;
 			left: 0;
+			.gb{
+				width: 100rpx;
+				height: 40rpx;
+				background-color: rgba(0,0,0,0.15);
+				position: absolute;
+				top: 0;
+				right: 22rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				border-radius: 0 30rpx 0 0;
+				text{
+					font-size: 34rpx;
+				}
+			}
 			image{
 				width: 710rpx;
 				height: 196rpx;
+				border-radius: 30rpx;
 			}
 		}
 		.shoplist{