From 541e1e369bd160e4f2954736ca92afebfa92e16a Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Thu, 23 Dec 2021 18:26:18 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=20=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AD=9B=E9=80=89=E7=B1=BB=E5=9E=8B=20?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CertificateManagement.vue                 |  2 +-
 .../PaymentInfo/CertificateInfo.vue           |  2 +-
 .../PaymentInfo/InvoiceInfo.vue               |  2 +-
 .../PaymentInfo/MemberInfo.vue                |  2 +-
 .../memberInfo/CertificateInfo.vue            |  9 ++++--
 .../memberInfo/PaymentInfo.vue                |  2 +-
 .../memberInfo/modules/MemberInfoModal.vue    |  8 ++---
 src/views/system/UserAnnouncementList.vue     | 32 +++++++++++++++++++
 8 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/src/views/standardsAssociation/CertificateManagement.vue b/src/views/standardsAssociation/CertificateManagement.vue
index 7e141d4..6642c21 100644
--- a/src/views/standardsAssociation/CertificateManagement.vue
+++ b/src/views/standardsAssociation/CertificateManagement.vue
@@ -55,7 +55,7 @@
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">刷新</a-button>
+              <a-button   @click="searchReset" icon="reload" style="margin-left: 8px" class="reset-button">重置</a-button>
               <a-button
                 type="primary"
                 @click="applyCertificate"
diff --git a/src/views/standardsAssociation/PaymentInfo/CertificateInfo.vue b/src/views/standardsAssociation/PaymentInfo/CertificateInfo.vue
index 509d7df..f954ac8 100644
--- a/src/views/standardsAssociation/PaymentInfo/CertificateInfo.vue
+++ b/src/views/standardsAssociation/PaymentInfo/CertificateInfo.vue
@@ -37,7 +37,7 @@
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">刷新</a-button>
+              <a-button   @click="searchReset" icon="reload" style="margin-left: 8px" class="reset-button">重置</a-button>
               <!--              <a @click="handleToggleSearch" style="margin-left: 8px">-->
               <!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
               <!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
diff --git a/src/views/standardsAssociation/PaymentInfo/InvoiceInfo.vue b/src/views/standardsAssociation/PaymentInfo/InvoiceInfo.vue
index 2e9e85a..62ab650 100644
--- a/src/views/standardsAssociation/PaymentInfo/InvoiceInfo.vue
+++ b/src/views/standardsAssociation/PaymentInfo/InvoiceInfo.vue
@@ -58,7 +58,7 @@
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button   @click="searchReset" icon="reload" style="margin-left: 8px" class="reset-button">重置</a-button>
             </span>
             </a-col>
           </a-row>
diff --git a/src/views/standardsAssociation/PaymentInfo/MemberInfo.vue b/src/views/standardsAssociation/PaymentInfo/MemberInfo.vue
index 0a1be20..8dc8f0f 100644
--- a/src/views/standardsAssociation/PaymentInfo/MemberInfo.vue
+++ b/src/views/standardsAssociation/PaymentInfo/MemberInfo.vue
@@ -35,7 +35,7 @@
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">刷新</a-button>
+              <a-button   @click="searchReset" icon="reload" style="margin-left: 8px" class="reset-button">重置</a-button>
             </span>
             </a-col>
           </a-row>
diff --git a/src/views/standardsAssociation/memberInfo/CertificateInfo.vue b/src/views/standardsAssociation/memberInfo/CertificateInfo.vue
index 6abbc2a..82125e9 100644
--- a/src/views/standardsAssociation/memberInfo/CertificateInfo.vue
+++ b/src/views/standardsAssociation/memberInfo/CertificateInfo.vue
@@ -12,7 +12,7 @@
           <a-button class="btn btn-primary" type="primary" @click="vinQuery" icon="search">
             查询
           </a-button>
-          <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 5px">
+          <a-button   @click="searchReset" icon="reload" style="margin-left: 5px" class="reset-button">
             重置
           </a-button>
         </a-col>
