From 515eb4de8a68c57c09302e8e4cdb647531792bf2 Mon Sep 17 00:00:00 2001
From: yibo <361071264@qq.com>
Date: Tue, 4 Dec 2018 13:20:36 +0800
Subject: [PATCH] .

---
 pages/guarantee/newbill/newbill.js            |  4 +--
 pages/order/detail/detail.js                  | 31 +++++++++-------
 pages/order/newBill/newBill.js                | 35 +++++++++++--------
 .../outStoreDetail/outStoreDetail.wxml        |  2 +-
 4 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/pages/guarantee/newbill/newbill.js b/pages/guarantee/newbill/newbill.js
index 53ab5b6..0168309 100644
--- a/pages/guarantee/newbill/newbill.js
+++ b/pages/guarantee/newbill/newbill.js
@@ -261,8 +261,8 @@ Page({
     let detailsArray = [];
     for (var i = 0; i < this.data.array.length; i++) {
       var dmo = {
-        BillID: this.data.array[i].ID,
-        DmoTypeID: this.data.array[i].BillTypeID
+        BillID: this.data.array[i].BillID,
+        DmoTypeID: this.data.array[i].DmoTypeID
       }
       detailsArray.push(dmo)
     }
diff --git a/pages/order/detail/detail.js b/pages/order/detail/detail.js
index b2bfec8..932b09e 100644
--- a/pages/order/detail/detail.js
+++ b/pages/order/detail/detail.js
@@ -329,10 +329,14 @@ Page({
     this.util();
   },
 
-  getGoodsNum: function(e) {
+  getGoodsNum: function (e) {
+    var v = e.detail.value;
+    let end = v.charAt(v.length - 1)
+    if (end == ".")
+    return;
     let idx = e.target.dataset.idx;
     var detail = this.data.dmo.Details[idx];
-    let value = Number(e.detail.value);
+    let value = Number(v);
     if (isNaN(value)) {
       wx.showModal({
         title: '提示',
@@ -351,10 +355,14 @@ Page({
     })
   },
 
-  getSecondNum: function(e) {
+  getSecondNum: function (e) {
+    var v = e.detail.value;
+    let end = v.charAt(v.length - 1)
+    if (end == ".")
+      return;
     let idx = e.target.dataset.idx;
     var detail = this.data.dmo.Details[idx];
-    let value = Number(e.detail.value);
+    let value = Number(v);
     if (isNaN(value)) {
       wx.showModal({
         title: '提示',
@@ -373,9 +381,13 @@ Page({
     })
   },
 
-  getPrice: function(e) {
+  getPrice: function (e) {
+    var v = e.detail.value;
+    let end = v.charAt(v.length - 1)
+    if (end == ".")
+      return;
     let idx = e.target.dataset.idx;
-    let value = Number(e.detail.value);
+    let value = Number(v);
     if (isNaN(value)) {
       wx.showToast({
         title: '提示',
@@ -455,13 +467,6 @@ Page({
       return;
     }
 
-    if (dmo.DeliverAddress == "") {
-      wx.showToast({
-        title: '请填写送货地址',
-      })
-      return;
-    }
-
     for (var i = 0; i < dmo.Details.length; i++) {
       if (dmo.Details[i].SaleGoods_ID == null) {
         wx.showToast({
diff --git a/pages/order/newBill/newBill.js b/pages/order/newBill/newBill.js
index 9985bdb..b753178 100644
--- a/pages/order/newBill/newBill.js
+++ b/pages/order/newBill/newBill.js
@@ -191,7 +191,7 @@ Page({
   // 遮罩存货输入框
   select: function(e) {
     var value = e.detail.value;
-    var x = this.data.whicwhichh;
+    var x = this.data.which;
     this.showDialog(x, value);
   },
 
@@ -288,10 +288,14 @@ Page({
     this.util();
   },
 
-  getGoodsNum: function(e) {
+  getGoodsNum: function (e) {
+    var v = e.detail.value;
+    let end = v.charAt(v.length - 1)
+    if (end == ".")
+      return;
     let idx = e.target.dataset.idx;
     var detail = this.data.dmo.Details[idx];
-    let value = Number(e.detail.value);
+    let value = Number(v);
     if (isNaN(value)) {
       wx.showModal({
         title: '提示',
@@ -310,10 +314,14 @@ Page({
     })
   },
 
-  getSecondNum: function(e) {
+  getSecondNum: function (e) {
+    var v = e.detail.value;
+    let end = v.charAt(v.length - 1)
+    if (end == ".")
+      return;
     let idx = e.target.dataset.idx;
     var detail = this.data.dmo.Details[idx];
-    let value = Number(e.detail.value);
+    let value = Number(v);
     if (isNaN(value)) {
       wx.showModal({
         title: '提示',
@@ -333,9 +341,13 @@ Page({
   },
 
   // 
-  getPrice: function(e) {
+  getPrice: function (e) {
+    var v = e.detail.value;
+    let end = v.charAt(v.length - 1)
+    if (end == ".")
+      return;
     let idx = e.target.dataset.idx;
-    let value = Number(e.detail.value);
+    let value = Number(v);
     if (isNaN(value)) {
       wx.showToast({
         title: '提示',
@@ -416,14 +428,7 @@ Page({
       })
       return;
     }
-
-    if (dmo.DeliverAddress == "") {
-      wx.showToast({
-        title: '请填写送货地址',
-      })
-      return;
-    }
-
+    
     for (var i = 0; i < dmo.Details.length; i++) {
       if (dmo.Details[i].SaleGoods_ID == null) {
         wx.showToast({
diff --git a/pages/outStore/outStoreDetail/outStoreDetail.wxml b/pages/outStore/outStoreDetail/outStoreDetail.wxml
index aa7a777..532992c 100644
--- a/pages/outStore/outStoreDetail/outStoreDetail.wxml
+++ b/pages/outStore/outStoreDetail/outStoreDetail.wxml
@@ -14,7 +14,7 @@
 <view class='listContainer'>
 <scroll-view scroll-x="false" scroll-y="true" class='scrollView'>
 
-  <block wx:for="{{dataArr}}" wx:for-item="item">
+  <block wx:for="{{dataArr}}" wx:for-item="item" wx:key="{{item}}">
     <template is="outStoreDetailTemplate" data="{{item}}" />
   </block>
   </scroll-view>