完善table组件细节；开始接入城市选择器；

app/admin/controller/test/Goods.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace app\admin\controller\test;
+
+use app\common\controller\AdminController;
+use EasyAdmin\annotation\ControllerAnnotation;
+use EasyAdmin\annotation\NodeAnotation;
+use think\App;
+
+/**
+ * @ControllerAnnotation(title="test_goods")
+ */
+class Goods extends AdminController
+{
+
+    use \app\admin\traits\Curd;
+
+    public function __construct(App $app)
+    {
+        parent::__construct($app);
+
+        $this->model = new \app\admin\model\TestGoods();
+        
+        $this->assign('select_list_status', $this->model::SELECT_LIST_STATUS, true);
+
+        $this->assign('select_list_time_status', $this->model::SELECT_LIST_TIME_STATUS, true);
+
+        $this->assign('select_list_is_recommend', $this->model::SELECT_LIST_IS_RECOMMEND, true);
+
+        $this->assign('select_list_shop_type', $this->model::SELECT_LIST_SHOP_TYPE, true);
+
+    }
+
+    
+    /**
+     * @NodeAnotation(title="列表")
+     */
+    public function index()
+    {
+        if ($this->request->isAjax()) {
+            if (input('selectFields')) {
+                return $this->selectList();
+            }
+            list($page, $limit, $where) = $this->buildTableParames();
+            $count = $this->model
+                ->withJoin('mallCate', 'LEFT')
+                ->where($where)
+                ->count();
+            $list = $this->model
+                ->withJoin('mallCate', 'LEFT')
+                ->where($where)
+                ->page($page, $limit)
+                ->order($this->sort)
+                ->select();
+            $data = [
+                'code'  => 0,
+                'msg'   => '',
+                'count' => $count,
+                'data'  => $list,
+            ];
+            return json($data);
+        }
+        return $this->fetch();
+    }
+}

app/admin/model/TestGoods.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace app\admin\model;
+
+use app\common\model\TimeModel;
+
+class TestGoods extends TimeModel
+{
+
+    protected $name = "test_goods";
+
+    protected $deleteTime = "delete_time";
+
+    
+    public const SELECT_LIST_STATUS = ['0'=>'正常','1'=>'禁用',];
+
+    public const SELECT_LIST_TIME_STATUS = ['0'=>'未参加','1'=>'已开始','3'=>'已结束',];
+
+    public const SELECT_LIST_IS_RECOMMEND = ['0'=>'不推荐','1'=>'推荐',];
+
+    public const SELECT_LIST_SHOP_TYPE = ['taobao'=>'淘宝','jd'=>'京东',];
+
+    
+    
+    public function mallCate()
+    {
+        return $this->belongsTo('\app\admin\model\MallCate', 'cate_id', 'id');
+    }
+
+
+}

app/admin/service/curd/templates/view/module/table.code

@@ -1,3 +1,4 @@
+        
         <div class="layui-form-item">
             <label class="layui-form-label">{{comment}}</label>
             <div class="layui-input-block">

app/admin/view/test/goods/add.html

