打包配置

.env.development

@@ -1,3 +1,4 @@
 # VITE_API_BASE_URL = http://112.29.103.165:1616
-# VITE_API_BASE_URL = /api
 VITE_API_BASE_URL = /api
+# VITE_API_BASE_URL = http://192.168.0.14:1999/hd-realname/prod-api
+# VITE_API_BASE_URL = http://192.168.0.234:38080

.env.production

@@ -1 +1 @@
-VITE_API_BASE_URL = http://192.168.1.175:58080
+VITE_API_BASE_URL = http://192.168.0.14:1999/hd-realname/prod-api

package-lock.json

@@ -12004,9 +12004,9 @@
             }
         },
         "node_modules/uview-plus": {
-            "version": "3.4.65",
-            "resolved": "https://repo.huaweicloud.com/repository/npm/uview-plus/-/uview-plus-3.4.65.tgz",
-            "integrity": "sha512-SXk3CgvO+v6XNTPe8g5RrEOfebgQRHHnrsn55wTz5y1s1VE2tORvqlVjAfzvfv0udSgioeq5a4227LHcDSN3QQ==",
+            "version": "3.5.25",
+            "resolved": "https://repo.huaweicloud.com/repository/npm/uview-plus/-/uview-plus-3.5.25.tgz",
+            "integrity": "sha512-Z7gCtZA45qXNT8b8IEUjrb0Y++bVauK1SLv4iz/1WjIfNd++Sq7dPIsTNS9NyTwIZqJiVpnE3HqkykqIhTNCAw==",
             "dependencies": {
                 "clipboard": "^2.0.11",
                 "dayjs": "^1.11.3"

src/App.vue

@@ -1,15 +1,25 @@
-<script>
-export default {
-    onLaunch: function () {
+<script setup>
+import { onLaunch, onShow, onHide } from '@dcloudio/uni-app'
+onLaunch(() => {
     console.log('App Launch')
+    uni.loadFontFace({
+        family: 'uicon-iconfont',
+        source: 'url("https://at.alicdn.com/t/font_2225171_8kdcwk4po24.ttf")',
+        global: true,
+        success: (success) => {
+            console.log('Font loaded successfully', success)
         },
-    onShow: function () {
+        fail: (fail) => {
+            console.log('Font loading failed', fail)
+        },
+    })
+})
+onShow(() => {
     console.log('App Show')
-    },
-    onHide: function () {
+})
+onHide(() => {
     console.log('App Hide')
-    },
-}
+})
 </script>
 
 <style lang="scss">

src/components/ContractForm/index.vue

@@ -142,7 +142,7 @@
 </template>
 
 <script setup name="contractForm">
-import { ref, defineExpose, watch } from 'vue'
+import { ref, watch } from 'vue'
 
 const contractFormRef = ref(null) // 合同见证表单ref
 const dateType = ref(1) // 日期类型 1:合同签订日期 2:合同终止日期

src/components/KeyInfoForm/index.vue

@@ -147,7 +147,7 @@
 </template>
 
 <script setup name="keyInfoForm">
-import { ref, defineExpose, onMounted, watch } from 'vue'
+import { ref, onMounted, watch } from 'vue'
 import {
     getPostTypeSelectListAPI,
     getSubSelectListByConditionAPI,

src/components/PersonIdCardForm/index.vue

@@ -152,7 +152,7 @@
 </template>
 
 <script setup name="personIdCardForm">
-import { ref, defineExpose, watch } from 'vue'
+import { ref, watch } from 'vue'
 const idCardFormRef = ref(null) // 身份证表单ref
 const idCardModel = ref({
     age: '',

src/components/WageCardForm/index.vue

@@ -87,7 +87,7 @@
 </template>
 
 <script setup name="wageCardForm">
-import { ref, defineExpose, watch } from 'vue'
+import { ref, watch } from 'vue'
 
 const wageCardFormRef = ref(null) // 工资卡见证表单ref
 

src/main.js

@@ -5,8 +5,19 @@ import uviewPlus from 'uview-plus'
 import './static/index.scss'
 export function createApp() {
     const app = createSSRApp(App)
-    app.use(uviewPlus)
     app.use(pinia)
+    // app.use(uviewPlus)
+    app.use(uviewPlus, () => {
+        // 注意这里是一个函数
+        return {
+            options: {
+                config: {
+                    loadFontOnce: false,
+                },
+            },
+        }
+    })
+
     return {
         app,
     }

src/pages/attendance/index.vue

@@ -38,6 +38,7 @@
 <script setup name="Attendance">
 import { ref, onMounted, onBeforeUnmount } from 'vue'
 import { useCommonStore } from '@/stores'
+import dayjs from 'dayjs'
 const commonStore = useCommonStore()
 const currentTime = ref('') //获取当前的时分秒时间
 const timeInterval = ref(null) //定时器
@@ -45,7 +46,10 @@ const activeProjectName = ref('') // 当前选择的工程名称
 
 onMounted(() => {
     timeInterval.value = setInterval(() => {
-        currentTime.value = new Date().toLocaleTimeString()
+        // currentTime.value = new Date().toLocaleTimeString()
+
+        // 设置时分秒
+        currentTime.value = dayjs().format('HH:mm:ss')
     }, 1000)
 })
 

src/pages/my/edit-password/index.vue

@@ -214,7 +214,10 @@ const onHandleNext = () => {
                     editPasswordModel.value.oldPassword,
                 )
                 // 调后台接口判断原密码是否正确
-                const res = await checkPasswordApi({ oldP: editPasswordModel.value.oldPassword })
+                const res = await checkPasswordApi({
+                    phonenumber: editPasswordModel.value.username,
+                    oldPassword: editPasswordModel.value.oldPassword,
+                })
                 console.log(
                     '%c🔍 校验原密码请求出参 %c',
                     'background: linear-gradient(90deg, #FF6B6B, #4ECDC4); color: white; padding: 5px 10px; border-radius: 5px; font-weight: bold;',

src/pages/my/index.vue

@@ -1,6 +1,6 @@
 <template>
     <!-- 我的 -->
-    <view class="my-container">
+    <view class="my-container app-container" :style="{ paddingTop: safeAreaInsets?.top + 'px' }">
         <view class="my-info">
             <up-image
                 width="52"
@@ -106,6 +106,8 @@ const switchProjectShow = ref(false)
 const searchProjectValue = ref('')
 const activeProjectId = ref('')
 const activeProjectName = ref('')
+
+const { safeAreaInsets } = uni.getSystemInfoSync()
 const userInfo = ref(memberStore.userInfo || {})
 
 const projectList = ref([])
@@ -201,9 +203,9 @@ onMounted(() => {
 
 <style lang="scss" scoped>
 .my-container {
-    height: 100%;
-    display: flex;
-    flex-direction: column;
+    // height: 100%;
+    // display: flex;
+    // flex-direction: column;
     background-color: #f0f2f5;
 
     .my-info {

src/pages/person-entry/child-pages/addAndEditPerson.vue

@@ -4,7 +4,10 @@
     <NavBarModal :navBarTitle="navBarTitle" />
     <view
         class="add-person-container"
-        :style="{ paddingBottom: nextBtnHeight + 'px', paddingTop: paddingTop + 'px' }"
+        :style="{
+            paddingBottom: nextBtnHeight + 'px',
+            paddingTop: safeAreaInsets?.top + paddingTop + 'px',
+        }"
     >
         <!-- 步骤条 -->
         <view>
@@ -60,12 +63,14 @@
 <script setup name="addAndEditPerson">
 import { ref, onMounted, nextTick } from 'vue'
 import { getPersonInfoByIdAPI, updatePersonLightStatusApi } from '@/services/person-entry'
+
 import PersonIdCardForm from '@/components/PersonIdCardForm/index.vue'
 import KeyInfoForm from '@/components/KeyInfoForm/index.vue'
 import ContractForm from '@/components/ContractForm/index.vue'
 import WageCardForm from '@/components/WageCardForm/index.vue'
 import NavBarModal from '@/components/NavBarModal/index.vue'
 import { onLoad } from '@dcloudio/uni-app'
+const { safeAreaInsets } = uni.getSystemInfoSync()
 const navBarTitle = ref('新增人员信息')
 const currentStep = ref(0) // 当前步骤
 const nextBtnRef = ref(null) // 下一步按钮ref

src/pages/select-project/index.vue

@@ -86,11 +86,12 @@ onMounted(() => {
     box-sizing: border-box;
 
     .my-project-title {
+        // margin-bottom: 20rpx;
         font-size: 18px;
         font-weight: bold;
         color: #333;
         padding: 14rpx 0;
-        border-bottom: 1px solid #e5e5e5;
+        // border-bottom: 1px solid #e5e5e5;
         text-align: center;
     }
 

src/services/my.js

@@ -4,7 +4,7 @@ import { http } from '@/utils/http'
 export const checkPasswordApi = (data) => {
     return http({
         method: 'POST',
-        url: '/bmw/workerLight/getWorkerAttList',
+        url: '/bmw/app/validatePassword',
         data,
     })
 }
@@ -12,7 +12,7 @@ export const checkPasswordApi = (data) => {
 export const editPasswordApi = (data) => {
     return http({
         method: 'POST',
-        url: '/bmw/workerLight/getWorkerAttListById',
+        url: '/bmw/app/updatePassword',
         data,
     })
 }

vite.config.js

@@ -10,8 +10,8 @@ export default defineConfig({
             '/api': {
                 // target: 'http://112.29.103.165:1616', // 测试环境
                 // target: 'http://192.168.0.133:58080', // 梁超
-                target: 'http://192.168.0.14:1999/hd-realname/prod-api', // 测试环境
-                // target: 'http://192.168.0.234:38080', // 方亮
+                // target: 'http://192.168.0.14:1999/hd-realname/prod-api', // 测试环境
+                target: 'http://192.168.0.234:38080', // 方亮
                 changeOrigin: true,
                 rewrite: (path) => {
                     return path.replace(/\/api/, '')