Kaynağa Gözat

up wechat 审核修改

openlockPPP 1 yıl önce
ebeveyn
işleme
85acb039dc

+ 2 - 2
JiaPeiManage.xcodeproj/project.pbxproj

@@ -1652,7 +1652,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = JiaPeiManage/JiaPeiManage.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1242023090402;
+				CURRENT_PROJECT_VERSION = 1242023090501;
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = JiaPeiManage/Info.plist;
@@ -1695,7 +1695,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = JiaPeiManage/JiaPeiManage.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1242023090402;
+				CURRENT_PROJECT_VERSION = 1242023090501;
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = JiaPeiManage/Info.plist;

+ 4 - 4
JiaPeiManage/Sources/Main/App/CompositionRoot.swift

@@ -93,10 +93,10 @@ final class CompositionRoot {
         LocalManager.userInfo.openTimes += 1
         //设置环境  --默认是线上环境
         Defaults.currentEnvironment = .res
-#if DEBUG || _DEBUG
-        //设置环境
-        Defaults.currentEnvironment = .dev
-#endif
+//#if DEBUG || _DEBUG
+//        //设置环境
+//        Defaults.currentEnvironment = .dev
+//#endif
         //ToastView
         ToastView.appearance().font = NYFont.SysFont.sys_15
         

+ 8 - 4
JiaPeiManage/Sources/Modulars/Login/Controllers/LoginViewController.swift

@@ -138,12 +138,16 @@ final class LoginViewController: BaseViewController {
         }).disposed(by: disposeBag)
         //wxin_button
         wxin_button.rx.tap.subscribe ({ [unowned self] (_)  in
-            if WXApi.isWXAppInstalled() {
+            if LocalManager.userInfo.ios_login_open == 1 { //关闭审核状态
+                if WXApi.isWXAppInstalled() {
+                    self.getCityArray(type: 1)
+                }else {
+                    NYTips.showMsg(txt: "本地未安装微信")
+                }
+            }else{
+                //打开审核
                 self.getCityArray(type: 1)
-            }else {
-                NYTips.showMsg(txt: "本地未安装微信")
             }
-            
         }).disposed(by: disposeBag)
         //apple id
         apple_button.rx.tap.subscribe ({ [unowned self] (_)  in

+ 10 - 9
JiaPeiManage/Sources/Utils/NYWXApiManager.swift

@@ -46,15 +46,16 @@ class NYWXApiManager : NSObject {
              WXApi.send(rep, completion: nil)
            }
         else {
-            NYTips.showMsg(txt: "本地未安装微信")
-//            let rep = SendAuthReq()
-//            //这两个参数 可以照抄 第一个是固定的,第二个随意写
-//            rep.scope = "snsapi_userinfo"
-//            rep.state = "wx_oauth_authorization_state"
-//            DispatchQueue.main.async {
-//                let vc = NYWindow.currentVc()
-//                WXApi.sendAuthReq(rep, viewController: vc, delegate: self)
-//            }
+//            NYTips.showMsg(txt: "本地未安装微信")
+            let rep = SendAuthReq()
+            //这两个参数 可以照抄 第一个是固定的,第二个随意写
+            rep.scope = "snsapi_userinfo"
+            rep.state = "wx_oauth_authorization_state"
+            DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
+                // 在延迟 1 秒后执行的代码
+                let vc = NYWindow.currentVc()
+                WXApi.sendAuthReq(rep, viewController: vc, delegate: self)
+            }
         }
     }