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/shskPage/orderInfo/orderInfo.js |   56 +++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/pages/shskPage/orderInfo/orderInfo.js b/pages/shskPage/orderInfo/orderInfo.js
index 67da88b..7989b73 100644
--- a/pages/shskPage/orderInfo/orderInfo.js
+++ b/pages/shskPage/orderInfo/orderInfo.js
@@ -1,4 +1,5 @@
 let $api = require('../../../utils/ajaxFn.js')
+let validator = require('../../../utils/validator.js')
 Page({
   data: {
     userStyle: {},
@@ -67,15 +68,24 @@
     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
-      }
+    // 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.payAmt)||info.payAmt==0) {
+      my.showToast({
+        type: 'none',
+        content: '请输入0.01-100000之间商品金额',
+        duration: 2000,
+      });
+      return
     }
     my.scan({
       scanType: ['qrCode', 'barCode'],
@@ -104,17 +114,25 @@
     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.payAmt)||info.payAmt==0) {
+      my.showToast({
+        type: 'none',
+        content: '请输入0.01-100000之间商品金额',
+        duration: 2000,
+      });
+      return
     }
-    
     let str = JSON.stringify(this.data.info)
     console.log(this.data.info)
     my.navigateTo({

--
Gitblit v1.8.0