From a643bae3e3ad11f5496d6071a40076859a5de71d Mon Sep 17 00:00:00 2001
From: zhaorulin <zhaorulin@singsingenglish.com>
Date: Thu, 12 Sep 2019 18:26:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=8A=E6=97=A5=E5=AE=9E=E6=97=B6=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=20=E6=9B=B4=E6=96=B0=20=EF=BC=88=E6=9C=89=E6=95=88?=
 =?UTF-8?q?=E6=B2=9F=E9=80=9A=E3=80=81=E6=80=BB=E5=A5=BD=E5=8F=8B=E3=80=81?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A5=BD=E5=8F=8B=EF=BC=89=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=98=B5=E7=A7=B0=E9=93=BE=E6=8E=A5=E9=93=BE=E6=8E=A5=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=B8=BAfriend=5Fuid=EF=BC=8C=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=20=E6=9B=B4=E6=96=B0=E4=B8=BA=20=E6=9C=80?=
 =?UTF-8?q?=E5=90=8E=E7=99=BB=E5=BD=95=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/teacherDetail/customer.vue | 32 ++++++++++++++++++++---
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/components/teacherDetail/customer.vue b/src/components/teacherDetail/customer.vue
index d1afa354..84208120 100644
--- a/src/components/teacherDetail/customer.vue
+++ b/src/components/teacherDetail/customer.vue
@@ -85,7 +85,15 @@
             <td>{{ index + 1 }}</td>
             <td>{{ customerObj.name }}</td>
             <td>{{ item.friend_uid }}</td>
-            <td><router-link :to="{path:'/user', query:{type: 'detail',userid: item.user_id, teacherid: customerO.id}}" target="_blank">{{ item.nick }}</router-link></td>
+            <!--<td><router-link :to="{path:'/user', query:{type: 'detail',userid: item.user_id, teacherid: customerO.id}}" target="_blank">{{ item.nick }}</router-link></td>-->
+            <td>
+              <span v-if="item.friend_uid" class="cell-link">
+                <router-link :to="{path:'/user', query:{type: 'detail',userid: item.friend_uid, teacherid: customerO.id}}" target="_blank">
+                  {{ item.nick }}
+                </router-link>
+              </span>
+              <template v-else>{{item.nick || '-'}}</template>
+            </td>
             <td>{{ item.chat_count }}</td>
             <td>{{ item.visit_desc }}</td>
             <td>{{ item.next_visit_at }}</td>
@@ -100,7 +108,15 @@
             <td >
               <img style="width: 40px; height: 40px;" :src="item.headimg" alt="">
             </td>
-            <td><router-link :to="{path:'/user', query:{type: 'detail',userid: item.user_id, teacherid: customerO.id}}" target="_blank">{{ item.nick }}</router-link></td>
+            <!--<td><router-link :to="{path:'/user', query:{type: 'detail',userid: item.user_id, teacherid: customerO.id}}" target="_blank">{{ item.nick }}</router-link></td>-->
+            <td>
+              <span v-if="item.friend_uid" class="cell-link">
+                <router-link :to="{path:'/user', query:{type: 'detail',userid: item.friend_uid, teacherid: customerO.id}}" target="_blank">
+                  {{ item.nick }}
+                </router-link>
+              </span>
+              <template v-else>{{item.nick || '-'}}</template>
+            </td>
             <td>{{ item.friend_uid }}</td>
             <td>{{ item.mobile }}</td>
             <td>{{ item.create_time }}</td>
@@ -113,7 +129,14 @@
           <template v-if="infoShow == 4">
             <td >{{ customerObj.name }}</td>
             <td>{{ item.friend_uid }}</td>
-            <td  style="text-decoration: underline;"><router-link :to="{path:'/user', query:{type: 'detail',userid: item.user_id, teacherid: customerO.id}}" target="_blank">{{ item.friend_nickname }}</router-link></td>
+            <td>
+              <span v-if="item.friend_uid" class="cell-link">
+                <router-link :to="{path:'/user', query:{type: 'detail',userid: item.friend_uid, teacherid: customerO.id}}" target="_blank">
+                  {{ item.friend_nickname }}
+                </router-link>
+              </span>
+              <template v-else>{{item.friend_nickname || '-'}}</template>
+            </td>
             <td>{{ item.mobile }}</td>
             <td>{{ item.allow_time }}</td>
             <td>{{ item.add_time_long }}min</td>
@@ -479,7 +502,8 @@
             this.phoneRecordList.pageData = res.chat_friend_list.page_data
             this.total = res.chat_friend_list.total
           }else if(infoShow === 3){
-            this.phoneRecordList.headerTh = ['用户头像', '用户昵称', 'UID', '电话号码', '添加时间', '用户属性', '意向度', '最后沟通', '下次回访']
+            // this.phoneRecordList.headerTh = ['用户头像', '用户昵称', 'UID', '电话号码', '添加时间', '用户属性', '意向度', '最后沟通', '下次回访']
+            this.phoneRecordList.headerTh = ['用户头像', '用户昵称', 'UID', '电话号码', '添加时间', '最后一次登录时间', '意向度', '最后沟通', '下次回访']
             this.phoneRecordList.pageData = res.friend_list
             this.total = res.friend_total
           }else if(infoShow === 4) {
-- 
2.21.0