Authored by xuhongyun

build

... ... @@ -379,15 +379,20 @@ webpackJsonp([13],[
function saveDecoration(submitStatus){
console.log(jsonMain);
common.util.__ajax({
url:'/shop/ShopsDecoratorRest/saveShopsDecorator',
url:'/shop/sellerDecoratorRest/saveShopsDecorator',
data: {
"submitStatus": submitStatus,
"shopsId": jsonMain.shopsId,
"platform": jsonMain.platform,
"platformType": 2,
"templateType": jsonMain.templateType,
"resources": JSON.stringify(jsonMain.resources)
}
},function(rs){
if(rs.data == 500){
common.util.__tip(rs.message);
return;
}
if(rs.data){
if(submitStatus == 100){
jsonMain = rs.data;
... ...
... ... @@ -1876,10 +1876,11 @@ webpackJsonp([18],{
}
common.util.__ajax({
url: '/shop/ModularDecoratorRest/saveDecoratorTemplate',
url: '/shop/sellerDecoratorRest/saveDecoratorTemplate',
data: {
shopId: Bll.shopId,
platform: +t.active ? 0 : 1,
platformType: 2,
appType: Bll.appType,
templateName: name,
templateType: Bll.templateType,
... ... @@ -1887,6 +1888,10 @@ webpackJsonp([18],{
flag: flag
}
}, function(res) {
if(res.data == 500){
common.util.__tip(res.message);
return;
}
if(res && res.code == 200) {
// 重载模板列表
Bll.getTemplates();
... ... @@ -1974,13 +1979,18 @@ webpackJsonp([18],{
});
common.util.__ajax({
url: "/shop/ModularDecoratorRest/updateDecoratorTemplate",
url: "/shop/sellerDecoratorRest/updateDecoratorTemplate",
data: {
templateId: templateId,
shopId: Bll.shopId,
platformType: 2,
modules: JSON.stringify(Bll.moduleDataList)
}
}, function(resp) {
if(resp.data == 500){
common.util.__tip(resp.message);
return;
}
if(resp.code === 200) {
// 将变化监控值置为0,无需重新刷新模板列表
Bll.changedModuleMonitor = 0;
... ... @@ -2213,7 +2223,8 @@ webpackJsonp([18],{
common.util.__ajax({
url: '/shop/ModularDecoratorRest/deleteDecoratorTemplate',
data: {
templateId: templateId
templateId: templateId,
platformType: 2
}
}, function(res) {
if(res && res.code == 200) {
... ...
... ... @@ -21,6 +21,7 @@ module.exports = {
params: [
{name: "shopId", type: "Number"},
{name: "platform", type: "Number"},
{name: "platformType", type: "Number"},
{name: "appType", type: "Number"},
{name: "templateName", type: "String"},
{name: "templateType", type: "String"},
... ... @@ -34,7 +35,7 @@ module.exports = {
params: [
{name: "shopId", type: "Number"},
{name: "platform", type: "Number"},
{name: 'platformType', type: 'Number'},
{name: "platformType", type: "Number"},
{name: "appType", type: "Number"}
]
},
... ... @@ -49,7 +50,8 @@ module.exports = {
title: "删除装修模板",
url: "/newShopsDecoratorRest/deleteDecoratorTemplate",
params: [
{name: "templateId", type: "Number"}
{name: "templateId", type: "Number"},
{name: "platformType", type: "Number"}
]
},
publishDecoratorTemplate: {
... ... @@ -66,6 +68,7 @@ module.exports = {
{name: "templateId", type: "Number"},
{name: "shopId", type: "Number"},
{name: "platform", type: "Number"},
{name: "platformType", type: "Number"},
{name: "appType", type: "Number"},
{name: "templateName", type: "String"},
{name: "modules", type: "String"}
... ...
... ... @@ -30,6 +30,7 @@
{name: 'shopsId', type: 'Number'},
{name: 'submitStatus', type: 'Number'},
{name: 'platform', type: 'String'},
{name: 'platformType', type: 'Number'},
{name: 'templateType', type: 'String'},
{name: 'resources', type: 'String'}
]
... ...
... ... @@ -384,7 +384,8 @@ function __sendRequest(options, success, fail, wlen, i, args) {
if (!options.outobj) {
obj = JSON.parse(body)
if (!(typeof obj == "object")) {
_err_.message = "Error[json parse@" + options.title + "--"+options.url+"]:" + body;
//_err_.message = "Error[json parse@" + options.title + "--"+options.url+"]:" + body; // 返回给页面的消息不能含有服务器的ip等信息
_err_.message = "Error[json parse@" + options.title + "]:" + body;
console.info(_err_.message);
console.error(_err_);
wlen.len = 0;
... ... @@ -395,7 +396,8 @@ function __sendRequest(options, success, fail, wlen, i, args) {
obj = options.outobj.toLocaleUpperCase().indexOf("BODY")>-1?body:response;
}
} else {
_err_.message = "Error[response state @" + options.title + "--"+options.url+"]:" + response.statusCode;
//_err_.message = "Error[response state @" + options.title + "--"+options.url+"]:" + response.statusCode; // 返回给页面的消息不能含有服务器的ip等信息
_err_.message = "Error[response state @" + options.title +"]:" + response.statusCode;
console.info(_err_.message);
console.error(_err_);
wlen.len = 0;
... ...