学丽 5 years ago
parent
commit
419dd495ff

BIN
.DS_Store


+ 32 - 0
KuDianProject.xcworkspace/xcuserdata/lxl.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -39,5 +39,37 @@
39 39
             landmarkType = "7">
40 40
          </BreakpointContent>
41 41
       </BreakpointProxy>
42
+      <BreakpointProxy
43
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
44
+         <BreakpointContent
45
+            shouldBeEnabled = "Yes"
46
+            ignoreCount = "0"
47
+            continueAfterRunningActions = "No"
48
+            filePath = "KuDianProject/TOP/Drawer/Control/KDPWebInteractionVC.m"
49
+            timestampString = "586060408.290048"
50
+            startingColumnNumber = "9223372036854775807"
51
+            endingColumnNumber = "9223372036854775807"
52
+            startingLineNumber = "109"
53
+            endingLineNumber = "109"
54
+            landmarkName = "-JumpGoodDetail:"
55
+            landmarkType = "7">
56
+         </BreakpointContent>
57
+      </BreakpointProxy>
58
+      <BreakpointProxy
59
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
60
+         <BreakpointContent
61
+            shouldBeEnabled = "Yes"
62
+            ignoreCount = "0"
63
+            continueAfterRunningActions = "No"
64
+            filePath = "KuDianProject/TOP/Drawer/Control/KDPWebInteractionVC.m"
65
+            timestampString = "586060408.290116"
66
+            startingColumnNumber = "9223372036854775807"
67
+            endingColumnNumber = "9223372036854775807"
68
+            startingLineNumber = "123"
69
+            endingLineNumber = "123"
70
+            landmarkName = "-getGoodDetail:"
71
+            landmarkType = "7">
72
+         </BreakpointContent>
73
+      </BreakpointProxy>
42 74
    </Breakpoints>
43 75
 </Bucket>

BIN
KuDianProject/.DS_Store


BIN
KuDianProject/Assets.xcassets/.DS_Store


BIN
KuDianProject/Assets.xcassets/LaunchImage.launchimage/41564371267_.pic_hd.jpg


BIN
KuDianProject/Assets.xcassets/LaunchImage.launchimage/51564371268_.pic_hd.jpg


+ 17 - 0
KuDianProject/Assets.xcassets/LaunchImage.launchimage/Contents.json

@@ -44,6 +44,23 @@
44 44
       "minimum-system-version" : "8.0",
45 45
       "orientation" : "portrait",
46 46
       "scale" : "2x"
47
+    },
48
+    {
49
+      "orientation" : "portrait",
50
+      "idiom" : "iphone",
51
+      "filename" : "51564371268_.pic_hd.jpg",
52
+      "extent" : "full-screen",
53
+      "minimum-system-version" : "7.0",
54
+      "scale" : "2x"
55
+    },
56
+    {
57
+      "extent" : "full-screen",
58
+      "idiom" : "iphone",
59
+      "subtype" : "retina4",
60
+      "filename" : "41564371267_.pic_hd.jpg",
61
+      "minimum-system-version" : "7.0",
62
+      "orientation" : "portrait",
63
+      "scale" : "2x"
47 64
     }
48 65
   ],
49 66
   "info" : {

+ 2 - 2
KuDianProject/Info.plist

@@ -17,9 +17,9 @@
17 17
 	<key>CFBundlePackageType</key>
18 18
 	<string>APPL</string>
19 19
 	<key>CFBundleShortVersionString</key>
20
-	<string>1.0.1</string>
20
+	<string>1.0.3</string>
21 21
 	<key>CFBundleVersion</key>
22
-	<string>104</string>
22
+	<string>107</string>
23 23
 	<key>LSApplicationQueriesSchemes</key>
24 24
 	<array>
25 25
 		<string>wechat</string>

+ 4 - 3
KuDianProject/TOP/Controller/KDPGoodDetailVC.m

@@ -77,7 +77,7 @@
77 77
     }@catch (NSException *exception) {
78 78
         
79 79
     }
80
-    NSLog(@"释放了------------");
80
+   
81 81
 }
82 82
 #pragma mark---商品详情
83 83
 -(void)getGoodDetail
@@ -87,11 +87,12 @@
87 87
     }
88 88
     [LoadingView show];
89 89
     [KDPNetworkRequestHTTP postURL:goodDetailURL params:@{@"goods_id":self.model.goods_id} success:^(id  _Nonnull json) {
90
+        [self saveHistoryModel:self.detailModel];
90 91
         self.detailModel=[KDPGoodsModel yy_modelWithJSON:json[@"data"]];
91 92
         if (self.detailModel.goods_point.length>0) {
92 93
             [self good_points];
93 94
         }
94
-        if (self.model.commission_rate.length>0) {
95
+        if (self.model.commission_rate.floatValue>0) {
95 96
             self.detailModel.commission_rate = self.model.commission_rate;
96 97
         }
97 98
         self.infoView.model=self.detailModel;
@@ -99,7 +100,7 @@
99 100
         [self loadRequestWeb];
100 101
         [LoadingView dismiss];
101 102
         [self isCollect];
102
-        [self saveHistoryModel:self.detailModel];
103
+        
103 104
     } failure:^(NSError * _Nonnull error) {
104 105
         [LoadingView dismiss];
105 106
     }];

+ 2 - 2
KuDianProject/TOP/Drawer/Control/KDPWebInteractionVC.m

@@ -106,7 +106,7 @@ static NSString *kd_h5_open_goodDetail=@"kd_h5_open_goodDetail";
106 106
     NSDictionary *dict = [KDPublicMethod dictionaryWithJsonString:message.body];
107 107
     KDPGoodsModel *model =[[KDPGoodsModel alloc]init];
108 108
     model.goods_id = [NSString stringWithFormat:@"%@",dict[@"goodsid"]];
109
-    if ([dict[@"commissionRate"]length]>0) {
109
+    if ([dict[@"commissionRate"]floatValue]>0) {
110 110
         model.commission_rate= [NSString stringWithFormat:@"%@",dict[@"commissionRate"]];
111 111
     }
112 112
     
@@ -120,7 +120,7 @@ static NSString *kd_h5_open_goodDetail=@"kd_h5_open_goodDetail";
120 120
     NSDictionary *dict = [KDPublicMethod dictionaryWithJsonString:message.body];
121 121
     KDPGoodsModel *model =[[KDPGoodsModel alloc]init];
122 122
     model.goods_id = [NSString stringWithFormat:@"%@",dict[@"goodsId"]];
123
-    if ([dict[@"commissionRate"]length]>0) {
123
+    if ([dict[@"commissionRate"]floatValue]>0) {
124 124
         model.commission_rate= [NSString stringWithFormat:@"%@",dict[@"commissionRate"]];
125 125
     }
126 126
     KDPGoodDetailVC *detailVC = [[KDPGoodDetailVC alloc] init];

+ 1 - 1
KuDianProject/TOP/View/Detail/KDPDetailGoodInformationView.m

@@ -167,7 +167,7 @@
167 167
     if (!_couponImgV) {
168 168
         _couponImgV=[[UIImageView alloc]init];
169 169
         _couponImgV.image=[UIImage imageNamed:@"coupon_icon"];
170
-        
170
+        _couponImgV.hidden=YES;
171 171
         UILabel *quanL=[[UILabel alloc]initWithFrame:CGRectMake(0, 0, 20, 16)];
172 172
         quanL.text=@"券";
173 173
         quanL.font=[UIFont systemFontOfSize:12];