diff --git a/pages/synthesis/entrustCivil.vue b/pages/synthesis/entrustCivil.vue index bb34dd0..c559c65 100644 --- a/pages/synthesis/entrustCivil.vue +++ b/pages/synthesis/entrustCivil.vue @@ -300,7 +300,6 @@ let subData = {}; let dataArr = [] - for(let val of this.paramsArr){ if(val.type === 'pro_city'){ subData[val.key] = this.address @@ -315,9 +314,12 @@ value: subData[key] }) } - - - entrustPost(this.entrustId, {...dataArr}).then(res => { + entrustPost(this.entrustId, { + data: dataArr, + type: 'self', + channel: 'h5', + user_id: '' + }).then(res => { this.disabled = true this.expressSheet(res.entrust_order_id, res.order_type, res.can, res.price) }).catch( err => { diff --git a/pages/synthesis/entrustWrite.vue b/pages/synthesis/entrustWrite.vue index ab689fe..e4014c0 100644 --- a/pages/synthesis/entrustWrite.vue +++ b/pages/synthesis/entrustWrite.vue @@ -240,7 +240,12 @@ }) } - entrustPost(this.$Route.query.entrustId, {...dataArr}).then(res => { + entrustPost(this.$Route.query.entrustId, { + data: dataArr, + type: 'self', + channel: 'h5', + user_id: '' + }).then(res => { this.disabled = true this.expressSheet(res.entrust_order_id, res.order_type, res.can, res.price ) }).catch( err => { diff --git a/pages/synthesis/expandWrite.vue b/pages/synthesis/expandWrite.vue index 1fbaa0a..dcfac09 100644 --- a/pages/synthesis/expandWrite.vue +++ b/pages/synthesis/expandWrite.vue @@ -223,7 +223,12 @@ }) } - expandsPost(this.$Route.query.entrustId, {...dataArr}).then(res => { + expandsPost(this.$Route.query.entrustId, { + data: dataArr, + type: 'self', + channel: 'h5', + user_id: '' + }).then(res => { this.disabled = true this.expressSheet(res.expand_order_id, res.order_type, res.can, res.price ) }).catch( err => { diff --git a/pages/synthesis/feeWrite.vue b/pages/synthesis/feeWrite.vue index 6360566..58ca4f5 100644 --- a/pages/synthesis/feeWrite.vue +++ b/pages/synthesis/feeWrite.vue @@ -208,7 +208,12 @@ value: subData[key] }) } - synthPost(this.$Route.query.synthesisId, {...dataArr}).then(res => { + synthPost(this.$Route.query.synthesisId, { + data: dataArr, + type: 'self', + channel: 'h5', + user_id: '' + }).then(res => { this.disabled = true uni.showToast({ title: '提交成功', diff --git a/pages/synthesis/personWrite.vue b/pages/synthesis/personWrite.vue index f160eb5..0876d34 100644 --- a/pages/synthesis/personWrite.vue +++ b/pages/synthesis/personWrite.vue @@ -180,7 +180,12 @@ value: subData[key] }) } - yearSynthPost(this.$Route.query.serveId, {...dataArr}).then(res => { + yearSynthPost(this.$Route.query.serveId, { + data: dataArr, + type: 'self', + channel: 'h5', + user_id: '' + }).then(res => { this.disabled = true this.expressSheet(res.service_order_id, res.order_type, res.can, res.price ) }).catch( err => { diff --git a/pages/synthesis/standWrite.vue b/pages/synthesis/standWrite.vue index 2685984..8324fc6 100644 --- a/pages/synthesis/standWrite.vue +++ b/pages/synthesis/standWrite.vue @@ -206,8 +206,12 @@ value: subData[key] }) } - - yearSynthPost(this.$Route.query.serveId, {...dataArr}).then(res => { + yearSynthPost(this.$Route.query.serveId, { + data: dataArr, + type: 'self', + channel: 'h5', + user_id: '' + }).then(res => { this.disabled = true this.expressSheet(res.service_order_id, res.order_type, res.can, res.price ) }).catch( err => { diff --git a/router/index.js b/router/index.js index 983f4cf..a05f39c 100644 --- a/router/index.js +++ b/router/index.js @@ -30,20 +30,20 @@ router.beforeEach((to, from, next) => { return } // 检查用户是否授权了微信 - // if(to.name != 'webWechatIndex' && openId === ''){ - // authFollow({ - // url: 'https://web.douhuotest.douhuofalv.com/webWechat/index' - // // url: 'https://web.douhuofalv.com/webWechat/index' - // }).then(res => { - // window.location.href = res - // }).catch(err => { - // uni.showToast({ - // title: err.message, - // icon: "none" - // }) - // }) - // return - // } + if(to.name != 'webWechatIndex' && openId === ''){ + authFollow({ + url: 'https://web.douhuotest.douhuofalv.com/webWechat/index' + // url: 'https://web.douhuofalv.com/webWechat/index' + }).then(res => { + window.location.href = res + }).catch(err => { + uni.showToast({ + title: err.message, + icon: "none" + }) + }) + return + } // 检查是否需要登录 if(to.auth && token === ''){