fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by ZhongW
Commit 272bdbde75fd1d14da94e002ec77644c61c7d9fa 1 parent f2bacfca

4.9.4打包

Inline Side-by-side
Showing 11 changed files with 104 additions and 22 deletions
{
"name": "yohobuy-portal-fe",
"version": "4.9.3",
"version": "4.9.4",
"description": "Construction of the presentation layer solution is based on express, handlebars",
"main": "app.js",
"scripts": {
... ...
... ... @@ -24,7 +24,8 @@ module.exports={
{name: 'supplierId', type: 'Number'},
{name: 'isAuditing', type: 'Number'},
{name: 'founderName', type: 'String'},
{name:'factoryCode',type:'String'}
{name:'factoryCode',type:'String'},
{name:'appType',type:'Number'}
]
},
getBaseProductList:{
... ...
... ... @@ -17,6 +17,7 @@ module.exports={
{name: 'orderBy', type: 'String'},
{name: 'startTime', type: 'String'},
{name: 'endTime', type: 'String'},
{name: 'appType', type: 'Number'},
{name: 'page', type: 'Number'},
{name: 'size', type: 'Number'}
]
... ...
{"name":"yohobuy-portal-fe","version":"4.9.3","description":"Construction of the presentation layer solution is based on express, handlebars","main":"app.js","scripts":{"code":"set NODE_ENV=coding&& gulp start","build":"set NODE_ENV=production && gulp && gulp mvc","server":"set NODE_ENV=server&& gulp start"},"dependencies":{"art-template":"^3.0.3","async":"^2.0.0-rc.3","body-parser":"^1.15.0","connect-multiparty":"^2.0.0","connect-redis":"^3.0.2","cookie-parser":"^1.4.1","dev":"^0.1.3","express":"^4.13.4","express-session":"^1.13.0","glob":"^7.0.3","lodash":"^4.11.1","md5":"^2.1.0","mkdirp":"^0.5.1","request":"^2.72.0","vue-router":"^0.7.13","vuex":"^1.0.0-rc.2","winston":"^2.2.0"}}
\ No newline at end of file
{"name":"yohobuy-portal-fe","version":"4.9.4","description":"Construction of the presentation layer solution is based on express, handlebars","main":"app.js","scripts":{"code":"set NODE_ENV=coding&& gulp start","build":"set NODE_ENV=production && gulp && gulp mvc","server":"set NODE_ENV=server&& gulp start"},"dependencies":{"art-template":"^3.0.3","async":"^2.0.0-rc.3","body-parser":"^1.15.0","connect-multiparty":"^2.0.0","connect-redis":"^3.0.2","cookie-parser":"^1.4.1","dev":"^0.1.3","express":"^4.13.4","express-session":"^1.13.0","glob":"^7.0.3","lodash":"^4.11.1","md5":"^2.1.0","mkdirp":"^0.5.1","request":"^2.72.0","vue-router":"^0.7.13","vuex":"^1.0.0-rc.2","winston":"^2.2.0"}}
\ No newline at end of file
... ...
... ... @@ -33,10 +33,10 @@
<a class="fileinput-button-icon" href="javascript:void(0);"><img src="[[_item.imageUrl]]"></a>
<i class="remove-item-btn glyphicon glyphicon-remove-circle"></i>
</div>
<div class="cover-color">
<div class="cover-color">
[[if _item.isDefault=="Y"]]
<a href="javascript:;" class="btn btn-default btn-metro info" data-i="0">默认</a>
[[else]]
[[else]]
<a href="javascript:;" class="btn btn-default btn-metro" data-i="0">默认</a>
[[/if]]
... ... @@ -54,7 +54,7 @@
[[else]]
<a href="javascript:;" class="btn btn-default btn-metro" data-i="2">女封</a>
[[/if]]
[[/if]]
[[/if]]
</div>
</li>
[[/each]]
... ...
... ... @@ -45,16 +45,6 @@
</div>
<div class="form-group">
<label for="advertCode" class="col-sm-2 control-label">是否BLK：</label>
<div class="col-sm-10">
<select class="form-control" id="appType" value="[[appType]]">
<option value="0">否</option>
<option value="1">是</option>
</select>
</div>
</div>
<div class="form-group">
<label for="status" class="col-sm-2 control-label" style="margin-top: 10px">是否启用：</label>
<div class="col-sm-10 radio">
<label><input type="radio" value="1" name="status" kl_vkbd_parsed="true">开启</label>
... ... @@ -62,4 +52,16 @@
</div>
<input id="status" type="hidden" value="[[status]]" for="radio" kl_vkbd_parsed="true">
</div>
</script>
\ No newline at end of file
</script>
<!-- <div class="form-group">
<label for="advertCode" class="col-sm-2 control-label">是否BLK：</label>
<div class="col-sm-10">
<select class="form-control" id="appType" value="[[appType]]">
<option value="0">否</option>
<option value="1">是</option>
</select>
</div>
</div>-->
\ No newline at end of file
... ...
... ... @@ -51,6 +51,14 @@
</div>
<div class="panel-col">
<select id="appType" class="form-control">
<option value="-1">是否BLK商品</option>
<option value="1">是BLK</option>
<option value="0">非BLK</option>
</select>
</div>
<div class="panel-col">
<input type="text" id="starttime" class="form-control panel-input hasDatepicker" name="start_time"
placeholder="开始时间" value="" kl_vkbd_parsed="true">
</div>
... ...
... ... @@ -143,9 +143,9 @@
<div class="form-inline">
<div class="form-group" id="resultdiscount">
打
<input type="text" class="form-control observe" placeholder="0.00"
<input type="text" class="form-control observe" placeholder="优惠结果,格式:0.0"
id="discount"
value="[[discount]]" required pattern="^0(.\d{1,2})?$"
value="[[discount]]" required pattern="^\d(.\d{1,1})?$"
data-field="discount">
折,
</div>
... ...
... ... @@ -58,9 +58,9 @@
<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>
<option value="5">聚焦潮鞋</option>
<option value="6">爱享潮物</option>
<option value="7">潮人自曝</option>
</select>
</div>
<div id="showchannel" class="col-sm-5">
... ...
... ... @@ -1587,4 +1587,58 @@
</div>
</div>
</div>
</script>
<!-- APP直播 -->
<script type="text/template" id="livePicture-template">
<div class="form-group">
<div class="col-sm-6">
<label>标题:</label>&emsp;&emsp;
<input type="text" class="form-control input-form observe" placeholder="标题" value="[[contentData.data.title.name]]" data-field="title.name">
</div>
<div class="col-sm-6">
<label>更多名称:</label>
<input type="text" class="form-control input-form observe" placeholder="更多名称" value="[[contentData.data.title.more_name]]" data-field="title.more_name">
</div>
</div>
<div class="form-group">
<div class="col-sm-6">
<label>跳转目的:</label>
<select name="goTo" class="observe form-control input-form" value="[[contentData.data.title.more_url.action]]" data-field="title.more_url.action">
[[layout action_template]]
</select>
</div>
<div class="col-sm-6">
<label>跳转地址:</label>
<input type="text" class="form-control input-form observe" placeholder="跳转地址" value="[[contentData.data.title.more_url.url]]" data-field="title.more_url.url">
</div>
</div>
<ul class="draggable" data-array="data.list">
[[each contentData.data.list as item index]]
<li>
<table class="table table-hover table-bordered responsive dataTable no-footer">
<tbody>
<tr>
<td align="center">[[index+1]]</td>
<td align="center"><input type="file" name="file" value="[[item.src]]" class="observe" data-field="list.[[index]].src" required/></td>
<td>
<div class="form-group">
<div class="col-sm-10">
<select name="goTo" class="observe form-control" value="[[item.url.action]]" data-field="list.[[index]].url.action">
[[layout action_template]]
</select>
</div>
</div>
<div class="form-group">
<div class="col-sm-10">
<input type="text" placeholder="url" value="[[item.url.url]]" class="observe form-control" data-field="list.[[index]].url.url"/>
</div>
</div>
</td>
</tr>
</tbody>
</table>
</li>
[[/each]]
</ul>
</script>
\ No newline at end of file
... ...
... ... @@ -431,4 +431,20 @@
<img style="height: 50%;width: 100%" src="[[module.contentData.data.list[3].src]]">
</div>
</div>
</div>
[[else if module.contentData.template_name=='livePicture']]
<div class="offCodeArea">
<div class="recommend-info">
[[if module.contentData.data.title.name]]
<p class="title">[[module.contentData.data.title.name]]<a class="more" href="#">[[module.contentData.data.title.more_name]]</a></p>
[[/if]]
<p class="big-pic"><img src="[[module.contentData.data.list[0].src]]"></p>
<div class="col-sm-6 matchImage" style="padding-left: 3px">
<img src="[[module.contentData.data.list[1].src]]">
</div>
<div class="col-sm-6 matchImage">
<img style="height: 50%;width: 100%" src="[[module.contentData.data.list[2].src]]">
</div>
</div>
</div>
\ No newline at end of file
... ...