fe / yohobuy-portal-fe · Commits

Go to a project

Authored by weiqingting
Commit 2cd784c356a75c4c6ff5684a716fca75d8833361 2 parents 04c2427a 28eb542a

Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6

Inline Side-by-side
Showing 3 changed files with 6 additions and 6 deletions
... ... @@ -76,7 +76,7 @@ $.ajax({
url: '/goods/product/queryAttributesByConf',
data: {
saleType: 2,
displayPosition: 3,
displayPosition: 2,
categoryId: basicInfo.smallSortId
},
dataType: 'json',
... ... @@ -175,7 +175,7 @@ common.util.__ajax({
url: '/goods/product/queryAttributesByConfEx',
data: {
saleType: 2,
displayPosition: 2,
displayPosition: 3,
categoryId: basicInfo.smallSortId
}
}, function(res) {
... ...
... ... @@ -118,10 +118,10 @@
<div class="form-group col-sm-100">
<label class="col-sm-2 control-label">活动时间</label>
<div class="panel-col1 col-sm-4">
<input type="text" id="startTime" jsaction="time:end:endTime" class="form-control panel-input hasDatepicker " name="start_time" placeholder="开始时间" value="{startTime}">
<input type="text" id="startTime" jsaction="time:end:endTime" readonly class="form-control panel-input hasDatepicker " name="start_time" placeholder="开始时间" value="{startTime}">
</div>
<div class="panel-col1 col-sm-4">
<input type="text" id="endTime" jsaction="time:start:startTime" class="form-control panel-input hasDatepicker" name="end_time" placeholder="结束时间" value="{endTime}">
<input type="text" id="endTime" jsaction="time:start:startTime" readonly class="form-control panel-input hasDatepicker" name="end_time" placeholder="结束时间" value="{endTime}">
</div>
</div>
</div>
... ...
... ... @@ -121,12 +121,12 @@
<label class="col-sm-2 control-label">活动时间</label>
<div class="panel-col1 col-sm-4">
<input type="text" id="startTime" jsaction="time:end:endTime"
class="form-control panel-input hasDatepicker " name="start_time" placeholder="开始时间"
class="form-control panel-input hasDatepicker " readonly name="start_time" placeholder="开始时间"
value="{startTime}">
</div>
<div class="panel-col1 col-sm-4">
<input type="text" id="endTime" jsaction="time:start:startTime"
class="form-control panel-input hasDatepicker" name="end_time" placeholder="结束时间"
class="form-control panel-input hasDatepicker" readonly name="end_time" placeholder="结束时间"
value="{endTime}">
</div>
</div>
... ...