提交

components/common/u-select/index.vue

@@ -3,9 +3,12 @@
     <view v-if="children === false">
       <checkbox-group @change="handleItemChange" :id="uId">
         <label class="custom-checkbox" v-for="(item, index) in dataList" :key="index">
-          <checkbox :value="item.label">
+          <checkbox :value="item.label" v-if="title === '展馆号'">
             {{item.label}}
           </checkbox>
+					<checkbox :value="item.value" v-else>
+					  {{item.label}}
+					</checkbox>
         </label>
       </checkbox-group>
     </view>
@@ -14,7 +17,7 @@
       <van-collapse :value="activeName" @change="onChange"  :name="item.label" v-for="(item, index) in dataList" :key="index">
         <van-collapse-item :title="item.label" :name="item.label">
           <label class="custom-checkbox" v-for="(children_item, index) in item.children" :key="index">
-            <checkbox :value="children_item.label">
+            <checkbox :value="children_item.value">
               {{children_item.label}}
             </checkbox>
           </label>

pages/exhibitor/exhibit.vue

@@ -194,10 +194,7 @@
 				})
 			},
 			searchList() {
-				// this.exhibitParams.application_areas_id = this.searchApplicationAreas || ''
-				// this.exhibitParams.product_cate_id = this.searchCategoryId || ''
-				// this.exhibitParams.page = 1
-				// this.getList()
+				this.showLoading()
 				let product_cate_ids = ''
 				let application_areas_ids = ''
 				if (this.searchCategoryId.length === 0) {
@@ -233,6 +230,7 @@
 						this.exhibitList = res.data.data
 						this.total = res.data.total
 						this.exhibitListLastPage = res.data.last_page
+						this.hideLoading()
 					},
 					fail: (err) => {
 						console.error('请求失败', err);
@@ -240,6 +238,7 @@
 				});
 			},
 			getList() {
+				this.showLoading()
 				exhibitorsProductList(this.exhibitParams).then(res => {
 					if (res.data.data) {
 						this.exhibitList = res.data.data
@@ -249,6 +248,7 @@
 						this.showToast('系统繁忙，稍候再试')
 					}
 					this.exhibitListLoading = false
+					this.hideLoading()
 				})
 			},
 			// onScrollToLower(e) {
@@ -322,9 +322,10 @@
 
 <style lang="scss">
 	checkbox {
+		color: #333333;
 		.wx-checkbox-input {
-			width: 20rpx;
-			height: 20rpx;
+			width: 26rpx;
+			height: 26rpx;
 
 			&.wx-checkbox-input-checked {
 				background-color: #E57519;
@@ -355,10 +356,80 @@
 		}
 
 		.select-list {
-			display: flex;
-			flex-direction: column;
-			grid-gap: 30rpx;
 			margin-bottom: 30rpx;
+		
+			.van-collapse {
+				display: flex;
+				flex-direction: column;
+				grid-gap: 30rpx;
+		
+				.first-title {
+					&>.van-collapse-item {
+						border-radius: 14rpx;
+						border: 2rpx solid #B3B3B3;
+						overflow: hidden;
+		
+						.van-collapse-item__content {
+							padding: unset;
+						}
+		
+						van-collapse {
+							.van-collapse-item {
+								border-bottom: 2rpx solid #e3e9f1;
+								
+								.van-cell {
+									grid-gap: 16rpx;
+									width: 100%;
+									.van-cell__title {
+										flex: unset;
+										width: fit-content;
+									}
+									
+									.van-cell__right-icon-wrap {
+										font-size: $fontSize0;
+										
+										.van-icon-arrow {
+											color: #333333;
+											&::before {
+												content: '\e819';
+												font-family: iconfont;
+											}
+										}
+									}
+								}
+		
+								.van-collapse-item__wrapper {
+										.custom-checkbox {
+											checkbox {
+												border: unset;
+											}
+										}
+								}
+							}
+		
+							&:nth-last-child(1) {
+								.van-collapse-item {
+									border: unset;
+								}
+							}
+						}
+					}
+		
+					.van-cell {
+						padding: 16rpx 20rpx;
+		
+						&::after {
+							border-bottom: unset;
+						}
+					}
+				}
+			}
+		
+			.van-hairline--top-bottom {
+				&::after {
+					border: unset;
+				}
+			}
 		}
 
 		.select-search-btn {