From 910f2ef56d0d49a4ce24b2f33860dce4d739b1b4 Mon Sep 17 00:00:00 2001
From: 付延余 <f-yanyu@outlook.com>
Date: 星期三, 03 八月 2022 16:58:06 +0800
Subject: [PATCH] 项目整体细节,新增主页煤仓剩余量图表。

---
 pages/my-application/my-application.vue |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/pages/my-application/my-application.vue b/pages/my-application/my-application.vue
index 2a2d27c..c11508e 100644
--- a/pages/my-application/my-application.vue
+++ b/pages/my-application/my-application.vue
@@ -48,7 +48,7 @@
     <!-- 鎴戠殑鐢宠鍗$墖鍖哄煙 -->
     <!-- <u-checkbox-group v-model="checkBoxValue" placement="column" @change="checkboxChange" style="margin-bottom:150px"> -->
     <combination-card v-for="(item, index) in shenqingData" index="index">
-      <template v-slot:top>
+        <template v-slot:top>
         <!-- <u-checkbox size="35" :key="item.id" :name="item.id"></u-checkbox> -->
         <view>
           <text>{{ item.title }}</text>
@@ -61,7 +61,7 @@
               <text>鎵�灞炴祦绋嬶細{{ item.processName }}</text>
             </view>
             <view class="">
-              <text>瀹℃壒鐜妭锛歿{ item.currTaskName }}</text>
+              <text>瀹℃壒鐜妭锛歿{ item.currTaskName == null ? '' : item.currTaskName }}</text>
             </view>
           </view>
           <view class="center-content__two center-margin">
@@ -139,7 +139,9 @@
     </view>
 
     <!--杩斿洖椤堕儴-->
-    <u-back-top :scroll-top="scrollTop"></u-back-top>
+    <view class="back-top-container">
+      <u-back-top :scroll-top="scrollTop" style="position:fixed;bottom:100px;right:100px;"></u-back-top>
+    </view>
 
     <view class="" style="height:50px;">
 
@@ -786,6 +788,16 @@
     }
   }
 
+  // 杩斿洖椤堕儴
+  .back-top-container{
+    .u-transition{
+      position:fixed;
+      bottom:vww(80)!important;
+      right:vww(20)!important;
+    }
+  }
+
+
   // 搴曢儴
   .bottomTabbar {
     position: fixed;

--
Gitblit v1.9.1