From e182c9c1d5f13a732ec8cca90337c83e6ef04b7c Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Tue, 14 Nov 2023 09:44:20 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF-=E5=9B=BD?=
 =?UTF-8?q?=E5=86=85/=E6=B5=B7=E5=A4=96/=E4=BC=81=E6=A0=87=E5=BA=93-?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/phone/domesticStand.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/phone/domesticStand.vue b/src/pages/phone/domesticStand.vue
index 5b3c6fbc8..eb799513c 100644
--- a/src/pages/phone/domesticStand.vue
+++ b/src/pages/phone/domesticStand.vue
@@ -30,8 +30,9 @@
      <div v-else-if="!loading && standList.length" class="card-content" v-for="item in standList" :key="item.id" @click="jumpDetails(item)">
        <div class="standTitle">
          <div v-if="titleType === 'POLICY'"  class="title">{{item.lawsNumber}}</div>
-         <div v-else-if="titleType !== 'POLICY' && item.standYear" class="title">{{item.standSort + '&nbsp&nbsp' + item.standNumber + '-' + item.standYear }}</div>
-         <div v-else class="title">{{item.standSort + '&nbsp&nbsp' + item.standNumber }}</div>
+         <!--<div v-else-if="titleType !== 'POLICY' && item.standYear" class="title">{{item.standSort + '&nbsp&nbsp' + item.standNumber + '-' + item.standYear }}</div>-->
+         <!--<div v-else class="title">{{item.standSort + '&nbsp&nbsp' + item.standNumber }}</div>-->
+         <div v-else class="title">{{item.numbershow }}</div>
        </div>
        <div class="standContent">
          <!--<div class="standState">{{item.standName && item.standName !== '' ? item.standName : item.standEnName !== '' ? item.standEnName : item.nameshow }}</div>-->

From 492610990069043e710c89dc19049cf8444894d5 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Tue, 14 Nov 2023 09:44:20 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF-=E5=9B=BD?=
 =?UTF-8?q?=E5=86=85/=E6=B5=B7=E5=A4=96/=E4=BC=81=E6=A0=87=E5=BA=93-?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/phone/domesticStand.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/phone/domesticStand.vue b/src/pages/phone/domesticStand.vue
index 5b3c6fbc8..6234d86e5 100644
--- a/src/pages/phone/domesticStand.vue
+++ b/src/pages/phone/domesticStand.vue
@@ -30,8 +30,9 @@
      <div v-else-if="!loading && standList.length" class="card-content" v-for="item in standList" :key="item.id" @click="jumpDetails(item)">
        <div class="standTitle">
          <div v-if="titleType === 'POLICY'"  class="title">{{item.lawsNumber}}</div>
-         <div v-else-if="titleType !== 'POLICY' && item.standYear" class="title">{{item.standSort + '&nbsp&nbsp' + item.standNumber + '-' + item.standYear }}</div>
-         <div v-else class="title">{{item.standSort + '&nbsp&nbsp' + item.standNumber }}</div>
+         <!--<div v-else-if="titleType !== 'POLICY' && item.standYear" class="title">{{item.standSort + '&nbsp&nbsp' + item.standNumber + '-' + item.standYear }}</div>-->
+         <!--<div v-else class="title">{{item.standSort + '&nbsp&nbsp' + item.standNumber }}</div>-->
+         <div v-else class="title">{{ item.stand_code || item.numbershow }}</div>
        </div>
        <div class="standContent">
          <!--<div class="standState">{{item.standName && item.standName !== '' ? item.standName : item.standEnName !== '' ? item.standEnName : item.nameshow }}</div>-->

From ed55c4713180a97ced841becf669fd88d9998034 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Tue, 14 Nov 2023 10:05:28 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=86=85=E5=A4=96=E9=83=A8=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=AE-=E8=AF=A6=E6=83=85=E6=B7=BB=E5=8A=A0=E8=AF=BE?=
 =?UTF-8?q?=E9=A2=98=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/meetingDetail/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/details/meetingDetail/index.vue b/src/pages/details/meetingDetail/index.vue
index 826ec827d..c82a17752 100644
--- a/src/pages/details/meetingDetail/index.vue
+++ b/src/pages/details/meetingDetail/index.vue
@@ -20,6 +20,7 @@
             </template>
             <div class="modular-content">
               <p style="" class="half"><label style=" margin-right: 132px;">会议名称</label><span>{{ form.meetingName || '-' }}</span></p>
+              <p style="" class="half"><label style=" margin-right: 132px;">课题名称</label><span>{{ form.topicName || '-' }}</span></p>
               <p style="" class="half"><label style=" margin-right: 100px;">会议主办单位</label><span>{{ form.meetingOrganizer || '-' }}</span></p>
               <p style="" class="half"><label style=" margin-right: 132px;">会议时间</label><span>{{ form.meetingTime || '-' }}</span></p>
               <p style="" class="half"><label style=" margin-right: 132px;">会议地点</label><span>{{ form.meetingAddress || '-' }}</span></p>