diff --git a/app.json b/app.json
index b0af55e..ae42324 100644
--- a/app.json
+++ b/app.json
@@ -34,7 +34,9 @@
"pages/audioPlay/index",
"pages/recommend/index",
"pages/allot/index",
- "pages/storeInfo/index"
+ "pages/storeInfo/index",
+ "pages/order/detail/index2",
+ "pages/order/edit/index2"
],
"echarts": [
{
diff --git a/commons/css/thirdparty/iconfont.wxss b/commons/css/thirdparty/iconfont.wxss
index cdcc0ed..089841c 100644
--- a/commons/css/thirdparty/iconfont.wxss
+++ b/commons/css/thirdparty/iconfont.wxss
@@ -1,9 +1,9 @@
@font-face {
font-family: "iconfont"; /* Project id 2643717 */
src:
- url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'),
- url('iconfont.woff?t=1640674754155') format('woff'),
- url('iconfont.ttf?t=1640674754155') format('truetype');
+ url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'),
+ url('iconfont.woff?t=1642151968633') format('woff'),
+ url('iconfont.ttf?t=1642151968633') format('truetype');
}
.iconfont {
@@ -13,6 +13,10 @@
-moz-osx-font-smoothing: grayscale;
}
+.icon-jia1:before {
+ content: "\e600";
+}
+
.icon-duanxinguanli:before {
content: "\e60a";
}
diff --git a/commons/js/config.js b/commons/js/config.js
index 35ba47d..151c5a9 100644
--- a/commons/js/config.js
+++ b/commons/js/config.js
@@ -1,4 +1,4 @@
-const env = "p";
+const env = "d";
const version = 1,
@@ -106,6 +106,11 @@ api = {
appBizSituation_tabs:'app/biz/situation_tabs', //店铺概况_tab
appBizSituation:'app/biz/situation', //店铺概况 /店铺概况保存
appBizStreet:'app/biz/street', //获取乡镇
+
+ appCusorderV2Inten:'app/cusorderV2/inten', //新增意向金订单
+ appCusorderV2:'app/cusorderV2', //新建订单 /获取订单列表 /订单详情
+ appCusorderV2Tabs:'app/cusorderV2/tabs', //获取订单列表tab
+
}
diff --git a/commons/js/utils/apiQuery.js b/commons/js/utils/apiQuery.js
index 1ab28de..3edb15c 100644
--- a/commons/js/utils/apiQuery.js
+++ b/commons/js/utils/apiQuery.js
@@ -642,7 +642,6 @@ apiQuery.getAppBrokerageOrders = function (params) {
})
}
-
//调拨记录_tab
apiQuery.getAppTransferTabs = function (params) {
return new Promise(function (resolve, reject) {
@@ -685,4 +684,40 @@ apiQuery.getAppBizStreet = function (params) {
})
}
+//新增意向金订单
+apiQuery.postAppCusorderV2Inten = function (params) {
+ return new Promise(function (resolve, reject) {
+ HttpRequest(true, Config.api.appCusorderV2Inten, 2, params, "POST", resolve, reject)
+ })
+}
+
+//新建订单
+apiQuery.postAppCusorderV2 = function (params) {
+ return new Promise(function (resolve, reject) {
+ HttpRequest(true, Config.api.appCusorderV2, 2, params, "POST", resolve, reject)
+ })
+}
+
+//获取订单列表tab
+apiQuery.getAppCusorderV2Tabs = function (params) {
+ return new Promise(function (resolve, reject) {
+ HttpRequest(false, Config.api.appCusorderV2Tabs, 2, params, "GET", resolve, reject)
+ })
+}
+
+//获取订单列表
+apiQuery.getAppCusorderV2List = function (params) {
+ return new Promise(function (resolve, reject) {
+ HttpRequest(false, Config.api.appCusorderV2, 2, params, "GET", resolve, reject)
+ })
+}
+
+//订单详情
+apiQuery.getAppCusorderV2 = function (params) {
+ return new Promise(function (resolve, reject) {
+ HttpRequest(false, Config.api.appCusorderV2, 2, params, "GET", resolve, reject)
+ })
+}
+
+
export default apiQuery;
\ No newline at end of file
diff --git a/commons/js/utils/httpRequest.js b/commons/js/utils/httpRequest.js
index 9f7e8bd..3249eae 100644
--- a/commons/js/utils/httpRequest.js
+++ b/commons/js/utils/httpRequest.js
@@ -50,7 +50,8 @@ function HttpNoUkeyRequest(loading, url, sessionChoose, params, method, callBack
}
wx.showToast({
title: res.data.msg,
- icon: "none"
+ icon: "none",
+ duration: 2500
});
}
}
diff --git a/pages/order/detail/index2.js b/pages/order/detail/index2.js
new file mode 100644
index 0000000..da49bca
--- /dev/null
+++ b/pages/order/detail/index2.js
@@ -0,0 +1,765 @@
+import _ from '../../../commons/js/commons'
+const app = getApp()
+Page({
+ data: {
+ imgUrl:_.config.imgUrl,
+ payway:1,
+ contract:[
+ {
+ "id":1,
+ "title":"全款购车",
+ },
+ {
+ "id":0,
+ "title":"分期购车",
+ },
+ ],
+ banksIndex:-1,//分期银行
+ yearsIndex:-1,//分期年限
+ money:'',//贷款金额
+ submitFlag:false,
+ frontUrl:{},
+ backUrl:{},
+ businessUrl:{},
+ isShowCode:false,
+ isShowOrderCode:false,
+ caridErr:[
+ {
+ caridA:true,
+ },
+ {
+ caridB:true,
+ },
+
+ ],
+ businessErr:[
+ {
+ business_licence:true,
+ },
+ ],
+ isChangePayway:false,//合同付款方式是否修改
+ remark:'',//补充说明
+ carInfoList:[],//随车资料选项
+ ckcarInfo:[],//随车资料选中内容
+ carToolList:[],//随车随车工具选项
+ ckcarTool:[],//随车工具选中内容
+ nextCode:false,
+
+ ins_img:[],
+ register_img:{},
+ car_img:{},
+
+ },
+ onLoad: function (options) {
+ for (let key in options) {
+ this.setData({
+ [key]: options[key]
+ })
+ }
+
+ this.getAppCusorderV2()
+ this.getUserInfo()
+
+ },
+ onShow: function () {
+
+ },
+
+ //获取用户信息
+ getUserInfo(){
+ _.apiQuery.getUserInfo().then(res => {
+ this.setData({
+ userInfo: res
+ })
+ });
+ },
+
+ //获取订单详情
+ getAppCusorderV2(){
+ let params = {};
+ params['id'] = this.data.id;
+ _.apiQuery.getAppCusorderV2(params).then(res=>{
+ this.setData({
+ info:res.data,
+ payway:res.data.payway,
+ pack_id:res.data.pack_id,
+ })
+
+ if(res.data.agent_status == 1){
+ this.setData({
+ ins_img:res.data.agent_data.ins_img?res.data.agent_data.ins_img:[],
+ register_img:res.data.agent_data.register_img.value?res.data.agent_data.register_img:{},
+ car_img:res.data.agent_data.car_img.value?res.data.agent_data.car_img:{},
+ })
+ }
+
+ if(res.data.ckcar_status==1){
+ this.setData({
+ remark:res.data.ckcar_data.remark,//补充说明
+ ckcarInfo:res.data.ckcar_data.info,//随车资料选中内容
+ ckcarTool:res.data.ckcar_data.tool,//随车工具选中内容
+ })
+ this.getAppDelivery()
+ }
+
+ wx.stopPullDownRefresh()
+
+ })
+ },
+
+ //获取车辆确定随车资料
+ getAppDelivery(){
+ _.apiQuery.getAppDelivery().then(res=>{
+
+ let delivery = res.data
+ let carInfoList = []
+ let ckcar_data = this.data.info.ckcar_data
+ delivery.info.forEach(item => {
+ carInfoList.push({
+ title:item,
+ checked:false,
+ })
+ })
+ if(ckcar_data.info.length>0){
+ carInfoList.forEach(item1 => {
+ ckcar_data.info.forEach(item2 => {
+ if(item1.title == item2){
+ item1.checked = true
+ }
+ })
+ })
+ }
+ let carToolList = []
+ delivery.tool.forEach(item => {
+ carToolList.push({
+ title:item,
+ checked:false,
+ })
+ })
+ if(ckcar_data.tool.length>0){
+ carToolList.forEach(item1 => {
+ ckcar_data.tool.forEach(item2 => {
+ if(item1.title == item2){
+ item1.checked = true
+ }
+ })
+ })
+ }
+
+ this.setData({
+ carInfoList,
+ carToolList,
+ })
+
+ })
+ },
+
+ //显示短信弹框
+ showMessage(e){
+ this.setData({
+ isShowMessage:true,
+ content:'',
+ })
+ },
+
+ //关闭短信弹框
+ hideMessage(e){
+ this.setData({
+ isShowMessage:false,
+ })
+ },
+
+ // 输入
+ inputTx(e) {
+ this.setData({
+ [e.currentTarget.dataset.key]: e.detail.value
+ })
+ },
+
+ //发短信
+ 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.id;
+ params['content'] = this.data.content;
+ _.apiQuery.postAppSmsCusorder(params).then(res=>{
+ this.setData({
+ isShowMessage:false,
+ submitFlag:false,
+ content:'',
+ })
+ wx.showToast({
+ title: res.msg,
+ icon: 'none'
+ })
+
+ })
+ }
+ },
+
+ //选择图片
+ chooseImg(e) {
+ this.setData({
+ submitFlag: false,
+ })
+ let that = this
+ wx.chooseImage({
+ count: 1, // 默认9
+ sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图,默认二者都有
+ sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机,默认二者都有
+ success(res) {
+
+ wx.showLoading();
+ wx.uploadFile({
+ url:_.config.api.upImg,
+ filePath:res.tempFilePaths[0],
+ name: 'img',
+ formData: {
+ 'app': 'liche'
+ },
+ success: (resp) => {
+ resp.data = JSON.parse(resp.data);
+ wx.hideLoading();
+ if (resp.data.code == 200) {
+
+ if(e.currentTarget.dataset.face == 'front'){
+ that.setData({
+ frontUrl:resp.data.data,
+ 'caridErr[0].caridA':true,
+ })
+ }
+ if(e.currentTarget.dataset.face == 'back'){
+ that.setData({
+ backUrl:resp.data.data,
+ 'caridErr[1].caridB':true,
+ })
+ }
+ if(e.currentTarget.dataset.face == 'business'){
+ that.setData({
+ businessUrl:resp.data.data,
+ 'businessErr[0].business_licence':true,
+ })
+ }
+
+ //有ID更新,没ID上传
+ if(that.data.info.bill_data.id){
+ that.putAppIdcard()
+ }else{
+ that.postAppIdcard()
+ }
+
+ }
+ },
+
+ })
+
+ },
+ fail: res => {
+ wx.showToast({
+ title: '文件选择失败',
+ icon: 'none',
+ duration: 2000
+ })
+ }
+ })
+ },
+
+ //代办选择图片
+ agentUpload(e) {
+ let that = this
+ if(e.currentTarget.dataset.type=='ins'){
+ wx.chooseImage({
+ count: 10 - this.data.ins_img.length, //
+ sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图,默认二者都有
+ sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机,默认二者都有
+ success(res1) {
+ wx.showLoading({
+ title: '图片上传中',
+ })
+ let ins_img=that.data.ins_img
+ for (let i = 0; i < res1.tempFilePaths.length; i++) {
+ //上传图片
+ wx.uploadFile({
+ url:_.config.api.upImg,
+ filePath:res1.tempFilePaths[i],
+ name: 'img',
+ formData: {
+ 'app': 'liche'
+ },
+ success: (resp) => {
+ resp.data = JSON.parse(resp.data);
+ if (resp.data.code == 200) {
+ let imgdata = resp.data
+ let list = []
+ list.push({
+ value:imgdata.data.url,
+ src:imgdata.data.full_url,
+ })
+ ins_img=ins_img.concat(list)
+ if(i+1==res1.tempFilePaths.length){
+ setTimeout(function () {
+ let params = {};
+ params['id'] = that.data.id;
+ params['type'] = 0;
+ let img = []
+ ins_img.forEach(item => {
+ img.push(item.value)
+ })
+ params['img'] = img;
+ _.apiQuery.putAppCusorderCdata(params).then(res => {
+ wx.hideLoading();
+ that.setData({
+ ins_img,
+ })
+ })
+ }, 500);
+
+ }
+ }
+ },
+
+ })
+ }
+
+ },
+ fail: res => {
+ wx.showToast({
+ title: '文件选择失败',
+ icon: 'none',
+ duration: 2000
+ })
+ }
+ })
+ }else if(e.currentTarget.dataset.type=='register'){
+ wx.chooseImage({
+ count: 1, //
+ sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图,默认二者都有
+ sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机,默认二者都有
+ success(res1) {
+ wx.showLoading({
+ title: '图片上传中',
+ })
+
+ //上传图片
+ wx.uploadFile({
+ url:_.config.api.upImg,
+ filePath:res1.tempFilePaths[0],
+ name: 'img',
+ formData: {
+ 'app': 'liche'
+ },
+ success: (resp) => {
+ resp.data = JSON.parse(resp.data);
+ if (resp.data.code == 200) {
+ let register_img = {
+ value:resp.data.data.url,
+ src:resp.data.data.full_url,
+ }
+ let params = {};
+ params['id'] = that.data.id;
+ params['type'] = 1;
+ params['img'] = [register_img.value];
+ _.apiQuery.putAppCusorderCdata(params).then(res => {
+ wx.hideLoading();
+ that.setData({
+ register_img,
+ })
+ })
+
+ }
+ },
+
+ })
+
+ },
+ fail: res => {
+ wx.showToast({
+ title: '文件选择失败',
+ icon: 'none',
+ duration: 2000
+ })
+ }
+ })
+ }else if(e.currentTarget.dataset.type=='car'){
+ wx.chooseImage({
+ count: 1, //
+ sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图,默认二者都有
+ sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机,默认二者都有
+ success(res1) {
+ wx.showLoading({
+ title: '图片上传中',
+ })
+
+ //上传图片
+ wx.uploadFile({
+ url:_.config.api.upImg,
+ filePath:res1.tempFilePaths[0],
+ name: 'img',
+ formData: {
+ 'app': 'liche'
+ },
+ success: (resp) => {
+ resp.data = JSON.parse(resp.data);
+ if (resp.data.code == 200) {
+ let car_img = {
+ value:resp.data.data.url,
+ src:resp.data.data.full_url,
+ }
+ let params = {};
+ params['id'] = that.data.id;
+ params['type'] = 2;
+ params['img'] = [car_img.value];
+ _.apiQuery.putAppCusorderCdata(params).then(res => {
+ wx.hideLoading();
+ that.setData({
+ car_img,
+ })
+ })
+
+ }
+ },
+
+ })
+
+ },
+ fail: res => {
+ wx.showToast({
+ title: '文件选择失败',
+ icon: 'none',
+ duration: 2000
+ })
+ }
+ })
+ }
+
+ },
+
+ //上传资料
+ putAppCusorderCdata(type){
+ let params = {};
+ params['id'] = this.data.id;
+ if(type=='ins'){
+ params['type'] = 0;
+ let img = []
+ this.data.ins_img.forEach(item => {
+ img.push(item.value)
+ })
+ params['img'] = img;
+ }
+ _.apiQuery.putAppCusorderCdata(params).then(res => {
+
+
+ })
+ },
+
+ // 编辑页面删除图片
+ delAgent(e){
+ if(e.currentTarget.dataset.type=='ins'){
+ let ins_img = this.data.ins_img
+ ins_img.splice(e.currentTarget.dataset.index, 1)
+ let params = {};
+ params['id'] = this.data.id;
+ params['type'] = 0;
+ let img = []
+ ins_img.forEach(item => {
+ img.push(item.value)
+ })
+ params['img'] = img;
+ _.apiQuery.putAppCusorderCdata(params).then(res => {
+ this.setData({
+ ins_img,
+ })
+ })
+ }else if(e.currentTarget.dataset.type=='register'){
+ let params = {};
+ params['id'] = this.data.id;
+ params['type'] = 1;
+ params['img'] = [];
+ _.apiQuery.putAppCusorderCdata(params).then(res => {
+ this.setData({
+ register_img:{},
+ })
+ })
+ }else if(e.currentTarget.dataset.type=='car'){
+ let params = {};
+ params['id'] = this.data.id;
+ params['type'] = 2;
+ params['img'] = [];
+ _.apiQuery.putAppCusorderCdata(params).then(res => {
+ this.setData({
+ car_img:{},
+ })
+ })
+ }
+ },
+
+ //查看图片
+ previewAgent:function(e) {
+ if(e.currentTarget.dataset.type=='ins'){
+ let img = []
+ this.data.info.agent_data.ins_img.forEach(item => {
+ img.push(item.src)
+ })
+ wx.previewImage({
+ current:this.data.info.agent_data.ins_img[e.currentTarget.dataset.index].src,
+ urls:img,
+ })
+ }else if(e.currentTarget.dataset.type=='register'){
+ wx.previewImage({
+ current:this.data.info.agent_data.register_img.src,
+ urls:[this.data.info.agent_data.register_img.src],
+ })
+ }else if(e.currentTarget.dataset.type=='car'){
+ wx.previewImage({
+ current:this.data.info.agent_data.car_img.src,
+ urls:[this.data.info.agent_data.car_img.src],
+ })
+ }
+ },
+
+ //创建申请开票信息
+ postAppIdcard(){
+ let that = this
+ let params = {};
+ params['oid'] = that.data.id;
+ if(that.data.frontUrl.url){
+ params['cardidA'] = that.data.frontUrl.url;
+ }
+ if(that.data.backUrl.url){
+ params['cardidB'] = that.data.backUrl.url;
+ }
+ if(that.data.businessUrl.url){
+ params['business_licence'] = that.data.businessUrl.url;
+ }
+ that.setData({
+ submitFlag: true,
+ })
+ _.apiQuery.postAppIdcard(params).then(res => {
+ this.setData({
+ submitFlag: false,
+ })
+ this.getAppCusorderV2()
+
+ wx.showToast({
+ title: '已提交申请',
+ icon: 'success'
+ })
+
+ }).catch(res=>{
+ if(res.code==418){
+ if(this.data.info.main_type == 0){
+ this.setData({
+ caridErr:res.data,
+ })
+ }else if(this.data.info.main_type == 1){
+ this.setData({
+ businessErr:res.data,
+ })
+ }
+ }
+ this.setData({
+ submitFlag: false,
+ })
+ });
+ },
+
+ //修改申请开票信息
+ putAppIdcard() {
+ let that = this
+ let params = {};
+ params['id'] = that.data.info.bill_data.id;
+ if(that.data.frontUrl.url){
+ params['cardidA'] = that.data.frontUrl.url;
+ }
+ if(that.data.backUrl.url){
+ params['cardidB'] = that.data.backUrl.url;
+ }
+ if(that.data.businessUrl.url){
+ params['business_licence'] = that.data.businessUrl.url;
+ }
+ that.setData({
+ submitFlag: true,
+ })
+ _.apiQuery.putAppIdcard(params).then(res => {
+ this.setData({
+ submitFlag: false,
+ })
+ this.getAppCusorderV2()
+
+ wx.showToast({
+ title: '已提交修改',
+ icon: 'success'
+ })
+
+ }).catch(res=>{
+ if(res.code==418){
+ if(this.data.info.main_type == 0){
+ this.setData({
+ caridErr:res.data,
+ })
+ }else if(this.data.info.main_type == 1){
+ this.setData({
+ businessErr:res.data,
+ })
+ }
+ }
+ this.setData({
+ submitFlag: false,
+ })
+ });
+ },
+
+ //确认交付
+ putAppCusorderCkcar(){
+
+ if(this.data.ckcarInfo.length == 0){
+ wx.showToast({
+ title: '请选择随车资料',
+ icon: 'none'
+ })
+ }
+ else if(this.data.ckcarTool.length == 0){
+ wx.showToast({
+ title: '请选择随车工具',
+ icon: 'none'
+ })
+ }
+ else{
+ let that = this
+ wx.showModal({
+ title:'确认随车物品?',
+ content:'',
+ success: function (res) {
+ if (res.confirm) {
+ that.setData({
+ submitFlag: true,
+ })
+ let params = {};
+ params['id'] = that.data.id;
+ params['info'] = that.data.ckcarInfo;
+ params['tool'] = that.data.ckcarTool;
+ params['remark'] = that.data.remark;
+ _.apiQuery.putAppCusorderCkcar(params).then(res => {
+ that.setData({
+ submitFlag: false,
+ })
+ that.getAppCusorderV2()
+
+ wx.showToast({
+ title: '确认随车物品成功',
+ icon: 'success'
+ })
+
+ }).catch(res=>{
+ that.setData({
+ submitFlag: false,
+ })
+ });
+ }
+ }
+ })
+ }
+ },
+
+ //客服微信码
+ optShowCode() {
+ this.setData({
+ isShowCode:!this.data.isShowCode,
+ nextCode:false,
+ })
+ },
+
+ //生成合同
+ optNextCode() {
+ this.setData({
+ nextCode:true,
+ })
+ },
+
+ //订单支付码
+ optShowOrderCode() {
+ this.setData({
+ isShowOrderCode:!this.data.isShowOrderCode,
+ })
+ },
+
+ //拨打客户电话xz
+ call(e) {
+ let params = {};
+ params['id'] = e.currentTarget.dataset.id;
+ params['type'] = 1;
+ _.apiQuery.getAppXz(params).then(res=>{
+ wx.makePhoneCall({
+ phoneNumber: res.data.mobile,
+ })
+ })
+ },
+
+ //查看图片
+ previewImage: function (e) {
+ wx.previewImage({
+ current:this.data.info.bill_data.bill_img,
+ urls:[this.data.info.bill_data.bill_img],
+ })
+ },
+
+ //推送链接
+ pushLink(e){
+ if(e.currentTarget.dataset.url){
+ _.$router.openUrlScheme(e.currentTarget.dataset.url)
+ }
+ },
+
+ //随车资料
+ changeMaterial(e) {
+ let carInfoList = this.data.carInfoList
+ let values = e.detail.value
+ carInfoList.forEach(item1 => {
+ item1.checked = false
+ values.forEach(item2 => {
+ if(item1.title == item2){
+ item1.checked = true
+ }
+ })
+ })
+
+ this.setData({
+ ckcarInfo:e.detail.value,
+ carInfoList,
+ })
+ },
+
+ //随车工具
+ changeTool(e) {
+ let carToolList = this.data.carToolList
+ let values = e.detail.value
+ carToolList.forEach(item1 => {
+ item1.checked = false
+ values.forEach(item2 => {
+ if(item1.title == item2){
+ item1.checked = true
+ }
+ })
+ })
+
+ this.setData({
+ ckcarTool:e.detail.value,
+ carToolList,
+ })
+ },
+
+ //页面相关事件处理函数--监听用户下拉动作
+ onPullDownRefresh(){
+ this.getAppCusorderV2()
+ },
+
+})
\ No newline at end of file
diff --git a/pages/order/detail/index2.json b/pages/order/detail/index2.json
new file mode 100644
index 0000000..3abc963
--- /dev/null
+++ b/pages/order/detail/index2.json
@@ -0,0 +1,5 @@
+{
+ "navigationBarTitleText": "订单详情",
+ "enablePullDownRefresh": true,
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/order/detail/index2.wxml b/pages/order/detail/index2.wxml
new file mode 100644
index 0000000..2275995
--- /dev/null
+++ b/pages/order/detail/index2.wxml
@@ -0,0 +1,348 @@
+
+
+
+
+ 用户信息
+ 销售顾问:{{userInfo.uname}}
+
+
+
+ {{info.name}}
+ 手机号:{{info.mobile}}
+
+
+
+
+
+
+
+
+
+
+
+ 车辆信息
+
+
+
+
+
+
+
+ {{key}}
+ {{value.value}}
+
+
+
+ {{key2}}
+ {{value2}}
+
+
+
+
+
+
+ {{key}}
+ {{value}}
+
+
+
+
+ {{key}}
+ {{value}}
+
+
+
+
+ 已付意向金{{info.inten_money}}元
+
+
+
+
+ 上传身份证
+ 上传营业执照
+
+
+
+
+
+ {{caridErr[0].errmsg}}
+
+
+
+
+
+
+
+ 上传身份证正面
+
+
+
+
+
+
+ {{caridErr[1].errmsg}}
+
+
+
+
+
+
+
+ 上传身份证背面
+
+
+
+
+
+
+
+
+ {{businessErr[0].errmsg}}
+
+
+
+
+
+
+
+ 上传营业执照
+
+
+
+
+
+
+
+ 开票信息
+
+
+
+
+
+
+ 随车资料
+
+
+
+
+
+
+
+
+
+ 随车工具
+
+
+
+
+
+
+
+
+
+ 补充说明
+
+
+
+
+
+ 随车资料
+
+
+ {{item}}
+
+
+
+
+ 随车工具
+
+
+ {{item}}
+
+
+
+
+ 补充说明
+ {{info.ckcar_data.remark}}
+
+
+
+
+
+
+ 资料上传
+
+
+
+
+
+
+
+
+
+
+
+
+ 上传保单
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 上传登记证
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 上传行驶证
+
+
+
+
+
+
+
+
+
+ 保单
+
+
+
+
+
+
+
+
+
+
+
+ 登记证
+
+
+
+
+
+
+
+ 行驶证
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 扫码生成合同
+
+
+
+ 客户合同未生成时可让客户扫码生成
+
+
+
+
+
+
+
+ 邀请客户扫码签名
+
+
+
+ 邀请客户扫码签订合同
+
+
+
+
+
+
+
+ 邀请客户扫码签名
+
+
+
+ 邀请客户扫码签订合同
+ (*客户合同未生成时“生成合同”)
+
+
+ 生成合同
+
+
+
+
+
+
+
+
+ 邀请客户扫码支付
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/order/detail/index2.wxss b/pages/order/detail/index2.wxss
new file mode 100644
index 0000000..a7e8ebf
--- /dev/null
+++ b/pages/order/detail/index2.wxss
@@ -0,0 +1,19 @@
+/*复选框外框样式*/
+checkbox .wx-checkbox-input {
+ width:30rpx;
+ height:30rpx;
+ border-color: #999;
+ background: #f6f6f6;
+}
+/* 选中后的 背景样式*/
+checkbox .wx-checkbox-input.wx-checkbox-input-checked {
+ border-color: #36afa2;
+ background: #36afa2;
+}
+/*复选框选中后内部样式*/
+checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
+ font-size:20rpx;
+ color:#fff;
+ transform:translate(-50%, -50%) scale(1);
+ -webkit-transform:translate(-50%, -50%) scale(1);
+}
\ No newline at end of file
diff --git a/pages/order/edit/index2.js b/pages/order/edit/index2.js
new file mode 100644
index 0000000..4039de6
--- /dev/null
+++ b/pages/order/edit/index2.js
@@ -0,0 +1,66 @@
+// pages/order/edit/index2.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/order/edit/index2.json b/pages/order/edit/index2.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/order/edit/index2.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/order/edit/index2.wxml b/pages/order/edit/index2.wxml
new file mode 100644
index 0000000..3176b50
--- /dev/null
+++ b/pages/order/edit/index2.wxml
@@ -0,0 +1,2 @@
+
+pages/order/edit/index2.wxml
diff --git a/pages/order/edit/index2.wxss b/pages/order/edit/index2.wxss
new file mode 100644
index 0000000..5efa5df
--- /dev/null
+++ b/pages/order/edit/index2.wxss
@@ -0,0 +1 @@
+/* pages/order/edit/index2.wxss */
\ No newline at end of file
diff --git a/pages/order/index.js b/pages/order/index.js
index 3158cfc..6789b87 100644
--- a/pages/order/index.js
+++ b/pages/order/index.js
@@ -25,18 +25,18 @@ Page({
[key]: options[key]
})
}
- this.getAppCusorderTabs()
+ this.getAppCusorderV2Tabs()
},
//客户-tab
- getAppCusorderTabs() {
- _.apiQuery.getAppCusorderTabs().then(res => {
+ getAppCusorderV2Tabs() {
+ _.apiQuery.getAppCusorderV2Tabs().then(res => {
this.setData({
tab:res.data,
key:this.data.key==''?res.data[0].key:this.data.key,
})
- this.getAppCusorderList()
+ this.getAppCusorderV2List()
wx.stopPullDownRefresh()
});
@@ -57,8 +57,8 @@ Page({
})
},
- //获取客户列表
- getAppCusorderList() {
+ //获取订单列表
+ getAppCusorderV2List() {
this.setData({
load: false,
loading: true,
@@ -70,7 +70,7 @@ Page({
if(this.data.searchInp.value != ''){
params['keyword'] = this.data.searchInp.value;
}
- _.apiQuery.getAppCusorderList(params).then(res => {
+ _.apiQuery.getAppCusorderV2List(params).then(res => {
this.setData({
flag: this.data.flag - 1
})
@@ -210,7 +210,7 @@ Page({
loading: false,
flag: this.data.flag + 1
})
- this.getAppCusorderList()
+ this.getAppCusorderV2List()
},
//页面上拉触底事件的处理函数
@@ -219,7 +219,7 @@ Page({
this.setData({
flag: this.data.flag + 1
})
- this.getAppCusorderList()
+ this.getAppCusorderV2List()
},
})
\ No newline at end of file
diff --git a/pages/order/index.wxml b/pages/order/index.wxml
index a3b7aa3..74d18ac 100644
--- a/pages/order/index.wxml
+++ b/pages/order/index.wxml
@@ -33,7 +33,7 @@
-
+
{{item.status_name}}
diff --git a/pages/order/register/index.js b/pages/order/register/index.js
index a9ff956..a9622b9 100644
--- a/pages/order/register/index.js
+++ b/pages/order/register/index.js
@@ -19,10 +19,12 @@ Page({
step:1,
name:'',//姓名
mobile:'',//手机号
- bak_mobile:'',//备用手机号
- address:'',//地址
cardid:'',//身份证
-
+ owner_name:'',//车主姓名
+ owner_mobile:'',//车主手机号
+ owner_cardid:'',//车主身份证
+ company:'',//企业名称
+ credit:'',//企业信用代码
brand_id:'',//品牌
car_id:'',//车系id
v_id:'',//车型级别id
@@ -58,13 +60,17 @@ Page({
paymentIndex:-1,//付款方式
payment:['全款', '分期',],
- mainIndex:0,//购车主体
- main:['个人', '公司',],
- entrustIndex:1,//是否委托
- entrust:['是','否',],
- entrust_name:'',//受托人姓名
- entrust_idcard:'',//受托人身份证
- entrust_mobile:'',//委托人手机号
+ main_type:0,//购车主体
+ main:[
+ {
+ title:'个人',
+ value:0,
+ },
+ {
+ title:'公司',
+ value:1,
+ },
+ ],
isPreview:false,//是否预览
isFill:false,//是否已填完成
@@ -78,8 +84,6 @@ Page({
srv_ids:[],//代办选择数组
agencyList:[],//代办数组
fine_total:0,//精品费用
- fine_ids:[],//精品选择数组
- fineList:[],//精品数组
isShowSuccess:false,//是否显示成功提示
isShowContract:false,//是否显示生成合同
@@ -87,6 +91,15 @@ Page({
if_fine:false,//精品尊享包
disc_fine_money:'',//精品优惠金额
+ deposit:'',//定金
+
+ fines:[
+ {
+ txt:'',
+ price:'',
+ },
+ ],//精品赠送
+
},
//生命周期函数--监听页面加载
onLoad: function (options) {
@@ -99,7 +112,6 @@ Page({
this.getAppCustomersList()
this.getAppSeriesBrands()
this.getUserInfo()
- this.getAppFine()
},
@@ -130,45 +142,39 @@ Page({
icon: 'none'
})
}
- else if(this.data.mainIndex == -1 ){
- wx.showToast({
- title: '请选择购车主体',
- icon: 'none'
- })
- }
- else if(this.data.mainIndex == 0&&(this.data.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.cardid))){
+ else if(this.data.main_type == 0&&(this.data.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.cardid))){
wx.showToast({
title: '请填写正确客户身份证',
icon: 'none'
})
}
- else if (this.data.address == '' ) {
+ else if(this.data.main_type == 0&&this.data.owner_name == ''){
wx.showToast({
- title: '请输入客户地址',
+ title: '请填写车主姓名',
icon: 'none'
})
}
- else if(this.data.entrustIndex == -1 ){
+ else if(this.data.main_type == 0&&this.data.owner_mobile == ''){
wx.showToast({
- title: '请选择是否委托',
+ title: '请填写车主手机号',
icon: 'none'
})
}
- else if(this.data.entrustIndex == 0 && this.data.entrust_name == ''){
+ 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: '请填写受托人姓名',
+ title: '请填写正确车主身份证',
icon: 'none'
})
}
- else if(this.data.entrustIndex == 0 && (this.data.entrust_idcard == ''|| !/^\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.entrust_idcard))){
+ else if(this.data.main_type == 1&&this.data.company == ''){
wx.showToast({
- title: '请填写正确受托人身份证',
+ title: '请填写企业名称',
icon: 'none'
})
}
- else if(this.data.entrustIndex == 0 && !/^1[3456789]\d{9}$/.test(this.data.entrust_mobile)){
+ else if(this.data.main_type == 1&&this.data.credit == ''){
wx.showToast({
- title: '请输入正确委托人手机号',
+ title: '请填写企业信用代码',
icon: 'none'
})
}
@@ -199,6 +205,11 @@ Page({
title: '请选择内饰颜色',
icon: 'none'
})
+ }else if(this.data.deposit == '' ){
+ wx.showToast({
+ title: '请选择定金',
+ icon: 'none'
+ })
}else{
this.setData({
step:3,
@@ -276,7 +287,6 @@ Page({
if(res.biz_name == '测试门店'){
this.setData({
- address:'福建狸车科技测试门店',//地址
cardid:'350000202101010000',//身份证
})
}
@@ -544,17 +554,13 @@ Page({
//购车主体
changeMain(e) {
this.setData({
- mainIndex:e.detail.value,
- })
- },
-
- //是否委托
- changeEntrust(e) {
- this.setData({
- entrustIndex:e.detail.value,
- entrust_name:'',
- entrust_idcard:'',
- entrust_mobile:'',
+ main_type:e.detail.value,
+ cardid:'',
+ owner_name:'',
+ owner_mobile:'',
+ owner_cardid:'',
+ company:'',
+ credit:'',
})
},
@@ -567,15 +573,9 @@ Page({
params['color_id'] = this.data.color_id;
params['incolor_id'] = this.data.incolor_id;
_.apiQuery.getAppSeriesInfo(params).then(res => {
- let fineList = this.data.fineList
- fineList.forEach(item => {
- item.checked = false
- })
this.setData({
priceinfo:res.data,
disc_money:'',
- fineList:fineList,
- fine_ids:[],
fine_total:0,
})
});
@@ -600,17 +600,6 @@ Page({
}
},
- //获取精品赠送列表
- getAppFine(){
- let params = {};
- params['car_id'] = this.data.car_id;
- _.apiQuery.getAppFine(params).then(res => {
- this.setData({
- fineList:res.data.list,
- })
- });
- },
-
//建卡时间
delryTime(e){
this.setData({
@@ -618,6 +607,15 @@ Page({
})
},
+ //一件同步购车人信息
+ synchroCustomer(e){
+ this.setData({
+ owner_name:this.data.name,
+ owner_mobile:this.data.mobile,
+ owner_cardid:this.data.cardid,
+ })
+ },
+
//获取金融机构列表
getAppFinance(){
let params = {};
@@ -640,55 +638,64 @@ Page({
},
//新建订单
- postAppCusorder() {
+ postAppCusorderV2() {
let that = this
that.setData({
submitFlag: true,
})
+
+ let fines = []
+ that.data.fines.forEach(item => {
+ if(item.txt!=''){
+ fines.push(item)
+ }
+ });
+
let params = {};
+ params['main_type'] = that.data.main_type;
params['cus_id'] = that.data.customer[that.data.customerIndex].id;
params['name'] = that.data.name;
params['mobile'] = that.data.mobile;
- if(that.data.bak_mobile != ''){
- params['bak_mobile'] = that.data.bak_mobile;
- }
if(that.data.cardid != ''){
params['cardid'] = that.data.cardid;
}
- params['address'] = that.data.address;
params['car_id'] = that.data.car_id;
params['v_id'] = that.data.v_id;
params['color_id'] = that.data.color_id;
params['incolor_id'] = that.data.incolor_id;
params['price'] = that.data.priceinfo.price;
- params['deposit'] = that.data.priceinfo.deposit;
+ params['deposit'] = that.data.deposit;
params['payway'] = that.data.paymentIndex==0?'1':'0';
- params['main_type'] = that.data.mainIndex==0?'0':'1';
- params['ifentrust'] = that.data.entrustIndex==0?'1':'0';
params['delry_time'] = that.data.delry_time;
- if(that.data.entrust_name != ''){
- params['entrust_name'] = that.data.entrust_name;
- }
- if(that.data.entrust_idcard != ''){
- params['entrust_idcard'] = that.data.entrust_idcard;
- }
- if(that.data.entrust_mobile != ''){
- params['entrust_mobile'] = that.data.entrust_mobile;
- }
if(that.data.finance_id!= ''){
params['finance_id'] = that.data.finance_id;
}
if(that.data.inten_money != ''){
params['inten_money'] = that.data.inten_money;
}
+ 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;
+ }
if(!!that.data.disc_money && that.data.disc_money != '' ){
params['disc_money'] = that.data.disc_money;
}
if(that.data.srv_ids.length>0){
params['srv_ids'] = that.data.srv_ids;
}
- if(that.data.fine_ids.length>0){
- params['fine_ids'] = that.data.fine_ids;
+ if(fines.length>0){
+ params['fines'] = fines;
}
if(that.data.priceinfo.fine_money){
params['if_fine'] = that.data.if_fine?'1':'0';
@@ -696,7 +703,7 @@ Page({
params['disc_fine_money'] = that.data.disc_fine_money;
}
}
- _.apiQuery.postAppCusorder(params).then(res => {
+ _.apiQuery.postAppCusorderV2(params).then(res => {
//刷新列表页
let pages = getCurrentPages();
@@ -775,6 +782,15 @@ Page({
}
},
+ //选择定金
+ depositPicker(e){
+ if(e.currentTarget.dataset.deposit != this.data.deposit){
+ this.setData({
+ deposit:e.currentTarget.dataset.deposit,
+ })
+ }
+ },
+
//显示选择客户
showSelectCustomer(){
this.setData({
@@ -796,7 +812,7 @@ Page({
},
//收取意向金新建订单
- postAppCusorder2() {
+ postAppCusorderV2Inten() {
if (this.data.customerIndex == -1 ) {
wx.showToast({
@@ -814,51 +830,45 @@ Page({
icon: 'none'
})
}
- else if(this.data.mainIndex == -1 ){
- wx.showToast({
- title: '请选择购车主体',
- icon: 'none'
- })
- }
- else if(this.data.mainIndex == 0&&(this.data.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.cardid))){
+ else if(this.data.main_type == 0&&(this.data.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.cardid))){
wx.showToast({
title: '请填写正确客户身份证',
icon: 'none'
})
}
- else if (this.data.address == '' ) {
- wx.showToast({
- title: '请输入客户地址',
- icon: 'none'
- })
- }
else if(this.data.inten_money == ''){
wx.showToast({
title: '请输入意向金',
icon: 'none'
})
}
- else if(this.data.entrustIndex == -1 ){
+ else if(this.data.main_type == 0&&this.data.owner_name == ''){
wx.showToast({
- title: '请选择是否委托',
+ title: '请填写车主姓名',
icon: 'none'
})
}
- else if(this.data.entrustIndex == 0 && this.data.entrust_name == ''){
+ else if(this.data.main_type == 0&&this.data.owner_mobile == ''){
wx.showToast({
- title: '请填写受托人姓名',
+ title: '请填写车主手机号',
icon: 'none'
})
}
- else if(this.data.entrustIndex == 0 && (this.data.entrust_idcard == ''|| !/^\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.entrust_idcard))){
+ 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: '请输入正确受托人身份证',
+ title: '请填写正确车主身份证',
icon: 'none'
})
}
- else if(this.data.entrustIndex == 0 && !/^1[3456789]\d{9}$/.test(this.data.entrust_mobile)){
+ else if(this.data.main_type == 1&&this.data.company == ''){
wx.showToast({
- title: '请输入正确委托人手机号',
+ title: '请填写企业名称',
+ icon: 'none'
+ })
+ }
+ else if(this.data.main_type == 1&&this.data.credit == ''){
+ wx.showToast({
+ title: '请填写企业信用代码',
icon: 'none'
})
}
@@ -874,31 +884,30 @@ Page({
submitFlag: true,
})
let params = {};
+ params['main_type'] = that.data.main_type;
params['cus_id'] = that.data.customer[that.data.customerIndex].id;
params['name'] = that.data.name;
params['mobile'] = that.data.mobile;
- if(that.data.bak_mobile != ''){
- params['bak_mobile'] = that.data.bak_mobile;
- }
+ params['inten_money'] = that.data.inten_money;
if(that.data.cardid != ''){
params['cardid'] = that.data.cardid;
}
- params['address'] = that.data.address;
- params['main_type'] = that.data.mainIndex==0?'0':'1';
- params['ifentrust'] = that.data.entrustIndex==0?'1':'0';
- if(that.data.entrust_name != ''){
- params['entrust_name'] = that.data.entrust_name;
+ if(that.data.owner_name != ''){
+ params['owner_name'] = that.data.owner_name;
}
- if(that.data.entrust_idcard != ''){
- params['entrust_idcard'] = that.data.entrust_idcard;
+ if(that.data.owner_mobile != ''){
+ params['owner_mobile'] = that.data.owner_mobile;
}
- if(that.data.entrust_mobile != ''){
- params['entrust_mobile'] = that.data.entrust_mobile;
+ if(that.data.owner_cardid != ''){
+ params['owner_cardid'] = that.data.owner_cardid;
}
- if(that.data.inten_money != ''){
- params['inten_money'] = that.data.inten_money;
+ if(that.data.company != ''){
+ params['company'] = that.data.company;
}
- _.apiQuery.postAppCusorder2(params).then(res => {
+ if(that.data.credit != ''){
+ params['credit'] = that.data.credit;
+ }
+ _.apiQuery.postAppCusorderV2Inten(params).then(res => {
//刷新列表页
let pages = getCurrentPages();
@@ -915,18 +924,6 @@ Page({
details:res.data,
})
- // wx.showModal({
- // title: '登记成功',
- // content: '',
- // confirmText: "查看详情",
- // confirmColor: "#36afa2",
- // showCancel:false,
- // success() {
- // wx.redirectTo({
- // url: '/pages/order/detail/index?id=' + res.data.id
- // })
- // }
- // })
}).catch(res=>{
that.setData({
submitFlag: false,
@@ -960,96 +957,6 @@ Page({
})
},
- //精品相关
- changeFine(e) {
- //判断是否选中
- if(this.data.fineList[e.currentTarget.dataset.index].checked){
- let fine_ids = this.data.fine_ids
- let idsindex = fine_ids.indexOf(this.data.fineList[e.currentTarget.dataset.index].id);
- fine_ids.splice(idsindex, 1)
- this.setData({
- ['fineList['+e.currentTarget.dataset.index+'].checked']:false,
- fine_ids,
- })
-
- let fine_total = 0
- this.data.fineList.forEach(item => {
- if(item.checked == true){
- fine_total = fine_total + parseFloat(item.price)
- }
- })
- this.setData({
- fine_total,
- })
- }else{
- let fine_ids = this.data.fine_ids
- fine_ids.push(this.data.fineList[e.currentTarget.dataset.index].id)
- this.setData({
- ['fineList['+e.currentTarget.dataset.index+'].checked']:true,
- fine_ids,
- })
-
- let fine_total = 0
- this.data.fineList.forEach(item => {
- if(item.checked == true){
- fine_total = fine_total + parseFloat(item.price)
- }
- })
- this.setData({
- fine_total,
- })
- }
-
- // //判断是否选中
- // if(this.data.fineList[e.currentTarget.dataset.index].checked){
- // let fine_ids = this.data.fine_ids
- // let idsindex = fine_ids.indexOf(this.data.fineList[e.currentTarget.dataset.index].id);
- // fine_ids.splice(idsindex, 1)
- // this.setData({
- // ['fineList['+e.currentTarget.dataset.index+'].checked']:false,
- // fine_ids,
- // })
-
- // let fine_total = 0
- // this.data.fineList.forEach(item => {
- // if(item.checked == true){
- // fine_total = fine_total + parseFloat(item.price)
- // }
- // })
- // this.setData({
- // fine_total,
- // })
- // }else{
- // //判断是否超过最大可优惠价格
- // if(this.data.priceinfo.dis_money>0 && parseFloat(this.data.disc_money!=''?this.data.disc_money:'0')+this.data.fine_total+parseFloat(this.data.fineList[e.currentTarget.dataset.index].price)>parseFloat(this.data.priceinfo.dis_money)){
- // wx.showToast({
- // title: '已超过最大可优惠价格',
- // icon: 'none'
- // })
- // this.setData({
- // ['fineList['+e.currentTarget.dataset.index+'].checked']:false,
- // })
- // }else{
- // let fine_ids = this.data.fine_ids
- // fine_ids.push(this.data.fineList[e.currentTarget.dataset.index].id)
- // this.setData({
- // ['fineList['+e.currentTarget.dataset.index+'].checked']:true,
- // fine_ids,
- // })
-
- // let fine_total = 0
- // this.data.fineList.forEach(item => {
- // if(item.checked == true){
- // fine_total = fine_total + parseFloat(item.price)
- // }
- // })
- // this.setData({
- // fine_total,
- // })
- // }
- // }
- },
-
//精品尊享版
changeFineBag(){
this.setData({
@@ -1095,7 +1002,7 @@ Page({
//推送链接
viewDetails(e){
wx.redirectTo({
- url: '/pages/order/detail/index?id=' + this.data.details.id
+ url: '/pages/order/detail/index2?id=' + this.data.details.id
})
},
@@ -1107,4 +1014,36 @@ Page({
})
},
+ //添加精品
+ addFine(){
+ this.data.fines.push({
+ txt:'',
+ price:'',
+ })
+ this.setData({
+ fines:this.data.fines,
+ })
+ },
+
+ //添加精品
+ inputFines(e){
+ if(e.currentTarget.dataset.type=='txt'){
+ this.setData({
+ ['fines['+e.currentTarget.dataset.index+'].txt']:e.detail.value,
+ })
+ }
+ if(e.currentTarget.dataset.type=='price'){
+ this.setData({
+ ['fines['+e.currentTarget.dataset.index+'].price']:e.detail.value,
+ })
+ let fine_total = 0
+ this.data.fines.forEach(item => {
+ fine_total = fine_total + parseFloat(item.price)
+ })
+ this.setData({
+ fine_total,
+ })
+ }
+ },
+
})
\ No newline at end of file
diff --git a/pages/order/register/index.wxml b/pages/order/register/index.wxml
index 695423d..d645908 100644
--- a/pages/order/register/index.wxml
+++ b/pages/order/register/index.wxml
@@ -20,85 +20,94 @@
-
- 购车主体*
-
-
- 请选择
- {{main[mainIndex]}}
-
-
+ 购车信息
+
+
+ 购车主体*
+
+
+
+
+
+
+
+
+ 客户姓名*
+
+
+
+
+
+ 客户手机号码*
+
+
+
+
+
+ 客户身份证*
+
+
+
+
+
+
+ 意向金
+
+
+ 元
+
-
-
- 客户姓名*
-
-
+
+
+ 车主信息
+
+
-
- 客户手机号码*
-
-
+
+
+ 客户姓名*
+
+
+
-
-
- 客户备用号码
-
-
+
+ 客户手机号码*
+
+
+
-
-
- 客户身份证*
-
-
-
-
-
- 客户地址*
-
-
+
+ 客户身份证*
+
+
+
-
- 意向金(非必填)
-
-
- 元
-
-
-
- 是否委托*
-
-
- 请选择
- {{entrust[entrustIndex]}}
-
-
-
-
-
-
- 受托人姓名*
-
-
+
+ 企业信息
+
+
+ 企业名称*
+
+
+
+
+
+ 企业信用代号*
+
+
+
+
-
-
- 受托人身份证*
-
-
-
-
-
- 受托人手机号码*
-
-
-
-
-
+
@@ -151,6 +160,24 @@
+
+ 车辆平台售价
+
+ {{priceinfo.price}}元
+
+
+
+ 定金*
+
+
+
+
+ {{item}}
+
+
+
+
+
@@ -184,18 +211,6 @@
-
- 车辆平台售价
-
- {{priceinfo.price}}元
-
-
-
- 定金
-
- {{priceinfo.deposit}}元
-
-
车身优惠
@@ -242,12 +257,17 @@
-
-
- {{item.title}}
-
+
+
+
+
+
+
+
+
+ 添加
@@ -263,7 +283,7 @@
-
+
@@ -281,7 +301,11 @@
购车主体
- {{main[mainIndex]}}
+
+
+ {{item.title}}
+
+
客户姓名
@@ -291,42 +315,46 @@
客户手机号码
{{mobile}}
-
- 客户备用号码
- {{bak_mobile}}
-
客户身份证
{{cardid}}
-
- 客户地址
- {{address}}
-
意向金
{{inten_money}}元
-
- 是否委托
- {{entrust[entrustIndex]}}
+
+ 客户姓名
+
+ {{owner_name}}
+
-
-
- 受托人姓名
- {{entrust_name}}
+
+ 客户手机号码
+
+ {{owner_mobile}}
-
- 受托人身份证
- {{entrust_idcard}}
+
+
+ 客户身份证
+
+ {{owner_cardid}}
-
- 受托人手机号码
- {{entrust_mobile}}
+
+
+ 企业名称
+
+ {{company}}
-
+
+
+ 企业信用代号
+
+ {{credit}}
+
+
车辆信息
车辆品牌
@@ -348,6 +376,19 @@
内饰颜色
{{interiorArray[interiorIndex]}}
+
+ 车辆平台售价
+
+ {{priceinfo.price}}元
+
+
+
+ 定金
+
+ {{deposit}}元
+
+
+ 其他信息
付款方式
{{payment[paymentIndex]}}
@@ -360,23 +401,10 @@
期望交付时间
{{delry_time}}
-
- 车辆平台售价
-
- {{priceinfo.price}}元
-
-
-
- 定金
-
- {{priceinfo.deposit}}元
-
-
车身优惠
{{disc_money}}元
- 其他信息
精品尊享包
{{priceinfo.fine_money}}元
@@ -396,14 +424,14 @@
精品赠送
-
- {{item.title}}
+
+ {{item.txt}}
-
+
@@ -474,7 +502,7 @@
查看订单
- 生成合同
+
diff --git a/pages/order/register/index.wxss b/pages/order/register/index.wxss
index a7e8ebf..7a15a6c 100644
--- a/pages/order/register/index.wxss
+++ b/pages/order/register/index.wxss
@@ -3,7 +3,7 @@ checkbox .wx-checkbox-input {
width:30rpx;
height:30rpx;
border-color: #999;
- background: #f6f6f6;
+ background: #f9f9f9;
}
/* 选中后的 背景样式*/
checkbox .wx-checkbox-input.wx-checkbox-input-checked {
@@ -16,4 +16,24 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
color:#fff;
transform:translate(-50%, -50%) scale(1);
-webkit-transform:translate(-50%, -50%) scale(1);
+}
+
+/*外框样式*/
+radio .wx-radio-input{
+ width:30rpx;
+ height:30rpx;
+ border-color: #999;
+ background: #f9f9f9;
+}
+/* 选中后的 背景样式*/
+radio .wx-radio-input.wx-radio-input-checked{
+ border-color: #36afa2;
+ background: #36afa2;
+}
+/*选中后内部样式*/
+radio .wx-radio-input.wx-radio-input-checked::before{
+ font-size:20rpx;
+ color:#fff;
+ transform:translate(-50%, -50%) scale(1);
+ -webkit-transform:translate(-50%, -50%) scale(1);
}
\ No newline at end of file