Merge branch '修改/物流单' into 莱斯奥/莱斯奥master

packageA/shipment/detail.js

@@ -72,10 +72,17 @@ Page({
             }, {
                 label: "运费",
                 value: data.freightamount
+            },{
+                label: "件数",
+                value: data.packageqty
             }, {
+                label: "物流费",
+                value: data.freightamount
+            },  {
                 label: "备注",
                 value: data.remarks
             }, ],
+
             list2 = [{
                 label: "创建人",
                 value: data.createby

packageA/shipment/modules/list/index.wxml

@@ -1,5 +1,5 @@
 <view class="item" wx:for="{{list}}" wx:key="billno">
-<!--     <navigator url="#" class="top" data-num="{{item.logisticno}}" bindtap="copyNum">
+    <!--     <navigator url="#" class="top" data-num="{{item.logisticno}}" bindtap="copyNum">
         {{item.logiscomp_name}} : {{item.logisticno||' --'}} <text wx:if="{{item.logisticno}}">复制</text>
     </navigator> -->
     <navigator url="/packageA/shipment/detail?id={{item.sa_logisticsid}}" class="content">
@@ -10,7 +10,13 @@
             订单状态：{{item.status == '审核' ? '待收货' : '已收货'}}
         </view>
         <view class="exp">
-            审核时间：{{item.checkdate || ' --'}}
+            单据日期：{{item.billdate || ' --'}}
+        </view>
+        <view class="exp">
+            件数：{{item.packageqty || ' --'}}
+        </view>
+        <view class="exp">
+            物流费：{{item.logisticsamount || ' --'}}
         </view>
         <view class="exp">
             备注：{{item.remarks|| ' --'}}