xieruidong 2 years ago
parent
commit
22ae2f4320

+ 1 - 1
application/admin/controller/user/User.php

@@ -174,7 +174,7 @@ class User extends Backend
     #赠送优惠券
     public function send_coupon($ids){
         if($this->request->isGet()) {
-            $coupon = Coupon::all();
+            $coupon = Coupon::column('name','id');
             $this->assign('coupon',$coupon);
             return $this->fetch();
         }else{

+ 7 - 1
application/admin/view/coupon/add.html

@@ -7,6 +7,12 @@
         </div>
     </div>
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('名称')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-name" min="0" class="form-control" name="row[name]" type="text" data-rule="required">
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('金额')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-amount" data-rule="required" min="0" class="form-control" step="0.01" name="row[amount]" type="number" data-rule="required">
@@ -40,7 +46,7 @@
         <label class="control-label col-xs-12 col-sm-2">{:__('已绑定商品')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input
-                    id="c-name"
+                    id="c-goods_id"
                     data-rule="required"
                     data-params='{}'
                     data-source="goods"

+ 21 - 0
application/admin/view/user/user/send_coupon.html

@@ -0,0 +1,21 @@
+<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('数量')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-num" min="0" class="form-control" name="row[num]" type="number" value="" data-rule="required">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('选择券')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            {:build_select('row[coupon]',$coupon)}
+        </div>
+    </div>
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</form>

+ 1 - 0
application/common/model/UserCoupon.php

@@ -29,6 +29,7 @@ class UserCoupon extends Model
 
     public static function toUser(User $user,Coupon $coupon){
         $userCoupon=$user->coupon()->save([
+            'name'=>$coupon['name'],
             'type'=>$coupon['type'],
             'amount'=>$coupon['amount'],
             'amount_full'=>$coupon['amount_full']??null,

+ 1 - 0
public/assets/js/backend/coupon.js

@@ -28,6 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
+                        {field: 'name', title: __('名称'), operate:'like'},
                         {field: 'type', title: __('类型'),searchList:types,formatter: Table.api.formatter.label},
                         {field: 'amount', title: __('金额'), operate:'BETWEEN'},
                         {field: 'amount_full', title: __('金额'), operate:'BETWEEN'},