Authored by xuqi

Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0

... ... @@ -16,7 +16,7 @@
<div class="img-upload">
<span class="iconfont">&#xe61f;</span>
</div>
<span class="img-up-tip">1/4</span>
<span class="img-up-tip">0/4</span>
</div>
</div>
</div>
... ...
... ... @@ -97,7 +97,7 @@ const getProductItemData = (params, url, uid) => {
itemFun.setDescriptionData(mulRes.sizeInfo, mulRes.comfort), // DESCRIPTION商品描述
itemFun.setMaterialData(mulRes.sizeInfo), // MATERIALS材料洗涤
itemFun.setSizeData(mulRes.sizeInfo, mulRes.modelTry), // SIZEINFO尺码信息
itemFun.setDetailData(mulRes.sizeInfo) // DETAILS商品详情
itemFun.setDetailData(mulRes.sizeInfo) // DETAILS商品详情
);
resData.content = data;
... ...
... ... @@ -198,6 +198,14 @@ $refundTable.on('change', '.refund-reason', function() {
$specialDom.slideUp();
}
$specialDom.siblings('.check').data({reason: val});
}).on('keyup', '.mark-text', function() {
var $this = $(this),
str = $.trim($this.val());
if (str.length > 100) {
str = str.substring(0, 100);
}
$this.val(str);
}).on('click', '.img-upload', function() {
var $this = $(this),
num = $this.data('num') || 0;
... ...