Merge branch 'refs/heads/master' into master_ljb

src/mocp/api/my-toDo.js

-import { http, post } from 'mocp/utils/http'
+import { http } from 'mocp/utils/http'
 
 //布置工作
 export const getArrangeWorkListForAppApi = (data, config) => {
-    return post({
+    return http({
         method: 'POST',
         url: '/technical-support/getArrangeWorkListForApp',
         data,

src/mocp/components/global-page/global-page.vue

@@ -12,6 +12,7 @@
         :loading-more-enabled="loadingMoreEnabled"
         :back-to-top-bottom="backToTopBottom"
         show-refresher-update-time
+        :hide-empty-view="!auto"
         @query="queryList"
         @scroll="scroll"
         :paging-style="getPagingStyle"

src/pages/modules/mocp/panel/aog/details.vue

@@ -103,9 +103,8 @@ onLoad(() => {
 })
 const goTo = (url, params) => {
     if (params) {
-        uni.$mocpJump.navigateTo(url, params).then(() => {
-            aogStore.setState('materialType', params.materialType)
-        })
+        aogStore.setState('materialType', params.materialType)
+        uni.$mocpJump.navigateTo(url, params)
     } else {
         uni.$mocpJump.navigateTo(url)
     }

src/pages/modules/mocp/panel/app-center/index.vue

@@ -68,11 +68,11 @@ const handleLeftClick = () => {
 }
 //保存
 const handleRightClick = () => {
-    navLeftType.value = 'icon'
     if (homeMenuList.value.length > 0) {
         if (homeMenuList.value.length > 15) {
             uni.$mocpMessage.warning('最多设置15个首页菜单')
         } else {
+            navLeftType.value = 'icon'
             isEdit.value = false
             userStore.changeHomeMenuList(cloneDeep(homeMenuList.value))
             uni.$mocpMessage.success('保存菜单成功')

src/pages/modules/mocp/panel/assign-work/details.vue

@@ -220,9 +220,6 @@ const handleRightClick = () => {
 const handleFooterClick = () => {
     uni.$mocpJump.navigateTo(assignWorkStore.getDetailsFooterBtn?.path)
 }
-onUnload(() => {
-    assignWorkStore.$reset()
-})
 </script>
 <style lang="scss" scoped>
 @import './constants/details.scss';

src/pages/modules/mocp/panel/my-toDo/index.vue

@@ -16,9 +16,10 @@ import AppraisalRecordList from './components/appraisal-record-list.vue'
 import MoveDecisionList from './components/move-decision-list.vue'
 import TechnologyEvaluationList from './components/technology-evaluation-list.vue'
 
-const { windowHeight } = uni.getSystemInfoSync()
+const { windowHeight, safeAreaInsets } = uni.getSystemInfoSync()
+//内容高度-nav高度-底部安全区-底部安全区
 const getHeight = computed(() => {
-    return windowHeight - 85 * 4 + 'px'
+    return windowHeight - 44 - safeAreaInsets?.top - safeAreaInsets?.bottom - 75 * 4 + 'px'
 })
 </script>
 <style lang="scss">