@@ -0,0 +1,161 @@
+<div class="layuimini-container">
+    <form id="app-form" class="layui-form layuimini-form">
+                
+        <div class="layui-form-item">
+            <label class="layui-form-label">分类ID</label>
+            <div class="layui-input-block">
+                <div data-toggle="table-data" data-index="{:__url('mall.cate/index')}" data-select-type="radio" data-select-value="" data-value-field="id" data-name="cate_id" data-field-name="title" data-required="1">
+
+                </div>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">商品名称</label>
+            <div class="layui-input-block">
+                <input type="text" name="title" class="layui-input" lay-verify="required" placeholder="请输入商品名称" value="">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label required">商品logo</label>
+            <div class="layui-input-block layuimini-upload">
+                <input name="logo" class="layui-input layui-col-xs6" lay-verify="required"  placeholder="请上传商品logo" value="">
+                <div class="layuimini-upload-btn">
+                    <span><a class="layui-btn" data-upload="logo" data-upload-number="one" data-upload-exts="png|jpg|ico|jpeg" data-upload-icon="image"><i class="fa fa-upload"></i> 上传</a></span>
+                    <span><a class="layui-btn layui-btn-normal" id="select_logo" data-upload-select="logo" data-upload-number="one" data-upload-mimetype="image/*"><i class="fa fa-list"></i> 选择</a></span>
+                </div>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label required">商品图片</label>
+            <div class="layui-input-block layuimini-upload">
+                <input name="images" class="layui-input layui-col-xs6" lay-verify="required"  placeholder="请上传商品图片" value="">
+                <div class="layuimini-upload-btn">
+                    <span><a class="layui-btn" data-upload="images" data-upload-number="more" data-upload-exts="png|jpg|ico|jpeg" data-upload-icon="image" data-upload-sign="|"><i class="fa fa-upload"></i> 上传</a></span>
+                    <span><a class="layui-btn layui-btn-normal" id="select_images" data-upload-select="images" data-upload-number="more" data-upload-mimetype="image/*" data-upload-sign="|"><i class="fa fa-list"></i> 选择</a></span>
+                </div>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">商品描述</label>
+            <div class="layui-input-block">
+                <textarea name="describe" rows="20" class="layui-textarea editor" placeholder="请输入商品描述"></textarea>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">总库存</label>
+            <div class="layui-input-block">
+                <input type="text" name="total_stock" class="layui-input" lay-verify="required" placeholder="请输入总库存" value="0">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">排序</label>
+            <div class="layui-input-block">
+                <input type="text" name="sort" class="layui-input" lay-verify="required" placeholder="请输入排序" value="0">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">状态</label>
+            <div class="layui-input-block">
+                {foreach $select_list_status as $k=>$v}
+                <input type="radio" name="status" value="{$k}" title="{$v}" {in name="k" value="0"}checked=""{/in}>
+                {/foreach}
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <label class="layui-form-label required">合格证</label>
+            <div class="layui-input-block layuimini-upload">
+                <input name="cert_file" class="layui-input layui-col-xs6" lay-verify="required"  placeholder="请上传合格证" value="">
+                <div class="layuimini-upload-btn">
+                    <span><a class="layui-btn" data-upload="cert_file" data-upload-number="one" data-upload-exts="zip" data-upload-icon="file" data-disable-preview="1"><i class="fa fa-upload"></i> 上传</a></span>
+                    <span><a class="layui-btn layui-btn-normal" id="select_cert_file" data-upload-select="cert_file" data-upload-number="one" data-upload-mimetype="*"><i class="fa fa-list"></i> 选择</a></span>
+                </div>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label required">检测报告</label>
+            <div class="layui-input-block layuimini-upload">
+                <input name="verfiy_file" class="layui-input layui-col-xs6" lay-verify="required"  placeholder="请上传检测报告" value="">
+                <div class="layuimini-upload-btn">
+                    <span><a class="layui-btn" data-upload="verfiy_file" data-upload-number="more" data-upload-exts="zip" data-upload-icon="file" data-disable-preview="1"><i class="fa fa-upload" data-upload-sign="|" ></i> 上传</a></span>
+                    <span><a class="layui-btn layui-btn-normal" id="select_verfiy_file" data-upload-select="verfiy_file" data-upload-number="more" data-upload-mimetype="*" data-upload-sign="|"><i class="fa fa-list"></i> 选择</a></span>
+                </div>
+            </div>
+        </div>
+        <div class="layui-form-item layui-form-text">
+            <label class="layui-form-label">备注说明</label>
+            <div class="layui-input-block">
+                <textarea name="remark" class="layui-textarea" lay-verify="required" placeholder="请输入备注说明"></textarea>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">发布日期</label>
+            <div class="layui-input-block">
+                <input type="text" name="publish_time" data-date="" data-date-type="date" class="layui-input" lay-verify="required" placeholder="请输入发布日期" value="">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">售卖日期</label>
+            <div class="layui-input-block">
+                <input type="text" name="sale_time" data-date="" data-date-type="datetime" class="layui-input" lay-verify="required" placeholder="请输入售卖日期" value="">
+            </div>
+        </div>
+        <div class="layui-form-item layui-form-text">
+            <label class="layui-form-label">简介</label>
+            <div class="layui-input-block">
+                <textarea name="intro" class="layui-textarea" lay-verify="required" placeholder="请输入简介"></textarea>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">秒杀状态</label>
+            <div class="layui-input-block">
+                <select name="time_status" lay-verify="required">
+                    <option value=''></option>
+                    {foreach $select_list_time_status as $k=>$v}
+                    <option value='{$k}' >{$v}</option>
+                    {/foreach}
+                </select>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">是否推荐</label>
+            <div class="layui-input-block">
+                {foreach $select_list_is_recommend as $k=>$v}
+                <input type="radio" name="is_recommend" value="{$k}" title="{$v}" {in name="k" value=""}checked=""{/in}>
+                {/foreach}
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <label class="layui-form-label">商品类型</label>
+            <div class="layui-input-block">
+                {foreach $select_list_shop_type as $k=>$v}
+                <input type="checkbox" name="shop_type[]" value="{$k}" lay-skin="primary" title="{$v}" {in name="k" value=""}checked=""{/in}>
+                {/foreach}
+            </div>
+        </div>
+        
+        <div class="layui-form-item">
+            <label class="layui-form-label">商品标签</label>
+            <div class="layui-input-block">
+                <div data-toggle="table-data" data-index="{:__url('mall.tag/index')}" data-select-type="checkbox" data-select-value="" data-value-field="id" data-name="tag" data-field-name="title" data-required="1">
+
+                </div>
+            </div>
+        </div>        
+        <div class="layui-form-item">
+            <label class="layui-form-label">商品标签2</label>
+            <div class="layui-input-block">
+                <div data-toggle="table-data" data-index="{:__url('mall.tag/index')}" data-select-type="checkbox" data-select-value="" data-value-field="id" data-name="tag_backup" data-field-name="title" data-required="">
+
+                </div>
+            </div>
+        </div>
+        <div class="hr-line"></div>
+        <div class="layui-form-item text-center">
+            <button type="submit" class="layui-btn layui-btn-normal layui-btn-sm" lay-submit>确认</button>
+            <button type="reset" class="layui-btn layui-btn-primary layui-btn-sm">重置</button>
+        </div>
+
+    </form>
+</div>

app/admin/view/test/goods/edit.html

