From 97378986e4b4cedc75a167c3bc8a49b7c19aaf33 Mon Sep 17 00:00:00 2001
From: pengda <10266652509@qq.com>
Date: Thu, 29 May 2025 17:04:03 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=9C=88=E6=8E=92=E8=A1=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/super/Ranking/RankDetail.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/super/Ranking/RankDetail.vue b/src/views/super/Ranking/RankDetail.vue
index 3403434..18afe45 100644
--- a/src/views/super/Ranking/RankDetail.vue
+++ b/src/views/super/Ranking/RankDetail.vue
@@ -422,6 +422,10 @@ export default {
                 return true;
             }
 
+            if(!obj && this.type == 'month'){
+                obj = {sort_by: 1, sort_order: 1}
+            }
+
             this.getRankingDetail(obj)
         },
         getRankingDetail(obj) {

From 24da72aff059ba17788238b5ef44456ff107e63d Mon Sep 17 00:00:00 2001
From: pengda <1111@qq.com>
Date: Fri, 13 Jun 2025 16:30:08 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=9C=AA=E8=AE=A1=E6=88=90=E6=9C=AC?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/super/Ranking/RankList.vue | 51 +++++++++++++++++++++++-------------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/src/views/super/Ranking/RankList.vue b/src/views/super/Ranking/RankList.vue
index 7a55435..2085473 100644
--- a/src/views/super/Ranking/RankList.vue
+++ b/src/views/super/Ranking/RankList.vue
@@ -13,24 +13,18 @@
             </CustomDropdown>
         </div>
 
-        <div v-if="dataRank == 1" style="margin-bottom: 20px;text-align: left">
-            <el-alert type="info" :closable="false" show-icon>
-                <template #title>
-                    未计成本
-                </template>
-                <div style="margin-top: 8px; line-height: 1.6; font-size: 14px; color: #606266;">
-                    <template v-if="dataType == 'ver_type'">
-                        1. AI（服务器成本）<span v-if="view == 'year'" style="color:red;">2025年（含）后计入成本</span><br />
-                        2. Turnitin <span v-if="view == 'year'" style="color:red;">2025年（含）后计入成本</span><br />
-                        3. 学术（知网PMLC，硕博VIP）<span v-if="view == 'year'" style="color:red;">2025年（含）后计入成本</span><br />
-                    </template>
-                    <template v-if="dataType == 'check_type'">
-                        1. AI（服务器成本）<br />
-                        2. Turnitin国际版、TurnitinUK版、Turnitin国际版+AI<br />
-                        3. 知网PMLC，硕博VIP <span v-if="view == 'year'" style="color:red;">2025年（含）后计入成本</span><br />
-                    </template>
-                </div>
-            </el-alert>
+        <div v-if="dataRank == 1 && (dataType == 'ver_type' || dataType == 'check_type')" style="margin-bottom: 20px;text-align: left" class="beforeNotice">
+            <p class="noticeTop flex"><img src="@/assets/site/siteSemInfo_Icon.svg" alt=""> 未计成本</p>
+            <div v-if="dataType == 'ver_type'" class="noticeBot column">
+                <p>1. AI（服务器成本）<span v-if="view == 'year'" style="color:red;">2025年（含）后计入成本</span></p>
+                <p>2. Turnitin <span v-if="view == 'year'" style="color:red;">2025年（含）后计入成本</span></p>
+                <p>3. 学术（知网PMLC，硕博VIP）<span v-if="view == 'year'" style="color:red;">2025年（含）后计入成本</span></p>
+            </div>
+            <div v-if="dataType == 'check_type'" class="noticeBot column">
+                <p>1. AI（服务器成本）</p>
+                <p>2. Turnitin国际版、TurnitinUK版、Turnitin国际版+AI</p>
+                <p>3. 知网PMLC，硕博VIP <span v-if="view == 'year'" style="color:red;">2025年（含）后计入成本</span></p>
+            </div>
         </div>
 
         <div class=" flex-common">
@@ -667,4 +661,25 @@ export default {
     }
   }
 }
