Browse Source

绑定计费点,改用数据库

lizhen_gitee 4 months ago
parent
commit
3085c10a7c

+ 4 - 4
application/admin/view/vipjifei/index.html

@@ -8,17 +8,17 @@
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
                         <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('vipjifei/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
-                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('vipjifei/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
-                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('vipjifei/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+                        <!--<a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('vipjifei/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>-->
+                        <!--<a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('vipjifei/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
                         
 
-                        <div class="dropdown btn-group {:$auth->check('vipjifei/multi')?'':'hide'}">
+                        <!--<div class="dropdown btn-group {:$auth->check('vipjifei/multi')?'':'hide'}">
                             <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
                             <ul class="dropdown-menu text-left" role="menu">
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
                             </ul>
-                        </div>
+                        </div>-->
 
                         <a class="btn btn-success btn-recyclebin btn-dialog {:$auth->check('vipjifei/recyclebin')?'':'hide'}" href="vipjifei/recyclebin" title="{:__('Recycle bin')}"><i class="fa fa-recycle"></i> {:__('Recycle bin')}</a>
                     </div>

+ 1 - 1
application/api/controller/Pay.php

@@ -337,7 +337,7 @@ class Pay extends Api
             'diversionCode' => config('product_code')
         ];
 
-        $vip_jifei = Db::name('vip_jifei')->where('pay_switch',1)
+        $vip_jifei = Db::name('vip_jifei')->where('pay_switch',1)->where('deletetime',NULL)
             ->field('productcode as productCode,productprice as productPrice,productunit as productUnit,productcount as productCount')
             ->select();
         $data['products'] = array_merge($data['products'],$vip_jifei);

+ 1 - 1
application/api/controller/User.php

@@ -115,7 +115,7 @@ class User extends Api
         //产品编码集合
         $product_codes = [config('product_code')
         ];
-        $vip_jifei = Db::name('vip_jifei')->where('user_switch',1)->column('productcode');
+        $vip_jifei = Db::name('vip_jifei')->where('user_switch',1)->where('deletetime',NULL)->column('productcode');
         $product_codes = array_merge($product_codes,$vip_jifei);
 
         $product_codes_count = count($product_codes);