From f8f07f1500b3c78494433137fda9eeb5533c60a2 Mon Sep 17 00:00:00 2001
From: jcgitadmin <>
Date: Tue, 12 Nov 2024 23:44:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AF=AE=E7=90=83=E6=AF=94=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E8=B0=83=E6=95=B4=E4=B8=BA=E4=B8=BB=E5=9C=BA?=
 =?UTF-8?q?=E5=9C=A8=E5=8F=B3=E5=AE=A2=E5=9C=BA=E5=9C=A8=E5=B7=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 quasar.config.js                             |  4 ++--
 src/components/ScoreItem.vue                 | 16 +++++++++----
 src/pages/score/DetailPage.vue               | 10 ++++++--
 src/pages/score/LqDetailPage.vue             | 16 ++++++-------
 src/pages/score/components/MatchAnalysis.vue |  2 +-
 src/pages/score/components/MatchInfo.vue     | 24 +++++++++++++++-----
 src/pages/win/NoticesPage.vue                |  4 ++--
 7 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/quasar.config.js b/quasar.config.js
index bc1bced..1905483 100644
--- a/quasar.config.js
+++ b/quasar.config.js
@@ -132,14 +132,14 @@ module.exports = configure(function ( ctx ) {
         // 将所有以/api开头的请求代理到jsonplaceholder
         "/api": {
           // target: 'http://buyer.jingcai.quickfly.eu.org:3000/',
-          target: 'https://test.buyer.daxiangzj.com/',
+          target: 'https://m168.yunduoxd.com/',
           changeOrigin: true,
           secure: false
           // pathRewrite: false
         },
         "/uploads":{
           // target: 'http://jingcai.quickfly.eu.org:3000/',
-          target: 'https://test.buyer.daxiangzj.com/',
+          target: 'https://m168.yunduoxd.com/',
           changeOrigin: true,
           secure: false
         }
diff --git a/src/components/ScoreItem.vue b/src/components/ScoreItem.vue
index c8ae03f..2928390 100644
--- a/src/components/ScoreItem.vue
+++ b/src/components/ScoreItem.vue
@@ -13,10 +13,14 @@
     </div>
     <div class="row items-center">
       <div class="col">
-        <div class="row items-center">
+        <div v-if="props.matchType == 'jczq'" class="row items-center">
           <user-avatar size="md" class="q-mr-sm bg-white team-logo" square ratio="10/13" fit="contain" :src="props.item.match.home_team_logo_url"></user-avatar>
           {{ props.item.match.home_team_name }}
         </div>
+        <div v-else class="row items-center">
+          <user-avatar size="md" class="q-mr-sm bg-white team-logo" square ratio="10/13" fit="contain" :src="props.item.match.away_team_logo_url"></user-avatar>
+          {{ props.item.match.away_team_name }}
+        </div>
       </div>
       <div class="col-auto text-red text-center">
         <template v-if="props.item.score">
@@ -27,16 +31,20 @@
               {{ props.item.score.half_time_score }}</div>
           </template>
           <template v-else>
-            <div class="text-h6">{{ props.item.score.home_score }}:{{ props.item.score.away_score }}</div>
+            <div class="text-h6">{{ props.item.score.away_score }}:{{ props.item.score.home_score }}</div>
           </template>
         </template>
         <div class="text-h6" v-else>VS</div>
       </div>
       <div class="col">
-        <div class="row items-center justify-end">
+        <div v-if="props.matchType == 'jczq'" class="row items-center justify-end">
           {{ props.item.match.away_team_name }}
           <user-avatar size="md" class="q-ml-sm bg-white team-logo" square ratio="10/13" fit="contain" :src="props.item.match.away_team_logo_url"></user-avatar>
         </div>
+        <div v-else class="row items-center justify-end">
+          {{ props.item.match.home_team_name }}
+          <user-avatar size="md" class="q-ml-sm bg-white team-logo" square ratio="10/13" fit="contain" :src="props.item.match.home_team_logo_url"></user-avatar>
+        </div>
       </div>
     </div>
     <div v-if="props.matchType == 'jczq'" class="row justify-between items-center">
@@ -49,7 +57,7 @@
     </div>
     <div v-if="props.matchType == 'lq' && props.item.score" class="text-caption q-mt-xs text-center text-red">
       <span v-for="i in 4" :key="i" class="q-mx-xs">
-        {{ props.item.score['q'+i+'home_score'] }}:{{ props.item.score['q'+i+'away_score'] }}
+        {{ props.item.score['q'+i+'away_score'] }}:{{ props.item.score['q'+i+'home_score'] }}
       </span>
     </div>
   </div>
diff --git a/src/pages/score/DetailPage.vue b/src/pages/score/DetailPage.vue
index 69f9150..64dae7e 100644
--- a/src/pages/score/DetailPage.vue
+++ b/src/pages/score/DetailPage.vue
@@ -1,8 +1,14 @@
 <template>
   <page-layout class="score-detail-page" header-class="score-header">
     <template #header-title v-if="info.match_info"
-      >{{ info.match_info.home_team_name }} vs
-      {{ info.match_info.away_team_name }}</template
+      >
+      <span v-if="route.params.type=='lq'">
+        {{ info.match_info.away_team_name }} vs {{ info.match_info.home_team_name }}
+      </span>
+      <span v-else>
+        {{ info.match_info.home_team_name }} vs {{ info.match_info.away_team_name }}
+      </span>
+      </template
     >
     <template #header-right>
       <q-btn flat dense icon="share" to="/shop/share" />
diff --git a/src/pages/score/LqDetailPage.vue b/src/pages/score/LqDetailPage.vue
index 771c472..906e1b8 100644
--- a/src/pages/score/LqDetailPage.vue
+++ b/src/pages/score/LqDetailPage.vue
@@ -1,8 +1,8 @@
 <template>
   <page-layout class="score-detail-page" header-class="score-header">
     <template #header-title v-if="info.match_info"
-      >{{ info.match_info.home_team_name }} vs
-      {{ info.match_info.away_team_name }}</template
+      >{{ info.match_info.away_team_name }} vs
+      {{ info.match_info.home_team_name }}</template
     >
     <template #header-right>
       <q-btn flat dense icon="share" to="/shop/share" />
@@ -10,8 +10,8 @@
     <template #header-append >
       <div v-if="info.match_info" class="row q-py-lg items-center">
         <div class="col text-center q-pt-sm">
-          <img :src="info.match_info.home_team_logo_url" width="56" height="68" />
-          <div>{{ info.match_info.home_team_name }}</div>
+          <img :src="info.match_info.away_team_logo_url" width="56" height="68" />
+          <div>{{ info.match_info.away_team_name }}</div>
         </div>
         <div class="text-center">
           <div class="text-caption">
@@ -25,19 +25,19 @@
             <div
               class="inline-block bg-grey-4 text-grey-10 q-pa-xs rounded-borders-xs glossy2"
             >
-              {{ info.match_info.home_score || "VS" }}
+              {{ info.match_info.away_score || "VS" }}
             </div>
             :
             <div
               class="inline-block bg-grey-4 text-grey-10 q-pa-xs rounded-borders-xs glossy2"
             >
-              {{ info.match_info.away_score || "VS" }}
+              {{ info.match_info.home_score || "VS" }}
             </div>
           </div>
         </div>
         <div class="col text-center q-pt-sm">
-          <img :src="info.match_info.away_team_logo_url" width="56" height="68" />
-          <div>{{ info.match_info.away_team_name }}</div>
+          <img :src="info.match_info.home_team_logo_url" width="56" height="68" />
+          <div>{{ info.match_info.home_team_name }}</div>
         </div>
       </div>
       <q-tabs
diff --git a/src/pages/score/components/MatchAnalysis.vue b/src/pages/score/components/MatchAnalysis.vue
index 8f4e946..15539f5 100644
--- a/src/pages/score/components/MatchAnalysis.vue
+++ b/src/pages/score/components/MatchAnalysis.vue
@@ -27,7 +27,7 @@
             <td>{{ item.start_time_str }}
               <br />{{ item.competition_name }}
             </td>
-            <td>{{ item.home_team_name }} {{ item.home_score }} - {{ item.away_score }} {{ item.away_team_name }}</td>
+            <td>{{ item.away_team_name }} {{ item.away_score }} - {{ item.home_score }} {{ item.home_team_name }}</td>
             <!-- <td></td> -->
             <!-- <td></td> -->
           </tr>
diff --git a/src/pages/score/components/MatchInfo.vue b/src/pages/score/components/MatchInfo.vue
index 304d13e..c8af200 100644
--- a/src/pages/score/components/MatchInfo.vue
+++ b/src/pages/score/components/MatchInfo.vue
@@ -1,8 +1,14 @@
 <template>
   <div class="row q-py-lg items-center">
     <div class="col text-center q-pt-sm">
-      <img :src="info.match_info.home_team_logo_url" width="50" style="max-height:65px;" />
-      <div>{{ info.match_info.home_team_name }}</div>
+      <template v-if="props.type=='lq'">
+        <img :src="info.match_info.away_team_logo_url" width="50" style="max-height:65px;" />
+        <div>{{ info.match_info.away_team_name }}</div>
+      </template>
+      <template v-else>
+        <img :src="info.match_info.home_team_logo_url" width="50" style="max-height:65px;" />
+        <div>{{ info.match_info.home_team_name }}</div>
+      </template>
     </div>
     <div class="text-center">
       <div class="text-caption">
@@ -14,17 +20,23 @@
       </div>
       <div class="q-mt-sm">
         <div class="inline-block bg-grey-4 text-grey-10 q-pa-xs rounded-borders-xs glossy2" style="width:2em;">
-          {{ score[0] || "VS" }}
+          {{ (props.type=='lq'?score[1]:score[0]) || "VS" }}
         </div>
         :
         <div class="inline-block bg-grey-4 text-grey-10 q-pa-xs rounded-borders-xs glossy2" style="width:2em;">
-          {{ score[1] || "VS" }}
+          {{ (props.type=='lq'?score[0]:score[1]) || "VS" }}
         </div>
       </div>
     </div>
     <div class="col text-center q-pt-sm">
-      <img :src="info.match_info.away_team_logo_url" width="50" style="max-height:65px;" />
-      <div>{{ info.match_info.away_team_name }}</div>
+      <template v-if="props.type=='lq'">
+        <img :src="info.match_info.home_team_logo_url" width="50" style="max-height:65px;" />
+        <div>{{ info.match_info.home_team_name }}</div>
+      </template>
+      <template v-else>
+        <img :src="info.match_info.away_team_logo_url" width="50" style="max-height:65px;" />
+        <div>{{ info.match_info.away_team_name }}</div>
+      </template>
     </div>
   </div>
 </template>
diff --git a/src/pages/win/NoticesPage.vue b/src/pages/win/NoticesPage.vue
index bd2f138..8ab2f8c 100644
--- a/src/pages/win/NoticesPage.vue
+++ b/src/pages/win/NoticesPage.vue
@@ -132,8 +132,8 @@
           <template v-else-if="tab2 == 'jclq'">
             <div class="bg-white q-pa-md">
               <div class="row q-mb-sm">{{ item.match.competition_name }} {{ item.play_num }}
-                <div class="col text-right text-weight-bold">{{ item.match.home_team_name }} <span
-                    class="text-red">{{ item.home_score }}:{{ item.away_score }}</span> {{ item.match.away_team_name }}</div>
+                <div class="col text-right text-weight-bold">{{ item.match.away_team_name }} <span
+                    class="text-red">{{ item.away_score }}:{{ item.home_score }}</span> {{ item.match.home_team_name }}</div>
               </div>
               <q-markup-table flat separator="cell" dense class="q-mb-md text-center border-white">
                 <thead class="bg-grey-4 text-black text-weight-medium">