Merge remote-tracking branch 'origin/zhaosm' into zhaosm

pages/exhibitor/detail.vue

@@ -79,7 +79,7 @@
 				<u-panel title="展商活动">
 					<activity-recommend recommend-type="detail" :exhibitorId="exhibitorId" />
 				</u-panel>
-				<view class="click-more"><van-button type="primary" @click="navigateTo('/pages/exhibitor/index')">点击查看更多展商信息</van-button></view>
+				<view class="click-more"><van-button type="primary" @click="navigateTo('/pages/index/index?tab=exhibitor')">点击查看更多展商信息</van-button></view>
 				<disclaimer-text></disclaimer-text>
 			</view>
 		</u-scroll-view>

pages/exhibitor/exhibit.vue

@@ -132,10 +132,6 @@
 				this.getList()
 			},
 			getList() {
-				if (this.exhibitListLoading === true) {
-					return
-				}
-				this.exhibitListLoading = true
 				exhibitorsProductList(this.exhibitParams).then(res => {
 					if (res.data.data) {
 						if (this.exhibitParams.page > 1) {

pages/exhibitor/index.vue

@@ -24,7 +24,8 @@
 				<van-empty v-if="exhibitorList.length === 0" description="暂无数据" />
 				<view v-else class="exhibitor-list">
 					<template v-for="(item, index) in exhibitorList">
-            <exhibitor-item :item="item" :key="index" :pollShow="pollShow.exhibitors_poll_show" @share="(e) => $emit('share', e)" @updateItemValue="updateItemValue()" />					</template>
+						<exhibitor-item :item="item" :key="index" :pollShow="pollShow.exhibitors_poll_show" @share="(e) => $emit('share', e)" @updateItemValue="updateItemValue()" />					
+					</template>
 				</view>
 				<disclaimer-text></disclaimer-text>
 			</view>
@@ -141,10 +142,6 @@
 				this.getExhibitorsList()
 			},
 			getExhibitorsList() {
-				if (this.exhibitorListLoading === true) {
-					return
-				}
-				this.exhibitorListLoading = true
 				exhibitorsList(this.exhibitorsParams).then(res => {
 					if (res.data.data) {
 						if (this.exhibitorsParams.page > 1) {

pages/index/index.vue

@@ -37,6 +37,11 @@
 				shareInfo: null
 			}
 		},
+		onLoad(options) {
+			if (options.tab) {
+				this.tabbarActive = options.tab
+			}
+		},
 		created() {
 			
 		},