From 7b862c994682928465b4399e7c4d09e1ee91e403 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Thu, 16 Nov 2023 18:28:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E8=B5=A0=E9=80=81=E7=A7=AF=E5=88=86=E8=BE=93=E5=85=A5=E6=A1=86?=
 =?UTF-8?q?=E5=8F=AA=E8=83=BD=E8=BE=93=E5=85=A5=E6=95=B0=E5=AD=97=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E4=BF=AE=E5=A4=8D=EF=BC=9A=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=E4=B8=AD=E5=BF=83=E7=9A=84=E5=B9=BF=E5=91=8A=E5=9B=BE?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6=E5=9B=BA=E5=AE=9A=E4=B8=BA150rpx=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=BC=80?=
 =?UTF-8?q?=E5=B1=8F=E5=B9=BF=E5=91=8A=E5=8A=A0=E4=BA=86=E9=93=BE=E6=8E=A5?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E4=B8=8D=E8=83=BD=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/guide/index.vue       | 35 +++++++++++++++-------
 pages.json                       |  2 +-
 pages/admin/custom/index.vue     |  2 +-
 pages/annex/vip_center/index.vue |  8 ++---
 pages/annex/vip_paid/index.vue   |  8 ++---
 pages/store/settled/index.vue    | 12 ++++----
 pages/user/index.vue             | 50 +++++++++++++++++++++++++++-----
 7 files changed, 83 insertions(+), 34 deletions(-)

diff --git a/components/guide/index.vue b/components/guide/index.vue
index d1c74a8..4c4d018 100644
--- a/components/guide/index.vue
+++ b/components/guide/index.vue
@@ -1,9 +1,18 @@
 <template>
 	<!-- 开屏广告 -->
 	<view class="content">
-		<swiper class="swiper" :class="advData.list.length==1?'on':''" :autoplay="autoplay" :interval="interval" :duration="duration" :circular="circular" @change="stopChange"
-			v-if="advData.list.length">
-			<swiper-item v-for="(item,index) in advData.list" :key="index" @click="jump(item.url)">
+		<swiper
+        class="swiper"
+        :class="advData.list.length==1?'on':''"
+        :autoplay="autoplay"
+        :interval="interval"
+        :duration="duration"
+        :circular="circular"
+        @change="stopChange"
+        @click="jump()"
+        v-if="advData.list.length"
+    >
+			<swiper-item v-for="(item,index) in advData.list" :key="index">
 				<view class="swiper-item">
 					<view class="swiper-item-img">
 						<image :src="item.pic" mode="aspectFill"></image>
@@ -12,10 +21,11 @@
 			</swiper-item>
 		</swiper>
 		<view class="video-box" v-if="advData.type == 'video' && advData.video_link">
-			<video class="vid" :src="advData.video_link" :autoplay="true" :loop="true" :muted="true"
-				:controls="false"></video>
+			<video class="vid" :src="advData.video_link" :autoplay="true" :loop="true" :muted="true" :controls="false"></video>
 		</view>
-		<view class="jump-over" :style="{ top: navH + 'rpx' }" @tap="launchFlag()">跳过<text v-if="closeType == 1">{{time}}</text><slot name="bottom"></slot></view>
+		<view class="jump-over" :style="{ top: navH + 'rpx' }" @tap="launchFlag()">
+      跳过<text v-if="closeType == 1">{{time}}</text><slot name="bottom"></slot>
+    </view>
 	</view>
 </template>
 
@@ -33,7 +43,8 @@
 				experience: '立即体验',
 				time: this.advData.config.open_screen_time,
 				timecount: undefined,
-				navH: 0
+				navH: 0,
+        currIndex: 0,
 			}
 		},
 		props: {
@@ -57,7 +68,8 @@
 			// #endif
 		},
 		methods: {
-			stopChange(){
+			stopChange(e){
+        this.currIndex = e.detail.current;
 				if(this.advData.list.length == 1){
 					return false
 				}
@@ -79,7 +91,9 @@
 					url: '/pages/index/index'
 				});
 			},
