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

src/mods/AppIntegralApply/AppIntegralApply.vue

@@ -106,7 +106,7 @@ export default {
           params: {
             size: 6,
             current: this.current,
-            residentId: this.user.residentId,
+            residentId: this.user.residentId ? this.user.residentId : '',
             description: this.searchObj,
             applyIntegralType: this.value,
             auditType: this.currentTab == '0' ? '' : this.currentTab == '1' ? '0' : this.currentTab == 2 ? '1' : '',

src/mods/AppIntegralApply/add.vue

@@ -118,7 +118,6 @@ export default {
             })
           }
 
-          this.flag = true
           this.$instance
             .post(`/app/appvillagerintegraldeclare/addOrUpdate`, {
               name: this.user.realName,
@@ -132,6 +131,7 @@ export default {
               if (res.code == 0) {
                 this.$u.toast('提交成功')
                 uni.$emit('updateList')
+                this.flag = true
                 setTimeout(() => {
                   uni.navigateBack()
                 }, 600)

src/mods/AppProgressNew/detail.vue

@@ -2,7 +2,7 @@
   <div class="Page" v-if="showPage">
     <div class="processNames">{{ detail.processName }}</div>
 
-    <div class="types">{{ name }}</div>
+    <div class="types">{{ detail.classificationName }}</div>
 
     <div class="conts" v-html="detail.needToKnow"></div>
   </div>
@@ -18,8 +18,6 @@ export default {
       showPage: false,
       id: '',
       detail: {},
-      classList: {},
-      name: '',
     }
   },
   computed: {},
@@ -34,34 +32,10 @@ export default {
       this.$instance.post(`/app/approval-process-def/info-id?id=${this.id}`).then((res) => {
         if (res.code == 0) {
           this.detail = res.data
-          this.typeList()
+          this.showPage = true
         }
       })
     },
-
-    typeList() {
-      this.$instance
-        .post(`/app/zwspapprovalclassification/list-xcx`, null, {
-          params: {
-            current: 1,
-            status: 1,
-            size: 9999,
-          },
-        })
-        .then((res) => {
-          if (res.code == 0) {
-            this.classList = res.data.records
-            if (this.classList) {
-              this.classList.map((e) => {
-                if (this.detail.classificationId == e.id) {
-                  this.name = e.name
-                }
-              })
-              this.showPage = true
-            }
-          }
-        })
-    },
   },
 }
 </script>