|
@@ -7,6 +7,7 @@
|
|
|
|
|
|
|
|
namespace app\models\store;
|
|
namespace app\models\store;
|
|
|
|
|
|
|
|
|
|
+use app\admin\model\system\SystemStore;
|
|
|
use app\models\user\User;
|
|
use app\models\user\User;
|
|
|
use crmeb\basic\BaseModel;
|
|
use crmeb\basic\BaseModel;
|
|
|
use crmeb\traits\ModelTrait;
|
|
use crmeb\traits\ModelTrait;
|
|
@@ -65,6 +66,8 @@ class StoreExchangeOrder extends BaseModel
|
|
|
unset($cart_info);
|
|
unset($cart_info);
|
|
|
}
|
|
}
|
|
|
$v['_info'] = $_info;
|
|
$v['_info'] = $_info;
|
|
|
|
|
+ $v['store'] = SystemStore::where('id', $v['store_id'])->value('name') ?: '--';
|
|
|
|
|
+ $v['add_time'] = $v['add_time'] ? date('Y-m-d H:i:s', $v['add_time']) : '';
|
|
|
}
|
|
}
|
|
|
$count = $model->count();
|
|
$count = $model->count();
|
|
|
return compact('data', 'count');
|
|
return compact('data', 'count');
|
