Authored by 马力

Merge branch 'dev_店铺介绍框'

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