重庆迈尖科技有限公司
2018-09-03 5d33c8d36d2fb4296b5aa99b403f48b52b6cf6fd
no message
3个文件已修改
106 ■■■■ 已修改文件
MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/我的/balance/体现/AddIncarnateViewController.xib 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/我的/balance/体现/IncarnateViewController.m 87 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate
Binary files differ
MIduo/½çÃæ/ÎÒµÄ/balance/ÌåÏÖ/AddIncarnateViewController.xib
@@ -23,7 +23,7 @@
            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
            <subviews>
                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="W5U-xK-P7j">
                    <rect key="frame" x="0.0" y="10" width="375" height="160"/>
                    <rect key="frame" x="0.0" y="50" width="375" height="160"/>
                    <subviews>
                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="支付宝" translatesAutoresizingMaskIntoConstraints="NO" id="ARx-dm-zbb">
                            <rect key="frame" x="20" y="20" width="35" height="35"/>
@@ -112,7 +112,7 @@
                    </constraints>
                </view>
                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="JuN-HO-zP5">
                    <rect key="frame" x="31.5" y="220" width="312.5" height="45"/>
                    <rect key="frame" x="31.5" y="260" width="312.5" height="45"/>
                    <color key="backgroundColor" red="0.89630961418151855" green="0.0026712445542216301" blue="0.35720354318618774" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                    <constraints>
                        <constraint firstAttribute="height" constant="45" id="oyG-23-J3x"/>
@@ -128,14 +128,27 @@
                        <action selector="sureTaped:" destination="-1" eventType="touchUpInside" id="e2d-Le-gfe"/>
                    </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="xeJ-DJ-Ejl">
                    <rect key="frame" x="0.0" y="0.0" width="375" height="40"/>
                    <color key="backgroundColor" red="1" green="0.99215686274509807" blue="0.88235294117647056" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                    <constraints>
                        <constraint firstAttribute="height" constant="40" id="PJr-hf-R4C"/>
                    </constraints>
                    <fontDescription key="fontDescription" type="system" pointSize="13"/>
                    <color key="textColor" red="0.89803921568627454" green="0.0" blue="0.36078431372549019" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                    <nil key="highlightedColor"/>
                </label>
            </subviews>
            <color key="backgroundColor" red="0.93715304136276245" green="0.93731355667114258" blue="0.93714290857315063" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
            <constraints>
                <constraint firstAttribute="trailing" secondItem="xeJ-DJ-Ejl" secondAttribute="trailing" id="5Ki-fj-8dP"/>
                <constraint firstItem="W5U-xK-P7j" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="7Ra-gr-YCo"/>
                <constraint firstItem="JuN-HO-zP5" firstAttribute="top" secondItem="W5U-xK-P7j" secondAttribute="bottom" constant="50" id="7lv-7o-qnT"/>
                <constraint firstAttribute="trailing" secondItem="W5U-xK-P7j" secondAttribute="trailing" id="Ua1-GY-v7b"/>
                <constraint firstItem="JuN-HO-zP5" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="Wt6-GG-4LO"/>
                <constraint firstItem="W5U-xK-P7j" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="10" id="xsV-dF-e1N"/>
                <constraint firstItem="xeJ-DJ-Ejl" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="kFG-pr-R1D"/>
                <constraint firstItem="xeJ-DJ-Ejl" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="nZz-OU-F3U"/>
                <constraint firstItem="W5U-xK-P7j" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="50" id="xsV-dF-e1N"/>
                <constraint firstItem="JuN-HO-zP5" firstAttribute="width" secondItem="i5M-Pr-FkT" secondAttribute="width" multiplier="5:6" id="zNI-dX-jTv"/>
            </constraints>
            <point key="canvasLocation" x="33.5" y="53.5"/>