-			jump(url) {
+			jump() {
+        let url = this.advData.list[this.currIndex].url || '';
+        console.log(url);
 				if(url){
 					clearInterval(this.timecount)
 					if (url.indexOf("http") != -1) {
@@ -87,8 +101,7 @@
 							url: `/pages/annex/web_view/index?url=${url}`
 						});
 					} else {
-						if (['/pages/goods_cate/goods_cate', '/pages/order_addcart/order_addcart', '/pages/user/index', '/pages/index/index', '/pages/plant_grass/index']
-							.indexOf(url) == -1) {
+						if (['/pages/goods_cate/goods_cate', '/pages/order_addcart/order_addcart', '/pages/user/index', '/pages/index/index', '/pages/plant_grass/index'].indexOf(url) == -1) {
 							uni.navigateTo({
 								url: url
 							})
diff --git a/pages.json b/pages.json
index 392fae5..5fcf9e2 100644
--- a/pages.json
+++ b/pages.json
@@ -580,7 +580,7 @@
 				{
 					"path": "shopStreet/index",
 					"style": {
-						"navigationBarTitleText": "店铺街"
+						"navigationBarTitleText": "附近商家"
 					}
 				},
 				{
diff --git a/pages/admin/custom/index.vue b/pages/admin/custom/index.vue
index 88ed031..da7a123 100644
--- a/pages/admin/custom/index.vue
+++ b/pages/admin/custom/index.vue
@@ -4,7 +4,7 @@
     <view class="search-content">
       <view class="search-box">
         <text class="iconfont icon-sousuo" @click="searchCustom()"></text>
-        <input class="search-input" type='number' placeholder='请输入会员昵称' v-model="search.nickname" @input="searchCustom()" />
+        <input class="search-input" type='text' placeholder='请输入会员昵称' v-model="search.nickname" @input="searchCustom()" />
       </view>
     </view>
     <!-- 客户列表 -->
diff --git a/pages/annex/vip_center/index.vue b/pages/annex/vip_center/index.vue
index 5430eea..edced37 100644
--- a/pages/annex/vip_center/index.vue
+++ b/pages/annex/vip_center/index.vue
@@ -82,10 +82,10 @@
 					</view>
 				</scroll-view>
 				<view class="buy" @click="pay">立即支付</view>
-				<view v-if="memberExplain" class="agree">
-					<navigator class="link" url="/pages/annex/vip_clause/index" hover-class="none">购买即视为同意<text
-						class="mark">《会员用户协议》</text></navigator>
-				</view>	
+				<!--<view v-if="memberExplain" class="agree">-->
+				<!--	<navigator class="link" url="/pages/annex/vip_clause/index" hover-class="none">购买即视为同意<text-->
+				<!--		class="mark">《会员用户协议》</text></navigator>-->
+				<!--</view>	-->
 			</view>
 			<view v-if="goodsList.length" class="goods-section">
 				<view class="section-hd">
diff --git a/pages/annex/vip_paid/index.vue b/pages/annex/vip_paid/index.vue
index 328345f..7ebaa3d 100644
--- a/pages/annex/vip_paid/index.vue
+++ b/pages/annex/vip_paid/index.vue
@@ -39,10 +39,10 @@
 				</view>
 			</scroll-view>
 			<view class="buy" @click="pay">{{svip_type == 1 ? '立即体验' : '立即开通'}}</view>
-			<view v-if="memberExplain" class="agree">
-				<navigator class="link" url="/pages/annex/vip_clause/index" hover-class="none">购买即视为同意<text
-						class="mark">《会员用户协议》</text></navigator>
-			</view>	
+			<!--<view v-if="memberExplain" class="agree">-->
+			<!--	<navigator class="link" url="/pages/annex/vip_clause/index" hover-class="none">购买即视为同意<text-->
+			<!--			class="mark">《会员用户协议》</text></navigator>-->
+			<!--</view>	-->
 		</view>
 		<view v-if="goodsList.length" class="goods-section">
 			<view class="section-hd">会员专享价 <text>会员购买享超低价</text></view>
diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index e8e19a9..0a3ebf5 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -91,11 +91,11 @@
 							</view>
 						</view>
 					</view>
-					<view class="item no-border">
-						<checkbox-group @change='ChangeIsAgree'>
-							<checkbox class="checkbox" :checked="isAgree ? true : false" />已阅读并同意</checkbox-group>
-						<button class="settleAgree" @click="getConfig">《入驻协议》</button>
-					</view>
+					<!--<view class="item no-border">-->
+					<!--	<checkbox-group @change='ChangeIsAgree'>-->
+					<!--		<checkbox class="checkbox" :checked="isAgree ? true : false" />已阅读并同意</checkbox-group>-->
+					<!--	<button class="settleAgree" @click="getConfig">《入驻协议》</button>-->
+					<!--</view>-->
 					<button class='submitBtn' :class="validate === true ? 'on':''" @click="formSubmit">提交申请</button>
 				</view>
 			</view>
@@ -165,7 +165,7 @@
 				text: "获取验证码",
 				codeUrl: "",
 				disabled: false,
-				isAgree: false,
+				isAgree: true,// 是否同意协议
 				showProtocol: false,
 				isShowCode: false,
 				loading: false,
diff --git a/pages/user/index.vue b/pages/user/index.vue
index d786c1d..d8c63af 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -120,12 +120,20 @@
 				</view>
 				<!-- 轮播 -->
 				<view class="slider-wrapper skeleton-rect" v-if="imgUrls.length>0">
-					<swiper indicator-dots="true" :autoplay="autoplay" :circular="circular" :interval="interval" :duration="duration"
-					 indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff">
+					<swiper
+              indicator-dots="true"
+              :autoplay="autoplay"
+              :circular="circular"
+              :interval="interval"
+              :duration="duration"
+              @change="changeSwiper"
+              :style="{ height: swiperHeight + 'px' }"
+              indicator-color="rgba(255,255,255,0.6)"
+              indicator-active-color="#fff">
 						<block v-for="(item,index) in imgUrls" :key="index">
 							<swiper-item>
 								<view @click="goUrl(item.url)" class='slide-navigator acea-row row-between-wrapper'>
-									<image :src="item.pic" class="slide-image"></image>
+									<image :src="item.pic" :id="'wrap'+index" class="slide-image"></image>
 								</view>
 							</swiper-item>
 						</block>
@@ -200,7 +208,6 @@
 	</view>
 </template>
 <script>
-
 	let sysHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
 	import { getMenuList, getUserInfo, setVisit } from '@/api/user.js';
 	import { getVersion, getNavigation } from "@/api/public";
@@ -313,10 +320,17 @@
 				newData: {},
 				activeRouter: '',
 				sysHeight: sysHeight,
+
+
+
+        currIndex: 0, // 当前索引
+        swiperHeight: 0, // 滑块的高度(单位px)
 			}
 		},
 		onLoad() {
-			
+      this.$nextTick(() => {
+        this.setSwiperHeight(); // 动态设置 swiper 的高度
+      });
 		},
 		onReady() {
 			this.isNodes++;
@@ -559,6 +573,29 @@
 					this.openAuto()
 				}
 			},
+
+      /* 切换 swiper 滑块 */
+      changeSwiper(e) {
+        this.currIndex = e.detail.current;
+        this.$nextTick(() => {
+          this.setSwiperHeight(); // 动态设置 swiper 的高度
+        });
+      },
+      /* 动态设置 swiper 的高度 */
+      setSwiperHeight() {
+        const element = "#wrap" + this.currIndex;
+        const query = uni.createSelectorQuery().in(this);
+        query.select(element).boundingClientRect(data => {
+          this.swiperHeight = data.width * 9 / 16;
+        }).exec();
+
+        // query.select(element).boundingClientRect();
+        // query.exec(res => {
+        //   console.log(res);
+        //   if (res && res[0]) this.swiperHeight = res[0].height;
+        // });
+      },
+
 		},
 		onPullDownRefresh: function(){
 			this.getNav();
@@ -809,14 +846,13 @@
 		}
 		.slider-wrapper {
 			margin: 20rpx 0;
-			height: 130rpx;
 			swiper,
 			swiper-item {
 				height: 100%;
 			}
 			image {
 				width: 100%;
-				height: 130rpx;
+        //height: auto!important;
 			}
 		}
 		.user-menus {