Merge branch 'master' of http://gitea.bugtc.com/zhouyanli/property-manager-side

wuye-manager-uniapp/package.json

@@ -1,10 +1,11 @@
 {
   "dependencies": {
     "clipboard": "^2.0.11",
-    "dayjs": "^1.11.21"
+    "dayjs": "^1.11.21",
+    "uview-plus": "^3.8.55"
   },
   "devDependencies": {
-    "sass": "^1.101.0",
+    "sass": "^1.63.2",
     "sass-loader": "^17.0.0"
   }
 }

wuye-manager-uniapp/pageSubPack/complaint/Details.vue

@@ -13,7 +13,7 @@
           style="flex: 1"
           scroll-y="true"
           lower-threshold="160"
-          v-if="list.length > 0"
+          :scroll-top="scrollTop"
           @scrolltolower="scrolltolower"
         >
           <view
@@ -53,7 +53,7 @@
             </view>
           </view>
         </scroll-view>
-        <view class="nodata" v-else>
+        <view class="nodata" v-if="list.length <= 0">
           <span>暂无数据</span>
         </view>
       </view>
@@ -62,7 +62,7 @@
 </template>
 
 <script setup>
-import { ref } from 'vue'
+import { nextTick, ref } from 'vue'
 import { onShow } from '@dcloudio/uni-app'
 import TabsComponents from '@/components/tabs/tabs.vue'
 import { getComplainList } from '@/api/complain.js'
@@ -96,7 +96,6 @@ const switchStatus = value => {
   querySearch.value.pageSize = 10
   hasMore.value = true
   isLoading.value = false
-  scrollTop.value = 0
   list.value = []
   init()
 }
@@ -133,6 +132,7 @@ function init() {
 }
 
 onShow(() => {
+  scrollTop.value = 0
   resetList()
 })
 function resetList() {
@@ -162,6 +162,7 @@ function scrolltolower() {
 <style scoped lang="scss">
 .page_padding {
   background: #f9f9f9;
+  overflow: hidden;
 }
 .detailsbox {
   height: 100%;
@@ -171,6 +172,7 @@ function scrolltolower() {
   display: flex;
   flex-direction: column;
   overflow: hidden;
+  box-sizing: border-box;
   .detail_list {
     margin-top: 20rpx;
     display: flex;

wuye-manager-uniapp/pageSubPack/inspection/inspection_record.vue

@@ -58,8 +58,9 @@
             <text>{{ ite.inspectorName }}</text>
           </view>
         </view>
+        <div class=""></div>
       </scroll-view>
-      <view class="nodata" v-else>
+      <view class="nodata" v-if="list.length > 0">
         <text>暂无数据</text>
       </view>
     </view>