界面与文字优化

admin-update/src/views/goods/summary.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="app-content summary-wrap">
-		<el-form :model="form" :rules="rules" ref="form" label-width="100px" class="demo-form">
+		<el-form :model="form" :rules="rules" ref="form" label-width="10px" class="demo-form">
 			<el-form-item label="" prop="desc">
 				<cl-editor-quill v-model="form.desc" @load="editor"></cl-editor-quill>
 			</el-form-item>

admin-update/src/views/member/list.vue

@@ -69,10 +69,6 @@
 				>
 			</template>
 
-			<!-- 详情 -->
-			<template #slot-detail="{scope}">
-				<el-button type="text" @click="detailShowFn(scope.row)">详情</el-button>
-			</template>
 			<!-- 充值 -->
 			<template #slot-recharge="{scope}">
 				<el-button type="text" @click="rechargeShowFn(scope.row)">充值</el-button>
@@ -319,7 +315,7 @@ export default {
 						},
 						{
 							prop: 'userName',
-							label: '来源 昵称',
+							label: '昵称',
 							align: 'center'
 						},
 						{
@@ -347,7 +343,7 @@ export default {
 							prop: 'subscribe',
 							label: '关注公众号',
 							align: 'center',
-							sortable: true,
+							sortable: false,
 							width: 150
 						},
 						{

admin-update/src/views/order/list.vue

@@ -23,14 +23,19 @@
 				<div class="book-wrap">
 					<cl-avatar
 						shape="circle"
-						:size="24"
-						:src="scope.row.avatarUrl | default_avatar"
+						:size="22"
+						:src="scope.row.bookAvatar | default_avatar"
 					></cl-avatar>
 					<div>{{ scope.row.bookName }}</div>
 					<div>{{ scope.row.bookMobile }}</div>
 				</div>
 			</template>
 
+			<!-- 单号 -->
+			<template #table-column-orderSn="{scope}">
+                <el type="text" @click="detailShowFn(scope.row)" >{{ scope.row.orderSn}}</el>
+			</template>
+
 			<!-- 收花人 -->
 			<template #table-column-receiveUserName="{scope}">
 				<div class="book-wrap">
@@ -49,20 +54,20 @@
 
 			<!-- 状态 -->
 			<template #table-column-status="{scope}">
-				<el-tag v-if="scope.row.status == 1" size="medium" type="danger">待配送</el-tag>
-				<el-tag v-else-if="scope.row.status == 2" size="medium" type="danger"
-					>配送中</el-tag
+				<el v-if="scope.row.status == 1">待配送</el>
+				<el v-else-if="scope.row.status == 2"
+					>配送中</el
 				>
-				<el-tag v-else-if="scope.row.status == 3" size="medium" type="danger"
-					>待通知</el-tag
+				<el v-else-if="scope.row.status == 3"
+					>待通知</el
 				>
-				<el-tag v-else-if="scope.row.status == 4" size="medium" type="danger"
-					>已取消</el-tag
+				<el v-else-if="scope.row.status == 4"
+					>已取消</el
 				>
-				<el-tag v-else-if="scope.row.status == 5" size="medium" type="success"
-					>已完成</el-tag
+				<el v-else-if="scope.row.status == 5"
+					>已完成</el
 				>
-				<el-tag v-else size="medium" type="danger">待付款</el-tag>
+				<el v-else>待付款</el>
 			</template>
 
 			<!-- 进度 -->
@@ -87,30 +92,28 @@
 			<!-- 操作 -->
 			<!-- 发货 -->
 			<template #slot-column-option="{scope}">
-				<template>
-					<el-button type="text" @click="detailShowFn(scope.row)">详情</el-button>
-				</template>
-				<template v-if="scope.row.status == 4 || scope.row.status == 0">
-					<el-button type="text" size="small" disabled>免发货</el-button>
+				<template v-if="scope.row.status == 0">
+					<el-button type="text" size="small" disabled>自取</el-button>
 					<el-button type="text" size="small" disabled>发货</el-button>
 				</template>
-				<template v-else-if="scope.row.currentFlow == 0">
-					<el-button type="text" size="small" @click="noSendShipFn(scope.row)"
-						>免发货</el-button
-					>
-					<el-button type="text" size="small" @click="shipDrawFn(scope.row)"
-						>发货</el-button
-					>
-				</template>
-				<template v-else-if="scope.row.currentFlow == scope.row.totalFlow">
-					<el-button type="text" size="small" @click="shipDrawFn(scope.row)"
-						>配送详情</el-button
-					>
-				</template>
+
 				<template v-else>
-					<el-button type="text" size="small" @click="shipDrawFn(scope.row)"
-						>继续</el-button
-					>
+
+                                <template v-if="scope.row.currentFlow == 0">
+                					<el-button type="text" size="small" @click="noSendShipFn(scope.row)"
+                						>自取</el-button
+                					>
+                					<el-button type="text" size="small" @click="shipDrawFn(scope.row)"
+                						>发货</el-button
+                					>
+                				</template>
+                				<template v-else>
+                									<el-button type="text" size="small" @click="shipDrawFn(scope.row)"
+                                						>继续</el-button
+                                					>
+				                </template>
+
+
 				</template>
 			</template>
 		</cl-crud>
@@ -185,7 +188,7 @@ export default {
 			})
 				.then(() => {
 					this.$service.order.freeShipping({ id: item.id }).then(res => {
-						this.$message.success('免发货操作成功！');
+						this.$message.success('操作成功！');
 						item.currentFlow = 1;
 					});
 				})
@@ -248,36 +251,40 @@ export default {
 							label: '实付款',
 							align: 'center',
 							emptyText: '无',
-							'min-width': 150
+							'min-width': 100
 						},
+                        {
+                            prop: 'sendNum',
+                            label: '编号',
+                            align: 'center',
+                            width: 80
+                        },
 						{
-							prop: 'reachTime',
-							label: '送达状态',
-							align: 'center'
-						},
-						{
-							prop: 'reachTime',
-							label: '送达时间',
-							align: 'center'
+							prop: 'currentFlow',
+							label: '进度',
+							align: 'center',
+							width: 220
 						},
 						{
 							prop: 'status',
 							label: '状态',
 							align: 'center'
 						},
+                        {
+                            prop: 'reachTime',
+                            label: '配送状态',
+                            align: 'center'
+                        },
 						{
-							prop: 'sendNum',
-							label: '标记号',
-							align: 'center',
-							sortable: true,
-							width: 150
+							prop: 'reachTime',
+							label: '送达时间',
+							align: 'center'
 						},
-						{
-							prop: 'currentFlow',
-							label: '进度',
-							align: 'center',
-							width: 220
-						}
+                        {
+                            prop: 'reachTime',
+                            label: '已通知',
+                            align: 'center'
+                        },
 					],
 
 					props: {
@@ -338,6 +345,7 @@ export default {
 	// height: 26px;
 }
 </style>
+
 <style lang="scss">
 .order-list-wrap {
 	.el-step__head.is-process {

admin-update/src/views/setting/wx-menu.vue

@@ -57,7 +57,7 @@
 						</el-form>
 						<div class="dialog-footer">
 							<el-button @click="resetForm" size="small">取 消</el-button>
-							<el-button type="primary" @click="confirmForm" size="small">提交生效</el-button>
+							<el-button type="primary" @click="confirmForm" size="small">提交</el-button>
 						</div>
 					</div>
 				</div>
@@ -132,7 +132,7 @@
 				console.log(this.menuData);
 				// return false;
 				this.$service.setting.updateMenu(this.menuData).then(res => {
-					this.$message.success(res.msg || '提交生效');
+					this.$message.success(res.msg || '提交');
 					this.closeOperate();
 					this.resetForm();
 				});