diff --git a/pages/customer/filterList/index.js b/pages/customer/filterList/index.js index f1637aa..daba093 100644 --- a/pages/customer/filterList/index.js +++ b/pages/customer/filterList/index.js @@ -21,6 +21,7 @@ Page({ v_id:'',//车型级别id cfrom:'',//客户来源 o_type:'',//排序类型 + ismy:'',//只显示自己订单 1是 }, onLoad(options) { for (let key in options) { @@ -48,6 +49,9 @@ Page({ let params = {}; params['page'] = this.data.pageNo; params['size'] = 10; + if(this.data.ismy != ''){ + params['ismy'] = this.data.ismy; + } if(this.data.istop != ''){ params['istop'] = this.data.istop; } diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 059afae..bfb472c 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -15,14 +15,14 @@ 客户代办事项 - + {{userCal.wl_count}} 未联系潜客(人) - + {{userCal.gz_count}} diff --git a/pages/mine/index.wxml b/pages/mine/index.wxml index 11f11c7..992bcb5 100644 --- a/pages/mine/index.wxml +++ b/pages/mine/index.wxml @@ -9,6 +9,7 @@ {{userInfo.uname}} + ({{userInfo.group_name}}) {{userInfo.biz_name}} diff --git a/pages/mine/install/index.wxml b/pages/mine/install/index.wxml index 16a6327..5b39134 100644 --- a/pages/mine/install/index.wxml +++ b/pages/mine/install/index.wxml @@ -10,6 +10,7 @@ {{userInfo.uname}} + ({{userInfo.group_name}}) {{userInfo.biz_name}} diff --git a/pages/mine/install/staff/index.wxml b/pages/mine/install/staff/index.wxml index f8f4874..8f23556 100644 --- a/pages/mine/install/staff/index.wxml +++ b/pages/mine/install/staff/index.wxml @@ -10,6 +10,7 @@ {{userInfo.uname}} + ({{userInfo.group_name}}) {{userInfo.biz_name}} diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js index 7fc27cd..44fb84d 100644 --- a/pages/order/detail/index.js +++ b/pages/order/detail/index.js @@ -17,7 +17,7 @@ Page({ isShowSelectContract:false, banksIndex:-1,//分期银行 yearsIndex:-1,//分期年限 - money:'',//首付金额 + money:'',//贷款金额 submitFlag:false, frontUrl:{}, backUrl:{}, @@ -225,7 +225,7 @@ Page({ }) }else if(that.data.money == '' ){ wx.showToast({ - title: '请填写首付金额', + title: '请填写贷款金额', icon: 'none' }) }else{ @@ -271,7 +271,7 @@ Page({ }) }else if(that.data.money == '' && that.data.info.loan_data.money == '0.00'){ wx.showToast({ - title: '请填写首付金额', + title: '请填写贷款金额', icon: 'none' }) }else{ diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml index 6a4e121..0e64bca 100644 --- a/pages/order/detail/index.wxml +++ b/pages/order/detail/index.wxml @@ -70,7 +70,7 @@ - 首付金额 + 贷款金额 @@ -89,7 +89,7 @@ {{info.loan_data.year}} - 首付金额 + 贷款金额 {{info.loan_data.money}}元 diff --git a/pages/order/filterList/index.js b/pages/order/filterList/index.js index d944df9..e2e8959 100644 --- a/pages/order/filterList/index.js +++ b/pages/order/filterList/index.js @@ -12,6 +12,7 @@ Page({ isShowMessage:false,//是否显示短信弹窗 content:'',//短信内容 isRefresh:false,//判断返回是否需要刷新 + ismy:'',//只显示自己订单 1是 }, onLoad: function (options) { for (let key in options) { @@ -26,7 +27,7 @@ Page({ }) }, - //获取客户列表 + //获取订单列表 getAppCusorderList() { this.setData({ load: false, @@ -36,6 +37,9 @@ Page({ params['page'] = this.data.pageNo; params['size'] = 10; params['status'] = this.data.key; + if(this.data.ismy != ''){ + params['ismy'] = this.data.ismy; + } _.apiQuery.getAppCusorderList(params).then(res => { this.setData({ pageNo: this.data.pageNo + 1, diff --git a/pages/order/register/index.js b/pages/order/register/index.js index 32d71c3..7804451 100644 --- a/pages/order/register/index.js +++ b/pages/order/register/index.js @@ -66,6 +66,8 @@ Page({ let params = {}; params['page'] = this.data.pageNo; params['size'] = 20; + params['status'] = 2; + params['ismy'] = 1; _.apiQuery.getAppCustomersList(params).then(res => { this.setData({ pageNo: this.data.pageNo + 1, diff --git a/pages/order/register/index.wxml b/pages/order/register/index.wxml index cc93cbb..28a27cc 100644 --- a/pages/order/register/index.wxml +++ b/pages/order/register/index.wxml @@ -4,8 +4,8 @@ 用户信息 销售顾问:{{userInfo.uname}} - - 请选择客户 + + {{customer.length>0?'请选择客户':'暂无可选客户'}} {{customer[customerIndex].name}} 手机号:{{customer[customerIndex].mobile}}