Skip to content

Z
zhichan
Commit e3273ba0 by 王勇飞
Options

Merge branch 'center-manage' of gitlab.gongsibao.com:jiangyong/zhichan into center-manage

parents a4124fe3 8f814c47
Showing with 13 additions and 13 deletions
center-manage/app/base/service/impl/common/channelhandlers/tx.js
...@@ -532,7 +532,7 @@ class TxHandler { ...@@ -532,7 +532,7 @@ class TxHandler {
} }
async ServiceCreate(datajson) { //获取融易算服务实例到队列 async ServiceCreate(datajson) { //获取融易算服务实例到队列
console.log("ServiceCreate----------------------------------------------",datajson); console.log("ServiceCreate----------------------------------------------", datajson);
var obj = { var obj = {
"pushUrl": this.bookUrl + "/deliverybillCtl/insertInfo", "pushUrl": this.bookUrl + "/deliverybillCtl/insertInfo",
"actionType": "insertInfo", "actionType": "insertInfo",
...@@ -548,7 +548,7 @@ class TxHandler { ...@@ -548,7 +548,7 @@ class TxHandler {
} }
async ServiceUpdate(datajson) { //更新融易算服务信息到队列 async ServiceUpdate(datajson) { //更新融易算服务信息到队列
console.log("ServiceUpdate----------------------------------------------",datajson); console.log("ServiceUpdate----------------------------------------------", datajson);
var obj = { var obj = {
"pushUrl": this.bookUrl + "/deliverybillCtl/updateServer", "pushUrl": this.bookUrl + "/deliverybillCtl/updateServer",
"actionType": "updateServer", "actionType": "updateServer",
...@@ -565,7 +565,7 @@ class TxHandler { ...@@ -565,7 +565,7 @@ class TxHandler {
//融易算创建需求 //融易算创建需求
async LeadsCreate(datajson) { async LeadsCreate(datajson) {
console.log("LeadsCreate----------------------------------------------",datajson); console.log("LeadsCreate----------------------------------------------", datajson);
var obj = { var obj = {
"pushUrl": this.bookUrl + "/bizoptCtl/insertInfo", "pushUrl": this.bookUrl + "/bizoptCtl/insertInfo",
"actionType": "insertInfo", "actionType": "insertInfo",
...@@ -582,7 +582,7 @@ class TxHandler { ...@@ -582,7 +582,7 @@ class TxHandler {
//融易算更新需求状态 //融易算更新需求状态
async LeadsUpdate(datajson) { async LeadsUpdate(datajson) {
console.log("LeadsUpdate----------------------------------------------",datajson); console.log("LeadsUpdate----------------------------------------------", datajson);
var obj = { var obj = {
"pushUrl": this.bookUrl + "/bizoptCtl/updatepayStatusByDemandCode", "pushUrl": this.bookUrl + "/bizoptCtl/updatepayStatusByDemandCode",
"actionType": "updatepayStatusByDemandCode", "actionType": "updatepayStatusByDemandCode",
...@@ -600,9 +600,9 @@ class TxHandler { ...@@ -600,9 +600,9 @@ class TxHandler {
// 融易算服务状态变更通知 // 融易算服务状态变更通知
async ServiceStatusNotify(datajson) { async ServiceStatusNotify(datajson) {
console.log("ServiceStatusNotify----------------------------------------------",datajson); console.log("ServiceStatusNotify----------------------------------------------", datajson);
let ab = Object.assign({}, datajson); let ab = Object.assign({}, datajson);
ab.status = ab.status === 6 ? "inserivice" : "closed"; ab.status = ab.status === 6 ? "inservice" : "closed";
var obj = { var obj = {
"pushUrl": this.bookUrl + "/deliverybillCtl/notifyServiceStatusChange", "pushUrl": this.bookUrl + "/deliverybillCtl/notifyServiceStatusChange",
"actionType": "notifyServiceStatusChange", "actionType": "notifyServiceStatusChange",
...@@ -619,7 +619,7 @@ class TxHandler { ...@@ -619,7 +619,7 @@ class TxHandler {
//融易算报表确认 //融易算报表确认
async ConfirmReport(datajson) { async ConfirmReport(datajson) {
console.log("ConfirmReport----------------------------------------------",datajson); console.log("ConfirmReport----------------------------------------------", datajson);
var messageBody = datajson; var messageBody = datajson;
messageBody.dataType = "2"; messageBody.dataType = "2";
messageBody.rysCheck = "1"; messageBody.rysCheck = "1";
...@@ -640,7 +640,7 @@ class TxHandler { ...@@ -640,7 +640,7 @@ class TxHandler {
//融易算报税确认 //融易算报税确认
async ConfirmTax(datajson) { async ConfirmTax(datajson) {
console.log("ConfirmTax----------------------------------------------",datajson); console.log("ConfirmTax----------------------------------------------", datajson);
var messageBody = datajson; var messageBody = datajson;
messageBody.dataType = "3"; messageBody.dataType = "3";
messageBody.rysCheck = "1"; messageBody.rysCheck = "1";
...@@ -661,7 +661,7 @@ class TxHandler { ...@@ -661,7 +661,7 @@ class TxHandler {
//融易算接收票据快递单号 //融易算接收票据快递单号
async ReceivePaperPost(datajson) { async ReceivePaperPost(datajson) {
console.log("ReceivePaperPost----------------------------------------------",datajson); console.log("ReceivePaperPost----------------------------------------------", datajson);
var obj = { var obj = {
"pushUrl": this.bookUrl + "/deliverybillCtl/receivePaperPost", "pushUrl": this.bookUrl + "/deliverybillCtl/receivePaperPost",
"actionType": "receivePaperPost", "actionType": "receivePaperPost",
......
center-manage/app/config/routes/api.js
...@@ -26,9 +26,9 @@ module.exports = function (app) { ...@@ -26,9 +26,9 @@ module.exports = function (app) {
} else { } else {
let rtn = await chnelapi.channelHandle(channel, req.path + "/" + ((req.body && req.body.actionType) || ''), req.body) let rtn = await chnelapi.channelHandle(channel, req.path + "/" + ((req.body && req.body.actionType) || ''), req.body)
if (rtn != null) { if (rtn != null) {
res.end(JSON.stringify(rtn)); res.json(rtn);
} else { } else {
res.end(JSON.stringify({ status: -1, message: "fail" })); res.json({ status: -1, message: "fail" });
} }
} }
} catch (e) { } catch (e) {
......
web/dev/app.js
This source diff could not be displayed because it is too large. You can view the blob instead.
web/pre/app.js
This source diff could not be displayed because it is too large. You can view the blob instead.
web/prod/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/ccc.png><title></title><link href=/css/chunk-14b9857b.0dc416de.css rel=prefetch><link href=/css/chunk-175acaff.d8eef113.css rel=prefetch><link href=/css/chunk-1b756945.9e7173ae.css rel=prefetch><link href=/css/chunk-21b5182a.6e6ae301.css rel=prefetch><link href=/css/chunk-2c359864.0dc416de.css rel=prefetch><link href=/css/chunk-3385141a.0dc416de.css rel=prefetch><link href=/css/chunk-5ccefbbb.9e7173ae.css rel=prefetch><link href=/css/chunk-61b0b1e5.9e7173ae.css rel=prefetch><link href=/css/chunk-738a8724.71e3d438.css rel=prefetch><link href=/css/chunk-7b4463da.84fd9662.css rel=prefetch><link href=/css/chunk-8e32057a.e8e9a917.css rel=prefetch><link href=/css/chunk-e7e51fa0.9e7173ae.css rel=prefetch><link href=/css/chunk-ff3eaeb0.9e7173ae.css rel=prefetch><link href=/js/chunk-037694a5.7e50cc17.js rel=prefetch><link href=/js/chunk-0aa2a834.9e04d151.js rel=prefetch><link href=/js/chunk-137dcf78.d8fcc61f.js rel=prefetch><link href=/js/chunk-14b9857b.35e42781.js rel=prefetch><link href=/js/chunk-15d6294e.e68f6ff9.js rel=prefetch><link href=/js/chunk-175acaff.ca3f7e65.js rel=prefetch><link href=/js/chunk-1792c498.c1554a3b.js rel=prefetch><link href=/js/chunk-1a0615f2.b051fd28.js rel=prefetch><link href=/js/chunk-1b756945.f2391a13.js rel=prefetch><link href=/js/chunk-21b5182a.32c97099.js rel=prefetch><link href=/js/chunk-22347577.172e21a4.js rel=prefetch><link href=/js/chunk-24a41303.88feac34.js rel=prefetch><link href=/js/chunk-25d9ab36.087a7b9f.js rel=prefetch><link href=/js/chunk-291faf05.a64ccf02.js rel=prefetch><link href=/js/chunk-2aeda6fa.2bd11851.js rel=prefetch><link href=/js/chunk-2b3066fa.e9594f63.js rel=prefetch><link href=/js/chunk-2c359864.90a950b1.js rel=prefetch><link href=/js/chunk-2d0d61ef.a431f6b6.js rel=prefetch><link href=/js/chunk-2d0e68e0.1a313c84.js rel=prefetch><link href=/js/chunk-2d0efc5d.662e1339.js rel=prefetch><link href=/js/chunk-3385141a.a6e1a986.js rel=prefetch><link href=/js/chunk-3a0bcea0.192dd1cf.js rel=prefetch><link href=/js/chunk-477a8e91.c603527d.js rel=prefetch><link href=/js/chunk-4b58f216.e79a0ff7.js rel=prefetch><link href=/js/chunk-5ccefbbb.e0ae48f8.js rel=prefetch><link href=/js/chunk-5e7b929d.f3ce9ea9.js rel=prefetch><link href=/js/chunk-61b0b1e5.e4ead4e0.js rel=prefetch><link href=/js/chunk-65e97401.9a1a9380.js rel=prefetch><link href=/js/chunk-738a8724.73425720.js rel=prefetch><link href=/js/chunk-75b126e3.2bc9add9.js rel=prefetch><link href=/js/chunk-7b4463da.facbc44a.js rel=prefetch><link href=/js/chunk-8e32057a.e126188b.js rel=prefetch><link href=/js/chunk-9947983a.7fd1c1d8.js rel=prefetch><link href=/js/chunk-e7e51fa0.2dc827c3.js rel=prefetch><link href=/js/chunk-ff3eaeb0.73991da8.js rel=prefetch><link href=/css/app.4f840f8a.css rel=preload as=style><link href=/css/chunk-vendors.1d90d08d.css rel=preload as=style><link href=/js/app.f922aa32.js rel=preload as=script><link href=/js/chunk-vendors.95c04c90.js rel=preload as=script><link href=/css/chunk-vendors.1d90d08d.css rel=stylesheet><link href=/css/app.4f840f8a.css rel=stylesheet></head><body><noscript><strong>We're sorry but iview-admin doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.95c04c90.js></script><script src=/js/app.f922aa32.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/ccc.png><title></title><link href=/css/chunk-14b9857b.0dc416de.css rel=prefetch><link href=/css/chunk-175acaff.d8eef113.css rel=prefetch><link href=/css/chunk-1b756945.9e7173ae.css rel=prefetch><link href=/css/chunk-21b5182a.6e6ae301.css rel=prefetch><link href=/css/chunk-2c359864.0dc416de.css rel=prefetch><link href=/css/chunk-3385141a.0dc416de.css rel=prefetch><link href=/css/chunk-5ccefbbb.9e7173ae.css rel=prefetch><link href=/css/chunk-61b0b1e5.9e7173ae.css rel=prefetch><link href=/css/chunk-738a8724.71e3d438.css rel=prefetch><link href=/css/chunk-7b4463da.84fd9662.css rel=prefetch><link href=/css/chunk-8e32057a.e8e9a917.css rel=prefetch><link href=/css/chunk-e7e51fa0.9e7173ae.css rel=prefetch><link href=/css/chunk-ff3eaeb0.9e7173ae.css rel=prefetch><link href=/js/chunk-037694a5.7e50cc17.js rel=prefetch><link href=/js/chunk-0aa2a834.9e04d151.js rel=prefetch><link href=/js/chunk-137dcf78.d8fcc61f.js rel=prefetch><link href=/js/chunk-14b9857b.35e42781.js rel=prefetch><link href=/js/chunk-15d6294e.e68f6ff9.js rel=prefetch><link href=/js/chunk-175acaff.ca3f7e65.js rel=prefetch><link href=/js/chunk-1792c498.c1554a3b.js rel=prefetch><link href=/js/chunk-1a0615f2.b051fd28.js rel=prefetch><link href=/js/chunk-1b756945.f2391a13.js rel=prefetch><link href=/js/chunk-21b5182a.32c97099.js rel=prefetch><link href=/js/chunk-22347577.172e21a4.js rel=prefetch><link href=/js/chunk-24a41303.88feac34.js rel=prefetch><link href=/js/chunk-25d9ab36.087a7b9f.js rel=prefetch><link href=/js/chunk-291faf05.a64ccf02.js rel=prefetch><link href=/js/chunk-2aeda6fa.2bd11851.js rel=prefetch><link href=/js/chunk-2b3066fa.e9594f63.js rel=prefetch><link href=/js/chunk-2c359864.90a950b1.js rel=prefetch><link href=/js/chunk-2d0d61ef.a431f6b6.js rel=prefetch><link href=/js/chunk-2d0e68e0.1a313c84.js rel=prefetch><link href=/js/chunk-2d0efc5d.662e1339.js rel=prefetch><link href=/js/chunk-3385141a.a6e1a986.js rel=prefetch><link href=/js/chunk-3a0bcea0.192dd1cf.js rel=prefetch><link href=/js/chunk-477a8e91.c603527d.js rel=prefetch><link href=/js/chunk-4b58f216.e79a0ff7.js rel=prefetch><link href=/js/chunk-5ccefbbb.e0ae48f8.js rel=prefetch><link href=/js/chunk-5e7b929d.f3ce9ea9.js rel=prefetch><link href=/js/chunk-61b0b1e5.e4ead4e0.js rel=prefetch><link href=/js/chunk-65e97401.9a1a9380.js rel=prefetch><link href=/js/chunk-738a8724.73425720.js rel=prefetch><link href=/js/chunk-75b126e3.2bc9add9.js rel=prefetch><link href=/js/chunk-7b4463da.facbc44a.js rel=prefetch><link href=/js/chunk-8e32057a.e126188b.js rel=prefetch><link href=/js/chunk-9947983a.7fd1c1d8.js rel=prefetch><link href=/js/chunk-e7e51fa0.2dc827c3.js rel=prefetch><link href=/js/chunk-ff3eaeb0.73991da8.js rel=prefetch><link href=/css/app.4f840f8a.css rel=preload as=style><link href=/css/chunk-vendors.1d90d08d.css rel=preload as=style><link href=/js/app.2a9d446c.js rel=preload as=script><link href=/js/chunk-vendors.95c04c90.js rel=preload as=script><link href=/css/chunk-vendors.1d90d08d.css rel=stylesheet><link href=/css/app.4f840f8a.css rel=stylesheet></head><body><noscript><strong>We're sorry but iview-admin doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.95c04c90.js></script><script src=/js/app.2a9d446c.js></script></body></html>
\ No newline at end of file \ No newline at end of file
web/prod/js/app.f922aa32.js → web/prod/js/app.2a9d446c.js
This source diff could not be displayed because it is too large. You can view the blob instead.
web/test/app.js
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment