From ee228475a943adcf1a275fccf5fe04a3f652beeb Mon Sep 17 00:00:00 2001 From: xuli3099 Date: Fri, 12 Sep 2025 13:14:52 +0800 Subject: [PATCH 01/21] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 12 ++++++++---- .env.production | 15 ++++++++++----- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/.env.development b/.env.development index f34654e..935a2b1 100644 --- a/.env.development +++ b/.env.development @@ -1,12 +1,16 @@ #调用后台地址 -# 公司 -VITE_APP_BASE_URL = 'http://118.186.13.120:31302' +# 贝英斯公司 +# VITE_APP_BASE_URL = 'http://118.186.13.120:31302' # VITE_APP_BASE_URL = "http://192.168.236.71:31302" # VITE_APP_BASE_URL = "http://123.57.20.168:3000" -# 友晟外网 +# 友晟test外网 # VITE_APP_BASE_URL = 'https://app-test.718yousheng.com/app' -# 友晟内网 +# 友晟test内网 # VITE_APP_BASE_URL = 'https://appi-test.718yousheng.com/app' +# 友晟线上内网 +# VITE_APP_BASE_URL = 'https://appi.718yousheng.com/app' +# 友晟线上外网网 +VITE_APP_BASE_URL = 'https://app.718yousheng.com/app' diff --git a/.env.production b/.env.production index 6731db1..b9a031e 100644 --- a/.env.production +++ b/.env.production @@ -1,11 +1,16 @@ #调用后台地址 -# 公司 +# 贝英斯公司 # VITE_APP_BASE_URL = 'http://118.186.13.120:31302' # VITE_APP_BASE_URL = "http://192.168.236.71:31302" # VITE_APP_BASE_URL = "http://123.57.20.168:3000" -# 友晟外网 -VITE_APP_BASE_URL = 'https://app-test.718yousheng.com/app' -# 友晟内网 -# VITE_APP_BASE_URL = 'https://appi-test.718yousheng.com/app' \ No newline at end of file +# 友晟test外网 +# VITE_APP_BASE_URL = 'https://app-test.718yousheng.com/app' +# 友晟test内网 +# VITE_APP_BASE_URL = 'https://appi-test.718yousheng.com/app' + +# 友晟线上内网 +# VITE_APP_BASE_URL = 'https://appi.718yousheng.com/app' +# 友晟线上外网网 +VITE_APP_BASE_URL = 'https://app.718yousheng.com/app' \ No newline at end of file From 19fa0622290982149392338fd2fddbaa3b5a0e25 Mon Sep 17 00:00:00 2001 From: wangzhuo Date: Fri, 12 Sep 2025 16:54:04 +0800 Subject: [PATCH 02/21] =?UTF-8?q?fix:=20=E5=91=A8=E8=AE=A1=E5=88=92-?= =?UTF-8?q?=E5=88=9B=E5=BB=BA-=E5=8F=96=E6=B6=88=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/business/CRM/plan/planEdit.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pages/business/CRM/plan/planEdit.vue b/src/pages/business/CRM/plan/planEdit.vue index cf37728..7862137 100644 --- a/src/pages/business/CRM/plan/planEdit.vue +++ b/src/pages/business/CRM/plan/planEdit.vue @@ -130,12 +130,12 @@ let instance = null; let initCreate = (params)=>{ const {itemList, selectIndex} = params; // 获取用户信息 - getUserInfo().then(res => { - userInfo.value = res.user; - console.log(route.path, "：用户信息获取成功"); - }).catch(err => { - console.warn(err, "用户信息获取失败") - }); + // getUserInfo().then(res => { + // userInfo.value = res.user; + // console.log(route.path, "：用户信息获取成功"); + // }).catch(err => { + // console.warn(err, "用户信息获取失败") + // }); console.log(route.path,`：创建${itemList[selectIndex]}计划`); title.value="创建周计划"; currentEditDate.value.yearMonth = getDate({format: true}).substring(0, 7); // 只要年月 From d36cadd06f5da671817b61c037bc3dc778a7ce1f Mon Sep 17 00:00:00 2001 From: wangzhuo Date: Fri, 12 Sep 2025 16:57:00 +0800 Subject: [PATCH 03/21] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BD=91?= =?UTF-8?q?=E7=BB=9C=E8=B6=85=E6=97=B6loading=E6=8F=90=E7=A4=BA=E4=B8=8D?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=9A=84=E9=97=AE=E9=A2=98=20fix:=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B5=E9=9D=A2=E9=AB=98=E5=BA=A6=E9=80=82?= =?UTF-8?q?=E9=85=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CRM/customer/changeCustomerOwner.vue | 103 +++++++----------- .../CRM/customer/customerUserBelong.vue | 64 ++++++----- .../business/CRM/customer/selectCustomer.vue | 15 ++- .../mainOwner/audit/mainOwnerChangeAudit.vue | 94 +++++++++------- .../CRM/mainOwner/view/viewMainOwner.vue | 14 +-- .../mainOwner/view/viewMainOwnerDetail.vue | 12 ++ src/pages/business/CRM/plan/myPlan.vue | 6 +- 7 files changed, 155 insertions(+), 153 deletions(-) diff --git a/src/pages/business/CRM/customer/changeCustomerOwner.vue b/src/pages/business/CRM/customer/changeCustomerOwner.vue index feb555b..c37f3b2 100644 --- a/src/pages/business/CRM/customer/changeCustomerOwner.vue +++ b/src/pages/business/CRM/customer/changeCustomerOwner.vue @@ -24,7 +24,7 @@ - @@ -126,7 +126,7 @@ let list = ref([]); const upOption = ref({ page: {num: 0, size: 10}, noMoreSize: 5, - empty: { + empty: { tip: '~ 空空如也 ~', icon: "../../../../static/images/mescroll-empty.png" }, @@ -149,44 +149,31 @@ 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); - list.value = res.list; - cssFlag.value = false; - // 正确传递 total 参数 - mescroll.endSuccess(res.list.length, res.total >= mescroll.size); - uni.hideLoading(); - - }, 500); - } catch (error) { - console.log(error) - mescroll.endErr(); - } + uni.showLoading(); + cssFlag.value = true; + setTimeout(async () => { + // 重置页码为第一页 + const res = await getList(1, mescroll.size || upOption.page.size); + cssFlag.value = false; + list.value = res.list; + // 正确传递 total 参数 + mescroll.endSuccess(res.list.length, res.total >= mescroll.size); + }, 500); } // 上拉加载更多 const upCallback = async (mescroll) => { - try { - uni.showLoading(); - setTimeout(async () => { - // 使用 mescroll 提供的页码和大小参数 - const res = await getList(mescroll.num, mescroll.size); - if (mescroll.num === 1) { - list.value = res.list; - } else { - list.value.push(...res.list); - } - // 正确判断是否还有更多数据 - mescroll.endSuccess(res.list.length, res.total >= mescroll.size); - uni.hideLoading(); - }, 500); - } catch (error) { - console.log(error) - mescroll.endErr(); - } + uni.showLoading(); + setTimeout(async () => { + // 使用 mescroll 提供的页码和大小参数 + const res = await getList(mescroll.num, mescroll.size); + if (mescroll.num === 1) { + list.value = res.list; + } else { + list.value.push(...res.list); + } + // 正确判断是否还有更多数据 + mescroll.endSuccess(res.list.length, res.total >= mescroll.size); + }, 500); } // 获取数据列表 @@ -197,12 +184,17 @@ const getList = (pageIndex, pageSize) => { pageSize, searchContent: searchValue.value } - - let res = await SearchForAllPerson(param); - resolve({ - list: res.rows, - total: res.total - }); + try { + let res = await SearchForAllPerson(param); + resolve({ + list: res.rows, + total: res.total + }); + } catch (e) { + console.log(e, '数据获取失败'); + } finally { + uni.hideLoading(); + } }); } @@ -306,16 +298,14 @@ let handleCopyInfo = (item) => { \ No newline at end of file diff --git a/src/pages/business/CRM/customer/customerUserBelong.vue b/src/pages/business/CRM/customer/customerUserBelong.vue index 6e57682..523dd3e 100644 --- a/src/pages/business/CRM/customer/customerUserBelong.vue +++ b/src/pages/business/CRM/customer/customerUserBelong.vue @@ -134,7 +134,7 @@ const upOption = ref({ noMoreSize: 5, empty: { tip: '~ 空空如也 ~', - icon: "../../static/images/mescroll-empty.png" + icon: "../../../../static/images/mescroll-empty.png" }, textLoading: '加载中...', textNoMore: '已经到底了' @@ -155,27 +155,27 @@ const mescrollInit = (mescroll) => { // 下拉刷新 const downCallback = async (mescroll) => { - try { - cssFlag.value = true; - uni.showLoading(); - setTimeout(async () => { + cssFlag.value = true; + uni.showLoading(); + setTimeout(async () => { + try { // 重置页码为第一页 const res = await getList(1, mescroll.size || upOption.page.size); - cssFlag.value = false; list.value = res.list; // 正确传递 total 参数 mescroll.endSuccess(res.list.length, res.total > (mescroll.size || upOption.page.size)); - uni.hideLoading(); - }, 500); - } catch (error) { - console.log(error) - mescroll.endErr(); - } + } catch (error) { + mescroll.endErr(); + } finally { + cssFlag.value = false; + } + }, 500); + } // 上拉加载更多 const upCallback = async (mescroll) => { - try { - setTimeout(async () => { + setTimeout(async () => { + try { // 使用 mescroll 提供的页码和大小参数 const res = await getList(mescroll.num, mescroll.size); if (mescroll.num === 1) { @@ -186,11 +186,10 @@ const upCallback = async (mescroll) => { // 正确判断是否还有更多数据 mescroll.endBySize(res.list.length, res.total) // mescroll.endSuccess(res.list.length, res.total > mescroll.num * mescroll.size); - }, 500); - } catch (error) { - console.log(error) - mescroll.endErr(); - } + } catch (error) { + mescroll.endErr(); + } + }, 500); } // 获取数据列表 @@ -201,12 +200,18 @@ const getList = (pageIndex, pageSize) => { pageSize, searchContent: searchValue.value } + try { + let res = await SearchForAllCustomersSalesperson(param); + resolve({ + list: res.rows, + total: res.total + }); + } catch (e) { + console.log(e, "获取所有客户人员所属失败"); + } finally { + uni.hideLoading(); + } - let res = await SearchForAllCustomersSalesperson(param); - resolve({ - list: res.rows, - total: res.total - }); }); } @@ -224,7 +229,7 @@ let handleDetail = (item) => { res.eventChannel.emit('editCusData', {param: item, isAdd: false}) } }) - }else{ + } else { uni.showToast({ title: '已完成审核，不可修改', icon: 'none' @@ -278,16 +283,15 @@ let handleDelete = async (item) => { \ No newline at end of file diff --git a/src/pages/business/CRM/mainOwner/view/viewMainOwner.vue b/src/pages/business/CRM/mainOwner/view/viewMainOwner.vue index 621d22f..31e7bc4 100644 --- a/src/pages/business/CRM/mainOwner/view/viewMainOwner.vue +++ b/src/pages/business/CRM/mainOwner/view/viewMainOwner.vue @@ -155,9 +155,9 @@ const upCallback = async (mescroll) => { const upOption = ref({ page: { num: 0, size: 10 }, noMoreSize: 5, - empty: { - tip: '~ 空空如也 ~', - icon: "../../static/images/mescroll-empty.png" + empty: { + tip: '~ 空空如也 ~', + icon: "../../../../../static/images/mescroll-empty.png" }, textLoading: '加载中...', textNoMore: '已经到底了' @@ -184,12 +184,12 @@ function showDetail(item) { .all-body { /* #ifdef APP-PLUS */ - top: 150rpx; - height: calc(100vh - 75px); + top: 160rpx; + height: calc(100vh - 160rpx); /* #endif */ /* #ifndef APP-PLUS */ - top: 120rpx; - height: calc(100vh); + top: 116rpx; + height: calc(100vh - 116rpx); /* #endif */ } diff --git a/src/pages/business/CRM/mainOwner/view/viewMainOwnerDetail.vue b/src/pages/business/CRM/mainOwner/view/viewMainOwnerDetail.vue index 0d52803..a5c63dc 100644 --- a/src/pages/business/CRM/mainOwner/view/viewMainOwnerDetail.vue +++ b/src/pages/business/CRM/mainOwner/view/viewMainOwnerDetail.vue @@ -138,6 +138,18 @@ function getCrmCusUserNewChangeOwnerList() { /* min-height: 100vh; */ } +.all-body { + /* #ifdef APP-PLUS */ + top: 160rpx; + height: calc(100vh - 160rpx); + /* #endif */ + /* #ifndef APP-PLUS */ + top: 116rpx; + height: calc(100vh - 116rpx); + /* #endif */ + overflow-y: auto; +} + .white-bg { padding-bottom: 10rpx; } diff --git a/src/pages/business/CRM/plan/myPlan.vue b/src/pages/business/CRM/plan/myPlan.vue index f9670ab..ffbd47b 100644 --- a/src/pages/business/CRM/plan/myPlan.vue +++ b/src/pages/business/CRM/plan/myPlan.vue @@ -56,7 +56,9 @@ - + + 暂无数据 + @@ -282,7 +284,7 @@ function handleEdit(index) { } .con-bg { - height: 445rpx; + /*height: 445rpx;*/ } .nav-list { From 842781b8d57df571d2100d194453fb4505c0e094 Mon Sep 17 00:00:00 2001 From: wangyang Date: Mon, 15 Sep 2025 12:55:23 +0800 Subject: [PATCH 04/21] =?UTF-8?q?CRM-=E8=B5=B0=E8=AE=BF=E6=9F=A5=E7=9C=8B-?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85=E5=92=8C?= =?UTF-8?q?=E9=95=BF=E6=8C=89=E5=88=A0=E9=99=A4=E4=BA=8B=E4=BB=B6=E7=9A=84?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CRM/marketActivity/visitReport.vue | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/src/pages/business/CRM/marketActivity/visitReport.vue b/src/pages/business/CRM/marketActivity/visitReport.vue index 09ffdb9..77aa8e5 100644 --- a/src/pages/business/CRM/marketActivity/visitReport.vue +++ b/src/pages/business/CRM/marketActivity/visitReport.vue @@ -27,14 +27,16 @@ :up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff" class="scroll-h" :class="{ 'loading-scroll': cssFlag }"> + @longpress="touchstart(item)" + @tap="touchend" + > 客户：{{ item.cusName }} {{ item.visistCode }} - + {{ item.status == '驳回' ? '再次提交' : item.status }} @@ -211,8 +213,6 @@ const getVisitorReportList = (pageNum, pageSize) => { } -let Loop = ref(0) -let now const visistId = ref(); const cusName = ref(); const cusId = ref(); @@ -223,9 +223,6 @@ function touchstart(item) { cusName.value = item.cusName cusId.value = item.cusId status.value = item.status - now = new Date(); - clearInterval(Loop.value); //再次清空定时器，防止重复注册定时器 - Loop.value = setTimeout(() => { uni.showModal({ title: '删除', content: '请问要删除本条消息吗？', @@ -257,21 +254,25 @@ function touchstart(item) { } } }); - }, 750); } - +let isLongPressed = ref(false); function touchend() { - let endDate = new Date(); - console.log('结束时间', endDate) - let cha = endDate.getTime() - now.getTime(); - console.log(cha, 'casd') - if (cha < 750) { + // 如果未触发长按，则执行点击逻辑 + if (!isLongPressed.value) { uni.navigateTo({ - url: "/pages/business/CRM/marketActivity/visitorReportEnter?visistId=" + visistId.value + '&cusName=' + cusName.value + '&cusId=' + cusId.value + '&status=' + status.value + url: "/pages/business/CRM/marketActivity/visitorReportEnter?visistId=" + + visistId.value + + '&cusName=' + + cusName.value + + '&cusId=' + + cusId.value + + '&status=' + + status.value }) } - clearInterval(Loop.value); + // 重置状态（避免影响下次事件） + isLongPressed.value = false; } //点击状态按钮 From 20f1c9b857784d23848137a291ffc6ab4148b2f0 Mon Sep 17 00:00:00 2001 From: wangzhuo Date: Tue, 16 Sep 2025 08:58:29 +0800 Subject: [PATCH 05/21] =?UTF-8?q?fix:=20=E5=AE=A2=E6=88=B7=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/CRM/customer/customerAudit.vue | 76 +++++++++++-------- 1 file changed, 43 insertions(+), 33 deletions(-) diff --git a/src/pages/business/CRM/customer/customerAudit.vue b/src/pages/business/CRM/customer/customerAudit.vue index 533fcf5..7fbf62d 100644 --- a/src/pages/business/CRM/customer/customerAudit.vue +++ b/src/pages/business/CRM/customer/customerAudit.vue @@ -17,12 +17,12 @@ - - - - + + + + - + { // 下拉刷新 const downCallback = async (mescroll) => { - try { - uni.showLoading(); - cssFlag.value = true; - setTimeout(async () => { + + uni.showLoading(); + cssFlag.value = true; + setTimeout(async () => { + try { // 重置页码为第一页 const res = await getList(1, mescroll.size || upOption.page.size); @@ -144,17 +145,21 @@ const downCallback = async (mescroll) => { // 正确传递 total 参数 mescroll.endSuccess(res.list.length, res.total > (mescroll.size || upOption.page.size)); uni.hideLoading(); + + } catch (error) { + console.log(error) + mescroll.endErr(); + } finally { cssFlag.value = false; - }, 500); - } catch (error) { - console.log(error) - mescroll.endErr(); - } + } + }, 500); + } // 上拉加载更多 const upCallback = async (mescroll) => { - try { - setTimeout(async () => { + + setTimeout(async () => { + try { // 使用 mescroll 提供的页码和大小参数 const res = await getList(mescroll.num, mescroll.size); if (mescroll.num === 1) { @@ -165,11 +170,11 @@ const upCallback = async (mescroll) => { mescroll.endBySize(res.list.length, res.total); // 正确判断是否还有更多数据 mescroll.endSuccess(res.list.length, res.total > mescroll.num * mescroll.size); - }, 500); - } catch (error) { - console.log(error) - mescroll.endErr(); - } + } catch (error) { + mescroll.endErr(); + } + }, 500); + } // 获取数据列表 @@ -180,12 +185,17 @@ const getList = (pageIndex, pageSize) => { pageSize, searchContent: searchValue.value } - - let res = await getCusUserApprovalList(param); - resolve({ - list: res.rows, - total: res.total - }); + try { + let res = await getCusUserApprovalList(param); + resolve({ + list: res.rows, + total: res.total + }); + } catch (e) { + console.log(e, "客户人员审核任务列表获取失败"); + } finally { + uni.hideLoading(); + } }); } @@ -210,12 +220,12 @@ let handleDetail = (item) => { \ No newline at end of file From 3a1339fc76be6890b0b096f8855b5ffe821892de Mon Sep 17 00:00:00 2001 From: wangzhuo Date: Wed, 17 Sep 2025 21:44:01 +0800 Subject: [PATCH 09/21] =?UTF-8?q?feat:=20=E5=91=A8=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=94=AF=E6=8C=81=E4=B8=8B=E6=8B=89=E5=88=B7?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages.json | 3 +- src/pages/business/CRM/plan/planView.vue | 67 +++++++++++++----------- 2 files changed, 37 insertions(+), 33 deletions(-) diff --git a/src/pages.json b/src/pages.json index d86b7d5..b0f497d 100644 --- a/src/pages.json +++ b/src/pages.json @@ -331,7 +331,8 @@ "path": "pages/business/CRM/plan/planView", //周计划查看 "style": { - "navigationBarTitleText": "" + "navigationBarTitleText": "", + "enablePullDownRefresh": true } }, { diff --git a/src/pages/business/CRM/plan/planView.vue b/src/pages/business/CRM/plan/planView.vue index 2f999c7..26c6adf 100644 --- a/src/pages/business/CRM/plan/planView.vue +++ b/src/pages/business/CRM/plan/planView.vue @@ -44,7 +44,7 @@ {{ parseInt(searchValue.selectDate.substring(5, 7)) }}月 - {{searchValue.selectDate.substring(0, 4) }}年 + {{ searchValue.selectDate.substring(0, 4) }}年 @@ -58,6 +58,7 @@ {{ WeekShortCN[i] }} {{ list[0][field].substring(8) }} + {{ getWeek(i) }} @@ -103,9 +104,10 @@ import MescrollUni from 'mescroll-uni/mescroll-uni.vue'; import {getNavBarPaddingTop} from '@/utils/system.js' import {getAllWeekPlanList} from "@/api/crm/plan/getPlan"; import {AreaList, COLOR_MAP, OrdinalDate, WeekShortCN, WorkEvent, WorkType} from "./dataMap"; -import {getCurrentWeekNum} from "./dateTimeUtils"; +import {getCurrentWeekNum, getWeek2} from "./dateTimeUtils"; import {getDate} from "@/utils/datetime"; import {getWeekPlanListByDate} from "@/api/crm/plan/getPlan"; +import {onPullDownRefresh} from "@dcloudio/uni-app"; // const currentYear = new Date().getFullYear(); const currentMonth = new Date().getMonth() + 1; @@ -116,10 +118,13 @@ const navBarPaddingTop = ref(0); onMounted(() => { navBarPaddingTop.value = getNavBarPaddingTop() * 2; uni.showLoading({}) - getPlanList().then(res=>{ + getPlanList().then(res => { let {total, rows} = res; - console.log(rows, "周计划数据获取成功") + console.log(total, rows, "周计划数据获取成功") list.value = rows; + }).catch((err) => { + console.warn(err, "周计划数据获取失败") + }).finally(() => { uni.hideLoading(); }) }) @@ -140,22 +145,21 @@ let searchValue = ref({ // 查询列表 let list = ref([]); const mescrollRef = ref(null); -const upOption = ref({ - page: {num: 0, size: 10}, - noMoreSize: 5, - empty: {tip: '~ 空空如也 ~'}, - textLoading: '加载中...', - textNoMore: '已经到底了' +onPullDownRefresh(() => { + getPlanList().then(res => { + const {rows} = res; + list.value = rows; + console.log(rows,'刷新周计划成功'); + }).finally(()=>{ + uni.stopPullDownRefresh(); + }) }); -const downOption = ref({ - auto: true, - textInOffset: '下拉刷新', - textOutOffset: '释放更新', - textLoading: '刷新中...' -}); - -let cssFlag = ref(false);//控制样式 +// 查询当前周一周日期 +const aweek = getWeek2('本周'); +const getWeek = (i) => { + return aweek[OrdinalDate[i]].substring(7) +} // 获取数据列表 const getPlanList = (month, date, pageIndex, pageSize) => { @@ -187,20 +191,17 @@ let bindDateChange = (e) => { let handleSearch = () => { console.log(searchValue.value, '查询参数') uni.showLoading(); - getWeekPlanListByDate(searchValue.value).then(res=>{ - const {total, rows } = res; + getWeekPlanListByDate(searchValue.value).then(res => { + const {total, rows} = res; list.value = rows; console.log(rows, '查询成功'); - }).catch(err=>{ - console.warn(err,'数据获取失败'); - }).finally(()=>{ + }).catch(err => { + console.warn(err, '数据获取失败'); + }).finally(() => { uni.hideLoading(); }) } -const mescrollInit = (mescroll) => { - cssFlag.value = true; - mescrollRef.value = mescroll; -}; + // 搜索区域变更 const bindPickerChange = (e) => { // console.log('picker发送选择改变，携带值为', peopleIndex.value) @@ -216,7 +217,7 @@ let handleDetail = (rowIndex, colIndex) => { let workDate = detail[OrdinalDate[colIndex]]; let workType = detail[WorkType[colIndex]]; let workEvent = detail[WorkEvent[colIndex]]; - if(workType && workEvent){ + if (workType && workEvent) { uni.showModal({ title: `${workDate}\n${workType}`, content: `${workEvent}`, @@ -231,8 +232,7 @@ let handleDetail = (rowIndex, colIndex) => { } } }) - } - else{ + } else { uni.showToast({ title: "暂无内容", icon: "none", @@ -366,10 +366,12 @@ let handleDetail = (rowIndex, colIndex) => { 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*/); + 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*/); + min-height: calc(100vh - 116rpx/*.topbar height*/ - 68rpx/*.search height*/ - 40rpx/*.white-bg padding-top*/ - 40rpx /*.white-bg padding-bottom*/ + ); /* #endif */ //overflow-y: auto; } @@ -394,6 +396,7 @@ let handleDetail = (rowIndex, colIndex) => { :deep(.form-con .uni-forms-item) { margin-bottom: 22px !important; } + /*.con-bg { height: 420rpx; }*/ From 1a3c014c8374bb86a3c5faf550abed200e67f436 Mon Sep 17 00:00:00 2001 From: wangzhuo Date: Wed, 17 Sep 2025 21:47:23 +0800 Subject: [PATCH 10/21] =?UTF-8?q?fix:=20=E4=B8=BB=E5=BD=92=E5=B1=9E?= =?UTF-8?q?=E4=BA=BA=E5=8F=98=E6=9B=B4=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainOwner/audit/mainOwnerChangeAudit.vue | 49 +++------- .../CRM/mainOwner/view/viewMainOwner.vue | 93 +++++++------------ 2 files changed, 46 insertions(+), 96 deletions(-) diff --git a/src/pages/business/CRM/mainOwner/audit/mainOwnerChangeAudit.vue b/src/pages/business/CRM/mainOwner/audit/mainOwnerChangeAudit.vue index 5ce10c6..8e37c43 100644 --- a/src/pages/business/CRM/mainOwner/audit/mainOwnerChangeAudit.vue +++ b/src/pages/business/CRM/mainOwner/audit/mainOwnerChangeAudit.vue @@ -16,13 +16,12 @@ - - - - - - - + + + + + + {{ item.cusName }} - {{ item.auditStatus ? item.auditStatus : '待审核' }} + {{ item.auditStatus ? item.auditStatus : '待您审核' }} @@ -100,7 +99,8 @@ const mescrollRef = ref(null); let timerId = null; // 查询搜索跳转 let handleSearch = () => { - // 防抖搜索 console.log(searchValue.value) + // 防抖搜索 + console.log(searchValue.value) if (timerId) clearTimeout(timerId); timerId = setTimeout(async () => { @@ -236,29 +236,6 @@ let handleDetail = (item) => { /* #endif */ } -.search { - display: flex; -} - -.search .btn-search { - border: none; - background: none; - line-height: normal; - color: #fff; - line-height: 56rpx !important; - padding: 10rpx 0 0; - text-align: left; - cursor: pointer; -} - -.search .btn-search::after { - display: none; -} - -.search .custom-search { - width: 80%; - -} .scroll-h{ /* #ifdef APP-PLUS */ top: 160rpx; @@ -270,10 +247,6 @@ let handleDetail = (item) => { /* #endif */ } -.search .custom-search.uni-searchbar { - padding-right: 0 !important; -} - .white-bg { padding-bottom: 10rpx; @@ -282,11 +255,11 @@ let handleDetail = (item) => { } } -.no-wrap{ +.no-wrap { white-space: nowrap; } -.btn-blue{ +.btn-blue { border-radius: 10rpx; } \ No newline at end of file diff --git a/src/pages/business/CRM/mainOwner/view/viewMainOwner.vue b/src/pages/business/CRM/mainOwner/view/viewMainOwner.vue index 31e7bc4..05b7093 100644 --- a/src/pages/business/CRM/mainOwner/view/viewMainOwner.vue +++ b/src/pages/business/CRM/mainOwner/view/viewMainOwner.vue @@ -1,19 +1,17 @@ +