Merge branch 'release/1.6' of git.dev.yoho.cn:platform/yohobuy-portal-fe into release/1.6
Showing
2 changed files
with
2 additions
and
1 deletions
@@ -77,6 +77,7 @@ if ($('.contentpanel').data('type') == 'info') { | @@ -77,6 +77,7 @@ if ($('.contentpanel').data('type') == 'info') { | ||
77 | $('#saveAllInfo').hide(); | 77 | $('#saveAllInfo').hide(); |
78 | $(".goods-img i").remove(); | 78 | $(".goods-img i").remove(); |
79 | $("#search-key-list").hide(); | 79 | $("#search-key-list").hide(); |
80 | + $(".brand-list").hide(); | ||
80 | 81 | ||
81 | // 上架审核的查看页面 | 82 | // 上架审核的查看页面 |
82 | if ($('.contentpanel').data('action') != 'audit') { | 83 | if ($('.contentpanel').data('action') != 'audit') { |
@@ -44,7 +44,7 @@ | @@ -44,7 +44,7 @@ | ||
44 | <label style="cursor: pointer;"><input name="[[b.attributeId]]" type="[[b.inputType]]" value="[[c.id]]">[[c.text]]</label> | 44 | <label style="cursor: pointer;"><input name="[[b.attributeId]]" type="[[b.inputType]]" value="[[c.id]]">[[c.text]]</label> |
45 | [[/each]] | 45 | [[/each]] |
46 | </span> | 46 | </span> |
47 | - <input id="[[b.attributeId]]" type="hidden" for="[[b.inputType]]" value="[[b.selectedValues]]" required="required"> | 47 | + <input id="[[b.attributeId]]" type="hidden" for="[[b.inputType]]" value="[[b.selectedValues]]" [[b.isMust=="N"?"":"required"]] placeholder="[[b.attributeName]]"> |
48 | </div> | 48 | </div> |
49 | [[/if]] | 49 | [[/if]] |
50 | [[/each]] | 50 | [[/each]] |
-
Please register or login to post a comment