xxxrrrdddd 3 年之前
父节点
当前提交
7b2eed0fca

+ 2 - 76
application/admin/controller/MobileFlow.php

@@ -104,81 +104,6 @@ class MobileFlow extends Backend
         ]);
     }
 
-    #置顶推荐
-    public function batch(){
-        $this->validate($data=input(),[
-            'id'=>'require',
-            'field'=>['require','in:rec_time,top_time'],
-            'status'=>'require',
-        ]);
-        $time=$data['status']?time():null;
-        $this->model->where('id',$data['id'])->update([
-            $data['field']=>$time
-        ]);
-        $this->success('','',[
-            'status'=>$time,
-        ]);
-    }
-    #设为特价
-    public function setdiscount($ids){
-        if($this->request->isGet()){
-            return view();
-        }else{
-            $this->validate($data=input('row/a'),[
-                'activity_time_end'=>['date','requireIf:activity_forever,0'],
-                'activity_forever'=>['require','in:0,1'],
-            ]);
-            if($data['activity_forever']){
-                $activity_time_end=null;
-            }else {
-                if (strtotime($data['activity_time_end']) <= time()) {
-                    $this->error('请选择将来时间');
-                }
-                $activity_time_end=$data['activity_time_end'];
-            }
-            $this->model->whereIn('id',$ids)->update([
-                'is_activity'=>1,
-                'activity_time_end'=>$activity_time_end,
-            ]);
-            $this->success();
-        }
-    }
-    #取消设为特价
-    public function cancelsetdiscount(){
-        $ids=input('ids/a');
-        if($ids){
-            $this->model->whereIn('id',$ids)->update([
-                'is_activity'=>0,
-                'activity_time_end'=>null,
-            ]);
-        }
-        $this->success('');
-    }
-    #预占
-    public function takeit($ids){
-        $mobile=$this->model->find($ids);
-        if($this->request->isGet()){
-            $this->assign('row',$mobile);
-            return view();
-        }else{
-            Db::startTrans();
-            $data=input('row/a');
-            $city=$data['city'];
-            if($city){
-                $ex=explode('/',$city);
-                list($data['province'],$data['city'])=$ex;
-                $data['province_id']=\app\common\model\Area::getIdByName($data['province']);
-                $data['city_id']=\app\common\model\Area::getIdByName($data['city']);
-            }
-            (new MobilePriceLogService)->setMobile($mobile)->setAdminId($this->auth->id)->setBeforePrice($mobile['amount_base'])->setAfterPrice($data['amount_base'])->log();
-            $mobile->allowField(true)->save($data);
-            $describe=$data['describe']??'';
-            $mobile->info()->update(compact('describe'));
-            Db::commit();
-            $this->success();
-        }
-    }
-
     public function edit($ids=null){
         $mobile=$this->model->find($ids);
         if($this->request->isGet()){
@@ -197,7 +122,8 @@ class MobileFlow extends Backend
             (new MobilePriceLogService)->setMobile($mobile)->setAdminId($this->auth->id)->setBeforePrice($mobile['amount_base'])->setAfterPrice($data['amount_base'])->log();
             $mobile->allowField(true)->save($data);
             $describe=$data['describe']??'';
-            $mobile->info()->update(compact('describe'));
+            $content=$data['content']??'';
+            $mobile->info()->update(compact('describe','content'));
             Db::commit();
             $this->success();
         }

+ 15 - 54
application/admin/view/mobile_flow/edit.html

@@ -13,12 +13,18 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('City')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('归属地')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div class='control-relative'><input id="c-city" class="form-control" data-toggle="city-picker" name="row[city]" data-level="city" type="text" value="{$row.province}/{$row.city}"></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">
+            <input id="c-name" class="form-control" name="row[name]" type="text" value="{$row.name}">
+        </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-network" class="form-control" name="row[network]" type="text" value="{$row.network}">
@@ -37,72 +43,27 @@
         </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">
-            <textarea id="c-describe" class="form-control" name="row[describe]" type="text">{$row.info.describe}</textarea>
-        </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-remark" class="form-control" name="row[remark]" type="text" value="{$row.remark}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('原价')}:</label>
+        <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-summary" class="form-control" name="row[summary]" type="text" value="{$row.summary}">
         </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}">
-        </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}">
-        </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}">
-        </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}">
-        </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">
-            <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>
-            自定义<input type="number" value="" class="kill-discount" style="width: 100px;"/>
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('是否秒杀')}:</label>
+        <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'])}
+            <textarea id="c-describe" class="form-control editor" name="row[describe]" type="text">{$row.info.describe}</textarea>
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('是否置顶')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('注意事项')}:</label>
         <div class="col-xs-12 col-sm-8">
-            {:build_radios('row[top_time]',[1=>'是',0=>'否'],$row['top_time']?1:0)}
+            <textarea id="c-content" class="form-control editor" name="row[content]" type="text">{$row.info.content}</textarea>
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('是否推荐')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('备注')}:</label>
         <div class="col-xs-12 col-sm-8">
-            {:build_radios('row[rec_time]',[1=>'是',0=>'否'],$row['rec_time']?1:0)}
+            <input id="c-remark" class="form-control" name="row[remark]" type="text" value="{$row.remark}">
         </div>
     </div>
     <div class="form-group">

+ 1 - 2
public/assets/js/backend/mobile_flow.js

@@ -46,8 +46,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'sort', title: __('Sort'),operate: "BETWEEN"},
                         {field: 'admin_id', title: __('上传用户'),operate: "="},
 
-                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate,buttons:[
-                            ]},
+                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate,buttons:[]},
                     ]
                 ]
             });