fe / yohobuy-shop-fe2 · Commits

Go to a project

Authored by xuhongyun
Commit a67d113306386fa08d9bb640c31a14109f005732 2 parents cfca01bc 9ece9172

Merge branch 'local_dev' into gray 

# Conflicts:
#	dist/yohobuy-shops-fe/4.8.3/jquery/goods.price.Change.js
#	dist/yohobuy-shops-fe/4.8.3/jquery/shop.Decoration.js
#	dist/yohobuy-shops-fe/4.8.3/vue/libs.js
#	dist/yohobuy-shops-fe/4.8.3/vue/report.BusinessOverview.js
#	dist/yohobuy-shops-fe/4.8.3/vue/report.BusinessSale.js
#	dist/yohobuy-shops-fe/4.8.3/vue/report.Charts.js
#	dist/yohobuy-shops-fe/4.8.3/vue/report.ImportExportStock.js
#	dist/yohobuy-shops-fe/4.8.3/vue/report.Stock.js
#	server/index.js
#	server/interfaces/goods.price.js
Inline Side-by-side
Showing 4 changed files with 9 additions and 9 deletions
... ... @@ -76,9 +76,9 @@
</div>
</div>
<div class="panel-footer">
<!-- <div class="panel-footer">
<button onclick="history.go(-1);" type="button" class="btn btn-primary btn-info">返回</button>
</div>
</div> -->
</form>
</div>
... ...
... ... @@ -49,7 +49,7 @@
<div class="footpanel" style="text-align: center;">
<a id="saveAllInfo" 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">
... ...
... ... @@ -216,7 +216,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('');
}
... ... @@ -434,7 +434,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>');
}
return html.join('');
}
... ...
... ... @@ -147,7 +147,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: '图片',
... ... @@ -307,13 +307,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;
... ...