Authored by weiqingting

分支切换

@@ -13,7 +13,8 @@ var config = { @@ -13,7 +13,8 @@ var config = {
13 redis: null, 13 redis: null,
14 apiKey: 'sd4H1ecAqlp', 14 apiKey: 'sd4H1ecAqlp',
15 port: 30016, 15 port: 30016,
16 - domain: 'http://192.168.102.210:8088/platform', 16 + // domain: 'http://192.168.102.210:8088/platform',
  17 + domain: 'http://192.168.102.202:8088/platform',
17 loggers: { 18 loggers: {
18 api: { 19 api: {
19 level: 'verbose', 20 level: 'verbose',
@@ -181,11 +181,6 @@ exports.res = [ @@ -181,11 +181,6 @@ exports.res = [
181 type: 'number' 181 type: 'number'
182 }] 182 }]
183 }, { 183 }, {
184 - //类目tree  
185 - route: '/product/class/queryAllProductSortList',  
186 - method: 'POST',  
187 - url: '/product/class/queryAllProductSortList'  
188 - }, {  
189 //商品管理【ajax查询所有品类】 184 //商品管理【ajax查询所有品类】
190 route: '/product/class/queryAllProductSortList', 185 route: '/product/class/queryAllProductSortList',
191 method: 'POST', 186 method: 'POST',
@@ -53,6 +53,7 @@ exports.uploadFile = function (req, res) { @@ -53,6 +53,7 @@ exports.uploadFile = function (req, res) {
53 53
54 if (req.body.__type == "batch-import") { 54 if (req.body.__type == "batch-import") {
55 req.body.file = fs.createReadStream(req.files[req.body.filename].path); 55 req.body.file = fs.createReadStream(req.files[req.body.filename].path);
  56 + console.log(domain + '/batch/import?' + url.join("&"))
56 request.post({ 57 request.post({
57 url: domain + '/batch/import?' + url.join("&"), 58 url: domain + '/batch/import?' + url.join("&"),
58 formData: req.body, 59 formData: req.body,
@@ -29,13 +29,6 @@ @@ -29,13 +29,6 @@
29 <option value="-1">选择品牌</option> 29 <option value="-1">选择品牌</option>
30 </select> 30 </select>
31 </div> 31 </div>
32 -  
33 - <!-- <label class="col-sm-1 control-label">管理店铺 </label>  
34 - <div class="col-sm-2">  
35 - <select id="shopId" class="form-control">  
36 - <option value="-1">选择店铺</option>  
37 - </select>  
38 - </div> -->  
39 32
40 <label class="col-sm-1 control-label">JIT供应商</label> 33 <label class="col-sm-1 control-label">JIT供应商</label>
41 <div class="col-sm-2"> 34 <div class="col-sm-2">