diff --git a/commons/js/config.js b/commons/js/config.js index e8b5f94..5fd6040 100644 --- a/commons/js/config.js +++ b/commons/js/config.js @@ -1,4 +1,4 @@ -const env = "p"; +const env = "d"; const version = 1, diff --git a/pages/customer/filterList/index.js b/pages/customer/filterList/index.js index e2849f5..834b6a0 100644 --- a/pages/customer/filterList/index.js +++ b/pages/customer/filterList/index.js @@ -47,7 +47,7 @@ Page({ }) } - //回访待跟进tab + //顶部tab this.getAppCustomersVisit_tabs() //销售顾问 diff --git a/pages/customer/filterList/index.wxml b/pages/customer/filterList/index.wxml index 43f2ca6..dd53e7d 100644 --- a/pages/customer/filterList/index.wxml +++ b/pages/customer/filterList/index.wxml @@ -23,7 +23,7 @@ - + {{item.tip}} {{item.defeat}} @@ -68,7 +68,30 @@ {{value}} - + + + + {{item.tip}} + {{item.defeat}} + {{item.orders_pay}} + + + + {{item.nickname}} + + + + {{key}} + + + {{value}} + 待分配 + {{value?'重新分配':'分配'}} + + + {{value}} + + diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 0a09f08..8a225dc 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -43,7 +43,7 @@ 数据看板 - + {{item.today.value}}/{{item.month.value}} {{item.today.title}}/{{item.month.title}} diff --git a/pages/order/filterList/index2.js b/pages/order/filterList/index2.js index 6cf57f8..0bcadc3 100644 --- a/pages/order/filterList/index2.js +++ b/pages/order/filterList/index2.js @@ -19,6 +19,9 @@ Page({ staffobj: [], employeeIndex:-1,//分配销售索引 employee_id:'',//分配销售ID + + tab:[],//回访待跟进tab + visit_tab_id:'',//回访待跟进tabid }, onLoad: function (options) { for (let key in options) { @@ -26,7 +29,11 @@ Page({ [key]: options[key] }) } - this.getAppCusorderV2List() + + //顶部tab + this.getAppCustomersVisit_tabs() + + //this.getAppCusorderV2List() wx.setNavigationBarTitle({ title: this.data.title||'订单' @@ -36,6 +43,26 @@ Page({ this.getAppUserAdmins() }, + //回访待跟进tab + getAppCustomersVisit_tabs() { + let params = {}; + if(this.data.status != ''){ + params['status'] = this.data.status; + } + _.apiQuery.getAppCustomersVisit_tabs(params).then(res => { + if(res.data.list.length>0){ + this.setData({ + tab:res.data.list, + visit_tab_id:res.data.list[0].id, + }) + } + + this.getAppCusorderV2List() + + wx.stopPullDownRefresh() + }); + }, + //获取订单列表 getAppCusorderV2List() { this.setData({ @@ -51,6 +78,9 @@ Page({ if(this.data.type != ''){ params['type'] = this.data.type; } + if(this.data.visit_tab_id != ''){ + params['visit_tab_id'] = this.data.visit_tab_id; + } _.apiQuery.getAppCusorderV2List(params).then(res => { this.setData({ pageNo: this.data.pageNo + 1, @@ -230,6 +260,20 @@ Page({ } }, + //切换tab + changeTab(e){ + this.setData({ + list: [], + pageNo: 1, + noData: false, + end: false, + load: true, + loading: false, + visit_tab_id: e.currentTarget.dataset.id, + }) + this.getAppCusorderV2List() + }, + //页面相关事件处理函数--监听用户下拉动作 onPullDownRefresh(){ this.setData({ diff --git a/pages/order/filterList/index2.wxml b/pages/order/filterList/index2.wxml index 8bb35e6..f95c959 100644 --- a/pages/order/filterList/index2.wxml +++ b/pages/order/filterList/index2.wxml @@ -1,6 +1,26 @@ - + + + + + + + {{item.name}} + + + + + + + {{item.name}} + + + + + + +