From de266737ec1bc5898aead3678a9b97f2c7f5697a Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Tue, 30 Mar 2021 19:47:28 +0800
Subject: [PATCH] no message

---
 pages/home/employee/index.js       | 2 ++
 pages/process/payment/index.js     | 5 ++---
 pages/process/payment/index.js.rej | 9 +++++++++
 3 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 pages/process/payment/index.js.rej

diff --git a/pages/home/employee/index.js b/pages/home/employee/index.js
index fdf0ed8..8c65748 100644
--- a/pages/home/employee/index.js
+++ b/pages/home/employee/index.js
@@ -115,6 +115,7 @@ Page({
       this.fetchMemberList()
     }).catch(err => {
       wx.hideLoading()
+      console.log(err)
       util.showToast(err)
     })
   },
@@ -126,6 +127,7 @@ Page({
       wx.hideLoading()
     }).catch(err => {
       wx.hideLoading()
+      console.log(err)
       util.showToast(err)
     })
   },
diff --git a/pages/process/payment/index.js b/pages/process/payment/index.js
index 39a33a4..5679dfb 100644
--- a/pages/process/payment/index.js
+++ b/pages/process/payment/index.js
@@ -154,9 +154,8 @@ Page({
       util.showToast('请选择要付款的订单')
       return
     }
-    Dialog.confirm({ title: '温馨提示',  message: '该客户注册成为纸通宝用户，才可以使用千鸟代付，现在去注册？' }).then(() => {
-      var cid = this.data.orderList[0].factoryCustomerId
-      wx.navigateTo({ url: '/pages/client/registe/index?id=' + cid })
+    Dialog.confirm({ title: '温馨提示',  message: '订单已经付款，在此进行确认？' }).then(() => {
+      this.agentPayment(this.data.params.settleType)
     }).catch(err => {
     })
   },
diff --git a/pages/process/payment/index.js.rej b/pages/process/payment/index.js.rej
new file mode 100644
index 0000000..28702b9
--- /dev/null
+++ b/pages/process/payment/index.js.rej
@@ -0,0 +1,9 @@
+diff a/pages/process/payment/index.js b/pages/process/payment/index.js	(rejected hunks)
+@@ -154,7 +154,6 @@
+       util.showToast('请选择要付款的订单')
+       return
+     }
+-      this.agentPayment(this.data.params.settleType)
+     Dialog.confirm({ title: '温馨提示',  message: '该客户注册成为纸通宝用户，才可以使用千鸟代付，现在去注册？' }).then(() => {
+       var cid = this.data.orderList[0].factoryCustomerId
+       wx.navigateTo({ url: '/pages/client/registe/index?id=' + cid })