fe / yohobuy-portal-fe · Commits

Go to a project

Authored by weiqingting
Commit 88b1ebf872749bd096a769669099da8cb1fc89b3 2 parents 3e9f3f76 2a860e54

Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6

Inline Side-by-side
Showing 8 changed files with 128 additions and 44 deletions
... ... @@ -104,30 +104,37 @@ if ($('.contentpanel').data('type') == 'info') {
var e = new common.edit('#netsaleAllInfo');
$(document).on("click", "#saveAllInfo", function() {
var data = {};
var error = '';
var allData = GOLABDATA.fire();
$.each(allData, function(key, value) {
if (typeof value == 'string') {
data = value;
console.log(value);
error += value;
return;
}
$.extend(data, value, true);
});
e.submit('/goods/product/saveNetSaleAllInfo', function(option) {
option.data = data;
option.success = function(res) {
res = res.data;
if (res.code == '200') {
e.$tip(res.message, function() {
history.go(-1);
}, 'growl-success');
} else {
e.$tip(res.message);
if (error !== '') {
common.util.__tip(error, 'warning');
} else {
e.submit('/goods/product/saveNetSaleAllInfo', function(option) {
option.data = data;
option.success = function(res) {
res = res.data;
if (res.code == '200') {
e.$tip(res.message, function() {
history.go(-1);
}, 'growl-success');
} else {
e.$tip(res.message);
}
return false;
}
return false;
}
});
});
}
});
... ...
/**
* Created by JiangMin on 2016/3/22.
* 试穿信息管理
... ... @@ -41,8 +42,9 @@ var g = new common.grid({
g.init("/meterManage/tryInfo/index2");
var modelLists = [];
//根据productSkn获取所有试穿信息并拼接返回
var getAllInfo = function (productSkn, maxSortId, callback) {
common.util.__ajax({url: '/meterManage/tryInfo/info1', data: {productSkn: productSkn}}, function (data) {
var getAllInfo = function (item, callback) {
console.log("item11",item);
common.util.__ajax({url: '/meterManage/tryInfo/info1', data: {productSkn: item.productSkn}}, function (data) {
var feelIds = {
1: "合适",
2: "偏大",
... ... @@ -75,12 +77,23 @@ var getAllInfo = function (productSkn, maxSortId, callback) {
callback(modelLists);
var e = new common.edit("#baseInfo");
e.init();
var sortId;
if(item.smallSortId&&item.smallSortId>1){
sortId=item.smallSortId;
}else{
if(item.middleSortId||item.middleSortId>1){
sortId=item.middleSortId;
}
else{
sortId=item.maxSortId;
}
}
new common.dropDown({
el: '.fit_size',
ajax: 'sortsize2',
params: function () {
return {
"sortId": maxSortId
"sortId": sortId
};
}
});
... ... @@ -110,7 +123,7 @@ var getNewLists = function (modelLists, callback) {
//详情模态
var Bll = {
toast: function (url, item) {
getAllInfo(item.productSkn, item.maxSortId, function (data) {
getAllInfo(item, function (data) {
var a = new common.dialog({
title: "试穿信息",
width: '80%',
... ...
... ... @@ -2,15 +2,10 @@ exports.domain = require('../config/common.js').domain;
//销售类目路由
exports.res = [{
route: '/goods/netsale/index',
route: '/sale/category/index',
method: 'GET',
view: 'pages/goods/netsale',
src: '/goods/netsale',
view: 'pages/salecategory/index',
data: {
pageTitle: '网销信息',
gridurl: '/goods/netsale/getList',
filter: {
}
gridurl: ''
}
}];
\ No newline at end of file
... ...
... ... @@ -85,5 +85,8 @@ module.exports = {
},
'/ajax/yohosearch':function(req,res){
uploader.getJSONFile(req,res);
},
'/proxy':function(req,res) {
uploader.proxy(req,res);
}
}
\ No newline at end of file
... ...
... ... @@ -231,4 +231,15 @@ exports.downFile = function(req, res) {
exports.getJSONFile=function(req,res){
console.log(searchDomain);
request.get("http://192.168.10.64:8080/yohosearch/brand/list.json").pipe(res);
}
exports.proxy = function(req,res) {
var headers = getHeader(req, res);
headers['Content-Type'] = 'application/json';
request({
headers:headers,
url:domain + req.query.url,
body:JSON.stringify(req.body)
}).pipe(res);
}
\ No newline at end of file
... ...
... ... @@ -142,9 +142,9 @@ exports.deepSet = function (obj,key,cb) {
*/
exports.getInterfaceConfig = function (routers) {
var env = process.env.NODE_ENV || 'development';
var cssFile = 'css/all.css';
var cssFile = 'css/index.css';
if(env !== 'development') {
cssFile = staticOptions.staticDir[env]+'/all.css';
cssFile = staticOptions.staticDir[env].path+'/index.css';
}
return function(req,res) {
... ... @@ -152,9 +152,11 @@ exports.getInterfaceConfig = function (routers) {
var groupList = [];
var navs = [];
var group = {};
var urlMap = {};
_.forEach(routers.interfacesConfig,function(v,k){
if(v.url)
{
if(v.url&&!urlMap[v.url]) {
urlMap[v.url] = true;//用于去重复的url
var nav = v.url.split('/')[1];
if(group[nav]) {
group[nav].push(v);
... ...
... ... @@ -41,11 +41,17 @@
<h3 class="panel-title">接口地址：{{domain}}{{url}}</h3>
</div>
<div class="panel-body">
<div class="media">
<div class="media-body">
<h4 >页面路由：</h4>
<p class="media-desc">{{route}}</p>
</div>
</div>
<div class="media">
<div class="media-body">
<h4 >调用方式：</h4>
<p class="media-desc">{{method}}：{{#isJsonRaw}}json 文本提交{{/isJsonRaw}}</p>
</div>
</div>
</div>
<h4 class="mt5">输入参数：</h4>
<table class="table table-info mb30">
... ... @@ -53,9 +59,8 @@
<tr>
<th>属性名</th>
<th>属性类型</th>
<th>正则匹配</th>
<th>长度限制</th>
<th>说明</th>
<th>测试入参</th>
</tr>
</thead>
... ... @@ -64,9 +69,8 @@
<tr>
<td>{{name}}</td>
<td>{{type}}</td>
<td>{{reg}}</td>
<td>{{minLength}}-{{maxLength}}</td>
<td>{{message}}</td>
<td><input name="{{name}}" type="text" /></td>
</tr>
{{/ params}}
</tbody>
... ... @@ -75,7 +79,7 @@
<pre style="display:none">
</pre>
<button class="btn btn-success getRes" method="{{method}}" url="{{url}}">点击获取</button>
<button class="btn btn-success getRes" method="{{method}}" url="{{url}}" isjson="{{isJsonRaw}}">点击获取</button>
</div>
</div>
{{/ list}}
... ... @@ -170,19 +174,31 @@ var formatJson = function(json, options) {
return formatted;
};
$(function(){
$(".panel-minimize").click();
$(".getRes").click(function(){
$('.panel-minimize').click();
$('.getRes').click(function(){
var panel = $(this).prev().show('fast');
$.ajax({
url:$(this).attr("url"),
type:$(this).attr("method"),
dataType:'json'
}).done(function(data){
var isJson = $(this).attr('isjson');
var option = {
url:$(this).attr('url'),
type:$(this).attr('method'),
}
var data = {};
if(isJson!=='false') {
option.url = '/proxy?url=' + $(this).attr('url');
}
$(this).parent().find('input').each(function(){
data[$(this).attr('name')] = $(this).val();
});
option.data = data;
$.ajax(option).done(function(data){
var json = formatJson(data);
panel.html(json);
});
});
})
});
</script>
</body>
</html>
... ...
<div class="pageheader">
<div class="media">
<div class="pageicon pull-left">
<i class="fa fa-th-list"></i>
</div>
<div class="media-body">
<ul class="breadcrumb">
<li><a href=""><i class="glyphicon glyphicon-home"></i></a></li>
<li><a href="">运营管理</a></li>
<li>
销售类目管理
</li>
</ul>
<div>
<div style="width: 30%;float: left;">
<h4>销售类目管理</h4>
</div>
</div>
</div>
</div>
</div>
<div class="contentpanel">
<div class="panel panel-default" style="margin-bottom:10px;">
<div class="panel-head">
</div>
<div class="panel-body nopadding">
<div class="dataTables_wrapper no-footer" id="basicTable"></div>
</div>
</div>
</div>
<input type="hidden" id="gridurl" value="{{gridurl}}">
... ...