Merge branch 'fix/goods-0525' into msb_test

pages/order/submit/index.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-04 17:30:58
  * @LastEditors: ch
- * @LastEditTime: 2022-05-26 20:00:22
+ * @LastEditTime: 2022-05-26 20:20:23
  * @Description: file content
 -->
 
@@ -66,6 +66,7 @@ export default {
 			if(query.mode === 'cart'){
 				res = await ApiGetBeforeCartOrder({
 					cartIds: query.ids,
+					isVirtual :this.productType == 2 && true,
 					recipientAddressId : this.address.id
 				})
 			}
@@ -76,6 +77,7 @@ export default {
 					quantity : query.num,
 					activityId : query.activityId,
 					activityTimeId : query.activityTimeId,
+					isVirtual :this.productType == 2 && true,
 					// 1正常购买 2活动购买
 					activityType : query.activityType,
 					recipientAddressId : this.address.id
@@ -102,6 +104,7 @@ export default {
 			const {error, result} = await ApiPostSubmitOrder({
 				orderSource :  4,
 				recipientAddressId : this.address.id,
+				isVirtual :this.productType == 2 && true,
 				shoppingCartIds : query.ids ? query.ids.split(',') : [],
 				products : this.orderInfo.products.map(i => ({
 					activityId : query.activityId,