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

---
 pages/shskPage/orderInfo/orderInfo.js |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/pages/shskPage/orderInfo/orderInfo.js b/pages/shskPage/orderInfo/orderInfo.js
index cab45f3..a69e142 100644
--- a/pages/shskPage/orderInfo/orderInfo.js
+++ b/pages/shskPage/orderInfo/orderInfo.js
@@ -3,7 +3,8 @@
   data: {
     userStyle: {},
     info: {
-      payAmt: ''
+      payAmt: '',
+      goodsName:''
     },
     amtList: [
       { name: '商家到账', number: 0 },
@@ -29,12 +30,19 @@
     } else if (code == 2) {
       obj.goodsName = value
     }
-    console.log(obj)
     this.setData({
       info: { ...this.data.info,...obj }
     })
     if(code == 1&&this.data.info.payAmt){
       this.getTaril()
+    }
+    if(code == 1&&!this.data.info.payAmt){
+      this.setData({
+        amtList:[
+            { name: '商家到账', number: 0 },
+            { name: '用户支付金额', number: 0 }
+        ]
+      })
     }
   },
   getTaril(){
@@ -60,6 +68,16 @@
     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
+      }
+    }
     my.scan({
       scanType: ['qrCode', 'barCode'],
       success: (res) => {

--
Gitblit v1.8.0