Skip to content

A
ALand
Commit 66eb830f authored by Sandy's avatar Sandy
Browse files
Options

bug fix

parent 0fb284d1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 145 additions and 73 deletions
ALand.xcodeproj/project.pbxproj
View file @ 66eb830f
......@@ -1578,6 +1578,7 @@
19D906A91CC7898C00CD42DC /* MineViewController.h */,
19D906AA1CC7898C00CD42DC /* MineViewController.m */,
19D906AB1CC7898C00CD42DC /* MineViewController.xib */,
192900971CD2129B00D226E7 /* MyAcountViewController.h */,
192900981CD2129B00D226E7 /* MyAcountViewController.m */,
192900991CD2129B00D226E7 /* MyAcountViewController.xib */,
19D906B31CC86DA300CD42DC /* SettingViewController.h */,
......@@ -1592,7 +1593,6 @@
194FB0D81CE32EAB0089A3D5 /* ChangePasswordViewController.m */,
194FB0D91CE32EAB0089A3D5 /* ChangePasswordViewController.xib */,
194502F51CE9A307005C0781 /* MyBillViewController.h */,
192900971CD2129B00D226E7 /* MyAcountViewController.h */,
194502F61CE9A307005C0781 /* MyBillViewController.m */,
);
path = ViewController;
......@@ -2310,7 +2310,7 @@
TargetAttributes = {
1940D2E61C9A56730080678C = {
CreatedOnToolsVersion = 7.2.1;
DevelopmentTeam = W54V2VB863;
DevelopmentTeam = 2G3393EZPN;
};
1940D2F91C9A56730080678C = {
CreatedOnToolsVersion = 7.2.1;
......@@ -2887,9 +2887,10 @@
INFOPLIST_FILE = ALand/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.aland;
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.store.aland2;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE = "f6b88569-d850-46ef-b723-c4bfe46b907b";
TARGETED_DEVICE_FAMILY = 1;
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
};
name = Debug;
......@@ -2899,8 +2900,8 @@
baseConfigurationReference = AAF51B5D53AE9938C03065C3 /* Pods.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
ENABLE_BITCODE = NO;
GCC_PREFIX_HEADER = Aland/PrefixHeader.pch;
HEADER_SEARCH_PATHS = (
......@@ -2916,9 +2917,10 @@
INFOPLIST_FILE = ALand/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.aland;
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.store.aland2;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE = "f6b88569-d850-46ef-b723-c4bfe46b907b";
TARGETED_DEVICE_FAMILY = 1;
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
};
name = Release;
......
ALand/Assets.xcassets/消息_iPhone_assets/客服.imageset/Contents.json → ALand/Assets.xcassets/客服.imageset/Contents.json
View file @ 66eb830f
......@@ -7,7 +7,6 @@
},
{
"idiom" : "universal",
"filename" : "客服@2x.png",
"scale" : "2x"
},
{
......
ALand/Base.lproj/LaunchScreen.storyboard
View file @ 66eb830f
......@@ -17,7 +17,7 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleAspectFit" image="launch" translatesAutoresizingMaskIntoConstraints="NO" id="SGe-eP-jF9">
<imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleAspectFill" image="launch" translatesAutoresizingMaskIntoConstraints="NO" id="SGe-eP-jF9">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
</imageView>
</subviews>
......@@ -27,7 +27,13 @@
<constraint firstItem="SGe-eP-jF9" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="F6b-Xb-Gyg"/>
<constraint firstAttribute="trailing" secondItem="SGe-eP-jF9" secondAttribute="trailing" id="T2E-Yc-l4Q"/>
<constraint firstAttribute="bottom" secondItem="SGe-eP-jF9" secondAttribute="bottom" id="cGD-ya-Ccz"/>
<constraint firstItem="xb3-aO-Qok" firstAttribute="top" secondItem="SGe-eP-jF9" secondAttribute="bottom" id="vA5-tN-6Sy"/>
</constraints>
<variation key="default">
<mask key="constraints">
<exclude reference="cGD-ya-Ccz"/>
</mask>
</variation>
</view>
<simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina47"/>
</viewController>
......@@ -37,6 +43,6 @@
</scene>
</scenes>
<resources>
<image name="launch" width="800" height="1422"/>
<image name="launch" width="1080" height="1920"/>
</resources>
</document>
ALand/CodeClass/Home/View/HomeTopView.xib
View file @ 66eb830f
......@@ -35,7 +35,7 @@
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="defaultUserIcon" translatesAutoresizingMaskIntoConstraints="NO" id="G8W-Xp-4yu">
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="default_commodity_placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="G8W-Xp-4yu">
<rect key="frame" x="18" y="16" width="70" height="70"/>
<constraints>
<constraint firstAttribute="width" constant="70" id="pE8-uA-V23"/>
......@@ -74,7 +74,7 @@
</view>
</objects>
<resources>
<image name="defaultUserIcon" width="84" height="84"/>
<image name="default_commodity_placeholder" width="93" height="93"/>
<image name="imageCover" width="540" height="175"/>
<image name="wallhaven-25411" width="540" height="279"/>
</resources>
......
ALand/CodeClass/Home/View/Order/OrderCellView.m
View file @ 66eb830f
......@@ -22,6 +22,7 @@
JavenGoods *goods = model.goods;
[self.imgCommdity sd_setImageWithURL:[NSURL URLWithString:goods.cover] placeholderImage:kPlaceHolderImage];
self.labelTitle.text = goods.name;
self.labelSpecName.text = goods.specName;
self.labelPrice.text = [NSString stringWithFormat:@"￥%.2f",goods.price];
self.labelCount.text = [NSString stringWithFormat:@"x%.0f", model.count];
......
ALand/CodeClass/Home/View/Order/OrderDetailTableViewCell.m
View file @ 66eb830f
......@@ -26,6 +26,7 @@
JavenGoods *goods = model.goods;
[self.imgCommdity sd_setImageWithURL:[NSURL URLWithString:goods.cover] placeholderImage:kPlaceHolderImage];
self.labelTitle.text = goods.name;
self.labelSpecName.text = goods.specName;
self.labelPrice.text = [NSString stringWithFormat:@"￥%.2f",goods.price];
self.labelCount.text = [NSString stringWithFormat:@"x%.0f", model.count];
}
......
ALand/CodeClass/Home/ViewController/CommodityManagementViewController.m
View file @ 66eb830f
......@@ -72,6 +72,8 @@
- (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
[MobClick beginLogPageView:@"commodityManagement"];//("PageOne"为页面名称，可自定义)
[self resetReloadData];
}
......@@ -313,7 +315,7 @@
- (void)viewWillDisappear:(BOOL)animated {
[self.navigationController.navigationBar endEditing:YES];
[MobClick endLogPageView:@"commodityManagement"];
[super viewWillDisappear:animated];
[self.sorView hide];
}
......
ALand/CodeClass/Home/ViewController/CustomerManagement/CustomerManagementViewController.m
View file @ 66eb830f
......@@ -345,6 +345,18 @@
}
- (void)viewWillAppear:(BOOL)animated
{
[super viewWillAppear:animated];
[MobClick beginLogPageView:@"customerManagerment"];//("PageOne"为页面名称，可自定义)
}
- (void)viewWillDisappear:(BOOL)animated
{
[super viewWillDisappear:animated];
[MobClick endLogPageView:@"customerManagerment"];
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
......
ALand/CodeClass/Home/ViewController/CustomerManagement/CustomerViewController.m
View file @ 66eb830f
......@@ -86,7 +86,7 @@
@"parameters" : @[[UserInfo shareInstance].uuid]},
@{@"operation" : @"consumer uuid equals",
@"parameters" : @[self.customer.consumer.uuid]}],
@"orders" : @[@{@"field" : @"reseller",
@"orders" : @[@{@"field" : @"createInfo.time",
@"direction" : @"desc"}],
@"pageSize" : kPageSize,
@"page" : @0,
......
ALand/CodeClass/Home/ViewController/InviteParterner/InvitePartnerViewController.m
View file @ 66eb830f
......@@ -65,6 +65,18 @@
}
- (void)viewWillAppear:(BOOL)animated
{
[super viewWillAppear:animated];
[MobClick beginLogPageView:@"invitePartner"];//("PageOne"为页面名称，可自定义)
}
- (void)viewWillDisappear:(BOOL)animated
{
[super viewWillDisappear:animated];
[MobClick endLogPageView:@"invitePartner"];
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
......
ALand/CodeClass/Home/ViewController/MyTeams/MyTeamViewController.m
View file @ 66eb830f
......@@ -114,6 +114,18 @@
return cell;
}
- (void)viewWillAppear:(BOOL)animated
{
[super viewWillAppear:animated];
[MobClick beginLogPageView:@"myTeam"];//("PageOne"为页面名称，可自定义)
}
- (void)viewWillDisappear:(BOOL)animated
{
[super viewWillDisappear:animated];
[MobClick endLogPageView:@"myTeam"];
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
......
ALand/CodeClass/Home/ViewController/Order/OrderViewController.m
View file @ 66eb830f
......@@ -72,6 +72,17 @@
}
- (void)viewWillAppear:(BOOL)animated
{
[super viewWillAppear:animated];
[MobClick beginLogPageView:@"orderManagement"];//("PageOne"为页面名称，可自定义)
}
- (void)viewWillDisappear:(BOOL)animated
{
[super viewWillDisappear:animated];
[MobClick endLogPageView:@"orderManagement"];
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
......
ALand/CodeClass/Home/ViewController/ShopWebViewController.m
View file @ 66eb830f
......@@ -98,6 +98,18 @@
{
}
- (void)viewWillAppear:(BOOL)animated
{
[super viewWillAppear:animated];
[MobClick beginLogPageView:@"helpCustomerOrder"];//("PageOne"为页面名称，可自定义)
}
- (void)viewWillDisappear:(BOOL)animated
{
[super viewWillDisappear:animated];
[MobClick endLogPageView:@"helpCustomerOrder"];
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
......
ALand/CodeClass/Home/ViewController/StoreManagerment/StoreManagermentViewController.m
View file @ 66eb830f
......@@ -42,11 +42,18 @@
- (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
[MobClick beginLogPageView:@"storeSetting"];//("PageOne"为页面名称，可自定义)
[self.navigationController setNavigationBarHidden:YES animated:YES];
[self setUpdata];
}
- (void)viewWillDisappear:(BOOL)animated
{
[super viewWillDisappear:animated];
[MobClick endLogPageView:@"storeSetting"];
}
- (void)setUpdata {
WS(weakSelf)
......
ALand/CodeClass/Home/ViewController/StoreManagerment/StoreManagermentViewController.xib
View file @ 66eb830f
......@@ -338,7 +338,7 @@
<constraint firstAttribute="height" constant="1" id="Fq7-CN-esr"/>
</constraints>
</view>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="fcE-Ma-jO5">
<imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="fcE-Ma-jO5">
<rect key="frame" x="347" y="0.0" width="12" height="49"/>
<constraints>
<constraint firstAttribute="width" constant="12" id="v09-NI-Cfv"/>
......@@ -578,7 +578,7 @@
</button>
</objects>
<resources>
<image name="bac" width="13" height="24"/>
<image name="bac" width="11" height="20"/>
<image name="btn_commodity_manager" width="94" height="109"/>
<image name="btn_share_shop" width="95" height="111"/>
<image name="btn_shop_qrcode" width="119" height="106"/>
......
ALand/CodeClass/Home/ViewController/StoreManagerment/StoreNameViewController.m
View file @ 66eb830f
......@@ -18,6 +18,7 @@
- (void)viewDidLoad {
[super viewDidLoad];
self.navigationItem.title = @"店铺名称";
self.textFieldName.text = self.shopModel.name;
// Do any additional setup after loading the view from its nib.
}
......@@ -49,7 +50,7 @@
if ([responseObject[@"code"] isEqualToNumber:@0]) {
[hud hide:YES];
[MBProgressHUD Javen_showSuccess:@"修改成功！" onView:weakSelf.view delay:0.7 complete:^{
[MBProgressHUD Javen_showSuccess:@"保存成功！" onView:weakSelf.view delay:0.7 complete:^{
[weakSelf popAction];
}];
......
ALand/CodeClass/Home/ViewController/StoreManagerment/StoreNameViewController.xib
View file @ 66eb830f
......@@ -19,7 +19,7 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ALc-34-26d">
<rect key="frame" x="0.0" y="20" width="375" height="49"/>
<subviews>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="deL-BR-euJ">
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="deL-BR-euJ">
<rect key="frame" x="16" y="10" width="343" height="30"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="bF5-mo-edx"/>
......
ALand/CodeClass/Home/ViewController/StoreManagerment/introductionViewController.m
View file @ 66eb830f
......@@ -17,6 +17,7 @@
- (void)viewDidLoad {
[super viewDidLoad];
self.textViewInstroduction.text = self.shopModel.internalBaseClassDescription;
// Do any additional setup after loading the view from its nib.
}
- (IBAction)safeIntroductionAction:(id)sender {
......@@ -40,7 +41,7 @@
if ([responseObject[@"code"] isEqualToNumber:@0]) {
[hud hide:YES];
[MBProgressHUD Javen_showSuccess:@"修改成功！" onView:weakSelf.view delay:0.7 complete:^{
[MBProgressHUD Javen_showSuccess:@"保存成功！" onView:weakSelf.view delay:0.7 complete:^{
[weakSelf popAction];
}];
......
ALand/CodeClass/Login/ResetPasswordViewController.m
View file @ 66eb830f
......@@ -40,22 +40,7 @@
@"template":[NSNull null]};
WS(weakSelf)
#ifdef DEBUG
[[HTTPCilent shareCilent] GET:@"app/sendSms" parameters:parameters success:^(NSURLSessionDataTask *task, id responseObject) {
[MBProgressHUD hideHUDForView:weakSelf.view];
if (kIsResponseSuccess(responseObject)) {
NextResetPasswordViewController *nextVC = [[NextResetPasswordViewController alloc] initWithNibName:@"NextResetPasswordViewController" bundle:[NSBundle mainBundle]];
nextVC.isShowNavigationBar = YES;
nextVC.mobilePhone = weakSelf.phoneNumber.text;
[weakSelf.navigationController pushViewController:nextVC animated:YES];
}
} failure:^(NSURLSessionDataTask *task, NSError *error) {
[MBProgressHUD hideHUDForView:weakSelf.view];
}];
#else
if ([self.phoneNumber.text isMobileNumber]) {
[[HTTPCilent shareCilent] GET:@"app/sendSms" parameters:parameters success:^(NSURLSessionDataTask *task, id responseObject) {
[MBProgressHUD hideHUDForView:weakSelf.view];
......@@ -68,13 +53,7 @@
} failure:^(NSURLSessionDataTask *task, NSError *error) {
}];
}else{
[MBProgressHUD hideHUDForView:weakSelf.view];
[MBProgressHUD Javen_showError:@"号码格式不正确" onView:self.view delay:0.7 complete:nil];
}
#endif
}
......
ALand/CodeClass/MIne/ViewController/MyBandCard/AddDetailInfoViewController.m
View file @ 66eb830f
......@@ -9,6 +9,7 @@
#import "AddDetailInfoViewController.h"
#import "MyBankClass.h"
#import "JavenBankCards.h"
#import "MyBandCardViewController.h"
@interface AddDetailInfoViewController ()<UITextFieldDelegate>
@property (weak, nonatomic) IBOutlet UILabel *labelBankName;
@property (weak, nonatomic) IBOutlet UILabel *labelBankCardID;
......@@ -86,8 +87,15 @@
[MBProgressHUD hideHUDForView:weakSelf.view];
if ([responseObject[@"code"] isEqualToNumber:@0]) {
[MBProgressHUD Javen_showSuccess:@"设置成功！" onView:weakSelf.view delay:0.7 complete:^{
}];
[MBProgressHUD Javen_showSuccess:@"设置成功！" onView:weakSelf.view delay:0.7 complete:nil];
for (UIViewController *vc in weakSelf.navigationController.viewControllers) {
if ([vc isKindOfClass:[MyBandCardViewController class]]) {
[weakSelf.navigationController popToViewController:vc animated:YES];
}
}
}else{
[MBProgressHUD Javen_showSuccess:responseObject[@"message"] onView:weakSelf.view delay:0.7 complete:^{
}];
......
ALand/CodeClass/MIne/ViewController/MyBandCard/MyBandCardViewController.m
View file @ 66eb830f
......@@ -103,7 +103,7 @@
if ([responseObject[@"code"] isEqualToNumber:@0]) {
weakSelf.reseller = [JavenResellerBigModel modelObjectWithDictionary:responseObject[@"reseller"]];
[weakSelf.tableView reloadData];
weakSelf.bottomView.btnAdd.selected = self.reseller.certificate.bankCards.count == 1;
weakSelf.bottomView.btnAdd.selected = self.reseller.certificate.bankCards.count > 0;
}
......
ALand/CodeClass/MIne/ViewController/MyBillViewController.m
View file @ 66eb830f
......@@ -25,7 +25,7 @@
@property (nonatomic, strong) NSMutableArray *arrSortedData;
@property (nonatomic, strong) NSMutableArray *arrSortedMonths;
@property (nonatomic, strong) NoBillHistoryView *noBillHistoryView;
@property (nonatomic, strong) JavenSingleSortView *sortView;
......@@ -40,6 +40,7 @@
self.state = [NSNull null];
self.confirmed = [NSNull null];
JavenSingleSortView *sortView = [JavenSingleSortView sortViewTitles:@[@"全部账单",@"进账单",@"出账单",@"待确认账单"]];
self.sortView = sortView;
sortView.frame = CGRectMake(0, 0, 150, 35);
self.navigationItem.titleView = sortView;
......@@ -55,6 +56,11 @@
// Do any additional setup after loading the view from its nib.
}
- (void)popAction {
[super popAction];
[self.sortView hide];
}
- (void)viewWillLayoutSubviews {
self.noBillHistoryView.frame = CGRectMake(0, 0, kWidth, kHeight);
}
......@@ -134,7 +140,7 @@
case 3://
{
self.state = @[@"income"];
self.confirmed = @"action equals";
self.confirmed = @"unconfirmed only";
}
break;
......
ALand/Global/HTTPCilent.m
View file @ 66eb830f
......@@ -53,10 +53,10 @@
CLog(@"POST请求失败！----->%@", [error localizedDescription]);
failure(task, error);
[MBProgressHUD showMessage:@"网络错误，请检查网络！"];
MBProgressHUD *hud = [MBProgressHUD showMessage:@"网络错误，请检查网络！"];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[MBProgressHUD hideHUD];
[hud hide:YES];
});
}];
}
......@@ -74,10 +74,10 @@
success(task, responseObject);
} failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
[MBProgressHUD showMessage:@"网络错误，请检查网络！"];
MBProgressHUD *hud = [MBProgressHUD showMessage:@"网络错误，请检查网络！"];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[MBProgressHUD hideHUD];
[hud hide:YES];
});
CLog(@"GET请求失败！----->%@", [error localizedDescription]);
......
ALand/Info.plist
View file @ 66eb830f
......@@ -42,7 +42,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.0.0</string>
<string>1.0.04</string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>wechat</string>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment