init

application/admin/controller/Mobile.php

@@ -10,6 +10,7 @@ use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Reader\Csv;
 use PhpOffice\PhpSpreadsheet\Reader\Xls;
 use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+use think\Db;
 use think\Exception;
 use think\exception\PDOException;
 use think\Loader;
@@ -153,8 +154,25 @@ class Mobile extends Backend
     #预占
     public function takeit($ids){
         $mobile=$this->model->find($ids);
-        $this->assign('row',$mobile);
-        return view();
+        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']);
+            }
+            $mobile->allowField(true)->save($data);
+            $describe=$data['describe']??'';
+            $mobile->info()->update(compact('describe'));
+            Db::commit();
+            $this->success();
+        }
     }
 
     protected function buildindexparams($searchfields = null, $relationSearch = null)

application/admin/validate/Admin.php

@@ -14,7 +14,7 @@ class Admin extends Validate
         'username' => 'require|regex:\w{3,12}|unique:admin',
         'nickname' => 'require',
         'password' => 'require|regex:\S{32}',
-        'email'    => 'require|email|unique:admin,email',
+        //'email'    => 'require|email|unique:admin,email',
     ];
 
     /**
@@ -33,8 +33,8 @@ class Admin extends Validate
      * 验证场景
      */
     protected $scene = [
-        'add'  => ['username', 'email', 'nickname', 'password'],
-        'edit' => ['username', 'email', 'nickname', 'password'],
+        'add'  => ['username', 'nickname', 'password'],
+        'edit' => ['username', 'nickname', 'password'],
     ];
 
     public function __construct(array $rules = [], $message = [], $field = [])

application/admin/view/auth/proxy/add.html

@@ -14,15 +14,21 @@
         </div>
     </div>
     <div class="form-group">
-        <label for="email" class="control-label col-xs-12 col-sm-2">{:__('Email')}:</label>
+        <label for="nickname" class="control-label col-xs-12 col-sm-2">{:__('企业名称')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input type="email" class="form-control" id="email" name="row[email]" value="" data-rule="required;email" />
+            <input type="text" class="form-control" id="nickname" name="row[nickname]" autocomplete="off" value="" data-rule="required" />
         </div>
     </div>
     <div class="form-group">
-        <label for="nickname" class="control-label col-xs-12 col-sm-2">{:__('Nickname')}:</label>
+        <label for="nickname" class="control-label col-xs-12 col-sm-2">{:__('企业联系人')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input type="text" class="form-control" id="nickname" name="row[nickname]" autocomplete="off" value="" data-rule="required" />
+            <input type="text" class="form-control" id="com_user" name="row[com_user]" autocomplete="off" value="" data-rule="required" />
+        </div>
+    </div>
+    <div class="form-group">
+        <label for="nickname" class="control-label col-xs-12 col-sm-2">{:__('企业电话')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input type="text" class="form-control" id="com_mobile" name="row[com_mobile]" autocomplete="off" value="" data-rule="required" />
         </div>
     </div>
     <div class="form-group">

application/admin/view/auth/proxy/edit.html

@@ -13,15 +13,21 @@
         </div>
     </div>
     <div class="form-group">
-        <label for="email" class="control-label col-xs-12 col-sm-2">{:__('Email')}:</label>
+        <label for="nickname" class="control-label col-xs-12 col-sm-2">{:__('企业名称')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input type="email" class="form-control" id="email" name="row[email]" value="{$row.email|htmlentities}" data-rule="required;email" />
+            <input type="text" class="form-control" id="nickname" name="row[nickname]" autocomplete="off" value="{$row.nickname|htmlentities}" data-rule="required" />
         </div>
     </div>
     <div class="form-group">
-        <label for="nickname" class="control-label col-xs-12 col-sm-2">{:__('Nickname')}:</label>
+        <label for="nickname" class="control-label col-xs-12 col-sm-2">{:__('企业联系人')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input type="text" class="form-control" id="nickname" name="row[nickname]" autocomplete="off" value="{$row.nickname|htmlentities}" data-rule="required" />
+            <input type="text" class="form-control" id="com_user" name="row[com_user]" autocomplete="off" value="{$row.com_user}" data-rule="required" />
+        </div>
+    </div>
+    <div class="form-group">
+        <label for="nickname" class="control-label col-xs-12 col-sm-2">{:__('企业电话')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input type="text" class="form-control" id="com_mobile" name="row[com_mobile]" autocomplete="off" value="{$row.com_mobile}" data-rule="required" />
         </div>
     </div>
     <div class="form-group">

application/admin/view/auth/proxy/index.html

@@ -9,8 +9,8 @@
                         {:build_toolbar('refresh,add,delete')}
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover" 
-                           data-operate-edit="{:$auth->check('auth/admin/edit')}" 
-                           data-operate-del="{:$auth->check('auth/admin/del')}" 
+                           data-operate-edit="{:$auth->check('auth/proxy/edit')}"
+                           data-operate-del="{:$auth->check('auth/proxy/del')}"
                            width="100%">
                     </table>
                 </div>

application/admin/view/mobile/takeit.html

@@ -27,7 +27,88 @@
     <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-proxy_id" data-field="username" data-params='{"custom[proxy]":1}' data-rule="required" data-source="auth/proxy/selectpage" class="form-control selectpage" name="row[proxy_id]" type="text" value="{$row.proxy_id}">
+            <input id="c-proxy_id" data-field="nickname" data-params='{"custom[proxy]":1}' data-rule="required" data-source="auth/proxy/selectpage" class="form-control selectpage" name="row[proxy_id]" type="text" value="{$row.proxy_id}">
+        </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-brand" class="form-control" name="row[brand]" type="text" value="{$row.brand}">
+        </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>
+        <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}">
+        </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>
+        <div class="col-xs-12 col-sm-8">
+            {:build_radios('row[is_activity]',[1=>'是',0=>'否'],$row['is_activity'])}
+        </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[top_time]',[1=>'是',0=>'否'],$row['top_time']?1:0)}
+        </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[rec_time]',[1=>'是',0=>'否'],$row['rec_time']?1:0)}
+        </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[status]',[0=>'正常',1=>'已售',2=>'已下架'],$row['status'])}
         </div>
     </div>
     <div class="form-group">

application/common/model/Mobile.php

@@ -55,6 +55,17 @@ class Mobile extends Model
         self::beforeWrite(function (self $mobile){
             $mobile['amount']=$mobile['amount_base']+$mobile['amount_charge'];
 
+            if(isset($mobile['top_time']) && $mobile['top_time']==1){
+                $mobile['top_time']=time();
+            }else{
+                $mobile['top_time']=null;
+            }
+            if(isset($mobile['rec_time']) && $mobile['rec_time']==1){
+                $mobile['rec_time']=time();
+            }else{
+                $mobile['rec_time']=null;
+            }
+
             $mobile->data(array_merge($mobile->getData(),MobileComputer::setMobile($mobile['no'])->filter()));
         });
 

public/assets/js/backend/auth/proxy.js

@@ -32,9 +32,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'state', checkbox: true, },
                         {field: 'id', title: 'ID'},
                         {field: 'username', title: __('Username')},
-                        {field: 'nickname', title: __('Nickname')},
+                        {field: 'nickname', title: __('企业名称')},
                         {field: 'groups_text', title: __('Group'), operate:false, formatter: Table.api.formatter.label},
-                        {field: 'email', title: __('Email')},
+                        {field: 'com_user', title: __('企业联系人')},
+                        {field: 'com_mobile', title: __('企业电话')},
                         {field: 'status', title: __("Status"), searchList: {"normal":__('Normal'),"hidden":__('Hidden')}, formatter: Table.api.formatter.status},
                         {field: 'logintime', title: __('Login time'), formatter: Table.api.formatter.datetime, operate: 'RANGE', addclass: 'datetimerange', sortable: true},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: function (value, row, index) {

public/assets/js/backend/mobile.js

@@ -204,6 +204,18 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
         },
         takeit(){
             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))
+            })
         }
     };
     return Controller;