+
+.beforeNotice {
+  margin-top: 12px;
+  border-radius: 4px;
+  background: #F2F7FF;
+  border: 1px solid #BFDAFF;
+  padding: 20px 14px;
+  color: #1E2226;
+  letter-spacing: 0.08em;
+
+  .noticeTop {
+    gap: 8px;
+    margin-bottom: 12px;
+
+  }
+
+  .noticeBot {
+    gap: 10px;
+  }
+
+}
 </style>
\ No newline at end of file

From 1c3ef1abf5d6cac6b6c806ef2f7f129ce3747023 Mon Sep 17 00:00:00 2001
From: pengda <1111@qq.com>
Date: Fri, 13 Jun 2025 16:45:59 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=AF=9B=E5=88=A9=E5=8D=A0=E6=AF=94?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E7=99=BE=E5=88=86=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/super/Ranking/RankList.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/super/Ranking/RankList.vue b/src/views/super/Ranking/RankList.vue
index 2085473..dac8d64 100644
--- a/src/views/super/Ranking/RankList.vue
+++ b/src/views/super/Ranking/RankList.vue
@@ -64,7 +64,11 @@
 
                     <el-table-column v-else prop="name" :label="type_desc[dataType]"></el-table-column>
 
-                    <el-table-column prop="rate" label="毛利占比" v-if="dataRank == 1 && dataType == 'check_type'"></el-table-column>
+                    <el-table-column prop="rate" label="毛利占比" v-if="dataRank == 1 && dataType == 'check_type'">
+                        <template slot-scope="scope">
+                                {{ scope.row.rate }} %
+                        </template>
+                    </el-table-column>
 
                     <el-table-column prop="1" :label="rank_type_desc[dataRank]" sortable="custom">
                         <template v-slot="{ row, $index }">

From ed306f4da5be81b735e69f179c785125c74ca049 Mon Sep 17 00:00:00 2001
From: pengda <1111@qq.com>
Date: Fri, 13 Jun 2025 17:03:17 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=94=B6=E5=85=A5?=
 =?UTF-8?q?=E5=92=8C=E6=88=90=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/super/Ranking/RankList.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/super/Ranking/RankList.vue b/src/views/super/Ranking/RankList.vue
index dac8d64..7728d75 100644
--- a/src/views/super/Ranking/RankList.vue
+++ b/src/views/super/Ranking/RankList.vue
@@ -70,6 +70,9 @@
                         </template>
                     </el-table-column>
 
+                    <el-table-column v-if="dataRank == 1" prop="value_3" label="收入"></el-table-column>
+                    <el-table-column v-if="dataRank == 1" prop="value_4" label="成本"></el-table-column>
+
                     <el-table-column prop="1" :label="rank_type_desc[dataRank]" sortable="custom">
                         <template v-slot="{ row, $index }">
                             <template v-if="dataRank == 3">

From 3cc4fcabaadb0524c3f7b5a86441b4e8d69ffe2a Mon Sep 17 00:00:00 2001
From: pengda <1111@qq.com>
Date: Fri, 13 Jun 2025 18:59:34 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BB=A3=E7=90=86=E5=95=86=E6=8E=92?=
 =?UTF-8?q?=E8=A1=8C=E5=B1=95=E7=A4=BA=E6=9F=A5=E7=9C=8B=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E6=8E=92=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/super/Ranking/RankList.vue | 65 +++++++++++++++++++++++++++++++++---
 1 file changed, 60 insertions(+), 5 deletions(-)

diff --git a/src/views/super/Ranking/RankList.vue b/src/views/super/Ranking/RankList.vue
index 7728d75..44d2879 100644
--- a/src/views/super/Ranking/RankList.vue
+++ b/src/views/super/Ranking/RankList.vue
@@ -70,8 +70,8 @@
                         </template>
                     </el-table-column>
 
-                    <el-table-column v-if="dataRank == 1" prop="value_3" label="收入"></el-table-column>
-                    <el-table-column v-if="dataRank == 1" prop="value_4" label="成本"></el-table-column>
+                    <el-table-column v-if="dataRank == 1 && dataType == 'check_type'" prop="value_3" label="收入"></el-table-column>
+                    <el-table-column v-if="dataRank == 1 && dataType == 'check_type'" prop="value_4" label="成本"></el-table-column>
 
                     <el-table-column prop="1" :label="rank_type_desc[dataRank]" sortable="custom">
                         <template v-slot="{ row, $index }">
