合并1.6.1

GeliBusinessPlatform.xcodeproj/project.pbxproj

@@ -3995,7 +3995,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2.1;
+				CURRENT_PROJECT_VERSION = 2.4;
 				DEFINES_MODULE = NO;
 				DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
 				DEVELOPMENT_TEAM = K48346UACH;
@@ -4043,7 +4043,7 @@
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/JPush/Lib",
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
 				);
-				MARKETING_VERSION = 1.6.1;
+				MARKETING_VERSION = 1.6.2;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -4124,7 +4124,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2.1;
+				CURRENT_PROJECT_VERSION = 2.4;
 				DEFINES_MODULE = NO;
 				DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
 				DEVELOPMENT_TEAM = K48346UACH;
@@ -4172,7 +4172,7 @@
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/JPush/Lib",
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
 				);
-				MARKETING_VERSION = 1.6.1;
+				MARKETING_VERSION = 1.6.2;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

GeliBusinessPlatform/Other/LMNote/LMNoteViewController.m

@@ -325,6 +325,7 @@
             if ([src containsString:imgSrc1]) {
                 imgurl = [src stringByReplacingOccurrencesOfString:imgSrc1 withString:@""];
             };
+
             [self.imgUrlArr addObject:imgurl];
         }
     }

GeliBusinessPlatform/ViewController/商品详情/EPViewController.swift

@@ -1668,8 +1668,13 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
             let item = dataArr[i]
             var pData = ""
             if item.price.contains(",") {
+
                 let pArr = item.price.components(separatedBy: ",")
                 pData = pArr.joined(separator: "")
+
+//                let arr = item.price.components(separatedBy: ",")
+//                pData = arr.joined(separator: "")
+
             }else{
                 pData = item.price
             }
@@ -1764,6 +1769,14 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
                 pct = item.DJBiLi
             }
             
+//            var pData = ""
+//            if item.price.contains(","){
+//                let arr = item.price.components(separatedBy: ",")
+//                pData = arr.joined(separator: "")
+//            }else{
+//                pData = item.price
+//            }
+            
             var sku = ["sku_sn":"",
                        "sku_id":item.sku_id,
                        "goods_id":goods_id,

GeliBusinessPlatform/ViewController/商品详情/ProductDetailViewController.swift

@@ -1221,8 +1221,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
         var model : GuiGeModel? = nil
         var skuArr:Array<Any> = []
         dataArr.forEach { (md) in
-            
-            
+
             var pData = ""
             if md.price.contains(","){
                 let arr = md.price.components(separatedBy: ",")
@@ -1323,6 +1322,14 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
             }
             let packAttrStr = dictChangeString(sender: pack_attr)
             
+//            var pData = ""
+//            if md.price.contains(","){
+//                let arr = md.price.components(separatedBy: ",")
+//                pData = arr.joined(separator: "")
+//            }else{
+//                pData = md.price
+//            }
+            
             var sku = ["sku_sn":"",
                        "spec_id":"1",
                        "attr":md.guiGe,