Merge branch 'dev' of git.singsingenglish.com:new-sing/admin into dev

src/components/teacherDetail/customer.vue

@@ -66,7 +66,7 @@
           <template v-if="infoShow == 2">
             <td>{{ index + 1 }}</td>
             <td>{{ customerObj.name }}</td>
-            <td>{{ item.contact_name }}</td>
+            <td style="text-decoration: underline;">{{ item.contact_name }}</td>
             <td>{{ item.contact_phone }}</td>
             <td>{{ item.start_time }}</td>
             <td>{{ (item.duration / 60) % 1 === 0 ? item.duration / 60: (item.duration / 60).toFixed(2) }}min</td>
@@ -110,7 +110,7 @@
           <template v-if="infoShow == 4">
             <td >{{ customerObj.name }}</td>
             <td>{{ item.friend_uid }}</td>
-            <td>{{ item.friend_nickname }}</td>
+            <td  style="text-decoration: underline;"><router-link :to="{path:'/userDetail', query:{userid: item.user_id, teacherid: customerO.id}}" target="_blank">{{ item.friend_nickname }}</router-link></td>
             <td>{{ item.mobile }}</td>
             <td>{{ item.allow_time }}</td>
             <td>{{ item.add_time_long }}min</td>