Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss_wx_app

package-basic-data/pages/activity/activity.js

@@ -119,6 +119,7 @@ Page({
      */
     countSummaryAmount() {
         let item = this.data.curentAdItem;
+        if(!item)return;
         let staffCount = this.data.staffCount;
         let summaryInfo = this.data.summaryInfo
         let amount = 0;

package-sales/pages/order-billing/detail/detail.js

@@ -39,8 +39,7 @@ Page({
     ],
     contentSaveList: [
       { code: 'flag', title: mixins.$t('saleOutBoundFlag'), type: 'checkbox' },
-      { code: 'need', title: mixins.$t('saleCollection'), type: 'str' },
-      { code: 'receivable', content: 0, type: 'number' },
+      { code: 'receivable', content: 0, type: 'number' ,title: mixins.$t('saleCollection')},
       {
         code: 'factAmt',
         content: 0,
@@ -67,8 +66,7 @@ Page({
       { code: 'collection', title: mixins.$t('collection'), plain: true }
     ],
     contentSaveList: [
-      { code: 'need', title:  mixins.$t('saleCollection'), type: 'str' },
-      { code: 'receivable', content: 0, type: 'number' },
+      { code: 'receivable', content: 0, type: 'number', title:  mixins.$t('saleCollection') },
       {
         code: 'factAmt',
         content: 0,