@@ -0,0 +1,169 @@
+<div class="layuimini-container">
+    <form id="app-form" class="layui-form layuimini-form">
+
+        <div class="layui-form-item">
+            <label class="layui-form-label">分类ID</label>
+            <div class="layui-input-block">
+                <div data-toggle="table-data" data-index="{:__url('mall.cate/index')}" data-select-type="radio" data-select-value="{$row.cate_id|default=''}" data-value-field="id" data-name="cate_id" data-field-name="title" data-required="1">
+
+                </div>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">商品名称</label>
+            <div class="layui-input-block">
+                <input type="text" name="title" class="layui-input" lay-verify="required" placeholder="请输入商品名称" value="{$row.title|default=''}">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label required">商品logo</label>
+            <div class="layui-input-block layuimini-upload">
+                <input name="logo" class="layui-input layui-col-xs6" lay-verify="required" placeholder="请上传商品logo" value="{$row.logo|default=''}">
+                <div class="layuimini-upload-btn">
+                    <span><a class="layui-btn" data-upload="logo" data-upload-number="one" data-upload-exts="png|jpg|ico|jpeg" data-upload-icon="image"><i class="fa fa-upload"></i> 上传</a></span>
+                    <span><a class="layui-btn layui-btn-normal" id="select_logo" data-upload-select="logo" data-upload-number="one" data-upload-mimetype="image/*"><i class="fa fa-list"></i> 选择</a></span>
+                </div>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label required">商品图片</label>
+            <div class="layui-input-block layuimini-upload">
+                <input name="images" class="layui-input layui-col-xs6" lay-verify="required" placeholder="请上传商品图片" value="{$row.images|default=''}">
+                <div class="layuimini-upload-btn">
+                    <span><a class="layui-btn" data-upload="images" data-upload-number="more" data-upload-exts="png|jpg|ico|jpeg" data-upload-icon="image" data-upload-sign=""><i class="fa fa-upload"></i> 上传</a></span>
+                    <span><a class="layui-btn layui-btn-normal" id="select_images" data-upload-select="images" data-upload-number="more" data-upload-mimetype="image/*" data-upload-sign=""><i class="fa fa-list"></i> 选择</a></span>
+                </div>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">商品描述</label>
+            <div class="layui-input-block">
+                <textarea name="describe" rows="20" class="layui-textarea editor" placeholder="请输入商品描述">{$row.describe|raw|default=''}</textarea>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">总库存</label>
+            <div class="layui-input-block">
+                <input type="text" name="total_stock" class="layui-input" lay-verify="required" placeholder="请输入总库存" value="{$row.total_stock|default=''}">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">排序</label>
+            <div class="layui-input-block">
+                <input type="text" name="sort" class="layui-input" lay-verify="required" placeholder="请输入排序" value="{$row.sort|default=''}">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">状态</label>
+            <div class="layui-input-block">
+                {foreach $select_list_status as $k=>$v}
+                <input type="radio" name="status" value="{$k}" title="{$v}" {in name="k" value="$row.status" }checked="" {/in}>
+                {/foreach}
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <label class="layui-form-label required">合格证</label>
+            <div class="layui-input-block layuimini-upload">
+                <input name="cert_file" class="layui-input layui-col-xs6" lay-verify="required" placeholder="请上传合格证" value="{$row.cert_file|default=''}">
+                <div class="layuimini-upload-btn">
+                    <span><a class="layui-btn" data-upload="cert_file" data-upload-number="one" data-upload-exts="zip" data-upload-icon="file" data-disable-preview="1"><i class="fa fa-upload"></i> 上传</a></span>
+                    <span><a class="layui-btn layui-btn-normal" id="select_cert_file" data-upload-select="cert_file" data-upload-number="one" data-upload-mimetype="*"><i class="fa fa-list"></i> 选择</a></span>
+                </div>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label required">检测报告</label>
+            <div class="layui-input-block layuimini-upload">
+                <input name="verfiy_file" class="layui-input layui-col-xs6" lay-verify="required" placeholder="请上传检测报告" value="{$row.verfiy_file|default=''}">
+                <div class="layuimini-upload-btn">
+                    <span><a class="layui-btn" data-upload="verfiy_file" data-upload-number="more" data-upload-exts="zip" data-upload-icon="file" data-disable-preview="1"><i class="fa fa-upload" data-upload-sign=""></i> 上传</a></span>
+                    <span><a class="layui-btn layui-btn-normal" id="select_verfiy_file" data-upload-select="verfiy_file" data-upload-number="more" data-upload-mimetype="*" data-upload-sign=""><i class="fa fa-list"></i> 选择</a></span>
+                </div>
+            </div>
+        </div>
+        <div class="layui-form-item layui-form-text">
+            <label class="layui-form-label">备注说明</label>
+            <div class="layui-input-block">
+                <textarea name="remark" class="layui-textarea" lay-verify="required" placeholder="请输入备注说明">{$row.remark|raw|default=''}</textarea>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">发布日期</label>
+            <div class="layui-input-block">
+                <input type="text" name="publish_time" data-date="" data-date-type="date" class="layui-input" lay-verify="required" placeholder="请输入发布日期" value="{$row.publish_time|default=''}">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">售卖日期</label>
+            <div class="layui-input-block">
+                <input type="text" name="sale_time" data-date="" data-date-type="datetime" class="layui-input" lay-verify="required" placeholder="请输入售卖日期" value="{$row.sale_time|default=''}">
+            </div>
+        </div>
+        <div class="layui-form-item layui-form-text">
+            <label class="layui-form-label">简介</label>
+            <div class="layui-input-block">
+                <textarea name="intro" class="layui-textarea" lay-verify="required" placeholder="请输入简介">{$row.intro|raw|default=''}</textarea>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">秒杀状态</label>
+            <div class="layui-input-block">
+                <select name="time_status" lay-verify="required">
+                    <option value=''></option>
+                    {foreach $select_list_time_status as $k=>$v}
+                    <option value='{$k}' {in name="k" value="$row.time_status" }selected="" {/in}>{$v}</option>
+                    {/foreach}
+                </select>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">是否推荐</label>
+            <div class="layui-input-block">
+                {foreach $select_list_is_recommend as $k=>$v}
+                <input type="radio" name="is_recommend" value="{$k}" title="{$v}" {in name="k" value="$row.is_recommend" }checked="" {/in}>
+                {/foreach}
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <label class="layui-form-label">商品类型</label>
+            <div class="layui-input-block">
+                {foreach $select_list_shop_type as $k=>$v}
+                <input type="checkbox" name="shop_type[]" value="{$k}" lay-skin="primary" title="{$v}" {in name="k" value="$row.shop_type" }checked="" {/in}>
+                {/foreach}
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <label class="layui-form-label">商品标签</label>
+            <div class="layui-input-block">
+                <div data-toggle="table-data" data-index="{:__url('mall.tag/index')}" data-select-type="checkbox" data-select-value="{$row.tag|default=''}" data-value-field="id" data-name="tag" data-field-name="title" data-required="1">
+
+                </div>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">商品标签2</label>
+            <div class="layui-input-block">
+                <div data-toggle="table-data" data-index="{:__url('mall.tag/index')}" data-select-type="checkbox" data-select-value="{$row.tag_backup|default=''}" data-value-field="id" data-name="tag_backup" data-field-name="title" data-required="">
+
+                </div>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">产地</label>
+            <div class="layui-input-block">
+
+                <input class="layui-input" name="area_street" value="山东省/临沂市/沂南县" readonly type="text" data-toggle="city-picker">
+
+            </div>
+        </div>
+        <div class="hr-line"></div>
+        <div class="layui-form-item text-center">
+            <button type="submit" class="layui-btn layui-btn-normal layui-btn-sm" lay-submit>确认</button>
+            <button type="reset" class="layui-btn layui-btn-primary layui-btn-sm">重置</button>
+        </div>
+
+    </form>
+</div>

