fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by shuaiguo
Commit a0e763578e93f1a0e1a4c7e8056034c3002a2557 2 parents d070be54 8bb73131

Merge branch 'gray'

Inline Side-by-side
Showing 2 changed files with 52 additions and 10 deletions
... ... @@ -44,6 +44,16 @@ var operationEdit={
cnName : '每满减',
param_list : [
{
name: 'parallel',
display_name : '是否平行',
type: 'radio',
default_value: 'N',
values: ['N','Y'],
remark: `设置为平行：<br/>
用户结算：与店铺券、红包平行计算、与平台券不平行<br/>
财务结算：此促销优惠部分，代销供应商承担、经销平台承担`
},
{
name:'maxLoopNumber' ,
display_name : '循环上限',
type : 'text',
... ... @@ -224,18 +234,29 @@ var operationEdit={
}
break;
case "textarea":
_input=$("<textarea style=\"width: 400px; height: 90px;\"></textarea>");
_input=$("<textarea style=\"width: 400px; height: 90px;border: 1px solid #ccc\"></textarea>");
if(this.actionParam&&this.actionParam[_param.name]){
_input.text(this.actionParam[_param.name]);
}else{
_input.text(_param.default_value);
}
break;
}
_input.attr("id",_param.name);
_input.attr("name",_param.name);
var $inputParent = _html.children("div").html(_input);
var $inputParent = _html.children("div");
if(_param.type === 'radio') {
$inputParent.html('');
_param.values.forEach(value=> {
$inputParent.append($(`<label style="${value === 'N' ? 'margin-right: 50px' : ''}"><input type="radio" id="${_param.name}"
name="${_param.name}"
value="${value}"
${(this.actionParam&&this.actionParam[_param.name] || 'N') === value ? 'checked' : ''} />${value === 'N' ? '否': '是'}</label>`))
})
}else{
_input.attr("id",_param.name);
_input.attr("name",_param.name);
$inputParent.html(_input);
}
if(_param.post_label) {
$inputParent.css({'display': 'flex', 'align-items': 'center'});
$inputParent.append($('<span>倍</span>').css('padding-left', '10px'))
... ...
... ... @@ -747,6 +747,16 @@ webpackJsonp([28],[
cnName : '每满减',
param_list : [
{
name: 'parallel',
display_name : '是否平行',
type: 'radio',
default_value: 'N',
values: ['N','Y'],
remark: `设置为平行：<br/>
用户结算：与店铺券、红包平行计算、与平台券不平行<br/>
财务结算：此促销优惠部分，代销供应商承担、经销平台承担`
},
{
name:'maxLoopNumber' ,
display_name : '循环上限',
type : 'text',
... ... @@ -927,18 +937,29 @@ webpackJsonp([28],[
}
break;
case "textarea":
_input=$("<textarea style=\"width: 400px; height: 90px;\"></textarea>");
_input=$("<textarea style=\"width: 400px; height: 90px;border: 1px solid #ccc\"></textarea>");
if(this.actionParam&&this.actionParam[_param.name]){
_input.text(this.actionParam[_param.name]);
}else{
_input.text(_param.default_value);
}
break;
}
_input.attr("id",_param.name);
_input.attr("name",_param.name);
var $inputParent = _html.children("div").html(_input);
var $inputParent = _html.children("div");
if(_param.type === 'radio') {
$inputParent.html('');
_param.values.forEach(value=> {
$inputParent.append($(`<label style="${value === 'N' ? 'margin-right: 50px' : ''}"><input type="radio" id="${_param.name}"
name="${_param.name}"
value="${value}"
${(this.actionParam&&this.actionParam[_param.name] || 'N') === value ? 'checked' : ''} />${value === 'N' ? '否': '是'}</label>`))
})
}else{
_input.attr("id",_param.name);
_input.attr("name",_param.name);
$inputParent.html(_input);
}
if(_param.post_label) {
$inputParent.css({'display': 'flex', 'align-items': 'center'});
$inputParent.append($('<span>倍</span>').css('padding-left', '10px'))
... ...