diff --git a/commons/css/base/radius.wxss b/commons/css/base/radius.wxss index eb8bca1..d1f196f 100644 --- a/commons/css/base/radius.wxss +++ b/commons/css/base/radius.wxss @@ -22,6 +22,7 @@ .ulib-rt750{border-top-left-radius:750rpx;border-top-right-radius:750rpx;} .ulib-rl750{border-top-left-radius:750rpx;border-bottom-left-radius:750rpx;} .ulib-rr750{border-top-right-radius:750rpx;border-bottom-right-radius:750rpx;} +.ulib-rlb750{border-bottom-left-radius:750rpx;} .ulib-rlt0{border-top-left-radius:0;} .ulib-rlt10{border-top-left-radius:10rpx;} .ulib-rlt0{border-top-left-radius:0;} diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml index 246b7f8..9568f84 100644 --- a/pages/order/detail/index.wxml +++ b/pages/order/detail/index.wxml @@ -26,9 +26,6 @@ - - 邀请签名 - diff --git a/pages/order/index.wxml b/pages/order/index.wxml index fa47570..847e4c5 100644 --- a/pages/order/index.wxml +++ b/pages/order/index.wxml @@ -3,7 +3,7 @@ - + {{item.name}} @@ -34,14 +34,12 @@ - + {{item.status_name}} + {{item.name}} ({{item.mobile}}) - - {{item.status_name}} - @@ -59,6 +57,8 @@ + 注:{{item.remark}} + diff --git a/pages/order/register/index.js b/pages/order/register/index.js index 925c63d..9fe96ec 100644 --- a/pages/order/register/index.js +++ b/pages/order/register/index.js @@ -16,7 +16,7 @@ Page({ step:3, }, ], - step:1, + step:2, name:'',//姓名 mobile:'',//手机号 address:'',//地址 @@ -329,29 +329,12 @@ Page({ }); }, - //获取车型属性 /颜色 /车型级别 - 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 => { + //获取车型级别 + getAppSeriesAttrslevel(){ + let params = {}; + params['id'] = this.data.car_id; + params['type'] = 0; + _.apiQuery.getAppSeriesAttrs(params).then(res => { if(res.data.total>0){ let levelArray = [] res.data.list.forEach(item => { @@ -364,11 +347,37 @@ Page({ }) } }); + }, - let params3 = {}; - params3['id'] = this.data.car_id; - params3['type'] = 2; - _.apiQuery.getAppSeriesAttrs(params3).then(res => { + //获取车型颜色 + getAppSeriesAttrscolor(){ + let params = {}; + params['id'] = this.data.car_id; + params['type'] = 1; + params['v_id'] = this.data.v_id; + _.apiQuery.getAppSeriesAttrs(params).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, + }) + } + }); + }, + + //获取车型内饰颜色 + getAppSeriesAttrsinterior(){ + let params = {}; + params['id'] = this.data.car_id; + params['type'] = 2; + params['v_id'] = this.data.v_id; + params['color_id'] = this.data.color_id; + _.apiQuery.getAppSeriesAttrs(params).then(res => { if(res.data.total>0){ let interiorArray = [] res.data.list.forEach(item => { @@ -449,7 +458,7 @@ Page({ interiorIndex:-1,//内饰颜色索引 priceinfo:'', }) - this.getAppSeriesAttrs() + this.getAppSeriesAttrslevel() this.getAppFinanceNums() } }, @@ -460,8 +469,15 @@ Page({ this.setData({ v_id:this.data.levelList[e.detail.value].id, levelIndex:e.detail.value, + color_id:'',//车型颜色id + incolor_id:'',//内饰颜色id + colorArray:[],//车型颜色列表 + interiorArray:[],//内饰颜色 + colorIndex:-1,//车型颜色索引 + interiorIndex:-1,//内饰颜色索引 + priceinfo:'', }) - this.getAppSeriesInfo() + this.getAppSeriesAttrscolor() this.getAppFinanceNums() } }, @@ -472,8 +488,12 @@ Page({ this.setData({ color_id:this.data.colorList[e.detail.value].id, colorIndex:e.detail.value, + incolor_id:'',//内饰颜色id + interiorArray:[],//内饰颜色 + interiorIndex:-1,//内饰颜色索引 + priceinfo:'', }) - this.getAppSeriesInfo() + this.getAppSeriesAttrsinterior() this.getAppFinanceNums() } }, @@ -576,6 +596,7 @@ Page({ params['incolor_id'] = this.data.incolor_id; _.apiQuery.getAppSeriesInfo(params).then(res => { this.setData({ + inten_money:'', priceinfo:res.data, }) }); diff --git a/pages/order/register/index.wxml b/pages/order/register/index.wxml index 688f3c4..1d5a115 100644 --- a/pages/order/register/index.wxml +++ b/pages/order/register/index.wxml @@ -78,7 +78,7 @@ - + 车型颜色* @@ -88,7 +88,7 @@ - + 内饰颜色*