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

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

@@ -79,6 +79,7 @@ import customHeader from '@/components/customHeader.vue'
 import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
 import { getNavBarPaddingTop } from '@/utils/system.js'
 import { getYsVisistList, removeVisist, updateStatus } from '../../../../api/crm/activity/activity';
+import {onShow} from "@dcloudio/uni-app";
 
 // 获取导航栏高度用于内容区域padding
 const navBarPaddingTop = ref(0);
@@ -86,6 +87,10 @@ onMounted(() => {
   navBarPaddingTop.value = getNavBarPaddingTop() * 2;
 })
 
+onShow(()=>{
+  getList()
+})
+
 // 查询列表
 let list = ref([]);
 
@@ -210,6 +215,13 @@ const getVisitorReportList = (pageNum, pageSize) => {
   });
 }
 
+//页面数据方法
+function getList(){
+  getYsVisistList({pageNum: 1, pageSize: 10}).then(res=>{
+    list.value=res.rows;
+  })
+}
+
 
 let Loop = ref(0)
 let now
@@ -252,7 +264,7 @@ function touchstart(item) {
               });
             }
             // 刷新内容
-            upCallback()
+            downCallback(mescrollRef.value.mescroll);
           });
         }
       }

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

@@ -138,7 +138,9 @@ const submitForm = async () => {
             icon: 'success'
         });
         saveVisistReportForm.cusId = formData.value.cusId
-        saveVisistReportForm.joinUser = formData.value.leader.map(item => item.text).join(',')
+        if (Array.isArray(formData.value.leader)) {
+          saveVisistReportForm.joinUser = formData.value.leader.map(item => item.text).join(',');
+        }
         saveVisistReportForm.visistDate = formData.value.visitDate
         saveVisistReportForm.visistType = 'I类活动（走访）'
         saveVisistReportForm.mapId = mapId.value