Commit 12fbdebc by 夏新然

Merge branch 'master' of http://192.168.9.26/xiaxr/appweb

2 parents 4b95c1e8 5f1ec7ba
...@@ -20,7 +20,6 @@ Vue.component(VTable.name, VTable) ...@@ -20,7 +20,6 @@ Vue.component(VTable.name, VTable)
Vue.component(VPagination.name, VPagination) Vue.component(VPagination.name, VPagination)
Vue.use(VueI18n) Vue.use(VueI18n)
Vue.use(AwesomePicker); Vue.use(AwesomePicker);
console.log('main MobileMessage', MobileMessage)
Vue.use(MobileMessage) Vue.use(MobileMessage)
Vue.config.productionTip = false Vue.config.productionTip = false
Vue.prototype.echarts=echarts; Vue.prototype.echarts=echarts;
......
This diff could not be displayed because it is too large.
...@@ -15,12 +15,12 @@ ...@@ -15,12 +15,12 @@
"navigationBarTitleText": "综合分析" "navigationBarTitleText": "综合分析"
} }
},{ },{
"path": "pages/passenger/index", "path": "pages/passenger/passenger",
"style": { "style": {
"navigationBarTitleText": "精准客流" "navigationBarTitleText": "精准客流"
} }
},{ },{
"path": "pages/profile/index", "path": "pages/profile/profile",
"style": { "style": {
"navigationBarTitleText": "我的" "navigationBarTitleText": "我的"
} }
...@@ -159,6 +159,16 @@ ...@@ -159,6 +159,16 @@
"style": { "style": {
"navigationBarTitleText": "" "navigationBarTitleText": ""
} }
},{
"path": "pages/passenger/captureReport/capture",
"style": {
"navigationBarTitleText": "抓拍记录"
}
},{
"path": "pages/passenger/groupTimeReport/groupTime",
"style": {
"navigationBarTitleText": "客群分时统计"
}
}], }],
"condition": { //模式配置,仅开发期间生效 "condition": { //模式配置,仅开发期间生效
"current": 0, //当前激活的模式(list 的索引项) "current": 0, //当前激活的模式(list 的索引项)
...@@ -190,7 +200,7 @@ ...@@ -190,7 +200,7 @@
"selectedIconPath": "static/index/snySelect.png", "selectedIconPath": "static/index/snySelect.png",
"text": "综合分析" "text": "综合分析"
}, { }, {
"pagePath": "pages/passenger/index", "pagePath": "pages/passenger/passenger",
"iconPath": "static/index/flow.png", "iconPath": "static/index/flow.png",
"selectedIconPath": "static/index/flowSelect.png", "selectedIconPath": "static/index/flowSelect.png",
"text": "精准客流" "text": "精准客流"
...@@ -200,7 +210,7 @@ ...@@ -200,7 +210,7 @@
"selectedIconPath": "static/index/manageSelect.png", "selectedIconPath": "static/index/manageSelect.png",
"text": "后台管理" "text": "后台管理"
}, { }, {
"pagePath": "pages/profile/index", "pagePath": "pages/profile/profile",
"iconPath": "static/index/my.png", "iconPath": "static/index/my.png",
"selectedIconPath": "static/index/mySelect.png", "selectedIconPath": "static/index/mySelect.png",
"text": "我的" "text": "我的"
......
<template> <template>
<div>222</div> <view>抓拍记录</view>
</template> </template>
<script> <script>
......
<template>
<view>
客群分时统计
</view>
</template>
<script>
</script>
<style>
</style>
<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>
<template> <template>
<view> <view>
<headerComp :title="titleStr"></headerComp> <headerComp :title="titleStr"></headerComp>
<view style="height: 25.36upx"></view> <view class="prefix-elem"></view>
<view class="profile-item" @tap="switchConnect"> <view class="profile-item" @tap="switchConnect">
<span class="texts">切换服务器地址</span> <span class="texts">切换服务器地址</span>
<img class="arrows" :src="rArrow" alt=""/> <img class="arrows" :src="rArrow" alt=""/>
...@@ -75,6 +75,9 @@ ...@@ -75,6 +75,9 @@
</script> </script>
<style> <style>
.prefix-elem {
height: 25.36upx;
}
.profile-item { .profile-item {
background: #FFFFFF; background: #FFFFFF;
position: relative; position: relative;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!