Authored by dongjunjie

Merge branch 'release/qqtest' of http://git.dev.yoho.cn/platform/yohobuy-shops-f…

…e into release/qqtest
... ... @@ -90,8 +90,12 @@ module.exports = function(req, res, next) {
if(path&&req.session.user.allRight[path]){
author.validateAuthor(req.session.user.auth.pid,req.session.user.auth.role_id,path,function(data){
if(data.code!=200){
res.status(403);
res.render('error/error_nolayout',{message:NO_AUTH,layout:false,cssfile:CSS_FILE});
// res.status(403);
if(!req.xhr){
res.render('error/error_nolayout',{message:NO_AUTH,layout:false,cssfile:CSS_FILE});
}else{
res.json({code:201,message:"没有权限!"});
}
return;
}
nextRedirect(method,path);
... ...
... ... @@ -215,7 +215,6 @@
</div>
<input type="hidden" id="grade" value="[[grade||'0']]" for="radio" required/>
[[if isAuditing==200]]
<label class="col-sm-1 control-label">适销季<span class="red">*</span></label>
<div class="col-sm-2">
<label class="radio-inline">
... ... @@ -226,7 +225,6 @@
<input type="checkbox" name="seasons" value="seasons">四季</label>
<input type="hidden" id="seasons" name="seasons" value="[[seasons||'seasons']]" for="checkbox" placeholder="年龄层" />
</div>
[[/if]]
</div>
... ...