app/admin/view/test/goods/index.html

@@ -0,0 +1,10 @@
+<div class="layuimini-container">
+    <div class="layuimini-main">
+        <table id="currentTable" class="layui-table layui-hide"
+               data-auth-add="{:auth('test.goods/add')}"
+               data-auth-edit="{:auth('test.goods/edit')}"
+               data-auth-delete="{:auth('test.goods/delete')}"
+               lay-filter="currentTable">
+        </table>
+    </div>
+</div>

public/static/admin/css/public.css

@@ -1,6 +1,7 @@
 @import url("../../plugs/layui-v2.7.2/css/layui.css");
 @import url("../../plugs/font-awesome-4.7.0/css/font-awesome.min.css");
 @import url("../css/iconfont.css");
+@import url('../../plugs/jq-module/city-picker/css/city-picker.css');
 
 html,
 body {
@@ -620,6 +621,32 @@ table样式
     display: flex;
     width  : 274px;
 }
+
 .form-item-number-limit .layui-input-inline {
     display: flex;
+}
+
+/* 重写地区选择器的样式 */
+
+.city-picker-span {
+    height          : 38px;
+    border-width    : 1px;
+    border-style    : solid;
+    background-color: #fff;
+    color           : rgba(0, 0, 0, .85);
+    border-radius   : 2px;
+    border-color    : #eee;
+}
+
+.city-picker-span:hover {
+    border-color: #eee !important;
+}
+
+.city-picker-span>.placeholder {
+    padding-left: 10px;
+}
+
+.city-picker-span.focus,
+.city-picker-span.open {
+    border-color: #d2d2d2 !important;
 }

public/static/admin/js/test/goods.js

