luxf 1 vecka sedan
förälder
incheckning
8faacda44b

+ 17 - 3
components/common/u-dropdown-select/index.vue

@@ -12,7 +12,7 @@
 			<view class="u-dropdown-options">
 				<template v-if="list.length">
 					<template v-for="(item, index) in list">
-						<view class="u-dropdown-option" :class="{ 'active': item.active }" @click="clickOption(item)">
+						<view class="u-dropdown-option" :class="{ 'active': item.active }" @click="clickOption(item, index)">
 							<view>{{ item.label }}</view>
 							<van-icon class="van-icon" name="arrow" />
 						</view>
@@ -92,7 +92,14 @@
 						this.list = []
 					} else if (!options[0].children || options[0].children.length === 0) {
 						this.tabs = []
-						this.list = options
+						this.list = options.map(v => {
+							if (v.value === this.value) {
+								v.active = true
+							} else {
+								v.active = false
+							}
+							return v
+						})
 					} else {
 						this.tabs = options.map(v => {
 							return {
@@ -101,7 +108,14 @@
 								children: v.children || []
 							}
 						})
-						this.list = this.tabs[0].children
+						this.list = this.tabs[0].children.map(v => {
+							if (v.value === this.value) {
+								v.active = true
+							} else {
+								v.active = false
+							}
+							return v
+						})
 						this.tabActive = this.tabs[0].value
 					}
 				}

+ 2 - 1
components/common/u-panel/index.vue

@@ -45,7 +45,7 @@
 </script>
 <style lang="scss">
 	.u-panel{
-		padding: 24rpx 28rpx;
+		padding: 28rpx 28rpx;
 	}
 	.u-panel-head{
 		@include display-flex-between;
@@ -54,6 +54,7 @@
 			position: relative;
 			padding-bottom: 20rpx;
 			font-size: $fontSize5;
+			line-height: $fontSize5;
 			font-weight: 500;
 			color: #000000;
 			&:after{

+ 1 - 1
pages/activity/components/activity-recommend.vue

@@ -36,7 +36,7 @@
 		},
 		methods: {
 			onClickActivity() {
-				this.navigateTo('https://mp-test-onlinecatelogue.matchexpo.cn/Xiaomi-Computer-Technology-Exhibition-16')
+				this.navigateTo('https://mp-test-onlinecatelogue.matchexpo.cn/Xiaomi-Computer-Technology-Exhibition-19')
 			}
 		}
 	}

+ 10 - 6
pages/exhibitor/detail.vue

@@ -52,7 +52,7 @@
 							<view>人气:11192</view>
 						</view>
 						<view>
-							<button :plain="true" @click.stop="onShare(item)">
+							<button :plain="true" @click.stop="onShare()">
 								<view>
 									<view class="iconfont icon-zhuanfa"></view>
 									<view>分享</view>
@@ -135,17 +135,18 @@
 		},
 		methods: {
 			onShareAppMessage(ops) {
-				const item = ops.target.dataset.item || {}
-				this.shareInfo = null
-				this.showShare = false
 				return {
-					title: item.name || '科世达(上海)连接器有限公司',
+					title: '科世达(上海)连接器有限公司',
 					path: `/pages/exhibitor/detail`,
 					imageUrl: 'https://oss.starify.cn/prod/starify/up/0001018678/20241108/672da70c02212.png?x-oss-process=image/resize,w_600,h_600,limit_0,m_pad'
 				}
 			},
 			onShare(item) {
-				this.shareInfo = item
+				this.shareInfo = {
+					title: '科世达(上海)连接器有限公司',
+					path: `/pages/exhibitor/detail`,
+					imageUrl: 'https://oss.starify.cn/prod/starify/up/0001018678/20241108/672da70c02212.png?x-oss-process=image/resize,w_600,h_600,limit_0,m_pad'
+				}
 				this.showShare = true
 			}
 		}
@@ -168,6 +169,9 @@
 				height: 100%;
 			}
 		}
+		.u-panel{
+			background-color: #FFFFFF;
+		}
 		.exhibitor-title{
 			font-family: Poppins, Poppins;
 			font-size: 30rpx;

+ 14 - 9
pages/exhibitor/exhibit-detail.vue

@@ -34,7 +34,7 @@
 							<view>人气:11192</view>
 						</view>
 						<view>
-							<button :plain="true">
+							<button :plain="true" @click.stop="onShare">
 								<view>
 									<view class="iconfont icon-zhuanfa"></view>
 									<view>分享</view>
@@ -62,7 +62,7 @@
 					<view class="exhibitor-card">
 						<view class="exhibitor-info">
 							<view class="exhibitor-logo">
-								<image src="/static/img/example/kostal_log.png" mode="aspectFit" />
+								<image src="https://oss.starify.cn/prod/starify/up/0001018678/20241108/672da70c02212.png?x-oss-process=image/resize,w_400" mode="widthFix" />
 							</view>
 							<view class="exhibitor-name-cn">科世达(上海)连接器有限公司</view>
 							<view class="exhibitor-name-en">Leopold Kostal GmbH & Co. KG</view>
@@ -118,18 +118,19 @@
 			this.loadFontFace('Poppins')
 		},
 		methods: {
-			onShareAppMessage(ops) {
-				const item = ops.target.dataset.item || {}
-				this.shareInfo = null
-				this.showShare = false
+			onShareAppMessage() {
 				return {
-					title: item.name || '汽车连接器 86W MLK 1,2 SD-HOLDER',
+					title: '汽车连接器 86W MLK 1,2 SD-HOLDER',
 					path: `/pages/exhibitor/exhibit-detail`,
 					imageUrl: 'https://oss.starify.cn/prod/starify/up/0001000075/20241113/67343f1c494de.png?x-oss-process=image/resize,w_600,h_600,limit_0,m_pad'
 				}
 			},
-			onShare(item) {
-				this.shareInfo = item
+			onShare() {
+				this.shareInfo = {
+					title: '汽车连接器 86W MLK 1,2 SD-HOLDER',
+					path: `/pages/exhibitor/exhibit-detail`,
+					imageUrl: 'https://oss.starify.cn/prod/starify/up/0001000075/20241113/67343f1c494de.png?x-oss-process=image/resize,w_600,h_600,limit_0,m_pad'
+				}
 				this.showShare = true
 			},
 			onClickDetail(e) {
@@ -181,9 +182,13 @@
 			background-color: #FFFFFF;
 			.exhibitor-info{
 				padding: 36rpx;
+				flex: 1;
 			}
 			.exhibitor-logo{
 				width: 194rpx;
+				image{
+					height: auto;
+				}
 			}
 			.exhibitor-detail-link{
 				margin-top: 36rpx;

+ 1 - 0
pages/exhibitor/exhibit.vue

@@ -57,6 +57,7 @@
 		},
 		data() {
 			return {
+				categoryId: undefined,
 				scrollviewHeight: 0,
 				searchKeyword: '',
 				exhibitList: [{ favourited: true }, { liked: true }, { voted: true }, {} ],

+ 1 - 0
pages/exhibitor/index.vue

@@ -52,6 +52,7 @@
 		},
 		data() {
 			return {
+				categoryId: undefined,
 				searchKeyword: '',
 				exhibitorList: [{ favourited: true, name: '科世达(上海)连接器有限公司' }, { liked: true }, { voted: true }, {}, {}, {}],
 				categories: [{