fe / yohobuy-portal-fe · Commits

Go to a project

Authored by weiqingting
Commit db44aa4a5427d46a4ffdd893a5b31911c5f2944b 2 parents 95be2d8b e057a995

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

Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
@@ -38,8 +38,8 @@ var $ = require('jquery'), @@ -38,8 +38,8 @@ var $ = require('jquery'),
38 {display: "状态", name: "status", render: function (item) { 38 {display: "状态", name: "status", render: function (item) {
39 if(item.status == 1) return "未定时"; 39 if(item.status == 1) return "未定时";
40 else if(item.status == 2) return "未发布"; 40 else if(item.status == 2) return "未发布";
41 - else if(item.status == 3) return "已结束";  
42 - else if(item.status == 4) return "已发布"; 41 + else if(item.status == 3) return "已发布";
  42 + else if(item.status == 4) return "已结束";
43 }}, 43 }},
44 {display: "创建时间", name: "createTime", render: function (item) { 44 {display: "创建时间", name: "createTime", render: function (item) {
45 if(!item.createTime) return ""; 45 if(!item.createTime) return "";
1 -//exports.domain = require('../config/common.js').domain; 1 +exports.domain = require('../config/common.js').domain;
2 // exports.domain = "http://192.168.102.201:8082/platform"; 2 // exports.domain = "http://192.168.102.201:8082/platform";
3 - exports.domain = "http://172.16.6.210:8083/platform"; 3 +// exports.domain = "http://172.16.6.210:8083/platform";
4 4
5 exports.res = [ 5 exports.res = [
6 { 6 {