debug

Lighting/Class/ClientViewController.m

@@ -586,13 +586,18 @@
         [self ErrorMBProgressView:@"手机号码不能为空"];
         return;
     }
-    
     NSString *phoneNumber = self.phoneNumberField.text;
     if (![HENLENSONG isValidateMobile:phoneNumber]) {
         
         [self ErrorMBProgressView:@"手机号码格式不正确"];
         return;
     }
+    if (self.customerAddress.text.length == 0) {
+        
+        [self ErrorMBProgressView:@"地址不能为空"];
+        return;
+    }
+    
     //客户信息类
     MyclientEntityModel *customerEntity = [[MyclientEntityModel alloc]init];
     customerEntity.createName = [Shoppersmanager manager].Shoppers.employee.realName;

Lighting/Class/OrderdetailsViewController.h

@@ -10,13 +10,11 @@
 
 @interface OrderdetailsViewController : BaseViewController
 
-
 /**
  *  订单详情tableview
  */
 @property (weak, nonatomic) IBOutlet UITableView *orderDetailsTableview;
 
-
 /**
  *  订单ID
  */
@@ -28,14 +26,11 @@
  */
 @property (nonatomic,assign) BOOL isShowattachment;
 
-
-
 /**
  *  区头显示title
  */
 @property (nonatomic,strong) NSArray *sectionTitle;
 
-
 /**
  *  是否显示支付按钮
  */

Lighting/Class/OrderdetailsViewController.m

@@ -517,7 +517,7 @@
     ShareGoodsViewController *shareController = [[ShareGoodsViewController alloc]init];
     shareController.isShareOrderbill = YES;
     shareController.orderBillNumber = self.orderCode;
-    shareController.shareImage = [UIImage imageNamed:@"aboutus"];
+    shareController.shareImage = [UIImage imageNamed:@"Icon-83.5"];
     shareController.preferredContentSize = CGSizeMake(290, 120);
     shareController.modalPresentationStyle = UIModalPresentationPopover;
     UIPopoverPresentationController *popover = shareController.popoverPresentationController;

Lighting/Class/PaymentsViewController.m

@@ -63,6 +63,11 @@
     [self setupRefreshing];
 }
 
