From c99f36420b3c0b784247539d85af076de7a8648b Mon Sep 17 00:00:00 2001 From: liutong <836164388@qq.com> Date: Wed, 21 May 2025 14:44:40 +0800 Subject: [PATCH 1/8] =?UTF-8?q?refactor(market):=20=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=BA=BF=E7=B4=A2=E6=97=A5=E5=BF=97=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -将单个表格拆分为两个表格，分别显示客户资源修改和六要素修改 - 添加表格标题，提高信息的可读性和区分度 - 调整表格样式和间距，优化整体布局 --- pages/market/clue/edit_clues_log.vue | 87 +++++++++++++++++++--------- 1 file changed, 60 insertions(+), 27 deletions(-) diff --git a/pages/market/clue/edit_clues_log.vue b/pages/market/clue/edit_clues_log.vue index 962fbab..8890467 100644 --- a/pages/market/clue/edit_clues_log.vue +++ b/pages/market/clue/edit_clues_log.vue @@ -34,25 +34,52 @@ 修改人：张三 修改了如下内容 - - - - - - - - - - - - - - - - - - -
字段名称原数据新数据
{{ row.field }}{{ row.oldValue }}{{ row.newValue }}
+ + 客户资源修改 + + + + + + + + + + + + + + + + + + +
字段名称原数据新数据
{{ row.field }}{{ row.oldValue }}{{ row.newValue }}
+ + + + 六要素修改 + + + + + + + + + + + + + + + + + + + +
字段名称原数据新数据
{{ row.field }}{{ row.oldValue }}{{ row.newValue }}
+ @@ -150,7 +177,7 @@ export default { this.filteredData.limit = 10//每页返回数据条数 this.filteredData.total = 10//数据总条数 }, - //获取列表-我的客户 + //获取列表-客户信息修改记录 async getList(){ this.loading = true @@ -200,21 +227,27 @@ export default { //background-color: #292929; overflow: auto; .table_list{ - border: 1px solid red; - .itme_box { margin-top: 30rpx; display: flex; flex-direction: column; - gap: 20rpx; + gap: 25rpx; .title_name{ font-size: 28rpx; } - .table_box{ - width: 100%; - border-collapse: collapse; - table-layout: fixed; + .table_section{ + .table_name{ + padding: 20rpx 0; + padding-bottom: 10rpx; + font-size: 28rpx; + } + .table_box{ + width: 100%; + border-collapse: collapse; + table-layout: fixed; + } } + } ::v-deep .fui-timeaxis__wrap{ From 3d4a0b57fe6f6a1bb64ed5682a3df00a1de5a32d Mon Sep 17 00:00:00 2001 From: liutong <836164388@qq.com> Date: Wed, 21 May 2025 18:03:06 +0800 Subject: [PATCH 2/8] =?UTF-8?q?feat(market):=20=E6=B7=BB=E5=8A=A0=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E8=B5=84=E6=BA=90=E5=92=8C=E5=85=AD=E8=A6=81=E7=B4=A0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=B0=E5=BD=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增客户资源和六要素修改记录的 API 接口和页面组件 - 实现修改记录的获取、展示和切换功能 -优化页面样式，增加时间轴和表格展示效果 --- api/apiRoute.js | 7 ++ common/config.js | 8 +- pages/market/clue/edit_clues_log.vue | 135 ++++++++++++++++++++++----- 3 files changed, 122 insertions(+), 28 deletions(-) diff --git a/api/apiRoute.js b/api/apiRoute.js index c2bb466..c0f67d8 100644 --- a/api/apiRoute.js +++ b/api/apiRoute.js @@ -153,6 +153,13 @@ export default { return res; }) }, + //销售端-客户资源-获取修改日志列表 + xs_customerResourcesGetEditLogList(data = {}) { + let url = '/customerResources/getEditLogList' + return http.get(url, data).then(res => { + return res; + }) + }, //销售端-资源共享-列表 xs_resourceSharingIndex(data = {}) { let url = '/resourceSharing/index' diff --git a/common/config.js b/common/config.js index 180e8cb..d026265 100644 --- a/common/config.js +++ b/common/config.js @@ -1,13 +1,13 @@ // 线上测试地址 -// const Api_url='http://aaaaaaaa.hksywl.cn/api' -// const img_domian = 'http://aaaaaaaa.hksywl.cn/' +const Api_url='http://146.56.228.75:20025/api' +const img_domian = 'http://146.56.228.75:20025/' //本地测试地址 // const Api_url='http://zhjw.cc/api' // const img_domian = 'http://zhjw.cc/' -const Api_url='http://146.56.228.75:20024/api' -const img_domian = 'http://146.56.228.75:20024/' +// const Api_url='http://146.56.228.75:20024/api' +// const img_domian = 'http://146.56.228.75:20024/' const IsDemo = false diff --git a/pages/market/clue/edit_clues_log.vue b/pages/market/clue/edit_clues_log.vue index 8890467..af47812 100644 --- a/pages/market/clue/edit_clues_log.vue +++ b/pages/market/clue/edit_clues_log.vue @@ -1,15 +1,31 @@ + + + + + + + + + + + + + + + @@ -106,7 +164,8 @@ export default { page:1,//当前页码 limit:10,//每页返回数据条数 total:10,//数据总条数 - resource_id: '',//客户资源表id + type:'resource',//查询类型|resource=客户资源,six_speed=六要素 + customer_resource_id: '',//客户资源表id }, //数据列表 tableList:[{ @@ -140,14 +199,29 @@ export default { oldValue:'张三', newValue:'11李四李四李四李四李四李四李四李四李四李四李四123', } + ], + + //tab切换 + optionTableId:0,//分段器初始选中项索引 + optionTable:[ + { + id: 0, + name: '客户资源修改记录', + type:'resource', + }, + { + id: 1, + name: '六要素修改记录', + type:'six_speed', + } ] } }, onLoad(options) { - this.filteredData.resource_id = options.resource_id//客户资源表id + this.filteredData.customer_resource_id = options.resource_id//客户资源表id }, onShow() { - // this.init() + this.init() }, //下拉刷新 async onPullDownRefresh() { @@ -197,7 +271,7 @@ export default { this.tableList = [] } - let res = await apiRoute.xs_resourceSharingIndex(data) + let res = await apiRoute.xs_customerResourcesGetEditLogList(data) this.loading = false this.isReachedBottom = false; if (res.code != 1){ @@ -208,6 +282,8 @@ export default { return } + console.log(123123123,res) + this.tableList = this.tableList.concat(res.data.data); // 使用 concat 方法 将新数据追加到数组中 console.log('列表1',this.tableList) @@ -216,6 +292,18 @@ export default { }, + //切换tag列表 + async segmented(e) { + console.log('切换',e) + //e.id|0=基础信息 1=六要素 + let status = e.id + this.optionTableId = String(status) + this.filteredData.type = e.type//查询类型|resource=客户资源,six_speed=六要素 + + await this.resetFilteredData() + await this.getList() + }, + } } @@ -226,6 +314,10 @@ export default { height: 100%; //background-color: #292929; overflow: auto; + .tab_section{ + padding: 0 20rpx; + padding-top: 30rpx; + } .table_list{ .itme_box { margin-top: 30rpx; @@ -236,11 +328,6 @@ export default { font-size: 28rpx; } .table_section{ - .table_name{ - padding: 20rpx 0; - padding-bottom: 10rpx; - font-size: 28rpx; - } .table_box{ width: 100%; border-collapse: collapse; From 305c23f557c9f9dff9ad2ce0ad72947528ea3357 Mon Sep 17 00:00:00 2001 From: liutong <836164388@qq.com> Date: Thu, 22 May 2025 10:32:38 +0800 Subject: [PATCH 3/8] =?UTF-8?q?refactor(market):=20=E6=B8=85=E7=90=86?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=BA=BF=E7=B4=A2=E6=97=A5=E5=BF=97=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=E5=86=97=E4=BD=99=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除了 tableList 数组中的静态示例数据- 删除了 customTableData 数组及其内容 - 保留了 tableList 作为空数组，为后续动态加载数据做准备 --- pages/market/clue/edit_clues_log.vue | 33 +--------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/pages/market/clue/edit_clues_log.vue b/pages/market/clue/edit_clues_log.vue index af47812..0dc0d53 100644 --- a/pages/market/clue/edit_clues_log.vue +++ b/pages/market/clue/edit_clues_log.vue @@ -168,38 +168,7 @@ export default { customer_resource_id: '',//客户资源表id }, //数据列表 - tableList:[{ - title: '入场', - time: '07:00', - activeColor: '#465CFF' - }, { - title: '主场演讲', - time: '08:00', - descr: '马云（阿里巴巴）', - activeColor: '#465CFF' - }, { - title: '世界互联经济', - time: '08:30', - descr: '马云（阿里巴巴）', - activeColor: '#465CFF' - }, { - title: '打造自己的互联帝国', - time: '09:30', - descr: '马化腾（腾讯）', - activeColor: '#FFB703' - }, { - title: '散场', - time: '11:00', - descr: '请带走垃圾，有序散场。' - }],//表格数据 - - customTableData:[ - { - field:'姓名', - oldValue:'张三', - newValue:'11李四李四李四李四李四李四李四李四李四李四李四123', - } - ], + tableList:[],//表格数据 //tab切换 optionTableId:0,//分段器初始选中项索引 From 0ad456dc33003c983ba44f8c01a1edf6c3694b86 Mon Sep 17 00:00:00 2001 From: liutong <836164388@qq.com> Date: Thu, 22 May 2025 12:00:04 +0800 Subject: [PATCH 4/8] =?UTF-8?q?feat(market):=20=E4=BC=98=E5=8C=96=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E8=B5=84=E6=96=99=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改部门信息展示方式，按校区和部门分别显示 - 优化页面布局，调整用户信息和部门信息的样式- 在我的页面中添加部门信息展示 - 修复意见反馈功能暂时不可用的问题 --- pages/market/my/index.vue | 52 ++++++++++++++++++++++++++++++--------- pages/market/my/info.vue | 14 ++++++++++- 2 files changed, 54 insertions(+), 12 deletions(-) diff --git a/pages/market/my/index.vue b/pages/market/my/index.vue index c281068..0cef266 100644 --- a/pages/market/my/index.vue +++ b/pages/market/my/index.vue @@ -20,12 +20,16 @@ - - 部门 - {{userInfo.department_name_str}} + + + 校区： + {{v.campus_id_name}} + - 等级 - S5 + + 部门： + {{v.dept_name_str}} + @@ -84,10 +88,10 @@ - - 意见反馈 - - + + + + 设置 @@ -165,7 +169,21 @@ export default { }) return } + + + + res.data.cameus_dept_arr.forEach((v,k)=>{ + console.log(111111,v) + let d_arr = [] + v.dept_arr.forEach((dv,dk)=>{ + d_arr.push(dv.dept_name) + }) + //数组转字符串 + v.dept_name_str = d_arr.join('，') + }) + this.userInfo = res.data + console.log('限定',this.userInfo) }, @@ -275,7 +293,7 @@ export default { //用户信息 .user_section { background-color: #29D3B4; - padding-top: 58rpx; + padding-top: 10rpx; padding-bottom: 42rpx; color: #fff; font-size: 28rpx; @@ -314,15 +332,27 @@ export default { padding: 0rpx 40rpx; display: flex; justify-content: space-between; - align-items: center; + align-items: flex-start; .title{ font-size: 28rpx; } + //分割线段 .division{ width: 2px; height: 35rpx; background-color: #fff; } + .left{ + width: 48%; + display: flex; + } + .right{ + width: 48%; + display: flex; + .dept{ + width: 70%; + } + } } } diff --git a/pages/market/my/info.vue b/pages/market/my/info.vue index 9307f9a..fefbe9c 100644 --- a/pages/market/my/info.vue +++ b/pages/market/my/info.vue @@ -39,7 +39,8 @@ 部门 - + + {{formData.department_name_str || '暂无'}} @@ -455,6 +456,7 @@ export default { .btn{} .title{ + min-width: 100rpx; display: flex; align-items: center; font-size: 26rpx; @@ -465,9 +467,19 @@ export default { } } .input{ + display: flex; + justify-content: flex-end; input{ text-align: right; } + .dept{ + width: 50%; + } + .disabled{ + color: #808080; + //禁止图标 + cursor: not-allowed; + } } } } From 11eaa38ffb51707d58178b819bd256d30e46d3ea Mon Sep 17 00:00:00 2001 From: liutong <836164388@qq.com> Date: Thu, 22 May 2025 12:00:34 +0800 Subject: [PATCH 5/8] =?UTF-8?q?refactor(market):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=88=91=E7=9A=84=E9=A1=B5=E9=9D=A2=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除了多余的空行和 console.log 语句 - 提高了代码的可读性和性能 --- pages/market/my/index.vue | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pages/market/my/index.vue b/pages/market/my/index.vue index 0cef266..ce3bf73 100644 --- a/pages/market/my/index.vue +++ b/pages/market/my/index.vue @@ -170,10 +170,7 @@ export default { return } - - res.data.cameus_dept_arr.forEach((v,k)=>{ - console.log(111111,v) let d_arr = [] v.dept_arr.forEach((dv,dk)=>{ d_arr.push(dv.dept_name) @@ -183,7 +180,6 @@ export default { }) this.userInfo = res.data - console.log('限定',this.userInfo) }, From 4768c65f11ed1079aeac1663793c7fefe7d467c8 Mon Sep 17 00:00:00 2001 From: liutong <836164388@qq.com> Date: Thu, 22 May 2025 12:04:56 +0800 Subject: [PATCH 6/8] =?UTF-8?q?refactor(market):=20=E7=A7=BB=E9=99=A4=20fi?= =?UTF-8?q?rm=5Finfo=20=E9=A1=B5=E9=9D=A2=E4=B8=AD=E7=9A=84=E5=86=97?= =?UTF-8?q?=E4=BD=99=E6=96=B9=E6=B3=95-=20=E5=88=A0=E9=99=A4=E4=BA=86?= =?UTF-8?q?=E6=9C=AA=E4=BD=BF=E7=94=A8=E7=9A=84=20privacy=5Fagreement=20?= =?UTF-8?q?=E5=92=8C=20update=5Fpass=20=E6=96=B9=E6=B3=95=20-=E7=AE=80?= =?UTF-8?q?=E5=8C=96=E4=BA=86=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84=EF=BC=8C?= =?UTF-8?q?=E6=8F=90=E9=AB=98=E4=BA=86=E4=BB=A3=E7=A0=81=E7=9A=84=E5=8F=AF?= =?UTF-8?q?=E8=AF=BB=E6=80=A7=E5=92=8C=E7=BB=B4=E6=8A=A4=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/market/my/firm_info.vue | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pages/market/my/firm_info.vue b/pages/market/my/firm_info.vue index 6c37a21..a76543a 100644 --- a/pages/market/my/firm_info.vue +++ b/pages/market/my/firm_info.vue @@ -87,16 +87,6 @@ import memberApi from '@/api/member.js'; console.log(123,this.dataInfo) }, - privacy_agreement(type){ - uni.navigateTo({ - url: '/pages/common/privacy_agreement?type='+type - }) - }, - update_pass(){ - uni.navigateTo({ - url: '/pages/market/my/update_pass' - }) - } } } From c1f59759f7fa2305041678d75e344667cb4edda1 Mon Sep 17 00:00:00 2001 From: liutong <836164388@qq.com> Date: Thu, 22 May 2025 16:25:47 +0800 Subject: [PATCH 7/8] =?UTF-8?q?feat(market):=20=E4=BF=AE=E6=94=B9=E5=AF=86?= =?UTF-8?q?=E7=A0=81=E5=8A=9F=E8=83=BD=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加验证旧密码功能- 新增上一步按钮，优化用户体验 - 完善新密码设置流程，增加密码长度和一致性校验 - 实现密码修改后的成功提示和自动跳转到个人中心 - 优化页面样式，调整按钮布局 --- api/apiRoute.js | 16 ++++ pages/market/my/update_pass.vue | 165 +++++++++++++++++++++++++++----- 2 files changed, 159 insertions(+), 22 deletions(-) diff --git a/api/apiRoute.js b/api/apiRoute.js index c0f67d8..7903f78 100644 --- a/api/apiRoute.js +++ b/api/apiRoute.js @@ -52,6 +52,22 @@ export default { return res; }) }, + //公共端-教师/销售端验证旧密码是否正确 + common_personnelCheckOldPwd(data = {}) { + let url = '/personnel/checkOldPwd' + return http.post(url, data).then(res => { + return res; + }) + }, + + //公共端-教师/销售端验证旧密码是否正确 + common_personnelEdidPassword(data = {}) { + let url = '/personnel/edidPassword' + return http.post(url, data).then(res => { + return res; + }) + }, + diff --git a/pages/market/my/update_pass.vue b/pages/market/my/update_pass.vue index 3544848..486fe37 100644 --- a/pages/market/my/update_pass.vue +++ b/pages/market/my/update_pass.vue @@ -2,7 +2,7 @@ @@ -104,4 +219,10 @@ color: #999999; padding-left: 30rpx; } + + .btn_box{ + display: flex; + flex-direction: column; + gap: 40rpx; + } \ No newline at end of file From d4d17b2d884fa52fd3faab4d1bc63d96514dfe30 Mon Sep 17 00:00:00 2001 From: liutong <836164388@qq.com> Date: Thu, 22 May 2025 18:07:34 +0800 Subject: [PATCH 8/8] =?UTF-8?q?feat(api):=20=E6=B7=BB=E5=8A=A0=E9=94=80?= =?UTF-8?q?=E5=94=AE=E7=AB=AF=E6=B2=9F=E9=80=9A=E8=AE=B0=E5=BD=95=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 apiRoute.js 中新增 xs_communicationRecordsAdd 方法，用于添加沟通记录 - 在市场线索页面中调用该方法，实现电话沟通记录的添加 - 优化了电话拨打流程，添加了沟通记录保存逻辑 --- api/apiRoute.js | 8 ++++++++ pages/market/clue/index.vue | 31 ++++++++++++++++++++----------- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/api/apiRoute.js b/api/apiRoute.js index 7903f78..f483e37 100644 --- a/api/apiRoute.js +++ b/api/apiRoute.js @@ -198,6 +198,14 @@ export default { }) }, + //销售端-沟通记录-添加 + xs_communicationRecordsAdd(data = {}) { + let url = '/communicationRecords/add' + return http.post(url, data).then(res => { + return res; + }) + }, + diff --git a/pages/market/clue/index.vue b/pages/market/clue/index.vue index f29f3b4..83737f4 100644 --- a/pages/market/clue/index.vue +++ b/pages/market/clue/index.vue @@ -3,8 +3,6 @@ - -