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

wuye-manager-uniapp/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花开管家",
     "appid" : "__UNI__5F224F3",
     "description" : "智慧社区管家端，专为小区物业管理人员打造，支持多小区灵活切换管理。集成账号密码、手机号密码双重登录模式，内置忘记密码找回功能，保障账号安全。涵盖消息通知、日常巡检、故障报修、一键开门、工单流转、投诉处理等核心办公功能，物业人员可在线完成巡检打卡、问题上报、工单派发跟进、投诉对接处理等日常工作，同时支持查看个人上报记录、巡检历史，便捷修改账号信息与登录密码。高效简化社区物业办公流程，提升小区服务与管理效率，打造便捷智能的社区管理服务平台。",
-    "versionName" : "1.1.5",
+    "versionName" : "1.1.6",
-    "versionCode" : 115,
+    "versionCode" : 116,
     "transformPx" : false,
     "app-plus" : {
         "usingComponents" : true,

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

@@ -200,6 +200,10 @@
             params.startDate = datetimerange.value[0]
             params.endDate = datetimerange.value[1]
         }
+        uni.showLoading({
+          title:'加载中',
+          mask:true
+        })
         return getTableList(params)
             .then((res) => {
                 if (res.code === 200 && res.data) {
@@ -246,6 +250,8 @@
                 title:err.msg || '网络异常',
                 icon:'none'
               })
+            }).finally(() => {
+              uni.hideLoading()
             })
     }
 

wuye-manager-uniapp/pageSubPack/loginSub/login.vue

@@ -401,6 +401,7 @@ const handlePwdLogin = () => {
       }
     })
     .catch(err => {
+      uni.hideLoading()
       uni.showToast({
         title: err.msg,
         icon: 'none'

wuye-manager-uniapp/pageSubPack/notice-list/select-community.vue

@@ -147,24 +147,12 @@
          }
        }).catch((err)=>{
          isConfirming.value = false
-         uni.hideLoading()
+
          uni.showToast({title:err.msg || '网络异常',icon:'none'})
+       }).finally(()=>{
+          uni.hideLoading()
        })
 
-
-      // uni.showModal({
-      //   title: '确认选择',
-      //   content: `您已选择: ${selectedItem.value.villageName}`,
-      //   success: (res) => {
-      //     if (res.confirm) {
-      //       uni.showToast({ title: '选择成功', icon: 'success', duration: 1500 })
-      //       uni.$emit('confirm', selectedItem.value)
-      //       setTimeout(() => {
-      //         uni.navigateBack()
-      //       }, 1500)
-      //     }
-      //   }
-      // })
     }
 
   </script>

wuye-manager-uniapp/pageSubPack/oneClickOpen/oneClickOpen.vue

@@ -1,11 +1,11 @@
 <template>
   <!-- 页面主容器 -->
   <view class="door-open-page">
-	  <view class="status_bar" :style="{ height: statusBarHeight + 'px' }"></view>
+	  <!-- <view class="status_bar" :style="{ height: statusBarHeight + 'px' }"></view> -->
     <!-- 顶部标题栏 -->
-    <view class="top-bar">
+   <!-- <view class="top-bar">
 		  <uni-nav-bar left-icon="left"  title="远程开门" backgroundColor ="none" :border="false" @clickLeft="narBack" />
-    </view>
+    </view> -->
 	<view class="top-img">
 		<image src="https://wuye.ckdzkj.com/images/imgs/xuancheng-bg.png" mode="" style="width: 100%;height: 100%;"></image>
 	</view>
@@ -47,7 +47,9 @@
     </view>
 
     <!-- 确认开门按钮 -->
-    <button class="confirm-btn" @click="openDoor" :disabled="selectedDoor === -1">确认开门  </button>
+    <view class="btn-footer">
+      <button class="confirm-btn" @click="openDoor" :disabled="selectedDoor === -1">确认开门  </button>
+    </view>
   </view>
 </template>
 
