Merge branch 'master' of http://git.huaml.com/zhh/front-end

ghs/src/admin/home/order.vue

@@ -64,7 +64,7 @@
 						</view>
 						<view class="order-info_box">
 							<view>数量：</view>
-							<view>{{ `${item.num}/${item.smallNum}` }}</view>
+							<view>{{ `${item.bigNum}/${item.smallNum}` }}</view>
 							<view class="price">
 								<view>￥{{ item.actPrice }}</view>
 								<i class="iconfont iconxiangyou"></i>

ghs/src/filters/constant.js

@@ -57,26 +57,22 @@ const _CONST_MAP = {
 	ORDER_STATUS: [
 		{
 			label: '待付款',
-			value: 0
-		},
-		{
-			label: '待配送',
 			value: 1
 		},
 		{
-			label: '配送中',
+			label: '待配送',
 			value: 2
 		},
 		{
-			label: '待通知',
+			label: '配送中',
 			value: 3
 		},
 		{
-			label: '已取消',
+			label: '已完成',
 			value: 4
 		},
 		{
-			label: '已完成',
+			label: '已取消',
 			value: 5
 		}
 	],

ghs/src/pagesOrder/detail.vue

@@ -105,7 +105,7 @@
 							重选花材
 						</view>
 						<view class="describe-view">
-							共{{ detailInfo.product.length || 0 }}种, 共{{ detailInfo.num }}扎{{
+							共{{ detailInfo.product.length || 0 }}种, 共{{ detailInfo.bigNum }}扎{{
 								detailInfo.smallNum
 							}}支，合计 ¥<text class="price">{{ detailInfo.actPrice }}</text>
 						</view>

shop/src/constant/constant.js

@@ -57,27 +57,27 @@ const _CONST_MAP = {
 	ORDER_STATUS: [
 		{
 			label: '待付款',
-			value: 0
-		},
-		{
-			label: '待配送',
 			value: 1
 		},
 		{
-			label: '配送中',
+			label: '待配送',
 			value: 2
 		},
 		{
-			label: '待通知',
+			label: '配送中',
 			value: 3
 		},
 		{
-			label: '已取消',
+			label: '已完成',
 			value: 4
 		},
 		{
-			label: '已完成',
+			label: '已取消',
 			value: 5
+		},
+		{
+			label: '已退款',
+			value: 6
 		}
 	],
 	// 后台审核账号

shop/src/views/order/list.vue

@@ -50,11 +50,10 @@
 
 			<!-- 状态 -->
 			<template #table-column-status="{scope}">
-				<el-tag v-if="scope.row.status == 1">待配送</el-tag>
-				<el-tag v-else-if="scope.row.status == 2">配送中</el-tag>
-				<el-tag v-else-if="scope.row.status == 3">待通知</el-tag>
-				<el-tag v-else-if="scope.row.status == 4">已取消</el-tag>
-				<el-tag v-else-if="scope.row.status == 5">已完成</el-tag>
+				<el-tag v-if="scope.row.status == 2">待配送</el-tag>
+				<el-tag v-else-if="scope.row.status == 3">配送中</el-tag>
+				<el-tag v-else-if="scope.row.status == 4">已完成</el-tag>
+				<el-tag v-else-if="scope.row.status == 5">已取消</el-tag>
 				<el-tag v-else>待付款</el-tag>
 			</template>