修改下单页面

api/groupon.js

@@ -25,4 +25,7 @@ export function publishGroupon(data) {
     return request.post("/v1/groupon/detail",data);
 }
 
-
+// 查询团购自提点
+export function getGrouponSelfTakeList(data) {
+    return request.get("/v1/self-take/list",data);
+}

api/home.js

@@ -119,8 +119,8 @@ export function postOrderSubmit(data) {
 
 // jspai下单API
 export function postJsapiPay(data) {
-	let url = "?openid="+data.openId + "&outTradeNo="+data.outTradeNo
-	return request.post("v1/wxPay/v3/jsapiPay"+url,data);
+	let url = "?openid="+data.openId + "&orderNo="+data.outTradeNo
+	return request.post("v1/wxPay/jsapiPay"+url,data);
 }
 
 // 获取手机验证码VS

components/payment/index.vue

@@ -4,7 +4,7 @@
 			<view class="title acea-row row-center-wrapper">
 				{{ $t(`选择付款方式`) }}<text class="iconfont icon-guanbi" @click='close'></text>
 			</view>
-			<u-alert title="积分赠送方式" type="warning" :description="description"></u-alert>
+			<!-- <u-alert title="积分赠送方式" type="warning" :description="description"></u-alert> -->
 			<view class="item acea-row row-between-wrapper" v-for="(item, index) in payMode" :key="index"
 				v-if='item.payStatus' @click="payType(item.number || 0, item.value, index)">
 				<view class="left acea-row row-between-wrapper">

pages/groupbuying_details/index.vue

@@ -1342,10 +1342,9 @@ export default {
 				});
 				return;
 			}
-			console.log("goodsArr -> ", goodsArr)
 			uni.navigateTo({
 				url: "/pages/groupbuying_details/order_details_confirm/index?organizerUserId=" + this.organizerUserId
-				 + "&selfTakeId=" + this.selfTakeId + "&goods=" + encodeURIComponent(JSON.stringify(goodsArr))
+				 + "&selfTakeId=" + this.selfTakeId + "&goods=" + encodeURIComponent(JSON.stringify(goodsArr)) + "&grouponId=" + this.id
 			});
 		},
 		open (data) {

pages/groupbuying_details/order_details_confirm/index.vue

@@ -39,7 +39,7 @@
 							<view class="t1">
 								自提门店
 							</view>
-							<view class="t2">
+							<view class="t2" @tap='selectSelfTake()'>
 								更换自提网点
 								<image src="http://www.gzzzyd.com/groupon/order_details/切换_面24@2x.png" mode="scaleToFill" />
 							</view>
@@ -47,18 +47,18 @@
 						<view class="a-m">
 							<view class="am1">
 								<view class="am1-1">
-									{{grouponOrderData.selfTake.name}}
+									{{selfTake.name}}
 								</view>
 								<view class="am1-2">
-									距您{{grouponOrderData.selfTake.distanceDesc}}
+									距您{{selfTake.distanceDesc}}
 									<image src="http://www.gzzzyd.com/groupon/order_details/距离@2x.png" mode="scaleToFill" />
 								</view>
 							</view>
 							<view class="am2">
-								{{grouponOrderData.selfTake.address}}
+								{{selfTake.address}}
 							</view>
 							<view class="am3">
-								营业时间 {{grouponOrderData.selfTake.busStartTime}}-{{grouponOrderData.selfTake.busEndTime}}
+								营业时间 {{selfTake.busStartTimeDesc}}-{{selfTake.busEndTimeDesc}}
 							</view>
 						</view>
 						<view class="a-b">
@@ -154,9 +154,14 @@
 		<canvas canvas-id="canvas" v-if="canvasStatus"
 			:style="{ width: canvasWidth + 'px', height: canvasHeight + 'px', position: 'absolute', left: '-100000px', top: '-100000px' }"></canvas>
 
+
+		<u-popup :show="selectSelfTakePopupShow" @close="selectSelfTakePopupShow = false" @open="	">
+			<!-- 页面待实现 -->
+		</u-popup>
 	</view>
 </template>
 <script>
+import {getGrouponSelfTakeList } from "@/api/groupon.js";
 import {
 	getGoodsDetail, postOrderSubmit, postBeforeCheck, getUserAddressByIdAndFreight
 } from "@/api/home.js";
@@ -218,6 +223,7 @@ export default {
 			format: true
 		})
 		return {
+			selectSelfTakePopupShow: false,
 			confirm: '', //自定义留言
 			date: this.$t(`请选择`),
 			time: this.$t(`请选择`),
@@ -345,7 +351,10 @@ export default {
 			goods: [],
 			organizerUserId: '',
 			selfTakeId: '',
-			grouponOrderData: {}
+			grouponOrderData: {},
+			selfTake: {},
+			selfTakeList: [],
+			grouponId: ''
 		};
 	},
 	computed: mapGetters(['isLogin']),
