From 8306e1d5fee678213f03942c06d117945e053088 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 1 Jul 2022 08:51:25 +0800
Subject: [PATCH] bug

---
 src/mods/work/AppProgressNew/AppProgressNew.vue       | 2 +-
 src/project/sanjianxi/AppApplyPoint/AppApplyPoint.vue | 5 ++++-
 src/project/sanjianxi/AppApplyPoint/add.vue           | 8 +++++---
 src/project/sanjianxi/AppApplyPoint/detail.vue        | 4 ++--
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/mods/work/AppProgressNew/AppProgressNew.vue b/src/mods/work/AppProgressNew/AppProgressNew.vue
index f7186db..8a8c57d 100644
--- a/src/mods/work/AppProgressNew/AppProgressNew.vue
+++ b/src/mods/work/AppProgressNew/AppProgressNew.vue
@@ -43,7 +43,7 @@ export default {
       if(this.current > this.pages) return
       this.$instance.post(`/app/approval-process-def/list-xcx?processType=2`, null, {
         params: {
-          size: 10,
+          size: 20,
           current: this.current
         },
         withoutToken: true,
diff --git a/src/project/sanjianxi/AppApplyPoint/AppApplyPoint.vue b/src/project/sanjianxi/AppApplyPoint/AppApplyPoint.vue
index 8ff49fb..f9c7c45 100644
--- a/src/project/sanjianxi/AppApplyPoint/AppApplyPoint.vue
+++ b/src/project/sanjianxi/AppApplyPoint/AppApplyPoint.vue
@@ -68,7 +68,10 @@ export default {
         if (res.code == 0) {
           this.pages = res.data.pages
           res.data.records.map((item) => {
-            item.ladderRule = JSON.parse(item.ladderRule)
+            if(item.ladderRule) {
+              item.ladderRule = JSON.parse(item.ladderRule)
+            }
+            
           })
           if (this.current > 1) {
             this.list = [...this.list, ...res.data.records]
diff --git a/src/project/sanjianxi/AppApplyPoint/add.vue b/src/project/sanjianxi/AppApplyPoint/add.vue
index fcf0393..3ce40e1 100644
--- a/src/project/sanjianxi/AppApplyPoint/add.vue
+++ b/src/project/sanjianxi/AppApplyPoint/add.vue
@@ -11,7 +11,7 @@
       </div>
       <div class="text-area">
         <div class="title"><span class="tips">*</span>申请描述</div>
-        <u-input v-model="description" type="textarea" :height="200" placeholder="请输入描述信息" placeholder-style="font-size:20px;color:#999;" maxlength="500" />
+        <u-input v-model="description" type="textarea" :height="200" placeholder="请输入描述信息" placeholder-style="font-size:20px;color:#999;" maxlength="500" :custom-style="customStyle"/>
       </div>
     </div>
     <div class="upload">
@@ -44,7 +44,8 @@ export default {
 
       typeList: [],
       showTypeSelect: false,
-      flag: false
+      flag: false,
+      customStyle: {'font-size':'17px'},
     };
   },
   onLoad(options) {
@@ -73,7 +74,7 @@ export default {
       this.flag = true
       this.$instance.post(`/app/apppartyintegraldeclare/addOrUpdate`, params).then((res) => {
         if(res.code == 0) {
-          this.$u.toast('申请成功')
+          this.$u.toast('提交成功')
           setTimeout(() => {
             uni.navigateBack()
           }, 500)
@@ -152,6 +153,7 @@ export default {
   width: 100%;
   padding: 16px 32px;
   background-color: #f3f6f9;
+  z-index: 999;
   .btn{
     width: 686px;
     height: 88px;
diff --git a/src/project/sanjianxi/AppApplyPoint/detail.vue b/src/project/sanjianxi/AppApplyPoint/detail.vue
index b644c2b..8a0e0c2 100644
--- a/src/project/sanjianxi/AppApplyPoint/detail.vue
+++ b/src/project/sanjianxi/AppApplyPoint/detail.vue
@@ -32,9 +32,9 @@
         <div class="value" :class="`status`+info.auditStatus">{{ $dict.getLabel('integralDeclareStatus', info.auditStatus) }}</div>
       </div>
       <div v-if="info.auditStatus == 1">
-        <div class="info" v-if="info.ruleType == 1">
+        <div class="info" v-if="info.integralRule && info.integralRule.ruleType == 1">
           <div class="label">加分项</div>
-          <div class="value">{{info.auditType}}</div>
+          <div class="value">{{info.integralRule.eventName}}</div>
         </div>
         <div class="info">
           <div class="label">积分调整</div>