优化收货码及界面

pages/order_details/index.vue

@@ -909,10 +909,22 @@
 			},
 			//收货弹窗
 			confirmOrder: function(item) {
-				console.log(item)
+
+				this.receivingshow = true
+
+			},
+			queding() {
+
+				let that = this;
+				orderTake(that.order_id).then(res => {
+					this.receivingshow = false
+					return that.$util.Tips({
+						title: '成功收货',
+						icon: 'success'
+					}, function() {
 						uni.showModal({
 							title: '取件码',
-					content: '5555555',
+							content: item.logistics_code,
 							success: function(res) {
 								if (res.confirm) {
 									// console.log('用户点击确定');
@@ -921,19 +933,6 @@
 								}
 							}
 						})
-				return
-				this.receivingshow = true
-
-			},
-			queding() {
-				let that = this;
-				orderTake(that.order_id).then(res => {
-					this.receivingshow = false
-					return that.$util.Tips({
-						title: '成功收货',
-						icon: 'success'
-					}, function() {
-
 						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 {