init

application/admin/controller/Mobile.php

@@ -72,6 +72,7 @@ class Mobile extends Backend
             $list = $this->model
                     ->with(['info','proxy'])
                     ->where($where)
+                ->where('type',1)
                     ->order($sort, $order)
                     ->paginate($limit);
 
@@ -84,7 +85,7 @@ class Mobile extends Backend
                         }
                     }
                 }
-                $row['rules']=array_unique($rules);
+                $row['rules']=array_values(array_unique($rules));
             }
 
             $result = array("total" => $list->total(), "rows" => $list->items());

application/common/model/Mobile.php

@@ -79,7 +79,14 @@ class Mobile extends Model
             if(!isset($mobile['amount_charge'])){
                 $mobile['amount_charge']=0;
             }
-            $mobile['amount']=$mobile['amount_base']+$mobile['amount_charge'];
+            if(!isset($mobile['is_activity'])){
+                $mobile['is_activity']=0;
+            }
+            if(!$mobile['is_activity']) {
+                $mobile['amount'] = $mobile['amount_base'] + $mobile['amount_charge'];
+            }else{
+                $mobile['amount'] = $mobile['amount_kill'] + $mobile['amount_charge'];
+            }
 
             if(isset($mobile['top_time']) && $mobile['top_time']==1){
                 $mobile['top_time']=time();
@@ -92,6 +99,10 @@ class Mobile extends Model
                 $mobile['rec_time']=null;
             }
 
+            if(isset($mobile->getChangedData()['is_activity']) && $mobile->getChangedData()['is_activity']==1){
+                $mobile['activity_time']=time();
+            }
+
             $mobile->data(array_merge($mobile->getData(),MobileComputer::setMobile($mobile['no'])->filter()));
         });
 

public/assets/js/backend/mobile.js

@@ -186,6 +186,18 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
         },
         edit: function () {
             Controller.api.bindevent();
+            $('.kill-discount-radio').change(function (){
+                let amount=$('#c-amount_base').val(),
+                    dis=this.value
+                let total=amount*dis
+                $('#c-amount_kill').val(total.toFixed(2))
+            })
+            $('.kill-discount').bind('input propertychange',function (){
+                let amount=$('#c-amount_base').val(),
+                    dis=this.value
+                let total=amount*dis/10
+                $('#c-amount_kill').val(total.toFixed(2))
+            })
         },
         setdiscount(){
             Controller.api.bindevent();