liuloulou / yohobuy-portal-fe2 · Commits

Go to a project

Authored by weiqingting
Commit ea09be9f00e4b7761b1ccbc8fd423f79c250eec4 1 parent 44e46f44

提交

Inline Side-by-side
Showing 7 changed files with 35 additions and 14 deletions
... ... @@ -21,9 +21,12 @@ module.exports = function (app) {
//编辑
app.post("/market/productPool/updateProductPool", "ProductPool_updateProductPool");
//删除
//清空
app.post("/market/productPool/clearProductPool", "ProductPool_clearProductPool");
//删除
app.post("/market/productPool/deleteProductPool", "ProductPool_deleteProductPool");
//详情列表
app.post("/market/productPool/queryProductPoolDetailPage", "ProductPool_queryProductPoolDetailPage");
... ...
... ... @@ -3,7 +3,11 @@ module.exports=function(Filter){
if(gray.code==200){
next();
}else{
res.redirect('/login');
if(req.xhr){
res.json(gray);
}else{
res.redirect('/login');
}
}
});
};
... ...
... ... @@ -85,6 +85,9 @@ module.exports = {
userInfo = { auth: userData, uid: userData.pid, name: userData.truename, right: {},shopList:[]};
allRes.data.forEach(function (data) {
if (data.platform_id == Iaccount.WEBSITE) {
if(data.path.indexOf("/operations/helpcategory")>-1){
console.log(data.path);
}
userInfo.right[data.path] = true;
}
});
... ... @@ -124,6 +127,9 @@ module.exports = {
if (path && user.right[path]) {
common.isUsedMenuAuth(user.auth.pid,user.auth.role_id,path).done(function(isURes){
result = { code: 200, message: "具有权限" };
if(isURes.data){
result={code:isURes.data.code,message:isURes.data.errmsg};
}
return callback(null, result);
},function(error){
return callback(error, result);
... ...
... ... @@ -19,7 +19,7 @@
<div class="form-group">
<label class="col-sm-2 control-label">活动名称：<span class="red">*</span></label>
<div class="col-sm-8">
<input type="text" id="activityName" placeholder="活动名称" class="form-control" required value="<%activityName%>">
<input type="text" id="activityName" placeholder="活动名称" class="form-control" required value="<%data.activityName%>">
</div>
</div>
<div class="form-group">
... ...
ERROR:<%message%>
\ No newline at end of file
ERROR:用户失效，或者没有权限
\ No newline at end of file
... ...
... ... @@ -34,7 +34,7 @@
<div class="form-group">
<label class="col-sm-2 control-label">申请部门</label>
<div class="col-sm-3">
<select value="[[reqDepartment[0] ]]" class="form-control observe noEdit" data-field="reqDepartment[0]">
<select value="[[reqDepartment1]]" class="form-control observe noEdit" data-field="reqDepartment1">
<option value="零售部">零售部</option>
<option value="市场部">市场部</option>
<option value="会员部">会员部</option>
... ... @@ -44,7 +44,7 @@
</select>
</div>
<div class="col-sm-3">
<select value="[[reqDepartment[1] ]]" class="form-control observe noEdit" data-field="reqDepartment[1]">
<select value="[[reqDepartment2]]" class="form-control observe noEdit" data-field="reqDepartment2">
<option value="营销策划">营销策划</option>
<option value="类目运营">类目运营</option>
<option value="店铺运营">店铺运营</option>
... ...
... ... @@ -41,7 +41,8 @@
<div class="form-group">
<label class="col-sm-2 control-label">店铺类型</label>
<div class="col-sm-3">
<select id="department1" class="form-control observe" data-field="department1">
<select class="form-control observe" value="[[department1]]"
data-field="department1">
<option value="零售部">零售部</option>
<option value="市场部">市场部</option>
<option value="会员部">会员部</option>
... ... @@ -51,7 +52,8 @@
</select>
</div>
<div class="col-sm-3">
<select id="department2" class="form-control observe" data-field="department2">
<select class="form-control observe" value="[[department2]]"
data-field="department2">
<option value="营销策划">营销策划</option>
<option value="类目运营">类目运营</option>
<option value="店铺运营">店铺运营</option>
... ... @@ -96,11 +98,15 @@
<div class="form-group">
<label class="col-sm-2 control-label">优惠类型<i class="red">*</i></label>
<div class="col-sm-8 ">
<input type="radio" name="promotionInfotype" class="observe" data-field="promotionInfotype" value="1">折扣(吊牌价)
<input type="radio" name="promotionInfotype" class="observe" data-field="promotionInfotype" value="2">折扣(销售价)
<input type="radio" name="promotionInfotype" class="observe" data-field="promotionInfotype" value="3">满减
<input type="radio" name="promotionInfotype" class="observe"
data-field="promotionInfotype" value="1">折扣(吊牌价)
<input type="radio" name="promotionInfotype" class="observe"
data-field="promotionInfotype" value="2">折扣(销售价)
<input type="radio" name="promotionInfotype" class="observe"
data-field="promotionInfotype" value="3">满减
</div>
<input type="hidden" id="promotionInfotype" value="[[promotionInfotype]]" for="radio" class="observe" data-field="promotionInfotype"
<input type="hidden" id="promotionInfotype" value="[[promotionInfotype]]" for="radio"
class="observe" data-field="promotionInfotype"
placeholder="优惠类型" required/>
</div>
<div class="form-group">
... ... @@ -111,7 +117,8 @@
>=
<input type="text" class="form-control observe"
id="promotionInfo-condition-amount_at_least"
placeholder="0.00" value="[[amount_at_least]]" required pattern="^[0-9]+(.\d{1,2})?$"
placeholder="0.00" value="[[amount_at_least]]" required
pattern="^[0-9]+(.\d{1,2})?$"
data-field="amount_at_least">
元,
</div>
... ... @@ -119,7 +126,8 @@
>=
<input type="text" class="form-control observe"
id="promotionInfo-condition-count_at_least"
placeholder="1" value="[[count_at_least]]" required pattern="^[1-9]+$"
placeholder="1" value="[[count_at_least]]" required
pattern="^[1-9]+$"
data-field="count_at_least">
件
</div>
... ...