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({ @@ -76,7 +76,7 @@ $.ajax({
76 url: '/goods/product/queryAttributesByConf', 76 url: '/goods/product/queryAttributesByConf',
77 data: { 77 data: {
78 saleType: 2, 78 saleType: 2,
79 - displayPosition: 3, 79 + displayPosition: 2,
80 categoryId: basicInfo.smallSortId 80 categoryId: basicInfo.smallSortId
81 }, 81 },
82 dataType: 'json', 82 dataType: 'json',
@@ -175,7 +175,7 @@ common.util.__ajax({ @@ -175,7 +175,7 @@ common.util.__ajax({
175 url: '/goods/product/queryAttributesByConfEx', 175 url: '/goods/product/queryAttributesByConfEx',
176 data: { 176 data: {
177 saleType: 2, 177 saleType: 2,
178 - displayPosition: 2, 178 + displayPosition: 3,
179 categoryId: basicInfo.smallSortId 179 categoryId: basicInfo.smallSortId
180 } 180 }
181 }, function(res) { 181 }, function(res) {
@@ -118,10 +118,10 @@ @@ -118,10 +118,10 @@
118 <div class="form-group col-sm-100"> 118 <div class="form-group col-sm-100">
119 <label class="col-sm-2 control-label">活动时间</label> 119 <label class="col-sm-2 control-label">活动时间</label>
120 <div class="panel-col1 col-sm-4"> 120 <div class="panel-col1 col-sm-4">
121 - <input type="text" id="startTime" jsaction="time:end:endTime" class="form-control panel-input hasDatepicker " name="start_time" placeholder="开始时间" value="{startTime}"> 121 + <input type="text" id="startTime" jsaction="time:end:endTime" readonly class="form-control panel-input hasDatepicker " name="start_time" placeholder="开始时间" value="{startTime}">
122 </div> 122 </div>
123 <div class="panel-col1 col-sm-4"> 123 <div class="panel-col1 col-sm-4">
124 - <input type="text" id="endTime" jsaction="time:start:startTime" class="form-control panel-input hasDatepicker" name="end_time" placeholder="结束时间" value="{endTime}"> 124 + <input type="text" id="endTime" jsaction="time:start:startTime" readonly class="form-control panel-input hasDatepicker" name="end_time" placeholder="结束时间" value="{endTime}">
125 </div> 125 </div>
126 </div> 126 </div>
127 </div> 127 </div>
@@ -121,12 +121,12 @@ @@ -121,12 +121,12 @@
121 <label class="col-sm-2 control-label">活动时间</label> 121 <label class="col-sm-2 control-label">活动时间</label>
122 <div class="panel-col1 col-sm-4"> 122 <div class="panel-col1 col-sm-4">
123 <input type="text" id="startTime" jsaction="time:end:endTime" 123 <input type="text" id="startTime" jsaction="time:end:endTime"
124 - class="form-control panel-input hasDatepicker " name="start_time" placeholder="开始时间" 124 + class="form-control panel-input hasDatepicker " readonly name="start_time" placeholder="开始时间"
125 value="{startTime}"> 125 value="{startTime}">
126 </div> 126 </div>
127 <div class="panel-col1 col-sm-4"> 127 <div class="panel-col1 col-sm-4">
128 <input type="text" id="endTime" jsaction="time:start:startTime" 128 <input type="text" id="endTime" jsaction="time:start:startTime"
129 - class="form-control panel-input hasDatepicker" name="end_time" placeholder="结束时间" 129 + class="form-control panel-input hasDatepicker" readonly name="end_time" placeholder="结束时间"
130 value="{endTime}"> 130 value="{endTime}">
131 </div> 131 </div>
132 </div> 132 </div>