Merge branch 'fix/goods-0525' into msb_test

pages/account/index/order/detail/index.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-08 01:14:03
  * @LastEditors: ch
- * @LastEditTime: 2022-05-11 22:22:15
+ * @LastEditTime: 2022-05-26 17:38:01
  * @Description: file content
 -->
 <template>
@@ -11,7 +11,7 @@
 			<StatusInfo :orderInfo="orderInfo" @changeStatus="getOrderInfo"/>
 			<StatusStep :orderInfo="orderInfo" />
 		</div>
-		<LogisitcsInfo :orderInfo="orderInfo" />
+		<LogisitcsInfo v-if="orderInfo.orderType !== ORDER_TYPE.VIRTUAL" :orderInfo="orderInfo" />
 		<div class="pay-type" v-if="orderInfo.payType !== 1">
 			<p>支付方式：{{orderInfo.payTypeDesc}}</p>
 			<p>支付时间：{{orderInfo.submitTime}}</p>
@@ -21,6 +21,7 @@
 </template>
 <script>
 import {ApiGetOrderDetail} from '@/plugins/api/order';
+import {ORDER_TYPE} from '@/plugins/dicts/order';
 import StatusInfo from './module/StatusInfo.vue';
 import StatusStep from './module/StatusStep.vue';
 import LogisitcsInfo from './module/LogisitcsInfo.vue';
@@ -29,6 +30,7 @@ export default {
 	components: { StatusInfo, StatusStep, LogisitcsInfo, GoodsInfo },
 	data(){
 		return {
+			ORDER_TYPE,
 			orderInfo : {}
 		}
 	},
@@ -53,12 +55,14 @@ export default {
 </script>
 <style lang="scss" scoped>
 .box{
-  min-width: 1000px;
+  	min-width: 1000px;
 	border: 1px solid #ddd;
 	border-radius: 4px;
 	display: flex;
+	margin: 0 0 30px 0;
 }
 .pay-type{
+	margin: 30px 0;
 	border: 1px solid #ddd;
 	background: #f8f8f8;
 	height: 59px;

pages/cart/index.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-03 22:41:15
  * @LastEditors: ch
- * @LastEditTime: 2022-05-16 20:40:48
+ * @LastEditTime: 2022-05-25 17:57:25
  * @Description: file content
 -->
 <template>
@@ -232,13 +232,26 @@ export default {
 		 * 点击去结算
 		 */
 		settlement(){
-			this.$router.push({
+			const ids = this.checkedIds;
-				path : '/order/submit', 
+			// 检查是否同时选中实物商品跟虚拟商品，不可以同时结账
-				query : { 
+			const baseType = this.list.find(i => ids[0] === i.id).productType;
-					mode: 'cart', 
+			for(let id of ids){
-					ids:this.checkedIds.join(',') 
+				const item = this.list.find(i => id === i.id);
+				if(item.productType != baseType){
+					this.$message.warning('虚拟商品需要单独结算，不可和其他实物订单合并结算哦~');
+					return false;
 				}
-			})
+			}
+            if (ids.length) {
+                this.$router.push({
+					path : '/order/submit', 
+					query : { 
+						mode: 'cart', 
+						productType : baseType,
+						ids:ids.join(',') 
+					}
+				})
+            }
 		}
 	}
 }

pages/goods/detail/_id.vue

@@ -493,6 +493,7 @@ export default {
         mode: "buyNow",
         skuId: this.curSku.skuId,
         num: this.curBuyNum,
+				productType : this.detailData.productType,
         activityType: 1,
       };
       this.$router.push({

pages/order/submit/index.vue

@@ -2,14 +2,16 @@
  * @Author: ch
  * @Date: 2022-05-04 17:30:58
  * @LastEditors: ch
- * @LastEditTime: 2022-05-17 16:44:30
+ * @LastEditTime: 2022-05-25 20:00:10
  * @Description: file content
 -->
 
 <template>
 	<div class="main">
-		<h3 class="title">收货地址</h3>
+		<template v-if="productType == 1">
-		<BsAddress v-model="address"/>
+			<h3 class="title">收货地址</h3>
+			<BsAddress v-model="address"/>
+		</template>
 		<!-- <h3 class="title">支付方式</h3>
 		<div class="pay-type">
 			<el-radio label="微信支付" />
@@ -45,7 +47,8 @@ export default {
 			payOrder : {},
 			payVisible : false,
 			payTimerTxt : '',
-			payTimerStop : null
+			payTimerStop : null,
+			productType : this.$Route.query.productType
 		}
 	},
 	mounted(){
@@ -92,7 +95,7 @@ export default {
 		async submit(){
 			const {query} = this.$route;
 			
-			if(!this.address.id){
+			if(!this.address.id && this.productType === 1){
 				this.$message.error('请选择收货地址');
 				return false;
 			}

plugins/dicts/order.js

@@ -0,0 +1,23 @@
+/*
+ * @Author: ch
+ * @Date: 2022-05-26 11:49:16
+ * @LastEditors: ch
+ * @LastEditTime: 2022-05-26 17:00:06
+ * @Description: file content
+ */
+
+// 订单状态
+export const ORDER_STATUS = {
+	// 待支付
+	AWAIT_PAY: 1
+}
+export const ORDER_TYPE = {
+	//(1, "普通订单"),
+	NORMAL: 1,
+	//(2, "免费订单"),
+	FREE: 2, 
+	//(3, "秒杀订单"),
+	SECKILL: 3, 
+	//(4, "虚拟商品订单"),
+    VIRTUAL : 4 
+}