推荐人信息

app/ghs/controllers/MerchantController.php

@@ -32,7 +32,7 @@ class MerchantController extends BaseController
 		$merchant = MerchantService::getInfo($this->sj, $this->sjExtend);
 		util::success($merchant);
 	}
-
+	
 	//商家现有的会员等级 shish 2019.12.12
 	public function actionMemberLevel()
 	{
@@ -107,9 +107,10 @@ class MerchantController extends BaseController
 		}
 		$merchantName = isset($merchant['merchantName']) ? $merchant['merchantName'] : '';
 		$smallLogoUrl = isset($merchant['smallLogoUrl']) ? $merchant['smallLogoUrl'] : '';
-		$logoUrl = isset($merchant['logoUrl']) ? $merchant['logoUrl'] : '';
-		$data = ['merchantName' => $merchantName, 'smallLogoUrl' => $smallLogoUrl, 'id' => $id, 'logoUrl' => $logoUrl, 'fullAddress' => '暂无'];
+		$logoUrl = isset($merchant['logoUrl']) && !empty($merchant['logoUrl']) ? $merchant['logoUrl'] : Yii::$app->params['imgHost'] . '/hhb_small.png';
+		$address = $merchant['address'] ?? '';
+		$data = ['merchantName' => $merchantName, 'smallLogoUrl' => $smallLogoUrl, 'id' => $id, 'logoUrl' => $logoUrl, 'fullAddress' => $address];
 		util::success($data);
 	}
-	
+
 }

sql.sql

@@ -1261,7 +1261,6 @@ ALTER TABLE xhUserPast CHANGE `integral` growth INT(11) NOT NULL DEFAULT '0' COM
 ALTER TABLE `xhExpress`
 ADD COLUMN `shopNo`  varchar(100) NOT NULL DEFAULT '' COMMENT '门店' AFTER `appSecret`;
 
-
 ========
 == shish 2021-2-25
-需要琦海配好线上的wss以及确认HTTP_ORIGIN限制问题
+需要琦海配好线上的wss以及确认HTTP_ORIGIN限制问题