积分申请

src/mods/AppIntegralApply/AppIntegralApply.vue

@@ -4,7 +4,7 @@
 
     <div class="middle">
       <div class="nav">
-        <div class="navLeft" @click="show = true">
+        <div class="navLeft" @click="showType = true">
           <span>{{ name ? name : '全部类型' }}</span>
 
           <u-icon name="arrow-down" v-if="!name"></u-icon>
@@ -16,17 +16,16 @@
       <template v-if="data.length">
         <div class="items" v-for="(item, i) in data" :key="i" @click="toAdd(0, item)">
           <div class="cards">
-            <div class="cont">{{ item.content }}</div>
+            <div class="cont">{{ item.description }}</div>
 
             <div class="flex">
-              <span class="tags">{{ item.address }}</span>
+              <span class="tags">{{ $dict.getLabel('atWillReportType', item.applyIntegralType) }}</span>
               <span class="times">{{ item.createTime }}</span>
             </div>
           </div>
 
           <div class="card">
-            <!-- status0 成功 status1 未通过  status2 待审核-->
-            <span class="status status0">{{ item.name }}</span>
+            <span :style="{ class: item.auditStatus == 0 ? 'status0' : item.auditStatus == 1 ? 'status1' : 'status2' }" class="status status0">{{ $dict.getLabel('auditStatus', item.auditStatus) }}</span>
           </div>
         </div>
       </template>
@@ -36,11 +35,13 @@
 
     <div class="fixedBtn" @click="toAdd(1)">我要申请</div>
 
-    <u-select v-model="show" :list="lists" @confirm="confirm"></u-select>
+    <u-select v-model="showType" :list="$dict.getDict('atWillReportType')" value-name="dictValue" label-name="dictName" @confirm="confirm"></u-select>
   </div>
 </template>
 
 <script>
+import { mapState } from 'vuex'
+
 export default {
   name: 'AppIntegralApply',
   appName: '积分申请',
@@ -61,17 +62,7 @@ export default {
         },
       ],
       currentTab: 0,
-      show: false,
-      lists: [
-        {
-          value: '0',
-          label: '江',
-        },
-        {
-          value: '1',
-          label: '湖',
-        },
-      ],
+      showType: false,
       value: '',
       name: '',
       searchObj: '',
@@ -79,10 +70,14 @@ export default {
       current: 1,
     }
   },
-  computed: {},
+  computed: {
+    ...mapState(['user']),
+  },
   watch: {},
   onLoad() {
-    this.getList()
+    this.$dict.load('atWillReportType', 'auditStatus').then(() => {
+      this.getList()
+    })
   },
   onshow() {
     uni.$on('updateList', () => {
@@ -92,11 +87,14 @@ export default {
   methods: {
     getList() {
       this.$instance
-        .post('/app/appmarriagefuneralinfo/list', null, {
+        .post('/app/appvillagerintegraldeclare/list', null, {
           params: {
             size: 6,
             current: this.current,
-            searchObj: this.searchObj,
+            residentId: this.user.residentId,
+            description: this.searchObj,
+            applyIntegralType: this.value,
+            auditStatus: this.currentTab == '0' ? '' : this.currentTab == '1' ? '0' : this.currentTab == 2 ? '1|2' : '',
           },
         })
         .then((res) => {
@@ -108,11 +106,9 @@ export default {
 
     toAdd(index, item) {
       if (index == '0') {
-        console.log(index, '详情')
         this.$linkTo(`./detail?id=${item.id}`)
       }
       if (index == '1') {
-        console.log(index, '新增')
         this.$linkTo(`./add`)
       }
     },
@@ -124,8 +120,10 @@ export default {
     },
 
     change(index) {
-      this.init()
       this.currentTab = index
+      this.data = []
+      this.current = 1
+      this.getList()
     },
 
     confirm(e) {