1.5.2上架版本

GeliBusinessPlatform/AppDelegate.swift

 /*
- shareSDK账号&密码
- 17322010717
- gelifood81338860
+shareSDK账号&密码
+17322010717
+gelifood81338860
  
- 融云账号&融云密码
- 18924107259
- 81338860geLI
+融云账号&融云密码
+18924107259
+81338860geLI
  
- 苹果账号&密码
- notice@gelifood.com
- 81338860^geLi
+苹果账号&密码
+notice@gelifood.com
+81338860^geLi
  
- 极光密码
- GeliFood
- 81338860geLI
+极光密码
+GeliFood
+81338860geLI
  
- 微信开发平台
- GELIFOOD123@126.com
- 81338860geli
+微信开发平台
+GELIFOOD123@126.com
+81338860geli
  
- 微信分享 id & secret
- wx26b371b279064098
- 55343eb2b2c2329860ad8545715ae9f3
+微信分享 id & secret
+wx26b371b279064098
+55343eb2b2c2329860ad8545715ae9f3
  
- 测试账号&密码
- Liangyuepf
- zxcvbnm
+测试账号&密码
+Liangyuepf
+zxcvbnm
  */
 
 import UIKit

GeliBusinessPlatform/Define/Define.swift

@@ -27,10 +27,10 @@ let systemVersion = (UIDevice.current.systemVersion as String)
 
 //接口地址
 //test
-let SERVERCE_ImageHost = "https://z.gelifood.com/"
-let SERVERCE_HOST = "https://z.gelifood.com/admin/"
-//let SERVERCE_ImageHost = "https://zx.gelifood.com/"
-//let SERVERCE_HOST = "https://zx.gelifood.com/admin/"
+//let SERVERCE_ImageHost = "https://z.gelifood.com/"
+//let SERVERCE_HOST = "https://z.gelifood.com/admin/"
+let SERVERCE_ImageHost = "https://zx.gelifood.com/"
+let SERVERCE_HOST = "https://zx.gelifood.com/admin/"
 //online
 
 //视图常量

GeliBusinessPlatform/ViewController/订单列表/OrderListVC.swift

@@ -191,10 +191,16 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
         if rowModel.cus_name != nil {
             cell.nameLbl.text = rowModel.cus_name!
         }else{
-            cell.nameLbl.text = rowModel.user_name! 
+            if rowModel.user_name != nil {
+                cell.nameLbl.text = rowModel.user_name!
+            }
         }
         cell.orderNumerLbl.text = rowModel.order_sn!
+        
+        if rowModel.order_status != nil && rowModel.order_status_d != nil && rowModel.goods_before_pay != nil {
         cell.statusLbl.text = orderStatusStrByInt(statusNumber: rowModel.order_status!, status_d: rowModel.order_status_d!, isBfPay: rowModel.goods_before_pay!, LmIdx: orderStatus)
+        }
+        
         cell.countLbl.text = "\(rowModel.goods_number!)"
         cell.priceLbl.text = rowModel.sum_amount
         cell.timeLbl.text = TimeByDouble(sender: rowModel.add_time!)

GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift

@@ -1112,8 +1112,10 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             let view1 = TitleAndLblView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 49))
             view1.nameLbl.text = "订单状态"
             //订单状态
-            view1.contentLbl.text = orderStatusStrByInt(statusNumber: (self.dataMdoel?.order_res?.order_status)!, status_d: (self.dataMdoel?.order_res?.order_status_d)!, isBfPay:(self.dataMdoel?.order_res!.goods_before_pay)! , LmIdx: lmIdx)
-            view.addSubview(view1)
+            if self.dataMdoel?.order_res?.order_status != nil && self.dataMdoel?.order_res?.order_status_d != nil && self.dataMdoel?.order_res!.goods_before_pay != nil {
+                view1.contentLbl.text = orderStatusStrByInt(statusNumber: (self.dataMdoel?.order_res?.order_status)!, status_d: (self.dataMdoel?.order_res?.order_status_d)!, isBfPay:(self.dataMdoel?.order_res!.goods_before_pay)! , LmIdx: lmIdx)
+                view.addSubview(view1)
+            }
             return view
         case 3:
             let view1 = HeaderOnlyTitleView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 39))