shish 6 лет назад
Родитель
Сommit
1dcdcd40c6

+ 3 - 3
admin-update/src/views/goods/goods-list.vue

@@ -21,8 +21,8 @@
 			<template #table-column-avatarUrl="{scope}">
 				<cl-avatar
 					shape="square"
-					:size="40"
-					:src="scope.row.smallImgList[0] | default_avatar"
+					:size="32"
+					:src="scope.row.smallImgList[0]"
 					:style="{ margin: 'auto' }"
 				></cl-avatar>
 			</template>
@@ -30,7 +30,7 @@
 			<template #table-column-goodsName="{scope}">
 				<span>{{ scope.row.goodsName }}</span>
 				<!-- <span>二维码</span> -->
-				<span class="short-link" @click="openLinkFn(scope.row)">链接</span>
+				<!--<span class="short-link" @click="openLinkFn(scope.row)">链接</span> -->
 			</template>
 
 			<template #table-column-inTurn="{scope}">

+ 34 - 25
admin-update/src/views/member/list.vue

@@ -19,22 +19,28 @@
 
 			<template #table-column-avatarUrl="{scope}">
 				<cl-avatar
-					:size="30"
+					:size="25"
 					:src="scope.row.smallAvatarUrl | default_avatar"
 					:style="{ margin: 'auto' }"
 				></cl-avatar>
+
 			</template>
 
 			<template #table-column-id="{scope}">
-				<span @click="detailShowFn(scope.row)">{{ scope.row.id }}</span>
+				<span >{{ scope.row.id }}</span>
+			</template>
+
+			<template #table-column-mobile="{scope}">
+				<span v-if="scope.row.mobile != ''">{{ scope.row.mobile }}</span>
+				<span v-else>-</span>
 			</template>
 
 			<template #table-column-userName="{scope}">
-				<div class="user-name-warp">
-					<i v-if="scope.row.source == 0" class="iconfont iconweixinlaiyuan"></i>
-					<i v-if="scope.row.source == 1" class="iconfont iconzhifubao"></i>
-					<span>{{ scope.row.userName }}</span>
-				</div>
+
+
+					<el-link :underline="false" @click="detailShowFn(scope.row)" style="font-size:12px;">{{ scope.row.userName}}</el-link>
+
+
 			</template>
 
 			<template #table-column-balance="{scope}">
@@ -48,18 +54,18 @@
 			<template #table-column-subscribe="{scope}">
 				<div class="store-icon">
 					<i
-						class="el-icon-check"
+						class="el-icon-success"
 						v-if="scope.row.subscribe == 1"
-						style="color:#FEE470"
+						style="color:#67C23A"
 					></i>
-					<i class="el-icon-close" v-else style="color: #999"></i>
+					<i class="el-icon-success" v-else style="color:#C0C4CC"></i>
 				</div>
 			</template>
 
 			<template #table-column-store="{scope}">
 				<div class="store-icon">
-					<i class="el-icon-check" v-if="scope.row.store == 1" style="color:#FEE470"></i>
-					<i class="el-icon-close" v-else style="color: #999"></i>
+					<i class="el-icon-s-shop" v-if="scope.row.store == 1" style="color:#67C23A"></i>
+					<i class="el-icon-s-shop" v-else style="color:#C0C4CC"></i>
 				</div>
 			</template>
 
