From 282b41a11fd15b46d3b4fc8f99902926f4c08f2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Fri, 25 Feb 2022 09:00:27 +0800
Subject: [PATCH 1/3] bug

---
 src/mods/AppIntegralApply/AppIntegralApply.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/mods/AppIntegralApply/AppIntegralApply.vue b/src/mods/AppIntegralApply/AppIntegralApply.vue
index f898d18..c6ddd82 100644
--- a/src/mods/AppIntegralApply/AppIntegralApply.vue
+++ b/src/mods/AppIntegralApply/AppIntegralApply.vue
@@ -103,7 +103,7 @@ export default {
             residentId: this.user.residentId,
             description: this.searchObj,
             applyIntegralType: this.value,
-            auditType: this.currentTab == '0' ? '' : this.currentTab == '1' ? '0' : this.currentTab == 2 ? '1|2' : '',
+            auditType: this.currentTab == '0' ? '' : this.currentTab == '1' ? '0' : this.currentTab == 2 ? '1' : '',
           },
         })
         .then((res) => {
@@ -133,9 +133,7 @@ export default {
 
     change(index) {
       this.currentTab = index
-      this.data = []
-      this.current = 1
-      this.getList()
+      this.init()
     },
 
     confirm(e) {

From 11247a161a31e5003baf1c86d5d8fa1dcd40f4cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Fri, 25 Feb 2022 09:09:19 +0800
Subject: [PATCH 2/3] 27620

---
 src/mods/AppIntegralApply/AppIntegralApply.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/mods/AppIntegralApply/AppIntegralApply.vue b/src/mods/AppIntegralApply/AppIntegralApply.vue
index c6ddd82..b62f33a 100644
--- a/src/mods/AppIntegralApply/AppIntegralApply.vue
+++ b/src/mods/AppIntegralApply/AppIntegralApply.vue
@@ -42,7 +42,7 @@
 
     <div class="fixedBtn" @click="toAdd(1)">我要申请</div>
 
-    <u-select v-model="showType" :list="$dict.getDict('atWillReportType')" value-name="dictValue" label-name="dictName" @confirm="confirm"></u-select>
+    <u-select v-model="showType" :list="newList" value-name="dictValue" label-name="dictName" @confirm="confirm"></u-select>
   </div>
 </template>
 
@@ -76,6 +76,7 @@ export default {
       searchObj: '',
       data: [],
       current: 1,
+      newList: [],
     }
   },
   computed: {
@@ -109,6 +110,10 @@ export default {
         .then((res) => {
           if (res.code == 0) {
             this.data = this.current > 1 ? [...this.data, ...res.data.records] : res.data.records
+
+            const oldList = this.$dict.getDict('atWillReportType')
+            const addList = [{ dictName: '全部', dictValue: '', dictColor: null }]
+            this.newList = [...addList, ...oldList]
           }
         })
         .finally(() => {

From e3ef0a2cb772b55065cbd8f7cb24c20d104d9073 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Fri, 25 Feb 2022 10:51:28 +0800
Subject: [PATCH 3/3] css

---
 src/mods/AppIntegralApply/AppIntegralApply.vue | 2 +-
 src/mods/AppIntegralApply/add.vue              | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/mods/AppIntegralApply/AppIntegralApply.vue b/src/mods/AppIntegralApply/AppIntegralApply.vue
index b62f33a..88e8384 100644
--- a/src/mods/AppIntegralApply/AppIntegralApply.vue
+++ b/src/mods/AppIntegralApply/AppIntegralApply.vue
@@ -249,7 +249,7 @@ export default {
     text-align: center;
     border-radius: 16px;
     font-size: 34px;
-    font-weight: 600;
+    font-weight: 500;
     color: #ffffff;
     z-index: 999;
   }
diff --git a/src/mods/AppIntegralApply/add.vue b/src/mods/AppIntegralApply/add.vue
index 9e149a5..51db7ff 100644
--- a/src/mods/AppIntegralApply/add.vue
+++ b/src/mods/AppIntegralApply/add.vue
@@ -303,11 +303,12 @@ export default {
     position: fixed;
     bottom: 0;
     width: 100%;
-    height: 112px;
-    line-height: 112px;
+    box-sizing: border-box;
     background: #1365dd;
+    padding: 20px 0;
     text-align: center;
-    font-size: 32px;
+    border-radius: 16px;
+    font-size: 34px;
     font-weight: 500;
     color: #ffffff;
     z-index: 999;