@@ -362,6 +371,7 @@ export default {
 		this.goods = goods;
 		this.organizerUserId = options.organizerUserId;
 		this.selfTakeId = options.selfTakeId;
+		this.grouponId = options.grouponId;
 		this.from = 'routine'
 		// if (!options.productId) return this.$util.Tips({
 		// 	title: this.$t(`请选择要购买的商品`)
@@ -396,13 +406,28 @@ export default {
 		})
 	},
 	methods: {
+		selectSelfTake() {
+			this.selectSelfTakePopupShow = true;
+			let longitude = uni.getStorageSync("user_longitude"); //经度
+			let latitude = uni.getStorageSync("user_latitude"); //纬度
+			getGrouponSelfTakeList({
+				grouponId: this.grouponId,
+				longitude: longitude,
+				latitude: latitude
+			}).then(res => {
+				this.selfTakeList = res.data;
+			}).catch(err => {
+				uni.showToast({
+					title: err,
+					icon: 'none'
+				});
+			});
+		},
 		calGoodsPrice(value) {
-			console.log(value);
 			this.grouponOrderData.goodsInfos.forEach(e => {
-				console.log(e.id + " - " + e.num)
 				if (value.name == e.id) {
 					let c = value.value - e.num;
-					this.totalPrice = this.totalPrice - (c*e.discountPrice)
+					this.totalPrice = this.totalPrice + (c*e.discountPrice)
 				}
 			});
 		},
@@ -422,6 +447,7 @@ export default {
 					console.log(e.goodsName + "-" + e.num)
 					total+=(e.discountPrice*e.num)
 				});
+				this.selfTake = this.grouponOrderData.selfTake;
 				this.totalPrice = total;
 			}).catch(err => {
 				uni.showToast({
@@ -519,46 +545,17 @@ export default {
 			uni.showLoading({
 				title: that.$t(`下单中`)
 			});
-			postBeforeCheck({
-				goodsSpecId: this.goodsSpecId,
-				num: this.num,
-				userAddressId: this.addressId
-			}).then(function (res) {
-				//验证是否可下单
-				if (res.code == 200) {
-					that.freight = res.data.freight - 0
-					that.totalPrice = res.data.freight - 0
-					that.cartInfo.forEach(e => {
-						that.totalPrice += (e.salePrice - 0) * (that.num - 0)
-					})
-					that.orderCreate()
-				} else {
-					this.totalPrice = 0
-					that.$util.Tips({
-						title: that.$t(`所选商品属性不支持下单`),
-						success: () => {
-							uni.hideLoading();
-							// that.getCartCount(true);
-						},
-					});
-				}
-			})
+			that.orderCreate()
 		},
 		orderCreate () {
 			let that = this
 			postOrderSubmit({
 				distributeMode: 1,
-				goodsList: [{
-					goodsId: that.cartId,
-					goodsNum: that.num,
-					goodsSpecIds: that.goodsSpecId
-				}],
-				payType: 1,
-				remark: that.remark,
-				settleType: 1,
-				userAddressId: that.addressInfo.id,
-				wlPrice: that.freight,
-				promotionCode: that.zoneType == 8 ? that.$Cache.get("INVITE_CODE") : ''
+				orderType: 1,
+				orderSource: 1,
+				grouponId: this.grouponId,
+				selfTakeId: this.selfTakeId,
+				goodsInfos: this.goods
 			}).then(res => {
 				that.orderKey = res.data.orderNo,
 					uni.showLoading({
@@ -574,7 +571,6 @@ export default {
 					title: err
 				});
 			});
-
 		},
 		pay_complete (type) {
 			let that = this