From 7ef8893e5483384522c600b74acbc4829561736b Mon Sep 17 00:00:00 2001
From: H <30830569@qq.com>
Date: Wed, 20 Jul 2022 11:07:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/index/index.vue           |   6 +-
 src/pages/product_details/index.vue |   7 +-
 src/pages/sort/index.vue            | 563 ++++++++++++++--------------
 3 files changed, 299 insertions(+), 277 deletions(-)

diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 61f5589..989d487 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -559,12 +559,14 @@ export default {
         if (e.jump_type == 1) {
           if (tabRouter.findIndex((el) => e.jump_link?.includes(el)) >= 0) {
             const params = this.getParams(e.jump_link);
-            console.log(params);
-            if(Object.keys(params.params).length>0) uni.setStorageSync(params.path, params.params);
+            // console.log(params); 
+            if(Object.keys(params.params).length>0) {
+            uni.$emit('jumpTab',params.params)
             this.$u.route({
               url: params.path,
               type: 'switchTab',
             });
+            }
           } else if (whiteRouter.findIndex((el) => e.jump_link?.includes(el)) >= 0) {
             this.$u.routeAuth(e.jump_link);
           } else {
diff --git a/src/pages/product_details/index.vue b/src/pages/product_details/index.vue
index 955d366..0c0320f 100644
--- a/src/pages/product_details/index.vue
+++ b/src/pages/product_details/index.vue
@@ -263,7 +263,7 @@
                 </block>
               </u-table>
             </view>
-            <u-parse :html="detailHtml"   style="font-size:0"></u-parse>
+            <u-parse :html="detailHtml"   style="font-size:0;width: 100%;"  :tagStyle="style"></u-parse>
           </view>
           <!-- 购物须知 -->
           <view class="mt-base bg-white">
@@ -395,6 +395,11 @@ export default {
       playShow: false,
       shareShow: false,
       goodsImage: '', //本地图片
+      style:{
+        	p: 'font-size:0',
+        	span: 'font-size: 0',
+          img:'display:block;min-width:100%'
+      }
     };
   },
   computed: {
diff --git a/src/pages/sort/index.vue b/src/pages/sort/index.vue
index 1b6236d..87ce5f4 100644
--- a/src/pages/sort/index.vue
+++ b/src/pages/sort/index.vue
@@ -1,316 +1,331 @@
 <template>
 	<view class="u-wrap">
-      <loading-view v-if="isFirstLoading"></loading-view>
+		<loading-view v-if="isFirstLoading"></loading-view>
 		<!-- 顶部导航栏 -->
-    <u-navbar :border-bottom="false" :is-back="false" :background="{ background: '#ffffff' }">
-      <view class="pl-base w-full" @tap="$u.route('/pages/search/search')">
-        <u-search disabled placeholder="搜索商品名称" :show-action="false"></u-search>
-      </view>
-      <template #right>
-        <view class="mx-base relative" @tap="$u.routeAuth('/pageA/news/index')">
-          <u-icon name="chat" size="48"></u-icon>
-          <block v-if="news_num > 0">
-            <u-badge :is-dot="true" size="16" :offset="[0, 2]" class="badge"></u-badge>
-          </block>
-        </view>
-      </template>
-    </u-navbar>
+		<u-navbar :border-bottom="false" :is-back="false" :background="{ background: '#ffffff' }">
+			<view class="pl-base w-full" @tap="$u.route('/pages/search/search')">
+				<u-search disabled placeholder="搜索商品名称" :show-action="false"></u-search>
+			</view>
+			<template #right>
+				<view class="mx-base relative" @tap="$u.routeAuth('/pageA/news/index')">
+					<u-icon name="chat" size="48"></u-icon>
+					<block v-if="news_num > 0">
+						<u-badge :is-dot="true" size="16" :offset="[0, 2]" class="badge"></u-badge>
+					</block>
+				</view>
+			</template>
+		</u-navbar>
 		<view class="u-menu-wrap">
 			<scroll-view scroll-y scroll-with-animation class="u-tab-view menu-scroll-view" :scroll-top="scrollTop"
-			 :scroll-into-view="itemId">
-				<view v-for="(item,index) in tabbar" :key="index" class="u-tab-item" :class="[current == index ? 'u-tab-item-active' : '']"
-				 @tap.stop="swichMenu(index)">
-					<text class="u-line-1">{{item.name}}</text>
+				:scroll-into-view="itemId">
+				<view v-for="(item, index) in tabbar" :key="index" class="u-tab-item"
+					:class="[current == index ? 'u-tab-item-active' : '']" @tap.stop="swichMenu(index)">
+					<text class="u-line-1">{{ item.name }}</text>
 				</view>
 			</scroll-view>
-			<scroll-view :scroll-top="scrollRightTop" scroll-y scroll-with-animation class="right-box" @scroll="rightScroll">
+			<scroll-view :scroll-top="scrollRightTop" scroll-y scroll-with-animation class="right-box"
+				@scroll="rightScroll">
 				<view class="page-view">
-					<block v-for="(item,index) in tabbar" :key="index">
-            <view class="class-item" :id="'item' + index" v-for="(item1 , index1) in item.children" :key="index1">
-            	<view class="item-title">
-            		<text>{{item1.name}}</text>
-            	</view>
-              <!-- 广告位 -->
-              <view class="my-20rpx shdow2 h-200rpx"  v-if="item1.icon">
-                <image class="w-full h-full rounded-15rpx " :src="item1.icon" mode="aspectFill"></image>
-              </view>
-            	<view class="item-container">
-            		<view @click="$u.route('/pages/search/search_result', {category: item2.id,})" class="thumb-box" v-for="(item2, index2) in item1.children" :key="index2">
-            			<image v-if="item2.icon" class="item-menu-image" :src="item2.icon" mode=""></image>
-            			<view class="item-menu-name">{{item2.name}}</view>
-            		</view>
-            	</view>
-            </view>
-          </block>
+					<block v-for="(item, index) in tabbar" :key="index">
+						<view class="class-item" :id="'item' + index" v-for="(item1, index1) in item.children"
+							:key="index1">
+							<view class="item-title">
+								<text>{{ item1.name }}</text>
+							</view>
+							<!-- 广告位 -->
+							<view class="my-20rpx shdow2 h-200rpx" v-if="item1.icon">
+								<image class="w-full h-full rounded-15rpx " :src="item1.icon" mode="aspectFill"></image>
+							</view>
+							<view class="item-container">
+								<view @click="$u.route('/pages/search/search_result', { category: item2.id, })"
+									class="thumb-box" v-for="(item2, index2) in item1.children" :key="index2">
+									<image v-if="item2.icon" class="item-menu-image" :src="item2.icon" mode=""></image>
+									<view class="item-menu-name">{{ item2.name }}</view>
+								</view>
+							</view>
+						</view>
+					</block>
 				</view>
 			</scroll-view>
 		</view>
 	</view>
 </template>
 <script>
-	export default {
-		data() {
-			return {
-				scrollTop: 0, //tab标题的滚动条位置
-				oldScrollTop: 0,
-				current: 0, // 预设当前项的值
-				menuHeight: 0, // 左边菜单的高度
-				menuItemHeight: 0, // 左边菜单item的高度
-				itemId: '', // 栏目右边scroll-view用于滚动的id
-				tabbar:[],
-				menuItemPos: [],
-				arr: [],
-				scrollRightTop: 0, // 右边栏目scroll-view的滚动条高度
-				timer: null, // 定时器
-				isFirstLoading:true,
+export default {
+	data() {
+		return {
+			scrollTop: 0, //tab标题的滚动条位置
+			oldScrollTop: 0,
+			current: 0, // 预设当前项的值
+			menuHeight: 0, // 左边菜单的高度
+			menuItemHeight: 0, // 左边菜单item的高度
+			itemId: '', // 栏目右边scroll-view用于滚动的id
+			tabbar: [],
+			menuItemPos: [],
+			arr: [],
+			scrollRightTop: 0, // 右边栏目scroll-view的滚动条高度
+			timer: null, // 定时器
+			isFirstLoading: true,
+		}
+	},
+	onLoad() {
+		setTimeout(() => {
+			this.isFirstLoading = false
+		}, 300)
+		this.getDate()
+	},
+	onShow(){
+		this.$nextTick(()=>{
+			uni.$on('jumpTab',({id})=> {
+			if(!!id){
+				const Index=this.tabbar.findIndex(e=>e.id==id)
+				this.swichMenu(Index)
 			}
+		})
+		})
+	},
+	onReady() {
+		this.getMenuItemTop()
+	},
+	methods: {
+		async getDate() {
+			const resData = await this.$api.get('/v1/product/categories')
+			this.tabbar = resData
 		},
-		onLoad() {
-      setTimeout(()=>{
-        this.isFirstLoading=false
-      },300)
-			this.getDate()
-		},
-		onReady() {
-			this.getMenuItemTop()
-		},
-		methods: {
-     async getDate(){
-       const resData=await this.$api.get('/v1/product/categories')
-        this.tabbar=resData
-      },
-			// 点击左边的栏目切换
-			async swichMenu(index) {
-				if(this.arr.length == 0) {
-					await this.getMenuItemTop();
-				}
-				if (index == this.current) return;
-				this.scrollRightTop = this.oldScrollTop;
-				this.$nextTick(function(){
-					this.scrollRightTop = this.arr[index];
-					this.current = index;
-					this.leftMenuStatus(index);
-				})
-			},
-			// 获取一个目标元素的高度
-			getElRect(elClass, dataVal) {
-				new Promise((resolve, reject) => {
-					const query = uni.createSelectorQuery().in(this);
-					query.select('.' + elClass).fields({
-						size: true
-					}, res => {
-						// 如果节点尚未生成，res值为null，循环调用执行
-						if (!res) {
-							setTimeout(() => {
-								this.getElRect(elClass);
-							}, 10);
-							return;
-						}
-						this[dataVal] = res.height;
-						resolve();
-					}).exec();
-				})
-			},
-			// 观测元素相交状态
-			async observer() {
-				this.tabbar.map((val, index) => {
-					let observer = uni.createIntersectionObserver(this);
-					// 检测右边scroll-view的id为itemxx的元素与right-box的相交状态
-					// 如果跟.right-box底部相交，就动态设置左边栏目的活动状态
-					observer.relativeTo('.right-box', {
-						top: 0
-					}).observe('#item' + index, res => {
-						if (res.intersectionRatio > 0) {
-							let id = res.id.substring(4);
-							this.leftMenuStatus(id);
-						}
-					})
-				})
-			},
-			// 设置左边菜单的滚动状态
-			async leftMenuStatus(index) {
+		// 点击左边的栏目切换
+		async swichMenu(index) {
+			if (this.arr.length == 0) {
+				await this.getMenuItemTop();
+			}
+			if (index == this.current) return;
+			this.scrollRightTop = this.oldScrollTop;
+			this.$nextTick(function () {
+				this.scrollRightTop = this.arr[index];
 				this.current = index;
-				// 如果为0，意味着尚未初始化
-				if (this.menuHeight == 0 || this.menuItemHeight == 0) {
-					await this.getElRect('menu-scroll-view', 'menuHeight');
-					await this.getElRect('u-tab-item', 'menuItemHeight');
-				}
-				// 将菜单活动item垂直居中
-				this.scrollTop = index * this.menuItemHeight + this.menuItemHeight / 2 - this.menuHeight / 2;
-			},
-			// 获取右边菜单每个item到顶部的距离
-			getMenuItemTop() {
-				new Promise(resolve => {
-					let selectorQuery = uni.createSelectorQuery();
-					selectorQuery.selectAll('.class-item').boundingClientRect((rects) => {
-						// 如果节点尚未生成，rects值为[](因为用selectAll，所以返回的是数组)，循环调用执行
-						if(!rects.length) {
-							setTimeout(() => {
-								this.getMenuItemTop();
-							}, 10);
-							return ;
-						}
-						rects.forEach((rect) => {
-							// 这里减去rects[0].top，是因为第一项顶部可能不是贴到导航栏(比如有个搜索框的情况)
-							this.arr.push(rect.top - rects[0].top);
-							resolve();
-						})
-					}).exec()
-				})
-			},
-			// 右边菜单滚动
-			async rightScroll(e) {
-				this.oldScrollTop = e.detail.scrollTop;
-				if(this.arr.length == 0) {
-					await this.getMenuItemTop();
-				}
-				if(this.timer) return ;
-				if(!this.menuHeight) {
-					await this.getElRect('menu-scroll-view', 'menuHeight');
-				}
-				setTimeout(() => { // 节流
-					this.timer = null;
-					// scrollHeight为右边菜单垂直中点位置
-					let scrollHeight = e.detail.scrollTop + this.menuHeight / 2;
-					for (let i = 0; i < this.arr.length; i++) {
-						let height1 = this.arr[i];
-						let height2 = this.arr[i + 1];
-						// 如果不存在height2，意味着数据循环已经到了最后一个，设置左边菜单为最后一项即可
-						if (!height2 || scrollHeight >= height1 && scrollHeight < height2) {
-							this.leftMenuStatus(i);
-							return ;
-						}
+				this.leftMenuStatus(index);
+			})
+		},
+		// 获取一个目标元素的高度
+		getElRect(elClass, dataVal) {
+			new Promise((resolve, reject) => {
+				const query = uni.createSelectorQuery().in(this);
+				query.select('.' + elClass).fields({
+					size: true
+				}, res => {
+					// 如果节点尚未生成，res值为null，循环调用执行
+					if (!res) {
+						setTimeout(() => {
+							this.getElRect(elClass);
+						}, 10);
+						return;
 					}
-				}, 10)
+					this[dataVal] = res.height;
+					resolve();
+				}).exec();
+			})
+		},
+		// 观测元素相交状态
+		async observer() {
+			this.tabbar.map((val, index) => {
+				let observer = uni.createIntersectionObserver(this);
+				// 检测右边scroll-view的id为itemxx的元素与right-box的相交状态
+				// 如果跟.right-box底部相交，就动态设置左边栏目的活动状态
+				observer.relativeTo('.right-box', {
+					top: 0
+				}).observe('#item' + index, res => {
+					if (res.intersectionRatio > 0) {
+						let id = res.id.substring(4);
+						this.leftMenuStatus(id);
+					}
+				})
+			})
+		},
+		// 设置左边菜单的滚动状态
+		async leftMenuStatus(index) {
+			this.current = index;
+			// 如果为0，意味着尚未初始化
+			if (this.menuHeight == 0 || this.menuItemHeight == 0) {
+				await this.getElRect('menu-scroll-view', 'menuHeight');
+				await this.getElRect('u-tab-item', 'menuItemHeight');
 			}
+			// 将菜单活动item垂直居中
+			this.scrollTop = index * this.menuItemHeight + this.menuItemHeight / 2 - this.menuHeight / 2;
+		},
+		// 获取右边菜单每个item到顶部的距离
+		getMenuItemTop() {
+			new Promise(resolve => {
+				let selectorQuery = uni.createSelectorQuery();
+				selectorQuery.selectAll('.class-item').boundingClientRect((rects) => {
+					// 如果节点尚未生成，rects值为[](因为用selectAll，所以返回的是数组)，循环调用执行
+					if (!rects.length) {
+						setTimeout(() => {
+							this.getMenuItemTop();
+						}, 10);
+						return;
+					}
+					rects.forEach((rect) => {
+						// 这里减去rects[0].top，是因为第一项顶部可能不是贴到导航栏(比如有个搜索框的情况)
+						this.arr.push(rect.top - rects[0].top);
+						resolve();
+					})
+				}).exec()
+			})
+		},
+		// 右边菜单滚动
+		async rightScroll(e) {
+			this.oldScrollTop = e.detail.scrollTop;
+			if (this.arr.length == 0) {
+				await this.getMenuItemTop();
+			}
+			if (this.timer) return;
+			if (!this.menuHeight) {
+				await this.getElRect('menu-scroll-view', 'menuHeight');
+			}
+			setTimeout(() => { // 节流
+				this.timer = null;
+				// scrollHeight为右边菜单垂直中点位置
+				let scrollHeight = e.detail.scrollTop + this.menuHeight / 2;
+				for (let i = 0; i < this.arr.length; i++) {
+					let height1 = this.arr[i];
+					let height2 = this.arr[i + 1];
+					// 如果不存在height2，意味着数据循环已经到了最后一个，设置左边菜单为最后一项即可
+					if (!height2 || scrollHeight >= height1 && scrollHeight < height2) {
+						this.leftMenuStatus(i);
+						return;
+					}
+				}
+			}, 10)
 		}
 	}
+}
 </script>
 
 <style lang="scss" scoped>
-  .shdow2{
-    background-color: rgba(255, 255, 255, 1);
-    box-shadow: 0px 4rpx 12rpx rgba(0, 0, 0, 0.2);
-    border-radius: 15rpx;
-  }
-	.u-wrap {
-		height: calc(100vh);
-		/* #ifdef H5 */
-		height: calc(100vh - var(--window-top));
-		/* #endif */
-		display: flex;
-		flex-direction: column;
-	}
+.shdow2 {
+	background-color: rgba(255, 255, 255, 1);
+	box-shadow: 0px 4rpx 12rpx rgba(0, 0, 0, 0.2);
+	border-radius: 15rpx;
+}
 
-	.u-search-box {
-		padding: 18rpx 30rpx;
-	}
+.u-wrap {
+	height: calc(100vh);
+	/* #ifdef H5 */
+	height: calc(100vh - var(--window-top));
+	/* #endif */
+	display: flex;
+	flex-direction: column;
+}
 
-	.u-menu-wrap {
-		flex: 1;
-		display: flex;
-		overflow: hidden;
-	}
+.u-search-box {
+	padding: 18rpx 30rpx;
+}
 
-	.u-search-inner {
-		background-color: rgb(234, 234, 234);
-		border-radius: 100rpx;
-		display: flex;
-		align-items: center;
-		padding: 10rpx 16rpx;
-	}
+.u-menu-wrap {
+	flex: 1;
+	display: flex;
+	overflow: hidden;
+}
 
-	.u-search-text {
-		font-size: 26rpx;
-		color: $u-tips-color;
-		margin-left: 10rpx;
-	}
+.u-search-inner {
+	background-color: rgb(234, 234, 234);
+	border-radius: 100rpx;
+	display: flex;
+	align-items: center;
+	padding: 10rpx 16rpx;
+}
 
-	.u-tab-view {
-		width: 200rpx;
-		height: 100%;
-	}
-	.u-tab-item {
-		height: 110rpx;
-		background: #f6f6f6;
-		box-sizing: border-box;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		font-size: 26rpx;
-		color: #444;
-		font-weight: 400;
-		line-height: 1;
-	}
+.u-search-text {
+	font-size: 26rpx;
+	color: $u-tips-color;
+	margin-left: 10rpx;
+}
 
-	.u-tab-item-active {
-		position: relative;
-		color: #000;
-		font-size: 30rpx;
-		font-weight: 600;
-		background: #fff;
-	}
+.u-tab-view {
+	width: 200rpx;
+	height: 100%;
+}
 
-	.u-tab-item-active::before {
-		content: "";
-		position: absolute;
-		border-left: 4px solid $u-type-primary;
-		height: 32rpx;
-		left: 0;
-		top: 39rpx;
-	}
+.u-tab-item {
+	height: 110rpx;
+	background: #f6f6f6;
+	box-sizing: border-box;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 26rpx;
+	color: #444;
+	font-weight: 400;
+	line-height: 1;
+}
 
-	.u-tab-view {
-		height: 100%;
-	}
+.u-tab-item-active {
+	position: relative;
+	color: #000;
+	font-size: 30rpx;
+	font-weight: 600;
+	background: #fff;
+}
 
-	.right-box {
-		background-color: rgb(250, 250, 250);
-	}
+.u-tab-item-active::before {
+	content: "";
+	position: absolute;
+	border-left: 4px solid $u-type-primary;
+	height: 32rpx;
+	left: 0;
+	top: 39rpx;
+}
 
-	.page-view {
-		padding: 16rpx;
-	}
+.u-tab-view {
+	height: 100%;
+}
 
-	.class-item {
-		margin-bottom: 30rpx;
-		background-color: #fff;
-		padding: 16rpx;
-		border-radius: 8rpx;
-	}
+.right-box {
+	background-color: rgb(250, 250, 250);
+}
 
-	// .class-item:last-child {
-	// 	min-height: 100vh;
-	// }
+.page-view {
+	padding: 16rpx;
+}
 
-	.item-title {
-		font-size: 26rpx;
-		color: $u-main-color;
-		font-weight: bold;
-	}
+.class-item {
+	margin-bottom: 30rpx;
+	background-color: #fff;
+	padding: 16rpx;
+	border-radius: 8rpx;
+}
 
-	.item-menu-name {
-		font-weight: normal;
-		font-size: 24rpx;
-		color: $u-main-color;
-	}
+// .class-item:last-child {
+// 	min-height: 100vh;
+// }
 
-	.item-container {
-		display: flex;
-		flex-wrap: wrap;
-	}
+.item-title {
+	font-size: 26rpx;
+	color: $u-main-color;
+	font-weight: bold;
+}
 
-	.thumb-box {
-		width: 33.333333%;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		flex-direction: column;
-		margin-top: 20rpx;
-	}
+.item-menu-name {
+	font-weight: normal;
+	font-size: 24rpx;
+	color: $u-main-color;
+}
 
-	.item-menu-image {
-		width: 120rpx;
-		height: 120rpx;
-	}
+.item-container {
+	display: flex;
+	flex-wrap: wrap;
+}
+
+.thumb-box {
+	width: 33.333333%;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	flex-direction: column;
+	margin-top: 20rpx;
+}
+
+.item-menu-image {
+	width: 120rpx;
+	height: 120rpx;
+}
 </style>