no message

ZhiJi.xcodeproj/project.pbxproj

@@ -1837,7 +1837,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 100;
-				DEVELOPMENT_TEAM = 6244YAV33V;
+				DEVELOPMENT_TEAM = 3VFFTBZ496;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/ZhiJi/Classes/Tools",
@@ -1914,7 +1914,7 @@
 					"-ObjC",
 					"-all_load",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.lmj.overseas;
+				PRODUCT_BUNDLE_IDENTIFIER = com.ishinapp.familymapp;
 				PRODUCT_NAME = "Caring Map";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/ZhiJi/Classes/Main/Base/ZhiJi-Bridging-Header.h";
@@ -1937,7 +1937,7 @@
 				CURRENT_PROJECT_VERSION = 100;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = 6244YAV33V;
+				DEVELOPMENT_TEAM = 3VFFTBZ496;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/ZhiJi/Classes/Tools",
@@ -2014,7 +2014,7 @@
 					"-ObjC",
 					"-all_load",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.lmj.overseas;
+				PRODUCT_BUNDLE_IDENTIFIER = com.ishinapp.familymapp;
 				PRODUCT_NAME = "Caring Map";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/ZhiJi/Classes/Main/Base/ZhiJi-Bridging-Header.h";

ZhiJi.xcodeproj/xcshareddata/xcschemes/ZhiJi.xcscheme

@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "686A7C932487644600C7200C"
-               BuildableName = "Family Mapp.app"
+               BuildableName = "Caring Map.app"
                BlueprintName = "ZhiJi"
                ReferencedContainer = "container:ZhiJi.xcodeproj">
             </BuildableReference>
@@ -45,7 +45,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "686A7C932487644600C7200C"
-            BuildableName = "Family Mapp.app"
+            BuildableName = "Caring Map.app"
             BlueprintName = "ZhiJi"
             ReferencedContainer = "container:ZhiJi.xcodeproj">
          </BuildableReference>
@@ -62,7 +62,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "686A7C932487644600C7200C"
-            BuildableName = "Family Mapp.app"
+            BuildableName = "Caring Map.app"
             BlueprintName = "ZhiJi"
             ReferencedContainer = "container:ZhiJi.xcodeproj">
          </BuildableReference>

ZhiJi/Assets.xcassets/Goods/pay_close.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "tt_titlebar_close_drawable@2x.png",
+      "filename" : "形状结合@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "tt_titlebar_close_drawable@3x.png",
+      "filename" : "形状结合@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

ZhiJi/Classes/Goods/Controller/ZJMemberPayViewController.m

@@ -84,7 +84,7 @@
 }
 
 - (void)setupView {
-    self.view.backgroundColor = kColorFromRGB(0x568EFC);
+    self.view.backgroundColor = kColorWithRGB(240, 242, 245);
     
     UIImageView * maskImV = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, kNavigationBarHeight)];
     maskImV.image = [UIImage imageNamed:@"goods_top_mask"];
@@ -110,6 +110,7 @@
     banner.showPageControl = NO;
     banner.localizationImageNamesGroup = self.images;
     banner.delegate = nil;
+    banner.backgroundColor = self.view.backgroundColor;
     [self.mainScrollView addSubview:banner];
     [self.mainScrollView sendSubviewToBack:banner];
     
@@ -120,12 +121,12 @@
     }
  
     UIView * bgView = [[UIView alloc] initWithFrame:CGRectMake(0, CGRectGetMaxY(banner.frame), KScreenWidth, KScaleWidth(90))];
-    bgView.backgroundColor = kColorFromRGB(0x568EFC);
+    bgView.backgroundColor = self.view.backgroundColor;
     [self.mainScrollView addSubview:bgView];
     [self.mainScrollView sendSubviewToBack:bgView];
     
     UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom];
