From 2734b3c272bf5a8e6f428f43d09a31ead36b1052 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Wed, 25 May 2022 16:07:25 +0800
Subject: [PATCH] =?UTF-8?q?pref:=E6=8F=90=E4=BA=A4=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=97=B6,=E8=99=9A=E6=8B=9F=E5=95=86=E5=93=81=E4=B8=8D?=
 =?UTF-8?q?=E4=BC=A0=E5=9C=B0=E5=9D=80Id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/cart/components/PageCtx.vue          |  3 ++-
 src/pages/goods/detail/components/SkuPopup.vue |  3 ++-
 src/pages/order/submit.vue                     | 17 ++++++++++-------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/pages/cart/components/PageCtx.vue b/src/pages/cart/components/PageCtx.vue
index 8381f43..1eb04af 100644
--- a/src/pages/cart/components/PageCtx.vue
+++ b/src/pages/cart/components/PageCtx.vue
@@ -307,7 +307,7 @@ export default {
 			for(let id of ids){
 				const item = this.list.find(i => id === i.id);
 				if(item.productType != baseType){
-					uni.$u.toast('虚拟商品跟实物商品不能同时结算哦~');
+					uni.$u.toast('虚拟商品需要单独结算，不可和其他实物订单合并结算哦~');
 					return false;
 				}
 			}
@@ -316,6 +316,7 @@ export default {
 					path : '/orderSubmit', 
 					query : { 
 						mode: 'cart', 
+						productType : baseType,
 						ids:ids.join(',') 
 					}
 				})
diff --git a/src/pages/goods/detail/components/SkuPopup.vue b/src/pages/goods/detail/components/SkuPopup.vue
index c463847..9c9b229 100644
--- a/src/pages/goods/detail/components/SkuPopup.vue
+++ b/src/pages/goods/detail/components/SkuPopup.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-24 11:30:55
  * @LastEditors: ch
- * @LastEditTime: 2022-05-17 22:21:10
+ * @LastEditTime: 2022-05-25 15:55:43
  * @Description: file content
 -->
 <template>
@@ -242,6 +242,7 @@ export default {
 				mode : 'buyNow',
 				skuId : this.curSku.skuId,
 				num : this.curBuyNum,
+				productType : this.goodsInfo.productType || 1,
 				activityType : 1
 			}
 			const {productActivityVO} = this.goodsInfo;
diff --git a/src/pages/order/submit.vue b/src/pages/order/submit.vue
index aabddb5..96feafa 100644
--- a/src/pages/order/submit.vue
+++ b/src/pages/order/submit.vue
@@ -2,13 +2,13 @@
  * @Author: ch
  * @Date: 2022-03-20 14:14:53
  * @LastEditors: ch
- * @LastEditTime: 2022-05-24 09:57:17
+ * @LastEditTime: 2022-05-25 16:04:45
  * @Description: file content
 -->
 <template>
 	<view>
 		
-		<UiWhiteBox>
+		<UiWhiteBox v-if="productType == 1">
 			<u-cell class="address" :border="false" isLink @click="selectAddress">
 				<view slot="title" class="address--title">
 					{{address.province ? address.province + address.city + address.area : '请选择收货地址'}}
@@ -82,7 +82,8 @@ export default {
 			address : {},
 			userMessage : '',
 			orderInfo : {},
-			payType : 'wxpay'
+			payType : 'wxpay',
+			productType : this.$Route.query.productType,
 		}
 	},
 	onLoad(){
@@ -93,10 +94,12 @@ export default {
 	},
 	onShow(){
 		// 默认选择设为默认的地址
-		if(!this.address.id){
+		if(!this.address.id && this.productType == 1){
 			this.getAddressList()
+		}else{
+			this.getBeforeOrder();
 		}
-		this.getBeforeOrder();
+		
 
 	},
 	methods:{
@@ -107,8 +110,8 @@ export default {
 				return false;
 			}
 			this.address = result.find(i => i.isDefault) || {};
-			console.log(this.address);
 			this.$store.commit('SET_ADDRESS', result);
+			this.getBeforeOrder();
 		},
 		/**
 		 * 获取预订单信息，将要提交的订单信息
@@ -153,7 +156,7 @@ export default {
 		 */
 		async submit(){
 			const {query} = this.$Route;
-			if(!this.address.id){
+			if(!this.address.id && this.productType === 1){
 				uni.$u.toast('请选择收货地址');
 				return false;
 			}