靓号

application/admin/controller/Mobile.php

@@ -76,7 +76,7 @@ class Mobile extends Backend
             }
             list($where, $sort, $order, $offset, $limit) = $this->buildindexparams();
 
-            if(!$this->admin('sub')){
+            if(!$this->admin('is_sub')){
                 $list = $this->model
                     ->with(['info','proxy'])
                     ->where($where)
@@ -105,7 +105,7 @@ class Mobile extends Backend
                 }
                 $row['rules']=array_values(array_unique($rules));
 
-                if($this->admin('sub')) {
+                if($this->admin('is_sub')) {
                     $row['mobile_sub'] = [
                         'sub_sort' => (int)$row['sub_sort'],
                         'sub_rec_time' => (int)$row['sub_rec_time'],
@@ -164,11 +164,11 @@ class Mobile extends Backend
             list($where, $sort, $order, $offset, $limit) = $this->buildindexparams();
 
             $map=[];
-            if($this->admin('sub')){
+            if($this->admin('is_sub')){
                 $map['hold_chan']=$this->auth->id;
             }
             $relation=['info'];
-            if(!$this->admin('sub')){
+            if(!$this->admin('is_sub')){
                 $relation[]='proxy';
             }
 
@@ -259,13 +259,20 @@ class Mobile extends Backend
         $this->success('');
     }
     #
-    protected function optDisabled($mobile){
-        if(!$this->admin('sub') && !$this->admin('proxy')){
+    protected function subDisabled(){
+        if($this->admin('is_manager')){
             return false;
         }
-        if($this->admin(''))
-        if(!$mobile['is_activity']){
-
+        return true;
+    }
+    protected function killDisabled($mobile){
+        if($this->admin('is_manager')){
+            return false;
+        }
+        if ($mobile['is_activity']) {
+            return $mobile['hold_chan']!=$this->admin('id');
+        }else{
+            return false;
         }
     }
     #预占
@@ -273,7 +280,8 @@ class Mobile extends Backend
         if($this->request->isGet()){
             $mobile=$this->model->find($ids);
             $this->assign('row',$mobile);
-            $this->assign('disabled',$this->admin('sub'));
+            $this->assign('subDisabled',$this->subDisabled());
+            $this->assign('killDisabled',$this->killDisabled($mobile));
             return view();
         }else{
             Db::startTrans();
@@ -307,8 +315,8 @@ class Mobile extends Backend
             $mobile['province']=\app\common\model\Area::where('id',$mobile['province_id'])->value('name');
             $mobile['city']=\app\common\model\Area::where('id',$mobile['city_id'])->value('name');
             $this->assign('row',$mobile);
-            $this->assign('disabled',$this->admin('sub'));
-            $this->assign('otherSubDisabled',$this->admin('sub') && $this->admin('id')!=$mobile['hold_chan']);
+            $this->assign('disabled',$this->subDisabled());
+            $this->assign('otherSubDisabled',$this->killDisabled($mobile));
             return view();
         }else{
             $data=input('row/a');
@@ -317,12 +325,12 @@ class Mobile extends Backend
             if(!$mobile){
                 $this->error('号码不存在');
             }
-            if($this->admin('sub') && $this->auth->id!=$mobile['hold_chan']){
+            if($this->admin('is_sub') && $this->auth->id!=$mobile['hold_chan']){
                 $this->error('无权操作');
             }
             /*foreach ($mobiles as $mobile){*/
                 Db::startTrans();
-                if($this->admin('sub')){
+                if($this->admin('is_sub')){
                     $data=[
                         'amount_kill'=>$data['amount_kill'],
                     ];
@@ -875,7 +883,7 @@ class Mobile extends Backend
     }
     public function batch_activity_cancel($ids){
         $map=[];
-        if($this->admin('sub')){
+        if($this->admin('is_sub')){
             $map['hold_chan']=$this->admin('id');
         }
        $this->model->whereIn('id',$ids)->where($map)->update([
@@ -897,7 +905,7 @@ class Mobile extends Backend
             'sort'=>0,
         ];
         if($this->request->isGet()){
-            if($this->admin('sub')){
+            if($this->admin('is_sub')){
                 $row['sort']=MobileSub::getBy($mobile,$this->admin())['sub_sort'];
             }else{
                 $row['sort']=$mobile['sort'];
@@ -909,7 +917,7 @@ class Mobile extends Backend
             $this->validate($data,[
                 'sort|排序'=>['require','integer','gt:0'],
             ]);
-            if($this->admin('sub')){
+            if($this->admin('is_sub')){
                 $mobileSub=MobileSub::getBy($mobile,$this->admin());
                 $mobileSub['sub_sort']=$data['sort'];
                 $mobileSub->save();

application/admin/controller/MobileOrder.php

@@ -62,7 +62,7 @@ class MobileOrder extends Backend
         $this->request->filter(['strip_tags', 'trim']);
 
         $map=[];
-        if($this->admin('sub')){
+        if($this->admin('is_sub')){
             $map['s_id']=$this->admin('id');
         }
         if ($this->request->isAjax()) {

application/admin/model/Admin.php

@@ -84,6 +84,11 @@ class Admin extends Model
                 $admin['logintime']=strtotime('-20days');
             }
         });
+        self::beforeWrite(function (self $admin){
+            if($admin['sub'] && $admin['proxy']){
+                throw_user('error admin role');
+            }
+        });
     }
 
     public static function getAdmins(){

application/admin/view/mobile/edit.html

@@ -96,13 +96,13 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('是否秒杀')}:</label>
         <div class="col-xs-12 col-sm-8">
-            {:build_radios('row[is_activity]',[1=>'是',0=>'否'],$row['is_activity'],$disabled)}
+            {:build_radios('row[is_activity]',[1=>'是',0=>'否'],$row['is_activity'],$otherSubDisabled)}
         </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 type="number" min="0" {:$disabled?'disabled':''} class="form-control" name="row[activity_time_end]" value="{$row.activity_time_end}"/>
+            <input type="number" min="0" {:$otherSubDisabled?'disabled':''} class="form-control" name="row[activity_time_end]" value="{$row.activity_time_end}"/>
         </div>
     </div>
     <div class="form-group">

application/admin/view/mobile/takeit.html

@@ -2,58 +2,58 @@
     <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_original" class="form-control" name="row[amount_original]" type="number" value="{$row.amount_original}">
+            <input id="c-amount_original" class="form-control" name="row[amount_original]" type="number" {:$subDisabled?'disabled':''} value="{$row.amount_original}">
         </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_di" class="form-control" name="row[amount_di]" type="number" value="{$row.amount_di}">
+            <input id="c-amount_di" class="form-control" name="row[amount_di]" type="number" {:$subDisabled?'disabled':''} value="{$row.amount_di}">
         </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_base" class="form-control" name="row[amount_base]" type="number" value="{$row.amount_base}">
+            <input id="c-amount_base" class="form-control" name="row[amount_base]" {:$subDisabled?'disabled':''} type="number" value="{$row.amount_base}">
         </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_charge" class="form-control" name="row[amount_charge]" type="number" value="{$row.amount_charge}">
+            <input id="c-amount_charge" class="form-control" name="row[amount_charge]" {:$subDisabled?'disabled':''} type="number" value="{$row.amount_charge}">
         </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_kill" class="form-control" name="row[amount_kill]" type="number" value="{$row.amount_kill}">
+            <input id="c-amount_kill" class="form-control" name="row[amount_kill]" {:$killDisabled?'disabled':''} type="number" value="{$row.amount_kill}">
         </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" style="font-size: 20px;">
-            <label><input type="radio" class="kill-discount-radio" name="discount" value="0.95"/>95折</label>
-            <label><input type="radio" class="kill-discount-radio" name="discount" value="0.9"/>9折</label>
-            <label><input type="radio" class="kill-discount-radio" name="discount" value="0.88"/>8.8折</label>
-            <label><input type="radio" class="kill-discount-radio" name="discount" value="0.85"/>8.5折</label>
-            <label><input type="radio" class="kill-discount-radio" name="discount" value="0.8"/>8折</label>
-            <label><input type="radio" class="kill-discount-radio" name="discount" value="0.75"/>75折</label>
-            <label><input type="radio" class="kill-discount-radio" name="discount" value="0.7"/>7折</label>
+            <label><input type="radio" class="kill-discount-radio" {:$killDisabled?'disabled':''} name="discount" value="0.95"/>95折</label>
+            <label><input type="radio" class="kill-discount-radio" {:$killDisabled?'disabled':''} name="discount" value="0.9"/>9折</label>
+            <label><input type="radio" class="kill-discount-radio" {:$killDisabled?'disabled':''} name="discount" value="0.88"/>8.8折</label>
+            <label><input type="radio" class="kill-discount-radio" {:$killDisabled?'disabled':''} name="discount" value="0.85"/>8.5折</label>
+            <label><input type="radio" class="kill-discount-radio" {:$killDisabled?'disabled':''} name="discount" value="0.8"/>8折</label>
+            <label><input type="radio" class="kill-discount-radio" {:$killDisabled?'disabled':''} name="discount" value="0.75"/>75折</label>
+            <label><input type="radio" class="kill-discount-radio" {:$killDisabled?'disabled':''} name="discount" value="0.7"/>7折</label>
             <div>
-                自定义<input type="number" value="" class="kill-discount" style="width: 150px;"/>
+                自定义<input type="number" value="" class="kill-discount" {:$killDisabled?'disabled':''} style="width: 150px;"/>
             </div>
         </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_radios('row[is_activity]',[1=>'是',0=>'否'],1)}
+            {:build_radios('row[is_activity]',[1=>'是',0=>'否'],1,$killDisabled)}
         </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 type="number" min="0" class="form-control" name="row[activity_time_end]" value="{$row.activity_time_end}"/>
+            <input type="number" min="0" class="form-control" {:$killDisabled?'disabled':''} name="row[activity_time_end]" value="{$row.activity_time_end}"/>
         </div>
     </div>
     <div class="form-group layer-footer">