MIduo/½çÃæ/ÎÒµÄ/balance/ÌåÏÖ/IncarnateViewController.m
@@ -30,13 +30,14 @@
@property (weak, nonatomic) IBOutlet UILabel *nameLabel;
@property (weak, nonatomic) IBOutlet UILabel *zhifubaoLabel;
@property (nonatomic,strong)NSArray *bindingAccountList;
@property (nonatomic, strong)NSDictionary * userDataSource;
@property (weak, nonatomic) IBOutlet UIButton *tixianButton;
@property (nonatomic,strong)SJRemoveBoundView *primtView;
@property (nonatomic, strong)SJRemoveBoundView *primtView;
@property (nonatomic, assign) BOOL isHaveDian;
@property (nonatomic, assign) BOOL isFirstZero;
@property (nonatomic,strong) NSString *maxMoney;
@property (nonatomic,strong) NSString *minMoney;
@property (nonatomic, strong) NSString *maxMoney;
@property (nonatomic, strong) NSString *minMoney;
@property (nonatomic, strong) NSDictionary * alipayBindStateDictionary;
@end
@@ -120,11 +121,13 @@
    
}
#pragma mark - SJRemoveBoundViewDelegate
- (void)sureClicked:(SJRemoveBoundView *)view textString:(NSString *)textString{
- (void)sureClicked:(SJRemoveBoundView *)view textString:(NSString *)textString {
    MessageLoginViewController *messageVC = [[MessageLoginViewController alloc]init];
    messageVC.isBoundPhone = YES;
    [self.navigationController pushViewController:messageVC animated:YES];
}
- (IBAction)addTaped:(UIButton *)sender {
    if (!self.datasource) {
        return;
@@ -153,8 +156,24 @@
}
- (IBAction)submitTaped:(id)sender {
    if (self.bindingAccountList.count == 0) {
        ALToastBottom(@"请添加提现账号");
        NSString *phoneString = _userInfo[@"phone"];
        if (phoneString.length == 0) {
            self.primtView.hidden = NO;
        } else {
            ModifyAccountViewController *modifyVC = [[ModifyAccountViewController alloc]init];
            modifyVC.title = @"账号验证";
            modifyVC.isAdd = YES;
            [self.navigationController pushViewController:modifyVC animated:YES];
        }
        return;
    }
    self.balanText.text = [self.balanText.text removeSpace];
@@ -176,15 +195,52 @@
    if (phoneString.length == 0) {
        self.primtView.hidden = NO;
        
    }else{
        ModifyAccountViewController *modifyVC = [[ModifyAccountViewController alloc]init];
        modifyVC.title = @"账号验证";
        modifyVC.isSubmit = YES;
        modifyVC.moneyString = self.balanText.text;
        self.balanText.text = @"";
        modifyVC.dataSource = _bindingAccountList[0];
        [self.navigationController pushViewController:modifyVC animated:YES];
    } else {
        BOOL canExract = (BOOL)self.userDataSource[@"canExtract"];
        if (!canExract) {
            ALToastBottom(self.userDataSource[@"extractErrorMsg"]);
            return;
        }
        [self customercanextract];
    }
}
- (void)customercanextract {
    NSMutableDictionary *dic = @{}.mutableCopy;
    [dic setObject:[[NSUserDefaults standardUserDefaults] objectForKey:@"userId"] forKey:@"uid"];
    [dic setObject:self.balanText.text forKey:@"money"];
    [JYNetWorking Post:[NSString stringWithFormat:@"%@/%@",domainHTTP,@"customer/canextract"] param:dic success:^(NSDictionary *object) {
        if ([object[@"code"]integerValue] == 0) {
            ModifyAccountViewController *modifyVC = [[ModifyAccountViewController alloc]init];
            modifyVC.title = @"账号验证";
            modifyVC.isSubmit = YES;
            modifyVC.moneyString = self.balanText.text;
            self.balanText.text = @"";
            modifyVC.dataSource = self.bindingAccountList[0];
            [self.navigationController pushViewController:modifyVC animated:YES];
        } else {
            ALToastBottom(object[@"msg"]);
        }
    } fail:^(id object) {
        NSError *error = (NSError *)object;
        if (error.code != -1009) {
            ALToastBottom(@"网络未连接,请检测网络设置");
        } else {
            ALToastBottom(@"网络连接异常,请检测网络设置");
        }
    }];
}
- (IBAction)nextTaped:(UIButton *)sender {
@@ -208,12 +264,11 @@
    
    [JYNetWorking Post:[NSString stringWithFormat:@"%@/%@",domainHTTP,@"customer/addbindingaccount"] param:dic success:^(NSDictionary *object) {
        NSLog(@"%@",object);
        //        NSInteger code = [object[@"code"]integerValue];
        //        NSDictionary *dic = object[@"data"];
        ALToastBottom(object[@"data"])
        self.backView.hidden = YES;
        self.addView.hidden = YES;
    } fail:^(id object) {
        NSLog(@"%@",object);
    }];
@@ -250,6 +305,8 @@
            self->_bindingAccountList = dic[@"bindingAccountList"];
            self.maxMoney = dic[@"maxMoney"];
            self.minMoney = dic[@"minMoney"];
            self.userDataSource = dic;
            if (self->_bindingAccountList.count == 0) {
                self.heightLayout.constant = 80;
                self.rightImage.hidden = NO;