api

pageC/cart/ConfirmOrder.vue

@@ -4,10 +4,10 @@
 			<image src="../static/image/2.png" class="address-icon"></image>
 			<view class="address">
 				<view class="user-info">
-					<view>胖胖</view>
-					<view>18220171014</view>
+					<view>{{ addressInfo.address_realname }}</view>
+					<view>{{ addressInfo.address_mob_phone }}</view>
 				</view>
-				<view class="address-text u-line-2">山东省泰安市泰山区东岳大街与克山路交汇口银山店四楼橙天影视南邻山东省泰安市泰山区东岳大街与克山路交汇口银山店四楼橙天影视南邻</view>
+				<view class="address-text u-line-2">{{ addressInfo.area_info + addressInfo.address_detail }}</view>
 			</view>
 			<image src="../static/image/1.png" class="right"></image>
 		</view>
@@ -75,6 +75,8 @@ export default {
 		return {
 			orderInfo: {},
 			totalPrice: '0.00',
+			addressInfo: {},
+			freight: '',
 		}
 	},
 	filters: {
@@ -92,36 +94,24 @@ export default {
 	onLoad(option) {
 		console.log(JSON.parse(option.info));
 		this.orderInfo = JSON.parse(option.info);
-		// this.orderListInit();
+		this.addressInfo = this.orderInfo.address_info;
 		this.showTotalPrice();
+		this.getFreight();
 	},
 	methods: {
-		// orderListInit() {
-		// 	this.orderList = this.orderInfo.store_list;
-		// 	for (const key in this.orderList) {
-		// 		if (this.orderList.hasOwnProperty(key)) {
-		// 			const element = this.orderList[key];
-		// 			let tempArray = Object.entries(this.orderInfo.store_cart_list);
-		// 			tempArray.forEach(item => {
-		// 				if (item[0])
-		// 			})
-		// 			let temp = this.orderInfo.store_cart_list.filters(store => {
-		// 				return store.store_id == item.store_id
-		// 			})
-		// 			element
-		// 		}
-		// 	}
-		// 	this.orderList.forEach(item => {
-		// 		let temp = this.orderInfo.store_cart_list.filters(store => {
-		// 			return store.store_id == item.store_id
-		// 		})
-		// 		Object.assign(item, { goods_list: temp });
-		// 	})
-		// 	console.log(this.orderList);
-			
-		// },
 		showTotalPrice() {
 			
+		},
+		getFreight() {
+			this.$u.api.getFreight({
+				freight_hash: this.orderInfo.freight_hash,
+				city_id: this.addressInfo.city_id,
+				area_id: this.addressInfo.area_id,
+			}).then(res => {
+				if(res.errCode == 0) {
+					// this.freight = res.
+				}
+			})
 		},
 		settlement() {
 			uni.navigateTo({
@@ -177,6 +167,7 @@ export default {
 		}
 	}
 	.main {
+		margin-bottom: 100rpx;
 		> view {
 			.goods-info {
 				background-color: #ffffff;
@@ -220,6 +211,7 @@ export default {
 							flex-shrink: 0;
 						}
 						.info {
+							flex: 1;
 							// width: 418rpx;
 							height: 160rpx;
 							display: flex;