门店

application/admin/controller/Company.php

@@ -3,7 +3,6 @@
 namespace app\admin\controller;
 
 use app\common\controller\Backend;
-use think\Db;
 
 /**
  * 门店
@@ -35,92 +34,39 @@ class Company extends Backend
      * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
      */
 
-    /**
-     * 添加
-     */
-    public function add()
-    {
-        if ($this->request->isPost()) {
-            $params = $this->request->post("row/a");
-            $params = $this->preExcludeFields($params);
-            if (!$params) {
-                $this->error(__('Parameter %s can not be empty', ''));
-            }
-            $result = false;
-            try {
-                //是否采用模型验证
-                if ($this->modelValidate) {
-                    $name = str_replace("\\model\\", "\\validate\\", get_class($this->model));
-                    $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.add' : $name) : $this->modelValidate;
-                    $this->model->validateFailException(true)->validate($validate);
-                }
-                if(isset($params['area_id'])) {
-                    $areaWhere['id'] = $params['area_id'];
-                    $areaData = Db::name('shopro_area')->where($areaWhere)->find();
-                    $params['province_name'] = isset($areaData['province_name']) ? $areaData['province_name'] : '';
-                    $params['city_name'] = isset($areaData['city_name']) ? $areaData['city_name'] : '';
-                    $params['area_name'] = isset($areaData['name']) ? $areaData['name'] : '';
-                    $params['full_address'] = $params['province_name'].$params['city_name'].$params['area_name'].$params['address'];
-                }
-                $result = $this->model->allowField(true)->save($params);
-            } catch (ValidateException|PDOException|Exception $e) {
-                $this->error($e->getMessage());
-            }
-            if ($result == false) {
-               $this->error(__('No rows were inserted'));
-            }
-            $this->success();
-        }
-        return $this->view->fetch();
-    }
 
     /**
-     * 编辑
+     * 查看
      */
