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

---
 pages/process/payment/index.js     | 25 +++++++++++++++++++------
 pages/process/payment/index.js.rej |  9 ---------
 2 files changed, 19 insertions(+), 15 deletions(-)
 delete mode 100644 pages/process/payment/index.js.rej

diff --git a/pages/process/payment/index.js b/pages/process/payment/index.js
index fa18d44..163ef23 100644
--- a/pages/process/payment/index.js
+++ b/pages/process/payment/index.js
@@ -137,13 +137,26 @@ Page({
     }).catch(err => {
       wx.hideLoading()
       this.data.requesting = false
-      util.showToast(err)
       console.log(err)
-      Dialog.confirm({ title: '温馨提示',  message: '该客户注册成为纸通宝用户，才可以使用千鸟代付，现在去注册？' }).then(() => {
-        var cid = this.data.orderList[0].factoryCustomerId
-        wx.navigateTo({ url: '/pages/client/registe/index?id=' + cid })
-      }).catch(err => {
-      })
+      if(err.indexOf('用户未实名') >= 0){
+        Dialog.confirm({ title: '温馨提示',  message: '您还没有实名认证，无法使用千鸟代付，现在去实名认证？' }).then(() => {
+          wx.navigateTo({ url: '/pages/home/authory/index' })
+        }).catch(err => {
+        })
+      } else if(err.indexOf('客户未注册') >= 0){
+        Dialog.confirm({ title: '温馨提示',  message: '该客户注册成为纸通宝用户，才可以使用千鸟代付，现在去注册？' }).then(() => {
+          var cid = this.data.orderList[0].factoryCustomerId
+          wx.navigateTo({ url: '/pages/client/registe/index?id=' + cid })
+        }).catch(err => {
+        })
+      } else if(err.indexOf('没有开通代付') >= 0){
+        Dialog.confirm({ title: '温馨提示',  message: '您还没有开通千鸟代付，现在去了解并开通？' }).then(() => {
+          wx.navigateTo({ url: '/pages/htmls/auths/index' })
+        }).catch(err => {
+        })
+      } else {
+        util.showToast(err)
+      }
     })
   },
   paymentOrder: function(){
diff --git a/pages/process/payment/index.js.rej b/pages/process/payment/index.js.rej
deleted file mode 100644
index 28702b9..0000000
--- a/pages/process/payment/index.js.rej
+++ /dev/null
@@ -1,9 +0,0 @@
-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 })