Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy

pageD/activity/activity.vue

@@ -1,5 +1,5 @@
 <template>
-	<view id="actives">
+	<view id="actives" :style="{height : height  + 'px'}">
 		<!-- 活动消息推送 -->
         <block v-for="(item, index) in actives" :key="index">
             <view class="time">{{ item.addtime }}</view>
@@ -22,13 +22,21 @@
 	export default {
 		data() {
 			return {
+				height:'600',
 				actives: [
 					
 				]
 			};
 		},
 		onLoad(){
-			this.messageactivityList()
+			var _that = this
+			_that.messageactivityList();
+			uni.getSystemInfo({
+			    success: function (res) {
+			        console.log(res.windowHeight);
+					_that.height = res.windowHeight
+			    }
+			});
 		},
 		methods: {
 			titletext(){
@@ -55,7 +63,6 @@
 		height: 100%;
 	}
 	#actives{
-			height: 100%;
 			background: #ECECEC;
             .time {
                 padding: 30rpx 0;

pageE/setting/updateVersion.vue

@@ -52,4 +52,7 @@
 		line-height: 1.7;
 		padding: 30rpx;
 	}
+    ::v-deep.u-mode-center-box {
+        background-color: transparent;
+    }
 </style>