Merge branch '天津中天' into 苏州英格玛

# Conflicts:
#	pages/main/advancepayment/adPayHome.js

@@ -192,17 +192,17 @@ Page({
     // })
     // })
   },
   },
 
 
-   handleDetailsData: function (data) {
+  handleDetailsData: function (data) {
 
 
-    let titles = JSON.parse(data['slip_titles'])  
+    let titles = JSON.parse(data['slip_titles'])
     let detail = JSON.parse(data['detail'])
     let detail = JSON.parse(data['detail'])
-    let mapping_keys = data["mapping_keys"] ? data["mapping_keys"]:[]
+    let mapping_keys = data["mapping_keys"] ? data["mapping_keys"] : []
     var details = []
     var details = []
     for (var i = 0; i < titles.length; ++i) {
     for (var i = 0; i < titles.length; ++i) {
       var titleData = titles[i]
       var titleData = titles[i]
       var value = detail[titleData['key']]
       var value = detail[titleData['key']]
       var title = titleData['title']
       var title = titleData['title']
-      if (!title){
+      if (!title) {
         title = titleData['original_column']
         title = titleData['original_column']
       }
       }
       if (!value) {
       if (!value) {
@@ -210,16 +210,16 @@ Page({
         if (value != undefined) {
         if (value != undefined) {
           value += 'tax_rate' == titleData['key'] ? '%' : ''
           value += 'tax_rate' == titleData['key'] ? '%' : ''
         }
         }
-      } 
+      }
       if (!title || !value) continue;
       if (!title || !value) continue;
-      if (mapping_keys.indexOf(title) == -1 && value == '0') continue;
+      if (mapping_keys.indexOf(titleData['key']) == -1 && value == '0') continue;
       details.push({
       details.push({
         title: title,
         title: title,
         value: value
         value: value
       })
       })
     }
     }
-     console.log('details', details)
-     return details
+    console.log('details', details)
+    return details
   },
   },
 
 
   goItemDetails: function (e) {
   goItemDetails: function (e) {