Merge branch 'coupon_rebate' into develop

.gitignore

@@ -12,3 +12,4 @@ npm-debug.log
 yarn-error.log
 
 .idea
+.vscode/launch.json

app/Admin/Forms/CouponTieForm.php

@@ -63,4 +63,5 @@ class CouponTieForm extends Form
             'repay' => '',
         ];
     }
+
 }

app/Admin/Repositories/CouponTie.php

@@ -6,7 +6,8 @@ use Dcat\Admin\Repositories\Repository;
 use Illuminate\Pagination\LengthAwarePaginator;
 use App\Libs\SsdbClient;
 
-class CouponTie extends Repository{
+class CouponTie extends Repository
+{
 
     public function getPrimaryKeyColumn()
     {
@@ -28,7 +29,7 @@ class CouponTie extends Repository{
                     'forward'=>$coupon['forward'],
                     'repay' => $coupon['repay']
                 ],
-            ],
+            ]
         );
     }
 

app/Models/CouponTie.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Models;
+
+use Dcat\Admin\Traits\HasDateTimeFormatter;
+
+use Illuminate\Database\Eloquent\Model;
+
+class CouponTie extends Model
+{
+	use HasDateTimeFormatter;
+    // protected $table = 'ims_system_coupon_user';
+    protected $dateFormat = 'U';
+
+}

resources/lang/zh-CN/coupon-tie.php

@@ -0,0 +1,14 @@
+<?php 
+return [
+    'labels' => [
+        'couponTie' => '活动绑定',
+    ],
+    'fields' => [
+        'activity' => '活动',
+        'forward' => '领券ids',
+        'repay' => '返券id',
+    ],
+    'options' => [
+        'actions' => '操作'
+    ],
+];