From 55fd7f14ef82f22f7e2dba467a3e6677b996f081 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Fri, 5 Mar 2021 18:06:21 +0800
Subject: [PATCH] fix bug

---
 src/pages/approve/list/list.vue              | 20 ++++++++++++++++----
 src/pages/course/experience/experience.vue   |  2 ++
 src/pages/course/offer/offer.vue             |  2 +-
 src/pages/course/task_finish/task_finish.vue |  7 ++++---
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/pages/approve/list/list.vue b/src/pages/approve/list/list.vue
index a719749..94cf730 100644
--- a/src/pages/approve/list/list.vue
+++ b/src/pages/approve/list/list.vue
@@ -21,7 +21,7 @@
             </view>
         </view>
         <view class="l-bar">
-            <view>审核人数: 0人</view>
+            <view><!-- 审核人数: 0人 --></view>
             <view @click="toRecord">审批记录</view>
         </view>
         <view class="l-null" v-if="approveList.length<=0">
@@ -49,12 +49,12 @@
                 </view>
                 <view class="l-reason" v-if="e.approve_type == 1">
                     <view>原因:</view>
-                    <view>{{e.for_leave_reason || '-'}}</view>
+                    <view :class="[e._isUnfold?'':'text-hide']">{{e.for_leave_reason || '-'}}</view>
                 </view>
                 <view class="l-unfold" v-if="e.approve_type == 1">
                     <view>
-                        <text>展开</text>
-                        <image mode="aspectFit" src="/static/images/arrow_c874.png"></image>
+                        <text @click.stop="unFoldBtn(i)">{{e._isUnfold?'收起':'展开'}}</text>
+                        <image @click.stop="unFoldBtn(i)" :style="e._isUnfold?'transform: rotateZ(180deg);':''" mode="aspectFit" src="/static/images/arrow_c874.png"></image>
                     </view>
                 </view>
             </view>
@@ -99,6 +99,11 @@ export default {
         this.getApproveList();
     },
     methods:　{
+        unFoldBtn(i){
+            let _list = [...this.approveList];
+            _list[i]._isUnfold = !_list[i]._isUnfold;
+            this.approveList = [..._list];
+        },
         selectAll(){
             let _list = [...this.approveList];
             if(_list.length<=0)return
@@ -171,7 +176,9 @@ export default {
 
 <style lang="scss">
     @import "~style/public.scss";
+
     .approve-list{  
+        
         padding-bottom: 120upx;
         padding-bottom: calc( 120upx + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */
         padding-bottom: calc( 120upx + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */
@@ -323,6 +330,11 @@ export default {
                         line-height: 40upx;
                         font-size: 28upx;
                         color: #9a9a9d;
+                        word-break: break-all;
+                        
+                        &.text-hide{
+                            @include textHide(2);
+                        }
                     }
                 }
             }
diff --git a/src/pages/course/experience/experience.vue b/src/pages/course/experience/experience.vue
index 3fe1d4c..ade2272 100644
--- a/src/pages/course/experience/experience.vue
+++ b/src/pages/course/experience/experience.vue
@@ -118,6 +118,7 @@ export default {
         conveneBtn(){
             let _ids = this.exList.filter(ele=>ele._selectedStatus).map(ele=>ele.id)
             console.warn(_ids)
+            if(_ids.length<=0)return;
             let _query = {
                 occupyType: 'exp_booking',
                 exp_booking_ids: _ids
@@ -164,6 +165,7 @@ export default {
         tabChange: util.debounce(function(e){
             let { course_id } = this;
             this.curTabInfo = e;
+            this.exList = [];
             this.getCourseList({
                 is_offer_price: e.status,
                 course_id
diff --git a/src/pages/course/offer/offer.vue b/src/pages/course/offer/offer.vue
index 03643ac..f56f622 100644
--- a/src/pages/course/offer/offer.vue
+++ b/src/pages/course/offer/offer.vue
@@ -15,7 +15,7 @@
             </view>
             <view class="s-line">
                 <view class="l-tit">课程报价: </view>
-                <view class="l-frame"><input type="number" v-model="coursePrice" /></view>
+                <view class="l-frame"><input type="digit" v-model="coursePrice" /></view>
                 <view class="l-txt">元</view>
             </view>
         </view>
diff --git a/src/pages/course/task_finish/task_finish.vue b/src/pages/course/task_finish/task_finish.vue
index 945e4f4..5162632 100644
--- a/src/pages/course/task_finish/task_finish.vue
+++ b/src/pages/course/task_finish/task_finish.vue
@@ -21,8 +21,8 @@
                         <image class="u-icon" mode="aspectFit" :src="`/static/images/sex_${e.order.gender-1}.png`"></image>
                     </view>
                     <view class="cc-status">
-                        <view :class="[i == 2&&false?'active':'']">{{e.record.completion || '-'}}</view>
-                        <image mode="aspectFit" src="/static/images/arrow_cb2.png"></image>
+                        <view :class="[e.record.id ==0?'active':'']">{{e.record.id == 0?'未完成':e.record.id >0?'已完成':'-'}}</view>
+                        <image mode="aspectFit" :src="e.record.id >0?'/static/images/arrow_cb2.png':''"></image>
                     </view>
                 </view>
             </view>
@@ -90,7 +90,8 @@ export default {
                 user_name: e.order.name,
                 user_avatar: e.user.avatar_url
             }
-            util.routeTo(`/pages/course/task_info/task_info?query=${util.jsonStr(_query)}`, 'nT');
+            if(e.record.id>0)return util.routeTo(`/pages/course/task_info/task_info?query=${util.jsonStr(_query)}`, 'nT');
+            
         },
         getFinishList({
             homework_id= '',