Merge branch 'local' into develop

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.0.2016061704</string>
+	<string>1.0.0.2016062101</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

@@ -39,7 +39,7 @@ export default class ChartView extends Component {
             }
         }
 
-        let yString = 0;
+        let yString = '';
         let yLength = yData.length;
         if (yLength !== 0) {
             for (var i = 0; i < yLength; i++) {

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

@@ -52,10 +52,10 @@ export default function saleStatisticsReducer(state = initialState, action) {
 				for (let i = 0; i < list.length; i++) {
 					let item = action.payload.list[i];
 					sevenDays.push(moment(item.dateId).format('MM.DD'));
-					trendInSevenDays.push(item.allNums);
+					trendInSevenDays.push(item.allAmounts);
 				}
 			}
-
+			
 			let amountRate = additionInfo.allAmountRate || 0;
 			let countRate = additionInfo.allNumberRate || 0;
 			let amountHasTrendData = additionInfo.allAmountRateFlag;