Authored by chenchao

Merge branch 'master' into dev6.0_免邮券

... ... @@ -152,7 +152,7 @@
</select>
<div style="position: relative">
<div class="copy-link">
<span style="width:40px;height:40px;" class="glyphicon glyphicon-copyright-mark info-copy" data-index="[[index]]" data-clipboard-text='[[data.resource]]' title="复制文本内容"></span>
<span style="width:40px;height:30px;" class="glyphicon glyphicon-copyright-mark info-copy" data-index="[[index]]" data-clipboard-text='[[data.resource]]' title="复制文本内容"></span>
</div>
<input type="text" style="padding-left:40px" class="form-control input-resource" value='[[data.resource]]'>
</div>
... ...
... ... @@ -152,7 +152,7 @@
</select>
<div style="position: relative">
<div class="copy-link">
<span style="width:40px;height:40px;" class="glyphicon glyphicon-copyright-mark info-copy" data-index="[[index]]" data-clipboard-text='[[data.resource]]' title="复制文本内容"></span>
<span style="width:40px;height:30px;" class="glyphicon glyphicon-copyright-mark info-copy" data-index="[[index]]" data-clipboard-text='[[data.resource]]' title="复制文本内容"></span>
</div>
<input type="text" style="padding-left:40px" class="form-control input-resource" value='[[data.resource]]'>
</div>
... ...