product冲突解决

@@ -12,8 +12,8 @@ const mRoot = '../models';
 const detail = require(`${mRoot}/detail`);
 const detail = require(`${mRoot}/detail`);
 
 
 exports.index = (req, res) => {
 exports.index = (req, res) => {
-	                                                                                var uid = null, // 需要修改为正式取 UID 的方式
-		                                                                                vipLevel = 0;// 用户等级
+    var uid = null, // 需要修改为正式取 UID 的方式
+        vipLevel = 0; // 用户等级
 
 
     detail({
     detail({
         id: req.params.id,
         id: req.params.id,

@@ -7,13 +7,12 @@
 'use strict';
 'use strict';
 
 
 const library = '../../../library';
 const library = '../../../library';
-const API = require(`${library}/api`).API;
+const API = require(`${library}/api`).ServiceAPI;
 const sign = require(`${library}/sign`);
 const sign = require(`${library}/sign`);
 const _ = require('lodash');
 const _ = require('lodash');
-const HELPERS = require(`${library}/helpers`);
+const helpers = require(`${library}/helpers`);
 
 
 var api = new API();
 var api = new API();
-var helpers = new HELPERS();
 
 
 /**
 /**
  * 处理品牌关联店铺信息
  * 处理品牌关联店铺信息
@@ -25,7 +24,7 @@ const getShopsInfo = (data) => {
 
 
     _.forEach(data, function(value, key) {
     _.forEach(data, function(value, key) {
         enterStore[key] = {};
         enterStore[key] = {};
-        enterStore[key].img = helpers.getImageUrl(value.brand_ico, 47, 47);
+        enterStore[key].img = value.brand_ico;
         enterStore[key].storeName = value.brand_name;
         enterStore[key].storeName = value.brand_name;
 
 
         if (value.shop_id !== null && value.shop_id !== undefined) {
         if (value.shop_id !== null && value.shop_id !== undefined) {
@@ -276,12 +275,6 @@ const detailDataPkg = (origin, uid, vipLevel, ua) => {
     // 品牌信息
     // 品牌信息
     if (origin.brand !== null && origin.brand !== undefined) {
     if (origin.brand !== null && origin.brand !== undefined) {
 
 
-        // dest.enterStore[0] = {};
-        // dest.enterStore[0].img =
-        //     helpers.getImageUrl(origin.brand.brandIco, 47, 47);
-        // dest.enterStore[0].storeName = origin.brand.brandName;
-        // dest.enterStore[0].url = helpers.url('', null, origin.brand.brandDomain);
-
         // 为你优选的链接
         // 为你优选的链接
         let params = {};
         let params = {};
 
 
@@ -360,7 +353,7 @@ const detailDataPkg = (origin, uid, vipLevel, ua) => {
             // 缩略图
             // 缩略图
             let params = {};
             let params = {};
 
 
-            params.img = helpers.getImageUrl(value.colorImage, 60, 60);
+            params.img = value.colorImage;
             thumbImageList[key] = params;
             thumbImageList[key] = params;
 
 
             // 商品库存总数
             // 商品库存总数
@@ -421,12 +414,12 @@ const detailDataPkg = (origin, uid, vipLevel, ua) => {
                 dest.bannerTop.list = {};
                 dest.bannerTop.list = {};
                 let params = {};
                 let params = {};
 
 
-                params.img = helpers.getImageUrl(value.img, 450, 600);
+                params.img = value.img;
                 dest.bannerTop.list[key] = params;
                 dest.bannerTop.list[key] = params;
             });
             });
         } else if (goodsGroup[0] !== null && goodsGroup[0] !== undefined) {
         } else if (goodsGroup[0] !== null && goodsGroup[0] !== undefined) {
             dest.bannerTop = {};
             dest.bannerTop = {};
-            dest.bannerTop.img = helpers.getImageUrl(goodsGroup[0].img, 450, 600);
+            dest.bannerTop.img = goodsGroup[0].img;
         }
         }
     }
     }
 
 

@@ -12,5 +12,5 @@ module.exports = app => {
     app.use(require('./apps/channel'));
     app.use(require('./apps/channel'));
 
 
     // 业务模块
     // 业务模块
-    //app.use('/product', require('./apps/product'));
+    app.use('/product', require('./apps/product'));
 };
 };