fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by xuhongyun
Commit c91749a65fcc91259be4748be9d52f8d0c176429 1 parent b82abba0

build

Inline Side-by-side
Showing 8 changed files with 146 additions and 21 deletions
... ... @@ -276,8 +276,19 @@ webpackJsonp([75],{
$.extend(window.ViewModel, res.data);
couponBean.limitStartTime = Bll.getTime(couponBean.limitStartTime);
if (couponBean.startTime == 0 ){
couponBean.startTime = null;
}else{
couponBean.startTime = Bll.getTime(couponBean.startTime);
}
if (couponBean.endTime == 0){
couponBean.endTime = null;
}else{
couponBean.endTime = Bll.getTime(couponBean.endTime);
}
Bll.selectSorts = couponBean.sortList || [];
//店铺数据
Bll.selectShops = couponBean.shopList || [];
... ... @@ -352,6 +363,8 @@ webpackJsonp([75],{
if (couponTypeVal == 1 || couponTypeVal == 8){
couponBean.showScope = "";
} else if(couponTypeVal == 6){
couponBean.showScope = "1,2,3";
} else {
couponBean.showScope = "2";
}
... ... @@ -1147,6 +1160,7 @@ webpackJsonp([75],{
useRange: 0,
shopList: "",
shopIds: "",
tPlusN:"",
feeSharingType: "0",
feeSharingRatio: "",
isUseLimitRule: "",
... ...
... ... @@ -128,9 +128,7 @@ webpackJsonp([77],[
},
{
display: "使用期限", render: function (item) {
var startTime = Bll.getTime(item.startTime);
var endTime = Bll.getTime(item.endTime);
return startTime + "</br> 至 " + endTime;
return item.usePeriodStr;
}
},
{
... ... @@ -410,6 +408,8 @@ webpackJsonp([77],[
item1.shopPriceLimits = "无";
}
item1.usePeriodStr = item.usePeriodStr;
Bll.toastInfo(item1, '优惠券详情');
});
// 绑定第三方
... ...
... ... @@ -122,7 +122,6 @@ webpackJsonp([151],{
return false;
}
// 通用楼层检查
if (module.contentData.template_name == 'floorMark'){
if (module.contentData.floorCategory =='-1'){
... ... @@ -1262,6 +1261,16 @@ webpackJsonp([151],{
// 默认模式
if(isDefault=='1') {
$("#divideDefinedDiv").find("input[type=file]").removeAttr("required");
Bll.module.contentData.imageHeight = '';
Bll.module.contentData.imageWidth = '';
Bll.module.contentData.data =[{
"url": {
"action": "",
"url": ""
},
"alt": "",
"src": ""
}];
}
// 图片模式
else{
... ... @@ -1418,11 +1427,28 @@ webpackJsonp([151],{
Bll.renderDialog("splitJointImg-template");
});
$(document).on("change", '#img_version_control', function () {
Bll.module.contentData.version_control = $(this).val();
Bll.renderDialog("imageListFloor-template");
});
$(document).on("change", '#floorContent', function () {
Bll.module.contentData.floorContent = $(this).val();
Bll.renderDialog("floorMark-template");
});
$(document).on("change", '#splitJoint_leave_blank', function () {
Bll.module.contentData.leave_blank = $(this).val();
Bll.renderDialog("splitJointImg-template");
});
$(document).on("change", '#banner_leave_blank', function () {
Bll.module.contentData.leave_blank = $(this).val();
Bll.renderDialog("splitJointImgBanner-template");
});
$(document).on("change", '#position-select', function () {
Bll.module.contentData.data.ufo_position = $(this).val();
Bll.renderDialog("cpsShowBanner-template");
... ... @@ -1526,7 +1552,14 @@ webpackJsonp([151],{
Bll.renderDialog("splitJointImgBanner-template");
});
$(document).on("change", '#focus_is_extend', function () {
if ($(this).is(':checked')) {
Bll.module.contentData.is_extend = 1;
}else{
Bll.module.contentData.is_extend = 0;
}
Bll.renderDialog("focus-template");
});
$(document).on("change", '#isNewUserFloor', function () {
if ($(this).is(':checked')) {
... ... @@ -2803,7 +2836,8 @@ webpackJsonp([151],{
image_height:"",
image_width:"",
is_extend:"",
version_control:"1"
version_control:"1",
leave_blank:"blank"
},
{
template_intro: "均分图片轮播图",
... ... @@ -2824,6 +2858,7 @@ webpackJsonp([151],{
img_rows:"",
img_columns:"",
is_extend:"",
leave_blank:"blank"
},
{
template_intro: "猜你喜欢",
... ... @@ -2879,6 +2914,7 @@ webpackJsonp([151],{
isFocusRec:""
}
],
is_extend:"",
image_height:"",
image_width:"",
after_app_version_682: 0,
... ... @@ -4485,7 +4521,8 @@ webpackJsonp([151],{
"title":"",
"list":[]
},
"isNewFloor":"1"
"isNewFloor":"1",
version_control:"1",
},
{
template_intro: "图片列表轮播图",
... ...
... ... @@ -44,6 +44,7 @@ module.exports = {
limitStartTime: {type: String},
startTime: {type: String},
endTime: {type: String},
tPlusN: {type: String},
explains: {type: String},
useLimitType: {type: Number},
useLimit: {type: Number},
... ...
... ... @@ -146,20 +146,35 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">使用期限(T+N)<span class="red">*</span></label>
<div class="col-sm-6">
<div class="col-sm-4">
<input type="text" class="form-control observe" data-field="tPlusN" id="tPlusN"
placeholder="领取后的有效天数" value="[[tPlusN]]" >
</div>
<div class="col-sm-4">
<label><span class="red">(T+N)和(开始结束时间)选填二选一</span></label>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">使用期限<span class="red">*</span></label>
<label class="col-sm-2 control-label">使用期限(开始结束时间)<span class="red">*</span></label>
<div class="col-sm-6">
<div class="col-sm-4">
<input type="text" class="form-control observe" data-field="startTime" id="startTime"
placeholder="开始时间" value="[[startTime]]" readonly required>
placeholder="开始时间" value="[[startTime]]" readonly >
</div>
<div class="col-sm-1">
<label class="control-label">到</label>
</div>
<div class="col-sm-4">
<input type="text" class="form-control observe" data-field="endTime" id="endTime"
placeholder="结束时间" value="[[endTime]]" readonly required>
placeholder="结束时间" value="[[endTime]]" readonly >
</div>
</div>
</div>
... ...
... ... @@ -158,14 +158,9 @@
<div class="form-group">
<label class="col-sm-2 control-label">使用期限</label>
<div class="col-sm-3">
<p>[[startTime]]</p>
</div>
<div class="col-sm-1">
<p>到</p>
</div>
<div class="col-sm-3">
<p>[[endTime]]</p>
<p>[[usePeriodStr]]</p>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">优惠券说明</label>
... ...
... ... @@ -1982,6 +1982,15 @@
<!--焦点图-->
<script type="text/template" id="focus-template">
<input type="button" class="btn btn-info btn-xs addBtn" data-event="focus.data" value="添加图片" style="margin:10px;"><br>
<div class="form-group">
<div class="col-sm-10">
<label>&emsp;&emsp;
是否顶边: <input type="checkbox" name="is_extend" id="focus_is_extend" value="1" [[contentData.is_extend==1?'checked':'']]>
</label>
</div>
</div>
<div class="form-group">
<div class="col-sm-10">
<label>焦点图类型：</label>
... ... @@ -2060,6 +2069,7 @@
<script type="text/template" id="headChannelSwitch-template">
<label class="control-label">色值:请填写十六进制</label>
<input type="button" class="btn btn-info btn-xs addBtn" data-event="headChannelSwitch.list" value="添加Tab" style="margin:10px;">
<br>
<ul class="draggable" data-array="data">
... ... @@ -2068,8 +2078,8 @@
<table class="table table-hover table-bordered responsive dataTable no-footer">
<tbody>
<tr>
<td align="center">[[index+1]]</td>
<td align="center">
<td align="center" rowspan="2">[[index+1]]</td>
<td align="center" >
<input class="form-control observe" value="[[item.tabName?item.tabName:'']]" placeholder="Tab中文名称"
data-field='list.[[index]].tabName' required/>
</td>
... ... @@ -2089,10 +2099,39 @@
<input class="form-control observe" placeholder="默认搜索词" data-field="list.[[index]].searchWord"
value="[[item.searchWord?item.searchWord:'']]"/>
</td>
<td>
<td rowspan="2">
<a target="_blank" class="btn btn-xs btn-primary goResourceContent" data-index="[[index]]">内容编辑</a>
<button class="btn btn-danger btn-sm delBtn" data-event="headChannelSwitch.list" type="button" data-index="[[index]]">删除</button></td>
</tr>
<tr>
<td>
<input class="form-control observe" placeholder="背景色(色值)" data-field="list.[[index]].bgColor"
value="[[item.bgColor?item.bgColor:'']]"/>
</td>
<td>
<input class="form-control observe" placeholder="文字选中(色值)" data-field="list.[[index]].selectedTxtBgColor"
value="[[item.selectedTxtBgColor?item.selectedTxtBgColor:'']]"/><br/>
<input class="form-control observe" placeholder="文字非选中(色值)" data-field="list.[[index]].noSelectedTxtBgColor"
value="[[item.noSelectedTxtBgColor?item.noSelectedTxtBgColor:'']]"/>
</td>
<td>
<label class="control-label">频道背景图片(选中):</label>
<input type="file" name="file" value="[[item.selectedBgSrc]]" class="observe" data-field="list.[[index]].selectedBgSrc" />
</td>
<td>
<label class="control-label">频道背景图片(非选中):</label>
<input type="file" name="file" value="[[item.noSelectedBgSrc]]" class="observe" data-field="list.[[index]].noSelectedBgSrc" />
</td>
<td>
<label class="control-label">消息盒子色值:</label>
<select class="observe" name="iconColor" value="[[item.iconColor]]" data-field="list.[[index]].iconColor">
<option value="0">请选择</option>
<option value="1">黑</option>
<option value="2">白</option>
</select>
</td>
</tr>
</tbody>
</table>
</li>
... ...
... ... @@ -378,7 +378,8 @@
<div class="row">
<div class="col-sm-8">
<input type="radio" name="divideColour" class="divideColour" value="1" [[contentData.divideColour=="1"?"checked":""]]> 灰色
<input type="radio" name="divideColour" class="divideColour" value="2" [[contentData.divideColour=="2"?"checked":""]]> 透明 &emsp;
<input type="radio" name="divideColour" class="divideColour" value="2" [[contentData.divideColour=="2"?"checked":""]]> 白色 &emsp;
<input type="radio" name="divideColour" class="divideColour" value="3" [[contentData.divideColour=="3"?"checked":""]]> 透明 &emsp;
</div>
</div>
</div>
... ... @@ -474,6 +475,12 @@
<label>&emsp;&emsp;
是否顶边: <input type="checkbox" name="is_extend" id="banner_is_extend" value="1" [[contentData.is_extend==1?'checked':'']]>
</label>
&emsp;&emsp;&emsp;&emsp;
<label>不顶边的时候留白：</label>
<select class="form-control input-form" id="banner_leave_blank" value="[[contentData.leave_blank]]">
<option value="white">白色</option>
<option value="transparent">透明</option>
</select>
</div>
</div>
... ... @@ -560,6 +567,12 @@
<label>&emsp;&emsp;
是否顶边: <input type="checkbox" name="is_extend" value="1" id="is_extend" [[contentData.is_extend==1?'checked':'']]>
</label>
&emsp;&emsp;&emsp;&emsp;
<label>不顶边的时候留白：</label>
<select class="form-control input-form" id="splitJoint_leave_blank" value="[[contentData.leave_blank]]">
<option value="white">白色</option>
<option value="transparent">透明</option>
</select>
</div>
</div>
... ... @@ -1822,6 +1835,17 @@
</div>
</div>
<div class="form-group">
<div class="col-sm-10">
<label>版本控制：</label>
<select class="form-control input-form" id="img_version_control" value="[[contentData.version_control]]">
<option value="1">全版本展示</option>
<option value="6">大于等于6.9.13展示</option>
<option value="7">小于6.9.13展示</option>
</select>
</div>
</div>
<div class="row">
<div class="col-sm-8">
... ...