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

wuye-manager-uniapp/api/BaseUrl.js

@@ -3,7 +3,7 @@
  * @Author: Zy
  * @Date: 2026-05-18 15:36:10
  * @LastEditor: Zy
- * @LastEditTime: 2026-06-29 08:28:25
+ * @LastEditTime: 2026-07-08 17:26:41
  */
 let baseUrl = ''
 

wuye-manager-uniapp/manifest.json

@@ -40,7 +40,8 @@
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
+                ],
+                "targetSdkVersion" : 30
             },
             "ios" : {
                 "dSYMs" : false,
@@ -139,13 +140,13 @@
             "bundleName" : "com.chengkong.property.butler",
             "signingConfigs" : {
                 "release" : {
-                    "certpath" : "D:/物业app-ios-harmony-证书/new_harmony/新花开物业正式.cer",
+                    "certpath" : "C:/Users/admin/Desktop/AppStore/new_harmony/花开物业.cer",
-                    "keyAlias" : "wuye_release",
+                    "keyAlias" : "wuye",
-                    "keyPassword" : "0000001A29DE91ED98E83E4AA715BEF3F0939FE80AD47D2CF45EFF04C4566953153352E9CDF554E10C12",
+                    "keyPassword" : "0000001ADF5A2ECBEA883B44816B2D1993792348DB36113109A8D6190B7BB0FA49FC807D9A4191B23E10",
-                    "profile" : "D:/物业app-ios-harmony-证书/new_harmony/guanjia_profileRelease.p7b",
+                    "profile" : "C:/Users/admin/Desktop/AppStore/new_harmony/guanjiaRelease.p7b",
                     "signAlg" : "SHA256withECDSA",
-                    "storeFile" : "D:/物业app-ios-harmony-证书/new_harmony/huakaiwuye.p12",
+                    "storeFile" : "C:/Users/admin/Desktop/AppStore/new_harmony/huakaiwuye.p12",
-                    "storePassword" : "0000001A67FD9009C459E134A62BF21903B8C48B1FA0F0C7E320F98C0C8F3132692D86D09FB1A54B39DD"
+                    "storePassword" : "0000001AA46C978566364D5E371290888A2A18578BBB958BCACA8A64F023354E30EC33C84C8CC9515B38"
                 }
             }
         }

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

@@ -8,7 +8,7 @@
         :tabslist="statusTabs"
         @update="switchStatus"
       ></TabsComponents>
-      <view class="detail_list">
+      <view class="detail_list" v-if="list.length > 0">
         <scroll-view
           style="flex: 1"
           scroll-y="true"
@@ -53,7 +53,9 @@
             </view>
           </view>
         </scroll-view>
-        <view class="nodata" v-if="list.length <= 0">
+      </view>
+      <view class="detail_list" style="margin-top: 0" v-if="list.length <= 0">
+        <view class="nodata">
           <span>暂无数据</span>
         </view>
       </view>

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

@@ -142,7 +142,14 @@ function getlist() {
 onShow(() => {
   getlist()
 })
-
+function scrolltolower() {
+  // 必须加这两个判断！
+  if (isLoading.value || !hasMore.value) {
+    return
+  }
+  queryParmas.value.pageNum += 1
+  getlist()
+}
 function resetList() {
   searchlist.value = []
   queryParmas.value.pageNum = 1

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

@@ -26,48 +26,48 @@
           </uni-datetime-picker>
         </view>
       </view>
-      <scroll-view
+      <view v-if="list.length > 0">
-        class="record_body record-list"
+        <scroll-view
-        scroll-y
+          class="record_body record-list"
-        lower-threshold="160"
+          scroll-y
-        @scrolltolower="scrolltolower"
+          lower-threshold="160"
-        v-if="list.length > 0"
+          @scrolltolower="scrolltolower"
-      >
-        <view
-          class="record_list_item"
-          v-for="(ite, index) in list"
-          :key="index"
-          @tap="handleTap(ite)"
         >
-          <view class="title flex items-center">
+          <view
-            <view class="title_name"> {{ ite.taskName }} </view>
+            class="record_list_item"
-            <view class="title_status" v-if="isComputed(ite.taskStatus)"> 已巡检 </view>
+            v-for="(ite, index) in list"
-            <view class="title_status noinspection" v-else> 未巡检 </view>
+            :key="index"
-          </view>
+            @tap="handleTap(ite)"
-          <view class="items" v-if="ite.points">
+          >
-            <view class="item" v-for="(itemname, itemindex) in ite.itemslist" :key="itemindex">
+            <view class="title flex items-center">
-              <text>{{ itemname }}</text>
+              <view class="title_name"> {{ ite.taskName }} </view>
+              <view class="title_status" v-if="isComputed(ite.taskStatus)"> 已巡检 </view>
+              <view class="title_status noinspection" v-else> 未巡检 </view>
+            </view>
+            <view class="items" v-if="ite.points">
+              <view class="item" v-for="(itemname, itemindex) in ite.itemslist" :key="itemindex">
+                <text>{{ itemname }}</text>
+              </view>
+            </view>
+            <view class="time">
+              <text>巡检时间：</text>
+              <text>{{ ite.taskTime }}</text>
+            </view>
+            <view class="time user">
+              <text>巡检人：</text>
+              <text>{{ ite.inspectorName }}</text>
             </view>
           </view>
-          <view class="time">
+        </scroll-view>
-            <text>巡检时间：</text>
+      </view>
-            <text>{{ ite.taskTime }}</text>
+      <view class="nodata" v-if="list.length <= 0">
-          </view>
-          <view class="time user">
-            <text>巡检人：</text>
-            <text>{{ ite.inspectorName }}</text>
-          </view>
-        </view>
-        <div class=""></div>
-      </scroll-view>
-      <view class="nodata" v-if="list.length > 0">
         <text>暂无数据</text>
       </view>
     </view>
   </view>
 </template>
-
 <script setup lang="ts">
+//// http://localhost:5173/#/pageSubPack/inspection/inspection_record
 import TabsComponents from '@/components/tabs/tabs.vue'
 import navBar from '@/components/navbar/navbar.vue'
 import { computed, ref } from 'vue'

wuye-manager-uniapp/pageSubPack/instrument/checkouthouse.vue

@@ -187,8 +187,8 @@ function handleSelecthouse() {
 
 <style scoped lang="scss">
 .checkouthouse_box {
+  justify-content: flex-start;
   background: #f9f9f9;
-
   .search_box {
     height: 80rpx;
     .search_view {