Authored by 陶雨

Merge branch 'yohobuy_portal_dev_v4.6_20160601' of http://git.yoho.cn/fe/yohobuy…

…-portal-fe into yohobuy_portal_dev_v4.6_20160601
... ... @@ -138,10 +138,17 @@ var g = new common.grid({
{
display: '状态', render: function (item) {
var html = ENUM.status[item.status] || '全部';
if (item.reason) {
if (item.status == 2 || item.status == 4) {
html += '<p style="color:red;word-wrap: break-word;">(' + item.reason + ')</p>';
if (item.status == 2) {
if (item.rejectReason.length > 10) {
item.rejectReason = item.rejectReason.substring(0, 10) + "......";
}
html += '<p style="color:red;word-wrap: break-word;">(' + item.rejectReason + ')</p>';
}
if (item.status == 3) {
if (item.invalidReason.length > 10) {
item.invalidReason = item.invalidReason.substring(0, 10) + "......";
}
html += '<p style="color:red;word-wrap: break-word;">(' + item.invalidReason + ')</p>';
}
return html;
}
... ... @@ -172,7 +179,7 @@ var Bll = {
data: data()
}, function () {
g.reload();
},true);
}, true);
});
},
toastPass: function (content, url, data) {
... ... @@ -182,7 +189,7 @@ var Bll = {
data: data
}, function () {
g.reload();
},true);
}, true);
});
},
toastInfo: function (item, hint) {
... ... @@ -256,7 +263,7 @@ $(document).on('click', '.apply-cancel', function () {
invalidReason: reason
};
};
Bll.toast(common.util.__template2($("#template").html(), {name: "你确定要作废此限购码吗?"}), "/coupon/invalid", data);
Bll.toast(common.util.__template2($("#template").html(), {name: "你确定要作废此优惠券吗?"}), "/coupon/invalid", data);
});
/**
* 查看详情
... ... @@ -283,8 +290,8 @@ $(document).on('click', '.coupon-info', function () {
}
item1.customType = types.join(",");
}
}else {
item1.customType="无";
} else {
item1.customType = "无";
}
Bll.toastInfo(item1, '优惠券详情');
});
... ...
... ... @@ -12,9 +12,8 @@ var config = {
'development': {
redis: null,
apiKey: 'sd4H1ecAqlp',
// domain:'http://192.168.102.210:8088/platform',//联调
yohoSearch: 'http://192.168.102.216:8087/yohosearch',
domain: 'http://192.168.102.202:8088/platform',//测试
domain:'http://192.168.102.210:8088/platform',//联调
// domain: 'http://192.168.102.202:8088/platform',//测试
loggers: {
api: {
... ...
... ... @@ -69,7 +69,6 @@
<option value="2">B</option>
<option value="3">公开券</option>
<option value="4">生日券</option>
<option value="5">免邮券</option>
</select>
</div>
</div>
... ...