@@ -310,12 +316,14 @@ export default {
 						{
 							prop: 'id',
 							label: 'ID',
-							align: 'center'
+							align: 'center',
+							width: 100
 						},
 						{
 							prop: 'avatarUrl',
 							label: '头像',
-							align: 'center'
+							align: 'center',
+							width: 80
 						},
 						{
 							prop: 'userName',
@@ -325,7 +333,14 @@ export default {
 						{
 							prop: 'mobile',
 							label: '手机号',
-							align: 'center'
+							align: 'center',
+							width: 120
+						},
+						{
+							prop: 'store',
+							label: '到店',
+							align: 'center',
+							width: 100
 						},
 						{
 							prop: 'actPrice',
@@ -334,13 +349,13 @@ export default {
 							emptyText: '无'
 						},
 						{
-							prop: 'balance',
-							label: '余额',
+							prop: 'growth',
+							label: '成长值',
 							align: 'center'
 						},
 						{
-							prop: 'growth',
-							label: '成长值',
+							prop: 'balance',
+							label: '余额',
 							align: 'center'
 						},
 						{
@@ -350,12 +365,6 @@ export default {
 							sortable: false,
 							width: 150
 						},
-						{
-							prop: 'store',
-							label: '到店',
-							align: 'center',
-							width: 150
-						},
 						{
 							prop: 'visitTimeFormat',
 							label: '最近访问',

+ 31 - 18
admin-update/src/views/order/list.vue

@@ -20,7 +20,7 @@
 
 			<!-- 单号 -->
 			<template #table-column-orderSn="{scope}">
-                <el-link :underline="false" @click="detailShowFn(scope.row)">{{ scope.row.orderSn}}</el-link>
+                <el-link :underline="false" @click="detailShowFn(scope.row)" style="font-size:12px;">{{ scope.row.orderSn}}</el-link>
 			</template>
 
 			<!-- 订花人 -->
@@ -28,28 +28,29 @@
 				<div class="book-wrap">
 					<cl-avatar
 						shape="circle"
-						:size="22"
-						:src="scope.row.bookAvatar | default_avatar"
+						:size="20"
+						:src="scope.row.bookAvatar"
 					></cl-avatar>
 					<div>{{ scope.row.bookName }}</div>
-					<div>{{ scope.row.bookMobile }}</div>
 				</div>
 			</template>
 
+			<!-- 订花人手机号 -->
+			<template #table-column-bookMobile="{scope}">
+					<div v-if="scope.row.bookMobile == ''">-</div>
+					<div v-else>{{ scope.row.bookMobile }}</div>
+			</template>
+
 			<!-- 收花人 -->
 			<template #table-column-receiveUserName="{scope}">
-				<div class="book-wrap">
-					<div>{{ scope.row.receiveUserName }}</div>
-					<div>{{ scope.row.receiveMobile }}</div>
-				</div>
+					<div v-if="scope.row.receiveUserName == ''">-</div>
+					<div v-else>{{ scope.row.receiveUserName }}</div>
 			</template>
 
-			<!-- 通知送达 -->
-			<template #table-column-receiveUserName="{scope}">
-				<div class="book-wrap">
-					<div>{{ scope.row.receiveUserName }}</div>
-					<div>{{ scope.row.receiveMobile }}</div>
-				</div>
+			<!-- 收花人电话 -->
+			<template #table-column-receiveMobile="{scope}">
+                <div v-if="scope.row.receiveMobile == ''">-</div>
+                <div v-else>{{ scope.row.receiveMobile }}</div>
 			</template>
 
 			<!-- 状态 -->
@@ -229,19 +230,31 @@ export default {
 							prop: 'orderSn',
 							label: '单号',
 							align: 'center',
-							width: '280'
+							width: '240'
 						},
 						{
 							prop: 'bookName',
 							label: '订花人',
 							align: 'center',
-							width: '220'
+							width: '120'
 						},
+                        {
+                            prop: 'bookMobile',
+                            label: '手机号',
+                            align: 'center',
+                            width: '110'
+                        },
 						{
 							prop: 'receiveUserName',
 							label: '收花人',
 							align: 'center',
-							width: '140'
+							width: '100'
+						},
+						{
+							prop: 'receiveMobile',
+							label: '手机号',
+							align: 'center',
+							width: '110'
 						},
 						{
 							prop: 'prePrice',
@@ -279,7 +292,7 @@ export default {
 						},
                         {
                             prop: 'reachTime',
-                            label: '通知',
+                            label: '通知送到',
                             align: 'center'
                         },
 					],