From cd2eb4aeabba166a1e540dcaf1554eeb47da065e Mon Sep 17 00:00:00 2001
From: Sandy <1074472615@qq.com>
Date: Tue, 7 Mar 2017 17:27:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E8=B4=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Car Release.plist | 4 +-
Car.xcodeproj/project.pbxproj | 20 +-
.../radious_select.imageset/Contents.json | 23 +
.../radious_select.png | Bin 0 -> 1327 bytes
.../radious_select@2x.png | Bin 0 -> 1833 bytes
.../radious_select@3x.png | Bin 0 -> 1799 bytes
.../radious_unselect.imageset/Contents.json | 23 +
.../radious_unselect.png | Bin 0 -> 1014 bytes
.../radious_unselect@2x.png | Bin 0 -> 1080 bytes
.../radious_unselect@3x.png | Bin 0 -> 1104 bytes
Car/Base.lproj/Main.storyboard | 354 +++++++++--
.../AccountRecordViewController.m | 3 +
.../ViewConstrollers/AccountViewController.m | 12 +-
.../Main/Cells/OrderListTableViewCell.h | 3 +-
.../Main/Cells/OrderListTableViewCell.m | 36 +-
Car/CodeClass/Main/Models/OrderListModel.h | 2 +
Car/CodeClass/Main/Models/OrderListModel.m | 12 +
.../Main/ViewControllers/MainViewController.m | 290 ++++++---
.../OrderListFilterViewController.m | 137 +++--
Car/Info.plist | 4 +-
Car/PrefixHeader.pch | 2 +-
Car/URL.h | 3 +-
Car/car_objc_json_client.h | 553 ++++++++++++++----
Car/car_objc_json_client.m | 184 ++++--
24 files changed, 1297 insertions(+), 368 deletions(-)
create mode 100644 Car/Assets.xcassets/main/radious_select.imageset/Contents.json
create mode 100644 Car/Assets.xcassets/main/radious_select.imageset/radious_select.png
create mode 100644 Car/Assets.xcassets/main/radious_select.imageset/radious_select@2x.png
create mode 100644 Car/Assets.xcassets/main/radious_select.imageset/radious_select@3x.png
create mode 100644 Car/Assets.xcassets/main/radious_unselect.imageset/Contents.json
create mode 100644 Car/Assets.xcassets/main/radious_unselect.imageset/radious_unselect.png
create mode 100644 Car/Assets.xcassets/main/radious_unselect.imageset/radious_unselect@2x.png
create mode 100644 Car/Assets.xcassets/main/radious_unselect.imageset/radious_unselect@3x.png
diff --git a/Car Release.plist b/Car Release.plist
index fae2b1d..6058115 100644
--- a/Car Release.plist
+++ b/Car Release.plist
@@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.0.2</string>
+ <string>1.0.4</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
@@ -30,7 +30,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>1.0.2</string>
+ <string>1.0.4</string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>wechat</string>
diff --git a/Car.xcodeproj/project.pbxproj b/Car.xcodeproj/project.pbxproj
index 637e3bf..c1b43c2 100644
--- a/Car.xcodeproj/project.pbxproj
+++ b/Car.xcodeproj/project.pbxproj
@@ -812,7 +812,7 @@
TargetAttributes = {
8F97C2B71E0CC4BE00D8A57D = {
CreatedOnToolsVersion = 8.1;
- DevelopmentTeam = W54V2VB863;
+ DevelopmentTeam = 3KJ9G3LC6T;
ProvisioningStyle = Automatic;
SystemCapabilities = {
com.apple.BackgroundModes = {
@@ -836,7 +836,7 @@
TestTargetID = 8F97C2B71E0CC4BE00D8A57D;
};
8FFE3DDA1E14AC6700BEB6A6 = {
- DevelopmentTeam = W54V2VB863;
+ DevelopmentTeam = 3KJ9G3LC6T;
};
};
};
@@ -1264,7 +1264,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = Car/Car.entitlements;
- DEVELOPMENT_TEAM = W54V2VB863;
+ DEVELOPMENT_TEAM = 3KJ9G3LC6T;
ENABLE_BITCODE = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SRCROOT)/Car/PrefixHeader.pch";
@@ -1276,7 +1276,7 @@
INFOPLIST_FILE = Car/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
- PRODUCT_BUNDLE_IDENTIFIER = com.gomore.car;
+ PRODUCT_BUNDLE_IDENTIFIER = com.czt.car;
PRODUCT_NAME = "$(TARGET_NAME)";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/**";
};
@@ -1288,7 +1288,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = Car/Car.entitlements;
- DEVELOPMENT_TEAM = W54V2VB863;
+ DEVELOPMENT_TEAM = 3KJ9G3LC6T;
ENABLE_BITCODE = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SRCROOT)/Car/PrefixHeader.pch";
@@ -1300,7 +1300,7 @@
INFOPLIST_FILE = Car/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
- PRODUCT_BUNDLE_IDENTIFIER = com.gomore.car;
+ PRODUCT_BUNDLE_IDENTIFIER = com.czt.car;
PRODUCT_NAME = "$(TARGET_NAME)";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/**";
};
@@ -1376,7 +1376,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = Car/Car.entitlements;
- DEVELOPMENT_TEAM = W54V2VB863;
+ DEVELOPMENT_TEAM = 3KJ9G3LC6T;
ENABLE_BITCODE = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SRCROOT)/Car/PrefixHeader.pch";
@@ -1387,7 +1387,7 @@
INFOPLIST_FILE = "$(SRCROOT)/Car Release.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
- PRODUCT_BUNDLE_IDENTIFIER = com.gomore.car;
+ PRODUCT_BUNDLE_IDENTIFIER = com.czt.car;
PRODUCT_NAME = "$(TARGET_NAME)";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/**";
};
@@ -1399,7 +1399,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = Car/Car.entitlements;
- DEVELOPMENT_TEAM = W54V2VB863;
+ DEVELOPMENT_TEAM = 3KJ9G3LC6T;
ENABLE_BITCODE = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SRCROOT)/Car/PrefixHeader.pch";
@@ -1410,7 +1410,7 @@
INFOPLIST_FILE = "$(SRCROOT)/Car Release.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
- PRODUCT_BUNDLE_IDENTIFIER = com.gomore.car;
+ PRODUCT_BUNDLE_IDENTIFIER = com.czt.car;
PRODUCT_NAME = "$(TARGET_NAME)";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/**";
};
diff --git a/Car/Assets.xcassets/main/radious_select.imageset/Contents.json b/Car/Assets.xcassets/main/radious_select.imageset/Contents.json
new file mode 100644
index 0000000..dc50bfc
--- /dev/null
+++ b/Car/Assets.xcassets/main/radious_select.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "filename" : "radious_select.png",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "filename" : "radious_select@2x.png",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "universal",
+ "filename" : "radious_select@3x.png",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/Car/Assets.xcassets/main/radious_select.imageset/radious_select.png b/Car/Assets.xcassets/main/radious_select.imageset/radious_select.png
new file mode 100644
index 0000000000000000000000000000000000000000..750a85c72f23d49aac13f2af8e317593f2fdc014
GIT binary patch
literal 1327
zcmeAS@N?(olHy`uVBq!ia0vp@Ak4uAB#T}@sR2@wC9V-A!TD(=<%vb942~)JNvR5+
zxryniL8*x;m4zo$Z5SAsH8MjYN+NuHtdjF{^%6m9^eS=-fVvqNZ0suv5|gu2OB9k)
z(=+pImEP~(ucVNfVyhHx>TBRz;GCL~=}}db8eHWUl3bOYY?-2DZ>L~WVFffGH?<^D
zp&~aYuh^=>Rtapb6_5=Q)>l#hD=EpgRf0Gw!Z$#{Ilm}X!Bo#oH`&nGLc!cp&(PG;
z!pKBN!N|bSOy9s#-_S(Yz|hLT(#pV40Sc6WwiTtMSp~VcLG1$aY?U%fN(!v>^~=l4
z^~#O)@{7{-4J|D#^$m>ljf`}GDs+o0^GXscbn}XpVJ5hw7AF^F7L;V>=P7_pOiaoz
zEwNPsx)kDt+yc0<dBxCR0tT3VMPh-zp`HQAOE87LzW9~q=E7AMmjtCE+>6!V;*iRM
zRQ;gT;{4L0WMIUlDTAykuyQU+O)SYT3dzsUfrVl~Mt(_taYlZDg0nLy)XWt$d=ry1
z^FV@{U|qhxR-SpqC5d^-sh%#jN<ee;GBZ=GoL!vFU0hrY-5kvf3=Lh)EDcSJoPZ(b
z;$+}v<Y?pq)9aF-T$-DjR|3<Ug3xP(Q!gk%<Q4#Jc1bPDEK5ysE6UGR0DIgj6N_6c
z9bF9#jNEXW2i2Q`+bsq--J%b4j6NuOk)j(W1WZF9COq*1Iq>A4ng>ktMZm=UcHXm0
z1_s8to-U3d6}M7?Y_pjhMdn!hpYIoD4b0iPX=516Mj>u(MVC*HKd}ehh>Xx=6Jg<&
z7W9^875roO_0NfO%7Uic+~vFTpPfAuz4re5`Z<2fx1WB><a_zUuDtEick;}e4l1-A
zURY@%vu|tM`trw(nX`7pt^dy;*Y94o{r1rc8#lGdjfHme-+HJ#>ULWkAUmHyZ#s8d
z;vGi2`Tftgty8h&>UjK7L*aPgli9Ny4kk2&tycY%bNg7;-m)I|yHgwm4mLV4eEuo(
zwoE#1z4$3^p-z^hjS?kHf9m$PT*xuIm|^15w(j+d5~~|IW=>PirUmLve|k<K!EE-z
zu+@o1Gd&bcyf<CUP)Yf7{%KK!j+oL!M+Ffs#i?G2+ixdsjq+q)_qMFN#;)IKAwyq_
zoo7<O{?y1rQ+(6{*I&2fe>uf(d7zG%>%GS^Gw<1Mtgz|J+S*lMp|fy`m#XHS_uu`S
z%|#ZU%ZPN@`zC5-hzi50XOgv_=9LDm58CviHFM+RqMcJrIOq8-zvNh>aUg&0(v{o4
tuRK)oT=<dd-anp|f7LcJ)&J!%VBnef(R_Y%(nU}a=IQF^vd$@?2>?64+H3#-
literal 0
HcmV?d00001
diff --git a/Car/Assets.xcassets/main/radious_select.imageset/radious_select@2x.png b/Car/Assets.xcassets/main/radious_select.imageset/radious_select@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7867a56b33ae6d858031cce40c648cefb7bff29
GIT binary patch
literal 1833
zcmaJ?X;e~a7)IRYxQu$TCd-ttatYZ46_OIc1r0?Ml4Cd_T$E9`1lL4Lv)wYSj$38Z
z?rG6BHJ!q?Q8UfVrA{VUY3a0RjMLOOmNggCnjhobbMF1V?>+DHyxa4gyPXpmYHKye
z3V}e_vci~Lc%2Ks&fi(U-`yPz!|>t+1;;@#pcG0MsQ?6B0ww||mRytsZ~>7dV|6nS
zfIygf$YSH5IQDX?7?fj0Mjxz3u7uGDM8GnQQY20RAXFldBva7P2HiC@N+zM9SCH9w
zwvquP%fhrOAVwP*E7qonDH8OurKkW66(*1akO-xbrz+G`4GlfPONIAFGY*ZKaDh^2
z=r2jdu{kIPr~*)AtgpA2;Ny?-qhJYSia(KrK@sr;UmTu-BapoD1S+0F#S>7I4;qf9
zl1QmsX2@hL_(Ve|Ly(e+!=<OEW7B=GpehMRpin3{JP}7Edcz*x>I?-W(s(P>Zc_|Q
zKrL3ul#mQmpp1;7L@*7aq2Wxwlpt4rrB$dW+XOcZrx7V}1T5ZI(v%~c{r|3V`B!f>
z#09?P`=7+>*bF6r;{s|hO(lj0Cv`K1Qc@WzKm>uRSP)E|>LMo@gg|vNs6;Us#;*CH
zJlG<!Okp&7PN3LqDode;L<%v$V$#qs4^}3VP$~3a0-hMm2%-Dp34~x@3V}onf;+|x
z!iNy)MCKHh35wI?fC8GrO1@#4(_)Q+kSpQHOh6@D14u$tpd2+(I8`=%F7#>nCb5#~
za|xOji-VKF8OQstaZj0G4H>sz#S0(4${$d`npeT%K2=}l4d0m(7Ly*U>8U8zhsV<$
zx31{tADd-vmyF+dG-UqBO;eudL9E%42bo(F-Z_mSw_FW&z22#f;W*lPc<iup8NuZ2
zNSa~ya-FsN(AE%f>vjCvy9WiIE7p&v+<D*H+L|NF>Ut7k5zprrzi(`8Ob-nWz0u#_
ze=dLD=T&2NU8egG+Zz-6{qr>eE)RQqi>j)8JTaI;j>n&t=M965r+t0&HwHsmM|^f=
zRaM%f?(W^=<C&Lqx`NJ5?%*|(S;z&;mi-tW9&XkS^*noaY;@gH+V2ewn}>#nS&@<X
zS#PyhoKZG$_Yk9_oP-2yM>2ftPP&EE*VkJWmX?-dIu2b&XE*MBDnazEp(Y;A%gbvX
z8mf3cFwj_UQdSIri<l;v5fKqYKfe=!vmR}vpXvOYKj84XzMhd+z&om=_uao=#6<6@
z-EgE%ua9?fb$#GqC#-(y(|768r4B=+m&HRSW=0p%VL6-K+}4)w=;+w+o1jTsDCF}O
z&73(i{9M6K7vDe!R`W|ujqFCcudB23t&bn;TyEK#0Xv6>hZDWF9XNET+!n0N79X&}
zlSs!$&JQ%TI0u@o&di*5*Bx;<_kvCr-_z3r9i;S@#7Vm~TCJD0we>x6*{1Z9r_Y|{
zKWne8tVEZVmTEox?0v_^#*SaTy7XXpaaNP<=JMOOZ|`5+)YN3P9K)IMmdE2={(k>%
zYIWsJwlFGcm)Rydt#FBXf9E!}N+gjmEi5euo<C>OEBx`lT)enYuh+k79vi#NO)cMi
zhAI>aJKNh22Ra8_@SN?wz;({txkX8fWwmHZ>#J9%+f1d4Ekll+E-MTEweNgOfFLuk
zE6mOe$rT7Z$z(E-Mmy8|(_*9>Zyf~1wvHb+Ao_x1VhXBjYP^bC7wRaVqTNnN)pGe6
z8ylN2q44K6!Cj}3wmA}S%b^!9a@LNn{9tKgs?lU*oVxJRU?>?Jl$tl#XKR{septDq
zVSDTaB+CiY5s|%Q$r5sYLu<?4q=5OdQ}&v@EoG(ED+NU+Ini}TNP=_rrY#J6&nFpo
zGpiHY?GaB43JUuF`tWX^;gkDF_4U-M4cppsbFF!)(b0QuzUS3uc;!}X<8<rw<&QbM
zgz?vbwY<mtoh4Z&af~^23#^6&TT;dcn{rslD>XImPtUHqw+g9?TEVe7|3v!73{rHj
zPp`+LsP!wZAwHzK9KG4Q>rDi{;7<2v*;d?o^Vx_lfOM~)q+f0Pd9i{cnP-DmZTttM
Ctl-iB
literal 0
HcmV?d00001
diff --git a/Car/Assets.xcassets/main/radious_select.imageset/radious_select@3x.png b/Car/Assets.xcassets/main/radious_select.imageset/radious_select@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9cd80fb871fec0025786e2f7ef5a3b9b1e51744
GIT binary patch
literal 1799
zcmaJ?dsI?)9LJoG%v=vMHM1L*X$4$JK~PW<Ffe=|nI4ZzgsZUP5nKf`o#t9CN9C6J
z=u~Qnsp;8DdmJoQnq`J9cS=Khs4>^6l|9TRXKNQz+aGiHoO^%2-}ihzpYQW`?zb^f
z5p$h9olq#$T=oVA4_W<?*Wb||`9@T2y@4zqFf##;lc&LIff7Q|Me<Y#U`qw*5DyZF
zvbJ|XAt;ospM;+PCvZ1XgmNiXV8viHQU$_Bp+Z763W0Dd1Ous1x<p1rztkJhfJ8(^
zZw};wTtzq}mTcIegyMEY@r66K3dtgLC=CeFP!Itr1PcI-bel{?(NNJ7x)fw@HRI60
z1O(nnMSlz`fg1ya%asrih$Ui#_;o=5iHyYul7k2VYXJg?C*nXd4j+I4@f46u0r9}(
zgGRh5MQIcsgEi?3IZ@GK7*<elIJH`hRj<R!mFYM<nM}rk1RQ~YK@b>KmJAkXFfx_T
zlmY`%36&BBERo9qtD+!Po&i(QNTeTAkSeBSWva<CAqB%}1PUA;3tCf}0&=<k50y%%
z(JGh+eTw%#g;o441%%^4DtU%dh%_$E$LdN!30Fb_Sgz#D<=dvJ7$cU$a+O%F0K&tq
zRU-j@T!By`vl{&;SX?fJEmOe)nGj+#sAxn7E0KsOWI7WM5?COMP6Y9ICXtK}Ago6!
z##j%s2y_Btip!7-Go+9Vp5lr=aq%;9tpg!dAf6eJQj!UYSW3ARm`I!=nK2e7b4I;M
zu4u+sn5-GOI3yUHwY~pp_ml~lA?tQ}c#*^O_(L*e=9S2BKc_u>j@+3HHiORBnEFeT
zqCI2hU3Xx#Ea#ul^tjt<Jp*Hh9(?ASH8S+}uG(TZ9%wq*QW}sm!i=lW*F@$Y6t^(7
zv9Yd0+G8JTkK}b?9omw+*}mE2v-;5AZk3f42&7W26H_LW`MEon-+#JF_f=^w>GF5v
z(p<<BD*q)elEWE%{{DX2*+d6>`x|Xo8sV>NZwrn+45ra^Cr<cqRxIe37>&j)y#plF
z@aWgVuqM4ea(H;yf2^>uupz~^A_8}zre@VX2HLgo8t=stEo=4a)mLj5=iPfkulcoh
zc7JQDEe4Cd`55s1flX<4AARlhxT~wHd%r>R@;GU9@5SosmCOr0Rpg3CFKb#`!#5on
z9!}3esWUVEyj;?o^ajK5v3sr~gM+)`H*enE`uN3*sNk@*`^;u2*R{C5e$5}K`RZ;5
zCX>_ei{ZF`|I;aVXZyO^+DenjH0H2#=gyPG#ft=%y1Lb0ip3RY&YU^lFxc0Zv|MjA
zas_?+_q)8_aminiXnWNsKP+!2ZA&{NJ1dJ_8M8smu~;k;v3PG!O5**6yZie3hOT%Y
zxc=v8d%HcC%dN#a`<M8~&$bVsP&f?@4f}|`MdtmDmM2eEm}!mC(a{~U^PR`YK|u%a
z*AyHnEv?Y$bp4#AI#o{2Q8za?*U)cX!ECpO#()N)Q0Ot>O1)q(+^+G9%ky!$V@Dzq
zb%)N11M0^6M@GQrrY6VThn?pca<j9OGy^|>F^f_3$YkO*FZ1#``R-ljz*wj5!uj(h
zA>N-yAFc{?^WIaDalLCJn-Uz{F`y6?cXzh~XWrks<$Pe_xy}VQ)qAPuAbu0QWps2D
zI;z_ACM79piLt9Ibx-y9f;O*mo9f>B#zx(%SKBWKy>@c+$6%^EI@o_dyGzRpDT@Ma
zHMEP`+iNOTBqt|7$<%jjBc^Y9Ki}7EHj{haoaP|brCY+PmOX#^v~qlWoD}GlNSZ@D
zq79FakFPV?oYw0t#-*`Q4>mHHcHHP_RWG~?bocP+i0nM9iqM|BVOADhOD)n?uFHBr
zl(;z3*Ulo4eT&K&ou$5()V8Watb@Ffl0@1{9L8{H@0~UK_})gFYTi5Vs?OsP9~M>Q
zH@`VGa&MNo@Jd1GoZkFURM4K}RGX{$5|_N+39%)Y@t3fuAD=CD1MNOIfv9C=$>ZqW
RJ!95i6Pp>uXk4GN>mO*w(E<Pf
literal 0
HcmV?d00001
diff --git a/Car/Assets.xcassets/main/radious_unselect.imageset/Contents.json b/Car/Assets.xcassets/main/radious_unselect.imageset/Contents.json
new file mode 100644
index 0000000..23b4ea1
--- /dev/null
+++ b/Car/Assets.xcassets/main/radious_unselect.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "filename" : "radious_unselect.png",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "filename" : "radious_unselect@2x.png",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "universal",
+ "filename" : "radious_unselect@3x.png",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/Car/Assets.xcassets/main/radious_unselect.imageset/radious_unselect.png b/Car/Assets.xcassets/main/radious_unselect.imageset/radious_unselect.png
new file mode 100644
index 0000000000000000000000000000000000000000..2367e6cd4da3233e19f5a0b7dc5192698f252714
GIT binary patch
literal 1014
zcmaJ=PiWIn7|*aw9qyzD|KNCJ2PfG4+tw|iaZ8%k6_zo&g2j_*^4f+idGY1dW<zv%
z80bm#q$foXJh;2;uuBgU+(kSI9t0VJ1M#LXoG)G5c~}j+y!Sr7-|zc<f8K-nxod+1
z=LZ;u8O+ZZg?NwGiGKRW-@o3W+c}agkp)yC4GTj?b5I$Ayk}Km0b0)Tt#>fZFvmvR
zVu_T@S;a;kXT?5T<OLMXFzKl%u<S)hKp9qDUuA!6Y_h<0RQCF~DVRY9*4&vD3>Q}B
ziuTH)Ej#SgRgjJpO5j0afyi6(LnTt#7Oz6jv6*K<%Y`he?189~IS(=jLom*zlD0TH
z2_|Gt9G54hu`56l#1t>cyf~H=L`9GlK?LoOrO~icQ3^(`9gE&nwnj*x@O-1u;2NVG
z!c|_BWtkTwUXqg3BN;CH#EO!BINV_{U}$4EATIJj%xINSov18TdXRz_bZPytT_##E
zKC%K{<b*h-j-zS*-_`TF-XST#L%l~5hsEUp@&y>8I<{%!D#LN8K*?Ze5rm5fEp@6m
zUqb|iH57nMCa&597%?r|^<(4Z7Rof0ydM(Fw_)B;S<1t?uA|6WRurV{WKK&7qL@v|
z;+Uk<iW$0)lQhZbU=3u~J?N7T);Yw=J+bjXcma)UK<wUzP7Wgvv=Ud`BeiI9W>o0S
z*Ty<WYH4A$o?3V+hL79(PrExNIz#cXJG}JL9e?Q4na6av?_PS7pbx{z8(J~?R8EIG
z@6-MLYZ0iF!KpueKlR-6SDU)7&+hK-ChB{8zn^^hywTV%O{W5kr63GXe{43Ji5F+L
zn3vDKt)D#ec7IjeZf<SO6dy9LkGnU1?QCCo{9$N%wU1fbxtMq~^z>f*67$(PV_m;_
F|1VU{Mpys<
literal 0
HcmV?d00001
diff --git a/Car/Assets.xcassets/main/radious_unselect.imageset/radious_unselect@2x.png b/Car/Assets.xcassets/main/radious_unselect.imageset/radious_unselect@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..afe9f4cbbdaf3728203456b23ffcdb1f1ee79b85
GIT binary patch
literal 1080
zcmaJ=TSyd97@jiBETxMtD#SRFD7bUm)pZ6p+uhOJa28uP+(^pVnd3U?T$(w$s}E5j
zg@l1oLiEs+Q4bXqK1Jw5h#~Y4i6ALLkwSr$Jq1!{bXR+58#r^$`T4)^zkO%8HGHxl
zza$^Su!2yt5J7vXv+{D$f8_noGiWP@jWO6}bit%#0nD!$ae#+3DFGrtQU)%)0reP`
zQ>jK{FebL}vZ0ZZ<3px26QMDzz9D5wau0xb93)iTN36Y^Byd&n5$!c1Et)~ltu_x@
zplvW5l?QudP9YkO<Mk;X5oiEPcuMQlZ9e5AHhFn;cFYukZ@R!9AF-8GOl-x2h6V5%
zveqRt?mFDdkxUI&$9k%9mS$=xnxhzxi)MJ5<7oy@e*}tVDP4R-XiCRIHy_arp~+KJ
zGMOZkZql$46vJ^GMY9ykx{!y<9?+qba_M$?hCu+fY^f$x4IOtFrMS@teFVyMs|3y5
zrq%6qn^423lw?v2NjoKF97XZ}u9~*(ZNmuI$@ibcc67i5R0P;YpCzNgb(K4zOg?A<
z2^v<^FnTjxZ0$CnVRsuQ9t=8N^Wv4FB&)h(tlC70A|KLiDCsf?2|fbxkgBTioZrs{
z-L$*OUrRGgV=c#c*Z}I75TKh_KPzOgf+6>5K!+KuvV-+x#X5q}OcYrFmf8=LCd<(9
z&BA##doD~?zBE?Jo(r25OQB>aXS{!nJ7Yo`a*o^LMVD>)108AJLgG$LJZ?u1<6%hf
zM^g)5$C$$1WktedU})*~er>$}=+yM<_1NHEdE&-$$xzP0{G!7v_ZLgA%su#YD6q~(
zUwmI$8(u98PqqFo`nJbA@^RNK581JNpnA6A^668f%*M^Tkw+8L^Py)K5>Jk;bR^H_
zUA5j$UO)Fs7An}$;TDBBa&KmA70ef(_cPOFUoO6S-urnm)-!(R-Avp)OD^XWc6v|z
d$feAUd>Z?(ud08pAa}ue%b~`w@HEhQ?GFmCWDfuU
literal 0
HcmV?d00001
diff --git a/Car/Assets.xcassets/main/radious_unselect.imageset/radious_unselect@3x.png b/Car/Assets.xcassets/main/radious_unselect.imageset/radious_unselect@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..6df403adf664572c2ae168c819599fe1937a3633
GIT binary patch
literal 1104
zcmaJ=ZAcSg96vLyNpEBz^`-0VMak{%rq125X>+&bsGBwyjfn7e_c)JvFWo)1+X%7@
zDTs)OBB)PAU!uN55M^o6ha!sTg~B2P!J;Cg0ujP`&YVWH4(@sR^Z)(+zyHf~q%FF6
zaoMUe48s;jTDTb6tL%SaDO!(CU02Yy5{446UF(Dy!2no5(vkp=C_)OvfFNb}JODln
zE3T5`37FuwvZAKA1lz}DDLO)9n6Jsw1u+dEo&+gb^%LVa2MJu3{KSrWp5pZ&=#pD<
z258Sk<6<r?G7{0$i2E!S5hwr(xTSQfCTsbLX<incZ8J&W(=IUWCw_}c@NIZdGXP%i
z@;F7h){8eVF1nuay6b9iH${6$iXrJbCq=Uq!%{Rp^ARYTA$77bE<6(p-TXusggQ%-
znM}r&sdZ^ailiBaAt^WMb~}-W)6A++u$-z{nP=dDDH^g4WlhCxMj@&7KtF+${!T&B
zXK7V)rc9_{q$TJi?V{|I@{T<Je^*7B^)_J)%<26nu^G?mfQ$iC>oG*sxXwyDl+FeX
zAVAHCYg%`{ifvsQ)XXkT$Adw;Y7KZ5FNm^g8>^>LJkLf{6AG#bBAlN<JT6(5SSAo)
zg0)mbIN+gZI^<#KI(IXw7}rdN-2pe3$8wt3qW~4=vC<sYTM%mxgrcL!95Cd)Knfe0
zf=?&T%7wMm7v!74N`<v}3SvnlhP2!JN4xVTG(+}rc6iZccKm^gX5K)<efU7D{nBnn
zxIo+*{`BgO<1V$LbmZm8wtMT277uJGU6xv&Bcr3((;}bLyZrR==S4q)eJvID%coXP
zJ$ci3V(jaUvsW*iTtXP3*7woj_2(;d+g_w9L|^jTritW6vd&x67dRV#HuB-x&PUm+
zQ||^Q_>i@9@b%^L(KW|6&2y~%dl~v!a%!^UjAMW5(51;;9|s;fj`c77vb*<IO>sJ1
teerE}e8ax^-}@hzc9_@ZZ$H;KZxL1!AjTFjL!a$89tlOcE6p7Te*xejYs~-v
literal 0
HcmV?d00001
diff --git a/Car/Base.lproj/Main.storyboard b/Car/Base.lproj/Main.storyboard
index 14b5463..a4a532a 100644
--- a/Car/Base.lproj/Main.storyboard
+++ b/Car/Base.lproj/Main.storyboard
@@ -113,8 +113,8 @@
<constraint firstAttribute="height" constant="30" id="Nvw-nI-6cM"/>
</constraints>
</imageView>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="账户" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fJu-eo-Y8d">
- <rect key="frame" x="76" y="16" width="37" height="22"/>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="工分æ现" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fJu-eo-Y8d">
+ <rect key="frame" x="76" y="16" width="74" height="22"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
@@ -738,7 +738,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="166" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="fte-kF-PCY">
- <rect key="frame" x="0.0" y="0.0" width="375" height="603"/>
+ <rect key="frame" x="0.0" y="44" width="375" height="475"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="OrderListTableViewCell" rowHeight="166" id="tpV-M9-l1S" customClass="OrderListTableViewCell">
@@ -749,25 +749,25 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2016-04-23 12:21" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PI0-yO-xgv">
- <rect key="frame" x="16" y="16" width="154" height="23"/>
+ <rect key="frame" x="50" y="16" width="154" height="23"/>
<fontDescription key="fontDescription" type="system" pointSize="19"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="å…ƒ" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1pn-6m-cer">
- <rect key="frame" x="341.5" y="17.5" width="17.5" height="20.5"/>
+ <rect key="frame" x="341" y="17" width="18" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="油站-åŠ æ²¹å‘˜" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="G9f-Lv-F9O">
- <rect key="frame" x="16" y="47" width="106" height="23"/>
+ <rect key="frame" x="50" y="47" width="106" height="23"/>
<fontDescription key="fontDescription" type="system" pointSize="19"/>
<color key="textColor" red="0.39995324611663818" green="0.40002685785293579" blue="0.39994865655899048" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="æ²¹å·-油枪" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="roe-Vr-AS8">
- <rect key="frame" x="16" y="74" width="86" height="23"/>
+ <rect key="frame" x="50" y="74" width="86" height="23"/>
<fontDescription key="fontDescription" type="system" pointSize="19"/>
<color key="textColor" red="0.39995324609999999" green="0.40002685789999998" blue="0.39994865660000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
@@ -791,7 +791,7 @@
<nil key="highlightedColor"/>
</label>
<button opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="C7n-Ft-15k">
- <rect key="frame" x="297" y="125.5" width="62" height="22"/>
+ <rect key="frame" x="297" y="125" width="62" height="22"/>
<constraints>
<constraint firstAttribute="height" constant="22.5" id="VEh-ic-B9A"/>
<constraint firstAttribute="width" constant="62" id="clM-k3-hFc"/>
@@ -833,17 +833,30 @@
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="199" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="M6y-YA-WBW">
- <rect key="frame" x="303.5" y="14" width="34" height="24"/>
+ <rect key="frame" x="303" y="14" width="34" height="24"/>
<fontDescription key="fontDescription" type="system" pointSize="20"/>
<color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
+ <button opaque="NO" contentMode="scaleToFill" enabled="NO" selected="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="G0Z-or-Mw8">
+ <rect key="frame" x="16" y="14.5" width="25" height="25"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="25" id="DPS-Jr-lRv"/>
+ <constraint firstAttribute="width" constant="25" id="eZ3-fE-nyu"/>
+ </constraints>
+ <state key="normal" backgroundImage="radious_unselect"/>
+ <state key="disabled" backgroundImage="radious_select"/>
+ <state key="selected" backgroundImage="radious_select"/>
+ <connections>
+ <action selector="actionCheck:" destination="tpV-M9-l1S" eventType="touchUpInside" id="z5n-j4-kon"/>
+ </connections>
+ </button>
</subviews>
<constraints>
<constraint firstItem="Mdj-mP-15I" firstAttribute="leading" secondItem="hzT-UH-DPk" secondAttribute="leading" constant="16" id="3jX-Oi-TBY"/>
<constraint firstItem="roe-Vr-AS8" firstAttribute="top" secondItem="G9f-Lv-F9O" secondAttribute="bottom" constant="4" id="44O-1K-Qly"/>
<constraint firstItem="G9f-Lv-F9O" firstAttribute="leading" secondItem="PI0-yO-xgv" secondAttribute="leading" id="4xb-ht-mIE"/>
- <constraint firstItem="PI0-yO-xgv" firstAttribute="leading" secondItem="hzT-UH-DPk" secondAttribute="leading" constant="16" id="5zf-od-CeG"/>
+ <constraint firstItem="PI0-yO-xgv" firstAttribute="leading" secondItem="hzT-UH-DPk" secondAttribute="leading" constant="50" id="5zf-od-CeG"/>
<constraint firstItem="Xdf-p8-5An" firstAttribute="top" secondItem="kGS-C0-cNE" secondAttribute="bottom" id="COz-g8-1hy"/>
<constraint firstAttribute="trailing" secondItem="C7n-Ft-15k" secondAttribute="trailing" constant="16" id="Dwe-zG-dax"/>
<constraint firstItem="m7p-3S-SOZ" firstAttribute="height" secondItem="kGS-C0-cNE" secondAttribute="height" id="FuE-xr-O73"/>
@@ -855,9 +868,11 @@
<constraint firstItem="Xdf-p8-5An" firstAttribute="leading" secondItem="hzT-UH-DPk" secondAttribute="leading" id="cl6-IX-PnS"/>
<constraint firstAttribute="bottom" secondItem="Xdf-p8-5An" secondAttribute="bottom" id="csy-AE-1fa"/>
<constraint firstItem="m7p-3S-SOZ" firstAttribute="top" secondItem="Mdj-mP-15I" secondAttribute="bottom" id="dcZ-H6-mrD"/>
+ <constraint firstItem="G0Z-or-Mw8" firstAttribute="leading" secondItem="hzT-UH-DPk" secondAttribute="leading" constant="16" id="drS-LW-E3E"/>
<constraint firstItem="roe-Vr-AS8" firstAttribute="leading" secondItem="G9f-Lv-F9O" secondAttribute="leading" id="epS-Hm-gw7"/>
<constraint firstItem="kGS-C0-cNE" firstAttribute="leading" secondItem="hzT-UH-DPk" secondAttribute="leading" constant="16" id="fuD-Bk-D0Q"/>
<constraint firstAttribute="trailing" secondItem="Mdj-mP-15I" secondAttribute="trailing" constant="16" id="gkS-fp-Kpu"/>
+ <constraint firstItem="G0Z-or-Mw8" firstAttribute="centerY" secondItem="PI0-yO-xgv" secondAttribute="centerY" id="jBv-9V-kct"/>
<constraint firstItem="1pn-6m-cer" firstAttribute="leading" secondItem="M6y-YA-WBW" secondAttribute="trailing" constant="4" id="nEa-Nb-LeI"/>
<constraint firstItem="kGS-C0-cNE" firstAttribute="top" secondItem="Mdj-mP-15I" secondAttribute="bottom" id="s4w-SJ-q21"/>
<constraint firstItem="m7p-3S-SOZ" firstAttribute="leading" secondItem="kGS-C0-cNE" secondAttribute="trailing" constant="-1" id="tAF-92-N0O"/>
@@ -867,6 +882,7 @@
</constraints>
</tableViewCellContentView>
<connections>
+ <outlet property="btnIsChecked" destination="G0Z-or-Mw8" id="1n3-Rn-Z58"/>
<outlet property="labelBillNumber" destination="m7p-3S-SOZ" id="qtj-m8-kor"/>
<outlet property="labelOil" destination="roe-Vr-AS8" id="sWe-2m-pNR"/>
<outlet property="labelPrice" destination="M6y-YA-WBW" id="Nfg-Dq-GhG"/>
@@ -876,13 +892,160 @@
</tableViewCell>
</prototypes>
</tableView>
+ <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SUp-3O-J8h">
+ <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+ <subviews>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bmf-kc-sf9">
+ <rect key="frame" x="16" y="9.5" width="25" height="25"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="25" id="7Tj-EY-Uiq"/>
+ <constraint firstAttribute="height" constant="25" id="Ptz-Th-dte"/>
+ </constraints>
+ <state key="normal" backgroundImage="radious_unselect"/>
+ <state key="selected" backgroundImage="radious_select"/>
+ <connections>
+ <action selector="actionSelectAll:" destination="NvU-gI-aPJ" eventType="touchUpInside" id="pfq-Sm-G68"/>
+ </connections>
+ </button>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="全选" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xfE-b7-Fwg">
+ <rect key="frame" x="57" y="11" width="39" height="23"/>
+ <fontDescription key="fontDescription" type="system" pointSize="19"/>
+ <nil key="textColor"/>
+ <nil key="highlightedColor"/>
+ </label>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oaq-2p-fUb">
+ <rect key="frame" x="279" y="0.0" width="80" height="44"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="80" id="kr4-H4-dLx"/>
+ </constraints>
+ <fontDescription key="fontDescription" type="system" pointSize="19"/>
+ <state key="normal" title="å–消对账">
+ <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
+ </state>
+ <connections>
+ <action selector="actionCancelCheck:" destination="NvU-gI-aPJ" eventType="touchUpInside" id="TRX-wb-6eH"/>
+ </connections>
+ </button>
+ </subviews>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <constraints>
+ <constraint firstAttribute="trailing" secondItem="oaq-2p-fUb" secondAttribute="trailing" constant="16" id="GLt-Mi-pph"/>
+ <constraint firstItem="bmf-kc-sf9" firstAttribute="leading" secondItem="SUp-3O-J8h" secondAttribute="leading" constant="16" id="LnV-xB-fif"/>
+ <constraint firstItem="oaq-2p-fUb" firstAttribute="top" secondItem="SUp-3O-J8h" secondAttribute="top" id="NmC-5Y-Yin"/>
+ <constraint firstItem="bmf-kc-sf9" firstAttribute="centerY" secondItem="SUp-3O-J8h" secondAttribute="centerY" id="OCo-t8-4uQ"/>
+ <constraint firstAttribute="height" constant="44" id="Ogv-fa-3jp"/>
+ <constraint firstItem="xfE-b7-Fwg" firstAttribute="leading" secondItem="bmf-kc-sf9" secondAttribute="trailing" constant="16" id="Q9f-cQ-WeM"/>
+ <constraint firstAttribute="bottom" secondItem="oaq-2p-fUb" secondAttribute="bottom" id="i8N-iK-x8i"/>
+ <constraint firstItem="xfE-b7-Fwg" firstAttribute="centerY" secondItem="SUp-3O-J8h" secondAttribute="centerY" id="ohL-wU-pej"/>
+ </constraints>
+ </view>
+ <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="60m-IE-dYi">
+ <rect key="frame" x="0.0" y="519" width="375" height="84"/>
+ <subviews>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pkB-KR-wBr">
+ <rect key="frame" x="255" y="0.0" width="120" height="84"/>
+ <color key="backgroundColor" red="0.89847332239151001" green="0.44295623898506165" blue="0.19516775012016296" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="120" id="EA1-qT-XUN"/>
+ </constraints>
+ <state key="normal" title="开始对账">
+ <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ </state>
+ <state key="selected" title="完æˆå¯¹è´¦"/>
+ <connections>
+ <action selector="actionCheck:" destination="NvU-gI-aPJ" eventType="touchUpInside" id="FYc-Af-f7j"/>
+ </connections>
+ </button>
+ <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6w7-So-BEq">
+ <rect key="frame" x="0.0" y="0.0" width="255" height="41.5"/>
+ <subviews>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="å•æ•°ï¼š" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bOO-oe-d7A">
+ <rect key="frame" x="45" y="0.0" width="70" height="41.5"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="70" id="eV7-sw-omz"/>
+ </constraints>
+ <fontDescription key="fontDescription" type="system" pointSize="17"/>
+ <nil key="textColor"/>
+ <nil key="highlightedColor"/>
+ </label>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XBX-Hu-kI5">
+ <rect key="frame" x="115" y="0.0" width="140" height="41.5"/>
+ <fontDescription key="fontDescription" type="system" pointSize="17"/>
+ <nil key="textColor"/>
+ <nil key="highlightedColor"/>
+ </label>
+ </subviews>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <constraints>
+ <constraint firstItem="XBX-Hu-kI5" firstAttribute="leading" secondItem="bOO-oe-d7A" secondAttribute="trailing" id="2Q1-VE-dfh"/>
+ <constraint firstItem="bOO-oe-d7A" firstAttribute="top" secondItem="6w7-So-BEq" secondAttribute="top" id="AjN-EL-DHu"/>
+ <constraint firstItem="XBX-Hu-kI5" firstAttribute="top" secondItem="6w7-So-BEq" secondAttribute="top" id="HKj-6U-J5P"/>
+ <constraint firstAttribute="trailing" secondItem="XBX-Hu-kI5" secondAttribute="trailing" id="LX1-Jr-k24"/>
+ <constraint firstAttribute="bottom" secondItem="bOO-oe-d7A" secondAttribute="bottom" id="Wdc-Lu-wXJ"/>
+ <constraint firstItem="bOO-oe-d7A" firstAttribute="leading" secondItem="6w7-So-BEq" secondAttribute="leading" constant="45" id="mQO-7g-wCn"/>
+ <constraint firstAttribute="bottom" secondItem="XBX-Hu-kI5" secondAttribute="bottom" id="sLS-cN-X8b"/>
+ </constraints>
+ </view>
+ <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oFG-hd-AiT">
+ <rect key="frame" x="0.0" y="42.5" width="255" height="41.5"/>
+ <subviews>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="金é¢ï¼š" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MLq-ta-08m">
+ <rect key="frame" x="45" y="-0.5" width="70" height="41.5"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="70" id="NiW-ti-sKm"/>
+ </constraints>
+ <fontDescription key="fontDescription" type="system" pointSize="17"/>
+ <nil key="textColor"/>
+ <nil key="highlightedColor"/>
+ </label>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ï¿¥0.001" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="H0A-lS-G4G">
+ <rect key="frame" x="115" y="0.0" width="140" height="41.5"/>
+ <fontDescription key="fontDescription" type="system" pointSize="17"/>
+ <color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <nil key="highlightedColor"/>
+ </label>
+ </subviews>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <constraints>
+ <constraint firstItem="H0A-lS-G4G" firstAttribute="leading" secondItem="MLq-ta-08m" secondAttribute="trailing" id="0FN-t7-0D9"/>
+ <constraint firstItem="MLq-ta-08m" firstAttribute="top" secondItem="oFG-hd-AiT" secondAttribute="top" id="IXv-09-rOR"/>
+ <constraint firstAttribute="trailing" secondItem="H0A-lS-G4G" secondAttribute="trailing" id="MNl-2o-Zny"/>
+ <constraint firstItem="MLq-ta-08m" firstAttribute="leading" secondItem="oFG-hd-AiT" secondAttribute="leading" constant="45" id="aMa-ca-95K"/>
+ <constraint firstAttribute="bottom" secondItem="H0A-lS-G4G" secondAttribute="bottom" id="cOS-k0-TXJ"/>
+ <constraint firstAttribute="bottom" secondItem="MLq-ta-08m" secondAttribute="bottom" id="es5-81-OhB"/>
+ <constraint firstItem="H0A-lS-G4G" firstAttribute="top" secondItem="oFG-hd-AiT" secondAttribute="top" id="kph-it-Dph"/>
+ </constraints>
+ </view>
+ </subviews>
+ <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
+ <constraints>
+ <constraint firstAttribute="bottom" secondItem="pkB-KR-wBr" secondAttribute="bottom" id="9JY-88-UIg"/>
+ <constraint firstItem="pkB-KR-wBr" firstAttribute="top" secondItem="60m-IE-dYi" secondAttribute="top" id="9hb-06-Rre"/>
+ <constraint firstItem="pkB-KR-wBr" firstAttribute="leading" secondItem="6w7-So-BEq" secondAttribute="trailing" id="9iG-00-w7h"/>
+ <constraint firstItem="oFG-hd-AiT" firstAttribute="leading" secondItem="60m-IE-dYi" secondAttribute="leading" id="Baz-ad-Z9G"/>
+ <constraint firstAttribute="trailing" secondItem="pkB-KR-wBr" secondAttribute="trailing" id="EAa-GR-QDP"/>
+ <constraint firstAttribute="bottom" secondItem="oFG-hd-AiT" secondAttribute="bottom" id="M8i-8u-5td"/>
+ <constraint firstItem="6w7-So-BEq" firstAttribute="leading" secondItem="60m-IE-dYi" secondAttribute="leading" id="RXM-mY-Up3"/>
+ <constraint firstItem="oFG-hd-AiT" firstAttribute="top" secondItem="6w7-So-BEq" secondAttribute="bottom" constant="1" id="Ryj-0l-YaA"/>
+ <constraint firstItem="pkB-KR-wBr" firstAttribute="leading" secondItem="oFG-hd-AiT" secondAttribute="trailing" id="iqv-Ut-Pc9"/>
+ <constraint firstItem="6w7-So-BEq" firstAttribute="top" secondItem="60m-IE-dYi" secondAttribute="top" id="nf0-8n-TvA"/>
+ <constraint firstItem="oFG-hd-AiT" firstAttribute="height" secondItem="6w7-So-BEq" secondAttribute="height" id="sgH-tR-hDq"/>
+ </constraints>
+ </view>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
+ <constraint firstItem="60m-IE-dYi" firstAttribute="top" secondItem="fte-kF-PCY" secondAttribute="bottom" id="8Or-2D-DIl"/>
+ <constraint firstAttribute="trailing" secondItem="SUp-3O-J8h" secondAttribute="trailing" id="9Mf-nI-Xj5"/>
+ <constraint firstAttribute="bottom" secondItem="60m-IE-dYi" secondAttribute="bottom" id="DGb-f0-AvT"/>
+ <constraint firstItem="SUp-3O-J8h" firstAttribute="top" secondItem="0NC-52-uCb" secondAttribute="bottom" id="F2r-oa-Pqj"/>
<constraint firstAttribute="trailing" secondItem="fte-kF-PCY" secondAttribute="trailing" id="GNL-GK-87X"/>
- <constraint firstItem="fte-kF-PCY" firstAttribute="top" secondItem="0NC-52-uCb" secondAttribute="bottom" id="QIb-Oi-b2i"/>
- <constraint firstItem="Yec-wN-vhX" firstAttribute="top" secondItem="fte-kF-PCY" secondAttribute="bottom" id="Tms-Gt-OBB"/>
+ <constraint firstItem="Yec-wN-vhX" firstAttribute="top" secondItem="fte-kF-PCY" secondAttribute="bottom" constant="84" id="Tms-Gt-OBB"/>
+ <constraint firstItem="SUp-3O-J8h" firstAttribute="leading" secondItem="jeU-3b-5wY" secondAttribute="leading" id="dc4-D3-aMT"/>
+ <constraint firstAttribute="trailing" secondItem="60m-IE-dYi" secondAttribute="trailing" id="nhz-IR-CNY"/>
<constraint firstItem="fte-kF-PCY" firstAttribute="leading" secondItem="jeU-3b-5wY" secondAttribute="leading" id="qRR-QM-gHV"/>
+ <constraint firstItem="60m-IE-dYi" firstAttribute="leading" secondItem="jeU-3b-5wY" secondAttribute="leading" id="rWy-JU-r8A"/>
+ <constraint firstItem="fte-kF-PCY" firstAttribute="top" secondItem="SUp-3O-J8h" secondAttribute="bottom" id="wJI-nx-8O7"/>
</constraints>
</view>
<navigationItem key="navigationItem" title="åŠ æ²¹å•" id="PTc-Wg-bhw">
@@ -900,12 +1063,17 @@
</barButtonItem>
</navigationItem>
<connections>
+ <outlet property="btnCheck" destination="pkB-KR-wBr" id="iuK-wQ-xGq"/>
+ <outlet property="btnSelectAll" destination="bmf-kc-sf9" id="2Uw-gN-QDj"/>
+ <outlet property="constraintTop" destination="Ogv-fa-3jp" id="Pko-jE-pfh"/>
+ <outlet property="labelAmount" destination="H0A-lS-G4G" id="O8P-M3-RT7"/>
+ <outlet property="labelCount" destination="XBX-Hu-kI5" id="PRk-3O-Iug"/>
<outlet property="tableView" destination="fte-kF-PCY" id="Thm-5H-Lu4"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="1XD-Cb-6hj" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
- <point key="canvasLocation" x="486" y="1415"/>
+ <point key="canvasLocation" x="485.60000000000002" y="1414.5427286356824"/>
</scene>
<!--Order List Filter View Controller-->
<scene sceneID="m3N-VX-LqN">
@@ -920,22 +1088,61 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lAH-tC-jlD">
- <rect key="frame" x="0.0" y="20" width="375" height="20"/>
+ <rect key="frame" x="0.0" y="20" width="375" height="320"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ged-0k-OzE">
<rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
<subviews>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="åŠ æ²¹å•å·ï¼š" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5vl-v1-juQ">
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="是å¦å¯¹è´¦ï¼š" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5vl-v1-juQ">
<rect key="frame" x="16" y="15" width="87" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
- <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="0HS-Kl-JSm">
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7aY-Ll-xGX">
+ <rect key="frame" x="111" y="5" width="248" height="40"/>
+ <color key="backgroundColor" red="0.90196079019999997" green="0.90196079019999997" blue="0.90196079019999997" alpha="1" colorSpace="calibratedRGB"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="40" id="xkV-9B-iJ9"/>
+ </constraints>
+ <fontDescription key="fontDescription" type="system" pointSize="17"/>
+ <state key="normal" title="全部">
+ <color key="titleColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+ </state>
+ <userDefinedRuntimeAttributes>
+ <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+ <real key="value" value="5"/>
+ </userDefinedRuntimeAttribute>
+ </userDefinedRuntimeAttributes>
+ <connections>
+ <action selector="actionChooseIsChecked:" destination="DJ0-jV-4Ff" eventType="touchUpInside" id="M6L-jo-hd6"/>
+ </connections>
+ </button>
+ </subviews>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <constraints>
+ <constraint firstItem="7aY-Ll-xGX" firstAttribute="leading" secondItem="5vl-v1-juQ" secondAttribute="trailing" constant="8" id="Fgj-7Y-1hS"/>
+ <constraint firstAttribute="height" constant="50" id="Ru9-ja-JLP"/>
+ <constraint firstItem="7aY-Ll-xGX" firstAttribute="centerY" secondItem="ged-0k-OzE" secondAttribute="centerY" id="sUf-t2-EV4"/>
+ <constraint firstAttribute="trailing" secondItem="7aY-Ll-xGX" secondAttribute="trailing" constant="16" id="uWv-xz-INz"/>
+ <constraint firstItem="5vl-v1-juQ" firstAttribute="leading" secondItem="ged-0k-OzE" secondAttribute="leading" constant="16" id="v60-0w-wNk"/>
+ <constraint firstItem="5vl-v1-juQ" firstAttribute="centerY" secondItem="ged-0k-OzE" secondAttribute="centerY" id="yx7-gN-O9O"/>
+ </constraints>
+ </view>
+ <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kvi-vx-bzY">
+ <rect key="frame" x="0.0" y="50" width="375" height="50"/>
+ <subviews>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="åŠ æ²¹å•å·ï¼š" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zfj-LU-gpy">
+ <rect key="frame" x="16" y="15" width="87" height="21"/>
+ <fontDescription key="fontDescription" type="system" pointSize="17"/>
+ <nil key="textColor"/>
+ <nil key="highlightedColor"/>
+ </label>
+ <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Tyc-ZF-j7b">
<rect key="frame" x="110" y="5" width="249" height="40"/>
- <color key="backgroundColor" red="0.93323183059692383" green="0.9333917498588562" blue="0.93322181701660156" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <color key="backgroundColor" red="0.93333333333333335" green="0.93333333333333335" blue="0.93333333333333335" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
- <constraint firstAttribute="height" constant="40" id="uKa-fO-sUm"/>
+ <constraint firstAttribute="height" constant="40" id="6xk-ea-7BU"/>
</constraints>
<nil key="textColor"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -944,18 +1151,18 @@
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
- <constraint firstItem="0HS-Kl-JSm" firstAttribute="leading" secondItem="ged-0k-OzE" secondAttribute="leading" constant="110" id="PY0-Co-9aM"/>
- <constraint firstAttribute="height" constant="50" id="Ru9-ja-JLP"/>
- <constraint firstItem="0HS-Kl-JSm" firstAttribute="centerY" secondItem="ged-0k-OzE" secondAttribute="centerY" id="YzS-mi-Uwh"/>
- <constraint firstItem="5vl-v1-juQ" firstAttribute="leading" secondItem="ged-0k-OzE" secondAttribute="leading" constant="16" id="v60-0w-wNk"/>
- <constraint firstAttribute="trailing" secondItem="0HS-Kl-JSm" secondAttribute="trailing" constant="16" id="xGI-vW-23f"/>
- <constraint firstItem="5vl-v1-juQ" firstAttribute="centerY" secondItem="ged-0k-OzE" secondAttribute="centerY" id="yx7-gN-O9O"/>
+ <constraint firstAttribute="height" constant="50" id="6Jp-sn-yNg"/>
+ <constraint firstAttribute="trailing" secondItem="Tyc-ZF-j7b" secondAttribute="trailing" constant="16" id="6Ur-z9-qNH"/>
+ <constraint firstItem="Zfj-LU-gpy" firstAttribute="centerY" secondItem="kvi-vx-bzY" secondAttribute="centerY" id="HrN-2e-Z1G"/>
+ <constraint firstItem="Zfj-LU-gpy" firstAttribute="leading" secondItem="kvi-vx-bzY" secondAttribute="leading" constant="16" id="SQD-Hq-Tb5"/>
+ <constraint firstItem="Tyc-ZF-j7b" firstAttribute="leading" secondItem="kvi-vx-bzY" secondAttribute="leading" constant="110" id="YdA-1g-Zww"/>
+ <constraint firstItem="Tyc-ZF-j7b" firstAttribute="centerY" secondItem="kvi-vx-bzY" secondAttribute="centerY" id="fae-v6-poR"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6PD-JU-six">
- <rect key="frame" x="0.0" y="50" width="375" height="50"/>
+ <rect key="frame" x="0.0" y="100" width="375" height="50"/>
<subviews>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="åŠ æ²¹æ—¶é—´ï¼š" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rgO-Mt-cU5">
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="开始时间：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rgO-Mt-cU5">
<rect key="frame" x="16" y="15" width="87" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
@@ -982,8 +1189,38 @@
<constraint firstItem="Wcq-oX-Vzb" firstAttribute="leading" secondItem="6PD-JU-six" secondAttribute="leading" constant="110" id="yq6-9k-pVV"/>
</constraints>
</view>
+ <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="f0V-Ps-aaS">
+ <rect key="frame" x="0.0" y="150" width="375" height="50"/>
+ <subviews>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="结æŸæ—¶é—´ï¼š" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cLn-Yp-sQy">
+ <rect key="frame" x="16" y="15" width="87" height="21"/>
+ <fontDescription key="fontDescription" type="system" pointSize="17"/>
+ <nil key="textColor"/>
+ <nil key="highlightedColor"/>
+ </label>
+ <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="w8b-63-OjZ" customClass="DateTextField">
+ <rect key="frame" x="110" y="5" width="249" height="40"/>
+ <color key="backgroundColor" red="0.93323183060000003" green="0.93339174989999996" blue="0.93322181699999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="40" id="I77-WC-1oM"/>
+ </constraints>
+ <nil key="textColor"/>
+ <fontDescription key="fontDescription" type="system" pointSize="14"/>
+ <textInputTraits key="textInputTraits"/>
+ </textField>
+ </subviews>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <constraints>
+ <constraint firstItem="w8b-63-OjZ" firstAttribute="leading" secondItem="f0V-Ps-aaS" secondAttribute="leading" constant="110" id="Lsr-uD-FNk"/>
+ <constraint firstAttribute="trailing" secondItem="w8b-63-OjZ" secondAttribute="trailing" constant="16" id="b2s-q3-spO"/>
+ <constraint firstItem="cLn-Yp-sQy" firstAttribute="leading" secondItem="f0V-Ps-aaS" secondAttribute="leading" constant="16" id="bra-va-J27"/>
+ <constraint firstAttribute="height" constant="50" id="cvg-L6-TVU"/>
+ <constraint firstItem="cLn-Yp-sQy" firstAttribute="centerY" secondItem="f0V-Ps-aaS" secondAttribute="centerY" id="eJq-Om-mzZ"/>
+ <constraint firstItem="w8b-63-OjZ" firstAttribute="centerY" secondItem="f0V-Ps-aaS" secondAttribute="centerY" id="rES-3g-lgM"/>
+ </constraints>
+ </view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BPU-oD-DwI">
- <rect key="frame" x="0.0" y="100" width="375" height="50"/>
+ <rect key="frame" x="0.0" y="200" width="375" height="50"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="åŠ æ²¹å‘˜ï¼š" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8mT-ZO-pVl">
<rect key="frame" x="16" y="15" width="70" height="21"/>
@@ -1013,7 +1250,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dzD-bu-N4P">
- <rect key="frame" x="0.0" y="150" width="375" height="70"/>
+ <rect key="frame" x="0.0" y="250" width="375" height="70"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="K9Z-iZ-JBi">
<rect key="frame" x="16" y="19" width="163.5" height="32"/>
@@ -1060,22 +1297,30 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="ged-0k-OzE" firstAttribute="top" secondItem="lAH-tC-jlD" secondAttribute="top" id="3gF-k9-Ciw"/>
+ <constraint firstItem="6PD-JU-six" firstAttribute="top" secondItem="kvi-vx-bzY" secondAttribute="bottom" id="4NK-Au-vVX"/>
<constraint firstItem="6PD-JU-six" firstAttribute="leading" secondItem="lAH-tC-jlD" secondAttribute="leading" id="6TY-Gy-5br"/>
+ <constraint firstItem="kvi-vx-bzY" firstAttribute="leading" secondItem="lAH-tC-jlD" secondAttribute="leading" id="9yR-Ua-rzh"/>
<constraint firstAttribute="trailing" secondItem="ged-0k-OzE" secondAttribute="trailing" id="AdS-XF-2sw"/>
- <constraint firstItem="BPU-oD-DwI" firstAttribute="top" secondItem="6PD-JU-six" secondAttribute="bottom" id="FJe-yg-V0j"/>
+ <constraint firstItem="BPU-oD-DwI" firstAttribute="top" secondItem="f0V-Ps-aaS" secondAttribute="bottom" id="BJd-9v-RLl"/>
+ <constraint firstItem="f0V-Ps-aaS" firstAttribute="leading" secondItem="lAH-tC-jlD" secondAttribute="leading" id="I2D-MO-33V"/>
+ <constraint firstItem="6PD-JU-six" firstAttribute="top" secondItem="kvi-vx-bzY" secondAttribute="bottom" id="KzD-6k-eGc"/>
+ <constraint firstAttribute="trailing" secondItem="f0V-Ps-aaS" secondAttribute="trailing" id="R1g-os-gHC"/>
<constraint firstItem="dzD-bu-N4P" firstAttribute="top" secondItem="BPU-oD-DwI" secondAttribute="bottom" id="U68-Pu-anq"/>
<constraint firstAttribute="trailing" secondItem="BPU-oD-DwI" secondAttribute="trailing" id="VHR-nN-4mz"/>
<constraint firstItem="ged-0k-OzE" firstAttribute="leading" secondItem="lAH-tC-jlD" secondAttribute="leading" id="YPF-ms-r5a"/>
+ <constraint firstItem="BPU-oD-DwI" firstAttribute="top" secondItem="f0V-Ps-aaS" secondAttribute="bottom" id="YRB-WU-GoJ"/>
<constraint firstItem="dzD-bu-N4P" firstAttribute="leading" secondItem="lAH-tC-jlD" secondAttribute="leading" id="atm-5P-9NJ"/>
+ <constraint firstAttribute="trailing" secondItem="kvi-vx-bzY" secondAttribute="trailing" id="drA-oo-Uwx"/>
<constraint firstAttribute="trailing" secondItem="6PD-JU-six" secondAttribute="trailing" id="fdZ-0D-tbA"/>
+ <constraint firstItem="kvi-vx-bzY" firstAttribute="top" secondItem="ged-0k-OzE" secondAttribute="bottom" id="nrq-Se-dTu"/>
<constraint firstAttribute="trailing" secondItem="dzD-bu-N4P" secondAttribute="trailing" id="s25-WP-2uI"/>
- <constraint firstAttribute="height" constant="20" id="uYs-JL-rMh"/>
- <constraint firstItem="6PD-JU-six" firstAttribute="top" secondItem="ged-0k-OzE" secondAttribute="bottom" id="umR-Ba-Z9S"/>
+ <constraint firstItem="f0V-Ps-aaS" firstAttribute="top" secondItem="6PD-JU-six" secondAttribute="bottom" id="tTw-13-E9v"/>
+ <constraint firstAttribute="height" constant="320" id="uYs-JL-rMh"/>
<constraint firstItem="BPU-oD-DwI" firstAttribute="leading" secondItem="lAH-tC-jlD" secondAttribute="leading" id="wjM-e8-HRK"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xux-8l-yBw">
- <rect key="frame" x="0.0" y="40" width="375" height="627"/>
+ <rect key="frame" x="0.0" y="340" width="375" height="327"/>
<color key="backgroundColor" white="0.33333333333333331" alpha="0.23191352739726026" colorSpace="calibratedWhite"/>
<gestureRecognizers/>
<connections>
@@ -1098,8 +1343,9 @@
<outlet property="board" destination="lAH-tC-jlD" id="vAl-Dt-Pzc"/>
<outlet property="constraintHeight" destination="uYs-JL-rMh" id="BGm-Bu-h82"/>
<outlet property="shadow" destination="xux-8l-yBw" id="OIe-us-hwX"/>
- <outlet property="textFieldBillNumber" destination="0HS-Kl-JSm" id="phR-w3-QwS"/>
+ <outlet property="textFieldBillNumber" destination="Tyc-ZF-j7b" id="gHO-Dg-N6B"/>
<outlet property="textFieldDate" destination="Wcq-oX-Vzb" id="cid-3S-Omf"/>
+ <outlet property="textFieldEndDate" destination="w8b-63-OjZ" id="FuU-8A-NEG"/>
<outlet property="textFieldStationUser" destination="PuF-Hr-KGB" id="N7h-Xp-Rof"/>
</connections>
</viewController>
@@ -1110,7 +1356,7 @@
</connections>
</tapGestureRecognizer>
</objects>
- <point key="canvasLocation" x="486" y="2118"/>
+ <point key="canvasLocation" x="485.60000000000002" y="2117.9910044977514"/>
</scene>
<!--Bill List View Controller-->
<scene sceneID="cPU-nz-qim">
@@ -2000,23 +2246,6 @@
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
- <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2t0-vQ-Pt1">
- <rect key="frame" x="20" y="417" width="335" height="50"/>
- <constraints>
- <constraint firstAttribute="height" constant="50" id="cCO-mS-dji"/>
- </constraints>
- <fontDescription key="fontDescription" type="system" pointSize="20"/>
- <state key="normal" title="ç«‹å³ç»‘定" backgroundImage="btn_abled"/>
- <state key="disabled" backgroundImage="btn_disabled"/>
- <userDefinedRuntimeAttributes>
- <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
- <real key="value" value="5"/>
- </userDefinedRuntimeAttribute>
- </userDefinedRuntimeAttributes>
- <connections>
- <action selector="actionBottom:" destination="wJQ-XJ-kfS" eventType="touchUpInside" id="ueX-aS-BMr"/>
- </connections>
- </button>
<imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleAspectFill" image="login_bg" translatesAutoresizingMaskIntoConstraints="NO" id="Mtt-an-81f">
<rect key="frame" x="0.0" y="554" width="375" height="113"/>
</imageView>
@@ -2035,7 +2264,7 @@
<color key="textColor" red="0.63179747495554428" green="0.63179747495554428" blue="0.63179747495554428" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1000" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="shc-Fb-T6n">
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="shc-Fb-T6n">
<rect key="frame" x="156" y="0.0" width="203" height="50"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.63179747500000005" green="0.63179747500000005" blue="0.63179747500000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -2066,7 +2295,7 @@
<color key="textColor" red="0.63179747500000005" green="0.63179747500000005" blue="0.63179747500000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1000" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gcf-Tq-L2E">
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gcf-Tq-L2E">
<rect key="frame" x="172" y="0.0" width="187" height="50"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.63179747500000005" green="0.63179747500000005" blue="0.63179747500000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -2181,6 +2410,23 @@
<constraint firstItem="kzF-jP-QSk" firstAttribute="leading" secondItem="ZDM-M0-XVm" secondAttribute="leading" id="xO3-y7-WDt"/>
</constraints>
</view>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2t0-vQ-Pt1">
+ <rect key="frame" x="20" y="417" width="335" height="50"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="50" id="cCO-mS-dji"/>
+ </constraints>
+ <fontDescription key="fontDescription" type="system" pointSize="20"/>
+ <state key="normal" title="ç«‹å³ç»‘定" backgroundImage="btn_abled"/>
+ <state key="disabled" backgroundImage="btn_disabled"/>
+ <userDefinedRuntimeAttributes>
+ <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+ <real key="value" value="5"/>
+ </userDefinedRuntimeAttribute>
+ </userDefinedRuntimeAttributes>
+ <connections>
+ <action selector="actionBottom:" destination="wJQ-XJ-kfS" eventType="touchUpInside" id="ueX-aS-BMr"/>
+ </connections>
+ </button>
</subviews>
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<constraints>
@@ -2512,6 +2758,8 @@
<image name="oil_detail_station" width="24" height="24"/>
<image name="oil_detail_top" width="360" height="57"/>
<image name="orange_card_bg" width="116" height="101"/>
+ <image name="radious_select" width="13" height="14"/>
+ <image name="radious_unselect" width="13" height="13"/>
<image name="right_arrow" width="32" height="32"/>
<image name="scan_icon" width="25" height="23"/>
<image name="state_audit" width="50" height="47"/>
diff --git a/Car/CodeClass/Account/ViewConstrollers/AccountRecordViewController.m b/Car/CodeClass/Account/ViewConstrollers/AccountRecordViewController.m
index 4c1fdee..e8418e6 100644
--- a/Car/CodeClass/Account/ViewConstrollers/AccountRecordViewController.m
+++ b/Car/CodeClass/Account/ViewConstrollers/AccountRecordViewController.m
@@ -24,6 +24,7 @@
- (void)httpRequest {
WS(weakSelf);
[MBProgressHUD j_loading];
+
[kHttp POST:kUserCashRecord parameters:[self.param toDictionary] complete:^(id _Nullable response, NSError * _Nullable error) {
[MBProgressHUD j_hideLoadingView];
if (kRsSuccess(response)) {
@@ -59,7 +60,9 @@
order.direction = @"desc";
_param.orders = (NSArray<QueryOrder> *)@[order];
_param.userId = kUser.fid;
+ _param.pageSize = self.pageSize;
}
+ _param.pageNumber = self.page;
return _param;
}
diff --git a/Car/CodeClass/Account/ViewConstrollers/AccountViewController.m b/Car/CodeClass/Account/ViewConstrollers/AccountViewController.m
index 0f7fe50..24ef289 100644
--- a/Car/CodeClass/Account/ViewConstrollers/AccountViewController.m
+++ b/Car/CodeClass/Account/ViewConstrollers/AccountViewController.m
@@ -122,6 +122,12 @@
} break;
case AccountViewControllerTypeBinding: {
WS(weakSelf);
+ kCanNotBeNil(self.textFieldScore.text, @"请输入æ现工分ï¼");
+
+ if ([self.textFieldScore.text doubleValue] > [self.labelValidScore.text doubleValue]) {
+ [MBProgressHUD j_error:@"å¯ç”¨å·¥åˆ†ä¸è¶³ï¼" complete:nil];
+ break;
+ }
[self alertTitle:@"确认æ交？"
msg:nil
okAction:^(UIAlertAction *_Nullable action) {
@@ -176,9 +182,10 @@
@"unionId":uid};
WS(weakSelf);
[kHttp POST:kModifyUserWxUid parameters:param complete:^(id _Nullable response, NSError * _Nullable error) {
- if (kRsMsg(response)) {
+ if (kRsSuccess(response)) {
[MBProgressHUD j_success:@"绑定æˆåŠŸï¼" complete:^{
kUser.wxOpenId = response[@"data"];
+ weakSelf.type = AccountViewControllerTypeBinding;
[weakSelf isBinding];
}];
}else{
@@ -190,7 +197,6 @@
- (void)httpSubmit {
[MBProgressHUD j_loading];
WS(weakSelf);
- kCanNotBeNil(self.textFieldScore.text, @"请输入è¦å…‘æ¢çš„工分数ï¼");
[kHttp POST:kCashApply
parameters:[self.param toDictionary]
complete:^(id _Nullable response, NSError *_Nullable error) {
@@ -214,7 +220,7 @@
if (kRsSuccess(response)) {
StationUserAcctEntity *acc = [[StationUserAcctEntity alloc] initWithDictionary:response[@"data"] error:nil];
weakSelf.labelTotalScore.text = [NSString stringWithFormat:@"%@", acc.balance];
- weakSelf.labelValidScore.text = [NSString stringWithFormat:@"%@", acc.drawBalance];
+ weakSelf.labelValidScore.text = [NSString stringWithFormat:@"%@", acc.drawBalance ? acc.drawBalance : @"0"];
}
}];
}
diff --git a/Car/CodeClass/Main/Cells/OrderListTableViewCell.h b/Car/CodeClass/Main/Cells/OrderListTableViewCell.h
index 70405a5..3a546c8 100644
--- a/Car/CodeClass/Main/Cells/OrderListTableViewCell.h
+++ b/Car/CodeClass/Main/Cells/OrderListTableViewCell.h
@@ -14,6 +14,7 @@
@property (weak, nonatomic) IBOutlet UILabel *labelOil;
@property (weak, nonatomic) IBOutlet UILabel *labelBillNumber;
@property (weak, nonatomic) IBOutlet UILabel *labelPrice;
+@property (weak, nonatomic) IBOutlet UIButton *btnIsChecked;
-- (void)configCellArray:(NSMutableArray *)array indexPath:(NSIndexPath *)indexPath;
+- (void)configCellArray:(NSMutableArray *)array indexPath:(NSIndexPath *)indexPath isShow:(BOOL)isShow isAll:(BOOL)isAll;
@end
diff --git a/Car/CodeClass/Main/Cells/OrderListTableViewCell.m b/Car/CodeClass/Main/Cells/OrderListTableViewCell.m
index ea1e8f2..bd43f32 100644
--- a/Car/CodeClass/Main/Cells/OrderListTableViewCell.m
+++ b/Car/CodeClass/Main/Cells/OrderListTableViewCell.m
@@ -8,20 +8,42 @@
#import "OrderListTableViewCell.h"
#import "OrderListModel.h"
+
+
+@interface OrderListTableViewCell ()
+@property (strong, nonatomic) OrderListModel *model;
+@end
@implementation OrderListTableViewCell
- (void)awakeFromNib {
[super awakeFromNib];
+ [self.btnIsChecked setBackgroundImage:[UIImage imageNamed:@"radious_select"] forState:UIControlStateDisabled | UIControlStateSelected];
// Initialization code
}
-- (void)configCellArray:(NSMutableArray *)array indexPath:(NSIndexPath *)indexPath {
- OrderListModel *model = array[indexPath.row];
- self.labelTime.text = model.payTime;
- self.labelStation.text = [NSString stringWithFormat:@"%@ - %@",model.stationName, model.stationUserName];
- self.labelOil.text = [NSString stringWithFormat:@"%@ - %@",model.gasItemName, model.oilGunName];
- self.labelBillNumber.text = model.billNumber;
- self.labelPrice.text = [CalculateHelper getMoneyStringFrom:model.realPayTotal];
+- (void)configCellArray:(NSMutableArray *)array indexPath:(NSIndexPath *)indexPath isShow:(BOOL)isShow isAll:(BOOL)isAll{
+ OrderListModel *model = array[indexPath.row];
+ self.model = model;
+ self.labelTime.text = model.payTime;
+ self.labelStation.text = [NSString stringWithFormat:@"%@ - %@", model.stationName, model.stationUserName];
+ self.labelOil.text = [NSString stringWithFormat:@"%@ - %@", model.gasItemName, model.oilGunName];
+ self.labelBillNumber.text = model.billNumber;
+ self.labelPrice.text = [CalculateHelper getMoneyStringFrom:model.realPayTotal];
+
+ self.btnIsChecked.selected = model.isSelected;
+
+ if ([model.checkState isEqualToString:@"checked"]) {
+ self.btnIsChecked.enabled = NO;
+ } else {
+ self.btnIsChecked.enabled = YES;
+ }
+
+ self.btnIsChecked.hidden = !isShow;
+}
+- (IBAction)actionCheck:(UIButton *)sender {
+ sender.selected = !sender.isSelected;
+ self.model.isSelected = sender.isSelected;
+ [[NSNotificationCenter defaultCenter] postNotificationName:kNotiSelectBill object:self.model];
}
- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
diff --git a/Car/CodeClass/Main/Models/OrderListModel.h b/Car/CodeClass/Main/Models/OrderListModel.h
index 6fca667..44a517d 100644
--- a/Car/CodeClass/Main/Models/OrderListModel.h
+++ b/Car/CodeClass/Main/Models/OrderListModel.h
@@ -27,4 +27,6 @@
@property (strong, nonatomic) NSString *printStateString;
+@property (nonatomic, assign) BOOL isSelected;
+
@end
diff --git a/Car/CodeClass/Main/Models/OrderListModel.m b/Car/CodeClass/Main/Models/OrderListModel.m
index 39c314a..7c51671 100644
--- a/Car/CodeClass/Main/Models/OrderListModel.m
+++ b/Car/CodeClass/Main/Models/OrderListModel.m
@@ -11,6 +11,18 @@
@implementation OrderListModel
+- (instancetype)initWithDictionary:(NSDictionary *)dict error:(NSError *__autoreleasing *)err {
+ self = [super initWithDictionary:dict error:err];
+ if (self) {
+ if ([self.checkState isEqualToString:@"checked"]) {
+ self.isSelected = YES;
+ }else{
+ self.isSelected = NO;
+ }
+ }
+ return self;
+}
+
- (NSString *)paymentString {
if (!_paymentString) {
if ([self.payMethod isEqualToString:@"weixin_pub"]) {
diff --git a/Car/CodeClass/Main/ViewControllers/MainViewController.m b/Car/CodeClass/Main/ViewControllers/MainViewController.m
index e8207d8..f0bca96 100644
--- a/Car/CodeClass/Main/ViewControllers/MainViewController.m
+++ b/Car/CodeClass/Main/ViewControllers/MainViewController.m
@@ -15,136 +15,266 @@
@interface MainViewController ()
@property (strong, nonatomic) OrderListFilterViewController *filterVC;
@property (strong, nonatomic) OrderQueryDefintion *param;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *constraintTop;
+@property (weak, nonatomic) IBOutlet UIButton *btnSelectAll;
+@property (weak, nonatomic) IBOutlet UIButton *btnCheck;
+@property (strong, nonatomic) NSMutableArray *arrBillIdToCheck;
+@property (weak, nonatomic) IBOutlet UILabel *labelCount;
+@property (weak, nonatomic) IBOutlet UILabel *labelAmount;
+@property (strong, nonatomic) TradeStatisticsResult *total;
@end
@implementation MainViewController
- (void)viewDidLoad {
- [super viewDidLoad];
- [self httpRequest];
+ [super viewDidLoad];
+ [self httpRequest];
+ self.constraintTop.constant = 0;
+ [self.view layoutIfNeeded];
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(actionNoti:) name:kNotiSelectBill object:nil];
}
- (void)viewWillAppear:(BOOL)animated {
- [super viewWillAppear:animated];
- kGlobal.mainVC = self;
+ [super viewWillAppear:animated];
+ kGlobal.mainVC = self;
}
- (void)httpRequest {
- self.param.pageSize = self.pageSize;
- self.param.pageNumber = self.page;
- NSDictionary *param = [self.param toDictionary];
- [MBProgressHUD j_loading:@"åŠ è½½ä¸â€¦"];
- WS(weakSelf);
- [kHttp POST:kOrderQueryUrl parameters:param complete:^(id _Nullable response, NSError * _Nullable error) {
- [MBProgressHUD j_hideLoadingView];
-
- if (kRsSuccess(response)) {
- for (NSDictionary *dict in response[@"data"][@"records"]) {
- OrderListModel *model = [[OrderListModel alloc] initWithDictionary:dict error:nil];
- [weakSelf.arrData addObject:model];
- }
- [weakSelf listTableViewReloadData];
-
- }else{
- kShowRsMsg(response);
- [weakSelf.tableView j_endRefresh];
- if (self.page > 0) {
- self.page--;
- }
- }
-
- }];
+ self.param.pageSize = self.pageSize;
+ self.param.pageNumber = self.page;
+ NSDictionary *param = [self.param toDictionary];
+ [MBProgressHUD j_loading:@"åŠ è½½ä¸â€¦"];
+ WS(weakSelf);
+ [kHttp POST:kOrderQueryUrl
+ parameters:param
+ complete:^(id _Nullable response, NSError *_Nullable error) {
+ [MBProgressHUD j_hideLoadingView];
+
+ if (kRsSuccess(response)) {
+ weakSelf.total = [[TradeStatisticsResult alloc] initWithDictionary:response[@"data"][@"total"] error:nil];
+ for (NSDictionary *dict in response[@"data"][@"records"]) {
+ OrderListModel *model = [[OrderListModel alloc] initWithDictionary:dict error:nil];
+ if (weakSelf.btnSelectAll.isSelected) {
+ model.isSelected = YES;
+ }
+ [weakSelf.arrData addObject:model];
+ }
+ [weakSelf listTableViewReloadData];
+
+ } else {
+ kShowRsMsg(response);
+ [weakSelf.tableView j_endRefresh];
+ if (self.page > 0) {
+ self.page--;
+ }
+ }
+
+ }];
}
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
- return 166;
+ return 166;
}
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
- return self.arrData.count;
+ return self.arrData.count;
}
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
- OrderListTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"OrderListTableViewCell" forIndexPath:indexPath];
- [cell configCellArray:self.arrData indexPath:indexPath];
- return cell;
+ OrderListTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"OrderListTableViewCell" forIndexPath:indexPath];
+ [cell configCellArray:self.arrData indexPath:indexPath isShow:self.btnCheck.isSelected isAll:self.btnSelectAll.selected];
+ return cell;
}
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
- [super tableView:tableView didSelectRowAtIndexPath:indexPath];
- kDebugIndex(indexPath);
+
+
+ [super tableView:tableView didSelectRowAtIndexPath:indexPath];
+
+ kDebugIndex(indexPath);
}
- (void)listDidSelect:(id)model {
- OrderDetailViewController *detailVC = [OrderDetailViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_MAIN];
- detailVC.model = model;
- [self.navigationController pushViewController:detailVC animated:YES];
+ if (self.btnCheck.isSelected) {
+ return;
+ }
+ OrderDetailViewController *detailVC = [OrderDetailViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_MAIN];
+ detailVC.model = model;
+ [self.navigationController pushViewController:detailVC animated:YES];
}
#pragma mark - actions
- (IBAction)actionLeft:(UIBarButtonItem *)sender {
- if (kGlobal.sideSlipVC.isShowLeft) {
- [kGlobal.sideSlipVC showMainView];
- }else{
- [kGlobal.sideSlipVC showLeftView];
- }
+ if (kGlobal.sideSlipVC.isShowLeft) {
+ [kGlobal.sideSlipVC showMainView];
+ } else {
+ [kGlobal.sideSlipVC showLeftView];
+ }
}
- (IBAction)actionRight:(id)sender {
- if (self.filterVC.isOpen) {
- [self.filterVC hideFilterView];
- }else{
- self.filterVC.view.frame = self.view.bounds;
- [self.view addSubview:self.filterVC.view];
- [self.filterVC showFilterView];
- }
+ if (self.filterVC.isOpen) {
+ [self.filterVC hideFilterView];
+ } else {
+ self.filterVC.view.frame = self.view.bounds;
+ [self.view addSubview:self.filterVC.view];
+ [self.filterVC showFilterView];
+ }
+}
+- (IBAction)actionCheck:(UIButton *)sender {
+
+ if (!sender.isSelected) {
+ sender.selected = YES;
+ [self.tableView reloadData];
+ self.constraintTop.constant = 44;
+ [UIView animateWithDuration:0.3
+ animations:^{
+ [self.view layoutIfNeeded];
+ }];
+ }else{
+ if (self.arrBillIdToCheck.count == 0) {
+ [MBProgressHUD j_error:@"请选择对账的å•æ®ï¼" complete:nil];
+ return;
+ }
+
+ [self httpCheckBill];
+
+ }
+
+}
+
+
+/**
+ 全选æ“作
+
+ @param isAll 是å¦å…¨é€‰
+ */
+- (void)configSelectData:(BOOL)isAll {
+ for (OrderListModel *model in self.arrData) {
+ if (![model.checkState isEqualToString:@"checked"]) {
+ model.isSelected = isAll;
+ }
+ }
+ [self.tableView reloadData];
+}
+
+- (void)setTotal:(TradeStatisticsResult *)total {
+ _total = total;
+ self.labelCount.text = [NSString stringWithFormat:@"%lld",total.orderCount];
+ self.labelAmount.text = [NSString stringWithFormat:@"ï¿¥ %.2f", total.totalAmount ? total.totalAmount : 0];
+}
+
+
+- (IBAction)actionSelectAll:(UIButton *)sender {
+ sender.selected = !sender.isSelected;
+ [self configSelectData:sender.isSelected];
+}
+
+- (IBAction)actionCancelCheck:(id)sender {
+ self.constraintTop.constant = 0;
+ [UIView animateWithDuration:0.3
+ animations:^{
+ [self.view layoutIfNeeded];
+ }];
+ self.btnCheck.selected = NO;
+ [self.tableView reloadData];
+}
+
+- (void)actionNoti:(NSNotification *)noti {
+
+ NSLog(@"%@",noti);
+ OrderListModel *model = noti.object;
+ if (model.isSelected) {
+ [self.arrBillIdToCheck addObject:model.fid];
+ }else{
+ [self.arrBillIdToCheck removeObject:model.fid];
+ }
+
+ self.btnSelectAll.selected = [self configIsAll];
+}
+
+- (BOOL)configIsAll {
+ for (OrderListModel *model in self.arrData) {
+ if (![model.checkState isEqualToString:@"checked"]) {
+ if (!model.isSelected) {
+ return NO;
+ }
+ }
+ }
+ return YES;
}
- (void)showShadow {
- self.shadow.hidden = NO;
+ self.shadow.hidden = NO;
}
- (void)hideShadow {
- self.shadow.hidden = YES;
+ self.shadow.hidden = YES;
}
-#pragma mark - lazy
-- (OrderListFilterViewController *)filterVC {
- if (!_filterVC) {
- _filterVC = [OrderListFilterViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_MAIN];
- _filterVC.param = self.param;
+- (void)httpCheckBill {
+ CheckOrderRequest *request = [[CheckOrderRequest alloc] init];
+ request.userId = kUser.fid;
+ request.orderIds = self.arrBillIdToCheck;
WS(weakSelf);
- [_filterVC setBlockSubmit:^{
- [weakSelf.tableView.mj_header beginRefreshing];
+ [kHttp POST:kUrlCheck parameters:request.toDictionary complete:^(id _Nullable response, NSError * _Nullable error) {
+ if (kRsSuccess(response)) {
+ [MBProgressHUD j_success:@"对账æˆåŠŸï¼" complete:nil];
+ [weakSelf actionCancelCheck:nil];
+ [weakSelf.arrBillIdToCheck removeAllObjects];
+ } else {
+ kShowRsMsg(response);
+ }
}];
- [self addChildViewController:_filterVC];
- }
- return _filterVC;
+}
+
+#pragma mark - lazy
+- (OrderListFilterViewController *)filterVC {
+ if (!_filterVC) {
+ _filterVC = [OrderListFilterViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_MAIN];
+ _filterVC.param = self.param;
+ WS(weakSelf);
+ [_filterVC setBlockSubmit:^{
+ [weakSelf.tableView.mj_header beginRefreshing];
+ }];
+ [self addChildViewController:_filterVC];
+ }
+ return _filterVC;
}
- (OrderQueryDefintion *)param {
- if (!_param) {
- _param = [[OrderQueryDefintion alloc] init];
- QueryOrder *order = [[QueryOrder alloc] init];
- order.field = @"payTime";
- order.direction = @"desc";
- _param.orders = (NSArray<QueryOrder> *)@[order];
- _param.userId = kUser.fid;
- _param.state = @"paid";
- }
- return _param;
+ if (!_param) {
+ _param = [[OrderQueryDefintion alloc] init];
+ QueryOrder *order = [[QueryOrder alloc] init];
+ order.field = @"payTime";
+ order.direction = @"desc";
+ _param.orders = (NSArray<QueryOrder> *) @[ order ];
+ _param.userId = kUser.fid;
+ _param.state = @"paid, invalid";
+ _param.beginDate = [[[NSDate date] yearMonthDayString] stringByAppendingString:@" 00:00:00"];
+ _param.endDate = [[[NSDate date] yearMonthDayString] stringByAppendingString:@" 23:59:59"];
+ }
+ return _param;
+}
+
+- (NSMutableArray *)arrBillIdToCheck {
+ if (!_arrBillIdToCheck) {
+ _arrBillIdToCheck = [NSMutableArray array];
+ }
+
+ return _arrBillIdToCheck;
}
- (UIView *)shadow {
- if (!_shadow) {
- _shadow = [[UIView alloc] initWithFrame:self.view.bounds];
- _shadow.backgroundColor = [UIColor colorWithWhite:0.3 alpha:0.3];
- [self.view addSubview:_shadow];
- _shadow.hidden = YES;
- _shadow.tag = 11112222;
- }
- return _shadow;
+ if (!_shadow) {
+ _shadow = [[UIView alloc] initWithFrame:self.view.bounds];
+ _shadow.backgroundColor = [UIColor colorWithWhite:0.3 alpha:0.3];
+ [self.view addSubview:_shadow];
+ _shadow.hidden = YES;
+ _shadow.tag = 11112222;
+ }
+ return _shadow;
}
- (void)didReceiveMemoryWarning {
diff --git a/Car/CodeClass/Main/ViewControllers/OrderListFilterViewController.m b/Car/CodeClass/Main/ViewControllers/OrderListFilterViewController.m
index c3ba03d..97d911d 100644
--- a/Car/CodeClass/Main/ViewControllers/OrderListFilterViewController.m
+++ b/Car/CodeClass/Main/ViewControllers/OrderListFilterViewController.m
@@ -9,7 +9,7 @@
#import "OrderListFilterViewController.h"
@interface OrderListFilterViewController ()
-@property(weak, nonatomic) IBOutlet NSLayoutConstraint *constraintHeight;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *constraintHeight;
/**
阴影
@@ -27,36 +27,37 @@
@property (weak, nonatomic) IBOutlet UITextField *textFieldBillNumber;
/**
- 日期
+ 日期开始时间
*/
@property (weak, nonatomic) IBOutlet DateTextField *textFieldDate;
+@property (weak, nonatomic) IBOutlet DateTextField *textFieldEndDate;
/**
åŠ æ²¹å‘˜
*/
@property (weak, nonatomic) IBOutlet UITextField *textFieldStationUser;
-
@end
@implementation OrderListFilterViewController
- (void)viewDidLoad {
- [super viewDidLoad];
- self.view.backgroundColor = [UIColor clearColor];
- // Do any additional setup after loading the view.
- self.textFieldDate.type = DateTextFieldYearMonthDay;
+ [super viewDidLoad];
+ self.view.backgroundColor = [UIColor clearColor];
+ // Do any additional setup after loading the view.
+ self.textFieldDate.type = DateTextFieldYearMonthDay;
+ self.textFieldEndDate.type = DateTextFieldYearMonthDay;
}
- (IBAction)actionBac:(id)sender {
- [self hideFilterView];
+ [self hideFilterView];
}
- (void)configParam {
- self.param.billNumberLike = self.textFieldBillNumber.text;
- self.param.userNameLike = self.textFieldStationUser.text;
- self.param.endDate = kIf(self.textFieldDate.text.length > 0, [self.textFieldDate.text stringByAppendingString:@" 23:59:59"], nil);
-
+ self.param.billNumberLike = self.textFieldBillNumber.text;
+ self.param.userNameLike = self.textFieldStationUser.text;
+ self.param.beginDate = kIf(self.textFieldDate.text.length > 0, [self.textFieldDate.text stringByAppendingString:@" 00:00:00"], nil);
+ self.param.endDate = kIf(self.textFieldEndDate.text.length > 0, [self.textFieldEndDate.text stringByAppendingString:@" 23:59:59"], nil);
}
#pragma mark - actions
@@ -65,61 +66,95 @@
é‡ç½®
*/
- (IBAction)actionReset:(id)sender {
- self.param.billNumberLike = nil;
- self.param.userNameLike = nil;
- self.param.endDate = nil;
- self.textFieldDate.text = nil;
- self.textFieldStationUser.text = nil;
- self.textFieldBillNumber.text = nil;
+ self.param.billNumberLike = nil;
+ self.param.userNameLike = nil;
+ self.param.endDate = nil;
+ self.textFieldDate.text = nil;
+ self.textFieldStationUser.text = nil;
+ self.textFieldBillNumber.text = nil;
}
/**
æ交
*/
- (IBAction)actionSubmit:(id)sender {
- [self configParam];
- [self hideFilterView];
- if (self.blockSubmit) {
- self.blockSubmit();
- }
+ [self configParam];
+ [self hideFilterView];
+ if (self.blockSubmit) {
+ self.blockSubmit();
+ }
+}
+
+- (IBAction)actionChooseIsChecked:(UIButton *)sender {
+ UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"请选择" message:nil preferredStyle:UIAlertControllerStyleAlert];
+ WS(weakSelf);
+ UIAlertAction *actionAll = [UIAlertAction actionWithTitle:@"全部"
+ style:(UIAlertActionStyleDefault)
+ handler:^(UIAlertAction *_Nonnull action) {
+ [sender setTitle:@"全部" forState:UIControlStateNormal];
+ weakSelf.param.checkState = nil;
+ }];
+ [alert addAction:actionAll];
+
+ UIAlertAction *actionChecked = [UIAlertAction actionWithTitle:@"已对账"
+ style:(UIAlertActionStyleDefault)
+ handler:^(UIAlertAction *_Nonnull action) {
+ [sender setTitle:@"已对账" forState:UIControlStateNormal];
+ weakSelf.param.checkState = @"checked";
+ }];
+
+ [alert addAction:actionChecked];
+
+ UIAlertAction *actionUnchecked = [UIAlertAction actionWithTitle:@"未对账"
+ style:(UIAlertActionStyleDefault)
+ handler:^(UIAlertAction *_Nonnull action) {
+ [sender setTitle:@"未对账" forState:UIControlStateNormal];
+ weakSelf.param.checkState = @"unchecked";
+ }];
+ [alert addAction:actionUnchecked];
+
+ UIAlertAction *actionCancel = [UIAlertAction actionWithTitle:@"å–消" style:UIAlertActionStyleDestructive handler:nil];
+ [alert addAction:actionCancel];
+
+ [self presentViewController:alert animated:YES completion:nil];
}
- (void)hideFilterView {
- HIDE_KEYBOARD;
- self.isOpen = NO;
- self.constraintHeight.constant = 0;
- [UIView animateWithDuration:0.7
- delay:0
- usingSpringWithDamping:0.9
+ HIDE_KEYBOARD;
+ self.isOpen = NO;
+ self.constraintHeight.constant = 0;
+ [UIView animateWithDuration:0.7
+ delay:0
+ usingSpringWithDamping:0.9
initialSpringVelocity:1.0
- options:UIViewAnimationOptionCurveLinear
- animations:^{
- self.shadow.backgroundColor = [UIColor clearColor];
- [self.view layoutIfNeeded];
- }
- completion:^(BOOL finished) {
- [self.view removeFromSuperview];
- }];
+ options:UIViewAnimationOptionCurveLinear
+ animations:^{
+ self.shadow.backgroundColor = [UIColor clearColor];
+ [self.view layoutIfNeeded];
+ }
+ completion:^(BOOL finished) {
+ [self.view removeFromSuperview];
+ }];
}
- (void)showFilterView {
- self.isOpen = YES;
- self.constraintHeight.constant = 220;
- [UIView animateWithDuration:0.7
- delay:0
- usingSpringWithDamping:0.9
- initialSpringVelocity:1.0
- options:UIViewAnimationOptionCurveLinear
- animations:^{
- self.shadow.backgroundColor = [UIColor colorWithWhite:0.3 alpha:0.3];
- [self.view layoutIfNeeded];
- }
- completion:nil];
+ self.isOpen = YES;
+ self.constraintHeight.constant = 320;
+ [UIView animateWithDuration:0.7
+ delay:0
+ usingSpringWithDamping:0.9
+ initialSpringVelocity:1.0
+ options:UIViewAnimationOptionCurveLinear
+ animations:^{
+ self.shadow.backgroundColor = [UIColor colorWithWhite:0.3 alpha:0.3];
+ [self.view layoutIfNeeded];
+ }
+ completion:nil];
}
- (void)didReceiveMemoryWarning {
- [super didReceiveMemoryWarning];
- // Dispose of any resources that can be recreated.
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
}
/*
diff --git a/Car/Info.plist b/Car/Info.plist
index 6de91bf..9222710 100644
--- a/Car/Info.plist
+++ b/Car/Info.plist
@@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.0.0</string>
+ <string>1.0.3</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
@@ -30,7 +30,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>1.0.0</string>
+ <string>1.0.3</string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>wechat</string>
diff --git a/Car/PrefixHeader.pch b/Car/PrefixHeader.pch
index 7429c12..5e29bd1 100644
--- a/Car/PrefixHeader.pch
+++ b/Car/PrefixHeader.pch
@@ -17,7 +17,7 @@
//主题色
#define kMainColor kMainOrangeColor
-
+static NSString *const kNotiSelectBill = @"kNotiSelectBill";
#ifdef DEBUG
#define CLog(format, ...) \
diff --git a/Car/URL.h b/Car/URL.h
index 615eeb7..00a0c2d 100644
--- a/Car/URL.h
+++ b/Car/URL.h
@@ -11,7 +11,7 @@
#ifdef test
static NSString *const VersionName = @"车æ—通测试版";
-static NSString *const BASE_IP = @"http://test.gomoretech.com";
+static NSString *const BASE_IP = @"http://cartest.gomoretech.com";
#else
static NSString *const VersionName = @"车æ—通æ£å¼ç‰ˆ";
static NSString *const BASE_IP = @"http://whcar.gomoretech.com";
@@ -42,5 +42,6 @@ static NSString *const kUserCashRecord = @"cash/query";
static NSString *const kCashApply = @"cash/apply";
//绑定用户微信unionId
static NSString *const kModifyUserWxUid = @"stationUser/save/openId";
+static NSString *const kUrlCheck = @"order/check";
#endif /* URL_h */
diff --git a/Car/car_objc_json_client.h b/Car/car_objc_json_client.h
index 2f98f02..82b4414 100755
--- a/Car/car_objc_json_client.h
+++ b/Car/car_objc_json_client.h
@@ -27,11 +27,13 @@ extern NSString * const QUERYORDERDIRECTION_DESC;
@class RsQueryResult;
@class LoginRequest;
@class ModifyPasswordRequest;
+@class CheckOrderRequest;
@class ResetPasswordRequest;
@class CheckTicketRequest;
@class StationUserAcctHisEntity;
@class DelegateCardBalanceEntity;
@class CommentEntity;
+@class CouponStockEntity;
@class GasItemEntity;
@class MemberEntity;
@class RechargeBillEntity;
@@ -58,21 +60,23 @@ extern NSString * const QUERYORDERDIRECTION_DESC;
@class OtherTicketEntity;
@class InvoiceEntity;
@class DelegateCardEntity;
+@class CouponEntity;
@class DrawCashBillEntity;
@class TOAppversionEntity;
@class StationUserAcctEntity;
+@class TradeStatisticsResult;
@class LoginResult;
@class RsResponse;
@class ExceptionCode;
@class AlipayGzuserinfo;
@class OrderQueryResult;
-@class WithdrawQueryResult;
@class JeecgDemo;
-@class TSDepart;
@class TSBaseUser;
+@class TSDepart;
+@class WithdrawQueryResult;
@class TSUserOrg;
-@class OrderQueryDefintion;
@class WxMassBillEntity;
+@class OrderQueryDefintion;
@class WithdrawQueryDefintion;
@class AccountHistoryQueryResult;
@class AccountHistoryQueryDefintion;
@@ -86,11 +90,13 @@ extern NSString * const QUERYORDERDIRECTION_DESC;
@protocol RsQueryResult @end
@protocol LoginRequest @end
@protocol ModifyPasswordRequest @end
+@protocol CheckOrderRequest @end
@protocol ResetPasswordRequest @end
@protocol CheckTicketRequest @end
@protocol StationUserAcctHisEntity @end
@protocol DelegateCardBalanceEntity @end
@protocol CommentEntity @end
+@protocol CouponStockEntity @end
@protocol GasItemEntity @end
@protocol MemberEntity @end
@protocol RechargeBillEntity @end
@@ -117,21 +123,23 @@ extern NSString * const QUERYORDERDIRECTION_DESC;
@protocol OtherTicketEntity @end
@protocol InvoiceEntity @end
@protocol DelegateCardEntity @end
+@protocol CouponEntity @end
@protocol DrawCashBillEntity @end
@protocol TOAppversionEntity @end
@protocol StationUserAcctEntity @end
+@protocol TradeStatisticsResult @end
@protocol LoginResult @end
@protocol RsResponse @end
@protocol ExceptionCode @end
@protocol AlipayGzuserinfo @end
@protocol OrderQueryResult @end
-@protocol WithdrawQueryResult @end
@protocol JeecgDemo @end
-@protocol TSDepart @end
@protocol TSBaseUser @end
+@protocol TSDepart @end
+@protocol WithdrawQueryResult @end
@protocol TSUserOrg @end
-@protocol OrderQueryDefintion @end
@protocol WxMassBillEntity @end
+@protocol OrderQueryDefintion @end
@protocol WithdrawQueryDefintion @end
@protocol AccountHistoryQueryResult @end
@protocol AccountHistoryQueryDefintion @end
@@ -344,6 +352,30 @@ extern NSString * const QUERYORDERDIRECTION_DESC;
+/**
+ * åŠ æ²¹å‘˜å¯¹è´¦è¯·æ±‚ã€‚
+
+ @author liyang
+ @since 0.1
+
+ */
+@interface CheckOrderRequest : JSONModel
+/**
+ * (no documentation provided)
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *userId;
+/**
+ * (no documentation provided)
+ * @see NSString
+ *
+ */
+@property (nonatomic, strong) NSArray<NSString *> *orderIds;
+@end /* interface CheckOrderRequest */
+
+
+
/**
* é‡ç½®å¯†ç 请求。
@@ -627,7 +659,7 @@ extern NSString * const QUERYORDERDIRECTION_DESC;
*/
@property (nonatomic, strong) NSNumber *balanceAmount;
/**
- * 代管å¡ï¿½ï¿½å·
+ * 代管å¡å¡å·
*
*
*/
@@ -794,6 +826,141 @@ extern NSString * const QUERYORDERDIRECTION_DESC;
+/**
+ *
+ @Title: Entity
+ @Description: 券库å˜
+ @author onlineGenerator
+ @date 2017-03-01 11:17:30
+ @version V1.0
+
+
+ */
+@interface CouponStockEntity : JSONModel
+/**
+ * 主键
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *fid;
+/**
+ * 创建人å称
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *createName;
+/**
+ * 创建人登录å称
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *createBy;
+/**
+ * 创建日期
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *createDate;
+/**
+ * 更新人å称
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *updateName;
+/**
+ * 更新人登录å称
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *updateBy;
+/**
+ * 更新日期
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *updateDate;
+/**
+ * 所属部门
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *sysOrgCode;
+/**
+ * 所属公å¸
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *sysCompanyCode;
+/**
+ * 券å·
+ *
+ *
+ */
+@property (nonatomic, assign) NSInteger couponNumber;
+/**
+ * å称
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *name;
+/**
+ * 类型
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *type;
+/**
+ * é¢é¢
+ *
+ *
+ */
+@property (nonatomic, strong) NSNumber *total;
+/**
+ * 抵扣金é¢
+ *
+ *
+ */
+@property (nonatomic, strong) NSNumber *realToal;
+/**
+ * 状æ€
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *state;
+/**
+ * 所属会员id
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *memberId;
+/**
+ * 所属会员å称
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *memberName;
+/**
+ * å…³è”订å•
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *orderNumber;
+/**
+ * 有效期始
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *validBeginDate;
+/**
+ * 有效期æ¢
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *validEndDate;
+@end /* interface CouponStockEntity */
+
+
+
/**
* @Title: Entity
@Description: æ²¹å“
@@ -1015,8 +1182,7 @@ extern NSString * const QUERYORDERDIRECTION_DESC;
/**
- *
- @Title: Entity
+ * @Title: Entity
@Description: 代管å¡å……值å•
@author onlineGenerator
@date 2017-01-06 10:17:23
@@ -1298,7 +1464,7 @@ extern NSString * const QUERYORDERDIRECTION_DESC;
*/
@property (nonatomic, copy) NSString *payTime;
/**
- * 方法: å–得支付方å¼
+ * 方法: å–得支付方���
*
*
*/
@@ -1387,6 +1553,12 @@ extern NSString * const QUERYORDERDIRECTION_DESC;
*
*/
@property (nonatomic, copy) NSString *alipaybuyerLogonId;
+/**
+ * 对账状æ€
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *checkState;
@end /* interface OrderEntity */
@@ -2662,13 +2834,13 @@ extern NSString * const QUERYORDERDIRECTION_DESC;
*
*
*/
-@property (nonatomic, strong) NSString *attributes;
+@property (nonatomic, copy) NSString *msg;
/**
* (no documentation provided)
*
*
*/
-@property (nonatomic, strong) NSObject *obj;
+@property (nonatomic, strong) NSString *attributes;
/**
* (no documentation provided)
*
@@ -2680,7 +2852,7 @@ extern NSString * const QUERYORDERDIRECTION_DESC;
*
*
*/
-@property (nonatomic, copy) NSString *msg;
+@property (nonatomic, strong) NSObject *obj;
@end /* interface AjaxJson */
@@ -3352,8 +3524,7 @@ extern NSString * const QUERYORDERDIRECTION_DESC;
/**
- *
- @Title: Entity
+ * @Title: Entity
@Description: 代管å¡
@author onlineGenerator
@date 2017-01-05 14:29:16
@@ -3450,6 +3621,116 @@ extern NSString * const QUERYORDERDIRECTION_DESC;
+/**
+ * @Title: Entity
+ @Description: ä¼˜æƒ åˆ¸
+ @author onlineGenerator
+ @date 2017-03-01 10:09:59
+ @version V1.0
+
+
+ */
+@interface CouponEntity : JSONModel
+/**
+ * 主键
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *fid;
+/**
+ * 创建人å称
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *createName;
+/**
+ * 创建人登录å称
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *createBy;
+/**
+ * 创建日期
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *createDate;
+/**
+ * 更新人å称
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *updateName;
+/**
+ * 更新人登录å称
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *updateBy;
+/**
+ * 更新日期
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *updateDate;
+/**
+ * 所属部门
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *sysOrgCode;
+/**
+ * 所属公å¸
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *sysCompanyCode;
+/**
+ * å称
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *name;
+/**
+ * 类型
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *type;
+/**
+ * é¢é¢
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *total;
+/**
+ * 抵扣金é¢
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *realTotal;
+/**
+ * 状æ€
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *state;
+/**
+ * 概率
+ *
+ *
+ */
+@property (nonatomic, strong) NSNumber *probability;
+/**
+ * 概率
+ *
+ *
+ */
+@property (nonatomic, assign) NSInteger validateDays;
+@end /* interface CouponEntity */
+
+
+
/**
* @Title: Entity
@Description: æ现申请å•
@@ -3738,6 +4019,30 @@ extern NSString * const QUERYORDERDIRECTION_DESC;
+/**
+ * 交易信æ¯æ±‡æ€»ã€‚
+
+ @author liyang
+ @since 0.1
+
+ */
+@interface TradeStatisticsResult : JSONModel
+/**
+ *
+ *
+ *
+ */
+@property (nonatomic, assign) long long orderCount;
+/**
+ * (no documentation provided)
+ *
+ *
+ */
+@property (nonatomic, assign) double totalAmount;
+@end /* interface TradeStatisticsResult */
+
+
+
/**
* 登录结果。
@@ -3973,25 +4278,13 @@ extern NSString * const QUERYORDERDIRECTION_DESC;
*
*/
@property (nonatomic, strong) NSArray<OrderEntity> *records;
-@end /* interface OrderQueryResult */
-
-
-
-/**
- * 订å•æŸ¥è¯¢ç»“果。
-
- @author liyang
- @since 0.1
-
- */
-@interface WithdrawQueryResult : RsQueryResult
/**
- * 查询结果集åˆ
- * @see DrawCashBillEntity
+ *
+ *
*
*/
-@property (nonatomic, strong) NSArray<DrawCashBillEntity> *records;
-@end /* interface WithdrawQueryResult */
+@property (nonatomic, strong) TradeStatisticsResult *total;
+@end /* interface OrderQueryResult */
@@ -4078,156 +4371,174 @@ extern NSString * const QUERYORDERDIRECTION_DESC;
/**
- * 部门机构表
+ * 系统用户父类表
@author å¼ ä»£æµ©
*/
-@interface TSDepart : IdEntity
+@interface TSBaseUser : IdEntity
/**
- * (no documentation provided)
+ *
*
*
*/
-@property (nonatomic, strong) TSDepart *TSPDepart;
+@property (nonatomic, copy) NSString *userType;
/**
* (no documentation provided)
*
*
*/
-@property (nonatomic, copy) NSString *departname;
+@property (nonatomic, copy) NSString *departid;
/**
* (no documentation provided)
*
*
*/
-@property (nonatomic, copy) NSString *fdescription;
+@property (nonatomic, strong) NSData *signature;
/**
* (no documentation provided)
- * @see TSDepart
+ *
*
*/
-@property (nonatomic, strong) NSArray<TSDepart> *TSDeparts;
+@property (nonatomic, copy) NSString *browser;
/**
* (no documentation provided)
*
*
*/
-@property (nonatomic, copy) NSString *orgCode;
+@property (nonatomic, copy) NSString *userKey;
/**
* (no documentation provided)
*
*
*/
-@property (nonatomic, copy) NSString *orgType;
+@property (nonatomic, assign) short status;
/**
* (no documentation provided)
*
*
*/
-@property (nonatomic, copy) NSString *mobile;
+@property (nonatomic, assign) short activitiSync;
/**
* (no documentation provided)
*
*
*/
-@property (nonatomic, copy) NSString *fax;
+@property (nonatomic, copy) NSString *password;
/**
* (no documentation provided)
*
*
*/
-@property (nonatomic, copy) NSString *address;
-@end /* interface TSDepart */
-
-
-
-/**
- * 系统用户父类表
-
- @author å¼ ä»£æµ©
-
- */
-@interface TSBaseUser : IdEntity
+@property (nonatomic, copy) NSString *userName;
/**
- *
+ * (no documentation provided)
*
*
*/
-@property (nonatomic, copy) NSString *userType;
+@property (nonatomic, copy) NSString *realName;
/**
* (no documentation provided)
*
*
*/
-@property (nonatomic, copy) NSString *departid;
+@property (nonatomic, strong) TSDepart *currentDepart;
/**
* (no documentation provided)
- *
+ * @see TSUserOrg
*
*/
-@property (nonatomic, strong) NSData *signature;
+@property (nonatomic, strong) NSArray<TSUserOrg> *userOrgList;
/**
* (no documentation provided)
*
*
*/
-@property (nonatomic, copy) NSString *browser;
+@property (nonatomic, assign) short deleteFlag;
+@end /* interface TSBaseUser */
+
+
+
+/**
+ * 部门机构表
+
+ @author å¼ ä»£æµ©
+
+ */
+@interface TSDepart : IdEntity
/**
* (no documentation provided)
*
*
*/
-@property (nonatomic, copy) NSString *userKey;
+@property (nonatomic, strong) TSDepart *TSPDepart;
/**
* (no documentation provided)
*
*
*/
-@property (nonatomic, assign) short status;
+@property (nonatomic, copy) NSString *departname;
/**
* (no documentation provided)
*
*
*/
-@property (nonatomic, assign) short activitiSync;
+@property (nonatomic, copy) NSString *fdescription;
/**
* (no documentation provided)
- *
+ * @see TSDepart
*
*/
-@property (nonatomic, copy) NSString *password;
+@property (nonatomic, strong) NSArray<TSDepart> *TSDeparts;
/**
* (no documentation provided)
*
*
*/
-@property (nonatomic, copy) NSString *userName;
+@property (nonatomic, copy) NSString *orgCode;
/**
* (no documentation provided)
*
*
*/
-@property (nonatomic, copy) NSString *realName;
+@property (nonatomic, copy) NSString *orgType;
/**
* (no documentation provided)
*
*
*/
-@property (nonatomic, strong) TSDepart *currentDepart;
+@property (nonatomic, copy) NSString *mobile;
/**
* (no documentation provided)
- * @see TSUserOrg
+ *
*
*/
-@property (nonatomic, strong) NSArray<TSUserOrg> *userOrgList;
+@property (nonatomic, copy) NSString *fax;
/**
* (no documentation provided)
*
*
*/
-@property (nonatomic, assign) short deleteFlag;
-@end /* interface TSBaseUser */
+@property (nonatomic, copy) NSString *address;
+@end /* interface TSDepart */
+
+
+
+/**
+ * 订å•æŸ¥è¯¢ç»“果。
+
+ @author liyang
+ @since 0.1
+
+ */
+@interface WithdrawQueryResult : RsQueryResult
+/**
+ * 查询结果集åˆ
+ * @see DrawCashBillEntity
+ *
+ */
+@property (nonatomic, strong) NSArray<DrawCashBillEntity> *records;
+@end /* interface WithdrawQueryResult */
@@ -4262,48 +4573,6 @@ extern NSString * const QUERYORDERDIRECTION_DESC;
-/**
- * 账户æµæ°´æŸ¥è¯¢ã€‚
-
- @author liyang
- @since 0.1
-
- */
-@interface OrderQueryDefintion : QueryDefinition
-/**
- * åŠ æ²¹å‘˜Id
- *
- *
- */
-@property (nonatomic, copy) NSString *userId;
-/**
- * 用户å称类似于
- *
- *
- */
-@property (nonatomic, copy) NSString *userNameLike;
-/**
- *
- *
- *
- */
-@property (nonatomic, copy) NSString *billNumberLike;
-/**
- *
- *
- *
- */
-@property (nonatomic, copy) NSString *endDate;
-/**
- *
- *
- *
- */
-@property (nonatomic, copy) NSString *state;
-@end /* interface OrderQueryDefintion */
-
-
-
/**
* @Title: Entity
@Description: 微信群å‘消æ¯
@@ -4504,6 +4773,60 @@ extern NSString * const QUERYORDERDIRECTION_DESC;
+/**
+ * 账户æµæ°´æŸ¥è¯¢ã€‚
+
+ @author liyang
+ @since 0.1
+
+ */
+@interface OrderQueryDefintion : QueryDefinition
+/**
+ * åŠ æ²¹å‘˜Id
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *userId;
+/**
+ * 用户å称类似于
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *userNameLike;
+/**
+ *
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *billNumberLike;
+/**
+ *
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *endDate;
+/**
+ *
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *state;
+/**
+ *
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *beginDate;
+/**
+ *
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *checkState;
+@end /* interface OrderQueryDefintion */
+
+
+
/**
* 账户æµæ°´æŸ¥è¯¢ã€‚
diff --git a/Car/car_objc_json_client.m b/Car/car_objc_json_client.m
index def2c83..6be6ffa 100755
--- a/Car/car_objc_json_client.m
+++ b/Car/car_objc_json_client.m
@@ -92,6 +92,18 @@ NSString * const QUERYORDERDIRECTION_DESC = @"desc";
}
+@end
+
+@implementation CheckOrderRequest
+@synthesize userId;
+@synthesize orderIds;
+
++(BOOL)propertyIsOptional:(NSString*)propertyName
+{
+ return YES;
+}
+
+
@end
@implementation ResetPasswordRequest
@@ -239,6 +251,44 @@ NSString * const QUERYORDERDIRECTION_DESC = @"desc";
}
+@end
+
+@implementation CouponStockEntity
+@synthesize fid;
+@synthesize createName;
+@synthesize createBy;
+@synthesize createDate;
+@synthesize updateName;
+@synthesize updateBy;
+@synthesize updateDate;
+@synthesize sysOrgCode;
+@synthesize sysCompanyCode;
+@synthesize couponNumber;
+@synthesize name;
+@synthesize type;
+@synthesize total;
+@synthesize realToal;
+@synthesize state;
+@synthesize memberId;
+@synthesize memberName;
+@synthesize orderNumber;
+@synthesize validBeginDate;
+@synthesize validEndDate;
+
++(BOOL)propertyIsOptional:(NSString*)propertyName
+{
+ return YES;
+}
+
+
++(JSONKeyMapper*)keyMapper
+{
+ return [[JSONKeyMapper alloc] initWithDictionary:@{
+ @"id": @"fid",
+ }];
+}
+
+
@end
@implementation GasItemEntity
@@ -386,6 +436,7 @@ NSString * const QUERYORDERDIRECTION_DESC = @"desc";
@synthesize invoiceId;
@synthesize alipayBuyerId;
@synthesize alipaybuyerLogonId;
+@synthesize checkState;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
@@ -791,10 +842,10 @@ NSString * const QUERYORDERDIRECTION_DESC = @"desc";
@end
@implementation AjaxJson
+@synthesize msg;
@synthesize attributes;
-@synthesize obj;
@synthesize success;
-@synthesize msg;
+@synthesize obj;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
@@ -1049,6 +1100,40 @@ NSString * const QUERYORDERDIRECTION_DESC = @"desc";
}
+@end
+
+@implementation CouponEntity
+@synthesize fid;
+@synthesize createName;
+@synthesize createBy;
+@synthesize createDate;
+@synthesize updateName;
+@synthesize updateBy;
+@synthesize updateDate;
+@synthesize sysOrgCode;
+@synthesize sysCompanyCode;
+@synthesize name;
+@synthesize type;
+@synthesize total;
+@synthesize realTotal;
+@synthesize state;
+@synthesize probability;
+@synthesize validateDays;
+
++(BOOL)propertyIsOptional:(NSString*)propertyName
+{
+ return YES;
+}
+
+
++(JSONKeyMapper*)keyMapper
+{
+ return [[JSONKeyMapper alloc] initWithDictionary:@{
+ @"id": @"fid",
+ }];
+}
+
+
@end
@implementation DrawCashBillEntity
@@ -1144,6 +1229,18 @@ NSString * const QUERYORDERDIRECTION_DESC = @"desc";
}
+@end
+
+@implementation TradeStatisticsResult
+@synthesize orderCount;
+@synthesize totalAmount;
+
++(BOOL)propertyIsOptional:(NSString*)propertyName
+{
+ return YES;
+}
+
+
@end
@implementation LoginResult
@@ -1224,17 +1321,7 @@ NSString * const QUERYORDERDIRECTION_DESC = @"desc";
@implementation OrderQueryResult
@synthesize records;
-
-+(BOOL)propertyIsOptional:(NSString*)propertyName
-{
- return YES;
-}
-
-
-@end
-
-@implementation WithdrawQueryResult
-@synthesize records;
+@synthesize total;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
@@ -1264,6 +1351,29 @@ NSString * const QUERYORDERDIRECTION_DESC = @"desc";
}
+@end
+
+@implementation TSBaseUser
+@synthesize userType;
+@synthesize departid;
+@synthesize signature;
+@synthesize browser;
+@synthesize userKey;
+@synthesize status;
+@synthesize activitiSync;
+@synthesize password;
+@synthesize userName;
+@synthesize realName;
+@synthesize currentDepart;
+@synthesize userOrgList;
+@synthesize deleteFlag;
+
++(BOOL)propertyIsOptional:(NSString*)propertyName
+{
+ return YES;
+}
+
+
@end
@implementation TSDepart
@@ -1293,20 +1403,8 @@ NSString * const QUERYORDERDIRECTION_DESC = @"desc";
@end
-@implementation TSBaseUser
-@synthesize userType;
-@synthesize departid;
-@synthesize signature;
-@synthesize browser;
-@synthesize userKey;
-@synthesize status;
-@synthesize activitiSync;
-@synthesize password;
-@synthesize userName;
-@synthesize realName;
-@synthesize currentDepart;
-@synthesize userOrgList;
-@synthesize deleteFlag;
+@implementation WithdrawQueryResult
+@synthesize records;
+(BOOL)propertyIsOptional:(NSString*)propertyName
{
@@ -1326,21 +1424,6 @@ NSString * const QUERYORDERDIRECTION_DESC = @"desc";
}
-@end
-
-@implementation OrderQueryDefintion
-@synthesize userId;
-@synthesize userNameLike;
-@synthesize billNumberLike;
-@synthesize endDate;
-@synthesize state;
-
-+(BOOL)propertyIsOptional:(NSString*)propertyName
-{
- return YES;
-}
-
-
@end
@implementation WxMassBillEntity
@@ -1382,6 +1465,23 @@ NSString * const QUERYORDERDIRECTION_DESC = @"desc";
}
+@end
+
+@implementation OrderQueryDefintion
+@synthesize userId;
+@synthesize userNameLike;
+@synthesize billNumberLike;
+@synthesize endDate;
+@synthesize state;
+@synthesize beginDate;
+@synthesize checkState;
+
++(BOOL)propertyIsOptional:(NSString*)propertyName
+{
+ return YES;
+}
+
+
@end
@implementation WithdrawQueryDefintion
--
2.18.1