Merge branch 'zhaosm' of http://120.26.79.179/luxf/mp_exhibitor_miniprog into zhaosm

components/disclaimer-text/index.vue

@@ -0,0 +1,36 @@
+<template>
+	<view>
+		<text class="disclaimer_text">请仔细阅读<text class="disclaimer_title" @click="routeTo">《免责申明》</text></text>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			routeTo() {
+				uni.navigateTo({
+					url: '/pages/disclaimer/index'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+.disclaimer_text {
+	color: $fontColor;
+	font-size: $fontSize1;
+	text-align: center;
+	width: 100%;
+	display: block;
+	margin-top: 164rpx;
+}
+.disclaimer_title {
+	color: $textActionColor;
+}
+</style>

pages.json

@@ -28,7 +28,8 @@
 		// 组件页面
 		{ "path": "pages/index/search",  "style": { "navigationBarTitleText": "搜索" }},
 		// WEBVIEW
-		{ "path": "pages/index/webview", "style": { "navigationStyle": "default", "navigationBarTitleText": "加载中...", "navigationBarBackgroundColor": "#332968" }}
+		{ "path": "pages/index/webview", "style": { "navigationStyle": "default", "navigationBarTitleText": "加载中...", "navigationBarBackgroundColor": "#332968" }},
+		{ "path" : "pages/disclaimer/index", "style" : { "navigationBarTitleText" : "免责声明" }}
 	],
 	"globalStyle": {
 		"navigationStyle": "custom",
@@ -43,5 +44,15 @@
 			"van-dialog": "/wxcomponents/vant/dialog/index"
 		}
 	},
-	"uniIdRouter": {}
+	"uniIdRouter": {},
+	"condition" : { //模式配置，仅开发期间生效
+		"current": 0, //当前激活的模式(list 的索引项)
+		"list": [
+			{
+				"name": "", //模式名称
+				"path": "", //启动页面，必选
+				"query": "" //启动参数，在页面的onLoad函数里面得到
+			}
+		]
+	}
 }

pages/index/search.vue

@@ -13,6 +13,13 @@
 					<view v-if="tabActive === 1" class="search-result-list exhibit-list">
 						<template v-for="(item, index) in exhibitorList">
 							<exhibitor-item :item="item" :key="index" />
+							<exhibitor-item :item="item" :key="index" />
+							<exhibitor-item :item="item" :key="index" />
+							<exhibitor-item :item="item" :key="index" />
+							<exhibitor-item :item="item" :key="index" />
+							<exhibitor-item :item="item" :key="index" />
+							<exhibitor-item :item="item" :key="index" />
+							<exhibitor-item :item="item" :key="index" />
 						</template>
 					</view>
 					<view v-else-if="tabActive === 2" class="search-result-list exhibit-list">
@@ -36,6 +43,7 @@
 						</template>
 					</view>
 				</template>
+				<disclaimer></disclaimer>
 			</view>
 		</u-scroll-view>
 	</view>
@@ -50,7 +58,7 @@
 	import ExhibitorItem from '@/pages/exhibitor/components/exhibitor-item.vue'
 	import NewsItem from '@/pages/news/components/news-item.vue'
 	import ActivityItem from '@/pages/activity/components/activity-item.vue'
-
+	import disclaimer from '@/components/disclaimer-text/index.vue'
 	export default {
 		options: {
 			styleIsolation: 'shared'
@@ -63,7 +71,8 @@
 			ExhibitItem,
 			ExhibitorItem,
 			NewsItem,
-			ActivityItem
+			ActivityItem,
+			disclaimer
 		},
 		data() {
 			return {

uni.scss

@@ -6,7 +6,8 @@ $textActionColor: #E57519;
 $border: 2rpx solid #aaaaaa;
 $borderLight: 2rpx solid #dddddd;
 $bgLightColor: #F5F5F5;
-
+$fontColor: #555555;
+$fontTitleColor: #000000;
 $fontSize0: 16rpx;
 $fontSize1: 18rpx;
 $fontSize2: 20rpx;