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,7 +12,9 @@ app.$mount()
 // #endif
 
 // #ifdef VUE3
-import { createSSRApp } from 'vue'
+import {
+  createSSRApp
+} from 'vue'
 export function createApp() {
   const app = createSSRApp(App)
   return {

wuye-manager-uniapp/manifest.json

@@ -16,6 +16,54 @@
       "autoclose": true,
       "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,6 +125,74 @@
             "splashscreen" : {
                 "useOriginalMsgbox" : true
             }
+=======
+        "geolocation": {
+          "system": {
+            "__platform__": ["ios", "android"]
+          }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> .theirs
+        }
+      },
+      "splashscreen": {
+        "useOriginalMsgbox": true
+      }
     }
   },
   /* 快应用特有相关 */
@@ -103,5 +219,5 @@
   "locale": "zh-Hans",
   "fallbackLocale": "zh-Hans"
 }
-/* ios打包配置 *//* SDK配置 */
+/* 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>
+      </scroll-view>
       <view class="noData" v-else>
         <text>暂无数据</text>
       </view>
-      </scroll-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,7 +242,6 @@ function handleSelecthouse() {
         border: 1rpx solid #4d5dfa;
       }
     }
-  }
     .noData {
       text-align: center;
       color: rgba(0, 0, 0, 0.26);
@@ -244,6 +249,7 @@ function handleSelecthouse() {
       padding-top: 50rpx;
       letter-spacing: 10rpx;
     }
+  }
 
   .action_btn {
     width: 670rpx;

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>