Merge branch 'master' of http://git.zthymaoyi.com/gongdecai/wangluohuoyun-app

pages/news/newsSee.vue

@@ -2,7 +2,7 @@
 	<view class="center">
 		<view class="news_info">
 			<view class="">{{dataInfo.newsTitle}}</view>
-			
+			<view class="">{{dataInfo.newsContent}}</view>
 		</view>
 	</view>
 </template>
@@ -16,7 +16,6 @@
 			}
 		},
 		onLoad(options) {
-			debugger
 			this.dataInfo = JSON.parse(options._obj)
 				uni.setNavigationBarTitle({
 				title: this.dataInfo.newsType
@@ -32,6 +31,13 @@
 
 <style lang="scss">
 	.center{
-		
+		padding:30rpx;
+		height: 100%;
+		background: #F5F6FA ;
+		.news_info{
+			background: #FFFFFF;
+			padding: 20rpx 30rpx;
+			border-radius: 20rpx;
+		}
 	}
 </style>

pages/order/index.vue

@@ -732,6 +732,7 @@
 				border: 1px solid #CDCDCD;
 				border-radius: 33px;
 				padding: 13rpx 31rpx;
+				margin: 0 10rpx;
 			}
 		}
 	}