From 1c0feaa153455f0dcf8fb9484d2adc3a2c49c52a Mon Sep 17 00:00:00 2001
From: A1300399510 <A1300399510>
Date: Thu, 13 Feb 2025 19:04:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E6=A0=A1=E8=AF=A6=E6=83=85=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E7=BB=BC=E5=90=88=E6=8E=92=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/projectDetails/projectDetails.js           |  6 +++---
 pages/projectDetails/projectDetails.wxml         |  6 ++++--
 pages/projectList/projectList.js                 | 16 +++++++++++++---
 .../projectSchoolHomepage.js                     | 11 +++++++++++
 .../projectSchoolHomepage.wxml                   |  8 ++------
 project.private.config.json                      | 14 ++++++++++++++
 6 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/pages/projectDetails/projectDetails.js b/pages/projectDetails/projectDetails.js
index b0e7014..cb803df 100644
--- a/pages/projectDetails/projectDetails.js
+++ b/pages/projectDetails/projectDetails.js
@@ -184,7 +184,7 @@ Page({
 
                 const info = data.info || {}
 
-                const fields = ['tuition_fee',];
+                const fields = ['tuition_fee', ];
                 fields.forEach(field => {
                     const textKey = `${field}_text`;
                     info[textKey] = common.formatNumberWithSpaces(info[field] || '');
@@ -496,7 +496,7 @@ Page({
             informationState: false
         })
     },
-  
+
     // 点击 跳转 公共方法
     goPage(e) {
         const url = e.currentTarget.dataset.url
@@ -711,7 +711,7 @@ Page({
         item['system'] = encodeURIComponent(item['system'])
         item['subject'] = encodeURIComponent(item['subject'])
         wx.navigateTo({
-            url: `/pages/projectList/projectList?year=${ item.year }&system=${item.system}&subject=${item.subject}`,
+            url: `/pages/projectList/projectList?type=subject&year=${ item.year }&system=${item.system}&subject=${item.subject}`,
         })
     },
 })
\ No newline at end of file
diff --git a/pages/projectDetails/projectDetails.wxml b/pages/projectDetails/projectDetails.wxml
index 49b0edf..397dd5d 100644
--- a/pages/projectDetails/projectDetails.wxml
+++ b/pages/projectDetails/projectDetails.wxml
@@ -78,8 +78,10 @@
     <view style="height: 100%" class="details-box flex1" scroll-y="{{ true }}" scroll-with-animation="{{ scrollAnimation }}">
         <!-- 招生官 -->
         <view class="side-item" data-type="pivotal">
-            <image wx:if="{{ urls.length != 0 && answerType == 0 }}" class="quick-answer" src="https://app.gter.net/image/miniApp/offer/quick-answer.png" mode="widthFix" bind:tap="cutQuickAnswer"></image>
-            <view class="borderTop"></view>
+            <block wx:if="{{ urls.length != 0 && answerType == 0 }}">
+                <image class="quick-answer" src="https://app.gter.net/image/miniApp/offer/quick-answer.png" mode="widthFix" bind:tap="cutQuickAnswer"></image>
+                <view class="borderTop"></view>
+            </block>
 
             <view class="semester-box flexacenter ">
                 <view class="text gray {{ info.semesterState ? 'semester' : '' }}">{{ info.semester.text || '' }}</view>
diff --git a/pages/projectList/projectList.js b/pages/projectList/projectList.js
index ae4de3d..3f1da62 100644
--- a/pages/projectList/projectList.js
+++ b/pages/projectList/projectList.js
@@ -68,7 +68,7 @@ Page({
                     universityArr,
                 })
 
-                if (JSON.stringify(options) != "{}") {
+                if (options.type == 'subject') {
                     let discipline = this.data.discipline || {}
                     discipline["yearKey"] = options.year + ""
                     discipline["organizationKey"] = this.decodeKey(options.system)
@@ -79,6 +79,16 @@ Page({
                     })
                 }
 
+                if (options.type == 'school') {
+                    let comprehensive = this.data.comprehensive
+                    comprehensive["yearKey"] = options.year + ""
+                    comprehensive['organizationKey'] = this.decodeKey(options.mechanism)
+                    this.setData({
+                        classify: "school",
+                        comprehensive,
+                    })
+                }
+
                 this.getRankings()
             })
         })
