Authored by weiqingting

Merge branch 'yohobuy-shop-dev-4.6-20160606' of http://git.yoho.cn/fe/yohobuy-sh…

…op-fe2 into yohobuy-shop-dev-4.6-20160606
... ... @@ -6,7 +6,7 @@ module.exports=function(app) {
app.get("/logout","common.Login");
app.post("/login", "common_login", function (login, req, res){
if (login.code = 200) {
if (login.code == 200) {
res.myRedirect('/');
} else {
res.myRedirect('/login');
... ...
... ... @@ -146,7 +146,7 @@
}).then(function (response) {
var rs = response.data;
self.buyNumbers = rs.data.buyNumbers?rs.data.buyNumbers:'--';
self.orderAmount = rs.data.orderAmount?rs.data.buyNumbers:'--';
self.orderAmount = rs.data.orderAmount?rs.data.orderAmount:'--';
self.overViewUpdateTime = rs.data.hour?rs.data.hour.substring(0,5):'--';
}, function (response) {
var rs = response.data;
... ...
... ... @@ -96,7 +96,7 @@
},
{
name: '', display: '商品分类', render: function (item) {
return '<p>' + item.maxSortName + '-' + item.middleSortName + '</p>';
return [item.maxSortName, item.middleSortName, item.smallSortName].join('-');
}
},
{name: 'buyNumber', display: '数量'},
... ...
... ... @@ -42,8 +42,8 @@
saleData: {type: Object, default: {}}
},
data() {
let date=new Date();
date.setDate(date.getDate()-1);
let date = new Date();
date.setDate(date.getDate() - 1);
return {
cards: [
{name: "有效订单的商品件数", value: "0", name1: "环比", value1: "0"},
... ... @@ -95,7 +95,7 @@
},
{
name: '', display: '商品分类', render: function (item) {
return '<p>' + item.maxSortName + '-' + item.middleSortName + '</p>';
return [item.maxSortName, item.middleSortName, item.smallSortName].join('-');
}
},
{name: 'buyNumber', display: '数量'},
... ... @@ -118,7 +118,7 @@
if (this.params.sortList.length > 0) {
let length = this.params.sortList.length;
this.params.sortId = this.params.sortList[length - 1].id;
}else{
} else {
this.params.sortId = '';
}
var data = {
... ... @@ -140,9 +140,9 @@
}
return time;
},
checkRate(rate,value){
checkRate(rate, value){
if (rate) {
value =rate
value = rate
} else if (rate == 0) {
value = 0;
} else {
... ... @@ -156,9 +156,9 @@
let result = data.additionInfo;
if (result) {
this.cards[0].value = result.allNumber ? result.allNumber : 0;
this.cards[0].value1=this.checkRate(result.allNumberRate,this.cards[0].value1);
this.cards[0].value1 = this.checkRate(result.allNumberRate, this.cards[0].value1);
this.cards[1].value = result.allAmount ? result.allAmount : 0;
this.cards[1].value1=this.checkRate(result.allAmountRate,this.cards[1].value1);
this.cards[1].value1 = this.checkRate(result.allAmountRate, this.cards[1].value1);
}
}
}
... ...
... ... @@ -43,8 +43,8 @@ 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.189:8080/bigdata",//李建
bigdata:"http://192.168.102.210:8091/bigdata",
//bigdata:"http://172.16.6.110:8080",//钟文
system:Iaccount
},
... ...
... ... @@ -4,7 +4,7 @@ module.exports=function(app) {
app.get("/login","common.Login");
app.post("/login", "common_login", function (login, req, res){
if (login.code = 200) {
if (login.code == 200) {
res.myRedirect('/');
} else {
res.myRedirect('/login');
... ...
... ... @@ -43,7 +43,7 @@ var apiCofig = {
//root:__dirname,
EnvConst:{
domain:"http://192.168.102.210:8088/platform",
//bigdata:"http://172.16.6.189:8080/bigdata",//李建
// bigdata:"http://172.16.6.189:8080/bigdata",//李建
bigdata:"http://192.168.102.210:8091/bigdata",
//bigdata:"http://172.16.6.110:8080",//钟文
system:Iaccount
... ...