Explorar o código

增加发件人电话为空的时候取发发件公司电话

daxu0403 %!s(int64=7) %!d(string=hai) anos
pai
achega
64cc69336b

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

@@ -65,7 +65,7 @@ class _OrderDetailsPageState extends State < OrderDetailsPage > {
         children: < Widget > [
           titleWidget('lib/images/icon_send.png', '发件信息'),
           underLine(),
-          contentWiget('电话', orderDetailObj.senderPhone),
+          contentWiget('电话', orderDetailObj.senderPhone!=null?orderDetailObj.senderPhone:orderDetailObj.sendCompanyPhone),
           contentWiget('企业编码', orderDetailObj.sendCompanyCode),
           contentWiget('企业名称', orderDetailObj.sendCompanyName),
           contentWiget('城市/区域', '${orderDetailObj.sendCompanyProvinceName}'+' '+'${orderDetailObj.sendCompanyCityName}'+' '+ '${orderDetailObj.sendCompanyAreaName}'),

+ 1 - 1
lib/pages/order_management_page/order_detail_page.dart

@@ -66,7 +66,7 @@ class _OrderDetailPageState extends State < OrderDetailPage > {
         children: < Widget > [
           titleWidget('lib/images/icon_send.png', '发件信息'),
           underLine(),
-          contentWiget('电话', orderDetailObj.senderPhone),
+          contentWiget('电话', orderDetailObj.senderPhone!=null?orderDetailObj.senderPhone:orderDetailObj.sendCompanyPhone),
           contentWiget('企业编码', orderDetailObj.sendCompanyCode),
           contentWiget('企业名称', orderDetailObj.sendCompanyName),
           contentWiget('城市/区域', '${orderDetailObj.sendCompanyProvinceName}'+' '+'${orderDetailObj.sendCompanyCityName}'+' '+ '${orderDetailObj.sendCompanyAreaName}'),

+ 6 - 1
lib/util/models.dart

@@ -437,6 +437,7 @@ class OrderDetailData {
   String sendCompanyCode; //发件公司编码
   String sendCompanyProvinceCode; //发件公司市码
   String sendCompanyProvinceName; //发件公司市名
+  String sendCompanyPhone;
   String senderIdCard; //发件人身份证号
   String senderName; //发件人名称
   String senderPhone; //发件人电话
@@ -479,6 +480,7 @@ class OrderDetailData {
       this.sendCompanyProvinceName,
       this.senderIdCard,
       this.senderName,
+      this.sendCompanyPhone,
       this.senderPhone});
 
   factory OrderDetailData.fromJson(Map<String, dynamic> json) {
@@ -520,7 +522,10 @@ class OrderDetailData {
         sendCompanyProvinceName: json['sendCompanyProvinceName'],
         senderIdCard: json['senderIdCard'],
         senderName: json['senderName'],
-        senderPhone: json['senderPhone']);
+        senderPhone: json['senderPhone'],
+        sendCompanyPhone:json['sendCompanyPhone']
+        );
+        
   }
 }