订单发货相关调整

pages/bookShop/settlement.vue

@@ -21,7 +21,7 @@
 			</view>
 			<view class="defalBottom">
 				<text class="userAddress">
-					{{adressMoRen.province}} {{adressMoRen.city}} {{adressMoRen.county}} {{adressMoRen.useraddress}}
+					{{adressMoRen.province}} {{adressMoRen.city}} {{adressMoRen.county}} {{adressMoRen.detailAddress}}
 				</text>
 			</view>
 
@@ -56,8 +56,8 @@
 				优惠券
 				<u-icon name="arrow-right" color="#aaa" size="18" class="yqRight"></u-icon>
 				<text class="dagnqian"
-					v-if="youhuiList.length>0&&youhuiContent.id==undefined">当前可选{{this.youhuiList.length}}张</text>
-				<text class="dagnqian" v-if="youhuiList.length==0&&youhuiContent.id==undefined"
+					v-if="youhuiList.length>0">当前可选{{this.youhuiList.length}}张</text>
+				<text class="dagnqian" v-else
 					style="background-color: #999;">暂无优惠券</text>
 				<text class="dagnqian" v-if="youhuiContent.id!=undefined">
 					- ￥{{youhuiContent.coupons.couponAmount}}</text>
@@ -151,7 +151,7 @@
 							<view class="addrContentBottom">
 								<view class="userAddress">
 									{{item.province}} {{item.city}} {{item.county}} 
-									{{item.useraddress}}
+									{{item.detailAddress}}
 								</view>
 							</view>
 						</view>
@@ -166,7 +166,7 @@
 		<u-popup :show="youhuiShow" :round="10" @close="youhuiShow=false">
 			<view class="tanchu">
 				<view class="dp_title">请选择优惠券</view>
-				<view style="max-height: 1000rpx;overflow-y: scroll;">
+				<view style="max-height: 1000rpx;overflow-y: scroll;" v-if="youhuiList.length > 0">
 					<view :class="youhuiIndex === index ? 'youhuiItem youItem_style' : 'youhuiItem'"
 						v-for="(item,index) in youhuiList" :key="index" @click="choseYouhui(index)">
 						<view style="width: 25%;color:#fd6004;text-align: center;">
@@ -189,8 +189,11 @@
 						</view>
 						<br clear="both">
 					</view>
+					<view style="font-size: 20rpx;color: #aaa;margin-top: 30rpx;">* 每笔订单只能使用一张优惠价</view>
 				</view>
-				<view style="font-size: 20rpx;color: #aaa;margin-top: 30rpx;">* 每笔订单只能使用一张优惠价</view>
+				<view class="" v-else>
+					<u-divider text="暂无可用优惠券哦"></u-divider>
+				</view>				
 			</view>
 		</u-popup>
 
@@ -357,7 +360,7 @@
 								this.addressList = res.list
 								// console.log(this.addressList,'地址列表')
 								this.adressMoRen = this.addressList[this.adressMoRIndex]
-								// console.log(this.adressMoRen, '默认')
+								console.log(this.adressMoRen, '默认')
 								if(this.adressMoRen != {}){
 									// console.log('运费之前')
 									this.getYunFei()
@@ -459,7 +462,8 @@
 				 console.log(key,'this.adressMoRen.areaidpath')
 				
 				$http.request({
-					url: "book/buyOrder/calculateTransportPrice/",
+					// url: "book/buyOrder/calculateTransportPrice/",
+					url: "book/buyOrder/calculateTransportPrice",
 					// url: "book/buyorder/getTransPrice/" + this.adressMoRen.areaidpath + "?" + dataToString,
 					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
 					data:{
@@ -473,11 +477,10 @@
 				}).then(res => {					
 					if (res.code == 0) {
 						this.farePrice = res.result
-					}else{
-						this.farePrice = 0
+						console.log('需要的运费',res.result)
+						this.allPrice()
 					}
-					console.log('需要的运费',res.result)
-					this.allPrice()
+					
 				})
 			},	
 
@@ -613,13 +616,13 @@
 					couponName: youPre.coupons.name, //优惠券名称
 					districtMoney: youPre.coupons.amount, //优惠金额
 					orderStatus: 0, //订单状态
-					products: xiaBiao, //订单列表
+					productList: xiaBiao, //订单列表商品
 					orderType: "order", //订单类型
 					addressId:this.adressMoRen.id    // 地址ID
 				}				
-				$http.request({
-					// url: "book/buyorder/save",
-					url: "book/buyOrder/buySave",
+				$http.request({					
+					// url: "book/buyOrder/buySave",
+					url: "book/buyOrder/placeOrder",
 					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
 					data,
 					header: { //默认 无 说明：请求头