Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
colorfulSchoolReconsitution
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
刘卓鑫
colorfulSchoolReconsitution
Commits
f02f4509
Commit
f02f4509
authored
Sep 17, 2019
by
刘卓鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.更改手机号 参数传错了 导致校验验证码失败
2.设置中切换系统记扣提示文字更改。 3.图像验证码增加占位图。
parent
906f91c3
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
82 additions
and
21 deletions
+82
-21
project.pbxproj
ColorfulSchool/ColorfulSchool.xcodeproj/project.pbxproj
+1
-1
ColorfulSchool.xcscheme
....xcodeproj/xcshareddata/xcschemes/ColorfulSchool.xcscheme
+1
-1
UserInterfaceState.xcuserstate
...ata/liuzhuoxin.xcuserdatad/UserInterfaceState.xcuserstate
+0
-0
Breakpoints_v2.xcbkptlist
...uzhuoxin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+37
-5
AppDelegate.m
ColorfulSchool/ColorfulSchool/AppDelegate.m
+1
-1
ZXHomePageViewController.m
...ge(首页)/0801HomePage/Controller/ZXHomePageViewController.m
+2
-2
MQVerCodeImageView.m
...chool/Classes/Login(登录注册)/Login/View/MQVerCodeImageView.m
+10
-1
ZXChangeMsgViewController.m
...gePasswordAndPhone/Controller/ZXChangeMsgViewController.m
+2
-2
ZXSettingViewController.m
.../UserSetting/UserSet/Controller/ZXSettingViewController.m
+3
-3
ColorfulSchool.entitlements
ColorfulSchool/ColorfulSchool/ColorfulSchool.entitlements
+0
-4
Info.plist
ColorfulSchool/ColorfulSchool/Info.plist
+1
-1
Contents.json
...es.xcassets/newHomePage/ic_shuaxin.imageset/Contents.json
+24
-0
ic_shuaxin.png
...s.xcassets/newHomePage/ic_shuaxin.imageset/ic_shuaxin.png
+0
-0
ic_shuaxin@2x.png
...cassets/newHomePage/ic_shuaxin.imageset/ic_shuaxin@2x.png
+0
-0
ic_shuaxin@3x.png
...cassets/newHomePage/ic_shuaxin.imageset/ic_shuaxin@3x.png
+0
-0
No files found.
ColorfulSchool/ColorfulSchool.xcodeproj/project.pbxproj
View file @
f02f4509
...
...
@@ -4851,7 +4851,7 @@
enabled
=
1
;
};
com.apple.SafariKeychain
=
{
enabled
=
1
;
enabled
=
0
;
};
};
};
...
...
ColorfulSchool/ColorfulSchool.xcodeproj/xcshareddata/xcschemes/ColorfulSchool.xcscheme
View file @
f02f4509
...
...
@@ -62,7 +62,7 @@
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration =
"
Debug
"
buildConfiguration =
"
Release
"
selectedDebuggerIdentifier =
"Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier =
"Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle =
"0"
...
...
ColorfulSchool/ColorfulSchool.xcworkspace/xcuserdata/liuzhuoxin.xcuserdatad/UserInterfaceState.xcuserstate
View file @
f02f4509
No preview for this file type
ColorfulSchool/ColorfulSchool.xcworkspace/xcuserdata/liuzhuoxin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file @
f02f4509
...
...
@@ -35,14 +35,46 @@
shouldBeEnabled =
"Yes"
ignoreCount =
"0"
continueAfterRunningActions =
"No"
filePath =
"ColorfulSchool/Classes/
AD(广告)/ZXTXAdTool
.m"
timestampString =
"5
89796272.887374
"
filePath =
"ColorfulSchool/Classes/
MineView(个人中心)/UserSetting/ChangePasswordAndPhone/Controller/ZXChangeMsgViewController
.m"
timestampString =
"5
90396147.029526
"
startingColumnNumber =
"9223372036854775807"
endingColumnNumber =
"9223372036854775807"
startingLineNumber =
"
86
"
endingLineNumber =
"
86
"
landmarkName =
"-
splashAdFailToPresent:withError:
"
startingLineNumber =
"
289
"
endingLineNumber =
"
289
"
landmarkName =
"-
changeAction
"
landmarkType =
"7"
>
<Locations>
<Location
shouldBeEnabled =
"Yes"
ignoreCount =
"0"
continueAfterRunningActions =
"No"
symbolName =
"__41-[ZXChangeMsgViewController changeAction]_block_invoke.277"
moduleName =
"ColorfulSchool"
usesParentBreakpointCondition =
"Yes"
urlString =
"file:///Users/liuzhuoxin/codeStore/colorfulSchoolReconsitution/ColorfulSchool/ColorfulSchool/Classes/MineView(%E4%B8%AA%E4%BA%BA%E4%B8%AD%E5%BF%83)/UserSetting/ChangePasswordAndPhone/Controller/ZXChangeMsgViewController.m"
timestampString =
"590396147.429444"
startingColumnNumber =
"9223372036854775807"
endingColumnNumber =
"9223372036854775807"
startingLineNumber =
"289"
endingLineNumber =
"289"
offsetFromSymbolStart =
"24"
>
</Location>
<Location
shouldBeEnabled =
"Yes"
ignoreCount =
"0"
continueAfterRunningActions =
"No"
symbolName =
"__41-[ZXChangeMsgViewController changeAction]_block_invoke_2.279"
moduleName =
"ColorfulSchool"
usesParentBreakpointCondition =
"Yes"
urlString =
"file:///Users/liuzhuoxin/codeStore/colorfulSchoolReconsitution/ColorfulSchool/ColorfulSchool/Classes/MineView(%E4%B8%AA%E4%BA%BA%E4%B8%AD%E5%BF%83)/UserSetting/ChangePasswordAndPhone/Controller/ZXChangeMsgViewController.m"
timestampString =
"590396147.4322031"
startingColumnNumber =
"9223372036854775807"
endingColumnNumber =
"9223372036854775807"
startingLineNumber =
"290"
endingLineNumber =
"290"
offsetFromSymbolStart =
"16"
>
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
...
...
ColorfulSchool/ColorfulSchool/AppDelegate.m
View file @
f02f4509
...
...
@@ -84,7 +84,7 @@
// [kAppWindow addSubview:fps];
//默认配置
[
self
defaultLauchConfigAndIsOpenPreventCrashManager
:
NO
];
[
self
defaultLauchConfigAndIsOpenPreventCrashManager
:
YES
];
//防止蓝牙洗浴后台运行被系统中断
...
...
ColorfulSchool/ColorfulSchool/Classes/HomePage(首页)/0801HomePage/Controller/ZXHomePageViewController.m
View file @
f02f4509
//
//
...
...
@@ -166,7 +166,7 @@
if
(
iPhoneX
)
{
bottomH
=
34
;
}
_myTableView
=
[[
UITableView
alloc
]
initWithFrame
:
CGRectMake
(
0
,
kTopHeight
+
13
*
k6Scale
,
kScreenWidth
,
kScreenHeight
-
bottomH
-
49
-
kTopHeight
-
35
*
k6Scale
)
style
:
UITableViewStyleGrouped
];
_myTableView
=
[[
UITableView
alloc
]
initWithFrame
:
CGRectMake
(
0
,
kTopHeight
+
13
*
k6Scale
,
kScreenWidth
,
kScreenHeight
-
bottomH
-
49
-
kTopHeight
-
13
*
k6Scale
)
style
:
UITableViewStyleGrouped
];
_myTableView
.
delegate
=
self
;
_myTableView
.
dataSource
=
self
;
...
...
ColorfulSchool/ColorfulSchool/Classes/Login(登录注册)/Login/View/MQVerCodeImageView.m
View file @
f02f4509
//
//
...
...
@@ -13,6 +13,7 @@
@interface
MQVerCodeImageView
()
@property
(
nonatomic
,
strong
)
NSArray
*
textArray
;
@property
(
nonatomic
,
strong
)
UIView
*
bgView
;
@property
(
nonatomic
,
strong
)
UIImageView
*
holderView
;
@end
...
...
@@ -21,12 +22,20 @@
{
self
=
[
super
initWithFrame
:
frame
];
if
(
self
)
{
self
.
holderView
=
[[
UIImageView
alloc
]
initWithFrame
:
self
.
bounds
];
[
self
addSubview
:
self
.
holderView
];
self
.
holderView
.
image
=
[
UIImage
imageNamed
:
@"ic_shuaxin"
];
}
return
self
;
}
-
(
void
)
refreshVerCodeByStr
:(
NSString
*
)
code
{
if
(
code
==
nil
||
[
code
isEqualToString
:
@""
])
{
return
;
}
self
.
holderView
.
hidden
=
YES
;
self
.
imageCodeStr
=
code
;
dispatch_async
(
dispatch_get_main_queue
(),
^
{
[
self
initImageCodeView
];
...
...
ColorfulSchool/ColorfulSchool/Classes/MineView(个人中心)/UserSetting/ChangePasswordAndPhone/Controller/ZXChangeMsgViewController.m
View file @
f02f4509
//
//
...
...
@@ -182,7 +182,7 @@
}
//开始获取验证码
NSString
*
url
=
[
NSString
stringWithFormat
:
@"%@/app/customer/phone/message?cellphone=%@&codeNum=6&businessNum=
5
"
,[
kUserDefaults
valueForKey
:
@"NEW_PAY"
],
self
.
view2
.
textField
.
text
];
NSString
*
url
=
[
NSString
stringWithFormat
:
@"%@/app/customer/phone/message?cellphone=%@&codeNum=6&businessNum=
4
"
,[
kUserDefaults
valueForKey
:
@"NEW_PAY"
],
self
.
view2
.
textField
.
text
];
[
ZXTool
requestDataWithType
:
kXMHTTPMethodGET
url
:
url
para
:
nil
completed
:^
(
CommonModel
*
common
,
NSString
*
error
)
{
dispatch_async
(
dispatch_get_main_queue
(),
^
{
[
ZXTool
hideLoadingAnimation
];
...
...
ColorfulSchool/ColorfulSchool/Classes/MineView(个人中心)/UserSetting/UserSet/Controller/ZXSettingViewController.m
View file @
f02f4509
//
//
...
...
@@ -332,7 +332,7 @@ typedef void(^isCanChange)(BOOL iCan);
dispatch_async
(
dispatch_get_main_queue
(),
^
{
//弹窗提示
UIAlertController
*
alert
=
[
UIAlertController
alertControllerWithTitle
:
@"提示"
message
:
@"关闭后
将切换至订单单笔支付模式
"
preferredStyle
:
UIAlertControllerStyleAlert
];
UIAlertController
*
alert
=
[
UIAlertController
alertControllerWithTitle
:
@"提示"
message
:
@"关闭后
,将切换至订单支付模式。
"
preferredStyle
:
UIAlertControllerStyleAlert
];
UIAlertAction
*
ac1
=
[
UIAlertAction
actionWithTitle
:
@"取消"
style
:
0
handler
:^
(
UIAlertAction
*
_Nonnull
action
)
{
m
.
switchIsOn
=
!
m
.
switchIsOn
;
[
self
.
myTableView
reloadData
];
...
...
@@ -366,7 +366,7 @@ typedef void(^isCanChange)(BOOL iCan);
if
(
isCan
)
{
dispatch_async
(
dispatch_get_main_queue
(),
^
{
//弹窗提示
UIAlertController
*
alert
=
[
UIAlertController
alertControllerWithTitle
:
@"提示"
message
:
@"您将切换
使用预充值
模式,消费时请保证账号有余额。"
preferredStyle
:
UIAlertControllerStyleAlert
];
UIAlertController
*
alert
=
[
UIAlertController
alertControllerWithTitle
:
@"提示"
message
:
@"您将切换
成快捷使用
模式,消费时请保证账号有余额。"
preferredStyle
:
UIAlertControllerStyleAlert
];
UIAlertAction
*
ac1
=
[
UIAlertAction
actionWithTitle
:
@"取消"
style
:
0
handler
:^
(
UIAlertAction
*
_Nonnull
action
)
{
m
.
switchIsOn
=
!
m
.
switchIsOn
;
[
self
.
myTableView
reloadData
];
...
...
ColorfulSchool/ColorfulSchool/ColorfulSchool.entitlements
View file @
f02f4509
...
...
@@ -4,10 +4,6 @@
<dict>
<key>
aps-environment
</key>
<string>
development
</string>
<key>
com.apple.developer.associated-domains
</key>
<array>
<string>
applinks:https://www.dcrym.com/checktomcatstatus/
</string>
</array>
<key>
keychain-access-groups
</key>
<array>
<string>
$(AppIdentifierPrefix)com.pxkjformal.parallelcampus
</string>
...
...
ColorfulSchool/ColorfulSchool/Info.plist
View file @
f02f4509
...
...
@@ -440,7 +440,7 @@
<
/
d
i
c
t
>
<
/
a
rr
a
y
>
<
k
e
y
>
CFBundleVersion
<
/k
e
y
>
<
string
>
1.
0
<
/string
>
<
string
>
1.
2
<
/string
>
<
k
e
y
>
LSApplicationQueriesSchemes
<
/k
e
y
>
<
a
rr
a
y
>
<
string
>
jdlogin
<
/string
>
...
...
ColorfulSchool/ColorfulSchool/images.xcassets/newHomePage/ic_shuaxin.imageset/Contents.json
0 → 100644
View file @
f02f4509
{
"images"
:
[
{
"idiom"
:
"universal"
,
"filename"
:
"ic_shuaxin.png"
,
"scale"
:
"1x"
},
{
"idiom"
:
"universal"
,
"filename"
:
"ic_shuaxin@2x.png"
,
"scale"
:
"2x"
},
{
"idiom"
:
"universal"
,
"filename"
:
"ic_shuaxin@3x.png"
,
"scale"
:
"3x"
}
],
"info"
:
{
"version"
:
1
,
"author"
:
"xcode"
}
}
\ No newline at end of file
ColorfulSchool/ColorfulSchool/images.xcassets/newHomePage/ic_shuaxin.imageset/ic_shuaxin.png
0 → 100644
View file @
f02f4509
1.28 KB
ColorfulSchool/ColorfulSchool/images.xcassets/newHomePage/ic_shuaxin.imageset/ic_shuaxin@2x.png
0 → 100644
View file @
f02f4509
2.58 KB
ColorfulSchool/ColorfulSchool/images.xcassets/newHomePage/ic_shuaxin.imageset/ic_shuaxin@3x.png
0 → 100644
View file @
f02f4509
3.87 KB
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment