From 43c7301cbb3245633e531163f2b4d1aefea0bd03 Mon Sep 17 00:00:00 2001 From: liutong <836164388@qq.com> Date: Fri, 13 Jun 2025 11:49:23 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat(market):=20=E6=88=91=E7=9A=84=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加搜索抽屉，支持用户名、手机号和时间范围筛选 - 优化搜索逻辑，重置筛选条件并更新数据列表 - 调整搜索框样式，增加点击事件以打开抽屉 --- pages/market/clue/index.vue | 165 +++++++++++++++++++++++++++++++----- 1 file changed, 145 insertions(+), 20 deletions(-) diff --git a/pages/market/clue/index.vue b/pages/market/clue/index.vue index 2163f43..6732e86 100644 --- a/pages/market/clue/index.vue +++ b/pages/market/clue/index.vue @@ -11,12 +11,12 @@ @scrolltolower="loadMoreData_1" style="height: 100vh;" > - + - - + + 用户名/手机号/时间范围 - 搜索 + 搜索 @@ -79,10 +79,10 @@ > - - + + 用户名/手机号/时间范围 - 搜索 + 搜索 @@ -132,10 +132,54 @@ + + + + + + 筛选 + + + + + 时间筛选 + + + + + + + + + 姓名筛选 + + + + + + + + + 电话筛选 + + + + + + + + + + + + + + + @@ -166,9 +210,6 @@ export default { is_gh: '2',//1=资源分配,2=我的客户 }, - - - //顶部Tab栏 values: [ { @@ -191,6 +232,8 @@ export default { total:10,//数据总条数 shared_by:'',//共享人ID|0=未分配 shared_at_str:'',//共享时间|开始时间(Y-m-d)-结束时间(Y-m-d) + phone_number:'',//客户资源表-手机号 + name:'',//客户资源表-用户姓名 }, //数据列表 tableList_1:[],//表格数据 @@ -203,6 +246,8 @@ export default { total:10,//数据总条数 shared_by:'0',//共享人ID|0=未分配 shared_at_str:'',//共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)] + phone_number:'',//客户资源表-手机号 + name:'',//客户资源表-用户姓名 }, //数据列表 tableList_2:[],//表格数据 @@ -220,6 +265,15 @@ export default { //时间选择器相关 date_picker_show:false,//是否展示时间选择器 + //抽屉搜索条件展示窗相关 + showDrawer:false,//是否展示|false=否 + showDrawerForm:{ + shared_at_str:'',//共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)] + phone_number:'',//客户资源表-手机号 + name:'',//客户资源表-用户姓名 + }, + + } }, onLoad(options) {}, @@ -435,12 +489,25 @@ export default { //切换tag列表 async segmented(param) { this.segmented_type = param.id//1=我的客户,2=资源分配 + + //重置筛选抽屉中的表单数据 + this.showDrawerForm.shared_at_str = ''//共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)] + this.showDrawerForm.phone_number = ''//客户资源表-手机号 + this.showDrawerForm.name = ''//客户资源表-用户姓名 + if(this.segmented_type == 1){ + this.filteredData_1.shared_at_str = ''//共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)] + this.filteredData_1.phone_number = ''//客户资源表-手机号 + this.filteredData_1.name = ''//客户资源表-用户姓名 + //我的客户 //重置为第一页 await this.resetFilteredData_1() await this.getList_1() }else{ + this.filteredData_2.shared_at_str = ''//共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)] + this.filteredData_2.phone_number = ''//客户资源表-手机号 + this.filteredData_2.name = ''//客户资源表-用户姓名 //资源分配 //重置为第一页 await this.resetFilteredData_2() @@ -557,14 +624,7 @@ export default { changeDatePicker(e){ console.log('时间',e) let shared_at_str = `${e.startDate.result} ~ ${e.endDate.result}` - - if (this.segmented_type == 1) { - //我的客户 - this.filteredData_1.shared_at_str = shared_at_str - } else { - //资源分配 - this.filteredData_2.shared_at_str = shared_at_str - } + this.showDrawerForm.shared_at_str = shared_at_str this.cancelDatePicker() }, //打开时间选择器 @@ -579,14 +639,30 @@ export default { //检索数据 async searchData(){ if(this.segmented_type == 1){ + this.filteredData_1.shared_at_str = this.showDrawerForm.shared_at_str//共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)] + this.filteredData_1.phone_number = this.showDrawerForm.phone_number//客户资源表-手机号 + this.filteredData_1.name = this.showDrawerForm.name//客户资源表-用户姓名 //我的客户 await this.resetFilteredData_1() await this.getList_1() }else{ + this.filteredData_2.shared_at_str = this.showDrawerForm.shared_at_str//共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)] + this.filteredData_2.phone_number = this.showDrawerForm.phone_number//客户资源表-手机号 + this.filteredData_2.name = this.showDrawerForm.name//客户资源表-用户姓名 //资源分配 await this.resetFilteredData_2() await this.getList_2() } + this.closeShowDrawer() + }, + + //打开抽屉筛选弹窗 + openShowDrawer(){ + this.showDrawer = true + }, + //关闭抽屉筛选弹窗 + closeShowDrawer(){ + this.showDrawer = false } } } @@ -609,8 +685,13 @@ export default { justify-content: center; .input_box { width: 75%; - ::v-deep .fui-input__wrap{ - height: 100%; + .input_box_text{ + height: 60rpx; + line-height: 60rpx; + background-color: #fff; + padding-left: 20rpx; + color: #cccccc; + font-size: 28rpx; } } .button{ @@ -723,4 +804,48 @@ export default { height: 50rpx; background-color: #F59A23; } + + //抽屉搜索栏 + .fui-scroll__view { + margin-top: 60rpx; + width: 520rpx; + flex: 1; + overflow: hidden; + .fui-title { + padding: 40rpx 32rpx; + padding-bottom: 20rpx; + box-sizing: border-box; + font-weight: bold; + } + .drawer_box{ + border: 1px solid red; + .item{ + display: flex; + flex-direction: column; + gap: 15rpx; + .title{} + .input_box { + border: 1px solid #292929; + width: 450rpx; + ::v-deep .fui-input__wrap{ + padding: 10rpx !important; + height: 100%; + } + } + } + } + .fui-btn__box { + padding: 40rpx 0; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + gap: 30rpx; + } + } + + + + + From bd8990299fe4c32e084a20311265cdc5702cfecc Mon Sep 17 00:00:00 2001 From: liutong <836164388@qq.com> Date: Fri, 13 Jun 2025 15:08:38 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat(market):=20=E4=BC=98=E5=8C=96=E7=BA=BF?= =?UTF-8?q?=E7=B4=A2=E6=9D=A5=E6=BA=90=E9=80=89=E6=8B=A9=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改线索添加和编辑页面的来源选择逻辑 - 当选择非线上来源时，自动设置来源渠道为线下 -调整表单字段显示逻辑，根据来源类型动态显示来源渠道字段 --- api/apiRoute.js | 24 +++ pages.json | 9 ++ pages/market/clue/clue_info.vue | 9 ++ pages/market/clue/order_list.vue | 262 +++++++++++++++++++++++++++++++ 4 files changed, 304 insertions(+) create mode 100644 pages/market/clue/order_list.vue diff --git a/api/apiRoute.js b/api/apiRoute.js index 1cdf8bd..081d694 100644 --- a/api/apiRoute.js +++ b/api/apiRoute.js @@ -413,6 +413,30 @@ export default { }) }, + //员工端(销售)-订单管理-列表 + xs_orderTableList(data = {}) { + let url = '/orderTable' + return http.get(url, data).then(res => { + return res; + }) + }, + + //员工端(销售)-订单管理-详情 + xs_orderTableInfo(data = {}) { + let url = '/orderTable/info' + return http.get(url, data).then(res => { + return res; + }) + }, + + //员工端(销售)-订单管理-添加 + xs_orderTableAdd(data = {}) { + let url = '/orderTable/add' + return http.post(url, data).then(res => { + return res; + }) + }, + diff --git a/pages.json b/pages.json index 1bc726a..7bec910 100644 --- a/pages.json +++ b/pages.json @@ -483,6 +483,15 @@ "navigationBarBackgroundColor": "#29d3b4", "navigationBarTextStyle": "black" } + }, + { + "path": "pages/market/clue/order_list", + "style": { + "navigationBarTitleText": "订单列表", + "navigationStyle": "default", + "navigationBarBackgroundColor": "#29d3b4", + "navigationBarTextStyle": "black" + } }, { "path": "pages/market/clue/index", diff --git a/pages/market/clue/clue_info.vue b/pages/market/clue/clue_info.vue index 78a09b7..e6be625 100644 --- a/pages/market/clue/clue_info.vue +++ b/pages/market/clue/clue_info.vue @@ -261,6 +261,7 @@ 编辑详情 拨打电话 修改记录 + 订单列表 @@ -374,6 +375,14 @@ }) }, + //跳转页面-订单列表 + openViewOrder() { + let resource_id = this.clientInfo.resource_id + this.$navigateTo({ + url: `/pages/market/clue/order_list?resource_id=${resource_id}` + }) + }, + //跳转页面-转接跟进任务 openViewNewTask() { this.$navigateTo({ diff --git a/pages/market/clue/order_list.vue b/pages/market/clue/order_list.vue new file mode 100644 index 0000000..5da2bd0 --- /dev/null +++ b/pages/market/clue/order_list.vue @@ -0,0 +1,262 @@ + + + + + + \ No newline at end of file From 96d6798bbec01806b59ea77a9703277ab70cda9b Mon Sep 17 00:00:00 2001 From: liutong <836164388@qq.com> Date: Fri, 13 Jun 2025 15:22:37 +0800 Subject: [PATCH 3/4] =?UTF-8?q?refactor(market):=20=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E5=B8=83?= =?UTF-8?q?=E5=B1=80=E5=92=8C=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改了订单列表页面的顶部标题为"订单状态" - 移除了下载合同按钮 - 重新安排了订单信息的展示格式，包括客户姓名、付款类型、订单金额、课程、班级、人员和支付时间等字段 - 在 clue_info 页面中添加了 resource_id 字段 - 修改了 order_list 页面的 onLoad 方法，获取 resource_id 参数 - 更新了订单列表 API调用方式 --- pages/market/clue/clue_info.vue | 3 +- pages/market/clue/order_list.vue | 57 ++++++++++++++++++++++++-------- 2 files changed, 46 insertions(+), 14 deletions(-) diff --git a/pages/market/clue/clue_info.vue b/pages/market/clue/clue_info.vue index e6be625..f91da5e 100644 --- a/pages/market/clue/clue_info.vue +++ b/pages/market/clue/clue_info.vue @@ -281,6 +281,7 @@ resource_sharing_id:'',//共享资源表id clientInfo:{ id:'',//共享资源id + resource_id:'',//客户资源id customerResource:{},//客户资源信息 sixSpeed:{},//六要素信息 },//共享资源详情 @@ -377,7 +378,7 @@ //跳转页面-订单列表 openViewOrder() { - let resource_id = this.clientInfo.resource_id + let resource_id = this.clientInfo.resource_id//客户资源id this.$navigateTo({ url: `/pages/market/clue/order_list?resource_id=${resource_id}` }) diff --git a/pages/market/clue/order_list.vue b/pages/market/clue/order_list.vue index 5da2bd0..0ef299a 100644 --- a/pages/market/clue/order_list.vue +++ b/pages/market/clue/order_list.vue @@ -16,22 +16,47 @@ :key="k" > - 企业合同 - 下载合同 + 订单状态 + - 合同名称： - {{v.title}} + 客户姓名： + {{ v.resource_id_name }} + - 签署方： - {{v.signatory_a}} + 付款类型： + + {{ v.payment_type === 'cash' ? '现金支付' : v.payment_type === 'scan_code' ? '扫码支付' : '订阅支付' }} + + + + 订单金额： + ￥{{ v.order_amount }} + + - 签署方： - {{v.signatory_b}} + 课程： + {{ v.course_id_name }} + + + 班级： + {{ v.class_id_name }} + + + + 人员： + {{ v.staff_id_name }} + + + + 支付时间： + {{ v.payment_time }} + + @@ -41,8 +66,8 @@