shish 6 år sedan
förälder
incheckning
96cc092bef

+ 15 - 8
admin-update/src/views/my-invite/index.vue

@@ -40,16 +40,17 @@
 				</template>
 				</template>
 
 
 				<template #table-column-name="{scope}">
 				<template #table-column-name="{scope}">
-					<div class="flex-center">
-						<cl-avatar
-							shape="square"
-							:size="40"
-							:src="scope.row.userAvatar | default_avatar"
-						></cl-avatar>
-						<div class="app-margin-left-10">{{ scope.row.name }}</div>
+					<div>
+						{{ scope.row.name }}
 					</div>
 					</div>
 				</template>
 				</template>
 
 
+                <template #table-column-logo="{scope}">
+                    <div>
+                        <el-avatar size="small" :src="scope.row.userAvatar"></el-avatar>
+                    </div>
+                </template>
+
 				<template #table-column-address="{scope}">
 				<template #table-column-address="{scope}">
 					<span>
 					<span>
 						{{
 						{{
@@ -180,7 +181,13 @@ export default {
 							prop: 'name',
 							prop: 'name',
 							label: '花店名称',
 							label: '花店名称',
 							align: 'center',
 							align: 'center',
-							'min-width': 120
+							'min-width': 100
+						},
+						{
+							prop: 'logo',
+							label: '图片',
+							align: 'center',
+							'min-width': 100
 						},
 						},
 						{
 						{
 							prop: 'userName',
 							prop: 'userName',

+ 2 - 10
admin-update/src/views/order/list.vue

@@ -20,7 +20,7 @@
 
 
 			<!-- 单号 -->
 			<!-- 单号 -->
 			<template #table-column-orderSn="{scope}">
 			<template #table-column-orderSn="{scope}">
-                <el type="text">{{ scope.row.orderSn}}</el>
+                <el-link :underline="false" @click="detailShowFn(scope.row)">{{ scope.row.orderSn}}</el-link>
 			</template>
 			</template>
 
 
 			<!-- 订花人 -->
 			<!-- 订花人 -->
@@ -92,9 +92,6 @@
 			<!-- 操作 -->
 			<!-- 操作 -->
 			<!-- 发货 -->
 			<!-- 发货 -->
 			<template #slot-column-option="{scope}">
 			<template #slot-column-option="{scope}">
-                <template>
-                    <el-button type="text" size="small" @click="detailShowFn(scope.row)">详情</el-button>
-                </template>
 				<template v-if="scope.row.status == 0">
 				<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>
 					<el-button type="text" size="small" disabled>发货</el-button>
 					<el-button type="text" size="small" disabled>发货</el-button>
@@ -232,7 +229,7 @@ export default {
 							prop: 'orderSn',
 							prop: 'orderSn',
 							label: '单号',
 							label: '单号',
 							align: 'center',
 							align: 'center',
-							width: '230'
+							width: '280'
 						},
 						},
 						{
 						{
 							prop: 'bookName',
 							prop: 'bookName',
@@ -275,11 +272,6 @@ export default {
 							label: '状态',
 							label: '状态',
 							align: 'center'
 							align: 'center'
 						},
 						},
-                        {
-                            prop: 'reachTime',
-                            label: '配送状态',
-                            align: 'center'
-                        },
 						{
 						{
 							prop: 'reachTime',
 							prop: 'reachTime',
 							label: '送达时间',
 							label: '送达时间',

+ 11 - 12
admin-update/src/views/staff/list.vue

@@ -3,11 +3,10 @@
 		<cl-crud class="liu-crud-wrap" @load="onLoad">
 		<cl-crud class="liu-crud-wrap" @load="onLoad">
 			<template #table-column-nickName="{scope}">
 			<template #table-column-nickName="{scope}">
 				<div class="flex-center">
 				<div class="flex-center">
-					<cl-avatar
-						shape="square"
-						:size="60"
-						:src="scope.row.avatarUrl | default_avatar"
-					></cl-avatar>
+
+
+					<el-avatar src="scope.row.avatarUrl" size="small"></el-avatar>
+
 					<div class="app-margin-left-10">{{ scope.row.nickName }}</div>
 					<div class="app-margin-left-10">{{ scope.row.nickName }}</div>
 				</div>
 				</div>
 			</template>
 			</template>
@@ -369,17 +368,17 @@ export default {
 							align: 'center',
 							align: 'center',
 							width: 60
 							width: 60
 						},
 						},
-						{
-							prop: 'nickName',
-							label: '绑定微信',
-							align: 'center',
-							'min-width': 120
-						},
 						{
 						{
 							prop: 'adminName',
 							prop: 'adminName',
 							label: '姓名',
 							label: '姓名',
 							align: 'center'
 							align: 'center'
 						},
 						},
+						{
+							prop: 'nickName',
+							label: '绑定微信',
+							align: 'center',
+							'min-width': 80
+						},
 						{
 						{
 							prop: 'mobile',
 							prop: 'mobile',
 							label: '手机号',
 							label: '手机号',
@@ -406,7 +405,7 @@ export default {
 							align: 'center',
 							align: 'center',
 							formatter: row => {
 							formatter: row => {
 								if (row.loginTime == '0') {
 								if (row.loginTime == '0') {
-									return '未登录';
+									return '-';
 								}
 								}
 
 
 								return row.lastLoginTime;
 								return row.lastLoginTime;