Authored by weiqingting

Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6

... ... @@ -38,8 +38,8 @@ var $ = require('jquery'),
{display: "状态", name: "status", render: function (item) {
if(item.status == 1) return "未定时";
else if(item.status == 2) return "未发布";
else if(item.status == 3) return "已结束";
else if(item.status == 4) return "已发布";
else if(item.status == 3) return "已发布";
else if(item.status == 4) return "已结束";
}},
{display: "创建时间", name: "createTime", render: function (item) {
if(!item.createTime) return "";
... ...
//exports.domain = require('../config/common.js').domain;
exports.domain = require('../config/common.js').domain;
// exports.domain = "http://192.168.102.201:8082/platform";
exports.domain = "http://172.16.6.210:8083/platform";
// exports.domain = "http://172.16.6.210:8083/platform";
exports.res = [
{
... ...