diff --git a/src/pages/business/CRM/customer/changeCustomerOwner.vue b/src/pages/business/CRM/customer/changeCustomerOwner.vue index 1f5d820..16dedca 100644 --- a/src/pages/business/CRM/customer/changeCustomerOwner.vue +++ b/src/pages/business/CRM/customer/changeCustomerOwner.vue @@ -298,7 +298,7 @@ let handleCopyInfo=(item)=>{ } - \ No newline at end of file diff --git a/src/pages/business/CRM/customer/customerAdd.vue b/src/pages/business/CRM/customer/customerAdd.vue index f6f3a7a..4e07bde 100644 --- a/src/pages/business/CRM/customer/customerAdd.vue +++ b/src/pages/business/CRM/customer/customerAdd.vue @@ -179,7 +179,7 @@ @@ -435,6 +435,7 @@ let handleFunctionChange = (e) => { console.log(e.detail.value, '职能索引'); const {name} = functionalRequirementList[e.detail.value]; formData.value.functionalRequirements = name; + formData.value.function = name; getRecommendLevel(); } diff --git a/src/pages/business/CRM/customer/customerAudit.vue b/src/pages/business/CRM/customer/customerAudit.vue index 2fa806a..31f23eb 100644 --- a/src/pages/business/CRM/customer/customerAudit.vue +++ b/src/pages/business/CRM/customer/customerAudit.vue @@ -16,13 +16,13 @@ - + - - + + { // 防抖搜索 console.log(searchValue.value) if (timerId) clearTimeout(timerId); - uni.showLoading() timerId = setTimeout(async () => { - - cssFlag.value = true; - // let res = await getList(1, upOption.value.page.size) await downCallback(mescrollRef.value.mescroll); - - cssFlag.value = false; - uni.hideLoading(); clearTimeout(timerId); timerId = null; }, 500) @@ -138,6 +131,8 @@ const mescrollInit = (mescroll) => { // 下拉刷新 const downCallback = async (mescroll) => { try { + uni.showLoading(); + cssFlag.value = true; setTimeout(async () => { // 重置页码为第一页 const res = await getList(1, mescroll.size || upOption.page.size); @@ -145,6 +140,8 @@ const downCallback = async (mescroll) => { list.value = res.list; // 正确传递 total 参数 mescroll.endSuccess(res.list.length, res.total > (mescroll.size || upOption.page.size)); + uni.hideLoading(); + cssFlag.value = false; }, 500); } catch (error) { console.log(error) @@ -162,6 +159,7 @@ const upCallback = async (mescroll) => { } else { list.value.push(...res.list); } + mescroll.endBySize(res.list.length, res.total); // 正确判断是否还有更多数据 mescroll.endSuccess(res.list.length, res.total > mescroll.num * mescroll.size); }, 500); @@ -218,7 +216,6 @@ let handleDetail = (item) => { /* #endif */ } - .scroll-h { /* #ifdef APP-PLUS */ height: calc(100vh - 120px); diff --git a/src/pages/business/CRM/customer/customerUserBelong.vue b/src/pages/business/CRM/customer/customerUserBelong.vue index 179491b..c017c4f 100644 --- a/src/pages/business/CRM/customer/customerUserBelong.vue +++ b/src/pages/business/CRM/customer/customerUserBelong.vue @@ -32,8 +32,8 @@ - + {{ item.cusName }} {{ item.nodeCode }} diff --git a/src/pages/business/CRM/customer/selectCustomer.vue b/src/pages/business/CRM/customer/selectCustomer.vue index 88deb74..7126d19 100644 --- a/src/pages/business/CRM/customer/selectCustomer.vue +++ b/src/pages/business/CRM/customer/selectCustomer.vue @@ -33,10 +33,9 @@ + :class="index === selectIndex ? 'checked' : ''" + :checked="index === selectIndex" + :value="index+''"> @@ -118,7 +117,6 @@ let timerId = null; watch(searchValue, (newValue, oldValue) => { // console.log(`新值: ${newValue}, 旧值: ${oldValue}`); if(timerId) clearTimeout(timerId); - cssFlag.value = true; timerId = setTimeout(async ()=>{ handleSearch(); clearTimeout(timerId); @@ -130,7 +128,6 @@ watch(searchValue, (newValue, oldValue) => { const downCallback = async (mescroll) => { try { const res = await getList(1, upOption.value.page.size); - cssFlag.value = false; list.value = res.list; // 正确结束下拉刷新状态 mescroll.endSuccess(res.list.length, res.total >= upOption.value.page.size); @@ -163,9 +160,11 @@ const upCallback = async (mescroll) => { let handleSearch = async () => { // 触发下拉刷新以重新加载数据 if (mescrollRef.value) { + cssFlag.value = true; uni.showLoading() await downCallback(mescrollRef.value.mescroll); uni.hideLoading() + cssFlag.value = false; } } // 获取数据列表 @@ -181,12 +180,10 @@ const getList = async (pageIndex, pageSize) => { // 选中项的索引号 const selectIndex = ref(null); const radioChange = (e) => { - let {value} = e.detail; - let {index} = e.target.dataset; + let {value} = e.detail; // index // console.log(value); - // console.log(e.target.dataset); const eventChannel = instance.getOpenerEventChannel(); - eventChannel.emit('cuSelected', value); + eventChannel.emit('cuSelected', list.value[value]); uni.navigateBack() } diff --git a/src/pages/business/CRM/plan/planView.vue b/src/pages/business/CRM/plan/planView.vue index cfa8580..f265deb 100644 --- a/src/pages/business/CRM/plan/planView.vue +++ b/src/pages/business/CRM/plan/planView.vue @@ -366,6 +366,13 @@ let handleDetail = (rowIndex, colIndex) => { width: 690rpx; margin: 20rpx 0 0 0; border-radius: 8px 8px 0 0; + /* #ifdef APP-PLUS */ + min-height: calc(100vh - 160rpx/*.topbar height*/ - 68rpx/*.search height*/ - 40rpx/*.white-bg padding-top*/ - 40rpx/*.white-bg padding-bottom*/); + /* #endif */ + /* #ifndef APP-PLUS */ + min-height: calc(100vh - 116rpx/*.topbar height*/ - 68rpx/*.search height*/ - 40rpx/*.white-bg padding-top*/ - 40rpx/*.white-bg padding-bottom*/); + /* #endif */ + //overflow-y: auto; } .white-bg.white-bg-2 {