diff --git a/dist/yohobuy-portal-fe/5.0.2/jquery/brand.decorate.Edit.js b/dist/yohobuy-portal-fe/5.0.2/jquery/brand.decorate.Edit.js
index fb3f9b3..3a366ae 100644
--- a/dist/yohobuy-portal-fe/5.0.2/jquery/brand.decorate.Edit.js
+++ b/dist/yohobuy-portal-fe/5.0.2/jquery/brand.decorate.Edit.js
@@ -46,45 +46,48 @@ webpackJsonp([20],{
}
},
function(rs) {
- var tipText = "";
if (rs.data) {
var jsonMain = rs.data;
if(!$.isEmptyObject(jsonMain.brandIntro)){
- tipText = "品牌介绍包含违禁词："+jsonMain.brandIntro+"！";
+ var tipText = "品牌介绍包含违禁词："+jsonMain.brandIntro+"！";
+ common.dialog.confirm("温馨提示",tipText + "确定提交吗？",function(){
+ submitForm();
+ });
+ } else {
+ submitForm();
}
}
- common.dialog.confirm("温馨提示",tipText + "确定提交吗？",function(){
- e.submit($("#basicForm").attr("action"), function (option) {
-
- option.data.brandIntro=UMdescriptioner.getContent();
- var isShipping=$("input[type='checkbox'][name='isShipping']");
- if(isShipping.is(':checked')){
- option.data.isShipping=1;
- }else{
- option.data.isShipping=0;
- }
- option.success = function (res) {
- if (res.code == "200") {
- e.$tip("提交成功", function () {
- location.href = "/erpproduct/brands/decorate/index"
- }, 'growl-success');
- } else {
- e.$tip(res.message);
- }
- return false;
- };
- option.error = function (res) {
- e.$tip(res.message);
- };
- console.log(option.data);
- });
- });
},true);
-
return false;
});
+ function submitForm() {
+ e.submit($("#basicForm").attr("action"), function (option) {
+
+ option.data.brandIntro=UMdescriptioner.getContent();
+ var isShipping=$("input[type='checkbox'][name='isShipping']");
+ if(isShipping.is(':checked')){
+ option.data.isShipping=1;
+ }else{
+ option.data.isShipping=0;
+ }
+ option.success = function (res) {
+ if (res.code == "200") {
+ e.$tip("提交成功", function () {
+ location.href = "/erpproduct/brands/decorate/index"
+ }, 'growl-success');
+ } else {
+ e.$tip(res.message);
+ }
+ return false;
+ };
+ option.error = function (res) {
+ e.$tip(res.message);
+ };
+ console.log(option.data);
+ });
+ }
/***/ },
diff --git a/dist/yohobuy-portal-fe/5.0.2/jquery/goods.netsale.Edit.js b/dist/yohobuy-portal-fe/5.0.2/jquery/goods.netsale.Edit.js
index 3a8c962..990c47e 100644
--- a/dist/yohobuy-portal-fe/5.0.2/jquery/goods.netsale.Edit.js
+++ b/dist/yohobuy-portal-fe/5.0.2/jquery/goods.netsale.Edit.js
@@ -13472,41 +13472,44 @@ webpackJsonp([46],{
}
},
function(rs) {
- var tipText = "";
if (rs.data) {
var jsonMain = rs.data;
if(!$.isEmptyObject(jsonMain.phrase)){
- tipText = "推荐短语包含违禁词："+jsonMain.phrase+"！";
- }
- }
- common.dialog.confirm("温馨提示",tipText + "确定提交吗？",function(){
-
- common.util.__ajax({
- url:'/goods/product/saveNetSaleBaseInfo',
- data:{
- productSkn:basicInfo.productSkn,
- productName:common.util.__input('productName'),
- isNew:common.util.__input('[name=isNew]:checked'),
- sellChannels:common.util.__input('[name=sellChannels]:checked'),
- phrase:phraseValue,
- outSaleTime:common.util.__input('outSaleTime'),
- shopIds:common.util.__input('[name=shopIds]:checked'),
- delayArrivalNotice:common.util.__input('delayArrivalNotice'),
- grade:common.util.__input('grade')||0,
- isLimited:common.util.__input('isLimited')||'N',
- isOutlets:common.util.__input('isOutLets2')||'N',
- seasons:common.util.__input('seasons')
- }
- })
-
- if (common.util.__sknOperateLog(basicInfo.productSkn, common.util.__input('phrase'), oldphrase, 6)) {
- oldphrase = common.util.__input('phrase');
- }
-
- });
+ var tipText = "推荐短语包含违禁词："+jsonMain.phrase+"！";
+ common.dialog.confirm("温馨提示",tipText + "确定提交吗？",function(){
+ submitForm();
+ });
+ } else {
+ submitForm();
+ }
+ }
},true);
})
+
+ function submitForm() {
+ common.util.__ajax({
+ url:'/goods/product/saveNetSaleBaseInfo',
+ data:{
+ productSkn:basicInfo.productSkn,
+ productName:common.util.__input('productName'),
+ isNew:common.util.__input('[name=isNew]:checked'),
+ sellChannels:common.util.__input('[name=sellChannels]:checked'),
+ phrase:common.util.__input('phrase'),
+ outSaleTime:common.util.__input('outSaleTime'),
+ shopIds:common.util.__input('[name=shopIds]:checked'),
+ delayArrivalNotice:common.util.__input('delayArrivalNotice'),
+ grade:common.util.__input('grade')||0,
+ isLimited:common.util.__input('isLimited')||'N',
+ isOutlets:common.util.__input('isOutLets2')||'N',
+ seasons:common.util.__input('seasons')
+ }
+ })
+
+ if (common.util.__sknOperateLog(basicInfo.productSkn, common.util.__input('phrase'), oldphrase, 6)) {
+ oldphrase = common.util.__input('phrase');
+ }
+ }
// var e = new common.edit('#basicInfoWrap');
// e.init();
@@ -13594,22 +13597,29 @@ webpackJsonp([46],{
}
},
function(rs) {
- var tipText = "";
if (rs.data) {
var jsonMain = rs.data;
if(!$.isEmptyObject(jsonMain.content)){
- tipText = "商品描述包含违禁词："+jsonMain.content+"！";
+ var tipText = "商品描述包含违禁词："+jsonMain.content+"！";
+ common.dialog.confirm("温馨提示",tipText + "确定提交吗？",function(){
+ common.util.__ajax({
+ url:'/product/saveProductDesc',
+ data:{
+ productSkn:productSkn,
+ productDesc:content
+ }
+ });
+ });
+ } else {
+ common.util.__ajax({
+ url:'/product/saveProductDesc',
+ data:{
+ productSkn:productSkn,
+ productDesc:content
+ }
+ });
}
}
- common.dialog.confirm("温馨提示",tipText + "确定提交吗？",function(){
- common.util.__ajax({
- url:'/product/saveProductDesc',
- data:{
- productSkn:productSkn,
- productDesc:content
- }
- });
- });
},true);
});
@@ -14602,30 +14612,34 @@ webpackJsonp([46],{
}
},
function(rs) {
- var tipText = "";
if (rs.data) {
var jsonMain = rs.data;
if(!$.isEmptyObject(jsonMain.salesPhrase)){
- tipText = "促销短语包含违禁词："+jsonMain.salesPhrase+"！";
- }
- }
- common.dialog.confirm("温馨提示",tipText + "确定提交吗？",function(){
- common.util.__ajax({
- url:'/goods/product/saveAfterSaleInfo',
- data:{
- productSkn:basicInfo.productSkn,
- makeCrafts:common.util.__input('makeCrafts'),
- salesPhrase:common.util.__input('salesPhrase'),
- isHostsell:common.util.__input('[name=isHostsell]:checked'),
- wearSense:sense(),
- attributeProValuesTwo:JSON.stringify(attributeObj())
- }
- });
-
- });
+ var tipText = "促销短语包含违禁词："+jsonMain.salesPhrase+"！";
+ common.dialog.confirm("温馨提示",tipText + "确定提交吗？",function(){
+ submitForm();
+ });
+ } else {
+ submitForm();
+ }
+ }
},true);
});
+ function submitForm() {
+ common.util.__ajax({
+ url:'/goods/product/saveAfterSaleInfo',
+ data:{
+ productSkn:basicInfo.productSkn,
+ makeCrafts:common.util.__input('makeCrafts'),
+ salesPhrase:common.util.__input('salesPhrase'),
+ isHostsell:common.util.__input('[name=isHostsell]:checked'),
+ wearSense:sense(),
+ attributeProValuesTwo:JSON.stringify(attributeObj())
+ }
+ });
+ }
+
//去编辑商品名称
$('#editProductName').on('click', function() {
$('#productName').focus();
diff --git a/dist/yohobuy-portal-fe/5.0.2/jquery/shop.Edit.js b/dist/yohobuy-portal-fe/5.0.2/jquery/shop.Edit.js
index fff9287..a08262a 100644
--- a/dist/yohobuy-portal-fe/5.0.2/jquery/shop.Edit.js
+++ b/dist/yohobuy-portal-fe/5.0.2/jquery/shop.Edit.js
@@ -305,48 +305,53 @@ webpackJsonp([161],{
}
},
function(rs) {
- var tipText = "";
if (rs.data) {
var jsonMain = rs.data;
if(!$.isEmptyObject(jsonMain.shopIntro)){
- tipText = "店铺简介包含违禁词："+jsonMain.shopIntro+"！";
- }
- }
- common.dialog.confirm("温馨提示",tipText + "确定提交吗？",function(){
- var result = e.submit($("#storeForm").attr("action"),function(option){
- option.data=$.extend({},option.data,_arr);
- option.data.shopIntro = UMshopintro.getContent();
- console.log(option.data);
- option.success=function(res){
- if(res.code=="200"){
- e.$tip('提交成功',function(){
- //location.href="/supplier/store/index";
- history.go(-1);
- },'growl-success');
- }else{
- e.$tip(res.message);
- $(".btn-cun").removeAttr("disabled");
- $(".btn-success").removeAttr("disabled");
- }
- return false;
- },
- option.error=function(res){
- e.$tip("提交失败");
- $(".btn-cun").removeAttr("disabled");
- $(".btn-success").removeAttr("disabled");
- }
- callback&&callback(option.data);
- });
- // 发生校验错误
- if(result === false) {
- $(".btn-cun").removeAttr("disabled");
- $(".btn-success").removeAttr("disabled");
+ var tipText = "店铺简介包含违禁词："+jsonMain.shopIntro+"！";
+ common.dialog.confirm("温馨提示",tipText + "确定提交吗？",function(){
+ submitForm(callback);
+ });
+ } else {
+ submitForm(callback);
}
- });
+ }
},true);
};
+ function submitForm(callback) {
+ var result = e.submit($("#storeForm").attr("action"),function(option){
+ option.data=$.extend({},option.data,_arr);
+ option.data.shopIntro = UMshopintro.getContent();
+ console.log(option.data);
+ option.success=function(res){
+ if(res.code=="200"){
+ e.$tip('提交成功',function(){
+ //location.href="/supplier/store/index";
+ history.go(-1);
+ },'growl-success');
+ }else{
+ e.$tip(res.message);
+ $(".btn-cun").removeAttr("disabled");
+ $(".btn-success").removeAttr("disabled");
+ }
+ return false;
+ },
+ option.error=function(res){
+ e.$tip("提交失败");
+ $(".btn-cun").removeAttr("disabled");
+ $(".btn-success").removeAttr("disabled");
+ }
+ callback&&callback(option.data);
+ });
+ // 发生校验错误
+ if(result === false) {
+ $(".btn-cun").removeAttr("disabled");
+ $(".btn-success").removeAttr("disabled");
+ }
+ }
+
//提交
$(".btn-success").click(function(){
// 为防止同时触发 "提交审核" 和 "暂存"，对按钮做灰化处理