Steven vor 7 Monaten
Ursprung
Commit
a0dc8415ea

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher.xcodeproj/xcshareddata/xcschemes/KulexiuForTeacher.xcscheme

@@ -53,7 +53,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "TEST"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

+ 23 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Course/AccompanyCourse/View/AccompanyDetailBottomView.xib

@@ -13,6 +13,25 @@
             <rect key="frame" x="0.0" y="0.0" width="414" height="97"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="d5a-KD-vpo">
+                    <rect key="frame" x="0.0" y="0.0" width="414" height="97"/>
+                    <color key="backgroundColor" red="1" green="0.99215686270000003" blue="0.99215686270000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="size" keyPath="shadowOffset">
+                            <size key="value" width="0.0" height="0.0"/>
+                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="number" keyPath="shadowOpacity">
+                            <real key="value" value="1"/>
+                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="number" keyPath="shadowRadius">
+                            <real key="value" value="2"/>
+                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="boolean" keyPath="maskToBounces" value="NO"/>
+                        <userDefinedRuntimeAttribute type="color" keyPath="shadowUIColor">
+                            <color key="value" red="0.84705882349999995" green="0.84705882349999995" blue="0.84705882349999995" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/>
+                        </userDefinedRuntimeAttribute>
+                    </userDefinedRuntimeAttributes>
+                </view>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rQe-Un-bUG">
                     <rect key="frame" x="28" y="10" width="358" height="44"/>
                     <color key="backgroundColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
@@ -34,6 +53,10 @@
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
                 <constraint firstAttribute="trailing" secondItem="rQe-Un-bUG" secondAttribute="trailing" constant="28" id="9dH-1T-aSO"/>
+                <constraint firstAttribute="trailing" secondItem="d5a-KD-vpo" secondAttribute="trailing" id="DLL-hW-Pt8"/>
+                <constraint firstAttribute="bottom" secondItem="d5a-KD-vpo" secondAttribute="bottom" id="Pll-5z-4kP"/>
+                <constraint firstItem="d5a-KD-vpo" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="aJy-X8-rsc"/>
+                <constraint firstItem="d5a-KD-vpo" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="iOv-ME-LD2"/>
                 <constraint firstItem="rQe-Un-bUG" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="10" id="ldd-sP-BZe"/>
                 <constraint firstItem="rQe-Un-bUG" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="28" id="pLN-ap-tbg"/>
             </constraints>

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Course/VIPCourse/View/ProgramCourseGroupBodyView.m

