Merge remote-tracking branch 'origin/develop' into develop

src/pages/business/CRM/marketActivity/auditReport.vue

@@ -65,7 +65,7 @@ import { ref, reactive, onMounted } from 'vue'
 import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
 import { getNavBarPaddingTop } from '@/utils/system.js'
 import { onShow } from '@dcloudio/uni-app';
-import { getApprovalList, getUserInfo } from '../../../../api/crm/activity/activity';
+import { getApprovalList } from '../../../../api/crm/activity/activity';
 
 
 let list = ref([])
@@ -80,7 +80,7 @@ onMounted(() => {
 const upOption = ref({
     page: { num: 0, size: 10 },
     noMoreSize: 5,
-    empty: { 
+    empty: {
         tip: '~ 空空如也 ~',
         icon: "../../../../static/images/mescroll-empty.png"
     },
@@ -110,24 +110,24 @@ function upCallback(page) {
     getVisistList(page);
 }
 
-onShow(() => {
+// onShow(() => {
-    getUserInfoMethod();
+//     getUserInfoMethod();
-})
+// })
 
 let nickName = ref();
 let deptName = ref();
 let userId = ref();
 let posts = ref();
 
-//获取用户信息
+// //获取用户信息
-function getUserInfoMethod() {
+// function getUserInfoMethod() {
-    getUserInfo().then(res => {
+//     getUserInfo().then(res => {
-        nickName.value = res.user.nickName;
+//         nickName.value = res.user.nickName;
-        deptName.value = res.user.dept.deptName;
+//         deptName.value = res.user.dept.deptName;
-        userId.value = res.user.userId;
+//         userId.value = res.user.userId;
-        posts.value = res.post;
+//         posts.value = res.post;
-    })
+//     })
-}
+// }
 
 //查询待审批的列表信息
 let dataList = ref([])