Merge branch 'dev-1.5.3' into test

src/components/order/detail.vue

@@ -43,7 +43,7 @@
     <view class="between-cell address-cell">
       <view class="left-address">
         <u-icon name="map" size="28"></u-icon>
-        <text class="address-txt">{{ order.customerAddress }}</text>
+        <text class="address-txt">{{ order.customerAddress || '' }}</text>
       </view>
       <image
         v-if="showOperate"

src/components/order/index.vue

@@ -45,7 +45,7 @@
             :src="dizhiImage"
             mode="widthFix"
           ></image>
-          <text>{{ orderData.customerAddress }}</text>
+          <text>{{ orderData.customerAddress || '' }}</text>
         </view>
         <view v-if="showDistance" class="address-right-view">
           {{ orderDistance }}km