fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by 杨延青
Commit 69336c6575dc8cafbad46004bac1f3786d3e21cd 2 parents 1f606fde 9e082825

Merge branch 'gray' into 'master' 

Gray



See merge request !5
Inline Side-by-side
Showing 2 changed files with 72 additions and 36 deletions
... ... @@ -699,7 +699,14 @@
<label>tab名称左边的小图标<span class="red">(80*40)</span></label>
<input type="file" name="file" value="[[item.src]]"
data-field="[[index]].src" data-index="[[index]]" />
</div>
</div>
<div class="form-group">
<div class="col-sm-10">
<label>资源码</label>
<input class="form-control observe" value="[[item.resources_code?item.resources_code:'']]" placeholder="资源码"
data-field='[[index]].resources_code'/>
</div>
</div>
</td>
... ... @@ -1214,6 +1221,18 @@
<div class="panel-body" >
<div class="row">
<label class="col-sm-2 control-label">排版</label>
<div class="col-sm-8">
<select class="form-control observe input-form" value="[[contentData.data.columns]]" data-field="columns">
<option value="1">一列</option>
<option value="2">两列</option>
</select>
</div>
</div>
</div>
<div class="panel-body" >
<div class="row">
<label class="col-sm-2 control-label">推荐商品</label>
<div class="col-sm-8">
<textarea rows="2" class="form-control observe" data-field="recommendSkns" style="resize: none;">[[contentData.data.recommendSkns]]</textarea>
... ... @@ -1221,7 +1240,6 @@
</div>
</div>
<div class="panel-body" >
<div class="row">
<label class="col-sm-2 control-label">推荐逻辑</label>
... ... @@ -1769,8 +1787,8 @@
</script>
<script type="text/template" id="newSingleImage-template">
<div class="panel-body">
<div class="row">
<div class="col-sm-8">
... ... @@ -1824,7 +1842,7 @@
</div>
</div>
<div class="rows" id = "newSingleImage-common">
[[layout template-singleImg-vipLevel]]
[[layout template-singleImg-vipLevel]]
</div>
</script>
... ... @@ -2571,7 +2589,7 @@
<div class="panel-body">
<div class="row">
<label class="col-sm-2 control-label">列表展示方向<span class="red">*</span></label>
<div class="col-sm-6">
<div class="col-sm-6">
<select id="layout_float" name="layout_float" class="form-control observe input-form layout_float" value="[[contentData.data.layout_float]]" data-field="layout_float">
<option value="H">横向</option>
<option value="V">纵向</option>
... ... @@ -2584,7 +2602,7 @@
<div class="panel-body">
<div class="row">
<label class="col-sm-2 control-label">活动ID</label>
<div class="col-sm-6">
<div class="col-sm-6">
<input type="text" placeholder="活动ID" class="observe form-control input-form" value="[[contentData.data.activityId]]" data-field="activityId">
</div>
</div>
... ... @@ -2593,7 +2611,7 @@
<div class="panel-body">
<div class="row">
<label class="col-sm-2 control-label">优先的skn<span class="red">*</span>:</label>
<div class="col-sm-16">
<div class="col-sm-16">
<input type="text" placeholder="输入skn,多个skn以逗号分隔" class="observe form-control" value="[[contentData.data.sknList]]" data-field="sknList">
</div>
</div>
... ... @@ -2692,8 +2710,8 @@
<!-- 动画配置json文件 -->
<script type="text/template" id="lottiefiles-template">
<div class="rows">
<div id="grid-baseFrom">
<ul class="cover-image-list col-sm-16" data-array="data">
... ... @@ -2701,23 +2719,23 @@
<li style="width:100%;">
<table style="width:100%;" class="table table-hover table-bordered responsive dataTable no-footer">
<tbody>
<tr>
<tr>
<td>
<label class="col-sm-2 control-label">上传文件:<span class="red">*</span></label>
<label class="col-sm-2 control-label">上传文件:<span class="red">*</span></label>
</td>
<td align="center">
<td align="center">
<input type="file" name="file" value="[[item.src]]"
data-field="[[index]].src" data-index="[[index]]" />
</td>
<td>
<button type="button" class="btn btn-danger" id="delFile">删除</button>
<button type="button" class="btn btn-danger" id="delFile">删除</button>
</td>
</tr>
<tr>
<tr>
<td colspan="2">
<input type="text" id="jsonConfigsrc" class="form-control" style="display: inline-block; width: 100%"
<input type="text" id="jsonConfigsrc" class="form-control" style="display: inline-block; width: 100%"
readonly="readonly" placeholder="地址" value="[[item.src]]">
</td>
<td>
<button type="button" class="btn btn-info" id="copySrc">复制</button>
... ... @@ -2737,5 +2755,5 @@
</ul>
</div>
</div>
</script>
\ No newline at end of file
</script>
... ...
... ... @@ -699,7 +699,14 @@
<label>tab名称左边的小图标<span class="red">(80*40)</span></label>
<input type="file" name="file" value="[[item.src]]"
data-field="[[index]].src" data-index="[[index]]" />
</div>
</div>
<div class="form-group">
<div class="col-sm-10">
<label>资源码</label>
<input class="form-control observe" value="[[item.resources_code?item.resources_code:'']]" placeholder="资源码"
data-field='[[index]].resources_code'/>
</div>
</div>
</td>
... ... @@ -1214,6 +1221,18 @@
<div class="panel-body" >
<div class="row">
<label class="col-sm-2 control-label">排版</label>
<div class="col-sm-8">
<select class="form-control observe input-form" value="[[contentData.data.columns]]" data-field="columns">
<option value="1">一列</option>
<option value="2">两列</option>
</select>
</div>
</div>
</div>
<div class="panel-body" >
<div class="row">
<label class="col-sm-2 control-label">推荐商品</label>
<div class="col-sm-8">
<textarea rows="2" class="form-control observe" data-field="recommendSkns" style="resize: none;">[[contentData.data.recommendSkns]]</textarea>
... ... @@ -1221,7 +1240,6 @@
</div>
</div>
<div class="panel-body" >
<div class="row">
<label class="col-sm-2 control-label">推荐逻辑</label>
... ... @@ -1769,8 +1787,8 @@
</script>
<script type="text/template" id="newSingleImage-template">
<div class="panel-body">
<div class="row">
<div class="col-sm-8">
... ... @@ -1824,7 +1842,7 @@
</div>
</div>
<div class="rows" id = "newSingleImage-common">
[[layout template-singleImg-vipLevel]]
[[layout template-singleImg-vipLevel]]
</div>
</script>
... ... @@ -2571,7 +2589,7 @@
<div class="panel-body">
<div class="row">
<label class="col-sm-2 control-label">列表展示方向<span class="red">*</span></label>
<div class="col-sm-6">
<div class="col-sm-6">
<select id="layout_float" name="layout_float" class="form-control observe input-form layout_float" value="[[contentData.data.layout_float]]" data-field="layout_float">
<option value="H">横向</option>
<option value="V">纵向</option>
... ... @@ -2584,7 +2602,7 @@
<div class="panel-body">
<div class="row">
<label class="col-sm-2 control-label">活动ID</label>
<div class="col-sm-6">
<div class="col-sm-6">
<input type="text" placeholder="活动ID" class="observe form-control input-form" value="[[contentData.data.activityId]]" data-field="activityId">
</div>
</div>
... ... @@ -2593,7 +2611,7 @@
<div class="panel-body">
<div class="row">
<label class="col-sm-2 control-label">优先的skn<span class="red">*</span>:</label>
<div class="col-sm-16">
<div class="col-sm-16">
<input type="text" placeholder="输入skn,多个skn以逗号分隔" class="observe form-control" value="[[contentData.data.sknList]]" data-field="sknList">
</div>
</div>
... ... @@ -2692,8 +2710,8 @@
<!-- 动画配置json文件 -->
<script type="text/template" id="lottiefiles-template">
<div class="rows">
<div id="grid-baseFrom">
<ul class="cover-image-list col-sm-16" data-array="data">
... ... @@ -2701,23 +2719,23 @@
<li style="width:100%;">
<table style="width:100%;" class="table table-hover table-bordered responsive dataTable no-footer">
<tbody>
<tr>
<tr>
<td>
<label class="col-sm-2 control-label">上传文件:<span class="red">*</span></label>
<label class="col-sm-2 control-label">上传文件:<span class="red">*</span></label>
</td>
<td align="center">
<td align="center">
<input type="file" name="file" value="[[item.src]]"
data-field="[[index]].src" data-index="[[index]]" />
</td>
<td>
<button type="button" class="btn btn-danger" id="delFile">删除</button>
<button type="button" class="btn btn-danger" id="delFile">删除</button>
</td>
</tr>
<tr>
<tr>
<td colspan="2">
<input type="text" id="jsonConfigsrc" class="form-control" style="display: inline-block; width: 100%"
<input type="text" id="jsonConfigsrc" class="form-control" style="display: inline-block; width: 100%"
readonly="readonly" placeholder="地址" value="[[item.src]]">
</td>
<td>
<button type="button" class="btn btn-info" id="copySrc">复制</button>
... ... @@ -2737,5 +2755,5 @@
</ul>
</div>
</div>
</script>
\ No newline at end of file
</script>
... ...