Merge branch 'dev' into zhaosm

components/common/u-dropdown-select/index.vue

@@ -193,12 +193,12 @@
 				this.list.forEach(item => {
 					this.$set(item, 'active', false)
 				})
-				this.$emit('change', {
-					detail: {
-						value: null
-					}
-				})
-				this.$emit('input', undefined)
+				// this.$emit('change', {
+				// 	detail: {
+				// 		value: null
+				// 	}
+				// })
+				// this.$emit('input', null)
 			},
 			clickOption(item, list, index) {
 				this.cleanListActive()

pages/exhibitor/index.vue

@@ -3,6 +3,7 @@
 		<nav-bar title="展商信息" @init="onInitNavbar"></nav-bar>
 		<u-scroll-view :tabbar-conflict="true" @scroll-near-lower="onScrollToLower">
 			<view class="main-container">
+				<view>{{ categoryId }}</view>
 				<view class="exhibitor-filter">
 					<view>
 						<view class="exhibitor-filter-label">展馆号</view>