Commit 54a2adcf by 李君

优化

1 parent 40d0d38f
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
"index/index2", "index/index2",
"index/me", "index/me",
"pages/login/index", "pages/login/index",
"pages/homes/index",
"pages/editPwd/editPwd", "pages/editPwd/editPwd",
"pages/shopSelect/index" "pages/shopSelect/index"
], ],
......
...@@ -34,7 +34,7 @@ Component({ ...@@ -34,7 +34,7 @@ Component({
"pagePath": "/index/index2", "pagePath": "/index/index2",
"iconPath": "../images/cong.png", "iconPath": "../images/cong.png",
"selectedIconPath": "../images/cong-b.png", "selectedIconPath": "../images/cong-b.png",
"text": "工作台", "text": "店铺首页",
"curr": 2 "curr": 2
}, },
{ {
......
...@@ -7,7 +7,6 @@ import moment from 'moment' ...@@ -7,7 +7,6 @@ import moment from 'moment'
Component({ Component({
pageLifetimes: { pageLifetimes: {
show() { show() {
this.loadData()
if (typeof this.getTabBar === 'function' && this.getTabBar()) { if (typeof this.getTabBar === 'function' && this.getTabBar()) {
this.getTabBar().setData({ this.getTabBar().setData({
// 当前页面的 tabBar 索引 // 当前页面的 tabBar 索引
...@@ -16,6 +15,9 @@ Component({ ...@@ -16,6 +15,9 @@ Component({
} }
} }
}, },
ready(){
this.loadData()
},
data: { data: {
selectName: '',//集团名称 selectName: '',//集团名称
openMllNum:0,//开业门店数 openMllNum:0,//开业门店数
...@@ -176,7 +178,7 @@ Component({ ...@@ -176,7 +178,7 @@ Component({
},()=>{ },()=>{
// wx.hideLoading(); // wx.hideLoading();
}) })
},1000) },500)
}) })
}, },
// 获取门店排行 // 获取门店排行
......
...@@ -19,6 +19,44 @@ Component({ ...@@ -19,6 +19,44 @@ Component({
curClick: 2 curClick: 2
}) })
} }
}
},
/**
* 组件的初始数据
*/
data: {
currentTime: moment().format("YYYY-MM-DD"),
types: 1, //选中的时间类型
trendtypes: 1, //选中的业态趋势类型
chartData: {}, //客流趋势分析数据
chartDatastop: {}, //停留时长统计
chartDataSex: {}, //客群性别占比
chartDataAge: {}, //客群年龄占比
show: false, //显示日期自定义选择
minDate: new Date(2022, 0, 1).getTime(), //自定义时间的开始日期
// maxDate: new Date(2022, 11, 31).getTime(), //自定义时间的结束日期
maxDate: new Date(2025, 11, 31).getTime(), //自定义时间的结束日期
shopList: [
// {
// id: 1,
// name: '小米'
// }, {
// id: 2,
// name: '华为'
// }
], //店铺列表数据
selectId: '', //选中的店铺id
selectName: '', //选中店铺名字
columnsListName: [], //店铺的名字下拉列表
exposure: 0,
traffic: 0,
customer: 0,
entryRate: 0,
info: {}
},
ready(){
if (wx.getStorageSync('shopName') && this.data.shopList.length > 0) { if (wx.getStorageSync('shopName') && this.data.shopList.length > 0) {
let selectId = this.data.shopList.find(item => item.name == wx.getStorageSync('shopName')).id let selectId = this.data.shopList.find(item => item.name == wx.getStorageSync('shopName')).id
this.setData({ this.setData({
...@@ -75,41 +113,6 @@ Component({ ...@@ -75,41 +113,6 @@ Component({
}) })
}) })
} }
}
},
/**
* 组件的初始数据
*/
data: {
currentTime: moment().format("YYYY-MM-DD"),
types: 1, //选中的时间类型
trendtypes: 1, //选中的业态趋势类型
chartData: {}, //客流趋势分析数据
chartDatastop: {}, //停留时长统计
chartDataSex: {}, //客群性别占比
chartDataAge: {}, //客群年龄占比
show: false, //显示日期自定义选择
minDate: new Date(2022, 0, 1).getTime(), //自定义时间的开始日期
// maxDate: new Date(2022, 11, 31).getTime(), //自定义时间的结束日期
maxDate: new Date(2025, 11, 31).getTime(), //自定义时间的结束日期
shopList: [
// {
// id: 1,
// name: '小米'
// }, {
// id: 2,
// name: '华为'
// }
], //店铺列表数据
selectId: '', //选中的店铺id
selectName: '', //选中店铺名字
columnsListName: [], //店铺的名字下拉列表
exposure: 0,
traffic: 0,
customer: 0,
entryRate: 0,
info: {}
}, },
methods: { methods: {
// 关闭自定义日期选择 // 关闭自定义日期选择
......
<!--pages/homes/index.wxml--> <!--pages/homes/index.wxml-->
<view class="title">店铺首页</view> <view class="container" style="padding-bottom: 80px;">
<view class="container"> <navbar page-name="店铺首页" bg-color="RGBA(213, 227, 255, 1)" navbar-color="#000"></navbar>
<view class="~backgroundColor">
<!-- 名称 --> <!-- 名称 -->
<view class="contianer_shop"> <view class="contianer_shop">
<image src="../images/back.svg" class='images'></image> <image src="../images/back.svg" class='images'></image>
...@@ -30,22 +31,22 @@ ...@@ -30,22 +31,22 @@
<view class="card_passage"> <view class="card_passage">
<image src="../images/keliulaing.png" class="card_image"></image> <image src="../images/keliulaing.png" class="card_image"></image>
<view class="er"> 客流量</view> <view class="er"> 客流量</view>
<view class="er" style="font-size:48rpx"> {{traffic}}</view> <view class="er cardNum"> {{traffic}}</view>
</view> </view>
<view class="card_passage"> <view class="card_passage">
<image src="../images/keliuliangyellow.png" class="card_image"></image> <image src="../images/keliuliangyellow.png" class="card_image"></image>
<view class="er"> 曝光量</view> <view class="er"> 曝光量</view>
<view class="er" style="font-size:48rpx"> {{exposure}}</view> <view class="er cardNum"> {{exposure}}</view>
</view> </view>
<view class="card_passage"> <view class="card_passage">
<image src="../images/customer.png" class="card_image"></image> <image src="../images/customer.png" class="card_image"></image>
<view class="er"> 顾客人数</view> <view class="er"> 顾客人数</view>
<view class="er" style="font-size:48rpx"> {{customer}}</view> <view class="er cardNum"> {{customer}}</view>
</view> </view>
<view class="card_passage"> <view class="card_passage">
<image src="../images/jindianlv.png" class="card_image"></image> <image src="../images/jindianlv.png" class="card_image"></image>
<view class="er"> 进店率</view> <view class="er"> 进店率</view>
<view class="er" style="font-size:48rpx"> {{entryRate}}%</view> <view class="er cardNum"> {{entryRate}}%</view>
</view> </view>
</view> </view>
<!-- 客流趋势分析 --> <!-- 客流趋势分析 -->
...@@ -77,6 +78,8 @@ ...@@ -77,6 +78,8 @@
<text class="title_chart">客群年龄占比</text> <text class="title_chart">客群年龄占比</text>
<basic chartId='chartDataAge' chartData="{{chartDataAge}}" height="500rpx"></basic> <basic chartId='chartDataAge' chartData="{{chartDataAge}}" height="500rpx"></basic>
</view> </view>
</view>
<!-- 自定义时间选择器 --> <!-- 自定义时间选择器 -->
<van-calendar show="{{ show }}" min-date="{{ minDate }}" bind:close="onClose" color="#447bff" bind:confirm="onConfirm" type='range' /> <van-calendar show="{{ show }}" min-date="{{ minDate }}" bind:close="onClose" color="#447bff" bind:confirm="onConfirm" type='range' />
</view> </view>
\ No newline at end of file \ No newline at end of file
...@@ -20,57 +20,55 @@ ...@@ -20,57 +20,55 @@
} }
.container { .container {
margin-top: 140rpx; height: 100%;
padding: 10rpx 20rpx 60px;
background: linear-gradient(154deg, #C7D3FF 0%, #E9F9FF 48%, #FFFFFF 100%);
} }
.contianer_shop { .contianer_shop {
width: 100%; width: 100%;
height: 168rpx; height: 168rpx;
position: relative; position: relative;
margin-top: 20rpx;
} }
.images { .images {
position: absolute; position: absolute;
left: 0; left: 0;
top: 0; top: 0;
z-index: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.shop_name { .shop_name {
margin: 20rpx 0 10rpx 20rpx; padding: 30rpx 0 10rpx 28rpx;
font-size: 34rpx; font-size: 40rpx;
font-family: PingFangSC-Medium, PingFang SC; font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #FFFFFF; color: #FFFFFF;
display: flex; line-height: 56rpx;
align-items: flex-end; position: absolute;
position: relative;
z-index: 1;
}
.fonts{
font-size: 48rpx;
} }
.shop_name::after { .shop_name::after {
content: ''; content: '';
display: inline-block;
width: 0; width: 0;
height: 0; height: 0;
margin-left: 10rpx; margin-left: 20rpx;
border: 20rpx solid #fff; border: 20rpx solid #fff;
border-color: transparent; border-color: transparent;
border-top-color: #fff; border-top-color: #fff;
position: absolute;
bottom: 0;
} }
.shop_time { .shop_time {
margin-left: 20rpx; position: absolute;
font-size: 26rpx; top: 90rpx;
margin-left: 28rpx;
font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: rgba(255, 255, 255, 0.65); color: rgba(255, 255, 255, 0.65);
position: relative;
} }
.tab_tll { .tab_tll {
...@@ -78,8 +76,6 @@ ...@@ -78,8 +76,6 @@
width: 100%; width: 100%;
margin-top: 30rpx; margin-top: 30rpx;
position: relative; position: relative;
display: flex;
/* justify-content: space-between; */
} }
.tab_tll .text_tltle { .tab_tll .text_tltle {
...@@ -109,14 +105,14 @@ ...@@ -109,14 +105,14 @@
align-items: center; align-items: center;
padding: 0 0 0 50rpx; padding: 0 0 0 50rpx;
} }
.text_input{
font-size: 28rpx; .text_input {
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: rgba(0,0,0,0.9); color: rgba(0, 0, 0, 0.9);
} }
.card { .card {
width: 100%; width: 100%;
margin-top: 30rpx; margin-top: 30rpx;
...@@ -145,11 +141,17 @@ color: rgba(0,0,0,0.9); ...@@ -145,11 +141,17 @@ color: rgba(0,0,0,0.9);
width: 100%; width: 100%;
height: 148rpx; height: 148rpx;
} }
.er{
.er {
position: relative; position: relative;
z-index: 1; z-index: 1;
font-size: 28rpx; font-size: 28rpx;
} }
.er.cardNum {
font-size: 40rpx;
}
.card_passage { .card_passage {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
......
// pages/homes/index.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage() {
}
})
\ No newline at end of file \ No newline at end of file
<!--pages/homes/index.wxml-->
<text>pages/homes/index.wxml</text>
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<input class="userInput" placeholder="请输入密码" password bindinput="changePassword" value="{{ password }}" cursor-spacing="{{40}}" /> <input class="userInput" placeholder="请输入密码" password bindinput="changePassword" value="{{ password }}" cursor-spacing="{{40}}" />
</view> </view>
<view class="login-btn"> <view class="login-btn">
<view style="opacity:0;pointer-events: none;" class="login-btn-text" bindtap="changeBaseUrl">切换地址</view> <!-- <view style="opacity:0;pointer-events: none;" class="login-btn-text" bindtap="changeBaseUrl">切换地址</view> -->
<button class="btn" bindtap="login">登录</button> <button class="btn" bindtap="login">登录</button>
</view> </view>
</view> </view>
......
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
} }
.login-btn .btn { .login-btn .btn {
width: 316rpx; width: 100%;
height: 84rpx; height: 84rpx;
background:rgba(0,105,255,1); background:rgba(0,105,255,1);
border-radius: 16rpx; border-radius: 16rpx;
......
<!--pages/sameProportion/sameProportion.wxml--> <!--pages/sameProportion/sameProportion.wxml-->
<import src="../../components/wxSortPickerView/wxSortPickerView.wxml" /> <view class="">
<import src="../../components/wxSortPickerView/wxSortPickerView.wxml" />
<!-- <view class="containers"> <!-- <view class="containers">
<navbar page-name="店铺选择" bg-color="#3A63FF" navbar-color="#fff" nav='back' bindonGoBack='goBacks' /> <navbar page-name="店铺选择" bg-color="#3A63FF" navbar-color="#fff" nav='back' bindonGoBack='goBacks' />
<view class="part-list"> <view class="part-list">
<view>搜索</view> --> <view>搜索</view> -->
<view class="titles">请选择 <navbar page-name="请选择" bindonGoBack='goBacks' nav='back' bg-color="RGBA(213, 227, 255, 1)" navbar-color="#000"></navbar>
<!-- <view class="titles">请选择
<view class="befores" bindtap='goBacks'></view> <view class="befores" bindtap='goBacks'></view>
</view> </view> -->
<view class="search"> <view class="search">
<van-field value="{{ value }}" placeholder="请输入要搜索的内容" border="{{ true }}" bind:change="onChange" /> <van-field value="{{ value }}" placeholder="请输入要搜索的内容" border="{{ true }}" bind:change="onChange" />
</view> </view>
...@@ -15,3 +17,4 @@ ...@@ -15,3 +17,4 @@
<view class="tesl"> <view class="tesl">
<template is="wxSortPickerView" data="{{wxSortPickerData}}"></template> <template is="wxSortPickerView" data="{{wxSortPickerData}}"></template>
</view> </view>
</view>
\ No newline at end of file \ No newline at end of file
/* pages/sameProportion/sameProportion.wxss */ /* pages/sameProportion/sameProportion.wxss */
@import '../../components/wxSortPickerView/wxSortPickerView.wxss'; @import '../../components/wxSortPickerView/wxSortPickerView.wxss';
.titles { .titles {
height: 160rpx; height: 160rpx;
width: 100%; width: 100%;
...@@ -14,10 +11,10 @@ ...@@ -14,10 +11,10 @@
font-family: PingFangSC-Medium, PingFang SC; font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #fff; color: #fff;
position: relative; position: relative;
} }
.befores{
.befores {
position: absolute; position: absolute;
width: 30rpx; width: 30rpx;
height: 30rpx; height: 30rpx;
...@@ -27,15 +24,17 @@ position: relative; ...@@ -27,15 +24,17 @@ position: relative;
transform: rotate(315deg); transform: rotate(315deg);
left: 40rpx; left: 40rpx;
top: 100rpx; top: 100rpx;
} }
.search{
.search {
height: 80rpx; height: 80rpx;
box-sizing: border-box; box-sizing: border-box;
background: red; /* background: red; */
margin-top: 110rpx;
} }
.tesl{
height: calc(100% - 240rpx); .tesl {
height: auto;
overflow: auto; overflow: auto;
padding: 0 20rpx; padding: 0 20rpx;
} }
\ No newline at end of file \ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!