From d01dbe195c5dc2886ce4bf62d66d7459cefda667 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期四, 13 七月 2023 11:36:39 +0800
Subject: [PATCH] Merge branch 'feature/v1.1.4开发' of http://60.204.153.149:8081/r/dfgApi into feature/v1.1.4开发
---
application/api/logic/taoke/device/Dataoke.php | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/application/api/logic/taoke/device/Dataoke.php b/application/api/logic/taoke/device/Dataoke.php
index c01e311..fdf9694 100644
--- a/application/api/logic/taoke/device/Dataoke.php
+++ b/application/api/logic/taoke/device/Dataoke.php
@@ -38,7 +38,7 @@
'similer_url'=>'https://openapi.dataoke.com/api/goods/list-similer-goods-by-open',
'gift_money_url'=>'https://openapi.dataoke.com/api/goods/first-order-gift-money',
'bottom_price_url'=>'https://openapi.dataoke.com/api/goods/get-history-low-price-list',
- 'jdnines_url'=>'https://openapi.dataoke.com/api/dels/jd/column/list-nines',
+ 'jdnines_url'=>'https://openapi.dataoke.com/api/dels/jd/column/list-nines'
];
const shop_type = ["0"=>"娣樺疂","1"=>"澶╃尗","2"=>"澶╃尗瓒呭競","3"=>"澶╃尗鍥介檯"];
@@ -877,7 +877,7 @@
}
} */
$init_goods['desc'] = isset($goods['extensionContent']) ? $goods['extensionContent'] : ''; //鎺ㄥ箍鏂囨
- //!empty($goods['imgs']) && $init_goods['imgs'] = explode(",",$goods['imgs']);
+ $init_goods['imgs'] = isset($goods['smallImages']) ? $goods['smallImages'] : [];
empty($goods['smallImages'])&& $init_goods['smallImages'] =explode(",",$goods['smallImages']);
//!empty($goods['reimgs']) && $init_goods['reimgs'] = explode(",",$goods['reimgs']);
if(!empty($goods['detailPics'])){
@@ -892,6 +892,7 @@
}else{
$init_goods['detailPics'] = $init_goods['imgs'];
}
+ $init_goods['faction']='j';
/* $init_goods['isSubdivision'] = isset($goods['isSubdivision']) ? $goods['isSubdivision'] : 0; // 璇ュ晢鍝佹槸鍚︽湁缁嗗垎绫荤洰
$init_goods['subdivisionId'] = isset($goods['subdivisionId']) ? $goods['subdivisionId'] : ''; //璇ュ晢鍝佹墍灞炵粏鍒嗙被鐩甶d
$init_goods['subdivisionName'] = isset($goods['subdivisionName']) ? $goods['subdivisionName'] : ''; //璇ュ晢鍝佹墍灞炵粏鍒嗙被鐩悕绉�
@@ -982,6 +983,8 @@
$init_goods['fanli'] = self::rebate($goods['actualPrice'],$goods['commissionRate']/100);
$init_goods['topFanli'] = self::rebate($goods['actualPrice'],$goods['commissionRate']/100,self::$topFanliRate);
$init_goods['isCollect'] = self::isCollect($init_goods);
+ //琛ュ厖杩斿洖鍊煎晢鍝佺被鐩�
+ $init_goods['cid'] = isset($goods['cid']) ? $goods['cid'] : '';
return $init_goods;
}
--
Gitblit v1.9.3