liuloulou / yohobuy-portal-fe2 · Commits

Go to a project

Authored by ping
Commit 8ea170df1f9b986b8fd2966ab39fc05b43b21034 2 parents df0bf02e 511211d4

Merge branch 'master' into grey

Inline Side-by-side
Showing 5 changed files with 14 additions and 10 deletions
1 { 1 {
2 "name": "yohobuy-portal-fe", 2 "name": "yohobuy-portal-fe",
3 - "version": "4.9.6", 3 + "version": "4.9.7",
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": {
1 -{"name":"yohobuy-portal-fe","version":"4.9.6","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.7","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"}}
@@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
52 52
53 <div class="panel-col"> 53 <div class="panel-col">
54 <select id="appType" class="form-control"> 54 <select id="appType" class="form-control">
55 - <option value="-1">是否BLK商品</option> 55 + <option value="-1">是否BLK资讯</option>
56 <option value="1">是BLK</option> 56 <option value="1">是BLK</option>
57 <option value="0">非BLK</option> 57 <option value="0">非BLK</option>
58 </select> 58 </select>
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 <div class="form-group"> 37 <div class="form-group">
38 <label class="col-sm-1 control-label">英文名称</label> 38 <label class="col-sm-1 control-label">英文名称</label>
39 <div class="col-sm-9"> 39 <div class="col-sm-9">
40 - <input type="text" value="[[sortNameEn]]" class="form-control observe" data-field="sortNameEn" placeholder="英文名称" required> 40 + <input type="text" value="[[sortNameEn]]" class="form-control observe" data-field="sortNameEn" placeholder="英文名称">
41 </div> 41 </div>
42 </div><!-- form-group --> 42 </div><!-- form-group -->
43 <div class="form-group"> 43 <div class="form-group">
@@ -439,12 +439,16 @@ @@ -439,12 +439,16 @@
439 <p class="title">[[module.contentData.data.title.name]]<a class="more" href="#">[[module.contentData.data.title.more_name]]</a></p> 439 <p class="title">[[module.contentData.data.title.name]]<a class="more" href="#">[[module.contentData.data.title.more_name]]</a></p>
440 [[/if]] 440 [[/if]]
441 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]]"> 442 + <div>
  443 + <div class="col-sm-4 matchImage">
  444 + <img src="[[module.contentData.data.list[0].src]]">
  445 + </div>
  446 + <div class="col-sm-4 matchImage">
  447 + <img src="[[module.contentData.data.list[1].src]]">
  448 + </div>
  449 + <div class="col-sm-4 matchImage">
  450 + <img src="[[module.contentData.data.list[2].src]]">
  451 + </div>
448 </div> 452 </div>
449 </div> 453 </div>
450 </div> 454 </div>