From d3315d7eac567c749d56cf3b4f209d83512c47c0 Mon Sep 17 00:00:00 2001
From: TM <923727421@qq.com>
Date: Tue, 15 Dec 2020 15:59:35 +0800
Subject: [PATCH] 修改bug

---
 pages/hbfqPage/orderInfo/orderInfo.js |  145 +++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 123 insertions(+), 22 deletions(-)

diff --git a/pages/hbfqPage/orderInfo/orderInfo.js b/pages/hbfqPage/orderInfo/orderInfo.js
index 662e490..41184e4 100644
--- a/pages/hbfqPage/orderInfo/orderInfo.js
+++ b/pages/hbfqPage/orderInfo/orderInfo.js
@@ -1,6 +1,7 @@
 
 const app = getApp()
 let $api = require('../../../utils/ajaxFn.js')
+let validator = require('../../../utils/validator.js')
 Page({
   data: {
     isBoss: true,
@@ -91,7 +92,6 @@
     this.setData({
       info: { ...this.data.info, ...obj }
     })
-    console.log(this.data.info)
     if (code == 1) {
       if (!this.data.info.amt || !this.data.info.prodId || !this.data.info.term || !this.data.info.zfbVersion) {
         this.setData({
@@ -127,7 +127,6 @@
       ]
     })
     this.getList({ prodId: this.data.info.prodId })
-    console.log(this.data.info.amt, this.data.info.prodId, this.data.info.term, this.data.info.zfbVersion)
     if (!this.data.info.amt || !this.data.info.prodId || !this.data.info.term || !this.data.info.zfbVersion) {
       this.setData({
         isBoss: false
@@ -146,7 +145,6 @@
       termName: this.data.termsList[e.detail.value].name,
       'info.term': this.data.termsList[e.detail.value].code
     })
-    console.log(this.data.info.amt, this.data.info.prodId, this.data.info.term, this.data.info.zfbVersion)
     if (!this.data.info.amt || !this.data.info.prodId || !this.data.info.term || !this.data.info.zfbVersion) {
       this.setData({
         isBoss: false
@@ -177,7 +175,6 @@
         { name: '支付利率', rate: 0 }
       ]
     })
-    console.log(this.data.info.amt, this.data.info.prodId, this.data.info.term, this.data.info.zfbVersion)
     this.getList({ prodId: this.data.info.prodId, zfbVersion: this.data.info.zfbVersion })
     if (!this.data.info.amt || !this.data.info.prodId || !this.data.info.term || !this.data.info.zfbVersion) {
       this.setData({
@@ -196,15 +193,62 @@
     this.setData({
       'info.payType': 2
     })
-    for (let key in this.data.info) {
-      if (!this.data.info[key]) {
-        my.showToast({
-          type: 'none',
-          content: '请完整输入信息',
-          duration: 2000,
-        });
-        return
-      }
+    let info = this.data.info
+    if (!validator.checkbdMoney(info.amt)||info.amt==0) {
+      my.showToast({
+        type: 'none',
+        content: '请输入0.01-100000之间分期本金',
+        duration: 2000,
+      });
+      return
+    }
+    if (validator.checkValEmpty(info.goodsName)) {
+      my.showToast({
+        type: 'none',
+        content: '请输入商品名称',
+        duration: 2000,
+      });
+      return
+    }
+    if (validator.checkValEmpty(info.prodId)) {
+      my.showToast({
+        type: 'none',
+        content: '请选择付息方式',
+        duration: 2000,
+      });
+      return
+    }
+    if (validator.checkValEmpty(info.zfbVersion)) {
+      my.showToast({
+        type: 'none',
+        content: '请选择办单通道',
+        duration: 2000,
+      });
+      return
+    }
+    if (validator.checkValEmpty(info.term)) {
+      my.showToast({
+        type: 'none',
+        content: '请选择分期期数',
+        duration: 2000,
+      });
+      return
+    }
+    if (validator.checkValEmpty(info.userName)) {
+      my.showToast({
+        type: 'none',
+        content: '请输入客户姓名',
+        duration: 2000,
+      });
+      return
+    }
+    if (validator.checkValEmpty(info.userMblNo)) {
+      my.showToast({
+        type: 'none',
+        content: '请输入客户手机号',
+        duration: 2000,
+      });
+      return
     }
     my.scan({
       scanType: ['qrCode', 'barCode'],
@@ -232,15 +276,72 @@
     this.setData({
       'info.payType': 1
     })
-    for (let key in this.data.info) {
-      if (!this.data.info[key]) {
-        my.showToast({
-          type: 'none',
-          content: '请完整输入信息',
-          duration: 2000,
-        });
-        return
-      }
+    // for (let key in this.data.info) {
+    //   if (!this.data.info[key]) {
+    //     my.showToast({
+    //       type: 'none',
+    //       content: '请完整输入信息',
+    //       duration: 2000,
+    //     });
+    //     return
+    //   }
+    // }
+    let info = this.data.info
+    if (!validator.checkbdMoney(info.amt)||info.amt==0) {
+      my.showToast({
+        type: 'none',
+        content: '请输入0.01-100000之间分期本金',
+        duration: 2000,
+      });
+      return
+    }
+    if (validator.checkValEmpty(info.goodsName)) {
+      my.showToast({
+        type: 'none',
+        content: '请输入商品名称',
+        duration: 2000,
+      });
+      return
+    }
+    if (validator.checkValEmpty(info.prodId)) {
+      my.showToast({
+        type: 'none',
+        content: '请选择付息方式',
+        duration: 2000,
+      });
+      return
+    }
+    if (validator.checkValEmpty(info.zfbVersion)) {
+      my.showToast({
+        type: 'none',
+        content: '请选择办单通道',
+        duration: 2000,
+      });
+      return
+    }
+    if (validator.checkValEmpty(info.term)) {
+      my.showToast({
+        type: 'none',
+        content: '请选择分期期数',
+        duration: 2000,
+      });
+      return
+    }
+    if (validator.checkValEmpty(info.userName)) {
+      my.showToast({
+        type: 'none',
+        content: '请输入客户姓名',
+        duration: 2000,
+      });
+      return
+    }
+    if (validator.checkValEmpty(info.userMblNo)) {
+      my.showToast({
+        type: 'none',
+        content: '请输入客户手机号',
+        duration: 2000,
+      });
+      return
     }
     let str = JSON.stringify(this.data.info)
     my.navigateTo({

--
Gitblit v1.8.0