Merge branch 'master' of git.oschina.net:gomore/Opple-iOS

Class/Experiencecentre/Controller/ExperienceCentreViewController.m

@@ -273,6 +273,7 @@
     }
     shareController.shareID = goodsID;
     shareController.shareImage = [self capture];
+    shareController.type = SHARE_GOODS;
     shareController.preferredContentSize = CGSizeMake(290, 120);
     shareController.modalPresentationStyle = UIModalPresentationPopover;
     UIPopoverPresentationController *popover = shareController.popoverPresentationController;

Class/Experiencecentre/Controller/ShareGoodsViewController.m

@@ -116,8 +116,8 @@
     switch (self.type) {
         case SHARE_GOODS:
         {
-            UMShareImageObject *shareObject = [[UMShareImageObject alloc] init];
-            [shareObject setShareImage:self.shareImage];
+            UMShareWebpageObject *shareObject = [UMShareWebpageObject shareObjectWithTitle:@"欧立方体验中心一键分享" descr:@"欧立方体验中心一键分享" thumImage:self.shareImage];
+            shareObject.webpageUrl = shareWeb;
             messageObject.shareObject = shareObject;
         }
             

Class/MyClient/Orderdetails/controller/OrderdetailsViewController.m

@@ -538,7 +538,13 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
                     weChatModel.total = weakSelf.weChatModel.wxcardDenomation;break;
                 }
             }
-            [XBLoadingView showHUDViewWithText:[NSString stringWithFormat:@"微信卡劵(%ld元)使用成功",weakSelf.weChatModel.wxcardDenomation]];
+            NSString *message = MESSAGE(returnValue);
+            if ([[self class] isBlankString: message]) {
+                [XBLoadingView showHUDViewWithText:[NSString stringWithFormat:@"微信卡劵(%ld元)使用成功",weakSelf.weChatModel.wxcardDenomation]];
+
+            }else {
+                [XBLoadingView showHUDViewWithText:message];
+            }
             [weakSelf promotionInformationExecutionOrder];
         }else{
             ShowDefaultAlertView(self, nil, [NSString stringWithFormat:@"微信卡劵使用失败:(%@),是否重试？",returnValue[@"msg"]], UIAlertControllerStyleAlert, ^{