daxu0403 7 лет назад
Родитель
Сommit
dc0a07193e
3 измененных файлов с 32 добавлено и 5 удалено
  1. 4 1
      lib/pages/order_detail/order_detail.dart
  2. 1 1
      lib/pages/send_express_page.dart
  3. 27 3
      lib/util/models.dart

+ 4 - 1
lib/pages/order_detail/order_detail.dart

@@ -144,8 +144,11 @@ class _ItemInfoWidgetState extends State < ItemInfoWidget > {
             contentWiget("数量", (widget.obj.goodsQuantity).toString()),
             contentWiget("运费", (widget.obj.goodsFreight/100).toString()),
             contentWiget("代收", (widget.obj.goodsAgencyFund/100).toString()),
-            contentWiget("保价", widget.obj.goodsPriceProtection.toString()),
+            contentWiget("保价",(widget.obj.goodsPriceProtection/100).toString()),
             contentWiget("重量", widget.obj.goodsWeight.toStringAsFixed(1)),
+            contentWiget("包装类型", (widget.obj.goodsPackingName)),
+            contentWiget("货物类型", (widget.obj.goodsCategoryName)),
+            contentWiget("付款方式", (widget.obj.goodsPaymentMethod==1?'现付':'到付')),
             _descWidget(widget.obj.memo),
           ],
         ),

+ 1 - 1
lib/pages/send_express_page.dart

@@ -340,7 +340,7 @@ class _SendExpressPageState extends State < SendExpressPage > with AutomaticKeep
             _contentWiget("保价", 'goods'),
             _contentWiget("重量", 'goods'),
             _packageType('包装类型'),
-            _packageType('商品类型'),
+            _packageType('货物类型'),
             _packageType('付款方式'),
             _descWidget()
           ],

+ 27 - 3
lib/util/models.dart

@@ -406,15 +406,23 @@ class OrderDetailData {
   String orderNo;
   String goods; //商品名称
   int goodsAgencyFund; //代收款
+  int goodsCategoryId;
+  String goodsCategoryName;//货物类型
   int goodsFlatCost; //工本费
   int goodsFreight; //运费
   int goodsInsurance; //商品保险费
   int goodsOtherFees; //其他费用
+  int goodsPackingId;
+  String goodsPackingName;//货物包装类型
+  int goodsPaymentMethod;//付款方式
   int goodsPriceProtection; //商品保价
   int goodsQuantity; //商品数量
   int goodsValue; //商品价值
   double goodsWeight; //商品重量
   int id; //订单Id
+  String lineCode;//线路编码
+  int lineId;//线路id
+  String lineName;//线路名称
   String memo; //备注
   int orderStatus; //订单状态 0:代收单,1:已接单,2:配送中,3:已签收,4:拒收
   String receiptCompanyAddress; //收件详细地址
@@ -442,15 +450,21 @@ class OrderDetailData {
   String senderIdCard; //发件人身份证号
   String senderName; //发件人名称
   String senderPhone; //发件人电话
-
+  int stationId;
+  String stationName;
   OrderDetailData(
       {this.orderNo,
       this.goods,
       this.goodsAgencyFund,
+      this.goodsCategoryId,
+      this.goodsCategoryName,
       this.goodsFlatCost,
       this.goodsFreight,
       this.goodsInsurance,
       this.goodsOtherFees,
+      this.goodsPackingId,
+      this.goodsPackingName,
+      this.goodsPaymentMethod,
       this.goodsPriceProtection,
       this.goodsQuantity,
       this.goodsValue,
@@ -482,18 +496,26 @@ class OrderDetailData {
       this.senderIdCard,
       this.senderName,
       this.sendCompanyPhone,
-      this.senderPhone});
+      this.senderPhone,
+      this.stationId,
+      this.stationName
+      });
 
   factory OrderDetailData.fromJson(Map<String, dynamic> json) {
     return OrderDetailData(
         orderNo: json['orderNo'],
         goods: json['goods'],
         goodsAgencyFund: json['goodsAgencyFund'],
+        goodsCategoryId:json['goodsCategoryId'],
+        goodsCategoryName:json['goodsCategoryName'],
         goodsFlatCost: json['goodsFlatCost'],
         goodsFreight: json['goodsFreight'],
         goodsInsurance: json['goodsInsurance'],
         goodsOtherFees: json['goodsOtherFees'],
+        goodsPackingId:json['goodsPackingId'],
+        goodsPackingName:json['goodsPackingName'],
         goodsPriceProtection: json['goodsPriceProtection'],
+        goodsPaymentMethod:json['goodsPaymentMethod'],
         goodsQuantity: json['goodsQuantity'],
         goodsValue: json['goodsValue'],
         goodsWeight: json['goodsWeight'],
@@ -524,7 +546,9 @@ class OrderDetailData {
         senderIdCard: json['senderIdCard'],
         senderName: json['senderName'],
         senderPhone: json['senderPhone'],
-        sendCompanyPhone:json['sendCompanyPhone']
+        sendCompanyPhone:json['sendCompanyPhone'],
+        stationId:json['stationId'],
+        stationName:json['stationName']
         );
         
   }