2 Commits 2d90af1643 ... 11fb35d5fc

Auteur SHA1 Bericht Datum
  yanj 11fb35d5fc Merge branch 'dev' of http://120.26.79.179/luxf/mp_exhibitor_miniprog into dev 3 dagen geleden
  yanj b6d899b894 提交协议代码 3 dagen geleden
4 gewijzigde bestanden met toevoegingen van 9 en 3 verwijderingen
  1. 2 0
      pages.json
  2. 1 1
      pages/index/index.vue
  3. 4 2
      pages/index/search.vue
  4. 2 0
      uni.scss

+ 2 - 0
pages.json

@@ -25,6 +25,8 @@
 		{ "path": "pages/user/like", "style": { "navigationBarTitleText": "我的点赞" }},
 		{ "path": "pages/user/favorites", "style": { "navigationBarTitleText": "我的收藏" }},
 		{ "path": "pages/user/vote", "style": { "navigationBarTitleText": "我的投票" }},
+		//APP协议模块
+		{ "path": "pages/disclaimer/index", "style": { "navigationBarTitleText": "免责声明" }},
 		// 组件页面
 		{ "path": "pages/index/search",  "style": { "navigationBarTitleText": "搜索" }},
 		// WEBVIEW

+ 1 - 1
pages/index/index.vue

@@ -66,5 +66,5 @@
 	}
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 </style>

+ 4 - 2
pages/index/search.vue

@@ -36,6 +36,7 @@
 						</template>
 					</view>
 				</template>
+				<disclaimer-text></disclaimer-text>
 			</view>
 		</u-scroll-view>
 	</view>
@@ -50,7 +51,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 DisclaimerText from '@/components/disclaimer-text/index.vue'
 	export default {
 		options: {
 			styleIsolation: 'shared'
@@ -63,7 +64,8 @@
 			ExhibitItem,
 			ExhibitorItem,
 			NewsItem,
-			ActivityItem
+			ActivityItem,
+			DisclaimerText
 		},
 		data() {
 			return {

+ 2 - 0
uni.scss

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