Merge branch 'master' of http://124.223.61.50:8099/haojie/dex-admin

app/Service/TradeService.php

@@ -144,8 +144,9 @@ public function inscriptionList($page, $limit)
         $buy_fee = app(AdminConfigService::class)->getBuyFee();
         $buy_fee = app(AdminConfigService::class)->getBuyFee();
         // 指定返回的字段
         // 指定返回的字段
         $field = ['id', 'inscription', 'status', 'original_amount'];
         $field = ['id', 'inscription', 'status', 'original_amount'];
+        $model = InscriptionTrading::with(['inscriptions']);
         // $item->buy_real_amount = $item->original_amount + $item->original_amount * ($buy_fee / 100);
         // $item->buy_real_amount = $item->original_amount + $item->original_amount * ($buy_fee / 100);
-        $model = $this->model()->where('status', self::ORDER_STATUS_ON)
+        $model = $model->where('status', self::ORDER_STATUS_ON)
             ->orderBy('id', 'desc')->paginate($limit, $field, 'page', $page);
             ->orderBy('id', 'desc')->paginate($limit, $field, 'page', $page);
         // 获取分页后的data
         // 获取分页后的data
         $data = $model->items();
         $data = $model->items();

package-lock.json

 {
 {
-    "name": "dex-trade",
+    "name": "dex-admin",
     "lockfileVersion": 2,
     "lockfileVersion": 2,
     "requires": true,
     "requires": true,
     "packages": {
     "packages": {