Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

pages/order-submit/order-submit.vue

 <template>
-	<view class="ordersubmit" v-if="!loading">
+	<view class="ordersubmit">
 		<view class="add-box" @click="chosenAddress(ds.address.id)">
 			<view v-if="address.province && address.province != ''" class="add-info">
 				<view class="address">{{ address.province + address.city + address.district }}</view>
@@ -504,7 +504,6 @@ export default {
 				},
 				res => {
 					this.loading = false;
-
 					if (res.resultCode == 1) {
 						this.address = res.data.address;
 						this.address_enable=res.data.address_enable;