yanj 4 kuukautta sitten
vanhempi
commit
c7f256d030

+ 7 - 0
pages/activity/components/activity-recommend.vue

@@ -37,6 +37,7 @@
 		watch: {
 			exhibitorId(val) {
 				this.activityListParams.exhibitors_id = val
+        console.log(val,'exhibitors_id')
 				this.getActivityList()
 			}
 		},
@@ -53,12 +54,18 @@
 		},
 		created() {
 		},
+    mounted() {
+      this.getActivityList()
+    },
 		methods: {
 			getActivityList() {
 				if (this.activityListLoading === true) {
 					return
 				}
 				this.activityListLoading = true
+        if (this.exhibitorId) {
+          this.activityListParams.exhibitors_id = this.exhibitorId
+        }
 				exhibitorsBoothActivityList(this.activityListParams).then(res => {
 					if (res.code === 0) {
 						if (this.activityListParams.page > 1) {

+ 6 - 0
pages/exhibitor/components/exhibit-recommend.vue

@@ -55,12 +55,18 @@
 		},
 		created() {
 		},
+    mounted() {
+      this.getProductList()
+    },
 		methods: {
 			getProductList() {
 				if (this.productListLoading === true) {
 					return
 				}
 				this.productListLoading = true
+        if (this.exhibitorId) {
+          this.productListParams.exhibitors_id = this.exhibitorId
+        }
 				exhibitorsProductList(this.productListParams).then(res => {
 					if (res.code === 0) {
 						if (this.productListParams.page > 1) {

+ 3 - 4
pages/exhibitor/detail.vue

@@ -1,5 +1,5 @@
 <template>
-  <page-layout class="exhibitor-detail">
+  <page-layout class="exhibitor-detail" v-if="exhibitor && exhibitor.name_zh_cn">
     <nav-bar title="展商详情" @init="onInitNavbar"></nav-bar>
     <u-scroll-view>
       <view class="main-container">
@@ -80,8 +80,7 @@
           <activity-recommend recommend-type="detail" :exhibitorId="exhibitorId"/>
         </u-panel>
         <view class="click-more">
-          <van-button type="primary" @click="navigateTo('/pages/index/index?tab=exhibitor')">点击查看更多展商信息
-          </van-button>
+          <van-button type="primary" @click="navigateTo('/pages/index/index?tab=exhibitor')">点击查看更多展商信息</van-button>
         </view>
         <disclaimer-text></disclaimer-text>
       </view>
@@ -165,7 +164,7 @@ export default {
           for (let i = 0; i < countryZhCn.length; i++) {
             if (countryZhCn[i].code === this.exhibitor.country) {
               this.exhibitor.country_name = countryZhCn[i].name
-              break; // 当找到值为 3 的元素时退出循环
+              break;
             }
           }
         }

+ 1 - 1
pages/exhibitor/exhibitor-news.vue

@@ -2,7 +2,7 @@
   <page-layout>
     <nav-bar title="展商新闻" @init="onInitNavbar"></nav-bar>
     <u-scroll-view>
-      <view class="main-container">
+      <view class="main-container" v-if="info && info.title">
         <view class="title">
           {{ info.title }}
         </view>

+ 5 - 0
pages/news/components/news-recommend.vue

@@ -85,6 +85,11 @@
 			},
 			getExhibitorsNewsList() {
 				this.newsListLoading = true
+        if (this.exhibitorId) {
+          this.newsListParams.exhibitors_id = this.exhibitorId
+        } else {
+          this.newsListParams.exhibitors_id = 0
+        }
 				exhibitorsNewsList(this.newsListParams).then(res => {
 					if (res.data.data) {
 						if (this.newsListParams.page > 1) {

+ 17 - 2
static/style/pages/exhibitor-item.scss

@@ -4,9 +4,24 @@
 	box-shadow: 0rpx 4rpx 20rpx 0rpx rgba(0,0,0,0.15);
 	padding: 26rpx 23rpx;
 	border: 1rpx solid #D9D9D9;
-	&.active{
+	position: relative;
+	&:before {
+		content: '';
+		position: absolute;
+		left: -4rpx;
+		top: -2rpx;
+		width: 100%;
+		height: 100%;
+		border-radius: 8rpx;
 		border: 4rpx solid rgba(232,116,0,0.34);
-		padding: 24rpx 21rpx;
+		opacity: 0;
+		transition: .3s ease-in-out;
+		//padding: 24rpx 21rpx;
+	}
+	&.active{
+		&:before {
+			opacity: 1;
+		}
 	}
 	.exhibitor-body{
 		display: flex;