Merge branch 'fix/0523-ch' into msb_test

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",

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 = {
+	
+}

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,