Authored by mingdan.ge

Merge branch 'master' into dev_searchword

... ... @@ -99,7 +99,7 @@
</div>
<div class="col-sm-8">
<input type="file" id="shopLogo" name="shopLogo" value="<%data.shopLogo%>" size="500">
<p><span class="red" style="position: absolute; bottom: 0">提示: 请上传像素为150*150的图片,大小小于500KB</span></p>
<p><span class="red" style="position: absolute; bottom: 0">提示: 请上传像素为320*160的图片,大小小于500KB</span></p>
</div>
</div>
<div class="form-group">
... ...
... ... @@ -99,7 +99,7 @@
</div>
<div class="col-sm-8">
<input type="file" id="shopLogo" name="shopLogo" value="<%data.shopLogo%>" size="500">
<p><span class="red" style="position: absolute; bottom: 0">提示: 请上传像素为150*150的图片,大小小于500KB</span></p>
<p><span class="red" style="position: absolute; bottom: 0">提示: 请上传像素为320*160的图片,大小小于500KB</span></p>
</div>
</div>
<div class="form-group">
... ...