修改

pages/groupbuying/publish_group/index.vue

@@ -68,7 +68,7 @@
 								<view class="all-products-item-content-b">
 									<view class="" style="display:flex; flex-grow: 1;">
 										<text class="red "> ¥</text>
-										<input class="red redInput " type="digit" v-model="itemn.discountPrice" />
+										<input class="red redInput " type="digit" v-model="itemn.salePrice" />
 									</view>
 
 									<view @click="delItem(itemn,indexn)" class="count">
@@ -427,7 +427,7 @@ export default {
 						};
 				goodsIds.push(e.id);
 				grouponGoods.goodsId=e.id;
-				grouponGoods.grouponPrice=e.discountPrice;
+				grouponGoods.grouponPrice=e.salePrice;
 				grouponGoods.sort = index;
 				grouponGoodsList.push(grouponGoods)
 

pages/groupbuying_details/order_details_confirm/index.vue

@@ -523,13 +523,16 @@ export default {
 		getOrderData() {
 			let longitude = uni.getStorageSync("user_longitude"); //经度
 			let latitude = uni.getStorageSync("user_latitude"); //纬度
-			getGroupOrderData({
+			let param = {
 				goods: this.goods,
 				organizerUserId: this.organizerUserId,
 				selfTakeId: this.selfTakeId,
 				longitude: longitude,
-				latitude: latitude
-			}).then(res => {
+				latitude: latitude,
+				grouponId: this.grouponId
+			};
+			console.log(param)
+			getGroupOrderData(param).then(res => {
 				this.grouponOrderData = res.data;
 				let total = 0.0;
 				this.grouponOrderData.goodsInfos.forEach(e => {

pages/index/diy/components/latestGroupBuying.vue

@@ -64,15 +64,17 @@
 				</view>
 				<view class="self-pickup-point">
 					<view class="a-t">
-						最近的自提网点：
+						<text class="zuijinzitidian">最近的自提网点：</text>
+						<image class="address-img" src="http://www.gzzzyd.com/groupon/order_details/距离@2x.png" mode="scaleToFill" />
 					</view>
 					<view class="a-m">
 						<view class="am1">
-							<view class="am1-1">{{ e.selfTake.name }}
+							<view class="am1-1">
+								<text class="self-take-name">{{ e.selfTake.name }}</text>
+
 							</view>
 							<view class="am1-2">
-								距您{{ e.selfTake.distanceDesc }}
-								<image src="http://www.gzzzyd.com/groupon/order_details/导航图标@2x.png" mode="scaleToFill" />
+								<text class="juli">距您{{ e.selfTake.distanceDesc }}</text>
 							</view>
 						</view>
 					</view>
@@ -327,7 +329,7 @@ export default {
 	box-sizing: border-box;
 	background-color: rgba(255, 247, 248, 1.000000);
 	border-radius: 12rpx;
-	height: 100rpx;
+	height: 72rpx;
 	padding: 20rpx;
 	line-height: 100rpx;
 	align-self: center;
@@ -420,32 +422,37 @@ export default {
 .wrapper {}
 
 .a-t {
-	padding: 0 30rpx;
 	display: flex;
 	justify-content: space-between;
-	height: 44rpx;
-	margin-bottom: 20rpx;
+	height: 52rpx;
 
+	.address-img {
+		width: 14px !important;
+		height: 14px;
+		margin-top: 19rpx;
+		margin-right: 56rpx;
+	}
 }
 
 .a-m {
-
-	padding: 0 30rpx;
-	padding-bottom: 20rpx;
-	min-height: 60rpx;
+	height: 52rpx;
 
 	.am1 {
 		display: flex;
 		justify-content: space-between;
-		margin-bottom: 20rpx;
 
 		.am1-1 {
+			width: 450rpx;
 			min-height: 40rpx;
 			font-size: 28rpx;
 			font-weight: bold;
 			color: #B22338;
 			line-height: 40rpx;
-
+			display: -webkit-box;
+			-webkit-box-orient: vertical;
+			-webkit-line-clamp: 2;
+			overflow: hidden;
+			text-overflow: ellipsis;
 		}
 
 		.am1-2 {
@@ -455,12 +462,7 @@ export default {
 			color: #666666;
 			line-height: 36rpx;
 
-			image {
-				margin-left: 30rpx;
-				vertical-align: middle;
-				height: 34rpx;
-				width: 34rpx;
-			}
+
 		}
 	}
 
@@ -511,10 +513,9 @@ export default {
 
 .self-pickup-point {
 	background: #FFF7F8;
-	padding-top: 20rpx;
 	margin: 0 30rpx;
-	margin-top: 20rpx;
-
+	margin-top: 8rpx;
+	height: 104rpx;
 }
 
 .btn-area {
@@ -583,4 +584,32 @@ export default {
 	.bord{
 		border: 1px solid red;
 	}
+.self-take-name {
+	width: 500rpx;
+	font-size: 20rpx;
+	font-family: PingFangSC-Medium, PingFang SC;
+	font-weight: bold;
+	color: #B22338;
+	line-height: 52rpx;
+	margin-left: 18rpx;
+}
+	.zuijinzitidian {
+		font-size: 20rpx;
+		font-family: PingFangSC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #666666;
+		line-height: 52rpx;
+		margin-left: 18rpx;
+	}
+	.juli {
+		font-size: 20rpx;
+		font-family: PingFangSC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #666666;
+		line-height: 52rpx;
+		margin-right: 18rpx;
+	}
+
+
+
 </style>