diff --git a/commons/js/config.js b/commons/js/config.js
index bc9ae3e..ab04cee 100644
--- a/commons/js/config.js
+++ b/commons/js/config.js
@@ -32,6 +32,9 @@ api = {
appSmsCustomer: "app/sms/customer", //发短信
appCustomerlogs: "app/customerlogs", //获取日志
appCustomerData: "app/customers/data", //获取客户详细信息
+
+ appCusorder: "app/cusorder", //新建订单 /获取订单列表 /获取订单详情 /修改付款方式
+ appCusorderTabs: "app/cusorder/tabs", //获取tab
}
diff --git a/commons/js/utils/apiQuery.js b/commons/js/utils/apiQuery.js
index aadeb8e..57093c0 100644
--- a/commons/js/utils/apiQuery.js
+++ b/commons/js/utils/apiQuery.js
@@ -117,13 +117,20 @@ apiQuery.getAppCustomersTabs = function (params) {
})
}
-//获取客户列表 /获取客户详情
-apiQuery.getAppCustomers = function (params) {
+//获取客户列表
+apiQuery.getAppCustomersList = function (params) {
return new Promise(function (resolve, reject) {
HttpRequest(false, Config.api.appCustomers, 2, params, "GET", resolve, reject)
})
}
+//获取客户详情
+apiQuery.getAppCustomersDetails = function (params) {
+ return new Promise(function (resolve, reject) {
+ HttpRequest(true, Config.api.appCustomers, 2, params, "GET", resolve, reject)
+ })
+}
+
//获取列表筛选条件
apiQuery.getAppCustomersFilter = function (params) {
return new Promise(function (resolve, reject) {
@@ -166,4 +173,41 @@ apiQuery.getAppCustomerData = function (params) {
})
}
+//获取订单列表
+apiQuery.getAppCusorderList = function (params) {
+ return new Promise(function (resolve, reject) {
+ HttpRequest(false, Config.api.appCusorder, 2, params, "GET", resolve, reject)
+ })
+}
+
+//获取订单详情
+apiQuery.getAppCusorderDetails = function (params) {
+ return new Promise(function (resolve, reject) {
+ HttpRequest(true, Config.api.appCusorder, 2, params, "GET", resolve, reject)
+ })
+}
+
+//新建订单
+apiQuery.postAppCusorder = function (params) {
+ return new Promise(function (resolve, reject) {
+ HttpRequest(true, Config.api.appCusorder, 2, params, "POST", resolve, reject)
+ })
+}
+
+//修改付款方式
+apiQuery.putAppCusorder = function (params) {
+ return new Promise(function (resolve, reject) {
+ HttpRequest(true, Config.api.appCusorder, 2, params, "PUT", resolve, reject)
+ })
+}
+
+//获取tab
+apiQuery.getAppCusorderTabs = function (params) {
+ return new Promise(function (resolve, reject) {
+ HttpRequest(false, Config.api.appCusorderTabs, 2, params, "GET", resolve, reject)
+ })
+}
+
+
+
export default apiQuery;
\ No newline at end of file
diff --git a/pages/customer/addCard/index.js b/pages/customer/addCard/index.js
index 6efdcd9..da26351 100644
--- a/pages/customer/addCard/index.js
+++ b/pages/customer/addCard/index.js
@@ -19,7 +19,11 @@ Page({
},
//生命周期函数--监听页面加载
onLoad: function (options) {
-
+ for (let key in options) {
+ this.setData({
+ [key]: options[key]
+ })
+ }
this.getAppSeriesCars()
},
diff --git a/pages/customer/detail/index.js b/pages/customer/detail/index.js
index ba9e009..663dfb5 100644
--- a/pages/customer/detail/index.js
+++ b/pages/customer/detail/index.js
@@ -29,7 +29,7 @@ Page({
})
}
- this.getAppCustomers()
+ this.getAppCustomersDetails()
this.getAppCustomerData()
this.getAppCustomerlogs()
this.getAppCustomersTabs()
@@ -40,10 +40,10 @@ Page({
},
//获取客户详情
- getAppCustomers(){
+ getAppCustomersDetails(){
let params = {};
params['id'] = this.data.id;
- _.apiQuery.getAppCustomers(params).then(res=>{
+ _.apiQuery.getAppCustomersDetails(params).then(res=>{
this.setData({
detailinfo:res.data,
//statuskey:res.data.status,
@@ -248,7 +248,7 @@ Page({
load: true,
loading: false,
})
- this.getAppCustomers()
+ this.getAppCustomersDetails()
this.getAppCustomerData()
this.getAppCustomerlogs()
},
diff --git a/pages/customer/index.js b/pages/customer/index.js
index 5969fab..d216582 100644
--- a/pages/customer/index.js
+++ b/pages/customer/index.js
@@ -79,7 +79,7 @@ Page({
key:this.data.key==''?res.data[0].key:this.data.key,
})
- this.getAppCustomers()
+ this.getAppCustomersList()
wx.stopPullDownRefresh()
});
@@ -119,7 +119,7 @@ Page({
},
//获取客户列表
- getAppCustomers() {
+ getAppCustomersList() {
this.setData({
load: false,
loading: true,
@@ -152,7 +152,7 @@ Page({
if(this.data.o_type != ''){
params['o_type'] = this.data.o_type;
}
- _.apiQuery.getAppCustomers(params).then(res => {
+ _.apiQuery.getAppCustomersList(params).then(res => {
this.setData({
flag: this.data.flag - 1
})
@@ -243,7 +243,7 @@ Page({
loading: false,
flag: this.data.flag + 1
})
- this.getAppCustomers()
+ this.getAppCustomersList()
},
//排序方式
@@ -495,7 +495,7 @@ Page({
loading: false,
flag: this.data.flag + 1
})
- this.getAppCustomers()
+ this.getAppCustomersList()
},
//页面上拉触底事件的处理函数
@@ -504,7 +504,7 @@ Page({
this.setData({
flag: this.data.flag + 1
})
- this.getAppCustomers()
+ this.getAppCustomersList()
},
})
\ No newline at end of file
diff --git a/pages/order/index.js b/pages/order/index.js
index 193b6b4..1fd0cf4 100644
--- a/pages/order/index.js
+++ b/pages/order/index.js
@@ -25,18 +25,18 @@ Page({
[key]: options[key]
})
}
- this.getAppCustomersTabs()
+ this.getAppCusorderTabs()
},
//客户-tab
- getAppCustomersTabs() {
- _.apiQuery.getAppCustomersTabs().then(res => {
+ getAppCusorderTabs() {
+ _.apiQuery.getAppCusorderTabs().then(res => {
this.setData({
tab:res.data,
key:this.data.key==''?res.data[0].key:this.data.key,
})
- this.getAppCustomers()
+ this.getAppCusorderList()
wx.stopPullDownRefresh()
});
@@ -51,7 +51,7 @@ Page({
},
//获取客户列表
- getAppCustomers() {
+ getAppCusorderList() {
this.setData({
load: false,
loading: true,
@@ -63,7 +63,7 @@ Page({
if(this.data.searchInp.value != ''){
params['keyword'] = this.data.searchInp.value;
}
- _.apiQuery.getAppCustomers(params).then(res => {
+ _.apiQuery.getAppCusorderList(params).then(res => {
this.setData({
flag: this.data.flag - 1
})
@@ -135,7 +135,7 @@ Page({
loading: false,
flag: this.data.flag + 1
})
- this.getAppCustomers()
+ this.getAppCusorderList()
},
//显示短信弹框
@@ -209,7 +209,7 @@ Page({
loading: false,
flag: this.data.flag + 1
})
- this.getAppCustomers()
+ this.getAppCusorderList()
},
//页面上拉触底事件的处理函数
@@ -218,7 +218,7 @@ Page({
this.setData({
flag: this.data.flag + 1
})
- this.getAppCustomers()
+ this.getAppCusorderList()
},
})
\ No newline at end of file
diff --git a/pages/order/index.wxml b/pages/order/index.wxml
index dc8f632..d367fde 100644
--- a/pages/order/index.wxml
+++ b/pages/order/index.wxml
@@ -11,11 +11,13 @@
+
+
@@ -38,12 +40,7 @@
({{item.mobile}})
-
- {{tag}}
-
-
- ...
-
+ {{item.status_name}}
@@ -73,115 +70,11 @@
-
+
取消
- 确定
+ 确定
-
-
-
-
-
-
- 建卡开始时间
-
-
- 请选择
- {{c_time}}
-
-
-
-
-
- 建卡结束时间
-
-
- 请选择
- {{c_time}}
-
-
-
-
-
- 常用时间段
-
-
-
- {{item.title}}
-
-
-
-
-
- 是否试驾
-
-
-
- {{item.title}}
-
-
-
-
-
- 意向等级
-
-
- 请选择
- {{c_time}}
-
-
-
-
-
- 意向车名
-
-
- 请选择
- {{c_time}}
-
-
-
-
-
- 车型级别
-
-
- 请选择
- {{c_time}}
-
-
-
-
-
- 客户来源
-
-
- 请选择
- {{c_time}}
-
-
-
-
-
- 到店次数
-
-
- 请选择
- {{c_time}}
-
-
-
-
-
-
-
-
- 重置
- 确定
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/pages/order/register/index.js b/pages/order/register/index.js
index 2479f20..1b3450a 100644
--- a/pages/order/register/index.js
+++ b/pages/order/register/index.js
@@ -1,54 +1,258 @@
-// pages/order/register/index.js
+import _ from '../../../commons/js/commons'
+const app = getApp()
Page({
data: {
- customerIndex:0,
- customer:[
- {
- "id":0,
- "title":"林先生",
- 'tel':"134*****382",
- },
- {
- "id":1,
- "title":"欧泰票",
- 'tel':"134*****382",
- },
- {
- "id":2,
- "title":"史蒂夫",
- 'tel':"134*****382",
- },
- {
- "id":3,
- "title":"林先生",
- 'tel':"134*****382",
- },
- {
- "id":4,
- "title":"欧泰票",
- 'tel':"134*****382",
- },
- {
- "id":5,
- "title":"史蒂夫",
- 'tel':"134*****382",
- },
- ],
+ car_id:'',//车型id
+ v_id:'',//车型级别id
+ color_id:'',//颜色id
+ b_s_id:'',//备选车型id
+ buy_time:'',//预计购车时间
+ modelIndex:-1,//品牌车型索引
+ spareIndex:-1,//备选车型索引
+ colorArray:[],//车型颜色列表
+ levelArray:[],//车型级别列表
+ colorIndex:-1,//车型颜色索引
+ levelIndex:-1,//车型级别索引
+ submitFlag:false,
+
+ customerIndex:-1,
+ customer: [],//客户列表
+ pageNo: 1,
+ noData: false,
+ end: false,
+ load: true,
+ loading: false,
isShowSelectCustomer:false,
+
+ paymentIndex:-1,
+ payment:['全款', '分期',],
+
+ agencyIndex:-1,
+ agency:['需要', '不需要',],
+
},
+ //生命周期函数--监听页面加载
onLoad: function (options) {
+ for (let key in options) {
+ this.setData({
+ [key]: options[key]
+ })
+ }
- },
- onShow: function () {
+ this.getAppCustomersList()
+ this.getAppSeriesCars()
},
- //单选
+ //获取客户列表
+ getAppCustomersList(){
+ this.setData({
+ load: false,
+ loading: true,
+ })
+ let params = {};
+ params['page'] = this.data.pageNo;
+ params['size'] = 20;
+ _.apiQuery.getAppCustomersList(params).then(res => {
+ this.setData({
+ pageNo: this.data.pageNo + 1,
+ customer: this.data.customer.concat(res.data.list),
+ load: true,
+ loading: false,
+ })
+ if (res.data.total == 0) {
+ this.setData({
+ noData: true
+ })
+ } else if (this.data.customer.length == res.data.total) {
+ this.setData({
+ end: true
+ })
+ }
+ wx.stopPullDownRefresh()
+ });
+ },
+
+ //获取车型库
+ getAppSeriesCars(){
+ _.apiQuery.getAppSeriesCars().then(res => {
+ if(res.data.length>0){
+ let modelArray = []
+ res.data.forEach(item => {
+ modelArray.push(item.title)
+ })
+ this.setData({
+ modelArray:modelArray,
+ modelList:res.data,
+ })
+ }
+ });
+ },
+
+ //获取车型属性 /颜色 /车型级别
+ getAppSeriesAttrs(){
+ let params1 = {};
+ params1['id'] = this.data.car_id;
+ params1['type'] = 0;
+ _.apiQuery.getAppSeriesAttrs(params1).then(res => {
+ if(res.data.total>0){
+ let colorArray = []
+ res.data.list.forEach(item => {
+ colorArray.push(item.title)
+ })
+ this.setData({
+ colorArray:colorArray,
+ colorList:res.data.list,
+ colorIndex:-1,
+ })
+ }
+ });
+
+ let params2 = {};
+ params2['id'] = this.data.car_id;
+ params2['type'] = 1;
+ _.apiQuery.getAppSeriesAttrs(params2).then(res => {
+ if(res.data.total>0){
+ let levelArray = []
+ res.data.list.forEach(item => {
+ levelArray.push(item.title)
+ })
+ this.setData({
+ levelArray:levelArray,
+ levelList:res.data.list,
+ levelIndex:-1,
+ })
+ }
+ });
+ },
+
+ //选择车型
+ changeModel(e) {
+ let car_id = ''
+ if(e.detail.value >= 0){
+ car_id = this.data.modelList[e.detail.value].id
+ }
+ this.setData({
+ car_id:car_id,
+ modelIndex:e.detail.value,
+ })
+ if(car_id != ''){
+ this.getAppSeriesAttrs()
+ }
+ },
+
+ //车型级别
+ changeLevel(e) {
+ let v_id = ''
+ if(e.detail.value >= 0){
+ v_id = this.data.levelList[e.detail.value].id
+ }
+ this.setData({
+ v_id:v_id,
+ levelIndex:e.detail.value,
+ })
+ },
+
+ //车型颜色
+ changeColor(e) {
+ let color_id = ''
+ if(e.detail.value >= 0){
+ color_id = this.data.colorList[e.detail.value].id
+ }
+ this.setData({
+ color_id:color_id,
+ colorIndex:e.detail.value,
+ })
+ },
+
+ //付款方式
+ changePayment(e) {
+ this.setData({
+ paymentIndex:e.detail.value,
+ })
+ },
+
+ //代办车牌
+ changeAgency(e) {
+ this.setData({
+ agencyIndex:e.detail.value,
+ })
+ },
+
+ //新建订单
+ postAppCusorder() {
+ let that = this
+ if (that.data.customerIndex == -1 ) {
+ wx.showToast({
+ title: '请选择客户',
+ icon: 'none'
+ })
+ }else if(that.data.car_id == '' ){
+ wx.showToast({
+ title: '请选择品牌车型',
+ icon: 'none'
+ })
+ }else if(that.data.v_id == '' ){
+ wx.showToast({
+ title: '请选择车型级别',
+ icon: 'none'
+ })
+ }else if(that.data.color_id == '' ){
+ wx.showToast({
+ title: '请选择车型颜色',
+ icon: 'none'
+ })
+ }else if(that.data.paymentIndex == -1 ){
+ wx.showToast({
+ title: '请选择付款方式',
+ icon: 'none'
+ })
+ }else if(that.data.agencyIndex == -1 ){
+ wx.showToast({
+ title: '请选择是否代办车牌',
+ icon: 'none'
+ })
+ } else{
+ that.setData({
+ submitFlag: true,
+ })
+ let params = {};
+ params['cus_id'] = that.data.customer[that.data.customerIndex].id;
+ params['car_id'] = that.data.car_id;
+ params['v_id'] = that.data.v_id;
+ params['color_id'] = that.data.color_id;
+
+ params['price'] = that.data.levelList[that.data.levelIndex].price;
+ params['deposit'] = that.data.levelList[that.data.levelIndex].deposit;
+ params['payway'] = that.data.paymentIndex==0?'1':'0';
+ params['if_cnum'] = that.data.agencyIndex==0?'1':'0';
+ _.apiQuery.postAppCusorder(params).then(res => {
+ wx.showModal({
+ title: '登记成功',
+ content: '',
+ confirmText: "查看详情",
+ confirmColor: "#36afa2",
+ showCancel:false,
+ success() {
+ wx.redirectTo({
+ url: '/pages/order/detail/index?id=' + res.data.id
+ })
+ }
+ })
+ }).catch(res=>{
+ this.setData({
+ submitFlag: false,
+ })
+ });
+ }
+ },
+
+ //选择客户
radioPicker(e){
- if(e.currentTarget.dataset.id != this.data.statusid){
+ if(e.currentTarget.dataset.index != this.data.customerIndex){
this.setData({
isSubmiting: false,
- customerIndex:e.currentTarget.dataset.id,
+ customerIndex:e.currentTarget.dataset.index,
})
}
},
@@ -66,4 +270,11 @@ Page({
isShowSelectCustomer:false,
})
},
+
+ //客户列表上拉触底事件的处理函数
+ scrolltolower(e) {
+ if (this.data.noData || this.data.end||!this.data.load) return;
+ this.getAppCustomersList()
+ },
+
})
\ No newline at end of file
diff --git a/pages/order/register/index.wxml b/pages/order/register/index.wxml
index 16b3357..4dd6025 100644
--- a/pages/order/register/index.wxml
+++ b/pages/order/register/index.wxml
@@ -4,11 +4,11 @@
用户信息
销售顾问：王小胖
-
+
请选择客户
- {{customer[customerIndex].title}}
- 手机号：{{customer[customerIndex].tel}}
+ {{customer[customerIndex].name}}
+ 手机号：{{customer[customerIndex].mobile}}
@@ -18,34 +18,34 @@
品牌车型
-
- 请选择
- {{c_time}}
-
+
+ 请选择
+ {{modelArray[modelIndex]}}
+
车型级别
-
- 请选择
- {{c_time}}
-
+
+ {{levelArray.length == 0?'请先选择品牌车型':'请选择'}}
+ {{levelArray[levelIndex]}}
+
- 颜色
+ 车型颜色
-
- 请选择
- {{c_time}}
-
+
+ {{colorArray.length == 0?'请先选择品牌车型':'请选择'}}
+ {{colorArray[colorIndex]}}
+
-
+
车辆指导价
- 35,235.00元
+
+ {{levelList[levelIndex].price}}元
+
定金
- 5000.00元
+
+ {{levelList[levelIndex].deposit}}元
+
付款方式
-
- 请选择
- {{c_time}}
-
+
+ 请选择
+ {{payment[paymentIndex]}}
+
+
+
+
+
+ 代办车牌
+
+
+ 请选择
+ {{agency[agencyIndex]}}
+
-
+
@@ -85,12 +99,12 @@
选择客户
-
+
-
- {{item.title}}
- 手机号：{{item.tel}}
+
+ {{item.name}}
+ 手机号：{{item.mobile}}