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 100 additions and 18 deletions
1 { 1 {
2 "name": "yohobuy-portal-fe", 2 "name": "yohobuy-portal-fe",
3 - "version": "4.9.3", 3 + "version": "4.9.4",
4 "description": "Construction of the presentation layer solution is based on express, handlebars", 4 "description": "Construction of the presentation layer solution is based on express, handlebars",
5 "main": "app.js", 5 "main": "app.js",
6 "scripts": { 6 "scripts": {
@@ -24,7 +24,8 @@ module.exports={ @@ -24,7 +24,8 @@ module.exports={
24 {name: 'supplierId', type: 'Number'}, 24 {name: 'supplierId', type: 'Number'},
25 {name: 'isAuditing', type: 'Number'}, 25 {name: 'isAuditing', type: 'Number'},
26 {name: 'founderName', type: 'String'}, 26 {name: 'founderName', type: 'String'},
27 - {name:'factoryCode',type:'String'} 27 + {name:'factoryCode',type:'String'},
  28 + {name:'appType',type:'Number'}
28 ] 29 ]
29 }, 30 },
30 getBaseProductList:{ 31 getBaseProductList:{
@@ -17,6 +17,7 @@ module.exports={ @@ -17,6 +17,7 @@ module.exports={
17 {name: 'orderBy', type: 'String'}, 17 {name: 'orderBy', type: 'String'},
18 {name: 'startTime', type: 'String'}, 18 {name: 'startTime', type: 'String'},
19 {name: 'endTime', type: 'String'}, 19 {name: 'endTime', type: 'String'},
  20 + {name: 'appType', type: 'Number'},
20 {name: 'page', type: 'Number'}, 21 {name: 'page', type: 'Number'},
21 {name: 'size', type: 'Number'} 22 {name: 'size', type: 'Number'}
22 ] 23 ]
1 -{"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"}}  
  1 +{"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"}}
@@ -45,16 +45,6 @@ @@ -45,16 +45,6 @@
45 </div> 45 </div>
46 46
47 <div class="form-group"> 47 <div class="form-group">
48 - <label for="advertCode" class="col-sm-2 control-label">是否BLK：</label>  
49 - <div class="col-sm-10">  
50 - <select class="form-control" id="appType" value="[[appType]]">  
51 - <option value="0">否</option>  
52 - <option value="1">是</option>  
53 - </select>  
54 - </div>  
55 - </div>  
56 -  
57 - <div class="form-group">  
58 <label for="status" class="col-sm-2 control-label" style="margin-top: 10px">是否启用：</label> 48 <label for="status" class="col-sm-2 control-label" style="margin-top: 10px">是否启用：</label>
59 <div class="col-sm-10 radio"> 49 <div class="col-sm-10 radio">
60 <label><input type="radio" value="1" name="status" kl_vkbd_parsed="true">开启</label> 50 <label><input type="radio" value="1" name="status" kl_vkbd_parsed="true">开启</label>
@@ -63,3 +53,15 @@ @@ -63,3 +53,15 @@
63 <input id="status" type="hidden" value="[[status]]" for="radio" kl_vkbd_parsed="true"> 53 <input id="status" type="hidden" value="[[status]]" for="radio" kl_vkbd_parsed="true">
64 </div> 54 </div>
65 </script> 55 </script>
  56 +
  57 +
  58 +
  59 +<!-- <div class="form-group">
  60 + <label for="advertCode" class="col-sm-2 control-label">是否BLK：</label>
  61 + <div class="col-sm-10">
  62 + <select class="form-control" id="appType" value="[[appType]]">
  63 + <option value="0">否</option>
  64 + <option value="1">是</option>
  65 + </select>
  66 + </div>
  67 + </div>-->
@@ -51,6 +51,14 @@ @@ -51,6 +51,14 @@
51 </div> 51 </div>
52 52
53 <div class="panel-col"> 53 <div class="panel-col">
  54 + <select id="appType" class="form-control">
  55 + <option value="-1">是否BLK商品</option>
  56 + <option value="1">是BLK</option>
  57 + <option value="0">非BLK</option>
  58 + </select>
  59 + </div>
  60 +
  61 + <div class="panel-col">
54 <input type="text" id="starttime" class="form-control panel-input hasDatepicker" name="start_time" 62 <input type="text" id="starttime" class="form-control panel-input hasDatepicker" name="start_time"
55 placeholder="开始时间" value="" kl_vkbd_parsed="true"> 63 placeholder="开始时间" value="" kl_vkbd_parsed="true">
56 </div> 64 </div>
@@ -143,9 +143,9 @@ @@ -143,9 +143,9 @@
143 <div class="form-inline"> 143 <div class="form-inline">
144 <div class="form-group" id="resultdiscount"> 144 <div class="form-group" id="resultdiscount">
145 打 145 打
146 - <input type="text" class="form-control observe" placeholder="0.00" 146 + <input type="text" class="form-control observe" placeholder="优惠结果,格式:0.0"
147 id="discount" 147 id="discount"
148 - value="[[discount]]" required pattern="^0(.\d{1,2})?$" 148 + value="[[discount]]" required pattern="^\d(.\d{1,1})?$"
149 data-field="discount"> 149 data-field="discount">
150 折, 150 折,
151 </div> 151 </div>
@@ -58,9 +58,9 @@ @@ -58,9 +58,9 @@
58 <option value="2">个人中心</option> 58 <option value="2">个人中心</option>
59 <option value="3">社区首页</option> 59 <option value="3">社区首页</option>
60 <option value="4">复古市集会</option> 60 <option value="4">复古市集会</option>
61 - <option value="5">SNEAKER</option>  
62 - <option value="6">YOHO</option>  
63 - <option value="7">SHOW</option> 61 + <option value="5">聚焦潮鞋</option>
  62 + <option value="6">爱享潮物</option>
  63 + <option value="7">潮人自曝</option>
64 </select> 64 </select>
65 </div> 65 </div>
66 <div id="showchannel" class="col-sm-5"> 66 <div id="showchannel" class="col-sm-5">
@@ -1588,3 +1588,57 @@ @@ -1588,3 +1588,57 @@
1588 </div> 1588 </div>
1589 </div> 1589 </div>
1590 </script> 1590 </script>
  1591 +
  1592 +<!-- APP直播 -->
  1593 +<script type="text/template" id="livePicture-template">
  1594 + <div class="form-group">
  1595 + <div class="col-sm-6">
  1596 + <label>标题:</label>&emsp;&emsp;
  1597 + <input type="text" class="form-control input-form observe" placeholder="标题" value="[[contentData.data.title.name]]" data-field="title.name">
  1598 + </div>
  1599 + <div class="col-sm-6">
  1600 + <label>更多名称:</label>
  1601 + <input type="text" class="form-control input-form observe" placeholder="更多名称" value="[[contentData.data.title.more_name]]" data-field="title.more_name">
  1602 + </div>
  1603 + </div>
  1604 + <div class="form-group">
  1605 + <div class="col-sm-6">
  1606 + <label>跳转目的:</label>
  1607 + <select name="goTo" class="observe form-control input-form" value="[[contentData.data.title.more_url.action]]" data-field="title.more_url.action">
  1608 + [[layout action_template]]
  1609 + </select>
  1610 + </div>
  1611 + <div class="col-sm-6">
  1612 + <label>跳转地址:</label>
  1613 + <input type="text" class="form-control input-form observe" placeholder="跳转地址" value="[[contentData.data.title.more_url.url]]" data-field="title.more_url.url">
  1614 + </div>
  1615 + </div>
  1616 + <ul class="draggable" data-array="data.list">
  1617 + [[each contentData.data.list as item index]]
  1618 + <li>
  1619 + <table class="table table-hover table-bordered responsive dataTable no-footer">
  1620 + <tbody>
  1621 + <tr>
  1622 + <td align="center">[[index+1]]</td>
  1623 + <td align="center"><input type="file" name="file" value="[[item.src]]" class="observe" data-field="list.[[index]].src" required/></td>
  1624 + <td>
  1625 + <div class="form-group">
  1626 + <div class="col-sm-10">
  1627 + <select name="goTo" class="observe form-control" value="[[item.url.action]]" data-field="list.[[index]].url.action">
  1628 + [[layout action_template]]
  1629 + </select>
  1630 + </div>
  1631 + </div>
  1632 + <div class="form-group">
  1633 + <div class="col-sm-10">
  1634 + <input type="text" placeholder="url" value="[[item.url.url]]" class="observe form-control" data-field="list.[[index]].url.url"/>
  1635 + </div>
  1636 + </div>
  1637 + </td>
  1638 + </tr>
  1639 + </tbody>
  1640 + </table>
  1641 + </li>
  1642 + [[/each]]
  1643 + </ul>
  1644 +</script>
@@ -432,3 +432,19 @@ @@ -432,3 +432,19 @@
432 </div> 432 </div>
433 </div> 433 </div>
434 </div> 434 </div>
  435 +[[else if module.contentData.template_name=='livePicture']]
  436 +<div class="offCodeArea">
  437 + <div class="recommend-info">
  438 + [[if module.contentData.data.title.name]]
  439 + <p class="title">[[module.contentData.data.title.name]]<a class="more" href="#">[[module.contentData.data.title.more_name]]</a></p>
  440 + [[/if]]
  441 +
  442 + <p class="big-pic"><img src="[[module.contentData.data.list[0].src]]"></p>
  443 + <div class="col-sm-6 matchImage" style="padding-left: 3px">
  444 + <img src="[[module.contentData.data.list[1].src]]">
  445 + </div>
  446 + <div class="col-sm-6 matchImage">
  447 + <img style="height: 50%;width: 100%" src="[[module.contentData.data.list[2].src]]">
  448 + </div>
  449 + </div>
  450 +</div>