diff --git a/app.json b/app.json
index ae42324..6897e07 100644
--- a/app.json
+++ b/app.json
@@ -36,7 +36,8 @@
"pages/allot/index",
"pages/storeInfo/index",
"pages/order/detail/index2",
- "pages/order/edit/index2"
+ "pages/order/edit/index2",
+ "pages/order/editOwner/index"
],
"echarts": [
{
diff --git a/pages/order/detail/index2.wxml b/pages/order/detail/index2.wxml
index 17a2839..79c3e5f 100644
--- a/pages/order/detail/index2.wxml
+++ b/pages/order/detail/index2.wxml
@@ -2,25 +2,49 @@
- 用户信息
+ 购车人信息
销售顾问：{{userInfo.uname}}
-
-
- {{info.name}}
- 手机号：{{info.mobile}}
-
-
-
-
-
-
-
-
+
+ 客户姓名
+ {{info.name}}
+
+
+ 客户手机号
+ {{info.mobile}}
+
+
+ {{info.main_type==0?'车主信息':'企业信息'}}
+
+
+
+
+ 客户姓名
+ {{info.owner_name}}
+
+
+ 客户手机号
+ {{info.owner_mobile}}
+
+
+ 客户身份证
+ {{info.owner_cardid}}
+
+
+
+
+ 企业名称
+ {{info.company}}
+
+
+ 企业信用代号
+ {{info.credit}}
+
+
- 车辆信息
+ 订单信息
@@ -61,68 +85,6 @@
开票信息
-
-
-
-
-
- 随车资料
-
-
-
-
-
-
-
-
-
- 随车工具
-
-
-
-
-
-
-
-
-
- 补充说明
-
-
-
-
-
-
-
-
-
- 随车资料
-
-
- {{item}}
-
-
-
-
- 随车工具
-
-
- {{item}}
-
-
-
-
- 补充说明
- {{info.ckcar_data.remark}}
-
-
-
@@ -343,10 +305,71 @@
+
+
+
+
+ 随车资料
+
+
+
+
+
+
+
+
+
+ 随车工具
+
+
+
+
+
+
+
+
+
+ 补充说明
+
+
+
+
+
+
+
+
+
+ 随车资料
+
+
+ {{item}}
+
+
+
+
+ 随车工具
+
+
+ {{item}}
+
+
+
+
+ 补充说明
+ {{info.ckcar_data.remark}}
+
+
+
+
-
-
-
+
+
diff --git a/pages/order/edit/index2.js b/pages/order/edit/index2.js
index 9bd3e6c..3f9bef2 100644
--- a/pages/order/edit/index2.js
+++ b/pages/order/edit/index2.js
@@ -447,11 +447,6 @@ Page({
title: '请选择内饰颜色',
icon: 'none'
})
- }else if(this.data.deposit == '' ){
- wx.showToast({
- title: '请选择定金',
- icon: 'none'
- })
}else{
this.setData({
step:3,
@@ -482,8 +477,12 @@ Page({
title: '请输入期望交付时间',
icon: 'none'
})
- }
- else{
+ }else if(this.data.deposit == '' ){
+ wx.showToast({
+ title: '请选择定金',
+ icon: 'none'
+ })
+ }else{
let that = this
that.setData({
@@ -1063,7 +1062,9 @@ Page({
})
let fine_total = 0
this.data.fines.forEach(item => {
- fine_total = fine_total + parseFloat(item.price)
+ if(parseFloat(item.price)>0){
+ fine_total = fine_total + parseFloat(item.price)
+ }
})
this.setData({
fine_total,
@@ -1071,4 +1072,9 @@ Page({
}
},
+ //页面相关事件处理函数--监听用户下拉动作
+ onPullDownRefresh(){
+ this.getAppCusorderV2()
+ },
+
})
\ No newline at end of file
diff --git a/pages/order/edit/index2.wxml b/pages/order/edit/index2.wxml
index f20ce99..25b057f 100644
--- a/pages/order/edit/index2.wxml
+++ b/pages/order/edit/index2.wxml
@@ -62,24 +62,6 @@
-
- 车辆平台售价
-
- {{priceinfo.price}}元
-
-
-
- 定金*
-
-
-
-
- {{item}}
-
-
-
-
-
@@ -113,6 +95,24 @@
+
+ 车辆平台售价
+
+ {{priceinfo.price}}元
+
+
+
+ 定金*
+
+
+
+
+ {{item}}
+
+
+
+
+
车身优惠
@@ -153,7 +153,7 @@
- 精品赠送
+ 精品选装
精品价值：{{fine_total}}元
@@ -206,18 +206,6 @@
内饰颜色
{{interiorArray[interiorIndex]}}
-
- 车辆平台售价
-
- {{priceinfo.price}}元
-
-
-
- 定金
-
- {{deposit}}元
-
-
其他信息
付款方式
@@ -231,6 +219,18 @@
期望交付时间
{{delry_time}}
+
+ 车辆平台售价
+
+ {{priceinfo.price}}元
+
+
+
+ 定金
+
+ {{deposit}}元
+
+
车身优惠
{{disc_money}}元
@@ -252,7 +252,7 @@
- 精品赠送
+ 精品选装
{{item.txt}}
diff --git a/pages/order/editOwner/index.js b/pages/order/editOwner/index.js
new file mode 100644
index 0000000..66e6ab5
--- /dev/null
+++ b/pages/order/editOwner/index.js
@@ -0,0 +1,129 @@
+import _ from '../../../commons/js/commons'
+const app = getApp()
+Page({
+ data: {
+ main_type:'',//购车主体
+ owner_name:'',//车主姓名
+ owner_mobile:'',//车主手机号
+ owner_cardid:'',//车主身份证
+ company:'',//企业名称
+ credit:'',//企业信用代码
+ submitFlag:false,
+ },
+ onLoad: function (options) {
+ for (let key in options) {
+ this.setData({
+ [key]: options[key]
+ })
+ }
+
+ this.getAppCusorderV2()
+
+ },
+ onShow: function () {
+
+ },
+
+ //获取订单详情
+ getAppCusorderV2(){
+ let params = {};
+ params['id'] = this.data.id;
+ _.apiQuery.getAppCusorderV2(params).then(res=>{
+ this.setData({
+ main_type:res.data.main_type,
+ owner_name:res.data.owner_name?res.data.owner_name:'',
+ owner_mobile:res.data.owner_mobile?res.data.owner_mobile:'',
+ owner_cardid:res.data.owner_cardid?res.data.owner_cardid:'',
+ company:res.data.company?res.data.company:'',
+ credit:res.data.credit?res.data.credit:'',
+ })
+
+ wx.stopPullDownRefresh()
+
+ })
+ },
+
+ //编辑信息
+ putAppCusorderV2Inten() {
+ if(this.data.main_type == 0&&this.data.owner_name == ''){
+ wx.showToast({
+ title: '请填写车主姓名',
+ icon: 'none'
+ })
+ }
+ else if(this.data.main_type == 0&&this.data.owner_mobile == ''){
+ wx.showToast({
+ title: '请填写车主手机号',
+ icon: 'none'
+ })
+ }
+ else if(this.data.main_type == 0&&(this.data.owner_cardid == ''|| !/^\d{6}(18|19|20)?\d{2}(0[1-9]|1[012])(0[1-9]|[12]\d|3[01])\d{3}(\d|[xX])$/.test(this.data.owner_cardid))){
+ wx.showToast({
+ title: '请填写正确车主身份证',
+ icon: 'none'
+ })
+ }
+ else if(this.data.main_type == 1&&this.data.company == ''){
+ wx.showToast({
+ title: '请填写企业名称',
+ icon: 'none'
+ })
+ }
+ else if(this.data.main_type == 1&&this.data.credit == ''){
+ wx.showToast({
+ title: '请填写企业信用代码',
+ icon: 'none'
+ })
+ }
+ else{
+ let that = this
+ that.setData({
+ submitFlag: true,
+ })
+ let params = {};
+ if(that.data.owner_name != ''){
+ params['owner_name'] = that.data.owner_name;
+ }
+ if(that.data.owner_mobile != ''){
+ params['owner_mobile'] = that.data.owner_mobile;
+ }
+ if(that.data.owner_cardid != ''){
+ params['owner_cardid'] = that.data.owner_cardid;
+ }
+ if(that.data.company != ''){
+ params['company'] = that.data.company;
+ }
+ if(that.data.credit != ''){
+ params['credit'] = that.data.credit;
+ }
+ _.apiQuery.putAppCusorderV2Inten(params).then(res => {
+
+ //刷新详情页
+ let pages = getCurrentPages();
+ let prevPage = null; //上一个页面
+ if (pages.length >= 2) {
+ prevPage = pages[pages.length - 2]; //上一个页面
+ if(prevPage.route == 'pages/order/detail/index2'){
+ prevPage.onPullDownRefresh()
+ }
+ }
+ wx.showToast({
+ title: '编辑成功',
+ icon: 'success',
+ duration: 2000
+ })
+ setTimeout(function () {
+ wx.navigateBack({
+ delta: 1
+ })
+ }, 500)
+
+ }).catch(res=>{
+ that.setData({
+ submitFlag: false,
+ })
+ });
+ }
+ },
+
+})
\ No newline at end of file
diff --git a/pages/order/editOwner/index.json b/pages/order/editOwner/index.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/order/editOwner/index.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/order/editOwner/index.wxml b/pages/order/editOwner/index.wxml
new file mode 100644
index 0000000..f5f1da6
--- /dev/null
+++ b/pages/order/editOwner/index.wxml
@@ -0,0 +1,44 @@
+
+
+
+ 车主信息
+
+ 客户姓名*
+
+
+
+
+
+ 客户手机号码*
+
+
+
+
+
+ 客户身份证*
+
+
+
+
+
+
+ 企业信息
+
+ 企业名称*
+
+
+
+
+
+ 企业信用代号*
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/order/editOwner/index.wxss b/pages/order/editOwner/index.wxss
new file mode 100644
index 0000000..a638cb7
--- /dev/null
+++ b/pages/order/editOwner/index.wxss
@@ -0,0 +1 @@
+/* pages/order/editOwner/index.wxss */
\ No newline at end of file
diff --git a/pages/order/index.js b/pages/order/index.js
index 0a55244..d58e388 100644
--- a/pages/order/index.js
+++ b/pages/order/index.js
@@ -14,7 +14,6 @@ Page({
load: true,
loading: false,
flag:1,
- isShowMessage:false,//是否显示短信弹窗
content:'',//短信内容
isRefresh:false,//判断返回是否需要刷新
isShowMobile: false,
@@ -137,23 +136,7 @@ Page({
loading: false,
flag: this.data.flag + 1
})
- this.getAppCusorderList()
- },
-
- //显示短信弹框
- showMessage(e){
- this.setData({
- messageId:e.currentTarget.dataset.id,
- isShowMessage:true,
- content:'',
- })
- },
-
- //关闭短信弹框
- hideMessage(e){
- this.setData({
- isShowMessage:false,
- })
+ this.getAppCusorderV2List()
},
//输入
@@ -164,35 +147,6 @@ Page({
})
},
- //发短信
- postAppSmsCusorder(){
- if (this.data.submitFlag) return;
- if (this.data.content == '') {
- wx.showToast({
- title: '请填写短信内容',
- icon: 'none'
- })
- } else {
- this.setData({
- submitFlag: true,
- })
- let params = {};
- params['id'] = this.data.messageId;
- params['content'] = this.data.content;
- _.apiQuery.postAppSmsCusorder(params).then(res=>{
- this.setData({
- isShowMessage:false,
- submitFlag:false,
- content:'',
- })
- wx.showToast({
- title: res.msg,
- icon: 'none'
- })
- })
- }
- },
-
//推送链接
pushLink(e){
if(e.currentTarget.dataset.url){
diff --git a/pages/order/index.wxml b/pages/order/index.wxml
index 0fcafe3..c3ff598 100644
--- a/pages/order/index.wxml
+++ b/pages/order/index.wxml
@@ -1,8 +1,8 @@
-
-
+
+
+
+
+ 请输入客户姓名
+
+
+ 登记订单
+
-
-
- 请输入客户姓名
-
-
- 登记订单
-
+
- {{item.status_name}}
+
{{item.name}}
({{item.mobile}})
-
-
-
@@ -57,6 +55,44 @@
+
+ 身份证
+
+ 未传
+
+
+
+ 登记证
+
+ 已传
+
+
+
+ 行驶证
+
+ 已传
+
+
+
+ 保单
+
+ 已通过
+
+
+
+ 交车合照
+
+ 已通过
+
+
+
+ 交付
+
+ 顾问确认
+ 用户确认
+
+
+
注：{{item.remark}}
@@ -69,24 +105,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/pages/order/register/index.js b/pages/order/register/index.js
index 3835197..545733b 100644
--- a/pages/order/register/index.js
+++ b/pages/order/register/index.js
@@ -212,11 +212,6 @@ Page({
title: '请选择内饰颜色',
icon: 'none'
})
- }else if(this.data.deposit == '' ){
- wx.showToast({
- title: '请选择定金',
- icon: 'none'
- })
}else{
this.setData({
step:3,
@@ -248,6 +243,12 @@ Page({
icon: 'none'
})
}
+ else if(this.data.deposit == '' ){
+ wx.showToast({
+ title: '请选择定金',
+ icon: 'none'
+ })
+ }
else{
let that = this
@@ -1045,7 +1046,9 @@ Page({
})
let fine_total = 0
this.data.fines.forEach(item => {
- fine_total = fine_total + parseFloat(item.price)
+ if(parseFloat(item.price)>0){
+ fine_total = fine_total + parseFloat(item.price)
+ }
})
this.setData({
fine_total,
diff --git a/pages/order/register/index.wxml b/pages/order/register/index.wxml
index dd605fc..d4703bc 100644
--- a/pages/order/register/index.wxml
+++ b/pages/order/register/index.wxml
@@ -73,7 +73,7 @@
车主信息
-
+
@@ -166,24 +166,6 @@
-
- 车辆平台售价
-
- {{priceinfo.price}}元
-
-
-
- 定金*
-
-
-
-
- {{item}}
-
-
-
-
-
@@ -217,6 +199,24 @@
+
+ 车辆平台售价
+
+ {{priceinfo.price}}元
+
+
+
+ 定金*
+
+
+
+
+ {{item}}
+
+
+
+
+
车身优惠
@@ -257,7 +257,7 @@
- 精品赠送
+ 精品选装
精品价值：{{fine_total}}元
@@ -386,18 +386,6 @@
内饰颜色
{{interiorArray[interiorIndex]}}
-
- 车辆平台售价
-
- {{priceinfo.price}}元
-
-
-
- 定金
-
- {{deposit}}元
-
-
其他信息
付款方式
@@ -411,6 +399,18 @@
期望交付时间
{{delry_time}}
+
+ 车辆平台售价
+
+ {{priceinfo.price}}元
+
+
+
+ 定金
+
+ {{deposit}}元
+
+
车身优惠
{{disc_money}}元
@@ -432,7 +432,7 @@
- 精品赠送
+ 精品选装
{{item.txt}}