@@ -138,13 +140,9 @@ function getSwitchOpen(){
   min-height: 100vh;
   padding: 30rpx 40rpx;
   box-sizing: border-box;
+  /* 为固定底部按钮预留空间 */
+  padding-bottom: calc(140rpx + env(safe-area-inset-bottom));
 }
-  .status_bar {
-	/* height: 32px; */
-	width: 100%;
-  /* height: var(--status-bar-height); */
-  flex-shrink: 0;
- }
 /* 顶部标题 */
 .top-bar {
   text-align: center;
@@ -282,6 +280,18 @@ function getSwitchOpen(){
   font-weight: 500;
 }
 
+/* 底部按钮固定栏 */
+.btn-footer {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  padding: 20rpx 40rpx;
+  padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
+  background: linear-gradient(180deg, #F6FAFF, #E2F0FF);
+  z-index: 10;
+}
+
 /* 确认按钮 */
 .confirm-btn {
   width: 100%;

wuye-manager-uniapp/pageSubPack/setting/change-password.vue

@@ -1,11 +1,5 @@
 <template>
   <view class="reset-pwd-page">
-    <!-- <view class="status_bar"></view> -->
-    <!-- 顶部导航栏 -->
-    <!-- <view class="nav-bar">
-      <uni-icons type="left" size="28" color="#333" @click="goBack"></uni-icons>
-      <view class="nav-title">修改密码</view>
-    </view> -->
 
     <!-- 旧密码输入框 -->
     <view class="input-item">

wuye-manager-uniapp/pageSubPack/setting/change-phone.vue

@@ -9,7 +9,7 @@
     <view class="input-item">
       <view class="input-icon">
         <image
-          src="https://wuyeadmin.bugtc.com/images/login/phone.png"
+          src="https://wuye.ckdzkj.com/images/login/phone.png"
           mode=""
           style="height: 100%; width: 100%"
         ></image>
@@ -30,7 +30,7 @@
     <view class="input-item verify-item">
       <view class="input-icon">
         <image
-          src="https://wuyeadmin.bugtc.com/images/login/code.png"
+          src="https://wuye.ckdzkj.com/images/login/code.png"
           mode=""
           style="height: 100%; width: 100%"
         ></image>

wuye-manager-uniapp/pageSubPack/setting/deleteAccount.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="contentStyle">
-		<view class="status-bar"></view>
+	<!-- 	<view class="status-bar"></view>
 		<uni-nav-bar title="注销账号" left-icon="left" @clickLeft="goBack" backgroundColor="transparent" :border="false">
-		</uni-nav-bar>
+		</uni-nav-bar> -->
 
-		<scroll-view class="page" scroll-y>
+		<view class="page">
 			<!-- 提示信息 -->
 			<view class="warning-box">
 				<text class="warning-title">注销须知</text>
@@ -19,7 +19,7 @@
 			<!-- 	<input class="input-item" type="password" v-model="password" placeholder="请输入登录密码"
 					placeholder-class="input-placeholder" /> -->
 			<!-- </view> -->
-		</scroll-view>
+		</view>
 
 		<view class="bottom-btn">
 			<button class="submit-btn" :class="{ 'submit-btn--disabled': countdown > 0 }"
@@ -126,7 +126,6 @@ page {
 
 .page {
 	flex: 1;
-	overflow-y: auto;
 	padding: 0px 40rpx;
 	box-sizing: border-box;
 }

wuye-manager-uniapp/pages.json

@@ -229,8 +229,7 @@
       "pages": [{
         "path": "oneClickOpen",
         "style": {
-          "navigationBarTitleText": "一键开门",
+          "navigationBarTitleText": "一键开门"
-          "navigationStyle": "custom"
         }
       }]
     },
@@ -282,8 +281,7 @@
         {
           "path": "deleteAccount",
           "style": {
-            "navigationBarTitleText": "注销账号",
+            "navigationBarTitleText": "注销账号"
-            "navigationStyle": "custom"
           }
         }
       ]