Merge branch '机器人dev' into 海峡new

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

@@ -148,6 +148,7 @@ App({
     // baseUrl: "http://47.110.158.110:20000/",
     // baseUrl: "http://47.110.158.110:20000/",
     // baseUrl: "https://api.workai.com.cn/",
     // baseUrl: "https://api.workai.com.cn/",
     baseUrl: "https://api.fjhxrl.com/",
     baseUrl: "https://api.fjhxrl.com/",
+    // baseUrl: "https://api.workai.com.cn/",
     OSSUrl: "", //"https://oss.workai.com.cn/",
     OSSUrl: "", //"https://oss.workai.com.cn/",
     userInfo: null,
     userInfo: null,
     hostInfo: null,
     hostInfo: null,

@@ -114,8 +114,10 @@ Page({
   handleSalaryData: function (items) {
   handleSalaryData: function (items) {
     for (var i = 0; i < items.length; ++i) {
     for (var i = 0; i < items.length; ++i) {
       var item = items[i]
       var item = items[i]
+      console.log("item---", item)
       item.payroll_date = format.formatTime_date(item.payroll_date)
       item.payroll_date = format.formatTime_date(item.payroll_date)
       item.count_date = format.formatDate_min(item.start_time) + '-' + format.formatDate_min(item.end_time)
       item.count_date = format.formatDate_min(item.start_time) + '-' + format.formatDate_min(item.end_time)
+      item.zeroShow = item.zero_display=='yes'?true:false//是否展示非0字段
       item.detals = this.handleDetailsData(item)
       item.detals = this.handleDetailsData(item)
       item.isshow = false
       item.isshow = false
     }
     }
@@ -199,6 +201,7 @@ Page({
     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"] : []
+     console.log(titles,detail,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]
@@ -207,14 +210,15 @@ Page({
       if (!title) {
       if (!title) {
         title = titleData['original_column']
         title = titleData['original_column']
       }
       }
-      if (!value) {
+      if (value != 0 && !value) {
         value = data[titleData['key']]
         value = data[titleData['key']]
         if (value != undefined) {
         if (value != undefined) {
           value += 'tax_rate' == titleData['key'] ? '%' : ''
           value += 'tax_rate' == titleData['key'] ? '%' : ''
         }
         }
-      }
-      if (!title || !value) continue;
-      if (mapping_keys.indexOf(titleData['key']) == -1 && (value == '0' || value == 0)) continue;
+      }  
+      if (!title ) continue;
+      if (!title || (value!=0&&!value)) continue;
+      // if (mapping_keys.indexOf(titleData['key']) == -1 && (value == '0' || value == 0)) continue;
       details.push({
       details.push({
         title: title,
         title: title,
         value: value
         value: value

@@ -57,7 +57,7 @@
             <view class='divide_line_f5f5f5' style='margin:30rpx 0'></view>
             <view class='divide_line_f5f5f5' style='margin:30rpx 0'></view>
           </view>
           </view>
           <view wx:if="{{item.isshow}}" wx:for="{{item.detals}}" wx:for-item='detal'>
           <view wx:if="{{item.isshow}}" wx:for="{{item.detals}}" wx:for-item='detal'>
-            <view>
+            <view hidden="{{!item.zeroShow&&(detal.value=='0'||detal.value==0)}}" >
               <text class='text_999_28'>{{detal.title}}</text>
               <text class='text_999_28'>{{detal.title}}</text>
               <text class='text_999_28' style='color:#333;text-align:right;float: right'>{{detal.value}}</text>
               <text class='text_999_28' style='color:#333;text-align:right;float: right'>{{detal.value}}</text>
             </view>
             </view>