-    public function edit($ids = null)
+    public function index()
     {
-        $row = $this->model->get($ids);
-        if (!$row) {
-            $this->error(__('No Results were found'));
-        }
-        $adminIds = $this->getDataLimitAdminIds();
-        if (is_array($adminIds)) {
-            if (!in_array($row[$this->dataLimitField], $adminIds)) {
-                $this->error(__('You have no permission'));
-            }
-        }
-        if ($this->request->isPost()) {
-            $params = $this->request->post("row/a");
-            if (!$params) {
-                $this->error(__('Parameter %s can not be empty', ''));
+        //当前是否为关联查询
+        $this->relationSearch = true;
+        //设置过滤方法
+        $this->request->filter(['strip_tags', 'trim']);
+        if ($this->request->isAjax()) {
+            //如果发送的来源是Selectpage，则转发到Selectpage
+            if ($this->request->request('keyField')) {
+                return $this->selectpage();
             }
-            $params = $this->preExcludeFields($params);
-            $result = false;
-            try {
-                //是否采用模型验证
-                if ($this->modelValidate) {
-                    $name = str_replace("\\model\\", "\\validate\\", get_class($this->model));
-                    $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate;
-                    $row->validateFailException(true)->validate($validate);
-                }
-                if(isset($params['area_id'])) {
-                    $areaWhere['id'] = $params['area_id'];
-                    $areaData = Db::name('shopro_area')->where($areaWhere)->find();
-                    $params['province_name'] = isset($areaData['province_name']) ? $areaData['province_name'] : '';
-                    $params['city_name'] = isset($areaData['city_name']) ? $areaData['city_name'] : '';
-                    $params['area_name'] = isset($areaData['name']) ? $areaData['name'] : '';
-                    $params['full_address'] = $params['province_name'].$params['city_name'].$params['area_name'].$params['address'];
-                }
-                $result = $row->allowField(true)->save($params);
-            } catch (ValidateException|PDOException|Exception $e) {
-                $this->error($e->getMessage());
-            }
-            if ($result == false) {
-                $this->error(__('No rows were updated'));
+            list($where, $sort, $order, $offset, $limit) = $this->buildparams();
+
+            $list = $this->model
+                    ->with(['wallet'])
+                    ->where($where)
+                    ->order($sort, $order)
+                    ->paginate($limit);
+
+            foreach ($list as $row) {
+                
+                $row->getRelation('wallet')->visible(['money']);
             }
-            $this->success();
+
+            $result = array("total" => $list->total(), "rows" => $list->items());
+
+            return json($result);
         }
-        $this->view->assign("row", $row);
         return $this->view->fetch();
     }
+
 }

application/admin/lang/zh-cn/company.php

@@ -2,8 +2,8 @@
 
 return [
     'Id'              => 'ID',
+    'User_id'         => '用户ID',
     'Name'            => '店铺名称',
-    'Logo'            => '店铺logo',
     'Image'           => '公司头像',
     'Contacts'        => '联系人姓名',
     'Mobile'          => '联系方式',
@@ -27,5 +27,9 @@ return [
     'Is_open 0'       => '否',
     'Is_open 1'       => '是',
     'Open_hours'      => '营业时间',
-    'Agent_id'        => '代理ID'
+    'Agent_id'        => '代理ID',
+    'Mini_code'       => '小程序码',
+    'Createtime'      => '创建时间',
+    'Updatetime'      => '更新时间',
+    'Wallet.money'    => '余额'
 ];

application/admin/model/Company.php

@@ -3,7 +3,7 @@
 namespace app\admin\model;
 
 use think\Model;
-
+use think\Db;
 
 class Company extends Model
 {
@@ -16,11 +16,11 @@ class Company extends Model
     protected $name = 'company';
     
     // 自动写入时间戳字段
-    protected $autoWriteTimestamp = false;
+    protected $autoWriteTimestamp = 'integer';
 
     // 定义时间戳字段名
-    protected $createTime = false;
-    protected $updateTime = false;
+    protected $createTime = 'createtime';
+    protected $updateTime = 'updatetime';
     protected $deleteTime = false;
 
     // 追加属性
@@ -28,6 +28,32 @@ class Company extends Model
         'status_text',
         'is_open_text'
     ];
+
+
+
+protected static function init()
+{
+    self::beforeInsert(function ($row) {
+        if(isset($row['area_id'])) {
+            $areaData = Db::name('shopro_area')->where('id',$row['area_id'])->find();
+            $row['province_name'] = $areaData['province_name'];
+            $row['city_name'] = $areaData['city_name'];
+            $row['area_name'] = $areaData['name'];
+            $row['full_address'] = $row['province_name'].$row['city_name'].$row['area_name'].$row['address'];
+        }
+    });
+
+
+    self::beforeUpdate(function ($row) {
+        if(isset($row['area_id'])) {
+            $areaData = Db::name('shopro_area')->where('id',$row['area_id'])->find();
+            $row['province_name'] = $areaData['province_name'];
+            $row['city_name'] = $areaData['city_name'];
+            $row['area_name'] = $areaData['name'];
+            $row['full_address'] = $row['province_name'].$row['city_name'].$row['area_name'].$row['address'];
+        }
+    });
+}
     
 
     
@@ -60,4 +86,8 @@ class Company extends Model
 
 
 
+    public function wallet()
+    {
+        return $this->belongsTo('app\admin\model\company\Wallet', 'id', 'user_id', [], 'LEFT')->setEagerlyType(0);
+    }
 }

application/admin/model/company/Wallet.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace app\admin\model\company;
+
+use think\Model;
+
+class Wallet extends Model
+{
+    // 表名
+    protected $name = 'company_wallet';
+    
+}

application/admin/view/company/add.html

@@ -1,6 +1,12 @@
 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-name" class="form-control" name="row[name]" type="text" value="">
@@ -74,12 +80,12 @@
             <input id="c-address" class="form-control" name="row[address]" type="text" value="">
         </div>
     </div>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Full_address')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-full_address" class="form-control" name="row[full_address]" type="text" value="">
         </div>
-    </div>
+    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Longitude')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -142,6 +148,12 @@
             <input id="c-agent_id" data-rule="required" data-source="agent/index" class="form-control selectpage" name="row[agent_id]" type="text" value="">
         </div>
     </div>
+    <!--<div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Mini_code')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-mini_code" data-rule="required" class="form-control" name="row[mini_code]" type="text" value="">
+        </div>
+    </div>-->
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/company/edit.html

@@ -1,6 +1,12 @@
 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-name" class="form-control" name="row[name]" type="text" value="{$row.name|htmlentities}">
@@ -74,12 +80,12 @@
             <input id="c-address" class="form-control" name="row[address]" type="text" value="{$row.address|htmlentities}">
         </div>
     </div>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Full_address')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-full_address" class="form-control" name="row[full_address]" type="text" value="{$row.full_address|htmlentities}">
         </div>
-    </div>
+    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Longitude')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -142,6 +148,12 @@
             <input id="c-agent_id" data-rule="required" data-source="agent/index" class="form-control selectpage" name="row[agent_id]" type="text" value="{$row.agent_id|htmlentities}">
         </div>
     </div>
+    <!--<div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Mini_code')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-mini_code" data-rule="required" class="form-control" name="row[mini_code]" type="text" value="{$row.mini_code|htmlentities}">
+        </div>
+    </div>-->
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/company/index.html

@@ -18,7 +18,7 @@
                     <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('company/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('company/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
+                        <!--<a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('company/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('company/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         
 
@@ -29,7 +29,7 @@
                                 <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>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"

public/assets/js/backend/company.js

@@ -24,29 +24,35 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 sortName: 'id',
                 fixedColumns: true,
                 fixedRightNumber: 1,
+                search:false,
                 columns: [
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
+//                        {field: 'user_id', title: __('User_id')},
                         {field: 'name', title: __('Name'), operate: 'LIKE'},
                         {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
                         {field: 'contacts', title: __('Contacts'), operate: 'LIKE'},
                         {field: 'mobile', title: __('Mobile'), operate: 'LIKE'},
-                        {field: 'province_name', title: __('Province_name'), operate: 'LIKE'},
-                        {field: 'city_name', title: __('City_name'), operate: 'LIKE'},
-                        {field: 'area_name', title: __('Area_name'), operate: 'LIKE'},
-                        {field: 'province_id', title: __('Province_id'), operate: false,visible:false },
-                        {field: 'city_id', title: __('City_id'), operate: false, visible:false },
-                        {field: 'area_id', title: __('Area_id'), operate: false,visible:false },
-                        {field: 'address', title: __('Address'), operate: 'LIKE'},
+//                        {field: 'province_name', title: __('Province_name'), operate: 'LIKE'},
+//                        {field: 'city_name', title: __('City_name'), operate: 'LIKE'},
+//                        {field: 'area_name', title: __('Area_name'), operate: 'LIKE'},
+//                        {field: 'province_id', title: __('Province_id')},
+//                        {field: 'city_id', title: __('City_id')},
+//                        {field: 'area_id', title: __('Area_id')},
+//                        {field: 'address', title: __('Address'), operate: 'LIKE'},
                         {field: 'full_address', title: __('Full_address'), operate: 'LIKE'},
-                        {field: 'longitude', title: __('Longitude'), operate: false, visible:false },
-                        {field: 'latitude', title: __('Latitude'), operate: false, visible:false },
-                        {field: 'aptitude_images', title: __('Aptitude_images'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images},
+//                        {field: 'longitude', title: __('Longitude'), operate:'BETWEEN'},
+//                        {field: 'latitude', title: __('Latitude'), operate:'BETWEEN'},
+//                        {field: 'aptitude_images', title: __('Aptitude_images'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images},
                         {field: 'status', title: __('Status'), searchList: {"-1":__('Status -1'),"0":__('Status 0'),"1":__('Status 1'),"2":__('Status 2')}, formatter: Table.api.formatter.status},
                         {field: 'is_open', title: __('Is_open'), searchList: {"0":__('Is_open 0'),"1":__('Is_open 1')}, formatter: Table.api.formatter.normal},
                         {field: 'open_hours', title: __('Open_hours'), operate: 'LIKE'},
-                        {field: 'agent_id', title: __('Agent_id')},
+//                        {field: 'agent_id', title: __('Agent_id')},
+//                        {field: 'mini_code', title: __('Mini_code'), operate: 'LIKE'},
+                        {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'wallet.money', title: __('Wallet.money'), operate:'BETWEEN'},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]