@@ -205,12 +215,12 @@ Page({
             let comprehensiveTarget = this.data.comprehensive
             let organizationSet = [...this.objectOne(comprehensive)]
             comprehensiveTarget['organization'] = organizationSet
-            comprehensiveTarget['organizationKey'] = organizationSet[0]
+            if (!comprehensiveTarget['organizationKey']) comprehensiveTarget['organizationKey'] = organizationSet[0]
 
             let yearsSet = [...this.collectYears(comprehensive)]
             yearsSet.sort((a, b) => b - a);
 
-            comprehensiveTarget['yearKey'] = yearsSet[0]
+            if (!comprehensiveTarget['yearKey']) comprehensiveTarget['yearKey'] = yearsSet[0]
             comprehensiveTarget['obj'] = comprehensive
 
             this.checkComprehensiveYear()
diff --git a/pages/projectSchoolHomepage/projectSchoolHomepage.js b/pages/projectSchoolHomepage/projectSchoolHomepage.js
index 3e7b263..657bceb 100644
--- a/pages/projectSchoolHomepage/projectSchoolHomepage.js
+++ b/pages/projectSchoolHomepage/projectSchoolHomepage.js
@@ -649,4 +649,15 @@ Page({
             title: "【寄托港校项目库】- " + this.data.info.name,
         }
     },
+
+    // 跳转专业排名
+    goProjectList(e) {
+        const rankings = this.data.info.ranks || []
+        const index = e.currentTarget.dataset.index
+        let item = rankings[index]
+        item['mechanism'] = encodeURIComponent(item['mechanism'])
+        wx.navigateTo({
+            url: `/pages/projectList/projectList?type=school&year=${ item.year }&mechanism=${item.mechanism}`,
+        })
+    },
 })
\ No newline at end of file
diff --git a/pages/projectSchoolHomepage/projectSchoolHomepage.wxml b/pages/projectSchoolHomepage/projectSchoolHomepage.wxml
index 798d953..5efab06 100644
--- a/pages/projectSchoolHomepage/projectSchoolHomepage.wxml
+++ b/pages/projectSchoolHomepage/projectSchoolHomepage.wxml
@@ -9,14 +9,14 @@
             <view class="right flex1 flexflex">
                 <view class="name">{{ info.name }}</view>
                 <view class="english">{{ info.enname }}</view>
-                <view wx:if="{{ info.ranks.length != 0 }}" class="world" bind:tap="goPage" data-url="/pages/projectList/projectList">
+                <view wx:if="{{ info.ranks.length != 0 }}" class="world" >
                     <view class="head flexcenter">
                         <view class="icon flexcenter">
                             <image class="img" src="https://app.gter.net/image/miniApp/offer/world-ranking-icon.png" mode="widthFix"></image>
                         </view>
                     </view>
                     <view class="list flexacenter">
-                        <view class="item" wx:for="{{ info.ranks }}" wx:key="index">
+                        <view class="item" wx:for="{{ info.ranks }}" wx:key="index" bind:tap="goProjectList" data-index="{{ index }}">
                             <view class="quantity">{{ item.ranktext }}</view>
                             <view class="ranking-name">
                                 {{ item.mechanism }}
@@ -28,10 +28,6 @@
                         </view>
                     </view>
                 </view>
-                <!-- <view wx:else class="ranking-box flexacenter">
-                        QS世界综合排名 [2024]
-                        <view class="sum">16</view>
-                    </view> -->
             </view>
         </view>
         <rich-text id="rich-text" class="brief" nodes="{{ info.message }}"></rich-text>
diff --git a/project.private.config.json b/project.private.config.json
index 509f550..fb85605 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -8,6 +8,20 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/projectList/projectList",
+          "pathName": "pages/projectList/projectList",
+          "query": "type=school&year=2024&mechanism=QS",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/projectSchoolHomepage/projectSchoolHomepage",
+          "pathName": "pages/projectSchoolHomepage/projectSchoolHomepage",
+          "query": "id=312",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "pages/projectDetails/projectDetails",
           "pathName": "pages/projectDetails/projectDetails",