Merge branch 'develop'

main.js

@@ -20,7 +20,6 @@ Vue.component(VTable.name, VTable)
 Vue.component(VPagination.name, VPagination)
 Vue.use(VueI18n)
 Vue.use(AwesomePicker);
-console.log('main MobileMessage', MobileMessage)
 Vue.use(MobileMessage)
 Vue.config.productionTip = false
 Vue.prototype.echarts=echarts;

pages.json

@@ -15,12 +15,12 @@
             "navigationBarTitleText": "综合分析"
 		}
     },{
-        "path": "pages/passenger/index",
+        "path": "pages/passenger/passenger",
         "style": {
             "navigationBarTitleText": "精准客流"
 		}
     },{
-        "path": "pages/profile/index",
+        "path": "pages/profile/profile",
         "style": {
             "navigationBarTitleText": "我的"
 		}
@@ -109,6 +109,16 @@
         "style": {
             "navigationBarTitleText": ""
         }
+    },{
+        "path": "pages/passenger/captureReport/capture",
+        "style": {
+            "navigationBarTitleText": "抓拍记录"
+        }
+    },{
+        "path": "pages/passenger/groupTimeReport/groupTime",
+        "style": {
+            "navigationBarTitleText": "客群分时统计"
+        }
     }],
     "condition": { //模式配置，仅开发期间生效
         "current": 0, //当前激活的模式（list 的索引项）
@@ -140,7 +150,7 @@
             "selectedIconPath": "static/index/snySelect.png",
             "text": "综合分析"
         }, {
-            "pagePath": "pages/passenger/index",
+            "pagePath": "pages/passenger/passenger",
             "iconPath": "static/index/flow.png",
             "selectedIconPath": "static/index/flowSelect.png",
             "text": "精准客流"
@@ -150,7 +160,7 @@
             "selectedIconPath": "static/index/manageSelect.png",
             "text": "后台管理"
         }, {
-            "pagePath": "pages/profile/index",
+            "pagePath": "pages/profile/profile",
             "iconPath": "static/index/my.png",
             "selectedIconPath": "static/index/mySelect.png",
             "text": "我的"

pages/passenger/index.vue → pages/passenger/captureReport/capture.vue

 <template>
-	<div>222</div>
+	<view>抓拍记录</view>
 </template>
 
 <script>

pages/passenger/groupTimeReport/groupTime.vue

+<template>
+	<view>
+		客群分时统计
+	</view>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

pages/passenger/passenger.vue

+<template>
+	<view>
+		<headerComp :title="titleStr"></headerComp>
+		<view class="listBox">
+			<view class="itemBox" v-for="item in listData" @tap="goReport(item.src)">
+				<img class="icons" :src="item.iconSrc"/>
+				<span class="texts">{{item.text}}</span>
+				<img class="arrows" :src="item.rArrow" alt=""/>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import headerComp from '../../components/header'
+	import arrow from '../../static/analysis/rArrow.png'
+	import baseIcon from '../../static/analysis/base.png'
+	import inout from '../../static/analysis/inout.png'
+	
+	export default {
+		components: {
+			headerComp
+		},
+		data() {
+			return {
+				titleStr:'精准客流',
+				listData:[{
+					text:"抓拍记录",
+					iconSrc:baseIcon,
+					rArrow:arrow,
+					src:'captureReport/capture'
+				},{
+					text:"客群分时统计",
+					iconSrc:inout,
+					rArrow:arrow,
+					src:'groupTimeReport/groupTime'
+				}]
+			}
+		},
+		methods: {
+			goReport(url){
+				uni.navigateTo({
+					url:url,
+					animationType: 'slide-in-right',
+					animationDuration: 200
+				})
+			},
+		},
+	}
+</script>
+
+<style>
+	.listBox{
+		padding: 18.11upx 21.73upx;
+	}
+	.itemBox{
+		padding: 25.36upx 0;
+		background: #FFFFFF;
+		position: relative;
+		margin-bottom: 18.11upx;
+	}
+	.itemBox:active{
+		background: #EEEEEE;
+	}
+	.icons{
+		width: 28.98upx;
+		position: absolute;
+		top: 48.91upx;
+		left: 43.47upx;
+	}
+	.texts{
+		display: inline-block;
+		height: 68.84upx;
+		line-height: 68.84upx;
+		border-left:3.62upx #EEEEEE solid;
+		padding-left: 34.42upx;
+		font-size: 25.4upx;
+		color: #000000;
+		margin-left:115.94upx;
+	}
+	.arrows{
+		width: 14.49upx;
+		height: 25.36upx;
+		position: absolute;
+		right: 25.36upx;
+		top: 47.1upx;
+	}
+</style>

pages/profile/index.vue → pages/profile/profile.vue

 <template>
 	<view>
 		<headerComp :title="titleStr"></headerComp>
-		<view style="height: 25.36upx"></view>
+		<view class="prefix-elem"></view>
 		<view class="profile-item" @tap="switchConnect">
 			<span class="texts">切换服务器地址</span>
 			<img class="arrows" :src="rArrow" alt=""/>
@@ -69,6 +69,9 @@
 </script>
 
 <style>
+	.prefix-elem {
+		height: 25.36upx;
+	}
 	.profile-item {
 		background: #FFFFFF;
 		position: relative;