优化

src/components/AppealInfo.vue

@@ -79,7 +79,7 @@
               </div>
             </div>
           </van-collapse-item>
-          <van-collapse-item name="logs" :disabled="!appealInfo.logs.length > 0">
+          <van-collapse-item name="logs" :disabled="appealInfo.logs.length === 0">
             <template slot="title">
               <span class="content-font">{{appealInfo.logs.length + '条操作日志'}}</span>
             </template>

src/point/view/integral/approval_detail.vue

@@ -4,13 +4,24 @@
     <div class="body_com" :class="{ can_complete: detail_info.can_complete == 1}">
       <scroller>
         <van-collapse
+          accordion
           v-model="activeNames"
+          @change="collapseChange"
         >
-          <van-collapse-item v-if="detail_info && detail_info.logs && detail_info.logs.length > 0" :title="detail_info.logs.length + '条操作日志'" name="logs">
-            <div v-for="(item,index) in detail_info.logs" :key="index" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
-              <van-tag type="primary" size="medium">{{item.create_time}}</van-tag>
-              {{item.msg}}
-            </div>
+          <van-collapse-item
+            :disabled="detail_info.logs.length === 0"
+            v-if="detail_info && detail_info.logs && detail_info.logs.length > 0"
+            :title="detail_info.logs.length + '条操作日志'"
+            name="logs"
+          >
+            <van-notice-bar
+              v-for="(item,index) in logs"
+              :key="index"
+              left-icon="info-o"
+              color="#1989fa"
+              background="#ecf9ff"
+              :text="item.create_time + item.msg"
+            />
           </van-collapse-item>
         </van-collapse>
         <van-cell-group>
@@ -173,7 +184,7 @@
 <script>
 import Vue from 'vue'
 import approvalProcess from '@/point/view/integral/approval_process'
-import { Dialog, Panel, Step, Steps, Overlay, ImagePreview, Collapse, CollapseItem } from 'vant'
+import { Dialog, Panel, Step, Steps, Overlay, ImagePreview, Collapse, CollapseItem,NoticeBar } from 'vant'
 import Footer from "../../../components/footer.vue";
 Vue.use(Dialog)
   .use(Panel)
@@ -183,6 +194,7 @@ Vue.use(Dialog)
   .use(ImagePreview)
   .use(Collapse)
   .use(CollapseItem)
+  .use(NoticeBar)
 export default {
   // 数据
   components: {Footer, approvalProcess },
@@ -221,7 +233,8 @@ export default {
         remark:''
       },
       submitting:false,
-      activeNames:[]
+      activeNames:[],
+      logs: []
     }
   },
   watch: {
@@ -410,6 +423,13 @@ export default {
           self.showRejectRewrite = false
           self.submitting = false
         })
+    },
+    collapseChange(activeName){
+      if (activeName === 'logs'){
+        this.logs = this.detail_info.logs
+      }else {
+        this.logs = []
+      }
     }
   },
   created () {

src/point/view/integral/approval_process.vue

@@ -14,10 +14,6 @@
       <template slot="title">
         <span v-if="item.step > 0">阶段{{item.step}}</span>
         <van-tag :type="processStatusType(item.status)" size="medium" mark>{{processStatusMap[item.status] || '--'}}</van-tag>
-<!--        <span class="process-item__remark" v-if="item.remark == '申请人'">{{ item.remark }}</span>-->
-<!--        <span class="process-item__remark" v-else :class="{orange:item.remark == '待审核',green:item.remark == '审核通过',red:item.remark == '审核驳回','color-FF9600': item.remark == '待处理','color-F56C6C':item.remark == '驳回'}">-->
-<!--          {{ item.remark }}-->
-<!--        </span>-->
       </template>
       <template slot="right-icon">
         <span class="red" v-if="item.review_point > 0">+{{ item.review_point }}</span>
@@ -25,14 +21,38 @@
       </template>
       <template slot="label">
         <span class="datetime" v-if="item.time">{{ item.time }}</span>
-        <van-cell title="姓名" :value="item.name" />
-        <van-cell title="申请分值" v-if="item.point" :value="item.point ? item.point : ''" />
-        <van-cell title="发放奖票" v-if="i > 0" :value="item.ticket_count ? '是': '否'"  />
-        <van-cell title="审批分值" v-if="item.remark !== '发起' && item.review_point" :value="item.review_point ? item.review_point : ''"  />
-        <van-cell title="备注" :value="item.review_remark" v-if="item.review_remark" />
+<!--        <van-cell title="姓名" :value="item.name" />-->
+<!--        <van-cell title="申请分值" v-if="item.point" :value="item.point ? item.point : ''" />-->
+<!--        <van-cell title="发放奖票" v-if="i > 0" :value="item.ticket_count ? '是': '否'"  />-->
+<!--        <van-cell title="审批分值" v-if="item.remark !== '发起' && item.review_point" :value="item.review_point ? item.review_point : ''"  />-->
+        <van-row >
+          <van-col span="8" class="process-title">姓名</van-col>
+          <van-col span="16" class="process-content">{{item.name}}</van-col>
+        </van-row>
+        <van-row v-if="item.point">
+          <van-col span="8" class="process-title">申请分值</van-col>
+          <van-col span="16" class="process-content">{{item.point ? item.point : ''}}</van-col>
+        </van-row>
+        <van-row v-if="i > 0">
+          <van-col span="8" class="process-title">发放奖票</van-col>
+          <van-col span="16" class="process-content">{{item.ticket_count ? '是': '否'}}</van-col>
+        </van-row>
+        <van-row v-if="item.remark !== '发起' && item.review_point">
+          <van-col span="8" class="process-title">审批分值</van-col>
+          <van-col span="16" class="process-content">{{item.review_point ? item.review_point : ''}}</van-col>
+        </van-row>
+        <van-row v-if="item.review_remark">
+          <van-col span="8" class="process-title">备注</van-col>
+          <van-col span="16" class="process-content">
+            <van-notice-bar
+              color="#1989fa"
+              background="#ecf9ff"
+              :text="item.review_remark"
+            />
+          </van-col>
+        </van-row>
       </template>
     </van-cell>
-
   </div>
 </template>
 
@@ -85,7 +105,7 @@ export default {
 <style scoped>
 .process-item {
   padding-top: 0;
-  padding-bottom: 0;
+  padding-bottom: 0.1rem;
   position: relative;
 }
 
@@ -150,4 +170,15 @@ export default {
 /deep/ .img_round {
   margin-right: 0.16rem;
 }
+.process-title{
+  font-size: 0.3rem;
+  line-height: 0.7rem;
+  text-align: center;
+}
+.process-content{
+  font-size: 0.3rem;
+  line-height: 0.7rem;
+  text-align: right;
+}
+
 </style>