Merge pull request '罗世杰：feat：轮播图，分析统计、轮播消息接口接入' (#41) from lj into master

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

components/InputAndSwiper/InputAndSwiper.vue

@@ -13,7 +13,7 @@
 				</u-input>
 			</view>
 		</view>
-		<u-swiper :list="headerBgList" height="300rpx" />
+		<u-swiper :list="bannerURL" height="300rpx" />
 	</view>
 </template>
 
@@ -22,7 +22,7 @@
 	export default {
 		name: "inputAndSwiper",
 		props: {
-			headerBgList: {
+			bannerURL: {
 				type: Array,
 				default () {
 					return [

pages/index/HomeMainContent/HomeNavCard.vue

@@ -63,7 +63,14 @@
 					uni.navigateTo({
 						url: this.navItems[index].url
 					})
+				}else if (index == 7) {
+					uni.makePhoneCall({
+						phoneNumber: '123456789',
+						success: (result) => {},
+						fail: (error) => {}
+					})
 				}
+
 			}
 		}
 	};

pages/index/HomeMainContent/HomeNoticeBar.vue

@@ -10,6 +10,7 @@
 				customStyle="width:70vw"
 				color="#232323"
 				icon=" "
+				direction="column"
 			/>
 		</view>
 		
@@ -18,14 +19,14 @@
 
 <script>
 	/**
-	 * @property {String}  text 需要显示的消息 
+	 * @property {Array}  text 需要显示的消息 
 	 */
 	export default {
 		props: {
 			text: {
-				type: String,
+				type: Array,
 				default() {
-					return ' '
+					return []
 				}
 			}
 		}

pages/index/HomeMainContent/Statistics.vue

@@ -8,9 +8,9 @@
 				/>
 			</view>
 			<text class="text1">累计用户</text>
-			<text class="num1">{{ sumUser.total }}</text>
+			<text class="num1">{{ totalUser }}</text>
 			<view class="border border1"></view>
-			<text class="num11">昨日新增{{ sumUser.yesterday }}位</text>
+			<text class="num11">昨日新增{{ yesterdayUser }}位</text>
 
 		</view>
 		<view class="right">
@@ -22,9 +22,9 @@
 					/>
 				</view>
 				<text class="text2">累计转店</text>
-				<text class="num2">{{ sumTrans.total }}</text>
+				<text class="num2">{{ totalTrans }}</text>
 				<view class="border border2"></view>
-				<text class="num21">昨日新增{{ sumTrans.yesterday }}位</text>
+				<text class="num21">昨日新增{{ yesterdayTrans }}位</text>
 
 			</view>
 			<view class="right2">
@@ -35,9 +35,9 @@
 					/>
 				</view>
 				<text class="text3">累计找店</text>
-				<text class="num3">{{ sumSearch.total }}</text>
+				<text class="num3">{{ totalSearch }}</text>
 				<view class="border border3"></view>
-				<text class="num22">昨日新增{{ sumSearch.yesterday }}位</text>
+				<text class="num22">昨日新增{{ yesterdaySearch }}位</text>
 			</view>
 			
 		</view>
@@ -49,26 +49,23 @@
 <script>
 	export default {
 		props:{
-			sumUser:{
+			totalUser:{
-				type:Object,
+				type:Number
-				default: {
-					"total": 231753,
-					"yesterday": 1345
-				}
 			},
-			sumTrans:{
+			yesterdayUser:{
-				type:Object,
+				type:Number
-				default: {
-					"total": 231753,
-					"yesterday": 1345
-				}
 			},
-			sumSearch:{
+			totalTrans:{
-				type:Object,
+				type:Number
-				default: {
+			},
-					"total": 231753,
+			yesterdayTrans:{
-					"yesterday": 1345
+				type:Number
-				}
+			},
+			totalSearch:{
+				type:Number
+			},
+			yesterdaySearch:{
+				type:Number
 			}
 		},
 	}

pages/index/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="home-base-bg">
-		<InputAndSwiper type='0'></InputAndSwiper>
+		<InputAndSwiper type='0' :bannerURL="swiperList"></InputAndSwiper>
 		<view class="home-content">
 			<view class="service">
 				<u-image src="/static/statistics/sy_icon_lxkf.png" width="108rpx" height="108rpx"/>
@@ -35,17 +35,33 @@
 		},
 		data() {
 			return {
-				notice: '寒雨连江夜入吴 平明送客楚山孤 洛阳亲友如相问 一片冰心在玉壶',
+				notice: [],
 				chooseIndex: 0,
 				statisticsNum: [231753, 1345],
 				swiperList:[]
 			}
 		},
 		onLoad() {
-			
+			this.getBanner()
+			this.getNotice()
+			this.getStat()
 		},
 		methods: {
-
+			getBanner(){
+				this.$api.getBanner().then(res=>{  
+					this.swiperList = res.data.data.map(item=>item.img)
+				})
+			},
+			getNotice(){
+				this.$api.getHotInfo().then(res=>{
+					this.notice = res.data.data.map(item=>item.title)
+				})
+			},
+			getStat(){
+				this.$api.getStat().then(res=>{
+					this.statisticsNum = res.data.data
+				})
+			}
 		},
 		computed: {
 

service/request.js

@@ -1,4 +1,4 @@
-const serverHost = ''//http://xx.xxx.xx
+const serverHost = 'https://spsp.feashow.com/api/'//http://xx.xxx.xx
 
 const service = {
 	get(url, data) {
@@ -174,6 +174,26 @@ const apiService = {
 			resolve(service.putWithFormData(url, data))
 		})
 	},
+	// 获取轮播图
+	getBanner() {
+		const url = `/home/banner`
+		return new Promise((resolve, reject) => {
+			resolve(service.get(url))
+		})
+	},
+	// 获取热门信息
+	getHotInfo() {
+		const url = `/news/nlists/`
+		return new Promise((resolve, reject) => {
+			resolve(service.get(url))
+		})
+	},
+	getStat() {
+		const url = `/home/stat`
+		return new Promise((resolve, reject) => {
+			resolve(service.get(url))
+		})
+	}
 }
 export {
 	apiService,