liuloulou / yohobuy-portal-fe2 · Commits

Go to a project

Authored by ZhongW
Commit e7b371a3e137c024b50c7057cbf97be09f6a34ee 1 parent 34b22271

打包提交

Inline Side-by-side
Showing 11 changed files with 71 additions and 30 deletions
... ... @@ -6,10 +6,11 @@
module.exports=function(app) {
/*销售类目主页*/
app.get("/runManage/subjectManage/index","operations.subject.Index", function () {
app.get("/runManage/subjectManage/index","operations.subject.Index", ["subject_queryBaseProductPoolList"],function (rs) {
this.$extend = {
moduleName: "运营管理",
pageName: "专题管理"
pageName: "专题管理",
select:rs.data
}
});
... ...
... ... @@ -94,15 +94,17 @@ if(process.env.NODE_ENV!="coding"){
}
}
/*线下测试环境*/
if(process.env.NODE_ENV==="test211"){
apiCofig.EnvConst.domain="http://192.168.102.202:8088/platform";
apiCofig.EnvConst.yohoSearch="http://192.168.102.216:8080/yohosearch";
}
/*腾讯云*/
// if(process.env.NODE_ENV==="test211"){
// apiCofig.EnvConst.domain="http://192.168.102.202:8088/platform";
// apiCofig.EnvConst.yohoSearch="http://192.168.102.216:8080/yohosearch";
// }
/*测试环境*/
if(process.env.NODE_ENV==="test"){
apiCofig.EnvConst.domain="http://10.66.100.6:8088/platform";
apiCofig.EnvConst.yohoSearch="http://10.66.100.4:8080/yohosearch";
apiCofig.EnvConst.domain=process.env.TEST_PLATFORM||"http://10.66.100.6:8088/platform";
apiCofig.EnvConst.yohoSearch=process.env.TEST_SEARCH||"http://10.66.100.4:8080/yohosearch";
}
/*灰度环境*/
if(process.env.NODE_ENV==="gray"){
apiCofig.EnvConst.domain="http://172.31.23.161:8088/platform";
... ...
... ... @@ -45,6 +45,7 @@ module.exports={
url: '/salesCategory/addSC',
params: [
{name: 'categoryName', type: 'string'},
{name: 'appType', type: 'number'},
{name: 'relationParameter', type: 'string'},
{name: 'relationUrl', type: 'string'},
{name: 'parentId', type: 'string'},
... ... @@ -58,6 +59,7 @@ module.exports={
params: [
{name: 'categoryId', type: 'string'},
{name: 'categoryName', type: 'string'},
{name: 'appType', type: 'number'},
{name: 'relationParameter', type: 'string'},
{name: 'relationUrl', type: 'string'},
{name: 'parentId', type: 'string'},
... ...
... ... @@ -42,7 +42,7 @@
</div>
</div>
<div class="form-group">
<div class="form-group" style="display:none">
<label class="col-sm-2 control-label">品牌Banner</label>
<div class="col-sm-8">
<input type="file" id="brandBanner" name="brandBanner" value="<%data.brandBanner%>" placeholder="品牌Banner" bucket="brandBanner"/>
... ...
... ... @@ -471,6 +471,7 @@
</div>
<div class="col-sm-2">
<a id="search" class="go-search btn btn-primary">搜索商品</a>
<a id="searchBLK" class="go-search btn btn-primary">搜BLK商品</a>
</div>
</div>
... ... @@ -498,6 +499,7 @@
</div>
<p style="margin-top:40px;">
<a class="go-search tag-goods btn btn-primary" id="search2">搜索商品</a>
<a id="searchBLK2" class="go-search btn btn-primary">搜BLK商品</a>
</p>
</div>
<div class="goods-list form-group" style="display: none">
... ... @@ -520,7 +522,7 @@
</div>
</div>
<div class="gird" id="goodsgird">
<div class="gird" id="goodsgird" appType="0">
</div>
</div>
</script>
... ...
... ... @@ -30,6 +30,15 @@
{{/unless}}
<div class="form-group">
<label class="col-sm-2 control-label">是否BLK:</label>
<div class="col-sm-8">
<select class="form-control" id="appType" value="[[appType]]">
<option value="0">否</option>
<option value="1">是</option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">分类名称</label>
<div class="col-sm-8"><input type="text" id="categoryName" name="categoryName" class="form-control" placeholder="分类名称" value="{{categoryName}}"></div>
</div>
... ...
... ... @@ -37,6 +37,26 @@
<div class="col-sm-8 height40">[[parentName]]</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">是否BLK:</label>
[[if parentId==0]]
<div class="col-sm-8">
<select class="form-control" id="appType" value="[[appType]]">
<option value="0">否</option>
<option value="1">是</option>
</select>
</div>
[[/if]]
[[if parentId>0]]
<div class="col-sm-8">
<select class="form-control" id="appType" value="[[appType]]" disabled>
<option value="0">否</option>
<option value="1">是</option>
</select>
</div>
[[/if]]
</div>
<div class="form-group">
<label class="col-sm-2 control-label">分类名称：</label>
<div class="col-sm-8">
<div class="form-inline">
... ... @@ -87,7 +107,8 @@
<div class="level-hd clearfix">
<span class="folder"></span>
<span style="width: 5%">ID</span>
<span style="width: 20%">品类名称</span>
<span style="width: 5%">BLK商品</span>
<span style="width: 15%">品类名称</span>
<span>所属分类</span>
<span>分类图标</span>
<span class="orderby">排序</span>
... ... @@ -199,7 +220,8 @@
<script type="text/template" id="tableTemp2">
<span class="folder"></span>
<span style="width: 5%">[[categoryId]]</span>
<span style="width: 20%">[[categoryName]]</span>
<span style="width: 5%">[[if appType=="1"]]是[[/if]][[if appType=="0"]]否[[/if]]</span>
<span style="width: 15%">[[categoryName]]</span>
<span>[[levelNumber]]级分类</span>
<span><img src="[[icon]]" alt=""></span>
<span class="orderby"> <input type="text" class="form-control saleCategoryNumInput" value="[[orderBy]]" categoryId="[[categoryId]]" /></span>
... ...
... ... @@ -59,17 +59,17 @@
<div class="rows" id="baseform">
<div class="form-group">
<label class="col-sm-2 control-label">分类<font color="#f00">*</font></label>
<input type="hidden" value="{id}" id="id"/>
<input type="hidden" value="[[id]]" id="id"/>
<div class="col-sm-10">
<input name="sort" type="radio" value="1"/>奥莱
<input name="sort" type="radio" value="2"/>SALE
</div>
<input type="hidden" id="sort" value="{sort}" for="radio"/>
<input type="hidden" id="sort" value="[[sort]]" for="radio"/>
</div>
<div class="form-group">
<label class="col-sm-2 control-label" for="title">标题<font color="#f00">*</font></label>
<div class="col-sm-8">
<input type="text" value="{title}" class="form-control" id="title" required="required"/>
<input type="text" value="[[title]]" class="form-control" id="title" required="required"/>
</div>
</div>
<div class="form-group">
... ... @@ -80,7 +80,7 @@
<label style="cursor: pointer;"><input type="checkbox" name="plateform" value="3">WAP</label>
<label style="cursor: pointer;"><input type="checkbox" name="plateform" value="4">IPAD</label>
</div>
<input type="hidden" id="plateform" value="{plateform}" for="checkbox">
<input type="hidden" id="plateform" value="[[plateform]]" for="checkbox">
</div>
<div class="form-group">
<label class="col-sm-2 control-label">频道</label>
... ... @@ -90,7 +90,7 @@
<label style="cursor: pointer;"><input type="checkbox" name="yhChannel" value="3">儿童</label>
<label style="cursor: pointer;"><input type="checkbox" name="yhChannel" value="4">创意生活</label>
</div>
<input type="hidden" id="yhChannel" value="{yhChannel}" for="checkbox">
<input type="hidden" id="yhChannel" value="[[yhChannel]]" for="checkbox">
</div>
<div class="form-group">
<label class="col-sm-2 control-label">促销形式</label>
... ... @@ -116,49 +116,51 @@
<div class="panel-col1 col-sm-4">
<input type="text" id="startTime" jsaction="time:end:endTime"
class="form-control panel-input hasDatepicker " readonly name="start_time" placeholder="开始时间"
value="{startTime}">
value="[[startTime]]">
</div>
<div class="panel-col1 col-sm-4">
<input type="text" id="endTime" jsaction="time:start:startTime"
class="form-control panel-input hasDatepicker" readonly name="end_time" placeholder="结束时间"
value="{endTime}">
value="[[endTime]]">
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-lalbel" for="orderNum">排序</label>
<div class="col-sm-8">
<input type="text" id="orderNum" value="{orderNum}" class="form-control"/>
<input type="text" id="orderNum" value="[[orderNum]]" class="form-control"/>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">手机端封面图</label>
<div class="col-sm-10">
<input type="file" id="coverUrl" name="coverUrl" value="{coverUrl}"/>
<input type="file" id="coverUrl" name="coverUrl" value="[[coverUrl]]"/>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">WEB logo图</label>
<div class="col-sm-10">
<input type="file" id="logoUrl" name="logoUrl" value="{logoUrl}"/><!---->
<input type="file" id="logoUrl" name="logoUrl" value="[[logoUrl]]"/><!---->
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">web封面图</label>
<div class="col-sm-10">
<input type="file" id="webCoverUrl" name="webCoverUrl" value="{webCoverUrl}"/>
<input type="file" id="webCoverUrl" name="webCoverUrl" value="[[webCoverUrl]]"/>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">web列表页图</label>
<div class="col-sm-10">
<input type="file" id="webUrl" name="webUrl" value="{webUrl}"/>
<input type="file" id="webUrl" name="webUrl" value="[[webUrl]]"/>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">添加商品<font color="#f00">*</font></label>
<div class="col-sm-10">
<select id="productPoolId" style="width: 280px;" value="{productPoolId}">
<option value="{productPoolId}">请选择商品池</option>
<select id="productPoolId" style="width: 280px;" value="[[productPoolId]]">
<%each select as item i%>
<option value="<%item.id%>"><%item.text%></option>
<%/each%>
</select>
</div>
</div>
... ...
... ... @@ -55,7 +55,7 @@
<div class="shopBanner canEdit" data-dialogid="shopTopBanner">
<img src="[[resources.shopTopBanner.data.shopSrc]]">
[[if resources.shopTopBanner.data.isShowShopName == "Y"]]
<h1>[[shopName]]</h1>
<h1 style="color:white;margin-top:70px">[[shopName]]</h1>
[[/if]]
</div>
... ...
... ... @@ -23,7 +23,7 @@
<div class="panel-col">
<select name="status" id="yohoStatus" tabindex="-1" title="" class="form-control">
<option value="" selected="">有货状态</option>
<option value="0">待装修</option>
<option value="1">待装修</option>
<option value="100">暂存</option>
<option value="200">待审核</option>
<option value="300">审核通过</option>
... ... @@ -33,7 +33,7 @@
<div class="panel-col">
<select name="status" id="blkStatus" tabindex="-1" title="" class="form-control">
<option value="" selected="">BLK状态</option>
<option value="0">待装修</option>
<option value="1">待装修</option>
<option value="100">暂存</option>
<option value="200">待审核</option>
<option value="300">审核通过</option>
... ...
... ... @@ -23,6 +23,7 @@
<input id="productSKN" type="text" class="form-control" placeholder="SKN" />&nbsp;&nbsp;
<input id="factoryCode" type="text" class="form-control" placeholder="商家编码" />&nbsp;&nbsp;
<a href="javascript:" class="btn btn-info filter-btn">查询</a>
<a id="all-btn" href="" class="btn btn-info">全部</a>
<a href="javascript:" class="btn btn-danger cancelAll" style="float: right;display: none">全部取消</a>
</div>
<div id="productTable"></div>
... ...