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

wuye-manager-uniapp/api/BaseUrl.js

@@ -8,7 +8,7 @@
 let baseUrl = ''
 
 if (process.env.NODE_ENV === 'development') {
-  baseUrl = 'http://192.168.0.239:8080' // 开发环境
+  baseUrl = 'http://192.168.1.222:8080' // 开发环境
 } else {
   baseUrl = 'http://wuyeapi.ckdzkj.com' // 生产环境
 }

wuye-manager-uniapp/api/api.js

@@ -1,35 +1,29 @@
-import request, {
+import request, { get, post, upload } from './request.js'
-  get,
-  post,
-  upload
-} from "./request.js"
-
 
 // =======账号密码登录========
-export const getLoginPassword = (data) => {
+export const getLoginPassword = data => {
   return post('/api/butler/auth/loginByPassword', data)
 }
 // 获取验证码
-export const getSendCode = (data) => {
+export const getSendCode = data => {
   return post('/api/butler/auth/sendSmsCode', data)
 }
 // 手机验证码登录
-export const getLoginBySms = (data) => {
+export const getLoginBySms = data => {
   return post('/api/butler/auth/loginBySms', data)
 }
 // 忘记密码接口
-export const getResetPassword = (data) => {
+export const getResetPassword = data => {
   return post('/api/butler/auth/forgetPassword', data)
 }
 
-
 // ======首页=====
 // 获取小区列表
-export const getVillageList = (data) => {
+export const getVillageList = data => {
   return get('/api/inspection/today/villageList', data)
 }
 // 切换小区
-export const switchVillage = (data) => {
+export const switchVillage = data => {
   return post('/api/inspection/today/switchVillage', data)
 }
 // 获取当前小区
@@ -49,28 +43,23 @@ export const getBannarList = () => {
   return get('/api/manage/banner/list')
 }
 
-
-
 // ============通知列表===========
-export const getNoticeList = (data) => {
+export const getNoticeList = data => {
   return get('/manage/notice/repair', data)
 }
 
-
-
-
 // ======故障上报=====
 // 获取报修项目
 export const getRepairOrder = () => {
   return get('/manage/repair/order/list')
 }
 // 提交维修信息
-export const addRepairList = (data) => {
+export const addRepairList = data => {
   return post('/manage/repair/order', data)
 }
 // 上传图片
 export const uploadFile = (filePath, fileName) => {
-  return upload(filePath, '/api/butler/file/uploadImage', fileName);
+  return upload(filePath, '/api/butler/file/uploadImage', fileName)
 }
 
 // 查询一键开门
@@ -78,7 +67,7 @@ export const getOpenDoorList = () => {
   return get('/manage/remote/open/accessdevice')
 }
 // 一键开门
-export const switchOpenDoor = (data) => {
+export const switchOpenDoor = data => {
   return post('/manage/remote/open', data)
 }
 // ===========我的========
@@ -89,14 +78,14 @@ export const getSettingInfo = () => {
 
 // Zy ------------
 // 上报记录
-export const getMyOrderList = (data) => {
+export const getMyOrderList = data => {
   return get('/manage/repair/order/reportlist', data)
 }
 // Zy ------------
 
 // =====设置=======
 // 修改密码
-export const changePassword = (data) => {
+export const changePassword = data => {
   return post('/api/setting/changePassword', data)
 }
 // 退出登录
@@ -104,6 +93,6 @@ export const logout = () => {
   return post('/api/butler/auth/logout')
 }
 // 修改手机号
-export const changePhone = (data) => {
+export const changePhone = data => {
   return post('/api/setting/changePhone', data)
 }

wuye-manager-uniapp/manifest.json

@@ -50,9 +50,11 @@
                     "NSLocationWhenInUseUsageDescription" : "需要获取位置信息",
                     "NSLocationAlwaysAndWhenInUseUsageDescription" : "需要获取位置信息"
                 },
-        "urltypes": [{
+                "urltypes" : [
+                    {
                         "urlschemes" : [ "unionpaycashier" ]
-        }]
+                    }
+                ]
             },
             "sdkConfigs" : {
                 "push" : {
@@ -73,6 +75,38 @@
                         "__platform__" : [ "ios", "android" ]
                     }
                 }
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
             }
         }
     },

wuye-manager-uniapp/pages/index/index.vue

@@ -38,7 +38,7 @@
       <!-- 可滚动内容区 -->
       <view class="scroll-content">
         <!-- banner -->
-        <view class="bannarClass">
+        <view class="bannarClass" v-if="bannerList && bannerList.length > 0">
           <uni-swiper-dot
             class="uni-swiper-dot-box"
             @clickItem="clickItem"
@@ -48,6 +48,7 @@
           >
             <swiper
               class="swiper-box"
+              :key="bannerKey"
               :current="current"
               @change="onSwiperChange"
               autoplay
@@ -163,7 +164,7 @@
 </template>
 
 <script setup>
-import { ref } from 'vue'
+import { ref, computed, watch } from 'vue'
 import { onLoad, onUnload, onShow } from '@dcloudio/uni-app'
 import {
   getCurrentVillage,
@@ -182,6 +183,22 @@ const pendingCount = ref(0) //待巡检
 const InspectedCount = ref(0) //已巡检
 const statusBarHeight = ref(uni.getSystemInfoSync().statusBarHeight || 0)
 
+// 用于强制重新创建 swiper，避免列表变化时内部节点复用导致 getBoundingClientRect 空指针
+const bannerKey = computed(() => bannerList.value.map(item => item.id || item.url).join('_'))
+
+// banner 数据变化时重置当前索引，防止 current 越界
+watch(
+  () => bannerList.value,
+  newVal => {
+    if (!newVal || newVal.length === 0) {
+      current.value = 0
+    } else if (current.value >= newVal.length) {
+      current.value = 0
+    }
+  },
+  { deep: true }
+)
+
 // =======方法=======
 // 跳转小区
 const navigateToPage = () => {
@@ -302,13 +319,18 @@ function getbannarData() {
         const newData = res.data
         const oldData = bannerList.value
         if (JSON.stringify(newData) !== JSON.stringify(oldData)) {
+          current.value = 0
           bannerList.value = newData
         }
       } else {
+        current.value = 0
         bannerList.value = []
       }
     })
-    .catch(() => {})
+    .catch(() => {
+      current.value = 0
+      bannerList.value = []
+    })
 }
 
 // 接收选择小区返回的参数
@@ -337,11 +359,17 @@ onUnload(() => {
 })
 
 const clickItem = e => {
-  current.value = e.index !== undefined ? e.index : e
+  const idx = e.index !== undefined ? e.index : e
+  if (bannerList.value && idx >= 0 && idx < bannerList.value.length) {
+    current.value = idx
+  }
 }
 
 const onSwiperChange = e => {
-  current.value = e.detail.current
+  const idx = e.detail.current
+  if (bannerList.value && idx >= 0 && idx < bannerList.value.length) {
+    current.value = idx
+  }
 }
 </script>