优化收货码及界面

pages/order_details/index.vue

@@ -909,23 +909,12 @@
 			},
 			//收货弹窗
 			confirmOrder: function(item) {
-				console.log(item)
+
-				uni.showModal({
-					title: '取件码',
-					content: '5555555',
-					success: function(res) {
-						if (res.confirm) {
-							// console.log('用户点击确定');
-						} else if (res.cancel) {
-							// console.log('用户点击取消');
-						}
-					}
-				})
-				return
 				this.receivingshow = true
 
 			},
 			queding() {
+
 				let that = this;
 				orderTake(that.order_id).then(res => {
 					this.receivingshow = false
@@ -933,7 +922,17 @@
 						title: '成功收货',
 						icon: 'success'
 					}, function() {
-
+						uni.showModal({
+							title: '取件码',
+							content: item.logistics_code,
+							success: function(res) {
+								if (res.confirm) {
+									// console.log('用户点击确定');
+								} else if (res.cancel) {
+									// console.log('用户点击取消');
+								}
+							}
+						})
 						that.getOrderInfo();
 					});
 				}).catch(err => {

pages/trading_hall/product_details/index.vue

@@ -207,6 +207,7 @@
 
 		.content_top-two {
 			.price {
+				margin-top: 21rpx;
 				font-size: 46rpx;
 				font-family: PingFang SC;
 				font-weight: 500;
@@ -219,6 +220,7 @@
 				font-weight: 400;
 				color: #333333;
 				margin-top: 21rpx;
+				margin-bottom:21rpx;
 			}
 
 			.top-two_img {