fe / yohobuy-portal-fe · Commits

Go to a project

Authored by weiqingting
Commit 0c76c2c12d69f066e0e4943010e50412b618dcd5 2 parents 2cd784c3 a6536229

Merge branch 'master' into release/1.6 

# Conflicts:
#	client/package.json
Inline Side-by-side
Showing 15 changed files with 108 additions and 8 deletions
... ... @@ -7,10 +7,11 @@ var edit=require('../common/edit');
//brandTonality
e.on("validate",function(){
var num=$.trim($("#brandTonality").val());
if(num){
if(+num>100||+num<1){
return "调性指数（范围：1-100）";
}
}
return true;
});
e.init();
... ...
... ... @@ -70,6 +70,7 @@ var $ = require('jquery'),
detailtoast:function(obj) {
common.dialog({
title:"商品池详情",
width:"80%",
content:'<div id="faGrid" style="height: 600px;overflow:auto;"></div>',
button:[{value:"添加", callback:function() {
var e = new common.edit("#base-form");
... ... @@ -106,7 +107,7 @@ var $ = require('jquery'),
columns:[
{display:"ID", name:"id"},
{display:"SKN",name:"productskn"},
{display:"名称", name:""},
{display:"名称", name:"productName"},
{display:'品牌', name: "brandName"},
{display: '分类',name: "sortName"},
{display: '操作', name: "", render: function(item) {
... ...
{
"name": "yohobuy-portal",
"version": "0.3.4",
"description": "yohobuy-portal",
"keywords": [],
"homepage": "",
"author": "demo",
"repository": {
"type": "git",
"url": ""
},
"spm": {
"main": "index.js",
"dependencies": {
"jquery": "2.1.4",
"import-style": "1.0.0",
"yoho.handlebars": "3.0.3",
"yoho.bootstrap": "0.0.4"
},
"devDependencies": {
"expect.js": "0.3.1"
},
"buildArgs": "--idleading {{name}}"
},
"devDependencies": {
"crypto": "0.0.3",
"extract-text-webpack-plugin": "^1.0.1",
"gulp": "^3.9.1",
"gulp-autoprefixer": "^3.1.0",
"gulp-clean": "^0.3.1",
"gulp-concat": "^2.6.0",
"gulp-develop-server": "^0.5.0",
"gulp-ftp": "^1.1.0",
"gulp-md5": "^0.1.2",
"gulp-minify-css": "^1.2.4",
"gulp-plumber": "^1.1.0",
"gulp-rename": "^1.2.2",
"gulp-sass": "^2.0.4",
"gulp-uglify": "^1.5.2",
"gulp-util": "^3.0.7",
"webpack": "^1.12.13"
},
"scripts": {
"test": "spm test",
"build": "spm build"
},
"main": "app.js",
"directories": {
"example": "examples",
"test": "tests"
},
"license": "ISC"
}
... ...
... ... @@ -524,7 +524,7 @@ exports.res = [{
bottons: '{"edit":true,"columnsHidisFr":true}',
gridurl: '/goods/price/list',
domain: exports.domain,
download: '/common/batchUpdatePrice.xlsx'
download: 'batchUpdatePrice'
}
}, {
//代销变价 -> 列表数据
... ... @@ -640,7 +640,7 @@ exports.res = [{
bottons: '{"edit":true,"columnsHidisFr":true}',
gridurl: '/goods/brandCooperation/list',
domain: exports.domain,
download: '/common/brandCooperation.xlsx'
download: 'brandCooperation'
}
}, {
//品牌合作模式 -> 列表数据
... ...
exports.domain =require('../config/common.js').domain;
// exports.domain="http://172.16.6.240:8088/platform";
// exports.domain = "http://172.16.6.227:8088/platform";
exports.res = [
{//基础商品列表
route:'/resource/manager/content',
method:'GET',
view:'pages/resource/content',
src: '/resource/content'
}
]
\ No newline at end of file
... ...
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":""}}
\ No newline at end of file
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":""}}
\ No newline at end of file
... ...
... ... @@ -2,6 +2,7 @@ var authService = require('../service/auth');
var uploader=require('../service/upload');
var down=require('../service/down');
var ueditor=require('../service/ueditor');
var link=require('../service/link');
module.exports = {
'/auth_bak':function(req, res){
... ... @@ -81,5 +82,8 @@ module.exports = {
},
'/ajax/ueditor':function(req,res){
ueditor.uploadFile(req,res);
},
'/ajax/link/:name':function(req,res){
link.linkFile(req,res);
}
}
\ No newline at end of file
... ...
var request = require('request');
var _ = require('lodash');
var fs = require('fs');
var path=require('path');
var domain = require('../../config/common.js').domain;
exports.linkFile = function(req, res) {
request.get(domain+"/common/"+req.params.name+".xlsx").pipe(res);
}
\ No newline at end of file
... ...
... ... @@ -222,7 +222,7 @@
</div>
<div class="form-group">
<label class="col-sm-2 control-label">调性指数<span class="red">*</span></label>
<label class="col-sm-2 control-label">调性指数</label>
<div class="col-sm-2">
<input type="number" id="brandTonality" name="brandTonality" class="form-control" placeholder="调性指数（范围：1-100）" value="{{brandTonality}}">
</div>
... ...
... ... @@ -165,7 +165,7 @@
<input id="upload-input" name="file" class="btn btn-default excel-upload" type="file">
</span>
<a class="excel-model" href="{{domain}}{{download}}">表头下载</a>
<a class="excel-model" href="/ajax/link/{{download}}">表头下载</a>
<input id="sure-change" class="btn btn-primary" type="button" value="确定变价">
</div>
... ...
... ... @@ -67,6 +67,7 @@
<option value="2">SKU</option>
<option value="3">SKC</option>
</select>
<font color="red">要导入的数据类型必须和所选类型相同</font>
</div>
</div>
<div class="form-group">
... ...
<div class="pageheader">
<div class="media">
<div class="pageicon pull-left">
<i class="fa fa-home"></i>
</div>
<div class="media-body">
<ul class="breadcrumb">
<li><a href="/"><i class="glyphicon glyphicon-home"></i></a></li>
<li>Dashboard</li>
</ul>
<h4>Dashboard</h4>
</div>
</div>
</div>
<div class="contentpanel">
<div class="rows">
</div>
</div>
\ No newline at end of file
... ...
... ... @@ -42,7 +42,7 @@
<div class="form-group">
<label class="col-sm-2 control-label">营业执照号 <span class="red">*</span></label>
<div class="col-sm-8">
<input type="number" id="supplierCode" placeholder="营业执照号" class="form-control" required value="{{supplierCode}}">
<input type="text" id="supplierCode" placeholder="营业执照号" class="form-control" required value="{{supplierCode}}">
</div>
</div>
... ...