fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by liqingzhong
Commit f7d7935dd7c5a52e1edc12ed8c3e4a35795abd2b 2 parents 819ad0a4 cb94c26d

Merge branch 'master' into dev_decorator

Inline Side-by-side
Showing 13 changed files with 31 additions and 29 deletions
... ... @@ -75,13 +75,13 @@
</div>
</div>
<div class="panel-footer">
[[if isAuditing!="200"&&isAuditing!="300"]]
<div class="panel-footer">
<button class="btn btn-primary apply-success">通过</button>
<button class="btn btn-primary apply-back">驳回</button>
[[/if]]
<button onclick="history.go(-1);" type="button" class="btn btn-primary btn-info">返回</button>
<!-- <button onclick="history.go(-1);" type="button" class="btn btn-primary btn-info">返回</button> -->
</div>
[[/if]]
</form>
</div>
... ...
... ... @@ -82,7 +82,7 @@
<a href="/goods/netsale/index" class="btn btn-default btn-lg">取消</a>
<a id="passBtn" href="javascript:;" class="btn btn-primary btn-lg">通过</a>
<a id="rejectBtn" href="javascript:;" class="btn btn-primary btn-lg">驳回</a>
<a id="backBtn" href="javascript:;" onclick="history.go(-1)" class="btn btn-default btn-lg">取消</a>
<!-- <a id="backBtn" href="javascript:;" onclick="history.go(-1)" class="btn btn-default btn-lg">取消</a> -->
</div>
<div class="floatnav">
... ...
... ... @@ -12,9 +12,10 @@ var grayroute = require("./mid/grayrouter");
/*session 配置*/
var options = {
secret: 'yohobuy.portal', //session配置
cookie: {secure: false, maxAge: 3600000},
cookie: {secure: false, maxAge: 7200000},
resave: false,
saveUninitialized: true
saveUninitialized: true,
rolling: true
};
/*老平台接口 配置*/
... ...
... ... @@ -227,7 +227,7 @@ var g = new common.grid({
display: "SKN",
render: function(item) {
var html = [];
html.push('<a data-index="' + item.__index + '" href="/base/goods/info/' + item.productSkn + '/' + item.isAuditing + '" class="btn btn-info btn-xs edit-class-btn">' + item.productSkn + '</a>');
html.push('<a target="_blank" data-index="' + item.__index + '" href="/base/goods/info/' + item.productSkn + '/' + item.isAuditing + '" class="btn btn-info btn-xs edit-class-btn">' + item.productSkn + '</a>');
return html.join('');
}
... ... @@ -445,7 +445,7 @@ var g = new common.grid({
render: function(item) {
var html = [];
if (item.isAuditing != 100) {
html.push('<a data-index="' + item.__index + '" class="btn btn-info btn-xs edit-class-btn" href="/base/goods/update/' + item.productSkn + '/' + item.isAuditing + '">修改</a>');
html.push('<a target="_blank" data-index="' + item.__index + '" class="btn btn-info btn-xs edit-class-btn" href="/base/goods/update/' + item.productSkn + '/' + item.isAuditing + '">修改</a>');
}
if (item.isAuditing == 100) {
html.push('<a data-index="' + item.__index + '" href="JavaScript:;" class="btn operation btn-success btn-xs edit-class-btn apply-success">通过</a>');
... ...
... ... @@ -144,7 +144,7 @@ var g = new common.grid({
display: 'skn',
name: 'productSkn',
render: function (item) {
return '<a href="/goods/netsale/info/' + item.productSkn + editPostion + '">' + item.productSkn + '</a>'
return '<a target="_blank" href="/goods/netsale/info/' + item.productSkn + editPostion + '">' + item.productSkn + '</a>'
}
}, {
display: '图片',
... ... @@ -292,7 +292,7 @@ var g = new common.grid({
for (var i in arr) {
var item1 = $.trim(arr[i]);
if (item) {
html.push('<a href="/goods/netsale/edit/' + item.productSkn + editPostion + '#' + item1 + '">' + item1 + '</a>');
html.push('<a target="_blank" href="/goods/netsale/edit/' + item.productSkn + editPostion + '#' + item1 + '">' + item1 + '</a>');
}
}
html.push('</p>');
... ... @@ -304,13 +304,13 @@ var g = new common.grid({
var HtmArr = [];
var intValue ;
if (item.status == 4 || item.status == 1 || item.status == 5 || item.status == 6) {
HtmArr.push('<a href="/goods/netsale/edit/' + item.productSkn + editPostion + '" class="btn btn-info btn-xs edit-btn">编辑</a>');
HtmArr.push('<a target="_blank" href="/goods/netsale/edit/' + item.productSkn + editPostion + '" class="btn btn-info btn-xs edit-btn">编辑</a>');
HtmArr.push('<a href="javascript:;" class="btn btn-danger btn-xs shelve-btn" data-index="' + item.__index + '">下架</a>');
} else if (item.status == 3 || item.status == 8 || item.status == 2 || item.status == 0) {
HtmArr.push('<a href="/goods/netsale/edit/' + item.productSkn + editPostion + '" class="btn btn-info btn-xs edit-btn">编辑</a>');
HtmArr.push('<a target="_blank" href="/goods/netsale/edit/' + item.productSkn + editPostion + '" class="btn btn-info btn-xs edit-btn">编辑</a>');
HtmArr.push('<a href="javascript:;" class="btn btn-success btn-xs shelve-btn" data-index="' + item.__index + '">上架</a>');
}
HtmArr.push('<a href="/goods/netsale/info/' + item.productSkn + editPostion + '" class="btn btn-info btn-xs info-btn">查看</a>');
HtmArr.push('<a target="_blank" href="/goods/netsale/info/' + item.productSkn + editPostion + '" class="btn btn-info btn-xs info-btn">查看</a>');
HtmArr.push('<a href="javascript:;" class="btn btn-success btn-xs chima-btn" data-index="' + item.__index + '">尺码</a>');
if(typeof(item.productSearch) == "undefined"){
intValue = 0;
... ...
... ... @@ -52,7 +52,7 @@ var g = new common.grid({
}},
{display: "操作", name: "",render: function(item) {
var arr = [];
arr.push('<a class="btn btn-xs btn-info contentManage" data-index="' + item.__index + '" href="/resource/content/index/' + item.id + '">内容管理</a>');
arr.push('<a target="_blank" class="btn btn-xs btn-info contentManage" data-index="' + item.__index + '" href="/resource/content/index/' + item.id + '">内容管理</a>');
arr.push('<a class="btn btn-xs btn-primary add2" data-index="' + item.__index + '">编辑</a>');
arr.push('<a class="btn btn-xs btn-danger delbtn" data-index="' + item.__index + '">删除</a>');
return arr.join("");
... ...
... ... @@ -231,7 +231,7 @@ webpackJsonp([22],[
display: "SKN",
render: function(item) {
var html = [];
html.push('<a data-index="' + item.__index + '" href="/base/goods/info/' + item.productSkn + '/' + item.isAuditing + '" class="btn btn-info btn-xs edit-class-btn">' + item.productSkn + '</a>');
html.push('<a target="_blank" data-index="' + item.__index + '" href="/base/goods/info/' + item.productSkn + '/' + item.isAuditing + '" class="btn btn-info btn-xs edit-class-btn">' + item.productSkn + '</a>');
return html.join('');
}
... ... @@ -449,7 +449,7 @@ webpackJsonp([22],[
render: function(item) {
var html = [];
if (item.isAuditing != 100) {
html.push('<a data-index="' + item.__index + '" class="btn btn-info btn-xs edit-class-btn" href="/base/goods/update/' + item.productSkn + '/' + item.isAuditing + '">修改</a>');
html.push('<a target="_blank" data-index="' + item.__index + '" class="btn btn-info btn-xs edit-class-btn" href="/base/goods/update/' + item.productSkn + '/' + item.isAuditing + '">修改</a>');
}
if (item.isAuditing == 100) {
html.push('<a data-index="' + item.__index + '" href="JavaScript:;" class="btn operation btn-success btn-xs edit-class-btn apply-success">通过</a>');
... ...
... ... @@ -148,7 +148,7 @@ webpackJsonp([32],[
display: 'skn',
name: 'productSkn',
render: function (item) {
return '<a href="/goods/netsale/info/' + item.productSkn + editPostion + '">' + item.productSkn + '</a>'
return '<a target="_blank" href="/goods/netsale/info/' + item.productSkn + editPostion + '">' + item.productSkn + '</a>'
}
}, {
display: '图片',
... ... @@ -296,7 +296,7 @@ webpackJsonp([32],[
for (var i in arr) {
var item1 = $.trim(arr[i]);
if (item) {
html.push('<a href="/goods/netsale/edit/' + item.productSkn + editPostion + '#' + item1 + '">' + item1 + '</a>');
html.push('<a target="_blank" href="/goods/netsale/edit/' + item.productSkn + editPostion + '#' + item1 + '">' + item1 + '</a>');
}
}
html.push('</p>');
... ... @@ -308,13 +308,13 @@ webpackJsonp([32],[
var HtmArr = [];
var intValue ;
if (item.status == 4 || item.status == 1 || item.status == 5 || item.status == 6) {
HtmArr.push('<a href="/goods/netsale/edit/' + item.productSkn + editPostion + '" class="btn btn-info btn-xs edit-btn">编辑</a>');
HtmArr.push('<a target="_blank" href="/goods/netsale/edit/' + item.productSkn + editPostion + '" class="btn btn-info btn-xs edit-btn">编辑</a>');
HtmArr.push('<a href="javascript:;" class="btn btn-danger btn-xs shelve-btn" data-index="' + item.__index + '">下架</a>');
} else if (item.status == 3 || item.status == 8 || item.status == 2 || item.status == 0) {
HtmArr.push('<a href="/goods/netsale/edit/' + item.productSkn + editPostion + '" class="btn btn-info btn-xs edit-btn">编辑</a>');
HtmArr.push('<a target="_blank" href="/goods/netsale/edit/' + item.productSkn + editPostion + '" class="btn btn-info btn-xs edit-btn">编辑</a>');
HtmArr.push('<a href="javascript:;" class="btn btn-success btn-xs shelve-btn" data-index="' + item.__index + '">上架</a>');
}
HtmArr.push('<a href="/goods/netsale/info/' + item.productSkn + editPostion + '" class="btn btn-info btn-xs info-btn">查看</a>');
HtmArr.push('<a target="_blank" href="/goods/netsale/info/' + item.productSkn + editPostion + '" class="btn btn-info btn-xs info-btn">查看</a>');
HtmArr.push('<a href="javascript:;" class="btn btn-success btn-xs chima-btn" data-index="' + item.__index + '">尺码</a>');
if(typeof(item.productSearch) == "undefined"){
intValue = 0;
... ...
... ... @@ -56,7 +56,7 @@ webpackJsonp([101],[
}},
{display: "操作", name: "",render: function(item) {
var arr = [];
arr.push('<a class="btn btn-xs btn-info contentManage" data-index="' + item.__index + '" href="/resource/content/index/' + item.id + '">内容管理</a>');
arr.push('<a target="_blank" class="btn btn-xs btn-info contentManage" data-index="' + item.__index + '" href="/resource/content/index/' + item.id + '">内容管理</a>');
arr.push('<a class="btn btn-xs btn-primary add2" data-index="' + item.__index + '">编辑</a>');
arr.push('<a class="btn btn-xs btn-danger delbtn" data-index="' + item.__index + '">删除</a>');
return arr.join("");
... ...
... ... @@ -12,9 +12,10 @@ var grayroute = require("./mid/grayrouter");
/*session 配置*/
var options = {
secret: 'yohobuy.portal', //session配置
cookie: {secure: false, maxAge: 3600000},
cookie: {secure: false, maxAge: 7200000},
resave: false,
saveUninitialized: true
saveUninitialized: true,
rolling: true
};
/*老平台接口 配置*/
... ...
... ... @@ -75,13 +75,13 @@
</div>
</div>
<div class="panel-footer">
[[if isAuditing!="200"&&isAuditing!="300"]]
<div class="panel-footer">
<button class="btn btn-primary apply-success">通过</button>
<button class="btn btn-primary apply-back">驳回</button>
[[/if]]
<button onclick="history.go(-1);" type="button" class="btn btn-primary btn-info">返回</button>
<!-- <button onclick="history.go(-1);" type="button" class="btn btn-primary btn-info">返回</button> -->
</div>
[[/if]]
</form>
</div>
... ...
... ... @@ -82,7 +82,7 @@
<a href="/goods/netsale/index" class="btn btn-default btn-lg">取消</a>
<a id="passBtn" href="javascript:;" class="btn btn-primary btn-lg">通过</a>
<a id="rejectBtn" href="javascript:;" class="btn btn-primary btn-lg">驳回</a>
<a id="backBtn" href="javascript:;" onclick="history.go(-1)" class="btn btn-default btn-lg">取消</a>
<!-- <a id="backBtn" href="javascript:;" onclick="history.go(-1)" class="btn btn-default btn-lg">取消</a> -->
</div>
<div class="floatnav">
... ...
... ... @@ -77,7 +77,7 @@
<div class="col-sm-8">
<input type="text" placeholder="数量" prompt="数量" class="form-control observe number"
data-field="couponNum"
required value="[[couponNum]]" [[if isNew==0]] disabled [[/if]]>
required value="[[couponNum]]" [[if isNew===0]] disabled [[/if]]>
</div>
</div>
... ...