厂家颜色 订单接口修改

@@ -24,7 +24,7 @@ const _formatOrderGoods = (orderGoods, count, haveLink, tickets) => {
         let goods = {
         let goods = {
             thumb: value.goods_image,
             thumb: value.goods_image,
             name: value.product_name,
             name: value.product_name,
-            color: value.color_name,
+            color: value.factory_color_name ? value.factory_color_name : value.color_name,
             size: value.size_name,
             size: value.size_name,
             price: value.goods_price,
             price: value.goods_price,
             count: value.buy_number
             count: value.buy_number

@@ -210,14 +210,13 @@ const orderDetailData = (uid, orderCode) => {
             }
             }
 
 
             _.forEach(orderDetail.orderGoods, function(data) {
             _.forEach(orderDetail.orderGoods, function(data) {
-
                 let obj = {};
                 let obj = {};
                 let count = +data.buyNumber;
                 let count = +data.buyNumber;
 
 
                 obj = _.assign(obj, {
                 obj = _.assign(obj, {
                     thumb: data.goodsImage,
                     thumb: data.goodsImage,
                     name: data.productName,
                     name: data.productName,
-                    color: data.colorName,
+                    color: data.factoryColorName? data.factoryColorName : data.colorName,
                     size: data.sizeName,
                     size: data.sizeName,
                     price: data.goodsPrice,
                     price: data.goodsPrice,
                     count: count
                     count: count

@@ -22,17 +22,17 @@ module.exports = {
         singleApi: 'http://api-test3.yohops.com:9999/',
         singleApi: 'http://api-test3.yohops.com:9999/',
         imSocket: 'ws://im.yohobuy.com:10240',
         imSocket: 'ws://im.yohobuy.com:10240',
         imCs: 'http://im.yohobuy.com/api',
         imCs: 'http://im.yohobuy.com/api',
-        imServer: 'http://im.yohobuy.com/server',
+        imServer: 'http://im.yohobuy.com/server'
 
 
         // api: 'http://api.yoho.cn/',
         // api: 'http://api.yoho.cn/',
         // service: 'http://service.yoho.cn/',
         // service: 'http://service.yoho.cn/',
         // liveApi: 'http://api.live.yoho.cn/',
         // liveApi: 'http://api.live.yoho.cn/',
         // singleApi: 'http://single.yoho.cn/'
         // singleApi: 'http://single.yoho.cn/'
 
 
-        api: 'http://api-test3.yohops.com:9999/',
-        service: 'http://service-test3.yohops.com:9999/',
-        liveApi: 'http://testapi.live.yohops.com:9999/',
-        singleApi: 'http://api-test3.yohops.com:9999/'
+        // api: 'http://api-test3.yohops.com:9999/',
+        // service: 'http://service-test3.yohops.com:9999/',
+        // liveApi: 'http://testapi.live.yohops.com:9999/',
+        // singleApi: 'http://api-test3.yohops.com:9999/'
 
 
         // favApi: 'http://192.168.102.31:8092/brower',
         // favApi: 'http://192.168.102.31:8092/brower',
         // api: 'http://192.168.102.205:8080/gateway/',
         // api: 'http://192.168.102.205:8080/gateway/',

@@ -247,11 +247,11 @@ $search.on('touchend', function() {
     return false;
     return false;
 });
 });
 
 
-navSwiper = new Swiper('.new-hot', {
-    grabCursor: true,
-    slidesPerView: 'auto',
-    slideElement: 'li'
-});
+// navSwiper = new Swiper('.new-hot', {
+//     grabCursor: true,
+//     slidesPerView: 'auto',
+//     slideElement: 'li'
+// });
 
 
 // 初始化历史搜索的内容
 // 初始化历史搜索的内容
 (function() {
 (function() {