Authored by 马力

Merge branch 'dev_店铺介绍框' into grey

... ... @@ -93,8 +93,8 @@
<div class="col-sm-1 control-label">
<label>店铺简介:</label>
</div>
<div class="col-sm-7">
<script id="edit-shop-intro" type="text/plain" style="width:100%;height:500px;"></script>
<div class="col-sm-8">
<script id="edit-shop-intro" type="text/plain" style="width:89%;height:500px;"></script>
<input id="shopIntro" type="hidden" placeholder="店铺简介" value="<%data.shopIntro%>">
</div>
</div>
... ...