@@ -422,7 +422,7 @@
     
      if (type == SORT_TYPE_STATUS) { // 状态
         MJWeakSelf;
-        KSSmallChoosePicker *picker = [[KSSmallChoosePicker alloc] initWithTitle:@"" sourceData:@[@"全部",@"未开始",@"进行中",@"已结束"] lastChoose:self.secondChooseIndex chooseColor:THEMECOLOR chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
+        KSSmallChoosePicker *picker = [[KSSmallChoosePicker alloc] initWithTitle:@"" sourceData:@[@"全部状态",@"未开始",@"进行中",@"已结束"] lastChoose:self.secondChooseIndex chooseColor:THEMECOLOR chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
             weakSelf.secondChooseIndex = chooseIndex;
             if (chooseIndex == 1) {
                 [weakSelf.sortView.secondLabel setText:@"全部状态"];

+ 7 - 3
KulexiuForTeacher/KulexiuForTeacher/Module/Home/EvaluateCourse/View/EvaluateCourseBodyView.m

@@ -74,7 +74,7 @@
         [self.dateFormatter setDateFormat:@"yyyy-MM"];
         NSDate *currentDate = [NSDate date];
         self.chooseDate = [self.dateFormatter stringFromDate:currentDate];
-        
+        [self configDefault];
         MJWeakSelf;
         self.tableView.mj_header = [KSGifRefreshHeader headerWithRefreshingBlock:^{
             [weakSelf resetParamenter];
@@ -93,6 +93,10 @@
     return self;
 }
 
+- (void)configDefault {
+    self.secondChooseIndex = 1;
+    self.thirdChooseIndex = 1;
+}
 
 - (void)endRefresh {
     [self.tableView.mj_header endRefreshing];
@@ -321,7 +325,7 @@
         case EVALUATESORT_STATUS:
         {
             MJWeakSelf;
-            KSSmallChoosePicker *picker = [[KSSmallChoosePicker alloc] initWithTitle:@"" sourceData:@[@"全部",@"已评价",@"未评价"] lastChoose:self.secondChooseIndex chooseColor:THEMECOLOR chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
+            KSSmallChoosePicker *picker = [[KSSmallChoosePicker alloc] initWithTitle:@"" sourceData:@[@"全部状态",@"已评价",@"未评价"] lastChoose:self.secondChooseIndex chooseColor:THEMECOLOR chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
                 weakSelf.secondChooseIndex = chooseIndex;
                 if (chooseIndex == 1) {
                     [weakSelf.sortView.secondLabel setText:@"全部状态"];
@@ -342,7 +346,7 @@
         case EVALUATESORT_COURSETYPE:
         {
             MJWeakSelf;
-            KSSmallChoosePicker *picker = [[KSSmallChoosePicker alloc] initWithTitle:@"" sourceData:@[@"全部",@"VIP定制课",@"趣纠课"] lastChoose:self.thirdChooseIndex chooseColor:THEMECOLOR chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
+            KSSmallChoosePicker *picker = [[KSSmallChoosePicker alloc] initWithTitle:@"" sourceData:@[@"全部课程",@"VIP定制课",@"趣纠课"] lastChoose:self.thirdChooseIndex chooseColor:THEMECOLOR chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
                 weakSelf.secondChooseIndex = chooseIndex;
                 if (chooseIndex == 1) {
                     [weakSelf.sortView.thirdLabel setText:@"全部课程"];

+ 5 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Home/EvaluateCourse/View/EvaluateReceiveBodyView.m

@@ -70,6 +70,7 @@
         [self.dateFormatter setDateFormat:@"yyyy-MM"];
         NSDate *currentDate = [NSDate date];
         self.chooseDate = [self.dateFormatter stringFromDate:currentDate];
+        [self configDefault];
         
         MJWeakSelf;
         self.tableView.mj_header = [KSGifRefreshHeader headerWithRefreshingBlock:^{
@@ -89,6 +90,9 @@
     return self;
 }
 
+- (void)configDefault {
+    self.secondChooseIndex = 1;
+}
 
 - (void)endRefresh {
     [self.tableView.mj_header endRefreshing];
@@ -318,7 +322,7 @@
         case RECEVALUATESORT_COURSETYPE:
         {
             MJWeakSelf;
-            KSSmallChoosePicker *picker = [[KSSmallChoosePicker alloc] initWithTitle:@"" sourceData:@[@"全部",@"VIP定制课",@"趣纠课"] lastChoose:self.secondChooseIndex chooseColor:THEMECOLOR chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
+            KSSmallChoosePicker *picker = [[KSSmallChoosePicker alloc] initWithTitle:@"" sourceData:@[@"全部课程",@"VIP定制课",@"趣纠课"] lastChoose:self.secondChooseIndex chooseColor:THEMECOLOR chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
                 weakSelf.secondChooseIndex = chooseIndex;
                 if (chooseIndex == 1) {
                     [weakSelf.sortView.secondLabel setText:@"全部课程"];

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Home/Homework/View/HomeworkSortView.m

@@ -22,7 +22,7 @@
 - (void)awakeFromNib {
     [super awakeFromNib];
     self.searchField.delegate = self;
-    self.searchField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"请输入学生名称" attributes:@{NSForegroundColorAttributeName:HexRGBAlpha(0x000000, 0.4),NSFontAttributeName:[UIFont systemFontOfSize:14.0f]}];
+    self.searchField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"请输入学员昵称" attributes:@{NSForegroundColorAttributeName:HexRGBAlpha(0x000000, 0.4),NSFontAttributeName:[UIFont systemFontOfSize:14.0f]}];
 }
 
 + (instancetype)shareInstance {