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

wuye-manager-uniapp/pageSubPack/report-record/report-record.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="report-record-page">
-	  <view class="status-bar"></view>
+	  <view class="status-bar" :style="{ height: statusBarHeight + 'px' }"></view>
     <!-- 顶部导航栏 -->
     <uni-nav-bar
       left-icon="back"
@@ -58,8 +58,8 @@
 
         <!-- 类型标签 -->
         <view class="tag-group">
-          <view class="tag-item">{{ record.projectTypeStr || '无 ' }}</view>
-          <view class="tag-item">{{ record.maintenanceItemName || '无'}}</view>
+          <view class="tag-item" v-if="record.projectTypeStr">{{ record.projectTypeStr}}</view>
+          <view class="tag-item" v-if="record.maintenanceItemName">{{ record.maintenanceItemName}}</view>
         </view>
 
         <!-- 内容 -->
@@ -97,6 +97,7 @@ import {getMyOrderList} from '../../api/api.js'
 const navHeight = ref(44)
 const statusTabHeight = ref(88)
 const typeTabHeight = ref(88)
+const statusBarHeight = ref(uni.getSystemInfoSync().statusBarHeight || 0)
 // 分页
 const pageNum = ref(1)        // 当前页
 const pageSize = ref(5)      // 每页条数
@@ -254,7 +255,9 @@ onReady(() => {
 }
 .status-bar{
 	width: 100%;
-	height: 46px;
+  /* height: var(--status-bar-height); */
+  flex-shrink: 0;
+	/* height: 46px; */
 }
 /* 状态筛选标签 */
 .status-tabs {

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

@@ -237,8 +237,8 @@ const handleConfirm = () => {
 	color: #fff;
 }
 /* 禁用按钮边框 */
-button:after{
-	border-radius:  8px;
+.get-verify-btn:after{
+	border-radius:  40px;
 }