Skip to content

蒋秀川 / miniProject

Go to a project
Commit 998dc2cf by 李君
Options

优化

1 parent d02e6d9c
Expand all
Inline Side-by-side
Showing 17 changed files with 212 additions and 95 deletions
miniProject/app.js
...@@ -37,6 +37,15 @@ App({ ...@@ -37,6 +37,15 @@ App({
this.globalData.navTop = navTop; this.globalData.navTop = navTop;
this.globalData.windowHeight = res.windowHeight; this.globalData.windowHeight = res.windowHeight;
this.globalData.windowWidth = res.windowWidth; this.globalData.windowWidth = res.windowWidth;
let { screenWidth, screenHeight } = res
// iphoneX 、11、Xr、 Max等设备分辨率
let _screen = [
{w: 375, h: 812 },
{w: 414, h: 896 },
{w: 390, h: 844 },
{w: 428, h: 926 },
]
this.globalData.isIphoneX = _screen.some(item => item.w === screenWidth && item.h === screenHeight)
}, },
fail(err) { fail(err) {
console.log(err); console.log(err);
......
miniProject/custom-tab-bar/index.js
const App = getApp();
Component({ Component({
data: { data: {
isIphoneX:App.globalData.isIphoneX,
show:true, show:true,
curClick: 1, curClick: 1,
color: "#7A7E83", color: "#7A7E83",
......
miniProject/custom-tab-bar/index.wxss
.tab-bar { .tab-bar {
padding-top: 10rpx; padding-top: 10rpx;
position: absolute; position: absolute;
bottom: 0; bottom: 0;
left: 0; left: 0;
right: 0; right: 0;
height: 110rpx; /* height: 110rpx; */
background: white; background: white;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
padding-bottom: env(safe-area-inset-bottom); padding-bottom: env(safe-area-inset-bottom);
pointer-events: auto; pointer-events: auto;
} }
.tab-bar-border { .tab-bar-border {
...@@ -32,17 +32,17 @@ ...@@ -32,17 +32,17 @@
} }
.tab-bar-item image { .tab-bar-item image {
width: 27px; width: 48rpx;
height: 27px; height: 48rpx;
} }
.tab-bar-item view { .tab-bar-item view {
font-size: 10px; /* font-size: 10px; */
} }
.active.text { .active.text {
color: #597BFF; color: #597BFF;
} }
.text { .text {
font-size: 28rpx; font-size: 28rpx;
margin-top: 5rpx; /* margin-top: 5rpx; */
} }
miniProject/images/icdown.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>xiangxia</title>
<g id="store" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="2店铺首页" transform="translate(-280.000000, -118.000000)">
<g id="Fill-1" transform="translate(14.000000, 100.000000)">
<g id="xiangxia" transform="translate(266.000000, 18.000000)">
<rect id="矩形" stroke="#979797" fill="#D8D8D8" opacity="0" x="0.5" y="0.5" width="15" height="15"></rect>
<path d="M12.9578414,5 C13.2228968,5 13.4376832,5.05026914 13.6022003,5.15080742 C13.7667175,5.25134569 13.8763956,5.38387342 13.9312347,5.54839061 C13.9860738,5.71290779 13.9860738,5.89798962 13.9312347,6.10363609 C13.8763956,6.30928257 13.7575777,6.51264409 13.5747808,6.71372064 C12.8344535,7.53630655 12.1215457,8.34061277 11.4360574,9.12663931 C10.7505692,9.91266584 10.0879305,10.6484232 9.4481415,11.3339115 C9.27448448,11.5167084 9.07112296,11.6583759 8.83805695,11.7589142 C8.60499095,11.8594525 8.36507005,11.9120066 8.11829428,11.9165765 C7.87151851,11.9211464 7.63388258,11.8823021 7.40538649,11.8000435 C7.17689041,11.7177849 6.9849537,11.5898271 6.82957636,11.4161701 C6.47312246,11.0231568 6.10295881,10.6210037 5.71908538,10.2097108 L4.54004558,8.97583189 C4.15617215,8.56453894 3.77458369,8.16010087 3.39528019,7.76251768 C3.01597669,7.36493449 2.66180775,6.9787761 2.33277339,6.60404252 C2.17739605,6.4303855 2.07685777,6.24987359 2.03115856,6.0625068 C1.98545934,5.87514001 1.99002926,5.70376794 2.04486832,5.54839061 C2.09970738,5.39301327 2.20481558,5.26505546 2.36019292,5.16451718 C2.51557026,5.0639789 2.71664681,5.01370977 2.96342259,5.01370977 C3.28331711,5.01370977 3.72431455,5.0114248 4.28641492,5.00685488 C4.84851529,5.00228496 5.46316977,5 6.13037834,5 L8.18684311,5 L10.2021786,5 L11.8884797,5 L12.9578414,5 Z" id="路径" fill="#FFFFFF" fill-rule="nonzero"></path>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file \ No newline at end of file
miniProject/images/rili.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="19px" height="20px" viewBox="0 0 19 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>rili</title>
<g id="store" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="2店铺首页" transform="translate(-44.000000, -239.000000)" fill-rule="nonzero">
<g id="编组-11" transform="translate(20.000000, 232.000000)">
<g id="rili" transform="translate(24.000000, 7.000000)">
<path d="M14.6706321,19.8952415 L3.43128551,19.8952415 C1.54252486,19.8952415 0.0110973011,18.3638139 0.0110973011,16.4750533 L0.0110973011,6.44087358 C0.0110973011,4.55211293 1.54252486,3.02068537 3.43128551,3.02068537 L14.6706321,3.02068537 C16.5593928,3.02068537 18.0908203,4.55211293 18.0908203,6.44087358 L18.0908203,16.4750533 C18.0886009,18.3638139 16.5593928,19.8952415 14.6706321,19.8952415 Z" id="路径" fill="#83A4FF"></path>
<path d="M14.6706321,19.2915483 L3.43128551,19.2915483 C1.54252486,19.2915483 0.0110973011,17.7601207 0.0110973011,15.8713601 L0.0110973011,5.83939986 C0.0110973011,3.9506392 1.54252486,2.41921165 3.43128551,2.41921165 L14.6706321,2.41921165 C16.5593928,2.41921165 18.0908203,3.9506392 18.0908203,5.83939986 L18.0908203,15.8735795 C18.0886009,17.7601207 16.5593928,19.2915483 14.6706321,19.2915483 Z" id="路径" fill="#5B79FB"></path>
<path d="M14.6706321,18.6900746 L3.43128551,18.6900746 C1.54252486,18.6900746 0.0110973011,17.158647 0.0110973011,15.2698864 L0.0110973011,5.23570668 C0.0110973011,3.34694602 1.54252486,1.81551847 3.43128551,1.81551847 L14.6706321,1.81551847 C16.5593928,1.81551847 18.0908203,3.34694602 18.0908203,5.23570668 L18.0908203,15.2698864 C18.0886009,17.158647 16.5593928,18.6900746 14.6706321,18.6900746 Z" id="路径" fill="#83A4FF"></path>
<path d="M14.0713778,7.04012784 L4.02832031,7.04012784 C3.75310724,7.04012784 3.5267223,6.8137429 3.5267223,6.53852983 C3.5267223,6.26331676 3.75310724,6.03693182 4.02832031,6.03693182 L14.0713778,6.03693182 C14.3465909,6.03693182 14.572992,6.26331676 14.572992,6.53852983 C14.5751953,6.8137429 14.3488104,7.04012784 14.0713778,7.04012784 Z" id="路径" fill="#5B79FB"></path>
<path d="M9.28622159,16.6814631 L4.59650213,16.6814631 C4.32128906,16.6814631 4.09490412,16.4550781 4.09490412,16.1798651 C4.09490412,15.904652 4.32128906,15.678267 4.59650213,15.678267 L9.28622159,15.678267 C9.56143466,15.678267 9.7878196,15.904652 9.7878196,16.1798651 C9.7878196,16.4550781 9.56143466,16.6814631 9.28622159,16.6814631 L9.28622159,16.6814631 Z M12.8839666,16.6814631 L11.0418146,16.6814631 C10.7666016,16.6814631 10.5402166,16.4550781 10.5402166,16.1798651 C10.5402166,15.904652 10.7666016,15.678267 11.0418146,15.678267 L12.8839666,15.678267 C13.1591797,15.678267 13.3855646,15.904652 13.3855646,16.1798651 C13.3855646,16.4550781 13.1613991,16.6814631 12.8839666,16.6814631 Z" id="形状" fill="#E5ECFF"></path>
<path d="M5.42214134,13.2080078 C6.63618608,12.1049361 7.45072798,11.2238104 7.45072798,10.5202415 C7.45072798,10.0763494 7.20214844,9.83442827 6.81818182,9.83442827 C6.48526278,9.83442827 6.22336648,10.0563743 5.99698153,10.3049538 L5.36443537,9.67684659 C5.84161932,9.17524858 6.28551136,8.92666903 6.97576349,8.92666903 C7.91459517,8.92666903 8.56711648,9.5259233 8.56711648,10.4536577 C8.56711648,11.2881747 7.85023082,12.2092507 7.10449219,12.9594283 C7.34641335,12.9261364 7.67933239,12.8950639 7.89462003,12.8950639 L8.7890625,12.8950639 L8.7890625,13.8738459 L5.42214134,13.8738459 L5.42214134,13.2080078 Z M9.27734375,13.2856889 L9.81223366,12.5554865 C10.1052024,12.8351385 10.4447798,13.0260121 10.8243075,13.0260121 C11.274858,13.0260121 11.5678267,12.837358 11.5678267,12.471147 C11.5678267,12.0538885 11.3458807,11.8053089 10.3271484,11.8053089 L10.3271484,10.9885476 C11.1550071,10.9885476 11.4169034,10.7333097 11.4169034,10.349343 C11.4169034,10.016424 11.2215909,9.83442827 10.8620384,9.83442827 C10.5357777,9.83442827 10.2871982,9.98535156 9.9942294,10.23837 L9.40607244,9.52814276 C9.85662287,9.14861506 10.3382457,8.92888849 10.9130859,8.92888849 C11.9185014,8.92888849 12.5776811,9.39941406 12.5776811,10.267223 C12.5776811,10.7510653 12.3157848,11.1283736 11.7942116,11.3370028 L11.7942116,11.3702947 C12.3357599,11.5323153 12.7330433,11.9251598 12.7330433,12.5510476 C12.7330433,13.4588068 11.9051847,13.9670632 10.9375,13.9670632 C10.1717862,13.9648438 9.63023793,13.6985085 9.27734375,13.2856889 L9.27734375,13.2856889 Z" id="形状" fill="#FFFFFF"></path>
<path d="M4.43004261,4.02610085 C4.43004261,4.80324159 5.06003966,5.43323864 5.8371804,5.43323864 C6.61432114,5.43323864 7.24431818,4.80324159 7.24431818,4.02610085 C7.24431818,3.24896011 6.61432114,2.61896307 5.8371804,2.61896307 C5.06003966,2.61896307 4.43004261,3.24896011 4.43004261,4.02610085 L4.43004261,4.02610085 Z" id="路径" fill="#5B79FB"></path>
<path d="M10.6556286,4.02610085 C10.6556286,4.52882278 10.9238275,4.993357 11.3591974,5.24471797 C11.7945674,5.49607894 12.3309653,5.49607894 12.7663352,5.24471797 C13.2017052,4.993357 13.4699041,4.52882278 13.4699041,4.02610085 C13.4699041,3.52337893 13.2017052,3.0588447 12.7663352,2.80748374 C12.3309653,2.55612277 11.7945674,2.55612277 11.3591974,2.80748374 C10.9238275,3.0588447 10.6556286,3.52337893 10.6556286,4.02610085 L10.6556286,4.02610085 Z" id="路径" fill="#5B79FB"></path>
<path d="M5.8371804,5.03151634 C5.17134233,5.03151634 4.63201349,4.4921875 4.63201349,3.82634943 L4.63201349,1.21404474 C4.63201349,0.548206676 5.17134233,0.00887784091 5.8371804,0.00887784091 C6.50301847,0.00887784091 7.0423473,0.548206676 7.0423473,1.21404474 L7.0423473,3.82634943 C7.0423473,4.48996804 6.50301847,5.03151634 5.8371804,5.03151634 Z" id="路径" fill="#FF7E71"></path>
<path d="M5.8371804,4.22807173 C5.17134233,4.22807173 4.63201349,3.6887429 4.63201349,3.02290483 L4.63201349,3.82634943 C4.63201349,4.4921875 5.17134233,5.03151634 5.8371804,5.03151634 C6.50301847,5.03151634 7.0423473,4.4921875 7.0423473,3.82634943 L7.0423473,3.02290483 C7.0423473,3.68652344 6.50301847,4.22807173 5.8371804,4.22807173 Z" id="路径" fill="#F7554D"></path>
<path d="M12.0627663,5.03151634 C11.3969283,5.03151634 10.8575994,4.4921875 10.8575994,3.82634943 L10.8575994,1.21404474 C10.8575994,0.548206676 11.3969283,0.00887784091 12.0627663,0.00887784091 C12.7286044,0.00887784091 13.2679332,0.548206676 13.2679332,1.21404474 L13.2679332,3.82634943 C13.2679332,4.48996804 12.7286044,5.03151634 12.0627663,5.03151634 Z" id="路径" fill="#FF7E71"></path>
<path d="M12.0627663,4.22807173 C11.3969283,4.22807173 10.8575994,3.6887429 10.8575994,3.02290483 L10.8575994,3.82634943 C10.8575994,4.4921875 11.3969283,5.03151634 12.0627663,5.03151634 C12.7286044,5.03151634 13.2679332,4.4921875 13.2679332,3.82634943 L13.2679332,3.02290483 C13.2679332,3.68652344 12.7286044,4.22807173 12.0627663,4.22807173 Z" id="路径" fill="#F7554D"></path>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file \ No newline at end of file
miniProject/index/index.js
...@@ -187,7 +187,8 @@ Component({ ...@@ -187,7 +187,8 @@ Component({
startDate:startTime, startDate:startTime,
endDate:endTime, endDate:endTime,
dataLevel:(this.data.types==1 || this.data.types==2)?'hour':'day', dataLevel:(this.data.types==1 || this.data.types==2)?'hour':'day',
dataIndex:this.data.trendtypes // dataIndex:this.data.trendtypes
dataIndexes:['PassengerFlow','Exposure','CustomerNum','IntoStoreRate'].toString()
}).then(res => { }).then(res => {
setTimeout(()=>{ setTimeout(()=>{
this.setData({ this.setData({
...@@ -248,13 +249,20 @@ Component({ ...@@ -248,13 +249,20 @@ Component({
getLineConfig(res) { getLineConfig(res) {
let xasix = res.xaxis.data || [] let xasix = res.xaxis.data || []
let seriesList = res.series || []; let seriesList = res.series || [];
let data = seriesList[0].data; let legendData = ['路过客流','进店客流','顾客人数','进店率']
let isData = false; seriesList.forEach((item,index)=>{
for (let index = 0; index < data.length; index++) { if(index==3){
if(data[index] != null){ item.yAxisIndex= 1
isData = true;
} }
} item.name = legendData[index]
})
let data = seriesList[0].data;
let isData = true;
// for (let index = 0; index < data.length; index++) {
// if(data[index] != null){
// isData = true;
// }
// }
if (!isData) { if (!isData) {
return { return {
title: { title: {
...@@ -270,11 +278,11 @@ Component({ ...@@ -270,11 +278,11 @@ Component({
} }
return { return {
grid: { grid: {
top: 30, top: 50,
right: 20, right: 10,
bottom: 20, bottom: 20,
left: 5, left: 15,
containLabel: true containLabel: false
}, },
tooltip: { tooltip: {
trigger: 'axis', trigger: 'axis',
...@@ -284,19 +292,24 @@ Component({ ...@@ -284,19 +292,24 @@ Component({
color: "#444", color: "#444",
}, },
}, },
formatter: function (params) { // formatter: function (params) {
let html = '' // var str = "";
params.forEach(item => { // if (params.length > 0) {
html += item.axisValue+ ': ' + (item.value||'') // str = params[0].name + "\n";
}) // }
return html // for (var i = 0; i < params.length; i++) {
} // if (params[i].seriesName !== "") {
// str += params[i].seriesName + ":" + (params[i].value||'') + "\n";
// }
// }
// return str;
// }
}, },
xAxis: { xAxis: {
axisLabel: { axisLabel: {
color: '#8C8D95' color: '#8C8D95'
}, },
boundaryGap: false, boundaryGap: true,
axisTick: { axisTick: {
show: true show: true
}, },
...@@ -308,9 +321,10 @@ Component({ ...@@ -308,9 +321,10 @@ Component({
}, },
data: xasix data: xasix
}, },
yAxis: { yAxis: [{
type: 'value', type: 'value',
axisLabel: { axisLabel: {
margin:-30,
color: '#8C8D95', color: '#8C8D95',
formatter: function (value, index) { formatter: function (value, index) {
if (value >= 10000 && value < 1000000) { if (value >= 10000 && value < 1000000) {
...@@ -331,50 +345,74 @@ Component({ ...@@ -331,50 +345,74 @@ Component({
show: false show: false
} }
}, },
color: ['#FD8C5E', '#6FD3FF', '#BC7FF8', '#4F75FF', '#FF9AC1'], {
// series:seriesList.map(item=>({...item,symbol: 'none',smooth: true,})) show:false,
series: [{ type: 'value',
smooth: true, axisLabel: {
lineStyle: { // margin:-20,
color: { color: '#8C8D95',
type: 'linear', formatter: function (value, index) {
x: 0, return value + '%';
y: 0,
x2: 1,
y2: 0,
colorStops: [{
offset: 0, color: '#6384FF' // 0% 处的颜色
}, {
offset: 1, color: '#34BFFF' // 100% 处的颜色
}],
globalCoord: false
}
},
areaStyle: {
// 区域颜色
color: {
type: 'linear',
x: 0, //右
y: 0, //下
x2: 0, //左
y2: 1, //上
colorStops: [{
offset: 0.1,
color: '#EAF3FF' // 0% 处的颜色
},
{
offset: 1,
color: '#FFFFFF' // 100% 处的颜色
}
]
}, },
}, },
data: seriesList[0].data, axisTick: {
type: "line", show: true
symbol: "none", },
showSymbol: false, axisLine: {
symbolSize: 20, show: false
}] },
splitLine: {
show: false
}
}],
legend:{
data:['路过客流','进店客流','顾客人数','进店率'],
// bottom: 0
},
color: ['#FD8C5E', '#6FD3FF', '#BC7FF8', '#4F75FF', '#FF9AC1'],
series:seriesList.map(item=>({...item,symbol: 'none',smooth: true}))
// series: [{
// smooth: true,
// lineStyle: {
// color: {
// type: 'linear',
// x: 0,
// y: 0,
// x2: 1,
// y2: 0,
// colorStops: [{
// offset: 0, color: '#6384FF' // 0% 处的颜色
// }, {
// offset: 1, color: '#34BFFF' // 100% 处的颜色
// }],
// globalCoord: false
// }
// },
// areaStyle: {
// // 区域颜色
// color: {
// type: 'linear',
// x: 0, //右
// y: 0, //下
// x2: 0, //左
// y2: 1, //上
// colorStops: [{
// offset: 0.1,
// color: '#EAF3FF' // 0% 处的颜色
// },
// {
// offset: 1,
// color: '#FFFFFF' // 100% 处的颜色
// }
// ]
// },
// },
// data: seriesList[0].data,
// type: "line",
// symbol: "none",
// showSymbol: false,
// symbolSize: 20,
// }]
} }
}, },
} }
......
miniProject/index/index.wxml
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<text class="text_tltle {{types==5?'actives':'defaults'}}" bindtap="ClickTab" data-type='5'>自定义</text> <text class="text_tltle {{types==5?'actives':'defaults'}}" bindtap="ClickTab" data-type='5'>自定义</text>
</view> </view>
<view class="time_input"> <view class="time_input">
<image src="../images/rili.png" style="width:20px;height:20px;margin-right:20rpx"></image> <image src="../images/rili.svg" style="width:40rpx;height:40rpx;margin-right:40rpx"></image>
<text>{{currentTime}}</text> <text>{{currentTime}}</text>
</view> </view>
<!-- 卡片 --> <!-- 卡片 -->
...@@ -46,14 +46,14 @@ ...@@ -46,14 +46,14 @@
</view> </view>
</view> </view>
<!-- 客流趋势分析 --> <!-- 客流趋势分析 -->
<view class="keliuliang"> <view class="keliuliang boxPadding">
<text class="title_chart">客流趋势分析</text> <text class="title_chart">客流趋势分析</text>
<view class="tab_tll"> <!-- <view class="tab_tll">
<text class="text_tltle {{trendtypes=='PassengerFlow'?'actives':'defaults'}}" bindtap="ClickPassageFlow" data-type='PassengerFlow'>路过客流</text> <text class="text_tltle {{trendtypes=='PassengerFlow'?'actives':'defaults'}}" bindtap="ClickPassageFlow" data-type='PassengerFlow'>路过客流</text>
<text class="text_tltle {{trendtypes=='Exposure'?'actives':'defaults'}}" bindtap="ClickPassageFlow" data-type='Exposure'>进店客流</text> <text class="text_tltle {{trendtypes=='Exposure'?'actives':'defaults'}}" bindtap="ClickPassageFlow" data-type='Exposure'>进店客流</text>
<text class="text_tltle {{trendtypes=='CustomerNum'?'actives':'defaults'}}" bindtap="ClickPassageFlow" data-type='CustomerNum'>顾客人数</text> <text class="text_tltle {{trendtypes=='CustomerNum'?'actives':'defaults'}}" bindtap="ClickPassageFlow" data-type='CustomerNum'>顾客人数</text>
<text class="text_tltle {{trendtypes=='IntoStoreRate'?'actives':'defaults'}}" bindtap="ClickPassageFlow" data-type='IntoStoreRate'>进店率</text> <text class="text_tltle {{trendtypes=='IntoStoreRate'?'actives':'defaults'}}" bindtap="ClickPassageFlow" data-type='IntoStoreRate'>进店率</text>
</view> </view> -->
<basic chartId='chartTrend' chartData="{{chartData}}" height="500rpx"></basic> <basic chartId='chartTrend' chartData="{{chartData}}" height="500rpx"></basic>
</view> </view>
<!-- 停留时长统计 --> <!-- 停留时长统计 -->
......
miniProject/index/index.wxss
...@@ -55,7 +55,8 @@ ...@@ -55,7 +55,8 @@
.actives { .actives {
color: #000000; color: #000000;
border-bottom: 4px solid #447BFF; border-bottom: 6rpx solid #447BFF;
border-radius: 3rpx;
} }
.defaults { .defaults {
...@@ -254,4 +255,10 @@ ...@@ -254,4 +255,10 @@
} }
.customColor .van-progress__portion{ .customColor .van-progress__portion{
background: linear-gradient(152deg, #597CFF 0%, #7998FF 100%) !important; background: linear-gradient(152deg, #597CFF 0%, #7998FF 100%) !important;
}
.boxPadding{
padding:20rpx 0
}
.boxPadding .title_chart{
padding-left: 20rpx;
} }
\ No newline at end of file \ No newline at end of file
miniProject/index/index2.wxml
...@@ -7,6 +7,9 @@ ...@@ -7,6 +7,9 @@
<image src="../images/back.svg" class='images'></image> <image src="../images/back.svg" class='images'></image>
<view class="shop_name" bindtap="selectContent"> <view class="shop_name" bindtap="selectContent">
<text class="nameContent">{{selectName}}</text> <text class="nameContent">{{selectName}}</text>
<view class="iconDown">
<image src="../images/icdown.svg" class="imagesvg" mode=""/>
</view>
</view> </view>
<view class="shop_time"> <view class="shop_time">
<text>营业时间：{{info.startTime}}-{{info.endTime}}</text> <text>营业时间：{{info.startTime}}-{{info.endTime}}</text>
...@@ -25,7 +28,7 @@ ...@@ -25,7 +28,7 @@
<text class="text_tltle {{types==5?'actives':'defaults'}}" bindtap="ClickTab" data-type='5'>自定义</text> <text class="text_tltle {{types==5?'actives':'defaults'}}" bindtap="ClickTab" data-type='5'>自定义</text>
</view> </view>
<view class="time_input"> <view class="time_input">
<image src="../images/rili.png" style="width:20px;height:20px;margin-right:20rpx"></image> <image src="../images/rili.svg" style="width:40rpx;height:40rpx;margin-right:40rpx"></image>
<text class="text_input">{{currentTime}}</text> <text class="text_input">{{currentTime}}</text>
</view> </view>
<!-- 卡片 --> <!-- 卡片 -->
...@@ -52,14 +55,14 @@ ...@@ -52,14 +55,14 @@
</view> </view>
</view> </view>
<!-- 客流趋势分析 --> <!-- 客流趋势分析 -->
<view class="keliuliang" style="margin-top:30rpx"> <view class="keliuliang boxPadding" style="margin-top:30rpx">
<text class="title_chart">客流趋势分析</text> <text class="title_chart">客流趋势分析</text>
<view class="tab_tll"> <!-- <view class="tab_tll">
<text class="text_tltle {{trendtypes==1?'actives':'defaults'}}" bindtap="ClickPassageFlow" data-type='1'>过店客流</text> <text class="text_tltle {{trendtypes==1?'actives':'defaults'}}" bindtap="ClickPassageFlow" data-type='1'>过店客流</text>
<text class="text_tltle {{trendtypes==2?'actives':'defaults'}}" bindtap="ClickPassageFlow" data-type='2'>进店客流</text> <text class="text_tltle {{trendtypes==2?'actives':'defaults'}}" bindtap="ClickPassageFlow" data-type='2'>进店客流</text>
<text class="text_tltle {{trendtypes==3?'actives':'defaults'}}" bindtap="ClickPassageFlow" data-type='3'>顾客人数</text> <text class="text_tltle {{trendtypes==3?'actives':'defaults'}}" bindtap="ClickPassageFlow" data-type='3'>顾客人数</text>
<text class="text_tltle {{trendtypes==4?'actives':'defaults'}}" bindtap="ClickPassageFlow" data-type='4'>进店率</text> <text class="text_tltle {{trendtypes==4?'actives':'defaults'}}" bindtap="ClickPassageFlow" data-type='4'>进店率</text>
</view> </view> -->
<basic chartId='chartDatatrend' chartData="{{chartData}}" height="500rpx"></basic> <basic chartId='chartDatatrend' chartData="{{chartData}}" height="500rpx"></basic>
</view> </view>
<!-- 停留时长统计 --> <!-- 停留时长统计 -->
...@@ -76,7 +79,7 @@ ...@@ -76,7 +79,7 @@
<basic chartId='chartDataSex' chartData="{{chartDataSex}}" height="500rpx"></basic> <basic chartId='chartDataSex' chartData="{{chartDataSex}}" height="500rpx"></basic>
</view> </view>
<!--客群年龄占比 --> <!--客群年龄占比 -->
<view class="keliuliang" style="margin-top:30rpx"> <view class="keliuliang boxPadding" style="margin-top:30rpx">
<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>
......
miniProject/index/index2.wxss
...@@ -57,7 +57,18 @@ ...@@ -57,7 +57,18 @@
width: auto; width: auto;
max-width: 90%; max-width: 90%;
} }
.shop_name::after { .iconDown{
/* width: 35rpx; */
height: 56rpx;
display: inline-block;
vertical-align: top;
}
.imagesvg{
margin-left: 20rpx;
width: 35rpx;
height: 30rpx;
}
/* .shop_name::after {
content: ''; content: '';
display: inline-block; display: inline-block;
width: 0; width: 0;
...@@ -67,7 +78,7 @@ ...@@ -67,7 +78,7 @@
border-color: transparent; border-color: transparent;
border-top-color: #fff; border-top-color: #fff;
vertical-align: middle; vertical-align: middle;
} } */
.shop_time { .shop_time {
position: absolute; position: absolute;
...@@ -96,7 +107,8 @@ ...@@ -96,7 +107,8 @@
.actives { .actives {
font-weight: 500; font-weight: 500;
color: #000000; color: #000000;
border-bottom: 4px solid #447BFF; border-bottom: 6rpx solid #447BFF;
border-radius: 3rpx;
} }
.defaults { .defaults {
...@@ -218,4 +230,10 @@ ...@@ -218,4 +230,10 @@
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #5A95EC; color: #5A95EC;
}
.boxPadding{
padding:20rpx 0
}
.boxPadding .title_chart{
padding-left: 20rpx;
} }
\ No newline at end of file \ No newline at end of file
miniProject/index/me.wxss
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
.zong-content { .zong-content {
padding: 10rpx 0; padding: 10rpx 0;
width: 100%; width: 100%;
height: 324rpx; /* height: 324rpx; */
margin-top: 24rpx; margin-top: 24rpx;
border-radius: 16rpx; border-radius: 16rpx;
background-color: #fff; background-color: #fff;
......
miniProject/pages/editPwd/editPwd.wxml
<view class="container" style="height:{{windowHeight}}px;"> <view class="container" style="height:{{windowHeight}}px;padding-top: {{navHeight}}px">
<navbar page-name="修改密码" bg-color="RGBA(213, 227, 255, 1)" navbar-color="rgba(0, 0, 0, .85)" nav="back" backIcon="1" bind:onGoBack="onGoBack" /> <navbar page-name="修改密码" bg-color="RGBA(213, 227, 255, 1)" navbar-color="rgba(0, 0, 0, .85)" nav="back" backIcon="1" bind:onGoBack="onGoBack" />
<view class="~backgroundColor backf"> <view class="~backgroundColor backf">
<view class="zong-content"> <view class="zong-content">
......
miniProject/pages/editPwd/editPwd.wxss
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
.zong-content { .zong-content {
padding: 10rpx 0; padding: 10rpx 0;
width: 100%; width: 100%;
height: 324rpx; /* height: 324rpx; */
margin-top: 40rpx; margin-top: 40rpx;
border-radius: 16rpx; border-radius: 16rpx;
background-color: #fff; background-color: #fff;
......
miniProject/pages/shopSelect/index.wxml
<!--pages/sameProportion/sameProportion.wxml--> <!--pages/sameProportion/sameProportion.wxml-->
<view class=""> <view class="" style="padding-top: {{navHeight}}px">
<import src="../../components/wxSortPickerView/wxSortPickerView.wxml" /> <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' />
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<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 left-icon="search" value="{{ value }}" placeholder="请输入要搜索的内容" border="{{ true }}" bind:change="onChange" />
</view> </view>
<!-- 模板 --> <!-- 模板 -->
<view class="tesl"> <view class="tesl">
......
miniProject/pages/shopSelect/index.wxss
...@@ -29,8 +29,10 @@ ...@@ -29,8 +29,10 @@
.search { .search {
height: 80rpx; height: 80rpx;
box-sizing: border-box; box-sizing: border-box;
margin: 10rpx auto;
width: 95%;
/* background: red; */ /* background: red; */
margin-top: 110rpx; /* margin-top: 110rpx; */
} }
.tesl { .tesl {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!