Browse Source

域名更换新加坡 ,网络请求本地提示

吴彦祖 8 months ago
parent
commit
7e3a513bc7

BIN
ADHTuanCan.xcworkspace/xcuserdata/aodeheng.xcuserdatad/UserInterfaceState.xcuserstate


+ 3 - 3
ADHTuanCan/AppDelegate.swift

@@ -31,12 +31,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         self.window?.makeKeyAndVisible()
         
         //默认域名
-        Defaults[\.BaseUrl] = "http://47.108.114.127:10888"
+//        Defaults[\.BaseUrl] = "http://47.108.114.127:10888"
 //        Defaults[\.BaseUrl] = "http://www.gzzzyd.com/gm-api"
 //        Defaults[\.BaseUrl] = "http://wine.gzzzyd.com/api"
-//        Defaults[\.BaseUrl] = "https://kcapp.kiansengculinary.com/api"
+        Defaults[\.BaseUrl] = "https://kcapp.kiansengculinary.com/api"
+//        Defaults[\.BaseUrl] = "https://kcapp.gzzzyd.com/api"
 //        Defaults[\.BaseUrl] = "https://kcapp.gzzzyd.com/api"
-    
         
         if  Defaults[\.isFirstOpen]{
             self.gotoStartupPage()

+ 2 - 2
ADHTuanCan/Class/Category/HTTP/MCHttpUtil.swift

@@ -171,10 +171,10 @@ class MCHttpUtil: NSObject {
                     error?(MCHttpResponseError(data:nil,msg:nil,status:.cancel,code:0))
                 }
                 else if (e as NSError).code == MCHttpStatus.timeout.rawValue{
-                    error?(MCHttpResponseError(data:nil,msg:"请求超时,请重试",status:.timeout,code:0))
+                    error?(MCHttpResponseError(data:nil,msg:LanguagesUtil.createTextBy(Ctext: "请求超时", Etext: "Request timeout"),status:.timeout,code:0))
                 }
                 else{
-                    error?(MCHttpResponseError(data:nil,msg:"网络请求失败",status:.failure,code:0))
+                    error?(MCHttpResponseError(data:nil,msg:LanguagesUtil.createTextBy(Ctext: "网络请求失败", Etext: "Network request failed"),status:.failure,code:0))
                 }
             }
         }

+ 1 - 1
ADHTuanCan/Class/登录/Base.lproj/TCLogingViewController.xib

@@ -76,7 +76,7 @@
                 <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3jb-Ui-lX2">
                     <rect key="frame" x="25" y="371.66666666666669" width="343" height="54"/>
                     <subviews>
-                        <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="8-20位数字或字母" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="GXC-PL-clZ">
+                        <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="6-20位数字或字母" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="GXC-PL-clZ">
                             <rect key="frame" x="10" y="0.0" width="293" height="54"/>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <constraints>

+ 1 - 1
ADHTuanCan/Class/登录/en.lproj/TCLogingViewController.strings

@@ -6,7 +6,7 @@
 "D7o-SP-g8u.normalTitle" = "Welcome to login👏";
 
 /* Class = "UITextField"; placeholder = "8-20位数字或字母"; ObjectID = "GXC-PL-clZ"; */
-"GXC-PL-clZ.placeholder" = "8-20 digits or letters";
+"GXC-PL-clZ.placeholder" = "6-20 digits or letters";
 
 /* Class = "UILabel"; text = "注册登录帐号即可订购多种团餐"; ObjectID = "I8V-dn-5BN"; */
 "I8V-dn-5BN.text" = "Sign in to order a variety of group meals";

+ 1 - 1
ADHTuanCan/Class/登录/zh-Hans.lproj/TCLogingViewController.strings

@@ -6,7 +6,7 @@
 "D7o-SP-g8u.normalTitle" = "欢迎登录👏";
 
 /* Class = "UITextField"; placeholder = "8-20位数字或字母"; ObjectID = "GXC-PL-clZ"; */
-"GXC-PL-clZ.placeholder" = "8-20位数字或字母";
+"GXC-PL-clZ.placeholder" = "6-20位数字或字母";
 
 /* Class = "UILabel"; text = "注册登录帐号即可订购多种团餐"; ObjectID = "I8V-dn-5BN"; */
 "I8V-dn-5BN.text" = "注册登录帐号即可订购多种团餐";

+ 1 - 1
ADHTuanCan/Class/登录/注册/en.lproj/RegisteViewController.strings

@@ -3,7 +3,7 @@
 "0nG-sL-Gcv.placeholder" = "invitation code";
 
 /* Class = "UITextField"; placeholder = "8-20位数字或字母"; ObjectID = "4rN-6a-x8L"; */
-"4rN-6a-x8L.placeholder" = "8-20 digits or letters";
+"4rN-6a-x8L.placeholder" = "6-20 digits or letters";
 
 /* Class = "UIButton"; normalTitle = "注册"; ObjectID = "Kjp-AQ-K07"; */
 "Kjp-AQ-K07.normalTitle" = "Register";

+ 1 - 1
ADHTuanCan/Class/登录/注册/zh-Hans.lproj/RegisteViewController.strings

@@ -3,7 +3,7 @@
 "0nG-sL-Gcv.placeholder" = "邀请码";
 
 /* Class = "UITextField"; placeholder = "8-20位数字或字母"; ObjectID = "4rN-6a-x8L"; */
-"4rN-6a-x8L.placeholder" = "8-20位数字或字母";
+"4rN-6a-x8L.placeholder" = "6-20位数字或字母";
 
 /* Class = "UIButton"; normalTitle = "注册"; ObjectID = "Kjp-AQ-K07"; */
 "Kjp-AQ-K07.normalTitle" = "注册";