划分退定金，退款

GeliBusinessPlatform.xcodeproj/project.pbxproj

@@ -1124,7 +1124,7 @@
 		F956D598246A2D9C003FF510 /* LMNDraft.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LMNDraft.h; sourceTree = "<group>"; };
 		F956D599246A2D9C003FF510 /* UIImage+LMNStore.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+LMNStore.m"; sourceTree = "<group>"; };
 		F956D59A246A2D9C003FF510 /* LMNStore.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LMNStore.m; sourceTree = "<group>"; };
-		F956D5B6246A3255003FF510 /* OrderListModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderListModel.swift; sourceTree = "<group>"; };
+		F956D5B6246A3255003FF510 /* OrderListModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderListModel.swift; sourceTree = "<group>"; wrapsLines = 1; };
 		F956D5B8246A33E2003FF510 /* OrderInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderInterface.swift; sourceTree = "<group>"; };
 		F956D5BA246A359C003FF510 /* GoodsInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoodsInterface.swift; sourceTree = "<group>"; };
 		F956D5BF246A3789003FF510 /* OrderDetailModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderDetailModel.swift; sourceTree = "<group>"; };

GeliBusinessPlatform/AppDelegate.swift

-
-//
-//  AppDelegate.swift
-//  GeLiLaiGeWan
-//
-//  Created by geli on 2018/6/22.
-//  Copyright © 2018年 geli. All rights reserved.
-//
-
-//
 /*
-shareSDK账号&密码
-17322010717
-gelifood81338860
-
-融云账号&融云密码
-18924107259
-81338860geLI
-
-苹果账号&密码
-notice@gelifood.com
-81338860^geLi
+ shareSDK账号&密码
+ 17322010717
+ gelifood81338860
  
-极光密码
-GeliFood
-81338860geLI
+ 融云账号&融云密码
+ 18924107259
+ 81338860geLI
  
-微信开发平台
-GELIFOOD123@126.com
-81338860geli
-
-微信分享 id & secret
-wx26b371b279064098
-55343eb2b2c2329860ad8545715ae9f3
+ 苹果账号&密码
+ notice@gelifood.com
+ 81338860^geLi
  
-测试账号&密码
-Liangyuepf
-zxcvbnm
-*/
+ 极光密码
+ GeliFood
+ 81338860geLI
+ 
+ 微信开发平台
+ GELIFOOD123@126.com
+ 81338860geli
+ 
+ 微信分享 id & secret
+ wx26b371b279064098
+ 55343eb2b2c2329860ad8545715ae9f3
+ 
+ 测试账号&密码
+ Liangyuepf
+ zxcvbnm
+ */
 
 import UIKit
 import ESTabBarController_swift
@@ -46,9 +36,6 @@ import ESTabBarController_swift
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate,loginDelegate, UITabBarControllerDelegate, JPUSHRegisterDelegate{
     
-    
-    
-    
     var window:UIWindow?
     
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
@@ -62,11 +49,19 @@ class AppDelegate: UIResponder, UIApplicationDelegate,loginDelegate, UITabBarCon
         setting_Jpush(application: application, launchOptions: launchOptions)
         UIApplication.shared.applicationIconBadgeNumber = 0
         
-        
-        
+        setting_ShareSDK()
         
         return true
     }
+    
+    
+    func setting_ShareSDK(){
+        ShareSDK.registPlatforms {
+            register in
+            register?.setupWeChat(withAppId: "wx26b371b279064098", appSecret: "55343eb2b2c2329860ad8545715ae9f3",universalLink: "https://GeliBusinessPlatform.GeliBusinessPlatform/")
+        }
+    }
+    
     func setting_Jpush(application:UIApplication,launchOptions:[UIApplication.LaunchOptionsKey: Any]?) {
         
         if #available(iOS 10.0, *){

GeliBusinessPlatform/Info.plist

@@ -20,6 +20,19 @@
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>weixin</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>wx26b371b279064098</string>
+			</array>
+		</dict>
+	</array>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSRequiresIPhoneOS</key>
@@ -72,5 +85,11 @@
 	</array>
 	<key>UIUserInterfaceStyle</key>
 	<string>Light</string>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+		<string>wechat</string>
+		<string>weixin</string>
+		<string>weixinULAPI</string>
+	</array>
 </dict>
 </plist>

GeliBusinessPlatform/Model/OrderManageModel/OrderListModel.swift

@@ -35,6 +35,7 @@ class OrderListDataModel: Mappable {
     var order_type : Int? //订单类型 1普通2期货3团购4预售
     var pay_status : Int? //支付状态
     var pay_type : Int? //支付类型
+    var apply_cancel:Int?  //申请取消订单标识：0待申请 1申请取消中 2已取消
     var shipping_status : Int? //发货状态
     var from : Int? //订单来源，0PC商城，1android商城，2IOS商城，3后台(销售)下单，4小程序段
     var user_name : String? //购买用户
@@ -43,8 +44,8 @@ class OrderListDataModel: Mappable {
     var order_goods : Array<OrderListGoodsModel>?
 
     required init?( map: Map) {
-        
     }
+    
     func mapping(map: Map) {
         order_id <- map["order_id"]
         order_sn <- map["order_sn"]
@@ -57,6 +58,7 @@ class OrderListDataModel: Mappable {
         pay_status <- map["pay_status"]
         pay_type <- map["pay_type"]
         shipping_status <- map["shipping_status"]
+        apply_cancel <- map["apply_cancel"]
         from <- map["from"]
         user_name <- map["user_name"]
         cus_name <- map["cus_name"]

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

@@ -235,7 +235,7 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
                 btnStr = ["退货"]
             }
             if rowModel.shipping_status == 0 && rowModel.pay_status == 12 {
-                btnStr = ["退款"]
+                btnStr = ["退定金"]
             }
             break
         case 5://交易完成