Merge branch 'develop' of git.yoho.cn:mobile/yh_vendor into develop

@@ -445,9 +445,9 @@
 					"-ObjC",
 					"-ObjC",
 					"-lc++",
 					"-lc++",
 				);
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = cn.yoho.marketplace;
+				PRODUCT_BUNDLE_IDENTIFIER = cn.yoho.vendor;
 				PRODUCT_NAME = YH_Vendor;
 				PRODUCT_NAME = YH_Vendor;
-				PROVISIONING_PROFILE = "c7f1ffb1-28c3-4ecb-b185-c21e7cf62a85";
+				PROVISIONING_PROFILE = "7f2483ba-6187-4868-b1a8-9cc91bf1fd73";
 			};
 			};
 			name = Debug;
 			name = Debug;
 		};
 		};
@@ -475,9 +475,9 @@
 					"-ObjC",
 					"-ObjC",
 					"-lc++",
 					"-lc++",
 				);
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = cn.yoho.marketplace;
+				PRODUCT_BUNDLE_IDENTIFIER = cn.yoho.vendor;
 				PRODUCT_NAME = YH_Vendor;
 				PRODUCT_NAME = YH_Vendor;
-				PROVISIONING_PROFILE = "b1f4ea2a-a435-4a56-b648-390635342be6";
+				PROVISIONING_PROFILE = "9596d093-33c8-4fe4-9808-c898268171ce";
 			};
 			};
 			name = Release;
 			name = Release;
 		};
 		};

@@ -30,7 +30,7 @@
    * `inet` value under `en0:`) and make sure your computer and iOS device are
    * `inet` value under `en0:`) and make sure your computer and iOS device are
    * on the same Wi-Fi network.
    * on the same Wi-Fi network.
    */
    */
-
+#if DEBUG
   jsCodeLocation = [NSURL URLWithString:@"http://localhost:8081/index.ios.bundle?platform=ios&dev=true"];
   jsCodeLocation = [NSURL URLWithString:@"http://localhost:8081/index.ios.bundle?platform=ios&dev=true"];
 
 
   /**
   /**
@@ -40,8 +40,9 @@
    * running the project on an actual device or running the project on the
    * running the project on an actual device or running the project on the
    * simulator in the "Release" build configuration.
    * simulator in the "Release" build configuration.
    */
    */
-
-//   jsCodeLocation = [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
+#else
+   jsCodeLocation = [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
+#endif
 
 
   RCTRootView *rootView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation
   RCTRootView *rootView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation
                                                       moduleName:@"YH_Vendor"
                                                       moduleName:@"YH_Vendor"

@@ -33,7 +33,7 @@ export default function refoundStatisticsReducer(state = initialState, action) {
             if (list) {
             if (list) {
                 for (var i = 0; i < list.length; i++) {
                 for (var i = 0; i < list.length; i++) {
                     let item = action.payload.list[i];
                     let item = action.payload.list[i];
-                    sixMonths.push(moment(item.dateId).format('MM月'));
+                    sixMonths.push(moment(item.dateId, 'YYYYMM').format('MM月'));
                     trendInSixMonth.push(item.allNums);
                     trendInSixMonth.push(item.allNums);
                 }
                 }
             }
             }

@@ -49,7 +49,7 @@ export default class UserService {
 		return await this.api.get({
 		return await this.api.get({
 			url:'',
 			url:'',
 			body: {
 			body: {
-				method: 'app.shops.balance',
+				method: 'app.shops.accountbalance',
 				...params,
 				...params,
 			}
 			}
 		})
 		})