Merge pull request '罗世杰：合并首页部分api' (#48) from lj into master

Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/48

pages/index/HomeMainContent/Statistics.vue

@@ -8,9 +8,9 @@
 				/>
 			</view>
 			<text class="text1">累计用户</text>
-			<text class="num1">{{ totalUser }}</text>
+			<text class="num1">{{ statNum.all_user_num }}</text>
 			<view class="border border1"></view>
-			<text class="num11">昨日新增{{ yesterdayUser }}位</text>
+			<text class="num11">昨日新增{{ statNum.yesterday_user_num }}位</text>
 
 		</view>
 		<view class="right">
@@ -22,9 +22,9 @@
 					/>
 				</view>
 				<text class="text2">累计转店</text>
-				<text class="num2">{{ totalTrans }}</text>
+				<text class="num2">{{ statNum.all_trans_num }}</text>
 				<view class="border border2"></view>
-				<text class="num21">昨日新增{{ yesterdayTrans }}位</text>
+				<text class="num21">昨日新增{{ statNum.yesterday_trans_num }}位</text>
 
 			</view>
 			<view class="right2">
@@ -35,9 +35,9 @@
 					/>
 				</view>
 				<text class="text3">累计找店</text>
-				<text class="num3">{{ totalSearch }}</text>
+				<text class="num3">{{ statNum.all_find_num }}</text>
 				<view class="border border3"></view>
-				<text class="num22">昨日新增{{ yesterdaySearch }}位</text>
+				<text class="num22">昨日新增{{ statNum.yesterday_find_num }}位</text>
 			</view>
 			
 		</view>
@@ -47,27 +47,18 @@
 </template>
 
 <script>
+
 	export default {
 		props:{
-			totalUser:{
+			statNum :{
-				type:Number
+				type:Object,
-			},
+				default(){
-			yesterdayUser:{
+					return {
-				type:Number
+						
-			},
+					}
-			totalTrans:{
+				}
-				type:Number
-			},
-			yesterdayTrans:{
-				type:Number
-			},
-			totalSearch:{
-				type:Number
-			},
-			yesterdaySearch:{
-				type:Number
 			}
-		},
+		}
 	}
 </script>
 

pages/index/index.vue

@@ -7,7 +7,7 @@
 			</view>
 			<HomeNavCard></HomeNavCard>
 			<HomeNoticeBar :text="notice" />
-			<Statistics :data="statisticsNum" />
+			<Statistics :statNum="statNum"/>
 			<view class="show-and-search">
 				<view class="show-tab list-tab" :class="{ 'tab-activate': chooseIndex === 0 }" @click="this.chooseIndex=0">
 					<text>店铺列表</text>
@@ -38,7 +38,7 @@
 			return {
 				notice: [],
 				chooseIndex: 0,
-				statisticsNum: [231753, 1345],
+				statNum: {},
 				swiperList:[]
 			}
 		},
@@ -62,7 +62,8 @@
 			},
 			getStat(){
 				this.$api.getStat().then(res=>{
-					this.statisticsNum = res.data.data
+					this.statNum = res.data.data
+					console.log(res.data.data);
 				})
 			},
 			getRegionList() {