commit

app/admin/controller/ump/StoreCouponUser.php

@@ -30,7 +30,7 @@ class StoreCouponUser extends AuthController
             ['nickname', ''],
         ], $this->request);
         $this->assign('where', $where);
-        $this->assign(CouponUserModel::systemPage($where));
+        $this->assign('list',CouponUserModel::systemPage($where));
         return $this->fetch();
     }
 

app/admin/model/store/StoreCouponUser.php

@@ -2,6 +2,7 @@
 namespace app\admin\model\store;
 
 use crmeb\basic\BaseModel;
+use crmeb\services\AlipayService;
 use crmeb\traits\ModelTrait;
 use think\facade\Db;
 
@@ -29,26 +30,15 @@ class StoreCouponUser extends BaseModel
             $coupon['_end_time'] = date('Y/m/d',$coupon['end_time']);
             $coupon['use_min_price'] = floatval($coupon['use_min_price']);
             $coupon['coupon_price'] = floatval($coupon['coupon_price']);
-            if($coupon['is_fail']){
-                $coupon['_type'] = 0;
-                $coupon['_msg'] = '已失效';
-            }else if ($coupon['status'] == 1){
+            if ($coupon['status'] < 1){
+                $coupon['_type'] = 1;
+                $coupon['_msg'] = '未使用';
+            }elseif ($coupon['status'] == 1){
                 $coupon['_type'] = 0;
                 $coupon['_msg'] = '已使用';
-            }else if ($coupon['status'] == 2){
-                $coupon['_type'] = 0;
-                $coupon['_msg'] = '已过期';
-            }else if($coupon['add_time'] > $time || $coupon['end_time'] < $time){
+            }elseif ($coupon['status'] == 2){
                 $coupon['_type'] = 0;
                 $coupon['_msg'] = '已过期';
-            }else{
-                if($coupon['add_time']+ 3600*24 > $time){
-                    $coupon['_type'] = 2;
-                    $coupon['_msg'] = '可使用';
-                }else{
-                    $coupon['_type'] = 1;
-                    $coupon['_msg'] = '可使用';
-                }
             }
             $coupon['integral']= Db::name('store_coupon')->where(['id'=>$coupon['cid']])->value('integral');
         }

app/admin/model/ump/StoreCouponUser.php

@@ -46,7 +46,7 @@ class StoreCouponUser extends BaseModel
         if ($where['nickname'] != '') $model = $model->where('b.nickname|b.uid', 'LIKE', "%".$where['nickname']."%");
 //        $model = $model->where('is_del',0);
         $model = $model->order('id desc');
-        return self::page($model);
+        return $model->paginate(['list_rows'=>20,'query' => request()->param()]);
     }
 
     /**

app/admin/view/ump/store_coupon_user/index.php

@@ -122,7 +122,7 @@
                         </tbody>
                     </table>
                 </div>
-                {include file="public/inner_page"}
+                {$list|raw}
             </div>
         </div>
     </div>

app/admin/view/user/user/see.php

@@ -192,7 +192,7 @@
                                         <tr v-for="item in CouponsList">
                                             <td>{{item.coupon_title}}
                                                 <p>
-                                                    <span class="layui-badge" :class="{'layui-bg-green':item._type>=1}" v-text="item._type>=1 ? '可使用': '已过期' ">正在加载</span>
+                                                    <span class="layui-badge" :class="{'layui-bg-green':item._type>=1}" v-text="item._type>=1 ? '可使用': '已使用' ">正在加载</span>
                                                 </p>
                                             </td>
                                             <td>{{item.coupon_price}}</td>