@@ -90,20 +90,27 @@
                                         <div class="flex-between flex pop-top">
                                             <h3>
                                                 {{ text }} {{ row.name }} {{ rank_type_desc[dataRank] }}
-                                                <span @click="goLookMoreData(row.id)">查看更多</span>
+                                                <span @click="goLookAgentMoreRank(row.id)">查看更多</span>
                                             </h3>
                                             <span class="flex point" @click="closePop(row,'id')">
                                                 关闭<img src="@/assets/register/close.svg">
                                             </span>
                                         </div>
                                         <el-table :data="tableData1" style="width: 100%">
-                                            <el-table-column prop="value_1" width="208" label="日期"></el-table-column>
-                                            <el-table-column prop="value_2" width="208" :label="rank_type_desc[dataRank]"></el-table-column>
+                                            <el-table-column prop="name" width="208" label="服务名称"></el-table-column>
+                                            <el-table-column prop="rate" width="208" label="毛利占比"></el-table-column>
+                                            <el-table-column prop="value_1" width="208" label="毛利润"></el-table-column>
+                                            <el-table-column prop="value_2" width="208" label="订单数"></el-table-column>
                                         </el-table>
                                     </div>
 
                                     <div class="flex" slot="reference">
                                         {{ row.value_1 }}
+                                        <!--代理商利润排行 展示查看代理商产品排行-->
+                                        <HoverImage v-if="row.value_1 != 0 && dataRank == 1 && dataType == 'agent' && show_detail_index == row.sort"
+                                                    @click="handleClick3(row, $index, 'id')"
+                                                    :normal="require('@/assets/super/list-detail.svg')"
+                                                    :hover="require('@/assets/super/list-detail-hover.svg')"/>
                                     </div>
 
                                 </el-popover>
@@ -390,6 +397,17 @@ export default {
                 query: query
             }).href, '_blank')
         },
+        goLookAgentMoreRank(id) {
+            let query = {}
+            query.date = this.text
+            query.rank_type = this.dataRank
+            query.type = 'check_type'
+            query.aid = id
+            window.open(this.$router.resolve({
+                path: '/super/ranking/list',
+                query: query
+            }).href, '_blank')
+        },
         closePop(row, type) {
             row[type + '_popover'] = false;
             row[type + '_popover_2'] = false;
@@ -440,6 +458,26 @@ export default {
             }
             this.getRankingDetail(obj);
         },
+        handleClick3(row, index, type) {
+            // 关闭其他行的弹框
+            this.tableData.forEach((item, i) => {
+                item[type + '_popover'] = false;
+                if (i !== index) {
+                    item[type + '_popover_2'] = false;
+                }
+            });
+            // 打开当前行的弹框
+            row[type + '_popover_2'] = true;
+
+            let obj = {}
+            if (this.dataType == 'agent') {
+                obj.aid = row.id
+            }
+            if (this.dataType == 'ver_type') {
+                obj.ver_type = row.id
+            }
+            this.getAgentTypeRankingList();
+        },
         popshow() {
             var ariaEls = document.querySelectorAll('.el-popover')
             ariaEls.forEach((item) => {
@@ -597,6 +635,23 @@ export default {
                 console.error(error, 'error')
             })
         },
+        getAgentTypeRankingList(obj) {
+            const that = this
+            that.tableData1 = []
+            this.$http('POST', '/supernew/ajax_get_type_rank_list', {
+                date: that.text,
+                rank_type: that.dataRank,
+                cur_page: 1,
+                page_size: 5,
+                ...obj
+            }).then(response => {
+                this.$nextTick(() => {
+                    that.tableData1 = response.data.list.slice(0, 5)
+                })
+            }).catch(error => {
+                console.error(error, 'error')
+            })
+        },
         getLossList() {
             const that = this
             that.tableData = []