Authored by dongjunjie

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

... ... @@ -70,6 +70,7 @@ var $ = require('jquery'),
detailtoast:function(obj) {
common.dialog({
title:"商品池详情",
width:"80%",
content:'<div id="faGrid" style="height: 600px;overflow:auto;"></div>',
button:[{value:"添加", callback:function() {
var e = new common.edit("#base-form");
... ... @@ -106,7 +107,7 @@ var $ = require('jquery'),
columns:[
{display:"ID", name:"id"},
{display:"SKN",name:"productskn"},
{display:"名称", name:""},
{display:"名称", name:"productName"},
{display:'品牌', name: "brandName"},
{display: '分类',name: "sortName"},
{display: '操作', name: "", render: function(item) {
... ...
... ... @@ -41,7 +41,7 @@ var g = new common.grid({
g.init("/meterManage/tryInfo/index2");
var modelLists = [];
//根据productSkn获取所有试穿信息并拼接返回
var getAllInfo = function (productSkn, callback) {
var getAllInfo = function (productSkn, maxSortId,callback) {
common.util.__ajax({url: '/meterManage/tryInfo/info1', data: {productSkn: productSkn}}, function (data) {
var feelIds = {
1: "合适",
... ... @@ -75,7 +75,12 @@ var getAllInfo = function (productSkn, callback) {
callback(modelLists);
new common.dropDown({
el: '.fit_size',
ajax: 'sortsize'
ajax: 'sortsize2',
params: function(){
return {
"sortId" : maxSortId
};
}
});
}, true);
};
... ... @@ -102,7 +107,7 @@ var getNewLists = function (modelLists, callback) {
//详情模态
var Bll = {
toast: function (url, item) {
getAllInfo(item.productSkn, function (data) {
getAllInfo(item.productSkn, item.maxSortId,function (data) {
var a = new common.dialog({
title: "试穿信息",
width: '80%',
... ...
/**
* Created by JiangMin on 2016/3/17.
* 模特管理
*/
var $ = require('jquery');
var common = require('../common/common');
//日期插件
$('.hasDatepicker').fdatepicker({
format: 'yyyy-mm-dd'
});
/**
* 列表显示数据
* @type {common.grid}
*/
var g = new common.grid({
el: '#content-list',
hash: false,
//查询参数
parms: function () {
return {
modelName: common.util.__input('content-filter1'),
beginTime:((new Date($('#beginTime').val())).getTime())/1000,
endTime: ((new Date($('#endTime').val())).getTime())/1000,
modelType:parseInt($("#aa").val()),
status: parseInt($("#bb").val())
};
},
//列表显示
columns: [
{display: "ID", name: "id"},
{display: "姓名", name: "modelName"},
{
display: "头像", name: "avatar", render: function (item) {
return '<img src="' + item.avatar + '" width="100" height="60"/>'
}
},//图片显示
{display: "身高", name: "height"},
{display: "体重", name: "weight"},
{
display: "胸围", render: function (item) {
var a = item.vitalStatistics.split(/[,|/]/g);
return a[0];
}
},
{
display: "腰围", render: function (item) {
var a = item.vitalStatistics.split(/[,|/]/g);
return a[1];
}
},
{
display: "臀围", render: function (item) {
var a = item.vitalStatistics.split(/[,|/]/g);
return a[2];
}
},
{
display: "创建时间", name: "createTime",
render: function (item) {
var t = new Date(item.createTime * 1000);
var formatted = common.util.__dateFormat(t, "yyyy-MM-dd hh:mm:ss");
return "<p>" + formatted + "</p>";
}
},
{
display: "操作", name: "", render: function (item) {
var arr = [];
arr.push('<a class="btn btn-info update" data-index="' + item.__index + '">修改</a>');
arr.push('<a class="btn btn-danger delete" data-index="' + item.__index + '">删除</a>');
return arr.join('');
}
}
]
});
g.init("/meterManage/tryModel/index1");
var Bll = {
toast: function (url, item, hint) {
var e = new common.edit("#baseform", {
bucket: "modelCard"//真实的
});
//验证身高
e.on("validate", function () {
var height = $.trim($("#height").val());
if (height>250) {
return "身高值应小于250"
}
return true;
});
//验证体重
e.on("validate", function () {
var weight = $.trim($("#weight").val());
if (weight>200) {
return "体重值应小于200"
}
return true;
});
//验证胸围
e.on("validate", function () {
var Bust = $.trim($("#Bust").val());
if (Bust>200) {
return "胸围值应小于200"
}
return true;
});
//验证腰围
e.on("validate", function () {
var waist = $.trim($("#waist").val());
if (waist>200) {
return "腰围值应小于200"
}
return true;
});
//验证臀围
e.on("validate", function () {
var hips = $.trim($("#hips").val());
if (hips>200) {
return "臀围值应小于200"
}
return true;
});
var a = common.dialog.confirm(hint,
common.util.__template2($("#template").html(), item),
function () {
e.submit(url, function (option) {
option.data.modelType = parseInt($("#aa").val());//模特类型,1拍摄模特,2试穿模特
option.data.status = 1;//模特状态,默认启用
option.data.height = parseInt($("#height").val());//模特身高
option.data.weight = parseInt($("#weight").val());//模特体重
option.data.status = parseInt($("#status").val());//模特状态,默认启用
option.data.vitalStatistics = $("#Bust").val() + '|' + $("#waist").val() + "|" + $("#hips").val();//模特三围,拼接字符串
//console.log("option.data", option.data);
//option.debug = true;//调试状态
option.success = function (res) {
//判断接口请求状态
if (res.data.code == '200') {
g.reload();//重新加载界面
a.close();//关闭模态框
}
else {
//提示出错信息
e.$tip(res.data.message);
}
};
option.error = function () {
};
});
return false;
});
e.init();
}
};
//添加模特--点击事件
$('#add-content').on('click', function () {
var item = {
"__state": "add"
};
Bll.toast('/meterManage/tryModel/addModel', item, "添加模特");
});
var STATUS = {
'1': "启用",
'2': "禁用"
};
//修改模特--点击事件
$(document).on('click', '.update', function () {
var item = g.rows[$(this).data("index")];
item.__state = "update";
var a = item.vitalStatistics.split(/[,|/]/g);
item.Bust = a[0];
item.waist = a[1];
item.hips = a[2];
item.statusname = STATUS[item.status];
Bll.toast('/meterManage/tryModel/updateModel', item, "修改模特");
});
//删除--点击事件
$(document).on('click', '.delete', function () {
var item = g.rows[$(this).data("index")];
common.dialog.confirm("警告",
"确认删除?",
function () {
item.status = 0;
common.util.__ajax({
url: '/meterManage/tryModel/updateModel',
data: item
}, function () {
g.reload(1);
});
});
});
//查询按钮--点击事件
$(document).on('click', '#filter-btn', function () {
g.reload(1);
});
... ...
... ... @@ -10,47 +10,15 @@ new common.edit("#filter").init();
new common.dropDown({el: "#isHot-filter"});
new common.dropDown({el: "#status-filter"});
new common.dropDown({el: "#source-filter"});
new common.dropDown({el: "#version-filter"});
new common.dropDown({el: "#clientType-filter"});
new common.dropDown({el: "#clientType-filter"});
var ENUM = {
status: {all: '全部', noReply: '未回复', replied: '已回复'},//全部
tips: {"all": 0, "noReply": 0, "replied": 0},
statusStr: {
0: '未回复',
1: '已回复'
}
}
var t = new common.tab({
el: "#basicTab",
click: function () {
g.init('/suggest/getSuggestList');
},
columns: [
{name: "all", display: "全部({all})"},
{name: "noReply", display: "未回复({noReply})"},
{name: "replied", display: "已回复({replied})"}
]
}).init(ENUM.tips);
// tab初始化
var loadTab = function () {
t.active = undefined;
setTimeout(function () {
common.util.__ajax({
url: "/base/goods/ajax/auditCount",
data: g.options.parms()
}, function (res) {
var __dt = $.extend({}, ENUM.tips, res.data);
t.init(__dt);
}, true);
}, 400);
}
loadTab();
common.util.__ajax({
url: '/suggest/getAllAppVersions',
data: {}
},function(res) {
$("#version-search").html(common.util.__template2($("#version-template").html(), res));
new common.dropDown({el: "#appVersion-filter"});
},true);
var g = new common.grid({
el: "#basicTable",
... ... @@ -62,17 +30,22 @@ var g = new common.grid({
startTime: common.util.__input('startTime'),
endTime: common.util.__input('endTime'),
isHot: common.util.__input('isHot-filter'),
appVersion: common.util.__input('appVersion-filter')
appVersion: common.util.__input('appVersion-filter'),
//status:t.active
};
},
columns: [
{display: " ", type:"checkbox"},
{display: "UID", name: "uid"},
{display: "来源", name: "clientType", width: "56px"},
{display: "版本号", name: "appVersion", width:"56px"},
{display: "来源", name: "clientType", width: "56px", render: function(item) {
if(item.clientType) return item.clientType;
return "未知";
}},
{display: "版本号", name: "appVersion", style:"min-width: 56px;"},
{display: "图片", name: "", render: function(item) {
var url = item.imageUrl ? item.imageUrl.substring(0, item.imageUrl.indexOf("?")) : "";
if(item.imageUrl) {
return '<img src="' + item.imageUrl + '" height="70px" width="100px" />';
return '<a href="'+ url +'" target="_blank"><img src="' + item.imageUrl + '" height="60px" width="60px" /></a>';
}
}},
{display: "反馈内容", name: "content", width:"20%"},
... ... @@ -87,7 +60,7 @@ var g = new common.grid({
return "已发送";
}
}},
{display: "状态",name: "", width:"56px;",render: function(item) {
{display: "状态",name: "", width:"70px;",render: function(item) {
if (item.status == "0") {
return "未回复";
} else if (item.status == "1") {
... ... @@ -118,7 +91,7 @@ var g = new common.grid({
});
g.init("/suggest/getSuggestList");
console.log(g);
//console.log(g);
var Bll = {
toast:function(url, item, hint) {
... ... @@ -142,6 +115,30 @@ var Bll = {
});
});
e.init();
},
batch:function(url, hint) {
var ids = [];
$.each(g.selected,function (i, value) {
ids.push(value.id);
});
if(ids.length) {
if(url.indexOf("Publish") != -1) {
common.dialog.confirm("发送确认", "是否确认发送?", function () {
common.util.__ajax({
url: url,
data: {
id: ids.join(",")
}
}, function () {
g.reload();
});
});
} else {
window.open("/ajax/down?queryConf=" + JSON.stringify({"id":ids.join(",")}) + "&type=suggestExport");
}
} else {
util.__tip(hint,"warning");
}
}
};
... ... @@ -195,7 +192,14 @@ $(document).on('click', '.delBtn',function() {
});
});
$(document).on('click', '#batchSend', function() {//批量发送
Bll.batch("/suggest/batchPublishSuggest", "请选择要发送的回复!");
});
$(document).on('click', '#batchExport', function() {//批量导出
Bll.batch("/suggest/batchExportSuggest", "请选择要导出的数据!");
});
$(document).on('click', '#filter-btn', function() {
g.reload(1);
loadTab();
});
\ No newline at end of file
... ...
... ... @@ -4,6 +4,10 @@
*/
var $ = require('jquery');
var common = require('../common/common');
//日期插件
$('.hasDatepicker').fdatepicker({
format: 'yyyy-mm-dd'
});
/**
* 列表显示数据
* @type {common.grid}
... ... @@ -53,22 +57,23 @@ var g = new common.grid({
},
{display: "鞋码", name: "shoeSize"},
{display: "衣服尺码", name: "dressSize"},
{
display: "模特卡", name: "modelCard ",hidden:parseInt($("#aa").val())==2 ,render: function (item) {
return '<img src="' + item.modelCard + '" width="100" height="60"/>'
display: "模特卡", name: "modelCard ", render: function (item) {
return '<img src="' + item.modelCard + '" width="100" height="60"/>'
}
},
{
display: "状态", name: "status", render: function (item) {
if (item.status == 1) {
return status = "启用"
return "启用"
}
else {
return status = "禁用"
return "禁用"
}
}
},
{
display: "操作", name: "", render: function (item) {
var arr = [];
... ... @@ -95,6 +100,46 @@ var Bll = {
}
return true;
});
//验证身高
e.on("validate", function () {
var height = $.trim($("#height").val());
if (height>250) {
return "身高值应小于250"
}
return true;
});
//验证体重
e.on("validate", function () {
var weight = $.trim($("#weight").val());
if (weight>200) {
return "体重值应小于200"
}
return true;
});
//验证胸围
e.on("validate", function () {
var Bust = $.trim($("#Bust").val());
if (Bust>200) {
return "胸围值应小于200"
}
return true;
});
//验证腰围
e.on("validate", function () {
var waist = $.trim($("#waist").val());
if (waist>200) {
return "腰围值应小于200"
}
return true;
});
//验证臀围
e.on("validate", function () {
var hips = $.trim($("#hips").val());
if (hips>200) {
return "臀围值应小于200"
}
return true;
});
var a = common.dialog.confirm(hint,
common.util.__template2($("#template").html(), item),
function () {
... ... @@ -103,8 +148,14 @@ var Bll = {
option.data.status = 1;//模特状态,默认启用
option.data.height = parseInt($("#height").val());//模特身高
option.data.weight = parseInt($("#weight").val());//模特体重
option.data.status = 1;//模特状态,默认启用
if (item.__state == 'add') {
option.data.status = 1;//模特状态,默认启用
}
else {
option.data.status = parseInt($("#status").val());//模特状态,默认启用
}
option.data.vitalStatistics = $("#Bust").val() + '|' + $("#waist").val() + "|" + $("#hips").val();//模特三围,拼接字符串
console.log("option.data", option.data);
//option.debug = true;//调试状态
option.success = function (res) {
//判断接口请求状态
... ... @@ -129,16 +180,25 @@ var Bll = {
//添加模特--点击事件
$('#add-content').on('click', function () {
var item = {};
var item = {
"__state": "add"
};
Bll.toast('/shotManage/model/addModel', item, "添加模特");
});
var STATUS = {
'1': "启用",
'2': "禁用"
};
//修改模特--点击事件
$(document).on('click', '.update', function () {
var item = g.rows[$(this).data("index")];
item.__state = "update";
var a = item.vitalStatistics.split(/[,|/]/g);
item.Bust = a[0];
item.waist = a[1];
item.hips = a[2];
item.statusname = STATUS[item.status];
Bll.toast('/shotManage/model/updateModel', item, "修改模特");
});
//查询按钮--点击事件
... ...
... ... @@ -8,6 +8,7 @@ var common = require('../common/common');
$('.hasDatepicker').fdatepicker({
format: 'yyyy-mm-dd'
});
/**
* 列表显示数据
* @type {common.grid}
... ... @@ -21,18 +22,18 @@ var g = new common.grid({
productSkn: common.util.__input('content-filter1'),
productSkc: common.util.__input('content-filter2'),
productSku: common.util.__input('content-filter3'),
startTime: common.util.__input('starttime'),
endTime: common.util.__input('endtime')
startTime:((new Date($('#starttime').val())).getTime())/1000,
endTime: ((new Date($('#endtime').val())).getTime())/1000
};
},
//列表显示
columns: [
{display: "SKN", name: "productSkn"},
{
display: "最后上传时间", name: "updateTime",
display: "最后上传时间", name: "lastAddTime",
render: function (item) {
var t = new Date(item.updateTime * 1000);
var formatted = common.util.__dateFormat(t, "yyyy-MM-dd ");
var t = new Date(item.lastAddTime * 1000);
var formatted = common.util.__dateFormat(t, "yyyy-MM-dd hh/mm/ss");
return "<p>" + formatted + "</p>";
}
},
... ...
... ... @@ -66,5 +66,21 @@ exports.res = [
route:'/suggest/getAllAppVersions',
method:'POST',
url:'/suggest/suggest/getAllAppVersions'
},
{
route:'/suggest/batchPublishSuggest',
method:'POST',
url:'/suggest/suggest/batchPublishSuggest',
params:[
{name: 'id', type: 'string'}
]
},
{
route:'/suggest/batchExportSuggest',
method:'POST',
url:'/suggest/suggest/batchExportSuggest',
params:[
{name: 'id', type: 'string'}
]
}
];
... ...
exports.domain = require('../config/common.js').domain;
//exports.domain = require('../config/common.js').domain;
// exports.domain = "http://192.168.102.201:8082/platform";
// exports.domain = "http://172.16.6.210:8083/platform";
exports.domain = "http://172.16.6.210:8083/platform";
exports.res = [
{
... ...
... ... @@ -11,21 +11,24 @@ exports.res = [
{
route: '/meterManage/tryModel/index',//访问路由
method: 'GET',//方法
view: 'pages/shotManage/model',//视图
src: '/shotManage/model',//控制层
view: 'pages/meterManage/tryModel',//视图
src: '/meterManage/tryModel',//控制层
data: {
search:false,
type: 2,
typeName:'试穿模特管理'
typeName:'试穿模特管理',
status:1
}
},
//api请求数据
{
route: '/shotManage/model/getAllModels',
route: '/meterManage/tryModel/index1',
method: 'POST',
url: '/model/queryModelList',
params: [
{name: 'englishName', type: 'string'},//英文名
{name: 'modelName', type: 'string'},//名称
{name: 'beginTime', type: 'Number'},
{name: 'endTime', type: 'Number'},
{name: 'status', type: 'Number'},//模特状态:0 禁用 1 启用
{name: 'page', type: 'Number'},
{name: 'size', type: 'Number'}
... ... @@ -33,38 +36,29 @@ exports.res = [
},
//新增模特
{
route: '/shotManage/model/addModel',
route: '/meterManage/tryModel/addModel',
method: 'POST',
url: '/model/addModel',
params: [
{name: 'englishName', type: 'string'},//英文名
{name: 'height', type: 'Number'},//身高
{name: 'dressSize', type: 'string'},//穿衣尺码
{name: 'modelName', type: 'string'},//名称
{name: 'modelType', type: 'Number'},//模特类型:1 拍摄模特 2 试穿模特
{name: 'nationality', type: 'string'},//国籍
{name: 'status', type: 'Number'},//模特状态:0 禁用 1 启用
{name: 'shoeSize', type: 'string'},//鞋尺码
{name: 'vitalStatistics', type: 'string'},//三围
{name: 'weight', type: 'Number'},//体重
{name: 'avatar', type: 'string'},//头像
{name: 'modelCard', type: 'string'}//模特卡
{name: 'avatar', type: 'string'}//头像
]
},
//修改模特
{
route: '/shotManage/model/updateModel',
route: '/meterManage/tryModel/updateModel',
method: 'POST',
url: '/model/updateModel',
params: [
{name: 'id', type: 'Number'},//主键
{name: 'englishName', type: 'string'},//英文名
{name: 'height', type: 'Number'},//身高
{name: 'dressSize', type: 'string'},//穿衣尺码
{name: 'modelName', type: 'string'},//名称
{name: 'modelType', type: 'Number'},//模特类型:1 拍摄模特 2 试穿模特
{name: 'nationality', type: 'string'},//国籍
{name: 'shoeSize', type: 'string'},//鞋尺码
{name: 'status', type: 'Number'},//模特状态:0 禁用 1 启用
{name: 'vitalStatistics', type: 'string'},//三围
{name: 'weight', type: 'Number'},//体重
... ...
... ... @@ -67,6 +67,7 @@
<option value="2">SKU</option>
<option value="3">SKC</option>
</select>
<font color="red">要导入的数据类型必须和所选类型相同</font>
</div>
</div>
<div class="form-group">
... ...
<!--模特管理界面-->
<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>{{typeName}}</h4>
</div>
</div>
</div>
</div>
</div>
<div class="contentpanel">
<div class="panel panel-default" style="...">
<div class="panel-heading">
<a class="btn btn-success " id="add-content"><i class="fa fa-plus"></i> 添加</a>
</div>
<div class="panel-body">
<div class="row">
<div class="panel-col2">
<input type="text" id="beginTime" class="form-control panel-input hasDatepicker " name="begin_time"
placeholder="开始时间" value="" >
</div>
<div class="panel-col2">
<input type="text" id="endTime" class="form-control panel-input hasDatepicker " name="end_time"
placeholder="结束时间" value="" >
</div>
<div class="col-xs-2 col-sm-2 col-md-2 col-lg-2">
<input type="text" value="" name="modelName" id="content-filter1" placeholder="姓名"
class="form-control">
</div>
<a id="filter-btn" href="javascript:;" class="btn btn-info">查询</a>
</div>
</div>
</div>
<div id="content-list"></div>
<input type="hidden" id="aa" value="{{type}}"/>
<input type="hidden" id="bb" value="{{status}}"/>
</div>
<script type="text/template" id="template">
<div class="rows" id="baseform" >
<div class="form-group">
<label class="col-sm-2 control-label" for="avatar">头像</label>
<input type="hidden" value="[[id]]" id="id"/>
<div class="col-sm-6">
<input type="file" value="[[avatar]]" class="form-control avatar" id="avatar" name="avatar" placeholder="头像" required="required"/>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label" for="modelName">姓名</label>
<div class="col-sm-3">
<input type="text" value="[[modelName]]" class="form-control" id="modelName" placeholder="姓名" required="required"/>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label" for="height">身高</label>
<div class="col-sm-3">
<input type="number" value="[[height]]" class="form-control" id="height"
match="numbers" placeholder="身高(cm)" required="required"/>
</div>
<label class="col-sm-2 control-label" for="weight">体重</label>
<div class="col-sm-3">
<input type="number" value="[[weight]]" class="form-control" id="weight"
match="numbers" placeholder="体重(kg)" required="required"/>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">三围</label>
<div class="col-sm-3">
<input type="number" value="[[Bust]]" class="form-control" id="Bust"
match="numbers" placeholder="胸围(cm)" required="required"/>
</div>
<div class="col-sm-3">
<input type="number" value="[[waist]]" class="form-control" id="waist"
match="numbers" placeholder="腰围(cm)" required="required"/>
</div>
<div class="col-sm-3">
<input type="number" value="[[hips]]" class="form-control" id="hips"
match="numbers" placeholder="臀围(cm)" required="required"/>
</div>
</div>
</div>
</script>
... ...
... ... @@ -54,12 +54,8 @@
<option value="Android">Android</option>
</select>
</div>
<div class="panel-col">
<select name="appVersion" id="appVersion-filter" tabindex="-1" title="" class="form-control">
<option value="">选择版本号</option>
<option value="N">未测量</option>
<option value="Y">已测量</option>
</select>
<div class="panel-col" id="version-search">
</div>
<div class="panel-col">
... ... @@ -71,7 +67,10 @@
</div>
</div>
<div class="panel-body nopadding">
<div class="dataTab_wrapper" id="basicTab"></div>
<div class="dataTab_wrapper" id="basicTab">
<a href="javascript:void(0);" id="batchSend" style="margin-left: 10px;" class="btn btn-dark btn-xs pull-right">批量发送</a>
<a href="javascript:void(0);" id="batchExport" style="margin-left: 10px;" class="btn btn-dark btn-xs pull-right">批量导出</a>
</div>
<div class="dataTables_wrapper no-footer" id="basicTable"></div>
</div>
</div>
... ... @@ -86,4 +85,14 @@
</div>
</div><!-- form-group -->
</div>
</script>
<script type="text/template" id="version-template">
<select name="appVersion" id="appVersion-filter" tabindex="-1" title="" class="form-control">
<option value="">选择版本号</option>
<option value=" "></option>
[[each data as item index]]
<option value="[[item]]">[[item]]</option>
[[/each]]
</select>
</script>
\ No newline at end of file
... ...
... ... @@ -37,7 +37,7 @@
<div class="panel-col">
<select name="status" id="status-filter" tabindex="-1" title=""
class="form-control">
<option value="">全部</option>
<option value="-1">全部</option>
<option value="0">禁用</option>
<option value="1">启用</option>
</select>
... ... @@ -66,13 +66,16 @@
<div class="col-sm-3">
<input type="text" value="[[modelName]]" class="form-control" id="modelName" placeholder="姓名" required="required"/>
</div>
<label class="col-sm-2 control-label" for="englishName">英文名</label>
<div class="col-sm-3">
<input type="text" value="[[englishName]]" class="form-control" id="englishName" placeholder="英文名" required="required"/>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label" for="nationality">国籍</label>
... ... @@ -81,6 +84,7 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label" for="height">身高</label>
... ... @@ -125,7 +129,6 @@
match="numbers" placeholder="臀围(cm)" required="required"/>
</div>
</div>
[[if {{type}}==1]]
<div class="form-group">
<label class="col-sm-2 control-label" for="modelCard">模特卡</label>
... ... @@ -133,6 +136,15 @@
<input type="file" value="[[modelCard]]" class="form-control modelCard" id="modelCard" name="modelCard" placeholder="模特卡" required="required"/>
</div>
</div>
[[if __state=='update']]
<div class="form-group">
<label class="col-sm-2 control-label">状态</label>
<div class="col-sm-8">
<label style="cursor: pointer;"><input type="radio" name="status" value="1">启用</label>
<label style="cursor: pointer;"><input type="radio" name="status" value="2">禁用</label>
</div>
<input type="hidden" id="status" value="[[status]]" for="radio">
</div>
[[/if]]
</div>
</script>
... ...
... ... @@ -23,14 +23,14 @@
<div class="panel panel-default" style="...">
<div class="panel-body">
<div class="row">
<!--<div class="panel-col2">-->
<!--<input type="text" id="starttime" class="form-control panel-input hasDatepicker" name="start_time"-->
<!--placeholder="开始时间" value="">-->
<!--</div>-->
<!--<div class="panel-col2">-->
<!--<input type="text" id="endtime" class="form-control panel-input hasDatepicker" name="end_time"-->
<!--placeholder="结束时间" value="">-->
<!--</div>-->
<div class="panel-col2">
<input type="text" id="starttime" class="form-control panel-input hasDatepicker time" name="start_time"
placeholder="开始时间" value="">
</div>
<div class="panel-col2">
<input type="text" id="endtime" class="form-control panel-input hasDatepicker time" name="end_time"
placeholder="结束时间" value="">
</div>
<div class="panel-col">
<input type="text" value="" name="productSkn" id="content-filter1" placeholder="skn"
class="form-control">
... ...
... ... @@ -26,18 +26,10 @@
</div>
<div class="panel-body">
<div class="row">
<!--<div class="panel-col">-->
<!--<select name="status" id="status-filter" tabindex="-1" title=""-->
<!--class="form-control">-->
<!--<option value="">状态</option>-->
<!--<option value="1">可用</option>-->
<!--<option value="0">不可用</option>-->
<!--</select>-->
<!--</div>-->
<div class="panel-col">
<select name="type" id="type-filter" tabindex="-1" title=""
class="form-control">
<option value="">类型</option>
class="form-control" required="required">
<option value="-1">类型</option>
<option value="1">拍摄类型</option>
<option value="2">拍摄风格</option>
<option value="3">模特类型</option>
... ... @@ -58,7 +50,8 @@
<div class="form-group">
<label class="col-sm-2 control-label" for="type">选择类别</label>
<div class="col-sm-6">
<select id="type" class="form-control" value="[[type]]">
<select id="type" class="form-control" value="[[type]]" placeholder="类别" required="required">
<option value="-1">请选择 </option>
<option value="1">拍摄类型 </option>
<option value="2">拍摄风格</option>
<option value="3">模特类型</option>
... ... @@ -71,7 +64,7 @@
<div class="form-group">
<label class="col-sm-2 control-label" for="name">名称</label>
<div class="col-sm-6">
<input type="text" value="[[name]]" class="form-control" id="name" />
<input type="text" value="[[name]]" class="form-control" id="name" placeholder="名称" required="required"/>
</div>
</div>
... ...