|
|
@@ -26,26 +26,27 @@ class DeliveryController extends BaseController
|
|
|
{
|
|
|
$platformList = [];
|
|
|
$platformLogos = [
|
|
|
- 'data' => '📦',
|
|
|
- 'shunfeng' => '🚚',
|
|
|
- 'meituan' => '🍱' ,
|
|
|
- 'fengniao' => '🍜',
|
|
|
- 'huolala' => '🚛',
|
|
|
- 'shansong' => '⚡',
|
|
|
- 'didi' => '🚗',
|
|
|
- 'uu' => '🛵'
|
|
|
+ 'data' => ['name'=>'达达', 'logo'=>'📦'],
|
|
|
+ 'shunfeng' => ['name'=>'顺丰同城', 'logo'=>'🚚'],
|
|
|
+ 'meituan' => ['name'=>'美团', 'logo'=>'🍱'] ,
|
|
|
+ 'fengniao' => ['name'=>'蜂鸟', 'logo'=>'🍜'],
|
|
|
+ 'huolala' => ['name'=>'货拉拉', 'logo'=>'🚛'],
|
|
|
+ 'shansong' => ['name'=>'闪送', 'logo'=>'⚡'],
|
|
|
+ 'didi' => ['name'=>'滴滴', 'logo'=>'🚗'],
|
|
|
+ 'uu' => ['name'=>'UU跑腿', 'logo'=>'🛵']
|
|
|
];
|
|
|
$mainId = $this->mainId;
|
|
|
$allDeliveries = DeliveryAuthTokenClass::getAllByCondition(['mainId'=>$mainId]);
|
|
|
foreach($allDeliveries as $d){
|
|
|
$item = [
|
|
|
'id'=>$d['platform'],
|
|
|
- 'logo'=>$platformLogos[$d['platform']],
|
|
|
+ 'logo'=>$platformLogos[$d['platform']]['logo'],
|
|
|
+ 'name'=>$platformLogos[$d['platform']]['name'],
|
|
|
'is_authorized' => true,
|
|
|
'balance' => 0,
|
|
|
'access_type' => 'oauth'
|
|
|
];
|
|
|
- $platformList = $item;
|
|
|
+ $platformList[] = $item;
|
|
|
}
|
|
|
util::success(['platformList'=>$platformList]);
|
|
|
// [
|
|
|
@@ -306,10 +307,11 @@ class DeliveryController extends BaseController
|
|
|
// 创建订单(真实下单)
|
|
|
public function actionCreateOrder()
|
|
|
{
|
|
|
- $form = new CreateOrderForm();
|
|
|
- $form->loadAndValidate();
|
|
|
-
|
|
|
- $post = $form->getAttributes();
|
|
|
+// $form = new CreateOrderForm();
|
|
|
+// $form->loadAndValidate();
|
|
|
+//
|
|
|
+// $post = $form->getAttributes();
|
|
|
+ $post = Yii::$app->request->post();
|
|
|
$orderId = $post['orderId']; // xhGhsOrder.id
|
|
|
$params = $post['allParams'];
|
|
|
$platform = $params['en_name'];// $post['platform'] 是中文
|