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

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

@@ -90,7 +90,7 @@ Page({
       },
       {
         code: 'contactPhone',
-        type: 'phone',
+        type: 'str',
         title: mixins.$t('cpPhone'),
         required: false
       },

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

@@ -61,7 +61,7 @@
 
       <view style="background-color:#F4F9FF;width: 33%;padding:10rpx;border-radius: 16rpx;margin-left: 20rpx;">
         <view style="font-size:13px;text-align: center;margin-top: 10rpx;">出库金额</view>
-        <dk-cell left="0rpx" center="center" fontSize="15" contentFontSize="18" contentColor="#1B365D" spaceWidth="0" contentFontWeight="700" content="{{item.outAmt +item.outingAmt}}"></dk-cell>
+        <dk-cell left="0rpx" center="center" fontSize="15" contentFontSize="18" contentColor="#1B365D" spaceWidth="0" contentFontWeight="700" content="{{(item.outAmt&&item.outingAmt)?(item.outAmt +item.outingAmt):0}}"></dk-cell>
       </view>
 
     </view>
@@ -88,7 +88,7 @@
 
       <view style="background-color:#F4F9FF;width: 50%;padding:10rpx;border-radius: 16rpx;margin-left: 20rpx;">
         <view style="font-size:13px;text-align: center;margin-top: 10rpx;">出库金额</view>
-        <dk-cell left="0rpx" center="center" fontSize="15" contentFontSize="18" contentColor="#1B365D" spaceWidth="0" contentFontWeight="700" content="{{item.outAmt +item.outingAmt}}"></dk-cell>
+        <dk-cell left="0rpx" center="center" fontSize="15" contentFontSize="18" contentColor="#1B365D" spaceWidth="0" contentFontWeight="700" content="{{(item.outAmt&&item.outingAmt)?(item.outAmt +item.outingAmt):0}}"></dk-cell>
       </view>
     </view>
   </view>