From 40f16ff7071c793bc02cf3f8ca8c0aa60aa85e21 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 19 七月 2024 09:05:03 +0800
Subject: [PATCH] 提交
---
admin/src/views/business/customer.vue | 16 +++++++++-------
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 2 --
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/admin/src/views/business/customer.vue b/admin/src/views/business/customer.vue
index f80b7bc..92bb989 100644
--- a/admin/src/views/business/customer.vue
+++ b/admin/src/views/business/customer.vue
@@ -40,18 +40,20 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="120px"></el-table-column>
- <el-table-column prop="name" label="濮撳悕" min-width="100px"></el-table-column>
- <el-table-column prop="phone" label="鐢佃瘽" min-width="100px"></el-table-column>
+ <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" fixed min-width="140px"></el-table-column>
+ <el-table-column prop="name" label="濮撳悕" fixed min-width="100px"></el-table-column>
+ <el-table-column prop="phone" label="鐢佃瘽" fixed min-width="100px"></el-table-column>
+ <el-table-column prop="proName" label="鐪佷唤" min-width="180px">
+ <template slot-scope="{row}">
+ {{row.proName||''}}{{row.cityName||''}}{{row.areaName||''}}
+ </template>
+ </el-table-column>
<el-table-column prop="addr" label="鍦板潃" min-width="100px"></el-table-column>
<el-table-column prop="ip" label="IP鍦板潃" min-width="100px"></el-table-column>
- <el-table-column prop="proName" label="鐪佷唤" min-width="100px"></el-table-column>
- <el-table-column prop="cityName" label="鍩庡競" min-width="100px"></el-table-column>
- <el-table-column prop="areaName" label="鍖哄煙" min-width="100px"></el-table-column>
<el-table-column prop="sysVersion" label="绯荤粺鐗堟湰" min-width="100px"></el-table-column>
<el-table-column prop="browser" label="娴忚鍣�" min-width="100px"></el-table-column>
<el-table-column prop="terminal" label="缁堢绫诲瀷" min-width="100px"></el-table-column>
- <el-table-column prop="openid" label="寰俊openid" min-width="100px"></el-table-column>
+ <el-table-column prop="openid" label="寰俊openid" min-width="240px"></el-table-column>
<el-table-column prop="info" label="澶囨敞" min-width="100px"></el-table-column>
<!-- <el-table-column
v-if="containPermissions(['business:customer:update', 'business:customer:delete'])"
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 37739e1..3c3b69d 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -445,8 +445,6 @@
return ztUserGetTokenResponse;
}
-
-
@Override
public Member getMemberInfo(Long memberId){
Member member = memberMapper.selectById(memberId);
--
Gitblit v1.9.3