侧边栏bug fix

Car.xcodeproj/project.pbxproj

@@ -948,6 +948,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = Car/Car.entitlements;
 				DEVELOPMENT_TEAM = W54V2VB863;
+				ENABLE_BITCODE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/Car/PrefixHeader.pch";
 				INFOPLIST_FILE = Car/Info.plist;
@@ -966,6 +967,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = Car/Car.entitlements;
 				DEVELOPMENT_TEAM = W54V2VB863;
+				ENABLE_BITCODE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/Car/PrefixHeader.pch";
 				INFOPLIST_FILE = Car/Info.plist;

Car/Base.lproj/Main.storyboard

@@ -713,7 +713,7 @@
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="OrderListTableViewCell" rowHeight="166" id="tpV-M9-l1S" customClass="OrderListTableViewCell">
                                         <rect key="frame" x="0.0" y="28" width="375" height="166"/>
                                         <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="tpV-M9-l1S" id="hzT-UH-DPk">
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" tag="11112222" contentMode="center" tableViewCell="tpV-M9-l1S" id="hzT-UH-DPk">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="166"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>

Car/CodeClass/LeftView/ViewControllers/CardViewController.m

@@ -50,7 +50,7 @@
   [self findCard];
   self.cardView.model = self.card;
   if ([self.card.state isEqualToString:@"used"]) {
-    self.btnConfirm.enabled = NO;
+//    self.btnConfirm.enabled = NO;
   }
 
 }

Car/CodeClass/Main/Cells/OrderListTableViewCell.m

@@ -21,7 +21,7 @@
   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 = [model.deduct stringValue];
+  self.labelPrice.text = [CalculateHelper getMoneyStringFrom:model.deduct];
 }
 
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {

Car/CodeClass/Main/ViewControllers/OrderDetailViewController.m

@@ -69,7 +69,7 @@
   self.labelCustomer.text = kStrPrefix(self.model.memberName, @"顾客：");
   self.labelPayment.text = kStrPrefix(self.model.paymentString, @"支付方式：");
   self.labelPayTime.text = kStrPrefix(self.model.payTime, @"支付时间：");
-  self.labelPrice.text = kStrPrefix(self.model.total, @"￥");
+  self.labelPrice.text = kStrPrefix([CalculateHelper getMoneyStringFrom:self.model.total], @"￥");
   self.labelVoucher.text = kStrPrefix([self.model.deduct stringValue], @"￥");
   self.labelRealPrice.text = kStrPrefix([self.model.realPayTotal stringValue], @"￥");
   self.labelIsInvoice.text = kStrPrefix(self.model.invoiceString, @"是否开票：");

Car/tools/WWSideslipViewControllerClass/WWSideslipViewController.m

@@ -89,7 +89,8 @@
       if (scalef > 140 * speedf) {
         [self showLeftView];
       } else if (scalef < -140 * speedf) {
-        [self showRighView];
+//        [self showRighView];
+        [self showMainView];
       } else {
         [self showMainView];
         scalef = 0;
@@ -126,7 +127,8 @@
     if (scalef > 140 * speedf) {
       [self showLeftView];
     } else if (scalef < -140 * speedf) {
-      [self showRighView];
+//      [self showRighView];
+      [self showMainView];
     } else {
       [self showMainView];
       scalef = 0;
@@ -147,7 +149,7 @@
   // 输出点击的view的类名
   CLog(@"%@", NSStringFromClass([touch.view class]));
   // 若为UITableViewCellContentView（即点击了tableViewCell），则不截获Touch事件
-  if (touch.view.tag == 11112222) {
+  if (self.isShowLeft) {
     return YES;
   }
   return  NO;
@@ -157,7 +159,7 @@
 //恢复位置
 - (void)showMainView {
   self.isShowLeft = NO;
-  [kGlobal.mainVC hideShadow];
+//  [kGlobal.mainVC hideShadow];
   [UIView beginAnimations:nil context:nil];
   mainControl.view.transform =
       CGAffineTransformScale(CGAffineTransformIdentity, 1.0, 1.0);
@@ -170,7 +172,7 @@
 //显示左视图
 - (void)showLeftView {
   self.isShowLeft = YES;
-  [kGlobal.mainVC showShadow];
+//  [kGlobal.mainVC showShadow];
   leftControl.view.hidden = NO;
   [UIView beginAnimations:nil context:nil];
   mainControl.view.transform =