@@ -0,0 +1,34 @@
+define(["jquery", "easy-admin"], function ($, ea) {
+
+    var init = {
+        table_elem: '#currentTable',
+        table_render_id: 'currentTableRenderId',
+        index_url: 'test.goods/index',
+        add_url: 'test.goods/add',
+        edit_url: 'test.goods/edit',
+        delete_url: 'test.goods/delete',
+        export_url: 'test.goods/export',
+        modify_url: 'test.goods/modify',
+    };
+
+    var Controller = {
+
+        index: function () {
+            ea.table.render({
+                init: init,
+                cols: [[
+                    {type: 'checkbox'},
+                    {field: 'id', title: 'id'},
+                    {field: 'cate_id', title: '分类ID'},
+                    {field: 'title', title: '商品名称'},
+                    {field: 'logo', title: '商品logo', templet: ea.table.image},
+                    {field: 'total_stock', title: '总库存'},
+                    {field: 'sort', title: '排序', edit: 'text'},
+                    {field: 'status', search: 'select', selectList: ea.getDataBrage('select_list_status'), title: '状态', templet: ea.table.switch},
+                    {field: 'cert_file', title: '合格证', templet: ea.table.url},
+                    {field: 'remark', title: '备注说明', templet: ea.table.text},
+                    {field: 'create_time', title: 'create_time'},
+                    {field: 'publish_time', title: '发布日期'},
+                    {field: 'sale_time', title: '售卖日期'},
+                    {field: 'intro', title: '简介'},
+                    {field: 'time_status', search: 'select', selectList: ea.getDataBrage('select_list_time_status'), title: '秒杀状态'},

public/static/config-admin.js

@@ -22,6 +22,8 @@ require.config({
         "autocomplete": ["plugs/lay-module/autocomplete/autocomplete"],
         "vue": ["plugs/vue-2.6.10/vue.min"],
         "ckeditor": ["plugs/ckeditor4/ckeditor"],
+        'citypicker': ['plugs/jq-module/city-picker/js/city-picker.min'],
+        'ChineseDistricts': ['plugs/jq-module/city-picker/js/city-picker.data.min'],
     }
 });
 

public/static/plugs/easy-admin/easy-admin.js

@@ -1,4 +1,4 @@
-define(["jquery", "tableSelect", "ckeditor", 'miniTheme', 'tableData'], function ($, tableSelect, undefined, miniTheme, tableData) {
+define(["jquery", "tableSelect", "ckeditor", 'miniTheme', 'tableData','citypicker'], function ($, tableSelect, undefined, miniTheme, tableData) {
 
     window.onInitElemStyle = function () {
         miniTheme.renderElemStyle()
@@ -1708,6 +1708,20 @@ define(["jquery", "tableSelect", "ckeditor", 'miniTheme', 'tableData'], function
                                 });
                             }
 
+                            var cityList= $(v).closest('.layui-form').find('[data-toggle="city-picker"]');
+
+                            if(cityList.length > 0){
+                                $.each(cityList, function (i, v) {
+                                    console.log(i);
+                                    console.log(v);
+                                    var code = $(v).data('citypicker').getCode(type);
+                                    var text = $(v).data('citypicker').getVal(type);
+
+                                    console.log(code);
+                                    console.log(text);
+                                })
+                            }
+
                             if (typeof preposeCallback === 'function') {
                                 dataField = preposeCallback(dataField);
                             }

public/static/plugs/jq-module/city-picker/css/city-picker.css

@@ -0,0 +1,162 @@
+.city-picker-input {
+    opacity: 0 !important;
+    top: -9999px;
+    left: -9999px;
+    position: absolute;
+}
+
+.city-picker-span {
+    position: relative;
+    display: block;
+    outline: 0;
+    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+    border-bottom: 1px solid #ccc;
+    background-color: #fff;
+    color: #ccc;
+    cursor: pointer;
+}
+
+.city-picker-span > .placeholder {
+    color: #aaa;
+}
+
+.city-picker-span > .arrow {
+    position: absolute;
+    top: 50%;
+    right: 8px;
+    width: 10px;
+    margin-top: -3px;
+    height: 5px;
+    background: url(../images/drop-arrow.png) -10px -25px no-repeat;
+}
+
+.city-picker-span.focus,
+.city-picker-span.open {
+    border-bottom-color: #46A4FF;
+}
+
+.city-picker-span.open > .arrow {
+    background-position: -10px -10px;
+}
+
+.city-picker-span > .title > span {
+    color: #333;
+    padding: 5px;
+    border-radius: 3px;
+}
+
+.city-picker-span > .title > span:hover {
+    background-color: #f1f8ff;
+}
+
+.city-picker-dropdown {
+    position: absolute;
+    width: 315px;
+    left: -9999px;
+    top: -9999px;
+    outline: 0;
+    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+    z-index: 999999;
+    display: none;
+    min-width: 330px;
+    margin-bottom: 20px;
+}
+
+.city-select-wrap {
+    box-shadow: 0 1px 5px rgba(0, 0, 0, 0.5);
+}
+
+.city-select-tab {
+    border-bottom: 1px solid #ccc;
+    background: #f0f0f0;
+    font-size: 13px;
+}
+
+.city-select-tab > a {
+    display: inline-block;
+    padding: 8px 22px;
+    border-left: 1px solid #ccc;
+    border-bottom: 1px solid transparent;
+    color: #4D4D4D;
+    text-align: center;
+    outline: 0;
+    text-decoration: none;
+    cursor: pointer;
+    font-size: 14px;
+    margin-bottom: -1px;
+}
+
+.city-select-tab > a.active {
+    background: #fff;
+    border-bottom: 1px solid #fff;
+    color: #46A4FF;
+}
+
+.city-select-tab > a:first-child {
+    border-left: none;
+}
+
+.city-select-tab > a:last-child.active {
+    border-right: 1px solid #ccc;
+}
+
+.city-select-content {
+    width: 100%;
+    min-height: 10px;
+    background-color: #fff;
+    padding: 10px 15px;
+	box-sizing: border-box;
+}
+
+.city-select {
+    font-size: 13px;
+}
+
+.city-select dl {
+    line-height: 2;
+    clear: both;
+    padding: 3px 0;
+    margin: 0;
+}
+
+.city-select dt {
+    position: absolute;
+    width: 2.5em;
+    font-weight: 500;
+    text-align: right;
+    line-height: 2;
+}
+
+.city-select dd {
+    margin-left: 0;
+    line-height: 2;
+}
+
+.city-select.province dd {
+    margin-left: 3em;
+}
+
+.city-select a {
+    display: inline-block;
+    padding: 0 10px;
+    outline: 0;
+    text-decoration: none;
+    white-space: nowrap;
+    margin-right: 2px;
+    text-decoration: none;
+    color: #333;
+    cursor: pointer;
+}
+
+.city-select a:hover,
+.city-select a:focus {
+    background-color: #f1f8ff;
+    border-radius: 2px;
+    color: #46A4FF;
+}
+
+.city-select a.active {
+    background-color: #46A4FF;
+    color: #fff;
+    border-radius: 2px;
+}

public/static/plugs/jq-module/city-picker/js/city-picker.js

@@ -0,0 +1,647 @@
+/*!
+ * CityPicker v1.2.0
+ * https://github.com/tshi0912/citypicker
+ *
+ * Copyright (c) 2015-2018 Tao Shi
+ * Released under the MIT license
+ *
+ * Date: 2018-04-12T04:27:10.483Z
+ */
+
+(function (factory) {
+    if (typeof define === 'function' && define.amd) {
+        // AMD. Register as anonymous module.
+        define(['jquery', 'ChineseDistricts'], factory);
+    } else if (typeof exports === 'object') {
+        // Node / CommonJS
+        factory(require('jquery'), require('ChineseDistricts'));
+    } else {
+        // Browser globals.
+        factory(jQuery, ChineseDistricts);
+    }
+})(function ($, ChineseDistricts) {
+
+    'use strict';
+
+    if (typeof ChineseDistricts === 'undefined') {
+        throw new Error('The file "city-picker.data.js" must be included first!');
+    }
+
+    var NAMESPACE = 'citypicker';
+    var EVENT_CHANGE = 'change.' + NAMESPACE;
+    var PROVINCE = 'province';
+    var CITY = 'city';
+    var DISTRICT = 'district';
+
+    function CityPicker(element, options) {
+        this.$element = $(element);
+        this.$dropdown = null;
+        this.options = $.extend({}, CityPicker.DEFAULTS, $.isPlainObject(options) && options);
+        this.active = false;
+        this.dems = [];
+        this.needBlur = false;
+        this.init();
+    }
+
+    CityPicker.prototype = {
+        constructor: CityPicker,
+
+        init: function () {
+
+            this.codeRender();
+
+            this.defineDems();
+
+            this.render();
+
+            this.bind();
+
+            this.active = true;
+        },
+
+        codeRender: function(){
+            var code = this.$element.attr('code');
+            if(code!==undefined && code !== '' && !isNaN(Number(code))) this.$element.val($.fn.citypicker.getAddressbyCodeId(code));
+        },
+
+        render: function () {
+            var p = this.getPosition(),
+                placeholder = this.$element.attr('placeholder') || this.options.placeholder,
+                textspan = '<span class="city-picker-span" style="' +
+                    this.getWidthStyle(p.width) + 'height:' +
+                    p.height + 'px;line-height:' + (p.height - 1) + 'px;">' +
+                    (placeholder ? '<span class="placeholder">' + placeholder + '</span>' : '') +
+                    '<span class="title"></span><div class="arrow"></div>' + '</span>',
+
+                dropdown = '<div class="city-picker-dropdown" style="left:0px;top:100%;' +
+                    this.getWidthStyle(p.width, true) + '">' +
+                    '<div class="city-select-wrap">' +
+                    '<div class="city-select-tab">' +
+                    '<a class="active" data-count="province">省份</a>' +
+                    (this.includeDem('city') ? '<a data-count="city">城市</a>' : '') +
+                    (this.includeDem('district') ? '<a data-count="district">区县</a>' : '') + '</div>' +
+                    '<div class="city-select-content">' +
+                    '<div class="city-select province" data-count="province"></div>' +
+                    (this.includeDem('city') ? '<div class="city-select city" data-count="city"></div>' : '') +
+                    (this.includeDem('district') ? '<div class="city-select district" data-count="district"></div>' : '') +
+                    '</div></div>';
+
+            this.$element.addClass('city-picker-input');
+            this.$textspan = $(textspan).insertAfter(this.$element);
+            this.$dropdown = $(dropdown).insertAfter(this.$textspan);
+            var $select = this.$dropdown.find('.city-select');
+
+            // setup this.$province, this.$city and/or this.$district object
+            $.each(this.dems, $.proxy(function (i, type) {
+                this['$' + type] = $select.filter('.' + type + '');
+            }, this));
+
+            this.refresh();
+        },
+
+        refresh: function (force) {
+            // clean the data-item for each $select
+            var $select = this.$dropdown.find('.city-select');
+            $select.data('item', null);
+            // parse value from value of the target $element
+            var val = this.$element.val() || '';
+            val = val.split('/');
+            $.each(this.dems, $.proxy(function (i, type) {
+                if (val[i] && i < val.length) {
+                    this.options[type] = val[i];
+                } else if (force) {
+                    this.options[type] = '';
+                }
+                this.output(type);
+            }, this));
+            this.tab(PROVINCE);
+            this.feedText();
+            this.feedVal();
+        },
+
+        defineDems: function () {
+            var stop = false;
+            $.each([PROVINCE, CITY, DISTRICT], $.proxy(function (i, type) {
+                if (!stop) {
+                    this.dems.push(type);
+                }
+                if (type === this.options.level) {
+                    stop = true;
+                }
+            }, this));
+        },
+
+        includeDem: function (type) {
+            return $.inArray(type, this.dems) !== -1;
+        },
+
+        getPosition: function () {
+            var p, h, w, s, pw;
+            p = this.$element.position();
+            s = this.getSize(this.$element);
+            h = s.height;
+            w = s.width;
+            if (this.options.responsive) {
+                pw = this.$element.offsetParent().width();
+                if (pw) {
+                    w = w / pw;
+                    if (w > 0.99) {
+                        w = 1;
+                    }
+                    w = w * 100 + '%';
+                }
+            }
+
+            return {
+                top: p.top || 0,
+                left: p.left || 0,
+                height: h,
+                width: w
+            };
+        },
+
+        getSize: function ($dom) {
+            var $wrap, $clone, sizes;
+            if (!$dom.is(':visible')) {
+                $wrap = $("<div />").appendTo($("body"));
+                $wrap.css({
+                    "position": "absolute !important",
+                    "visibility": "hidden !important",
+                    "display": "block !important"
+                });
+
+                $clone = $dom.clone().appendTo($wrap);
+
+                sizes = {
+                    width: $clone.outerWidth(),
+                    height: $clone.outerHeight()
+                };
+
+                $wrap.remove();
+            } else {
+                sizes = {
+                    width: $dom.outerWidth(),
+                    height: $dom.outerHeight()
+                };
+            }
+
+            return sizes;
+        },
+
+        getWidthStyle: function (w, dropdown) {
+            if (this.options.responsive && !$.isNumeric(w)) {
+                return 'width:' + w + ';';
+            } else {
+                return 'width:' + (dropdown ? Math.max(320, w) : w) + 'px;';
+            }
+        },
+
+        bind: function () {
+            var $this = this;
+
+            $(document).on('click', (this._mouteclick = function (e) {
+                var $target = $(e.target);
+                var $dropdown, $span, $input;
+                if ($target.is('.city-picker-span')) {
+                    $span = $target;
+                } else if ($target.is('.city-picker-span *')) {
+                    $span = $target.parents('.city-picker-span');
+                }
+                if ($target.is('.city-picker-input')) {
+                    $input = $target;
+                }
+                if ($target.is('.city-picker-dropdown')) {
+                    $dropdown = $target;
+                } else if ($target.is('.city-picker-dropdown *')) {
+                    $dropdown = $target.parents('.city-picker-dropdown');
+                }
+                if ((!$input && !$span && !$dropdown) ||
+                    ($span && $span.get(0) !== $this.$textspan.get(0)) ||
+                    ($input && $input.get(0) !== $this.$element.get(0)) ||
+                    ($dropdown && $dropdown.get(0) !== $this.$dropdown.get(0))) {
+                    $this.close(true);
+                }
+
+            }));
+
+            this.$element.on('change', (this._changeElement = $.proxy(function () {
+                this.close(true);
+                this.refresh(true);
+            }, this))).on('focus', (this._focusElement = $.proxy(function () {
+                this.needBlur = true;
+                this.open();
+            }, this))).on('blur', (this._blurElement = $.proxy(function () {
+                if (this.needBlur) {
+                    this.needBlur = false;
+                    this.close(true);
+                }
+            }, this)));
+
+            this.$textspan.on('click', function (e) {
+                var $target = $(e.target), type;
+                $this.needBlur = false;
+                if ($target.is('.select-item')) {
+                    type = $target.data('count');
+                    $this.open(type);
+                } else {
+                    if ($this.$dropdown.is(':visible')) {
+                        $this.close();
+                    } else {
+                        $this.open();
+                    }
+                }
+            }).on('mousedown', function () {
+                $this.needBlur = false;
+            });
+
+            this.$dropdown.on('click', '.city-select a', function () {
+                var $select = $(this).parents('.city-select');
+                var $active = $select.find('a.active');
+                var last = $select.next().length === 0;
+                $active.removeClass('active');
+                $(this).addClass('active');
+                if ($active.data('code') !== $(this).data('code')) {
+                    $select.data('item', {
+                        address: $(this).attr('title'), code: $(this).data('code')
+                    });
+                    $(this).trigger(EVENT_CHANGE);
+                    $this.feedText();
+                    $this.feedVal(true);
+                    if (last) {
+                        $this.close();
+                    }
+                }
+            }).on('click', '.city-select-tab a', function () {
+                if (!$(this).hasClass('active')) {
+                    var type = $(this).data('count');
+                    $this.tab(type);
+                }
+            }).on('mousedown', function () {
+                $this.needBlur = false;
+            });
+
+            if (this.$province) {
+                this.$province.on(EVENT_CHANGE, (this._changeProvince = $.proxy(function () {
+                    this.output(CITY);
+                    this.output(DISTRICT);
+                    this.tab(CITY);
+                }, this)));
+            }
+
+            if (this.$city) {
+                this.$city.on(EVENT_CHANGE, (this._changeCity = $.proxy(function () {
+                    this.output(DISTRICT);
+                    this.tab(DISTRICT);
+                }, this)));
+            }
+        },
+
+        open: function (type) {
+            type = type || PROVINCE;
+            this.$dropdown.show();
+            this.$textspan.addClass('open').addClass('focus');
+            this.tab(type);
+        },
+
+        close: function (blur) {
+            this.$dropdown.hide();
+            this.$textspan.removeClass('open');
+            if (blur) {
+                this.$textspan.removeClass('focus');
+            }
+        },
+
+        unbind: function () {
+
+            $(document).off('click', this._mouteclick);
+
+            this.$element.off('change', this._changeElement);
+            this.$element.off('focus', this._focusElement);
+            this.$element.off('blur', this._blurElement);
+
+            this.$textspan.off('click');
+            this.$textspan.off('mousedown');
+
+            this.$dropdown.off('click');
+            this.$dropdown.off('mousedown');
+
+            if (this.$province) {
+                this.$province.off(EVENT_CHANGE, this._changeProvince);
+            }
+
+            if (this.$city) {
+                this.$city.off(EVENT_CHANGE, this._changeCity);
+            }
+        },
+
+        getText: function () {
+            var text = '';
+            this.$dropdown.find('.city-select')
+                .each(function () {
+                    var item = $(this).data('item'),
+                        type = $(this).data('count');
+                    if (item) {
+                        text += ($(this).hasClass('province') ? '' : '/') + '<span class="select-item" data-count="' +
+                            type + '" data-code="' + item.code + '">' + item.address + '</span>';
+                    }
+                });
+            return text;
+        },
+
+        getPlaceHolder: function () {
+            return this.$element.attr('placeholder') || this.options.placeholder;
+        },
+
+        feedText: function () {
+            var text = this.getText();
+            if (text) {
+                this.$textspan.find('>.placeholder').hide();
+                this.$textspan.find('>.title').html(this.getText()).show();
+            } else {
+                this.$textspan.find('>.placeholder').text(this.getPlaceHolder()).show();
+                this.$textspan.find('>.title').html('').hide();
+            }
+        },
+
+        getCode: function (count) {
+            var obj = {}, arr = [];
+            this.$textspan.find('.select-item')
+                .each(function () {
+                    var code = $(this).data('code');
+                    var count = $(this).data('count');
+                    obj[count] = code;
+                    arr.push(code);
+                });
+            return count ? obj[count] : arr.join('/');
+        },
+
+        getVal: function () {
+            var text = '';
+            this.$dropdown.find('.city-select')
+                .each(function () {
+                    var item = $(this).data('item');
+                    if (item) {
+                        text += ($(this).hasClass('province') ? '' : '/') + item.address;
+                    }
+                });
+            return text;
+        },
+
+        feedVal: function (trigger) {
+            this.$element.val(this.getVal());
+            if(trigger) {
+                this.$element.trigger('cp:updated');
+            }
+        },
+
+        output: function (type) {
+            var options = this.options;
+            //var placeholders = this.placeholders;
+            var $select = this['$' + type];
+            var data = type === PROVINCE ? {} : [];
+            var item;
+            var districts;
+            var code;
+            var matched = null;
+            var value;
+
+            if (!$select || !$select.length) {
+                return;
+            }
+
+            item = $select.data('item');
+
+            value = (item ? item.address : null) || options[type];
+
+            code = (
+                type === PROVINCE ? 86 :
+                    type === CITY ? this.$province && this.$province.find('.active').data('code') :
+                        type === DISTRICT ? this.$city && this.$city.find('.active').data('code') : code
+            );
+
+            districts = $.isNumeric(code) ? ChineseDistricts[code] : null;
+
+            if ($.isPlainObject(districts)) {
+                $.each(districts, function (code, address) {
+                    var provs;
+                    if (type === PROVINCE) {
+                        provs = [];
+                        for (var i = 0; i < address.length; i++) {
+                            if (address[i].address === value) {
+                                matched = {
+                                    code: address[i].code,
+                                    address: address[i].address
+                                };
+                            }
+                            provs.push({
+                                code: address[i].code,
+                                address: address[i].address,
+                                selected: address[i].address === value
+                            });
+                        }
+                        data[code] = provs;
+                    } else {
+                        if (address === value) {
+                            matched = {
+                                code: code,
+                                address: address
+                            };
+                        }
+                        data.push({
+                            code: code,
+                            address: address,
+                            selected: address === value
+                        });
+                    }
+                });
+            }
+
+            $select.html(type === PROVINCE ? this.getProvinceList(data) :
+                this.getList(data, type));
+            $select.data('item', matched);
+        },
+
+        getProvinceList: function (data) {
+            var list = [],
+                $this = this,
+                simple = this.options.simple;
+
+            $.each(data, function (i, n) {
+                list.push('<dl class="clearfix">');
+                list.push('<dt>' + i + '</dt><dd>');
+                $.each(n, function (j, m) {
+                    list.push(
+                        '<a' +
+                        ' title="' + (m.address || '') + '"' +
+                        ' data-code="' + (m.code || '') + '"' +
+                        ' class="' +
+                        (m.selected ? ' active' : '') +
+                        '">' +
+                        ( simple ? $this.simplize(m.address, PROVINCE) : m.address) +
+                        '</a>');
+                });
+                list.push('</dd></dl>');
+            });
+
+            return list.join('');
+        },
+
+        getList: function (data, type) {
+            var list = [],
+                $this = this,
+                simple = this.options.simple;
+            list.push('<dl class="clearfix"><dd>');
+
+            $.each(data, function (i, n) {
+                list.push(
+                    '<a' +
+                    ' title="' + (n.address || '') + '"' +
+                    ' data-code="' + (n.code || '') + '"' +
+                    ' class="' +
+                    (n.selected ? ' active' : '') +
+                    '">' +
+                    ( simple ? $this.simplize(n.address, type) : n.address) +
+                    '</a>');
+            });
+            list.push('</dd></dl>');
+
+            return list.join('');
+        },
+
+        simplize: function (address, type) {
+            address = address || '';
+            if (type === PROVINCE) {
+                return address.replace(/[省,市,自治区,壮族,回族,维吾尔]/g, '');
+            } else if (type === CITY) {
+                return address.replace(/[市,地区,回族,蒙古,苗族,白族,傣族,景颇族,藏族,彝族,壮族,傈僳族,布依族,侗族]/g, '')
+                    .replace('哈萨克', '').replace('自治州', '').replace(/自治县/, '');
+            } else if (type === DISTRICT) {
+                return address.length > 2 ? address.replace(/[市,区,县,旗]/g, '') : address;
+            }
+        },
+
+        tab: function (type) {
+            var $selects = this.$dropdown.find('.city-select');
+            var $tabs = this.$dropdown.find('.city-select-tab > a');
+            var $select = this['$' + type];
+            var $tab = this.$dropdown.find('.city-select-tab > a[data-count="' + type + '"]');
+            if ($select) {
+                $selects.hide();
+                $select.show();
+                $tabs.removeClass('active');
+                $tab.addClass('active');
+            }
+        },
+
+        reset: function () {
+            this.$element.val(null).trigger('change');
+        },
+
+        destroy: function () {
+            this.unbind();
+            this.$element.removeData(NAMESPACE).removeClass('city-picker-input');
+            this.$textspan.remove();
+            this.$dropdown.remove();
+        }
+    };
+
+    CityPicker.DEFAULTS = {
+        simple: false,
+        responsive: false,
+        placeholder: '请选择省/市/区',
+        level: 'district',
+        province: '',
+        city: '',
+        district: ''
+    };
+
+    CityPicker.setDefaults = function (options) {
+        $.extend(CityPicker.DEFAULTS, options);
+    };
+
+    // Save the other citypicker
+    CityPicker.other = $.fn.citypicker;
+
+    // Register as jQuery plugin
+    $.fn.citypicker = function (option) {
+        var args = [].slice.call(arguments, 1);
+
+        return this.each(function () {
+            var $this = $(this);
+            var data = $this.data(NAMESPACE);
+            var options;
+            var fn;
+
+            if (!data) {
+                if (/destroy/.test(option)) {
+                    return;
+                }
+
+                options = $.extend({}, $this.data(), $.isPlainObject(option) && option);
+                $this.data(NAMESPACE, (data = new CityPicker(this, options)));
+            }
+
+            if (typeof option === 'string' && $.isFunction(fn = data[option])) {
+                fn.apply(data, args);
+            }
+        });
+    };
+
+    $.fn.citypicker.Constructor = CityPicker;
+    $.fn.citypicker.setDefaults = CityPicker.setDefaults;
+
+    // No conflict
+    $.fn.citypicker.noConflict = function () {
+        $.fn.citypicker = CityPicker.other;
+        return this;
+    };
+
+    // 根据code查询地址
+    $.fn.citypicker.getAddressbyCodeId = function(code_id){
+    	var city = ChineseDistricts;
+    	var code = city[''+code_id];
+    	var addr = '';
+    	var province = '';
+    	var province_code = '';
+    	var city_str = '';
+    	var county = '';
+    	if(code_id.substring(0,2)==='44'){
+    		province = '广东省';
+    		province_code = '440000';
+    	}else{
+    		$.each(city['86'], function(i,item) {
+    				$.each(item, function(j,index) {
+    					if(index['code']===code_id.substring(0,2)+'0000'){
+    						province = index['address'];
+    						province_code = index['code'];
+    						return false;
+    					}
+    				});
+    		});
+    	}
+    	if(code_id.substring(2,4).indexOf('00')==-1){
+    		var city_code = code_id.substring(0,4)+'00';
+    		 city_str = city[province_code][city_code];
+    	}
+    	if(code===undefined){
+    		//440103
+    		code = code_id.substring(0,4)+"00";
+    		if(city[code] == null) return;
+    		addr = city[code][code_id];
+    		return addr = province+'/'+city_str+'/'+addr;
+    	}else{
+    		if(code_id.substring(2,4).indexOf('00')!=-1){
+    			//440000
+    			return addr = province;
+    		}else{
+    			//440100
+    			var city_city = city[code_id.substring(0,2)+'0000'];
+    			return addr = province +'/'+city_city[code_id];
+    		}
+        }
+    }
+
+    $(function () {
+        $('[data-toggle="city-picker"]').citypicker();
+    });
+});