Merge branch 'master' of http://47.100.3.209:3000/gongdecai/wangluohuoyun-app

# Conflicts:
#	pages/news/newsSee.vue
#	pages/order/orderDetails.vue

pages/news/newsSee.vue

@@ -1,8 +1,9 @@
 <template>
 	<view class="center">
 		<view class="news_info">
-			<!-- <view class="">{{dataInfo.newsTitle}}</view> -->
-			<view class="">{{dataInfo.newsContent}}</view>
+
+			<view class="">{{dataInfo.newsTitle}}</view>
+			<view style='white-space: pre-wrap;' class="">{{dataInfo.newsContent}}</view>
 		</view>
 	</view>
 </template>

pages/order/orderDetails.vue

@@ -149,7 +149,7 @@
 				<view class="">{{carrierInfo.estimatedFreight}}元</view>
 			</view>
 			<view class='row-between'>
-				<view class="">预付款（元）</view>
+				<view class="gray">预付款（元）</view>
 				{{dataObj.advanceCharge}}元
 			</view>
 			<view class='row-between'>