+- (void)viewWillAppear:(BOOL)animated
+{
+    [self.paymentsTableView.mj_header beginRefreshing];
+}
+
 #pragma mark - 设置刷新
 - (void)setupRefreshing
 {

Lighting/Class/RebateDetailsViewController.m

@@ -9,7 +9,7 @@
 #import "RebateDetailsViewController.h"
 #import "RebateSuccessTableViewController.h"
 
-@interface RebateDetailsViewController ()
+@interface RebateDetailsViewController ()<UITextFieldDelegate>
 
 /**
  *  输入提现金额
@@ -29,7 +29,7 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
 
-    self.inputRebateTextField.placeholder = [NSString stringWithFormat:@"当前可提现:%@",self.rebateAmount];
+    self.inputRebateTextField.placeholder = [NSString stringWithFormat:@"当前可提现:%.2f",[self.rebateAmount floatValue]];
 }
 
 - (IBAction)rebateButtonClickAction:(UIButton *)sender {
@@ -41,6 +41,12 @@
     if ([self.inputRebateTextField.text floatValue] > [self.rebateAmount floatValue]) {
         [self SHOWPrompttext:@"当前账户余额不足"];return;
     }
+    if ([self.inputRebateTextField.text floatValue] <= 0) {
+        [self SHOWPrompttext:@"格式不正确"];return;
+    }
+    if ([self includeChinese:self.inputRebateTextField.text]) {
+        [self SHOWPrompttext:@"格式不正确"];return;
+    }
     UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:nil message:[NSString stringWithFormat:@"请确认提现金额:%@元",self.inputRebateTextField.text] preferredStyle:UIAlertControllerStyleAlert];
     [alertVC addAction:[UIAlertAction actionWithTitle:@"确认" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
         [weakSelf CreateMBProgressHUDLoding];
@@ -75,6 +81,7 @@
     [success setClickEvent:^(NSIndexPath *indexPath) {
         if (indexPath.row == 1) {
             [weakSelf.navigationController popViewControllerAnimated:YES];
+            [[NSNotificationCenter defaultCenter] postNotificationName:@"setupRefreshing" object:nil];
         }else if (indexPath.row == 0)
         {
             [weakSelf queryDetails];
@@ -115,4 +122,63 @@
     }];
 }
 
+#pragma mark - <UITextFieldDelegate>
+- (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string
+{
+    NSScanner      *scanner    = [NSScanner scannerWithString:string];
+    NSCharacterSet *numbers;
+    NSRange         pointRange = [textField.text rangeOfString:@"."];
+    if ( (pointRange.length > 0) && (pointRange.location < range.location  || pointRange.location > range.location + range.length) ){
+        numbers = [NSCharacterSet characterSetWithCharactersInString:@"0123456789"];
+    }else{
+        numbers = [NSCharacterSet characterSetWithCharactersInString:@"0123456789."];
+    }
+    if ( [textField.text isEqualToString:@""] && [string isEqualToString:@"."] ){
+        return NO;
+    }
+    short remain = 2; //保留 number位小数
+    NSString *tempStr = [textField.text stringByAppendingString:string];
+    NSUInteger strlen = [tempStr length];
+    if(pointRange.length > 0 && pointRange.location > 0){ //判断输入框内是否含有“.”。
+        if([string isEqualToString:@"."]){ //当输入框内已经含有“.”时，如果再输入“.”则被视为无效。
+            return NO;
+        }
+        if(strlen > 0 && (strlen - pointRange.location) > remain+1){ //当输入框内已经含有“.”，当字符串长度减去小数点前面的字符串长度大于需要要保留的小数点位数，则视当次输入无效。
+            return NO;
+        }
+    }
+    NSRange zeroRange = [textField.text rangeOfString:@"0"];
+    if(zeroRange.length == 1 && zeroRange.location == 0){ //判断输入框第一个字符是否为“0”
+        if(![string isEqualToString:@"0"] && ![string isEqualToString:@"."] && [textField.text length] == 1){ //当输入框只有一个字符并且字符为“0”时，再输入不为“0”或者“.”的字符时，则将此输入替换输入框的这唯一字符。
+            textField.text = string;
+            return NO;
+        }else{
+            if(pointRange.length == 0 && pointRange.location > 0){ //当输入框第一个字符为“0”时，并且没有“.”字符时，如果当此输入的字符为“0”，则视当此输入无效。
+                if([string isEqualToString:@"0"]){
+                    return NO;
+                }
+            }
+        }
+    }
+    NSString *buffer;
+    if ( ![scanner scanCharactersFromSet:numbers intoString:&buffer] && ([string length] != 0) ){
+        return NO;
+    }else{
+        return YES;
+    }
+}
+
+#pragma mark - 判断是否是汉字
+- (BOOL)includeChinese:(NSString *)string
+{
+    for(int i=0; i< [string length];i++)
+    {
+        int a =[string characterAtIndex:i];
+        if( a >0x4e00&& a <0x9fff){
+            return YES;
+        }
+    }
+    return NO;
+}
+
 @end

Lighting/Class/WithdrawalViewController.m

@@ -59,9 +59,16 @@
     [super viewDidLoad];
     
     self.withdrawalTableView.tableFooterView = [UIView new];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(refreshList) name:@"setupRefreshing" object:nil];
     [self setupRefreshing];
 }
 
+#pragma mark - 通知刷新
+- (void)refreshList
+{
+    [self.withdrawalTableView .mj_header beginRefreshing];
+}
+
 #pragma mark - 设置刷新
 - (void)setupRefreshing
 {
@@ -125,7 +132,7 @@
 {
     WithdrawalTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"WithdrawalTableViewCell" forIndexPath:indexPath];
     TOApplyBillEntity *entity = self.resultArray[indexPath.row];
-    cell.amountLabel.text = [entity.applyMoney stringValue];
+    cell.amountLabel.text = [NSString stringWithFormat:@"%.2f",[entity.applyMoney floatValue]];
     cell.createTimeLabel.text = entity.createDate;
     cell.progressLabel.textColor = [self setupLabelColor:entity.billStates];
     cell.progressLabel.text = entity.billStates;
@@ -162,8 +169,11 @@
     return nil;
 }
 
-
-
+#pragma mark - 释放
+- (void)dealloc
+{
+    [[NSNotificationCenter defaultCenter]removeObserver:self];
+}
 
 
 

Lighting/Lighting/Images.xcassets/lefttool1.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "2.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "2@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Lighting/Images.xcassets/righttool.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "bg-副本-7.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "bg-副本-7@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Lighting/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleName</key>
 	<string>欧立方</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.5</string>
+	<string>1.0.6</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>

Lighting/Lighting/StoryboardwithCYX.storyboard

@@ -2215,7 +2215,7 @@
                                 <rect key="frame" x="24" y="93" width="721" height="90"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                 <subviews>
-                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="10-副本-3" id="RER-Ld-URf">
+                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="RER-Ld-URf">
                                         <rect key="frame" x="8" y="10" width="70" height="70"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                     </imageView>
@@ -2796,11 +2796,14 @@
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                         <textInputTraits key="textInputTraits"/>
+                                        <connections>
+                                            <outlet property="delegate" destination="4gk-Uy-LcU" id="gvm-cb-QoD"/>
+                                        </connections>
                                     </textField>
                                 </subviews>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                             </view>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="提现相关说明：提交金额后，我们会在第一时间为你..." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="2HJ-17-WJw">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="提现相关说明：提交金额后，我们会在第一时间为你审核。" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="2HJ-17-WJw">
                                 <rect key="frame" x="27" y="171" width="352" height="21"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="10"/>
@@ -2851,8 +2854,8 @@
                                     <rect key="frame" x="364" y="58" width="40" height="30"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 </imageView>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="恭喜你，申请提现成功!" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="W9L-JB-sQA">
-                                    <rect key="frame" x="288" y="101" width="192" height="21"/>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="提现申请已提交，审核中..." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="W9L-JB-sQA">
+                                    <rect key="frame" x="237" y="101" width="294" height="21"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
@@ -2905,6 +2908,11 @@
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                                     <color key="backgroundColor" red="0.91372549020000005" green="0.91764705879999997" blue="0.92156862750000001" alpha="1" colorSpace="calibratedRGB"/>
                                                 </view>
+                                                <view contentMode="scaleToFill" id="bft-Gk-ONL">
+                                                    <rect key="frame" x="0.0" y="67" width="768" height="1"/>
+                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                                                    <color key="backgroundColor" red="0.91372549020000005" green="0.91764705879999997" blue="0.92156862750000001" alpha="1" colorSpace="calibratedRGB"/>
+                                                </view>
                                             </subviews>
                                         </tableViewCellContentView>
                                     </tableViewCell>
@@ -4418,7 +4426,6 @@
     <resources>
         <image name="05产品库-详情_03" width="500" height="375"/>
         <image name="1" width="45" height="45"/>
-        <image name="10-副本-3" width="19" height="19"/>
         <image name="Folder" width="18" height="17"/>
         <image name="Trash" width="23" height="24"/>
         <image name="aboutus" width="1024" height="510"/>

Lighting/Tools/PrefixHeader.pch

@@ -117,12 +117,12 @@
 /**
  *  服务器测试地址
  */
-//#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://dg-dev.opple.com/opple-web/app%@",URL]
+#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://dg-dev.opple.com/opple-web/app%@",URL]
 
 ///**
 // *  服务器正式地址
 // */
-#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://dg.opple.com/opple-web/app%@",URL]
+//#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://dg.opple.com/opple-web/app%@",URL]
 //
 /**
  *  搜索框输入通知

Lighting/Tools/ShareGoodsViewController.m

@@ -34,7 +34,7 @@
             
             [weakSelf RemoveMBProgressHUDLoding];
             if ([returnValue[@"code"] isEqualToNumber:@0]) {
-                [weakSelf callSharePlatform:returnValue[@"data"][@"url"] withPlatformTag:sender];
+                [weakSelf callSharePlatform:returnValue[@"data"][@"url"] withPlatformTag:sender withTitle:@"欧立方订单一键分享"];
             }else
             {
                 [weakSelf SHOWPrompttext:returnValue[@"message"]];
@@ -59,7 +59,7 @@
             if ([returnValue[@"code"] isEqualToNumber:@0]) {
                 
                 NSString *shareWeb = returnValue[@"data"][@"url"];
-                [weakSelf callSharePlatform:shareWeb withPlatformTag:sender];
+                [weakSelf callSharePlatform:shareWeb withPlatformTag:sender withTitle:ShareTitle];
             }else
             {
                 if ([weakSelf.delegate respondsToSelector:@selector(CodeNotEqualZero:)]) {
@@ -99,7 +99,7 @@
 }
 
 #pragma mark - 调用分享
-- (void)callSharePlatform:(NSString *)shareWeb withPlatformTag:(UIButton *)sender
+- (void)callSharePlatform:(NSString *)shareWeb withPlatformTag:(UIButton *)sender withTitle:(NSString *)title
 {
     switch (sender.tag) {
         case 100: //微信好友
@@ -107,7 +107,7 @@
             
             //使用UMShareToWechatSession,UMShareToWechatTimeline,UMShareToWechatFavorite分别代表微信好友、微信朋友圈、微信收藏
             [UMSocialData defaultData].extConfig.wechatSessionData.url = shareWeb;
-            [[UMSocialDataService defaultDataService]  postSNSWithTypes:@[UMShareToWechatSession] content:ShareTitle image:self.shareImage location:nil urlResource:nil presentedController:self completion:^(UMSocialResponseEntity *response){
+            [[UMSocialDataService defaultDataService]  postSNSWithTypes:@[UMShareToWechatSession] content:title image:self.shareImage location:nil urlResource:nil presentedController:self completion:^(UMSocialResponseEntity *response){
                 if (response.responseCode == UMSResponseCodeSuccess) {
                     
                     [self SuccessMBProgressView:@"分享微信好友成功"];
@@ -120,7 +120,7 @@
         {
             //使用UMShareToWechatSession,UMShareToWechatTimeline,UMShareToWechatFavorite分别代表微信好友、微信朋友圈、微信收藏
             [UMSocialData defaultData].extConfig.wechatTimelineData.url = shareWeb;
-            [[UMSocialDataService defaultDataService]  postSNSWithTypes:@[UMShareToWechatTimeline] content:ShareTitle image:self.shareImage location:nil urlResource:nil presentedController:self completion:^(UMSocialResponseEntity *response){
+            [[UMSocialDataService defaultDataService]  postSNSWithTypes:@[UMShareToWechatTimeline] content:title image:self.shareImage location:nil urlResource:nil presentedController:self completion:^(UMSocialResponseEntity *response){
                 if (response.responseCode == UMSResponseCodeSuccess) {
                     
                     [self SuccessMBProgressView:@"分享微信朋友圈成功"];
@@ -133,7 +133,7 @@
             
             //自定义分享样式
             [UMSocialData defaultData].extConfig.sinaData.shareText = [NSString stringWithFormat:@"%@%@",@"欧普照明",shareWeb];
-            [[UMSocialDataService defaultDataService]  postSNSWithTypes:@[UMShareToSina] content:ShareTitle image:self.shareImage location:nil urlResource:nil presentedController:self completion:^(UMSocialResponseEntity *shareResponse){
+            [[UMSocialDataService defaultDataService]  postSNSWithTypes:@[UMShareToSina] content:title image:self.shareImage location:nil urlResource:nil presentedController:self completion:^(UMSocialResponseEntity *shareResponse){
                 if (shareResponse.responseCode == UMSResponseCodeSuccess) {
                     
                     [self SuccessMBProgressView:@"分享新浪微博成功"];