订单有显示进度条

ghs/src/views/home.vue

@@ -241,11 +241,7 @@ export default {
 				{
 					name: '花材数',
 					val: 10
-				},
-				{
-					name: '剩余短信',
-					val: 10
-				},
+				}
 			],
 			// 收入统计
 			incomeData: {

ghs/src/views/order/list.vue

@@ -25,7 +25,6 @@
 			<!-- 订花人 -->
 			<template #table-column-bookName="{scope}">
 				<div class="book-wrap">
-					<cl-avatar shape="circle" :size="20" :src="scope.row.bookAvatar"></cl-avatar>
 					<div style="width:58px;overflow: hidden;text-overflow:ellipsis;white-space:nowrap;">{{ scope.row.bookName }}</div>
 				</div>
 			</template>
@@ -36,18 +35,6 @@
 				<div v-else>{{ scope.row.bookMobile }}</div>
 			</template>
 
-			<!-- 收花人 -->
-			<template #table-column-receiveUserName="{scope}">
-				<div v-if="scope.row.receiveUserName == ''">-</div>
-				<div v-else>{{ scope.row.receiveUserName }}</div>
-			</template>
-
-			<!-- 收花人电话 -->
-			<template #table-column-receiveMobile="{scope}">
-				<div v-if="scope.row.receiveMobile == ''">-</div>
-				<div v-else>{{ scope.row.receiveMobile }}</div>
-			</template>
-
 			<!-- 状态 -->
 			<template #table-column-status="{scope}">
 				<el-tag v-if="scope.row.status == 2">待配送</el-tag>
@@ -59,18 +46,7 @@
 
 			<!-- 进度 -->
 			<template #table-column-currentFlow="{scope}">
-				<div class="steps-wrap" @click="shipDrawFn(scope.row)" style="cursor:pointer;">
-					<el-steps
-						:space="200"
-						:active="parseInt(scope.row.currentFlow)"
-						align-center
-						finish-status="success"
-						size="mini"
-					>
-						<el-step title v-for="(item, index) in parseInt(scope.row.totalFlow)" :key="index"></el-step>
-					</el-steps>
-				</div>
-				<!-- <div>{{ scope.row.currentFlow }}</div> -->
+				<el-progress :percentage="(scope.row.currentFlow/scope.row.totalFlow)*100" :format="formatProgress" ></el-progress>
 			</template>
 
 			<!-- 送达时间 -->
@@ -80,15 +56,6 @@
 				</span>
 			</template>
 
-			<!-- 通知送到 -->
-			<template #table-column-inform="{scope}">
-				<span v-if="scope.row.sendType == 0">-</span>
-				<span v-else>
-					<i class="el-icon-success" v-if="scope.row.inform == 1" style="color:#67C23A;font-size:19px;"></i>
-					<i class="el-icon-success" v-else style="color:#C0C4CC;font-size:19px;"></i>
-				</span>
-			</template>
-
 			<!-- 操作 -->
 			<template #slot-column-option="{scope}">
 				<template v-if="scope.row.status == 0">
@@ -140,31 +107,31 @@ export default {
 		return {
 			// x-crud
 			app: null,
-			tabIndex: '-1',
+			tabIndex: '0',
 			tabsData: [
 				{
 					text: '全部',
-					key: '-1',
+					key: '0',
 					val: 0
 				},
 				{
 					text: '待付款',
-					key: '0',
+					key: '1',
 					val: 0
 				},
 				{
 					text: '待配送',
-					key: '1',
+					key: '2',
 					val: 0
 				},
 				{
 					text: '配送中',
-					key: '2',
+					key: '3',
 					val: 0
 				},
 				{
 					text: '已完成',
-					key: '5',
+					key: '4',
 					val: 0
 				}
 			],
@@ -179,6 +146,9 @@ export default {
 		this.init();
 	},
 	methods: {
+		formatProgress(){
+			return ''
+		},
 		init() {
 			this.$store.dispatch('getCategory');
 			this.$store.dispatch('getUsage');
@@ -251,18 +221,6 @@ export default {
 							align: 'center',
 							width: '110'
 						},
-						{
-							prop: 'receiveUserName',
-							label: '收花人',
-							align: 'center',
-							width: '100'
-						},
-						{
-							prop: 'receiveMobile',
-							label: '手机号',
-							align: 'center',
-							width: '110'
-						},
 						{
 							prop: 'reachTime',
 							label: '送达时间',
@@ -297,11 +255,6 @@ export default {
 							prop: 'status',
 							label: '状态',
 							align: 'center'
-						},
-						{
-							prop: 'inform',
-							label: '通知送到',
-							align: 'center'
 						}
 					],
 

ghsApp/src/pagesStorehouse/flower/category.vue

@@ -83,7 +83,7 @@ export default {
 					custom: "warn"
 				},
 				{
-					name: "每扎采购价(元)",
+					name: "每扎采购价",
 					width: 130,
 					color: "info",
 					align: "center",
@@ -91,7 +91,7 @@ export default {
 					custom: "cost"
 				},
 				{
-					name: "每扎加价(元)",
+					name: "每扎加价",
 					width: 130,
 					color: "info",
 					align: "center",