From ba8ce4451b48b5902a307df075442bf016b5e4ae Mon Sep 17 00:00:00 2001
From: queenwuli <942534046@qq.com>
Date: Mon, 11 Jan 2021 17:06:21 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/jyyforjava/hive-app into master
---
hive-app/pages/workbench/selectCustomer.vue | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/hive-app/pages/workbench/selectCustomer.vue b/hive-app/pages/workbench/selectCustomer.vue
index 36fd0ef..0833c06 100644
--- a/hive-app/pages/workbench/selectCustomer.vue
+++ b/hive-app/pages/workbench/selectCustomer.vue
@@ -7,11 +7,17 @@
:url="'./customerInfo?type='+type+'&id='+item.id"
hover-class="none"
v-for="(item, index) in list">
- <text class="first-name" :style="{background: caculateBgcolor(index)}">{{item.vipName | formatName}}</text>
+ <template>
+ <image v-if="item.photo" src="item.photo" class="avatar"></image>
+ <text v-else class="first-name" :style="{background: caculateBgcolor(index)}">{{item.vipName | formatName}}</text>
+ </template>
<view class="flex-1 flex align-center justify-between member-list-con">
<view class="flex flex-v">
- <text>{{item.vipName}}</text>
- <text class="font-13 gray mt-5">{{$utils.encryptAccount(item.phone)}}</text>
+ <text class="mb-10">
+ <text>{{item.vipName}}</text>
+ <text class="vip-level" v-if="item.vipLevel">{{item.vipLevel}}</text>
+ </text>
+ <text class="font-13 gray">{{$utils.encryptAccount(item.phone)}}</text>
</view>
<view>
<text class="blue">{{item.shopName}}</text>
@@ -95,6 +101,12 @@
font-size: 14px;
padding-left: 4px;
}
+ .avatar{
+ display: inline-block;
+ width: 38px;
+ height: 38px;
+ border-radius: 50%;
+ }
.first-name{
display: inline-block;
width: 38px;
@@ -113,6 +125,14 @@
padding: 15px 0 15px 5px;
border-bottom: 1px solid #EDEAF4;
}
+ .member-list .vip-level{
+ border: 1px solid #666;
+ margin-left: 10px;
+ font-size: 12px;
+ border-radius: 12px;
+ padding: 2px 12px;
+ color: #666666;
+ }
.quick-entry{
position: fixed;
bottom: 80px;
--
Gitblit v1.9.1