From 05fec0816d14f2e7ab303eebb43443b4bc7f78ca Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期一, 15 十一月 2021 18:04:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 PAMapp/pages/recommendConsultant/result.vue |  106 +++++++++++++++++++---------------------------------
 1 files changed, 39 insertions(+), 67 deletions(-)

diff --git a/PAMapp/pages/recommendConsultant/result.vue b/PAMapp/pages/recommendConsultant/result.vue
index 8792bcc..25a5e55 100644
--- a/PAMapp/pages/recommendConsultant/result.vue
+++ b/PAMapp/pages/recommendConsultant/result.vue
@@ -2,16 +2,18 @@
 <div>
     <div class="mdTxt pb-10">��憿批��</div>
     <ul class="pam-rec-agent__list">
-        <li class="pam-rec-agent-card" v-for="(info,index) in pageList" :key="index">
+        <li class="pam-rec-agent-card" v-for="(strictQueryList,index) in pageList" :key="index">
             <div class="pam-rec-agent-card__content">
                 <div class="pam-rec-agent-card__content-header">
                 <div class="pam-rec-agent-card__avatar">
-                    <img :src="info.avatar" class="avatar">
+                    
+                    
+                    <UiAvatar :size="120" :fileName="strictQueryList.img" ></UiAvatar>
                 </div>
                 <div class="pam-rec-agent-card__main-info">
-                    <div class="fz-20 pt-10 rec-desktop-name">{{ info.name }}</div>
-                    <div class="rec-role">{{ info.role }}</div>
-                    <span class="rec-detail">閰喟敦鞈��</span>
+                    <div class="fz-20 pt-10 rec-desktop-name">{{ strictQueryList.name }}</div>
+                    <div class="rec-role">{{ strictQueryList.role }}</div>
+                    <span class="rec-detail"  @click="showAgentDetail(strictQueryList.agentNo)">閰喟敦鞈��</span>
                 </div>
             </div>
             <div class="pam-rec-agent-card__content-body">
@@ -21,20 +23,20 @@
                     撠����
                     </div>
                     <div class="field__content expertieses-container">
-                    <div class="pr-10 pb-10" v-for="(expert, index) in info.expertises" :key="index">
+                    <div class="pr-10 pb-10" v-for="(expert, index) in strictQueryList.expertise" :key="index">
                         #{{ expert }}
                     </div>
                     </div>
                 </div>
                 </el-row>
 
-            <el-row type="flex" class="pam-paragraph">
+                <el-row type="flex" class="pam-paragraph">
                 <el-col :span="12">
                     <div class="field__label">
                     ����風
                     </div>
                     <div class="field__content">
-                    {{ info.seniority }}
+                    {{ strictQueryList.seniority }}
                     </div>
                 </el-col>
                 <el-col :span="12">
@@ -43,7 +45,7 @@
                     </div>
                     <div class="field__content">
                         <i class="icon-star" style="color:#F2C75C"></i>
-                    {{ info.avgScore }}
+                    {{ strictQueryList.avgScore }}
                     </div>
                     </el-col>
                 </el-row>
@@ -58,77 +60,36 @@
                     <el-button class="btn2" type="primary" style="margin-left: 10px" @click="$router.push('/questionnaire')"
                     >�脰����</el-button>
                 </el-row>
+
+                <!-- <AddAndReservedBtns :cusClass=""></AddAndReservedBtns> -->
                 </div>
             </div>
         </li>
     </ul>
+    
     <UiPagination
-            :totalList="recAgentList"
+            :totalList="strictQueryList"
             @changePage="changePage"
+            :pageSize = 6
         ></UiPagination>
 
 </div>
 </template>
 <script lang="ts">
-import {Vue,Component} from 'vue-property-decorator';
+import {Vue,Component, State} from 'nuxt-property-decorator';
+import { AgentOfStrictQuery } from '~/assets/ts/api/consultant';
 
 @Component
 export default class Reslut extends Vue{
+    @State('strictQueryList') strictQueryList!: AgentOfStrictQuery;
 
-    recAgentList =[
-        {
-            avatar:'https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png',
-            name:'�蝢��',
-            role:'隡舀��蝬�鈭�',
-            expertises: ['鞎∪����', '鞈頧宏', '蝭�蝔�', '璅暑��隡�'],
-            seniority:'1撟�2���',
-            avgScore:4.8
-        },
-        {
-            avatar:'https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png',
-            name:'鞈�',
-            role:'擙剝��蝬�鈭�',
-            expertises: ['鞎∪����', '鞈頧宏', '蝭�蝔�', '璅暑��隡�'],
-            seniority:'1撟�2���',
-            avgScore:4.8
-        },
-        {
-            avatar:'https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png',
-            name:'�摰嗅弧',
-            role:'���收靽蝬�鈭�',
-            expertises: ['鞎∪����', '鞈頧宏', '蝭�蝔�', '璅暑��隡�'],
-            seniority:'1撟�2���',
-            avgScore:4.8
-        },
-        {
-            avatar:'https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png',
-            name:'撘萄���',
-            role:'擙剝��蝬�鈭�',
-            expertises: ['鞎∪����', '鞈頧宏', '蝭�蝔�', '璅暑��隡�'],
-            seniority:'1撟�2���',
-            avgScore:4.8
-        },
-        {
-            avatar:'https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png',
-            name:'���戊',
-            role:'���收靽蝬�鈭�',
-            expertises: ['鞎∪����', '鞈頧宏', '蝭�蝔�', '璅暑��隡�'],
-            seniority:'1撟�2���',
-            avgScore:4.8
-        },
-        {
-            avatar:'https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png',
-            name:'�撣亙',
-            role:'擙剝��蝬�鈭�',
-            expertises: ['鞎∪����', '鞈頧宏', '蝭�蝔�', '璅暑��隡�'],
-            seniority:'1撟�2���',
-            avgScore:4.8
-        }
-    ];
     pageList: any[] = [];
 
     changePage(pageList: any[]) {
         this.pageList = pageList;
+    }
+    showAgentDetail(agentNo: string): void {
+        this.$router.push(`/agentInfo/${agentNo}`);
     }
 
 
@@ -144,6 +105,7 @@
     width: 120px;
     height: 47px;
 }
+
 .pam-rec-agent-card {
     margin-bottom: 10px;
     border-radius: 10px;
@@ -160,11 +122,7 @@
             display: flex;
             flex-direction: row;
             margin-right: 20px;
-            .avatar{
-                width: 120px;
-                height: 120px;
-                border-radius:  50%;
-            }
+        
         }
         .pam-rec-agent-card__main-info {
             display: flex;
@@ -181,6 +139,7 @@
                 color:$PRIMARY_RED;
                 font-weight: bold;
                 padding-top: 30px;
+                cursor: pointer;
             }
         }
         }
@@ -202,9 +161,22 @@
 }
 
 @include desktop{
+.btn{
+    width: 90px;
+    height: 43px;
+    margin-left: 29px;
+    margin-right: 0px
+}
+.btn2{
+    width: 90px;
+    height: 43px;
+}
+    .page-container{}
     .pam-rec-agent__list{
         display: flex;
         flex-wrap: wrap;
+        flex-direction:row;
+        width: auto;
     }
     .pam-paragraph{
         margin-top: 10px;
@@ -222,7 +194,7 @@
         margin-left: 10px;
     
     .pam-rec-agent-card__content {
-        width: 190px;
+        width: 170px;
         .pam-rec-agent-card__content-header {
         display: flex;
         .pam-rec-agent-card__avatar {

--
Gitblit v1.8.0