From 04193dae00b3e9071e10d9d1e487554c57fc1b1a Mon Sep 17 00:00:00 2001
From: chenxuhui <qwehui12@163.com>
Date: Thu, 3 Jan 2019 14:38:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=80=E6=9C=89=E8=AE=A2=E5=8D=95=E6=96=B0?=
 =?UTF-8?q?=E5=BB=BA=E5=AE=8C=E6=88=90=E6=8F=90=E7=A4=BA=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E8=BF=9B=E5=85=A5=E5=88=97=E8=A1=A8=EF=BC=8C=E5=90=A6->?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=87=8D=E5=AE=9A=E5=90=91=E8=BF=9B=E5=85=A5?=
 =?UTF-8?q?=E6=89=80=E5=BB=BA=E5=8D=95=E6=8D=AE=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/guarantee/newbill/newbill.js                         | 7 ++++++-
 pages/order/newBill/newBill.js                             | 5 +++++
 .../creatNewSpecialOrder/creatNewSpecialOrder.js           | 7 ++++++-
 pages/waitForApproval/approvalDetail/approvalDetail.js     | 1 -
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/pages/guarantee/newbill/newbill.js b/pages/guarantee/newbill/newbill.js
index 0168309..ac84b33 100644
--- a/pages/guarantee/newbill/newbill.js
+++ b/pages/guarantee/newbill/newbill.js
@@ -279,11 +279,16 @@ Page({
     }];
     network.transfer_request(method, params, function(res) {
       if (res.result != null) {
+        var orderID = res.result;
         wx.showModal({
           title: '新建业务担保单No.' + res.result,
           content: '新建成功,是否返回首页',
           success: function(res) {
-            if (res.cancel) {} else {
+            if (res.cancel) {
+              wx.redirectTo({
+                url: '../detail/detail?ID=' + orderID,
+              })
+            } else {
               app.globalData.billInfo = [];
               wx.navigateBack({
                 delta: 1
diff --git a/pages/order/newBill/newBill.js b/pages/order/newBill/newBill.js
index fd1ce3e..6477834 100644
--- a/pages/order/newBill/newBill.js
+++ b/pages/order/newBill/newBill.js
@@ -501,6 +501,7 @@ Page({
 
     network.transfer_request(method, params, function(res) {
       if (res.result != null) {
+        var orderID = res.result;
         wx.showModal({
           title: '新建订单No.' + res.result,
           content: '新建成功,是否返回首页',
@@ -509,6 +510,10 @@ Page({
               wx.navigateBack({
                 delta: 1
               })
+            } else {
+              wx.redirectTo({
+                url: '/pages/order/detail/detail?ID=' + orderID,
+              })
             }
           },
           fail: function(res) {}
diff --git a/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.js b/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.js
index 97896f9..3993caf 100644
--- a/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.js
+++ b/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.js
@@ -394,11 +394,16 @@ Page({
     }];
     network.transfer_request(method, params, function(res) {
       if (res.result != null) {
+        var orderID = res.result;
         wx.showModal({
           title: '新建申请单No.' + res.result,
           content: '新建成功,是否返回上级列表',
           success: function(res) {
-            if (res.cancel) {} else {
+            if (res.cancel) {
+              wx.redirectTo({
+                url: '../specialOrderApplyDetail/specialOrderApplyDetail?ID=' + orderID,                
+              })
+            } else {
               wx.navigateBack({
                 delta: 1
               })
diff --git a/pages/waitForApproval/approvalDetail/approvalDetail.js b/pages/waitForApproval/approvalDetail/approvalDetail.js
index afadcf2..3ed9bef 100644
--- a/pages/waitForApproval/approvalDetail/approvalDetail.js
+++ b/pages/waitForApproval/approvalDetail/approvalDetail.js
@@ -209,7 +209,6 @@ Page({
     var backDate ='';
     if (result.CashBackDate) {
       backDate =timechage.formatTimeTwo(result.CashBackDate.substring(6, 19), 'Y/M/D h:m')
-
       }
     var formTitle = {
       //返回的订单ID