@@ -234,6 +234,11 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="less">
+.reset-button {
+  color: #08B6AF;
+  background: rgba(8,182,175,0.10);
+  border: 1px solid #08b6af;
+}
 
 </style>
diff --git a/src/views/standardsAssociation/memberInfo/PaymentInfo.vue b/src/views/standardsAssociation/memberInfo/PaymentInfo.vue
index 6ef63ef..91072b9 100644
--- a/src/views/standardsAssociation/memberInfo/PaymentInfo.vue
+++ b/src/views/standardsAssociation/memberInfo/PaymentInfo.vue
@@ -23,7 +23,7 @@
           <a-col :span="8" class="ope-col">
             <a-button class="btn btn-primary" type="primary" @click="payQuery" icon="searchQuery">查询
             </a-button>
-            <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 5px">刷新
+            <a-button   @click="searchReset" icon="reload" style="margin-left: 5px" class="reset-button">重置
             </a-button>
           </a-col>
         </a-row>
diff --git a/src/views/standardsAssociation/memberInfo/modules/MemberInfoModal.vue b/src/views/standardsAssociation/memberInfo/modules/MemberInfoModal.vue
index b75e72a..ebc6603 100644
--- a/src/views/standardsAssociation/memberInfo/modules/MemberInfoModal.vue
+++ b/src/views/standardsAssociation/memberInfo/modules/MemberInfoModal.vue
@@ -335,7 +335,7 @@
                       <a-col :span="8" class="ope-col">
                         <a-button class="btn btn-primary" type="primary" @click="paymentSearchQuery" icon="search">查询
                         </a-button>
-                        <a-button type="primary" @click="paymentSearchReset" icon="reload" style="margin-left: 5px">刷新
+                        <a-button   @click="paymentSearchReset" icon="reload" style="margin-left: 5px" class="reset-button">重置
                         </a-button>
                       </a-col>
                     </a-row>
@@ -374,8 +374,8 @@
                         <a-button class="btn btn-primary" type="primary" @click="certificateSearchQuery" icon="search">
                           查询
                         </a-button>
-                        <a-button type="primary" @click="certificateSearchReset" icon="reload" style="margin-left: 5px">
-                          刷新
+                        <a-button type="primary" @click="certificateSearchReset" icon="reload" style="margin-left: 5px" class="reset-button">
+                          重置
                         </a-button>
                       </a-col>
                     </a-row>
@@ -768,7 +768,7 @@
                       <a-col :span="8" class="ope-col">
                         <a-button class="btn btn-primary" type="primary" @click="paymentSearchQuery" icon="search">查询
                         </a-button>
-                        <a-button type="primary" @click="paymentSearchReset" icon="reload" style="margin-left: 5px">刷新
+                        <a-button type="primary" @click="paymentSearchReset" icon="reload" style="margin-left: 5px" class="reset-button">重置
                         </a-button>
                       </a-col>
                     </a-row>
diff --git a/src/views/system/UserAnnouncementList.vue b/src/views/system/UserAnnouncementList.vue
index 3112f2b..21ce99e 100644
--- a/src/views/system/UserAnnouncementList.vue
+++ b/src/views/system/UserAnnouncementList.vue
@@ -195,6 +195,38 @@ export default {
         {
           name:'系统通知',
           value: '12'
+        },
+        {
+          name:'缴费提醒（会员）',
+          value: '13'
+        },
+        {
+          name:'证书缴费（会员）',
+          value: '14'
+        },
+        {
+          name:'会员到期提醒（会员）',
+          value: '15'
+        },
+        {
+          name:'证书（会员）',
+          value: '16'
+        },
+        {
+          name:'开票信息（会员）',
+          value: '17'
+        },
+        {
+          name:'会员注册（会员）',
+          value: '18'
+        },
+        {
+          name:'变更联系人（会员）',
+          value: '19'
+        },
+        {
+          name:'单位名称变更（会员）',
+          value: '20'
         }
       ]
     }