Merge branch 'master' of https://git.banshouhui.com/lijundan/self-support

src/pages/order/detail.vue

@@ -32,7 +32,7 @@
 				<view class="between-cell address-cell">
 					<view class="left">
 						<u-icon name="map" size="28"></u-icon>
-						<text class="address-txt">{{ order.contactAddress }}</text>
+						<text class="address-txt">{{ formatAddress }}</text>
 					</view>
 					<u-image width="48rpx" height="48rpx" :src="navigationIcon" @click="openLocation(order.contactAddress)"></u-image>
 				</view>
@@ -265,7 +265,19 @@
 				} else {
 					return this.orderRecords
 				}
-			}
+			},
+			formatAddress() {
+				let self = this
+				let address = ""
+				if(self.order) {
+					address = self.order.contactProvinceText || ""
+					address += self.order.contactCityText || ""
+					address += self.order.contactCommunityText || ""
+					address += self.order.contactStreetText || ""
+					address += self.order.contactAddress || ""
+				}
+				return address
+			},
 		},
 		methods: {
 			openLocation(address){