-    btn.frame = CGRectMake((KScreenWidth-KScaleWidth(287))/2, bgView.frame.size.height-KScaleWidth(79), KScaleWidth(287), KScaleWidth(69));
+    btn.frame = CGRectMake((KScreenWidth-KScaleWidth(327))/2, bgView.frame.size.height-KScaleWidth(70), KScaleWidth(327), KScaleWidth(60));
     [btn setBackgroundImage:[UIImage imageNamed:@"goods_guide_confirm"] forState:UIControlStateNormal];
     [btn setBackgroundImage:[UIImage imageNamed:@"goods_guide_confirm"]  forState:UIControlStateHighlighted];
     [btn addTarget:self action:@selector(confirmBtnClick:) forControlEvents:(UIControlEventTouchUpInside)];
@@ -277,10 +278,10 @@
         textView.frame = CGRectMake(KScaleWidth(10), self.mainScrollView.contentSize.height, KScreenWidth-KScaleWidth(20), rect.size.height+KScaleWidth(32));
         textView.backgroundColor = [UIColor clearColor];
         textView.attributedText = attributeStr;
-        textView.linkTextAttributes = @{NSUnderlineStyleAttributeName:@1, NSUnderlineColorAttributeName:[UIColor whiteColor], NSForegroundColorAttributeName:[UIColor whiteColor]};
+        textView.linkTextAttributes = @{NSUnderlineStyleAttributeName:@1, NSUnderlineColorAttributeName:kColorWithRGB(153, 153, 153), NSForegroundColorAttributeName:kColorWithRGB(153, 153, 153)};
         textView.delegate = self;
         textView.font = [UIFont systemFontOfSize:KFont(12)];
-        textView.textColor = [UIColor whiteColor];
+        textView.textColor = kColorWithRGB(153, 153, 153);
         textView.textAlignment = NSTextAlignmentLeft;
         textView.showsHorizontalScrollIndicator = NO;
         textView.showsVerticalScrollIndicator = NO;
@@ -288,7 +289,7 @@
         [self.mainScrollView addSubview:textView];
         
         self.mainScrollView.contentSize = CGSizeMake(0, self.mainScrollView.contentSize.height+rect.size.height+KScaleWidth(32));
-        self.mainScrollView.backgroundColor = kColorFromRGB(0x568EFC);
+        self.mainScrollView.backgroundColor = self.view.backgroundColor;
     }
 }
 

ZhiJi/Classes/Goods/Pay.storyboard

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
@@ -197,7 +197,7 @@
                                 <rect key="frame" x="339" y="49.5" width="59" height="33"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <state key="normal" title="Restore">
-                                    <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    <color key="titleColor" red="0.023529411764705882" green="0.023529411764705882" blue="0.023529411764705882" alpha="1" colorSpace="calibratedRGB"/>
                                 </state>
                                 <connections>
                                     <action selector="restoreBtnClick:" destination="dwu-wn-GXg" eventType="touchUpInside" id="OR2-nw-yS8"/>

ZhiJi/Classes/Tools/PCH/ResourceHeader.pch

@@ -22,14 +22,14 @@
 
 //#if DEBUG
 //
-#define ServerReport   @"http://report.linking100.com"
-#define ServerHost     @"https://feedapitest.zhangxinhulian.com"
-#define ServerHostFeed @"https://feedapitest.zhangxinhulian.com"
+//#define ServerReport   @"http://report.linking100.com"
+//#define ServerHost     @"https://feedapitest.zhangxinhulian.com"
+//#define ServerHostFeed @"https://feedapitest.zhangxinhulian.com"
 //
 //#else
 
-//#define ServerReport   @"http://report.linking100.com"
-//#define ServerHost     @"https://feedapi.linking100.com"
-//#define ServerHostFeed @"https://feedapi.linking100.com"
+#define ServerReport   @"http://report.linking100.com"
+#define ServerHost     @"https://feedapi.linking100.com"
+#define ServerHostFeed @"https://feedapi.linking100.com"
 
 //#endif