From a0cfdaa4a39009953a365aef0f09c944ed4b403a Mon Sep 17 00:00:00 2001
From: XiaoMo <a1300399510@qq.com>
Date: Tue, 4 Apr 2023 11:40:10 +0800
Subject: [PATCH] =?UTF-8?q?a1300399510@qq.com=20=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E4=BA=8E=202023/04/04=20-11:40:01?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/detail/detailIndex.vue | 42 +++++++++++++++++---------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/views/detail/detailIndex.vue b/src/views/detail/detailIndex.vue
index f36d72d..47f6106 100755
--- a/src/views/detail/detailIndex.vue
+++ b/src/views/detail/detailIndex.vue
@@ -98,33 +98,34 @@
             <!-- offer -->
             <div class="card-item shadow" v-if="type == 6">
                 <div class="card-head flexacenter">
-                    <img class="card-head-icon"
-                        src="https://axure-file.lanhuapp.com/md516b251fb-9cfa-46fc-a9b6-2a41a7b4dc37__3ad73406ff4bc8b138dafc6dcbf1a635.svg" />
+                    <img class="card-head-icon" :src="info.avatar" />
                     <div class="card-head-content flex1 flexflex">
-                        <div class="card-head-name flexflex">闫旭Mike</div>
+                        <div class="card-head-name flexflex">{{ info.author }}</div>
                         <div class="card-head-time">2022-7-6 14:56</div>
                     </div>
                     <div class="card-head-fool">楼主</div>
                 </div>
                 <div class="offer-content">
                     <div class="offer-content-box">
+                        <template v-for="(item, index) in offerinfoKey">
+                            <div class="offer-content-item flexacenter" :key="index" v-if="offerinfo[item.key]">
+                                <div class="offer-content-key" v-if="offerinfo[item.key]">{{ item.name }}</div>
+                                <div class="offer-content-value">{{ offerinfo[item.key] }}</div>
+                            </div>
+                        </template>
 
-                        <div class="offer-content-item flexacenter" v-for="(item, index) in offerinfoKey" :key="index">
-                            <div class="offer-content-key">{{ item.name }}</div>
-                            <div class="offer-content-value">{{ offerinfo[item.key] }}</div>
-                        </div>
                         <!-- <div class="offer-content-item flexacenter" v-for="item in 7" :key="item">
                             <div class="offer-content-key">申请专业</div>
                             <div class="offer-content-value">韦仕敦大学</div>
                         </div> -->
                     </div>
 
-                    <div class="examine-btn flexcenter">
+                    <a class="examine-btn flexcenter" target="_blank" :href="shareurl">
                         查看当前捷报详情
                         <div class="examine-btn-outside flexcenter">
                             <svg-icon icon-class="arrowsRoundBlackLeft" class-name="examine-btn-icon"></svg-icon>
                         </div>
-                    </div>
+                    </a>
                 </div>
             </div>
             <!-- offer结束 -->
@@ -283,7 +284,7 @@ export default {
             token: "",
             offerinfo: {}, // offer捷报详情
             offerinfoKey: [{
-                key: "school.name",
+                key: "schoolName",
                 name: "申请学校"
             }, {
                 key: "degree",
@@ -291,6 +292,9 @@ export default {
             }, {
                 key: "professional",
                 name: "专业"
+            }, {
+                key: "project",
+                name: "项目"
             }, {
                 key: "apply_results",
                 name: "申请结果"
@@ -303,7 +307,8 @@ export default {
             }, {
                 key: "useperformanceStr",
                 name: "使用成绩"
-            }]
+            }],
+            shareurl: "", // 分享链接
 
 
         };
@@ -344,19 +349,18 @@ export default {
                 let offerinfo = data.offerinfo
                 console.log("offerinfo", offerinfo);
                 let useperformanceStr = ""
-                // offerinfo['useperformanceStr'] = ""
-                offerinfo.useperformance.forEach((el, index) => {
-                    console.log(el, index);
+
+                offerinfo.useperformance && offerinfo.useperformance.forEach((el, index) => {
+                    useperformanceStr += el + (offerinfo.useperformance.length - 1 == index ? '' : '、')
                 })
 
-                // offerinfo['useperformanceStr'] = JSON.stringify(offerinfo.useperformance).replace(/\[|\]|,/g, function (matched) {
-                //     if (matched === '[' || matched === ']') return ''
-                //     else return '、';
-                // });
+                offerinfo['useperformanceStr'] = useperformanceStr
+
+                offerinfo['schoolName'] = offerinfo.school.name
 
-                console.log(offerinfo['useperformanceStr']);
 
                 this.offerinfo = offerinfo
+                this.shareurl = data.shareurl
             })
         },