Merge remote-tracking branch 'origin/dev' into dev

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: {
@@ -103,12 +104,16 @@ 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) => {
           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(() => {
@@ -133,9 +138,7 @@ export default {
 
     change(index) {
       this.currentTab = index
-      this.data = []
+      this.init()
-      this.current = 1
-      this.getList()
     },
 
     confirm(e) {
@@ -246,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;
   }

src/mods/AppIntegralApply/add.vue

@@ -303,11 +303,12 @@ export default {
     position: fixed;
     bottom: 0;
     width: 100%;
-    height: 112px;
+    box-sizing: border-box;
-    line-height: 112px;
     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;