From 7f613585d2edc944e4443f3e87a207830a38dc92 Mon Sep 17 00:00:00 2001 From: kissnavel Date: Wed, 21 Aug 2024 20:30:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E9=BB=98=E8=AE=A4=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/mysapi/tool.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/mysapi/tool.js b/lib/mysapi/tool.js index fdf5cef..6217b98 100644 --- a/lib/mysapi/tool.js +++ b/lib/mysapi/tool.js @@ -79,12 +79,12 @@ export default class ZZZApiTool { const deviceCfg = settings.getConfig('device'); const defDeviceCfg = settings.getdefSet('device'); const { - productName = _.get(deviceCfg, defDeviceCfg, 'productName'), - deviceType = _.get(deviceCfg, defDeviceCfg, 'productType'), - modelName = _.get(deviceCfg, defDeviceCfg, 'modelName'), - oaid = _.get(deviceCfg, defDeviceCfg, 'oaid'), - deviceInfo = _.get(deviceCfg, defDeviceCfg, 'deviceInfo'), - board = _.get(deviceCfg, defDeviceCfg, 'board'), + productName = _.get(deviceCfg, 'productName') || _.get(defDeviceCfg, 'productName'), + deviceType = _.get(deviceCfg, 'productType') || _.get(defDeviceCfg, 'productType'), + modelName = _.get(deviceCfg, 'modelName') || _.get(defDeviceCfg, 'modelName'), + oaid = _.get(deviceCfg, 'oaid') || _.get(defDeviceCfg, 'oaid'), + deviceInfo = _.get(deviceCfg, 'deviceInfo') || _.get(defDeviceCfg, 'deviceInfo'), + board = _.get(deviceCfg, 'board') || _.get(defDeviceCfg, 'board'), } = data; const deviceBrand = deviceInfo.split('/')[0]; let urlMap = {