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

# Conflicts:
#	wuye-manager-uniapp/manifest.json

wuye-manager-uniapp/api/BaseUrl.js

@@ -3,13 +3,13 @@
  * @Author: Zy
  * @Date: 2026-05-18 15:36:10
  * @LastEditor: Zy
- * @LastEditTime: 2026-05-18 15:36:21
+ * @LastEditTime: 2026-05-30 16:53:07
  */
 let baseUrl = ''
 
 if (process.env.NODE_ENV === 'development') {
   baseUrl = 'http://192.168.0.239:8080' // 开发环境
 } else {
-  baseUrl = 'http://192.168.0.239:8080' // 生产环境
+  baseUrl = 'http://wuyeapi.ckdzkj.com' // 生产环境
 }
 export default baseUrl;

wuye-manager-uniapp/components/filePicker/filePicker.vue

@@ -174,7 +174,6 @@ async function uploadSingle(filePath) {
         }
       },
       fail: err => {
-        console.error('上传失败', err)
         remove(innerList.value.findIndex(item => item.url === filePath))
         emit('fail', err)
         reject(err)

wuye-manager-uniapp/main.js

@@ -12,11 +12,13 @@ app.$mount()
 // #endif
 
 // #ifdef VUE3
-import { createSSRApp } from 'vue'
+import {
+  createSSRApp
+} from 'vue'
 export function createApp() {
   const app = createSSRApp(App)
   return {
     app
   }
 }
-// #endif
+// #endif

wuye-manager-uniapp/manifest.json

@@ -1,21 +1,69 @@
 {
-    "name" : "花开管家",
+  "name": "花开管家",
-    "appid" : "__UNI__29C3D60",
+  "appid": "__UNI__29C3D60",
-    "description" : "智慧社区管家端，专为小区物业管理人员打造，支持多小区灵活切换管理。集成账号密码、手机号密码双重登录模式，内置忘记密码找回功能，保障账号安全。涵盖消息通知、日常巡检、故障报修、一键开门、工单流转、投诉处理等核心办公功能，物业人员可在线完成巡检打卡、问题上报、工单派发跟进、投诉对接处理等日常工作，同时支持查看个人上报记录、巡检历史，便捷修改账号信息与登录密码。高效简化社区物业办公流程，提升小区服务与管理效率，打造便捷智能的社区管理服务平台。",
+  "description": "智慧社区管家端，专为小区物业管理人员打造，支持多小区灵活切换管理。集成账号密码、手机号密码双重登录模式，内置忘记密码找回功能，保障账号安全。涵盖消息通知、日常巡检、故障报修、一键开门、工单流转、投诉处理等核心办公功能，物业人员可在线完成巡检打卡、问题上报、工单派发跟进、投诉对接处理等日常工作，同时支持查看个人上报记录、巡检历史，便捷修改账号信息与登录密码。高效简化社区物业办公流程，提升小区服务与管理效率，打造便捷智能的社区管理服务平台。",
-    "versionName" : "1.0.0",
+  "versionName": "1.0.0",
-    "versionCode" : "100",
+  "versionCode": "100",
-    "transformPx" : false,
+  "transformPx": false,
-    /* 5+App特有相关 */
+  /* 5+App特有相关 */
-    "app-plus" : {
+  "app-plus": {
-        "usingComponents" : true,
+    "usingComponents": true,
-        "nvueStyleCompiler" : "uni-app",
+    "nvueStyleCompiler": "uni-app",
-        "compilerVersion" : 3,
+    "compilerVersion": 3,
-        "splashscreen" : {
+    "splashscreen": {
-            "alwaysShowBeforeRender" : true,
+      "alwaysShowBeforeRender": true,
-            "waiting" : true,
+      "waiting": true,
-            "autoclose" : true,
+      "autoclose": true,
-            "delay" : 0
+      "delay": 0
+    },
+    /* 模块配置 */
+    "modules": {
+      "Geolocation": {},
+      "Camera": {},
+      "Push": {}
+    },
+    /* 应用发布信息 */
+    "distribute": {
+      /* android打包配置 */
+      "android": {
+        "permissions": [
+          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+          "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+          "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+          "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+          "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+          "<uses-feature android:name=\"android.hardware.camera\"/>",
+          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+        ]
+      },
+      /* ios打包配置 */
+      "ios": {
+        "dSYMs": false
+      },
+      /* SDK配置 */
+      "sdkConfigs": {
+        "push": {
+          "unipush": {
+            "version": "2",
+            "offline": true,
+            "hms": {},
+            "oppo": {},
+            "vivo": {},
+            "mi": {},
+            "meizu": {},
+            "honor": {},
+            "fcm": {}
+          }
         },
+<<<<<<< .mine
         /* 模块配置 */
         "modules" : {
             "Geolocation" : {},
@@ -77,31 +125,99 @@
             "splashscreen" : {
                 "useOriginalMsgbox" : true
             }
-        }
+=======
-    },
+        "geolocation": {
-    /* 快应用特有相关 */
+          "system": {
-    "quickapp" : {},
+            "__platform__": ["ios", "android"]
-    /* 小程序特有相关 */
+          }
-    "mp-weixin" : {
-        "appid" : "wx40625124315d2de1",
-        "usingComponents" : true,
-        "lazyCodeLoading" : "requiredComponents"
-    },
-    "mp-alipay" : {
-        "usingComponents" : true
-    },
-    "mp-baidu" : {
-        "usingComponents" : true
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true
-    },
-    "uniStatistics" : {
-        "enable" : false
-    },
-    "vueVersion" : "3",
-    "locale" : "zh-Hans",
-    "fallbackLocale" : "zh-Hans"
-}
-/* ios打包配置 *//* SDK配置 */
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> .theirs
+        }
+      },
+      "splashscreen": {
+        "useOriginalMsgbox": true
+      }
+    }
+  },
+  /* 快应用特有相关 */
+  "quickapp": {},
+  /* 小程序特有相关 */
+  "mp-weixin": {
+    "appid": "wx40625124315d2de1",
+    "usingComponents": true,
+    "lazyCodeLoading": "requiredComponents"
+  },
+  "mp-alipay": {
+    "usingComponents": true
+  },
+  "mp-baidu": {
+    "usingComponents": true
+  },
+  "mp-toutiao": {
+    "usingComponents": true
+  },
+  "uniStatistics": {
+    "enable": false
+  },
+  "vueVersion": "3",
+  "locale": "zh-Hans",
+  "fallbackLocale": "zh-Hans"
+}
+/* ios打包配置 */
+/* SDK配置 */

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

@@ -18,13 +18,13 @@
           </view>
           <view class="inspection_item">
             <text>巡检时间：</text>
-            <text>07:00:00 - 09:00:00</text>
+            <text>{{ info.taskTime }}</text>
           </view>
           <view class="inspection_item">
             <text>巡检小区：</text>
             <text>{{ info.villageName }}</text>
           </view>
-          <view class="" v-for="(item, index) in baseFormData" :key="index">
+          <view v-for="(item, index) in baseFormData" :key="index">
             <view class="inspection_item">
               <text>巡检路线：</text>
               <text>{{ item.routeName }}</text>
@@ -74,9 +74,7 @@
                 <view class="filePickerbox" v-if="!ite.complated">
                   <filePicker
                     v-model="ite.files"
-                    :sourceType="['camera']"
                     file-field-name="file"
-                    :extra-data="uploadParams"
                     uploadUrl="/resource/oss/upload"
                     @fail="onUploadFail"
                   ></filePicker>
@@ -190,15 +188,16 @@ function init() {
 }
 onLoad(options => {
   taskid.value = options.id
-  // taskid.value = '2044684785371725826'
   init()
 })
 
 //  ----------------------------------------------
-const uploadParams = ref({})
 
-function onUploadFail(e) {
+function onUploadFail() {
-  console.log('上传失败', e)
+  uni.showToast({
+    icon: 'error',
+    title: '上传失败！'
+  })
 }
 
 /** 提交巡检点 检查情况 */
@@ -246,12 +245,7 @@ const isComputed = computed(() => {
  */
 function previewImages(images, currentIndex) {
   uni.previewImage({
-    urls: [
+    urls: images,
-      'https://picsum.photos/80',
-      'https://picsum.photos/80',
-      'https://picsum.photos/80',
-      'https://picsum.photos/80'
-    ],
     current: currentIndex
   })
 }

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

@@ -24,21 +24,6 @@
         </view>
       </uni-forms-item>
       <uni-forms-item label="房屋号">
-        <!-- #ifndef APP-IOS -->
-        <uni-easyinput
-          :inputBorder="false"
-          @tap="handleClick"
-          disabled
-          v-model="houseName"
-          placeholderStyle="color: #999999"
-          placeholder="请选择安装房屋"
-        >
-          <template #right>
-            <uni-icons type="forward" color="#737373"></uni-icons>
-          </template>
-        </uni-easyinput>
-        <!-- #endif -->
-        <!-- #ifdef APP-IOS -->
         <view @tap="handleClick" style="width: 100%">
           <uni-easyinput
             :inputBorder="false"
@@ -52,7 +37,6 @@
             </template>
           </uni-easyinput>
         </view>
-        <!-- #endif -->
       </uni-forms-item>
     </uni-forms>
 

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

@@ -21,8 +21,13 @@
       />
     </view>
     <view class="search_list flex-1 flex">
-      <scroll-view lower-threshold="160" scroll-y="true" @scrolltolower="scrolltolower">
+      <scroll-view
-        <radio-group @change="radioChange" v-if="searchlist.length > 0">
+        v-if="searchlist.length > 0"
+        lower-threshold="160"
+        scroll-y="true"
+        @scrolltolower="scrolltolower"
+      >
+        <radio-group @change="radioChange">
           <label v-for="(item, index) in searchlist" :key="index">
             <view
               class="search_item flex flex-between"
@@ -41,10 +46,10 @@
             </view>
           </label>
         </radio-group>
-        <view class="noData" v-else>
-          <text>暂无数据</text>
-        </view>
       </scroll-view>
+      <view class="noData" v-else>
+        <text>暂无数据</text>
+      </view>
     </view>
 
     <view class="action_btn" @tap="handleSelecthouse">
@@ -204,6 +209,7 @@ function handleSelecthouse() {
     margin-top: 20rpx;
     box-sizing: border-box;
     overflow: hidden;
+    justify-content: center;
     .search_item {
       height: 116rpx;
       margin-bottom: 20rpx;
@@ -236,13 +242,13 @@ function handleSelecthouse() {
         border: 1rpx solid #4d5dfa;
       }
     }
-  }
+    .noData {
-  .noData {
+      text-align: center;
-    text-align: center;
+      color: rgba(0, 0, 0, 0.26);
-    color: rgba(0, 0, 0, 0.26);
+      font-size: larger;
-    font-size: larger;
+      padding-top: 50rpx;
-    padding-top: 50rpx;
+      letter-spacing: 10rpx;
-    letter-spacing: 10rpx;
+    }
   }
 
   .action_btn {

wuye-manager-uniapp/pageSubPack/ticket/repairCompleted.vue

@@ -25,9 +25,8 @@
           </uni-file-picker> -->
           <filePicker
             v-model="form.images"
-            :sourceType="['camera']"
             file-field-name="file"
-            uploadUrl="/resource/oss/upload"
+            uploadUrl="/api/butler/file/uploadImage"
           ></filePicker>
         </view>
       </view>