fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by weiqingting
Commit 2c16eb9a8ad10e73ee9fda77c31d458ca085e7fd 1 parent 2a9ac6ed

提交

Inline Side-by-side
Showing 20 changed files with 220 additions and 146 deletions
... ... @@ -42,8 +42,8 @@ var Iaccount = {
var apiCofig = {
//root:__dirname,
EnvConst:{
domain:"http://192.168.102.210:8088/platform",
//domain:"http://172.16.6.225:8080/platform",
// domain:"http://192.168.102.210:8088/platform",
domain:"http://172.16.6.200:8080/platform",
yohoSearch: 'http://192.168.102.216:8080/yohosearch',
system:Iaccount
},
... ...
... ... @@ -10,7 +10,8 @@ module.exports = function (app){
this.$extend={
action: '/brand/edit',
data:rs.data
}
};
return rs.data;
});
app.get("/erpproduct/brands/add", "brand.Edit", function (req,res){
... ...
... ... @@ -51,4 +51,7 @@ module.exports=function(app) {
app.post("/refundExchangeAttribute/queryRefundExchangeProductSkn","select_queryRefundExchangeProductSkn");
app.post("/product/fuzzySearchProductSortIds","select_fuzzySearchProductSortIds");
app.post("/product/searchAllSortLevel","select_searchAllSortLevel");
/*获取品牌列表*/
app.post("/payDelivery/queryPayDeliveryBrandName","select_queryPayDeliveryBrandName");
}
\ No newline at end of file
... ...
... ... @@ -48,8 +48,6 @@ module.exports=function(app) {
/*获取tab上的数量*/
app.post("/payDelivery/queryCountProductPayDelivery","cod_queryCountProductPayDelivery");
/*获取品牌列表*/
app.post("/payDelivery/queryPayDeliveryBrandName","cod_queryPayDeliveryBrandName");
/*批量导入*/
app.get("/goods/cod/upload","goods.cod.Upload",function(){
... ...
... ... @@ -42,8 +42,8 @@ var Iaccount = {
var apiCofig = {
//root:__dirname,
EnvConst:{
domain:"http://192.168.102.210:8088/platform",
//domain:"http://172.16.6.225:8080/platform",
// domain:"http://192.168.102.210:8088/platform",
domain:"http://172.16.6.200:8080/platform",
yohoSearch: 'http://192.168.102.216:8080/yohosearch',
system:Iaccount
},
... ...
... ... @@ -44,7 +44,9 @@ module.exports={
{name: 'brandFounder',type: 'string'},
{name: 'brandStyle',type: 'string'},
{name: 'brandNature',type: 'Number'},
{name: 'brandTonality',type: 'string'}
{name: 'brandTonality',type: 'string'},
{name: 'registerCertUrl',type: 'string'},
{name: 'authorizeCerts',type: 'string'}
]
},
... ... @@ -67,7 +69,9 @@ module.exports={
{name: 'brandFounder',type: 'string'},
{name: 'brandStyle',type: 'string'},
{name: 'brandNature',type: 'Number'},
{name: 'brandTonality',type: 'string'}
{name: 'brandTonality',type: 'string'},
{name: 'registerCertUrl',type: 'string'},
{name: 'authorizeCerts',type: 'string'}
]
}
}
... ...
... ... @@ -81,8 +81,10 @@ module.exports = {
}
common.Ilogin(user, password).allRight().sessionAsync(user, password).done(function (IloginRes,allRes,sesRes) {
var userData = IloginRes.data, cookie = sesRes.caseless.dict["set-cookie"];
userInfo = { auth: userData, uid: userData.pid, name: userData.truename, right: {},shopList:[]};
userInfo = { auth: userData, uid: userData.pid, name: userData.truename, right: {},shopList:[],brands:[]};
if(userData.data_authority&&userData.data_authority.brand&&userData.data_authority.brand.list){
userInfo.brands=Object.keys(userData.data_authority.brand.list);
}
allRes.data.forEach(function (data) {
if (data.platform_id == Iaccount.WEBSITE) {
userInfo.right[data.path] = true;
... ... @@ -119,7 +121,8 @@ module.exports = {
'x-user-id': user.auth.pid,
'x-user-name': user.auth.account,
'x-site-type': Iaccount.WEBSITE,
'x-client-ip': req.ip
'x-client-ip': req.ip,
'x-user-brands': user.brands.join(',')
};
if (path && user.right[path]) {
common.isUsedMenuAuth(user.auth.pid,user.auth.role_id,path).done(function(isURes){
... ...
... ... @@ -11,10 +11,11 @@ module.exports={
getBrandNames:{
title:'getBrandNames',
url: '/erpproduct/brands/getBrandNames',
params: [
{name: 'idName', type: 'String'},
{name: 'status', type: 'Number'}
]
params: {
idName:{type:String},
status:{type:Number},
userLimitFlag:{type:Boolean,default:false}
}
},
getUsersByIdentity:{
title:'',
... ... @@ -51,9 +52,10 @@ module.exports={
queryAllBrands:{
title:'查询品牌列表接口',
url: '/erpproduct/brands/queryAllBrands',
params: [
{name: 'idName', type: 'String'}
]
params: {
idName:{type:String},
userLimitFlag:{type:Boolean,default:false}
}
},
queryAllSupplier:{
title:'查询供应商列表接口',
... ... @@ -188,6 +190,14 @@ module.exports={
title:'所属分类',
url: '/product/searchAllSortLevel',
params: []
},
queryPayDeliveryBrandName:{
title:'获取品牌列表',
url: '/payDelivery/queryPayDeliveryBrandName',
params:{
idName:{type:String},
userLimitFlag:{type:Boolean,default:false}
}
}
}
};
\ No newline at end of file
... ...
... ... @@ -23,7 +23,6 @@ var Utils = {
'x-site-type': 1,
'x-client-ip': req.ip,
'x-shop-id': req.session.user.auth.shopId
};
}
},
... ... @@ -103,7 +102,13 @@ module.exports = {
req.body.files[index] = fs.createReadStream(files[index].path);
req.body.fileNames[index] = files[index].name;
}
if (req.body.bucket === 'goodsimg') {
// console.log("********** cao");
// console.log(JSON.stringify(req.body.files, null, 4))
// console.log("********** cao");
request.post({
url: "http://upload.static.yohobuy.com",
formData: {
... ...
... ... @@ -109,13 +109,7 @@ module.exports={
{name: 'brandId', type: 'Number'},
{name: 'isPayDelivery', type: 'Number'}
]
},
queryPayDeliveryBrandName:{
title:'获取品牌列表',
url: '/payDelivery/queryPayDeliveryBrandName',
params: [
{name: 'idName', type: 'String'}
]
}
}
}
\ No newline at end of file
... ...
... ... @@ -27,7 +27,7 @@ module.exports = function (logsConfig) {
};
var JsonToString=function(str){
return typeof str === "string" ? str : JSON.stringify(str);
return typeof str === "string" ? str : JSON.stringify(str);//null, 4
}
_.forEach(Consoles, function (v) {
if(["log","warn"].indexOf(v)>-1){
... ...
... ... @@ -16,13 +16,15 @@
<input type="text" id="brandName" name="brandName" class="form-control" placeholder="品牌名称" required value="<%data.brandName%>">
<label for='brandName' class='error' style="display: none;"></label>
</div>
</div><!-- form-group -->
</div>
<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="brandNameEn" name="brandNameEn" class="form-control" placeholder="英文名称" required value="<%data.brandNameEn%>">
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">二级域名 <span class="red">*</span></label>
<div class="col-sm-8">
... ... @@ -30,18 +32,19 @@
<input type="text" id="brandDomain" name="brandDomain" onkeyup="value=value.replace(/[^\w\.\/]/ig,'')" class="form-control" placeholder="二级域名" value="<%data.brandDomain%>" required>
<span class="input-group-addon">.yohobuy.com</span>
</div>
<label for='brand_name' class='error' style="display: none;"></label>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">品牌logo <span class="red">*</span></label>
<div class="col-sm-8">
<input type="file" id="brandIco" name="brandIco" value="<%data.brandIco%>" required placeholder="品牌logo"/>
<input type="file" id="brandIco" name="brandIco" value="<%data.brandIco%>" required placeholder="品牌logo" />
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">品牌级别 <span class="red">*</span></label>
<div class="col-sm-8" >
<div class="col-sm-8">
<label class="radio-inline">
<input type="radio" name="brandLevel" value="KA"/>KA </label>
<label class="radio-inline">
... ... @@ -53,74 +56,83 @@
</div>
<input type="hidden" id="brandLevel" value="<%data.brandLevel%>" for="radio" required>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">品牌推广星级 <span class="red">*</span></label>
<div class="col-sm-8" >
<div class="col-sm-8">
<label class="radio-inline">
<input type="radio" name="promotionLevel" id="level_1" value="1"/>一星 </label>
<input type="radio" name="promotionLevel" value="1"/>一星 </label>
<label class="radio-inline">
<input type="radio" name="promotionLevel" id="level_2" value="2"/>二星 </label>
<input type="radio" name="promotionLevel" value="2"/>二星 </label>
<label class="radio-inline">
<input type="radio" name="promotionLevel" id="level_3" value="3"/>三星 </label>
<input type="radio" name="promotionLevel" value="3"/>三星 </label>
</div>
<input type="hidden" id="promotionLevel" value="<%data.promotionLevel%>" for="radio" required>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">主营类目 <span class="red">*</span></label>
<div class="col-sm-8" >
<div class="col-sm-8">
<label class="radio-inline">
<input type="radio" name="mainCategory" id="level_1" value="1"/>男装 </label>
<input type="radio" name="mainCategory" value="1"/>男装 </label>
<label class="radio-inline">
<input type="radio" name="mainCategory" id="level_2" value="2"/>女装 </label>
<input type="radio" name="mainCategory" value="2"/>女装 </label>
<label class="radio-inline">
<input type="radio" name="mainCategory" id="level_3" value="3"/>混合 </label>
<input type="radio" name="mainCategory" value="3"/>混合 </label>
<label class="radio-inline">
<input type="radio" name="mainCategory" id="level_4" value="4"/>童装 </label>
<input type="radio" name="mainCategory" value="4"/>童装 </label>
<label class="radio-inline">
<input type="radio" name="mainCategory" id="level_5" value="5"/>创意生活 </label>
<input type="radio" name="mainCategory" value="5"/>创意生活 </label>
</div>
<input type="hidden" id="mainCategory" value="<%data.mainCategory%>" for="radio" required>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">发源地 <span class="red">*</span></label>
<div class="col-sm-8" >
<div class="col-sm-10">
<label class="radio-inline">
<input type="radio" name="brandHeadstream" value="1" />欧洲
<input type="radio" name="brandHeadstream" value="1"/>欧洲
</label>
<label class="radio-inline">
<input type="radio" name="brandHeadstream" value="2" />日本 </label>
<input type="radio" name="brandHeadstream" value="2"/>日本 </label>
<label class="radio-inline">
<input type="radio" name="brandHeadstream" value="3" />韩国 </label>
<input type="radio" name="brandHeadstream" value="3"/>韩国 </label>
<label class="radio-inline">
<input type="radio" name="brandHeadstream" value="4" />香港 </label>
<input type="radio" name="brandHeadstream" value="4"/>香港 </label>
<label class="radio-inline">
<input type="radio" name="brandHeadstream" value="5" />本地 </label>
<input type="radio" name="brandHeadstream" value="5"/>本地 </label>
<label class="radio-inline">
<input type="radio" name="brandHeadstream" value="6" />澳洲 </label>
<input type="radio" name="brandHeadstream" value="6"/>澳洲 </label>
<label class="radio-inline">
<input type="radio" name="brandHeadstream" value="7" />台湾 </label>
<input type="radio" name="brandHeadstream" value="7"/>台湾 </label>
<label class="radio-inline">
<input type="radio" name="brandHeadstream" value="8" />美国 </label>
<input type="radio" name="brandHeadstream" value="8"/>美国 </label>
<label class="radio-inline">
<input type="radio" name="brandHeadstream" value="9" />泰国
</label>
<input type="radio" name="brandHeadstream" value="9"/>泰国 </label>
<label class="radio-inline">
<input type="radio" name="brandHeadstream" value="10" />新加坡
</label>
<input type="radio" name="brandHeadstream" value="10"/>新加坡 </label>
<label class="radio-inline">
<input type="radio" name="brandHeadstream" value="11" />东南亚
</label>
<input type="radio" name="brandHeadstream" value="11"/>东南亚 </label>
<label class="radio-inline">
<input type="radio" name="brandHeadstream" value="12" />加拿大
</label>
<input type="radio" name="brandHeadstream" value="12"/>加拿大 </label>
</div>
<input type="hidden" id="brandHeadstream" value="<%data.brandHeadstream%>" required for="radio">
</div>
<div class="form-group">
<label class="col-sm-2 control-label">品牌注册证书 <span class="red">*</span></label>
<div class="col-sm-8">
<div><input type="file" id="registerCertUrl" name="registerCertUrl" value="<%data.registerCertUrl%>" required extend="gif,png,jpg,jpeg,pdf" placeholder="品牌注册证书" bucket="brandCertificate"/></div>
<div style="padding-top: 5px; clear: both"><span style="color:#999">注：支持pdf文件上传</span></div>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">品牌授权书 <span class="red">*</span></label>
<div id="authorizeCerts" class="cover-image-list col-sm-8"></div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">品牌类型</label>
<div class="col-sm-10" >
<label class="radio-inline">
... ... @@ -157,7 +169,7 @@
</div>
<div class="form-group">
<label class="col-sm-2 control-label">品牌介绍</label>
<div class="col-sm-6">
<div class="col-sm-8">
<textarea rows="2" id="brandIntro" class="form-control" placeholder="品牌介绍" ><%data.brandIntro%></textarea>
</div>
</div>
... ... @@ -176,29 +188,29 @@
<div class="form-group">
<label class="col-sm-2 control-label">品牌风格</label>
<div class="col-sm-8">
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="运动"> 运动</label>
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="户外"> 户外</label>
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="街头"> 街头</label>
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="暗黑"> 暗黑</label>
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="军事"> 军事</label>
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="英伦"> 英伦</label>
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="趣味"> 趣味</label>
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="美式"> 美式</label>
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="韩系"> 韩系</label>
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="日系"> 日系</label>
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="性感"> 性感</label>
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="时尚"> 时尚</label>
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="甜美"> 甜美</label>
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="可爱"> 可爱</label>
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="原创"> 原创</label>
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="工装"> 工装</label>
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="机车"> 机车</label>
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="民族"> 民族</label>
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="学院"> 学院</label>
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="欧美"> 欧美</label>
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="港台"> 港台</label>
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="中性"> 中性</label>
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="简约"> 简约</label>
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="运动"> 运动</label>&nbsp;&nbsp;
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="户外"> 户外</label>&nbsp;&nbsp;
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="街头"> 街头</label>&nbsp;&nbsp;
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="暗黑"> 暗黑</label>&nbsp;&nbsp;
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="军事"> 军事</label>&nbsp;&nbsp;
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="英伦"> 英伦</label>&nbsp;&nbsp;
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="趣味"> 趣味</label>&nbsp;&nbsp;
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="美式"> 美式</label>&nbsp;&nbsp;
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="韩系"> 韩系</label>&nbsp;&nbsp;
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="日系"> 日系</label>&nbsp;&nbsp;
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="性感"> 性感</label>&nbsp;&nbsp;
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="时尚"> 时尚</label>&nbsp;&nbsp;
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="甜美"> 甜美</label>&nbsp;&nbsp;
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="可爱"> 可爱</label>&nbsp;&nbsp;
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="原创"> 原创</label>&nbsp;&nbsp;
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="工装"> 工装</label>&nbsp;&nbsp;
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="机车"> 机车</label>&nbsp;&nbsp;
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="民族"> 民族</label>&nbsp;&nbsp;
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="学院"> 学院</label><br>
<label style="cursor: pointer; margin-left: 0"><input type="checkbox" name="brandStyle" value="欧美"> 欧美</label>&nbsp;&nbsp;
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="港台"> 港台</label>&nbsp;&nbsp;
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="中性"> 中性</label>&nbsp;&nbsp;
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="简约"> 简约</label>&nbsp;&nbsp;
<label style="cursor: pointer;"><input type="checkbox" name="brandStyle" value="高街"> 高街</label>
</div>
<input type="hidden" id="brandStyle" value="<%data.brandStyle%>" for="checkbox">
... ... @@ -224,20 +236,18 @@
<div class="form-group">
<label class="col-sm-2 control-label">调性指数</label>
<div class="col-sm-2">
<input type="number" id="brandTonality" name="brandTonality" class="form-control" placeholder="调性指数（范围：1-100）" value="<%data.brandTonality%>">
<div class="col-sm-3">
<input type="number" id="brandTonality" name="brandTonality" style="width: 180px" class="form-control" placeholder="调性指数（范围：1-100）" value="<%data.brandTonality%>">
</div>
</div>
<input type="hidden" id="id" value="<%data.id%>">
</div>
</div>
<div class="panel-footer">
<div class="row">
<div class="col-sm-8 col-sm-offset-2">
<a href="javascript:;" onclick="history.go(-1);" class="btn btn-default">取消</a>
<button id="save_brand" type="submit" data-loading-text="保存中..." class="btn delay-btn btn-primary">保存</button>
<button id="save_brand" type="submit" data-loading-text="保存中..." class="btn delay-btn btn-success">保存</button>
</div>
</div>
</div>
... ... @@ -247,4 +257,34 @@
</div>
</div>
<!--图片列表-->
<script type="text/template" id="template2">
<ul class="cover-image-list col-sm-10" id="addPic" style="padding: 0;margin: 0;">
[[each pictureBoList as _item _index]]
<li class="cover-image-item image-list" data-index=[[_index]]>
<div class="goods-img" style="margin: 0; margin-bottom: 10px">
[[if _item.type == "pdf"]]
<a class="fileinput-button-icon" href="[[_item.src]]" target="_blank" style="display: block;text-align: center;font-size: 24px;color: #999">
pdf文档
</a>
[[else]]
<a class="fileinput-button-icon" href="javascript:;">
<img src="[[_item.src]]?imageView/2/w/100/h/100">
</a>
[[/if]]
<i class="remove-item-btn glyphicon glyphicon-remove-circle" data-index="[[_index]]"></i>
</div>
</li>
[[/each]]
<li class="cover-image-item fileinput-button">
<div class="goods-img" style="margin: 0; margin-bottom: 10px">
<a class="fileinput-button-icon" href="javascript:;">+</a>
<input type="file" class="goods-img-upload picfile" name="picfile" id="picfile"
placeholder="品牌授权书">
</div>
</li>
</ul>
<div style="padding-top: 5px; clear: both"><span style="color:#999">注：支持pdf文件上传，最多上传10张</span></div>
</script>
<%include '../common/__ui/footer'%>
\ No newline at end of file
... ...
... ... @@ -99,8 +99,8 @@
<td>说明：</td>
<td colspan="2">
1、上传文件必须是<span style="color:red;">.xlsx</span>文件<br>
2、第一行标题栏：<span style="color: #67D267;">货品名称、厂家编号、一级分类、二级分类、三级分类、四级分类、性别、货品年、货品季、吊牌价、销售价、色系、厂家颜色、款型、尺码、条码、能否补货、SKN计数、年龄层（成人，大童，小童，中童，幼童）、重点款、预计上架时间、UPM条码</span><br>
3、<a href="/ajax/link/baseproduct">下载样例</a>
2、第一行标题栏：<span style="color: #67D267;">货品名称、厂家编号、一级分类、二级分类、三级分类、四级分类、性别、货品年、货品季、商品属性、吊牌价、销售价、色系、厂家颜色、款型、尺码、条码、能否补货、SKN计数,年龄层（成人，大童，中童，小童，幼童），重点款，预计上架时间、upm条码</span><br>
3、<a href="/ajax/link/baseproduct" style="margin: 0; text-decoration: underline">下载样例.xlsx</a>
</td>
</tr>
</table>
... ...
... ... @@ -23,7 +23,7 @@
<p>
<%if list%>
<%each list as item%>
<button type="button" class="btn btn-default sortadd btn-xs" data-id="<%item.id%>"><%item.colorName%></button>
<button type="button" class="btn btn-default sortadd btn-xs" style="margin-bottom: 5px" data-id="<%item.id%>"><%item.colorName%></button>
<%/each%>
<%/if%>
</p>
... ... @@ -104,8 +104,6 @@
</select>
</div>
<label class="col-sm-1 control-label">JIT供应商</label>
<div class="col-sm-2">
<select id="supplierId" class="form-control">
... ... @@ -118,7 +116,7 @@
<div class="form-group">
<label class="col-sm-2 control-label">分类<span class="red">*</span></label>
<div class="col-sm-5">
<div id="tree"></div>
<div id="tree" style="width: 100%"></div>
</div>
</div>
... ... @@ -168,9 +166,20 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">年龄层<span class="red">*</span></label>
<label class="col-sm-2 control-label">性别<span class="red">*</span></label>
<div class="col-sm-2">
<label class="radio-inline">
<input type="radio" name="gender" value="1">男</label>
<label class="radio-inline">
<input type="radio" name="gender" value="2">女</label>
<label class="radio-inline">
<input type="radio" name="gender" value="3">通用</label>
<input type="hidden" id="gender" name="gender" value="[[gender||'1']]" for="radio" required />
</div>
<label class="col-sm-1 control-label">年龄层<span class="red">*</span></label>
<div class="col-sm-3">
<label class="radio-inline" style="padding-left: 0">
<input type="checkbox" name="ageLevel" value="1">成人</label>
<label class="radio-inline">
<input type="checkbox" name="ageLevel" value="2">大童</label>
... ... @@ -182,16 +191,6 @@
<input type="checkbox" name="ageLevel" value="5">幼童</label>
<input type="hidden" id="ageLevel" name="ageLevel" value="[[ageLevel]]" for="checkbox" placeholder="年龄层" required />
</div>
<label class="col-sm-1 control-label">性别<span class="red">*</span></label>
<div class="col-sm-2">
<label class="radio-inline">
<input type="radio" name="gender" value="1">男</label>
<label class="radio-inline">
<input type="radio" name="gender" value="2">女</label>
<label class="radio-inline">
<input type="radio" name="gender" value="3">通用</label>
<input type="hidden" id="gender" name="gender" value="[[gender||'1']]" for="radio" required />
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">重点款<span class="red">*</span></label>
... ... @@ -204,7 +203,7 @@
<input type="hidden" id="grade" value="[[grade||'0']]" for="radio" required/>
<label class="col-sm-1 control-label">适销季<span class="red">*</span></label>
<div class="col-sm-4">
<label class="radio-inline">
<label class="radio-inline" style="padding-left: 0">
<input type="checkbox" name="seasons" value="spring">春</label>
<label class="radio-inline">
<input type="checkbox" name="seasons" value="summer">夏</label>
... ... @@ -288,17 +287,17 @@
<div class="form-group">
<label class="col-sm-2 control-label">预计上架时间<span class="red">*</span></label>
<div class="col-sm-2">
<input type="text" id="expectShelfTimeStr" jsaction="time" value="[[expectShelfTimeStr]]" required class="form-control" readonly="readonly" placeholder="预计上架时间" />
<input type="text" style="background-color: #fff" id="expectShelfTimeStr" jsaction="time" value="[[expectShelfTimeStr]]" required class="form-control" readonly="readonly" placeholder="预计上架时间" />
</div>
[[if isAdvance=='Y']]
<label class="col-sm-1 control-label" id="expectArrivalTimeStrTxt">预计到货时间<span class="red">*</span></label>
<div class="col-sm-2">
<input type="text" id="expectArrivalTimeStr" jsaction="time" value="[[expectArrivalTimeStr]]" class="form-control" readonly="readonly" required placeholder="预计到货时间" />
<input type="text" style="background-color: #fff" id="expectArrivalTimeStr" jsaction="time" value="[[expectArrivalTimeStr]]" class="form-control" readonly="readonly" required placeholder="预计到货时间" />
</div>
[[else]]
<label class="col-sm-1 control-label" id="expectArrivalTimeStrTxt">预计到货时间</label>
<div class="col-sm-2">
<input type="text" id="expectArrivalTimeStr" jsaction="time" value="[[expectArrivalTimeStr]]" class="form-control" readonly="readonly" placeholder="预计到货时间" />
<input type="text" style="background-color: #fff" id="expectArrivalTimeStr" jsaction="time" value="[[expectArrivalTimeStr]]" class="form-control" readonly="readonly" placeholder="预计到货时间" />
</div>
[[/if]]
... ... @@ -342,4 +341,16 @@
[[/if]]
</div>
</script>
<script type="text/template" id="colorSelect">
<select class='form-control colorSelect' style='width: 150px' value="[[colorId]]" data-index="[[__index]]">
<%if list%>
<%each list as item%>
<option value="<%item.id%>"><%item.colorName%></option>
<%/each%>
<%/if%>
</option>
</select>
<div class='clearfix'></div>
</script>
<%include '../../common/__ui/footer'%>
\ No newline at end of file
... ...
... ... @@ -73,19 +73,18 @@
</div>
<div class="panel-col">
<a id="pass-btn" href="javascript:;" class="btn btn-info">通过</a>
<a id="reject-btn" href="javascript:;" class="btn btn-info">驳回</a>
<a id="pass-btn" href="javascript:;" class="btn btn-success">通过</a>
<a id="reject-btn" href="javascript:;" class="btn btn-danger">驳回</a>
</div>
<div class="panel-col">
<a id="import-btn" href="/goods/base/batch" class="btn btn-info">基础商品导入</a>
<div class="panel-col2">
<a id="import-btn" href="/goods/base/batch" class="btn btn-primary">基础商品导入</a>
<a id="importFun-btn" href="/goods/piliang/batch" class="btn btn-primary">批量功能</a>
</div>
<div class="panel-col" style="display: none;" id="daochu">
<div class="panel-col" style="display: none" id="daochu">
<a href="javascript:;" class="btn btn-info" id="basedaochu">基础商品导出</a>
</div>
<div class="panel-col">
<a id="import-btn" href="/goods/piliang/batch" class="btn btn-info">批量功能</a>
</div>
</div>
</div>
</div>
... ...
... ... @@ -61,7 +61,7 @@
<li class="cover-image-item fileinput-button">
<div class="goods-img">
<a class="fileinput-button-icon" href="javascript:void(0);">+</a>
<input type="file" class="goods-img-upload fenmianfile" name="fenmianfile" data-index=[[index]]>
<input type="file" class="goods-img-upload fenmianfile" name="fenmianfile" data-index=[[index]] multiple="true">
</div>
</li>
</ul>
... ...
... ... @@ -123,6 +123,8 @@
<input type="checkbox" value="h5" style="width:18px;height:18px;margin-left:5px;" name="platform"> 手机网站
<input type="checkbox" value="web" style="width:18px;height:18px;margin-left:5px;" name="platform"> 网站
<input type="checkbox" value="platform" style="width:18px;height:18px;margin-left:5px;" name="platform"> 平台
<input type="checkbox" value="blk_pc" style="width:18px;height:18px;margin-left:5px;" name="platform"> BLK_PC
<input type="checkbox" value="blk_app" style="width:18px;height:18px;margin-left:5px;" name="platform"> BLK_APP
</div>
<input type="hidden" id="platform" for="checkbox" value="[[platform]]">
</div><!-- form-group -->
... ...
... ... @@ -27,6 +27,8 @@
<option value="h5">手机网站</option>
<option value="web">网站</option>
<option value="platform">平台</option>
<option value="blk_pc">BLK_PC</option>
<option value="blk_app">BLK_APP</option>
</select>
</div>
<div class="panel-col">
... ...
... ... @@ -12,11 +12,15 @@
<input type="text" placeholder="公告标题" id="notice-title" class="form-control"/>
</div>
<div class="panel-col">
<select name="position" id="notice-position" tabindex="-1" title=""
class="select2-offscreen brandBtn-group">
<select name="position" id="notice-position" tabindex="-1" title="" class="select2-offscreen brandBtn-group">
<option value="" selected="">位置</option>
<option value="1">首页</option>
<option value="2">个人中心</option>
<option value="3">社区首页</option>
<option value="4">复古市集会</option>
<option value="5">SNEAKER</option>
<option value="6">YOHO</option>
<option value="7">SHOW</option>
</select>
</div>
<div class="panel-col">
... ...
... ... @@ -9,7 +9,6 @@
<div class="panel-heading">
<h4 class="panel-title">基本信息</h4>
</div>
<div class="panel-body">
<div class="row">
<div class="form-group">
... ... @@ -28,27 +27,25 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">成立日期 <span class="red">*</span></label>
<div class="col-sm-8">
<div class="col-sm-3">
<input type="text" id="foundTime" jsaction="date" placeholder="成立日期"
class="form-control" readonly required value="<%data.foundTime%>">
class="form-control" readonly required value="<%data.foundTime%>" style="background-color: #fff">
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">营业期限<span class="red">*</span></label>
<label class="col-sm-2 control-label">营业期限 <span class="red">*</span></label>
<div class="col-sm-3">
<input type="text" class="form-control" jsaction="date:end:endOperateTime"
id="beginOperateTime" required placeholder="营业期限开始时间"
value="<%data.beginOperateTime%>" readonly>
value="<%data.beginOperateTime%>" readonly style="background-color: #fff">
</div>
<div class="col-sm-3">
<input type="text" class="form-control" jsaction="date:start:beginOperateTime"
id="endOperateTime" required placeholder="营业期限结束时间"
value="<%data.endOperateTime%>" readonly>
value="<%data.endOperateTime%>" readonly style="background-color: #fff">
</div>
</div>
... ... @@ -69,14 +66,6 @@
</div>
<div class="form-group">
<label class="col-sm-2 control-label">法人身份证电子版<span class="red">*</span> </label>
<div class="col-sm-8">
<input type="file" id="legalIdentityCard" name="legalIdentityCard"
value="<%data.legalIdentityCard%>" required placeholder="法人身份证电子版">
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">注册资本 <span class="red">*</span></label>
<div class="col-sm-8">
<input id="registeredCapital" placeholder="请填写注册资本" class="form-control" required
... ... @@ -93,7 +82,7 @@
</div>
<div class="form-group">
<label class="col-sm-2 control-label">组织机构代码证<span class="red">*</span></label>
<label class="col-sm-2 control-label">组织机构代码证 <span class="red">*</span></label>
<div class="col-sm-8">
<input type="file" id="businessLicensePic" name="businessLicensePic"
value="<%data.businessLicensePic%>" required>
... ... @@ -101,7 +90,7 @@
</div>
<div class="form-group">
<label class="col-sm-2 control-label">税务登记证<span class="red">*</span></label>
<label class="col-sm-2 control-label">税务登记证 <span class="red">*</span></label>
<div class="col-sm-8">
<input type="file" id="taxCertificate" name="taxCertificate"
value="<%data.taxCertificate%>" required>
... ... @@ -109,12 +98,22 @@
</div>
<div class="form-group">
<label class="col-sm-2 control-label">开户许可证<span class="red">*</span></label>
<label class="col-sm-2 control-label">开户许可证 <span class="red">*</span></label>
<div class="col-sm-8">
<input type="file" id="accountOpeningLicense" name="accountOpeningLicense"
value="<%data.accountOpeningLicense%>" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">法人身份证电子版</label>
<div class="col-sm-8">
<div><input type="file" id="legalIdentityCard" name="legalIdentityCard"
value="<%data.legalIdentityCard%>" placeholder="法人身份证电子版" extend="gif,png,jpg,jpeg,pdf"></div>
<div style="padding-top: 5px; clear: both"><span style="color:#999">注：支持pdf文件上传</span></div>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">纳税人资格证明</label>
<div class="col-sm-8">
... ... @@ -123,6 +122,7 @@
value="<%data.taxpayerQualificationCertificate%>">
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">行业许可证</label>
<div class="col-sm-8">
... ... @@ -130,9 +130,8 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">经营范围 </label>
<label class="col-sm-2 control-label">经营范围</label>
<div class="col-sm-8">
<input type="text" id="businessRange" placeholder="请填写经营范围" class="form-control"
value="<%data.businessRange%>">
... ... @@ -148,7 +147,6 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">公司联系地址 <span class="red">*</span></label>
<div class="col-sm-8">
... ... @@ -198,7 +196,7 @@
</div>
<div class="form-group">
<label class="col-sm-2 control-label">开户行<span class="red">*</span></label>
<label class="col-sm-2 control-label">开户行 <span class="red">*</span></label>
<div class="col-sm-8">
<input type="text" id="bankName" placeholder="请填写开户行" class="form-control"
value="<%data.bankName%>" required>
... ... @@ -206,7 +204,7 @@
</div>
<div class="form-group">
<label class="col-sm-2 control-label">开户账号<span class="red">*</span></label>
<label class="col-sm-2 control-label">开户账号 <span class="red">*</span></label>
<div class="col-sm-8">
<input type="text" id="bankAccount" placeholder="请填写开户账号" class="form-control"
value="<%data.bankAccount%>" required>
... ...