fe / yohobuy-shop-fe2 · Commits

Go to a project

Authored by dongjunjie
Commit 8c97d4e68902c7e76d44fe2a6d66cce7b3327b8d 1 parent f81b3678

会员画像bug修改+样式调节

Inline Side-by-side
Showing 5 changed files with 30 additions and 35 deletions
... ... @@ -5,13 +5,10 @@
<span>展示近30天销售地域分布数据</span>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div id="yohoTop" style="width: 500px;height:400px"></div>
</div>
<div class="col-sm-6">
<div id="shopTop" style="width: 500px;height:400px"></div>
</div>
<div class="_mainChart" style="margin-bottom: 0">
<div id="yohoTop" style="width: 500px;height:400px;float: left;margin-left: 80px"></div>
<div id="shopTop" style="width: 500px;height:400px;float: left;margin-left: 150px"></div>
<div class="clearfix"></div>
</div>
</template>
... ... @@ -34,12 +31,12 @@
var data = response.data.data;
//全站销售地域
var yohoTop = echarts.init(document.getElementById('yohoTop'));
var yohoOption = this.getXOption(data.yoho.x, data.yoho.y, "全站销售地域top10：");
var yohoOption = this.getXOption(data.yoho.x, data.yoho.y, "全站销售地域Top10：");
yohoTop.setOption(yohoOption);
//店铺销售地域
var shopTop = echarts.init(document.getElementById('shopTop'));
var shopOption = this.getXOption(data.shop.x, data.shop.y, "店铺销售地域top10：");
var shopOption = this.getXOption(data.shop.x, data.shop.y, "店铺销售地域Top10：");
shopTop.setOption(shopOption);
});
},
... ... @@ -47,7 +44,8 @@
var option = {
title : {
show: true,
text: title
text: title,
x:'center'
},
xAxis : [
{
... ... @@ -126,4 +124,7 @@
line-height: 40px;
font-size: 14px;
}
._mainChart{
margin: 20px 0;
}
</style>
\ No newline at end of file
... ...
... ... @@ -5,13 +5,10 @@
<span>统计近30天累计消费人群数据</span>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div id="consumptionLevel" style="width: 600px;height:400px"></div>
</div>
<div class="col-sm-6">
<div id="vipDistribute" style="width: 600px;height:400px"></div>
</div>
<div class="_mainChart">
<div id="consumptionLevel" style="width: 500px;height:400px;float: left;margin-left: 80px"></div>
<div id="vipDistribute" style="width: 500px;height:400px;float: left;margin-left: 150px"></div>
<div class="clearfix"></div>
</div>
</template>
... ... @@ -46,18 +43,25 @@
var option = {
title : {
show: true,
text: title
text: title,
x:'center'
},
tooltip : {
show: true,
trigger: 'axis',
formatter: function (params){
return params.valueOf() + '%';
//console.log(params);
var p = [];
for(var i=0; i<params.length; i++){
p.push(params[i].seriesName + "：" + params[i].value + "%");
}
return p.join('<br>');
}
},
legend: {
data:['当前店铺','YOHO！'],
show:true
show:true,
y:'bottom'
},
xAxis : [
{
... ... @@ -134,7 +138,6 @@
}
]
};
console.log(option);
return option;
}
}
... ...
... ... @@ -43,9 +43,9 @@ var apiCofig = {
//root:__dirname,
EnvConst:{
domain:"http://192.168.102.210:8088/platform",
bigdata:"http://192.168.102.210:8091/bigdata",
// bigdata:"http://172.16.6.169:8080",//钟文
// bigdata:"http://172.16.6.189:8080/bigdata",//李建
// bigdata:"http://192.168.102.210:8091/bigdata",
bigdata:"http://172.16.6.169:8080",//钟文
system:Iaccount
},
apps:path.join(__dirname,"apps"),
... ...
... ... @@ -43,9 +43,9 @@ var apiCofig = {
//root:__dirname,
EnvConst:{
domain:"http://192.168.102.210:8088/platform",
// bigdata:"http://172.16.6.189:8080/bigdata",//李建
bigdata:"http://192.168.102.210:8091/bigdata",
//bigdata:"http://172.16.6.110:8080",//钟文
// bigdata:"http://172.16.6.169:8080",//钟文
// bigdata:"http://172.16.6.189:8080/bigdata",//李建
system:Iaccount
},
apps:path.join(__dirname,"apps"),
... ...
{
"name": "server",
"version": "0.0.0",
"description": "server",
"main": "server.js",
"author": {
"name": "yoho",
"email": ""
}
}
{"name":"yohobuy-shops-fe","version":"4.7.4","description":"Construction of the presentation layer solution is based on express, handlebars","main":"app.js","scripts":{"code":"set NODE_ENV=coding&& gulp start","build":"set NODE_ENV=production && gulp && gulp mvc","server":"set NODE_ENV=server&& gulp start"},"dependencies":{"art-template":"^3.0.3","async":"^2.0.0-rc.3","body-parser":"^1.15.0","connect-multiparty":"^2.0.0","connect-redis":"^3.0.2","cookie-parser":"^1.4.1","express":"^4.13.4","express-session":"^1.13.0","lodash":"^4.11.1","md5":"^2.1.0","mkdirp":"^0.5.1","request":"^2.72.0","winston":"^2.2.0","glob":"^7.0.3"}}
\ No newline at end of file
... ...