Merge branch 'master' into release/1.6
# Conflicts: # client/package.json
Showing
15 changed files
with
108 additions
and
8 deletions
| @@ -7,10 +7,11 @@ var edit=require('../common/edit'); | @@ -7,10 +7,11 @@ var edit=require('../common/edit'); | ||
| 7 | //brandTonality | 7 | //brandTonality |
| 8 | e.on("validate",function(){ | 8 | e.on("validate",function(){ |
| 9 | var num=$.trim($("#brandTonality").val()); | 9 | var num=$.trim($("#brandTonality").val()); |
| 10 | + if(num){ | ||
| 10 | if(+num>100||+num<1){ | 11 | if(+num>100||+num<1){ |
| 11 | return "调性指数（范围：1-100）"; | 12 | return "调性指数（范围：1-100）"; |
| 12 | } | 13 | } |
| 13 | - | 14 | + } |
| 14 | return true; | 15 | return true; |
| 15 | }); | 16 | }); |
| 16 | e.init(); | 17 | e.init(); |
| @@ -70,6 +70,7 @@ var $ = require('jquery'), | @@ -70,6 +70,7 @@ var $ = require('jquery'), | ||
| 70 | detailtoast:function(obj) { | 70 | detailtoast:function(obj) { |
| 71 | common.dialog({ | 71 | common.dialog({ |
| 72 | title:"商品池详情", | 72 | title:"商品池详情", |
| 73 | + width:"80%", | ||
| 73 | content:'<div id="faGrid" style="height: 600px;overflow:auto;"></div>', | 74 | content:'<div id="faGrid" style="height: 600px;overflow:auto;"></div>', |
| 74 | button:[{value:"添加", callback:function() { | 75 | button:[{value:"添加", callback:function() { |
| 75 | var e = new common.edit("#base-form"); | 76 | var e = new common.edit("#base-form"); |
| @@ -106,7 +107,7 @@ var $ = require('jquery'), | @@ -106,7 +107,7 @@ var $ = require('jquery'), | ||
| 106 | columns:[ | 107 | columns:[ |
| 107 | {display:"ID", name:"id"}, | 108 | {display:"ID", name:"id"}, |
| 108 | {display:"SKN",name:"productskn"}, | 109 | {display:"SKN",name:"productskn"}, |
| 109 | - {display:"名称", name:""}, | 110 | + {display:"名称", name:"productName"}, |
| 110 | {display:'品牌', name: "brandName"}, | 111 | {display:'品牌', name: "brandName"}, |
| 111 | {display: '分类',name: "sortName"}, | 112 | {display: '分类',name: "sortName"}, |
| 112 | {display: '操作', name: "", render: function(item) { | 113 | {display: '操作', name: "", render: function(item) { |
client/js/resource/content.js
0 → 100644
client/package.json
0 → 100644
| 1 | + | ||
| 2 | +{ | ||
| 3 | + "name": "yohobuy-portal", | ||
| 4 | + "version": "0.3.4", | ||
| 5 | + "description": "yohobuy-portal", | ||
| 6 | + "keywords": [], | ||
| 7 | + "homepage": "", | ||
| 8 | + "author": "demo", | ||
| 9 | + "repository": { | ||
| 10 | + "type": "git", | ||
| 11 | + "url": "" | ||
| 12 | + }, | ||
| 13 | + "spm": { | ||
| 14 | + "main": "index.js", | ||
| 15 | + "dependencies": { | ||
| 16 | + "jquery": "2.1.4", | ||
| 17 | + "import-style": "1.0.0", | ||
| 18 | + "yoho.handlebars": "3.0.3", | ||
| 19 | + "yoho.bootstrap": "0.0.4" | ||
| 20 | + }, | ||
| 21 | + "devDependencies": { | ||
| 22 | + "expect.js": "0.3.1" | ||
| 23 | + }, | ||
| 24 | + "buildArgs": "--idleading {{name}}" | ||
| 25 | + }, | ||
| 26 | + "devDependencies": { | ||
| 27 | + "crypto": "0.0.3", | ||
| 28 | + "extract-text-webpack-plugin": "^1.0.1", | ||
| 29 | + "gulp": "^3.9.1", | ||
| 30 | + "gulp-autoprefixer": "^3.1.0", | ||
| 31 | + "gulp-clean": "^0.3.1", | ||
| 32 | + "gulp-concat": "^2.6.0", | ||
| 33 | + "gulp-develop-server": "^0.5.0", | ||
| 34 | + "gulp-ftp": "^1.1.0", | ||
| 35 | + "gulp-md5": "^0.1.2", | ||
| 36 | + "gulp-minify-css": "^1.2.4", | ||
| 37 | + "gulp-plumber": "^1.1.0", | ||
| 38 | + "gulp-rename": "^1.2.2", | ||
| 39 | + "gulp-sass": "^2.0.4", | ||
| 40 | + "gulp-uglify": "^1.5.2", | ||
| 41 | + "gulp-util": "^3.0.7", | ||
| 42 | + "webpack": "^1.12.13" | ||
| 43 | + }, | ||
| 44 | + "scripts": { | ||
| 45 | + "test": "spm test", | ||
| 46 | + "build": "spm build" | ||
| 47 | + }, | ||
| 48 | + "main": "app.js", | ||
| 49 | + "directories": { | ||
| 50 | + "example": "examples", | ||
| 51 | + "test": "tests" | ||
| 52 | + }, | ||
| 53 | + "license": "ISC" | ||
| 54 | +} |
public/img/excel.png
0 → 100644
2.87 KB
| @@ -524,7 +524,7 @@ exports.res = [{ | @@ -524,7 +524,7 @@ exports.res = [{ | ||
| 524 | bottons: '{"edit":true,"columnsHidisFr":true}', | 524 | bottons: '{"edit":true,"columnsHidisFr":true}', |
| 525 | gridurl: '/goods/price/list', | 525 | gridurl: '/goods/price/list', |
| 526 | domain: exports.domain, | 526 | domain: exports.domain, |
| 527 | - download: '/common/batchUpdatePrice.xlsx' | 527 | + download: 'batchUpdatePrice' |
| 528 | } | 528 | } |
| 529 | }, { | 529 | }, { |
| 530 | //代销变价 -> 列表数据 | 530 | //代销变价 -> 列表数据 |
| @@ -640,7 +640,7 @@ exports.res = [{ | @@ -640,7 +640,7 @@ exports.res = [{ | ||
| 640 | bottons: '{"edit":true,"columnsHidisFr":true}', | 640 | bottons: '{"edit":true,"columnsHidisFr":true}', |
| 641 | gridurl: '/goods/brandCooperation/list', | 641 | gridurl: '/goods/brandCooperation/list', |
| 642 | domain: exports.domain, | 642 | domain: exports.domain, |
| 643 | - download: '/common/brandCooperation.xlsx' | 643 | + download: 'brandCooperation' |
| 644 | } | 644 | } |
| 645 | }, { | 645 | }, { |
| 646 | //品牌合作模式 -> 列表数据 | 646 | //品牌合作模式 -> 列表数据 |
server/interface/resource.js
0 → 100644
| 1 | +exports.domain =require('../config/common.js').domain; | ||
| 2 | +// exports.domain="http://172.16.6.240:8088/platform"; | ||
| 3 | +// exports.domain = "http://172.16.6.227:8088/platform"; | ||
| 4 | +exports.res = [ | ||
| 5 | + {//基础商品列表 | ||
| 6 | + route:'/resource/manager/content', | ||
| 7 | + method:'GET', | ||
| 8 | + view:'pages/resource/content', | ||
| 9 | + src: '/resource/content' | ||
| 10 | + } | ||
| 11 | +] |
| 1 | -exports.staticDir = {"test":{"path":"/dist"},"preview":{"path":"http://cdn.yoho.cn/yohobuy-portal/0.3.2","md5":""},"production":{"path":"http://cdn.yoho.cn/yohobuy-portal/0.3.2","md5":""}} | ||
| 1 | +exports.staticDir = {"test":{"path":"/dist"},"preview":{"path":"http://cdn.yoho.cn/yohobuy-portal/0.3.4","md5":""},"production":{"path":"http://cdn.yoho.cn/yohobuy-portal/0.3.4","md5":""}} |
| @@ -2,6 +2,7 @@ var authService = require('../service/auth'); | @@ -2,6 +2,7 @@ var authService = require('../service/auth'); | ||
| 2 | var uploader=require('../service/upload'); | 2 | var uploader=require('../service/upload'); |
| 3 | var down=require('../service/down'); | 3 | var down=require('../service/down'); |
| 4 | var ueditor=require('../service/ueditor'); | 4 | var ueditor=require('../service/ueditor'); |
| 5 | +var link=require('../service/link'); | ||
| 5 | 6 | ||
| 6 | module.exports = { | 7 | module.exports = { |
| 7 | '/auth_bak':function(req, res){ | 8 | '/auth_bak':function(req, res){ |
| @@ -81,5 +82,8 @@ module.exports = { | @@ -81,5 +82,8 @@ module.exports = { | ||
| 81 | }, | 82 | }, |
| 82 | '/ajax/ueditor':function(req,res){ | 83 | '/ajax/ueditor':function(req,res){ |
| 83 | ueditor.uploadFile(req,res); | 84 | ueditor.uploadFile(req,res); |
| 85 | + }, | ||
| 86 | + '/ajax/link/:name':function(req,res){ | ||
| 87 | + link.linkFile(req,res); | ||
| 84 | } | 88 | } |
| 85 | } | 89 | } |
server/stub/service/link.js
0 → 100644
| 1 | +var request = require('request'); | ||
| 2 | +var _ = require('lodash'); | ||
| 3 | +var fs = require('fs'); | ||
| 4 | +var path=require('path'); | ||
| 5 | +var domain = require('../../config/common.js').domain; | ||
| 6 | + | ||
| 7 | +exports.linkFile = function(req, res) { | ||
| 8 | + request.get(domain+"/common/"+req.params.name+".xlsx").pipe(res); | ||
| 9 | +} |
| @@ -222,7 +222,7 @@ | @@ -222,7 +222,7 @@ | ||
| 222 | </div> | 222 | </div> |
| 223 | 223 | ||
| 224 | <div class="form-group"> | 224 | <div class="form-group"> |
| 225 | - <label class="col-sm-2 control-label">调性指数<span class="red">*</span></label> | 225 | + <label class="col-sm-2 control-label">调性指数</label> |
| 226 | <div class="col-sm-2"> | 226 | <div class="col-sm-2"> |
| 227 | <input type="number" id="brandTonality" name="brandTonality" class="form-control" placeholder="调性指数（范围：1-100）" value="{{brandTonality}}"> | 227 | <input type="number" id="brandTonality" name="brandTonality" class="form-control" placeholder="调性指数（范围：1-100）" value="{{brandTonality}}"> |
| 228 | </div> | 228 | </div> |
| @@ -165,7 +165,7 @@ | @@ -165,7 +165,7 @@ | ||
| 165 | <input id="upload-input" name="file" class="btn btn-default excel-upload" type="file"> | 165 | <input id="upload-input" name="file" class="btn btn-default excel-upload" type="file"> |
| 166 | </span> | 166 | </span> |
| 167 | 167 | ||
| 168 | - <a class="excel-model" href="{{domain}}{{download}}">表头下载</a> | 168 | + <a class="excel-model" href="/ajax/link/{{download}}">表头下载</a> |
| 169 | <input id="sure-change" class="btn btn-primary" type="button" value="确定变价"> | 169 | <input id="sure-change" class="btn btn-primary" type="button" value="确定变价"> |
| 170 | 170 | ||
| 171 | </div> | 171 | </div> |
| @@ -67,6 +67,7 @@ | @@ -67,6 +67,7 @@ | ||
| 67 | <option value="2">SKU</option> | 67 | <option value="2">SKU</option> |
| 68 | <option value="3">SKC</option> | 68 | <option value="3">SKC</option> |
| 69 | </select> | 69 | </select> |
| 70 | + <font color="red">要导入的数据类型必须和所选类型相同</font> | ||
| 70 | </div> | 71 | </div> |
| 71 | </div> | 72 | </div> |
| 72 | <div class="form-group"> | 73 | <div class="form-group"> |
server/views/pages/resource/content.html
0 → 100644
| 1 | +<div class="pageheader"> | ||
| 2 | + <div class="media"> | ||
| 3 | + <div class="pageicon pull-left"> | ||
| 4 | + <i class="fa fa-home"></i> | ||
| 5 | + </div> | ||
| 6 | + <div class="media-body"> | ||
| 7 | + <ul class="breadcrumb"> | ||
| 8 | + <li><a href="/"><i class="glyphicon glyphicon-home"></i></a></li> | ||
| 9 | + <li>Dashboard</li> | ||
| 10 | + </ul> | ||
| 11 | + <h4>Dashboard</h4> | ||
| 12 | + </div> | ||
| 13 | + </div> | ||
| 14 | +</div> | ||
| 15 | +<div class="contentpanel"> | ||
| 16 | + <div class="rows"> | ||
| 17 | + | ||
| 18 | + </div> | ||
| 19 | +</div> |
| @@ -42,7 +42,7 @@ | @@ -42,7 +42,7 @@ | ||
| 42 | <div class="form-group"> | 42 | <div class="form-group"> |
| 43 | <label class="col-sm-2 control-label">营业执照号 <span class="red">*</span></label> | 43 | <label class="col-sm-2 control-label">营业执照号 <span class="red">*</span></label> |
| 44 | <div class="col-sm-8"> | 44 | <div class="col-sm-8"> |
| 45 | - <input type="number" id="supplierCode" placeholder="营业执照号" class="form-control" required value="{{supplierCode}}"> | 45 | + <input type="text" id="supplierCode" placeholder="营业执照号" class="form-control" required value="{{supplierCode}}"> |
| 46 | </div> | 46 | </div> |
| 47 | </div> | 47 | </div> |
| 48 | 48 |
-
Please register or login to post a comment