Merge branch 'dev' into feature-zyw

src/pages/consumptionDetails/consumptionDetails.wxml

 <!--pages/consumptionDetails.wxml-->
 <wxs src="../../wxs/utils.wxs" module="utils" />
 
-<view wx:if="{{!orderDetail.length}}">
+<view wx:if="{{!orderDetail}}">
 	<view class="no-speed">暂无消费</view>
 </view>
 
-<view class="consumption" wx:if="{{orderDetail.length}}">
+<view class="consumption" wx:if="{{orderDetail}}">
 	<view class="consumption-top">
 		<view class="top-ract" />
 		<view class="top-order">

src/pages/memberOfOwn/memberOfOwn.wxml

@@ -2,7 +2,6 @@
 <view class='page-memberOfOwn'>
 	<view class='own-content'>
 		<view class='user-info'>
-			<image class='own-bg' src='/assets/imgs/711_08.png' />
 			<view class="user-avatar">
 				<open-data type="userAvatarUrl" />
 			</view>
@@ -89,15 +88,15 @@
 			<view class="picker-address">
 				<view class='form-label'>地址</view>
 				<view class="right-input">
-					<view wx:if="{{memberInfo.address}}">{{memberInfo.address}}</view>
+					<!--<view wx:if="{{memberInfo.address}}">{{memberInfo.address}}</view>-->
 					<view>
 						<textarea
-						 wx:if="{{!memberInfo.address}}"
 						 bindblur="bindTextAreaBlur"
 						 placeholder="请填写真实收件地址"
 						 name="address"
 						 auto-height
 						 maxlength='30'
+             value="{{memberInfo.address}}"
 						/>
 						</view>
         </view>