From 7df16f45caccf08252135cad82b837b5dcfc3263 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Thu, 26 May 2022 11:47:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E5=91=BD=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e83ad60..5a268c0 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,9 @@
     "build": "npm run build:h5",
     "build:app-plus": "cross-env NODE_ENV=production UNI_PLATFORM=app-plus vue-cli-service uni-build",
     "build:custom": "cross-env NODE_ENV=production uniapp-cli custom",
-    "build:h5": "cross-env NODE_ENV=production UNI_PLATFORM=h5 vue-cli-service uni-build",
+    "build:h5": "node env.config.js --ENV:test & cross-env NODE_ENV=production UNI_PLATFORM=h5 vue-cli-service uni-build",
+    "build:h5:bate": "node env.config.js --ENV:beta & cross-env NODE_ENV=production UNI_PLATFORM=h5 vue-cli-service uni-build",
+    "build:h5:prod": "node env.config.js --ENV:prod & cross-env NODE_ENV=production UNI_PLATFORM=h5 vue-cli-service uni-build",
     "build:mp-360": "cross-env NODE_ENV=production UNI_PLATFORM=mp-360 vue-cli-service uni-build",
     "build:mp-alipay": "cross-env NODE_ENV=production UNI_PLATFORM=mp-alipay vue-cli-service uni-build",
     "build:mp-baidu": "cross-env NODE_ENV=production UNI_PLATFORM=mp-baidu vue-cli-service uni-build",

From 693cc0417a0da8dd3d7bedf224be64c78f759bb9 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Thu, 26 May 2022 14:35:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A2=84=E8=AE=A2=E5=8D=95=E4=B8=8B?=
 =?UTF-8?q?=E5=8D=95=E5=8A=A0=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/dicts/order.js  | 16 ++++++++++++++++
 src/pages/order/submit.vue |  5 ++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 src/common/dicts/order.js

diff --git a/src/common/dicts/order.js b/src/common/dicts/order.js
new file mode 100644
index 0000000..a412175
--- /dev/null
+++ b/src/common/dicts/order.js
@@ -0,0 +1,16 @@
+/*
+ * @Author: ch
+ * @Date: 2022-05-26 11:49:16
+ * @LastEditors: ch
+ * @LastEditTime: 2022-05-26 14:16:49
+ * @Description: file content
+ */
+
+// 订单状态
+export const ORDER_STATUS = {
+	// 待支付
+	AWAIT_PAY: 1
+}
+export const ORDER_SOURCE = {
+	
+}
\ No newline at end of file
diff --git a/src/pages/order/submit.vue b/src/pages/order/submit.vue
index 96feafa..9cf2193 100644
--- a/src/pages/order/submit.vue
+++ b/src/pages/order/submit.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-20 14:14:53
  * @LastEditors: ch
- * @LastEditTime: 2022-05-25 16:04:45
+ * @LastEditTime: 2022-05-26 14:31:36
  * @Description: file content
 -->
 <template>
@@ -123,6 +123,7 @@ export default {
 			if(query.mode === 'cart'){
 				res = await ApiGetBeforeCartOrder({
 					cartIds: query.ids,
+					isVirtual :this.productType == 2 && true,
 					recipientAddressId : this.address.id
 				})
 			}
@@ -132,6 +133,7 @@ export default {
 					productSkuId : query.skuId,
 					quantity : query.num,
 					activityId : query.activityId,
+					isVirtual : this.productType == 2 && true,
 					activityTimeId : query.activityTimeId,
 					// 1正常购买 2活动购买
 					activityType : query.activityType,
@@ -169,6 +171,7 @@ export default {
 				orderSource : this.$store.state.openId ? 5 : 4,
 				// #endif
 				recipientAddressId : this.address.id,
+				isVirtual :this.productType == 2 && true,
 				shoppingCartIds : query.ids ? query.ids.split(',') : [],
 				products : this.orderInfo.products.map(i => ({
 					activityId : query.activityId,