544782275@qq.com 3 سال پیش
والد
کامیت
b965567711

+ 168 - 0
application/store/controller/Consult.php

@@ -0,0 +1,168 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | ThinkAdmin
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://demo.thinkadmin.top
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | gitee 代码仓库:https://gitee.com/zoujingli/ThinkAdmin
+// | github 代码仓库:https://github.com/zoujingli/ThinkAdmin
+// +----------------------------------------------------------------------
+
+namespace app\store\controller;
+
+use library\Controller;
+use library\tools\Data;
+use think\Db;
+
+/**
+ * 咨询管理
+ * Class Goods
+ * @package app\store\controller
+ */
+class Consult extends Controller
+{
+    /**
+     * 指定数据表
+     * @var string
+     */
+    protected $table = 'StoreConsult';
+
+    /**
+     * 咨询管理
+     * @auth true
+     * @menu true
+     * @throws \think\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
+     */
+    public function index()
+    {
+        $this->title = '咨询管理';
+        $query = $this->_query($this->table)->equal('status,cate_id')->like('title');
+        $query->where(['is_deleted' => '0'])->order(['is_top'=>'desc','sort'=>'desc','id'=>'desc'])->page();
+    }
+
+    /**
+     * 数据列表处理
+     * @param array $data
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    protected function _index_page_filter(&$data)
+    {
+        foreach ($data as &$vo) {
+            $vo['cate_name'] = Db::name('store_goods_cate')->where('id',$vo['cate_id'])->value('title');
+            $media_info = Db::name('store_media')->field('logo,title')->where('id',$vo['media_id'])->find();
+            $vo['media_logo'] = $media_info['logo'];
+            $vo['media_title'] = $media_info['title'];
+        }
+        $this->cate_arr = Db::name('store_goods_cate')->field('id,title')->where('status',1)->where('is_deleted',0)->select();
+    }
+
+    /**
+     * 添加咨询
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
+     */
+    public function add()
+    {
+        $this->title = '添加咨询信息';
+        $this->cate_arr = Db::name('store_goods_cate')->field('id,title')->where('status',1)->where('is_deleted',0)->select();
+        $this->media_arr = Db::name('store_media')->field('id,title')->where('status',1)->where('is_deleted',0)->select();
+        $this->is_top = array('0'=>'不置顶','1'=>'置顶');
+        $this->_form($this->table, 'form');
+    }
+
+    /**
+     * 编辑咨询
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
+     */
+    public function edit()
+    {
+        $this->title = '编辑咨询信息';
+        $this->_form($this->table, 'form');
+    }
+
+    /**
+     * 表单数据处理
+     * @param array $data
+     * @throws \think\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
+     */
+    protected function _form_filter(&$data)
+    {
+        // 生成活动ID
+        if ($this->request->isGet()) {
+            $this->cate_arr = Db::name('store_goods_cate')->field('id,title')->where('status',1)->where('is_deleted',0)->select();
+            $this->media_arr = Db::name('store_media')->field('id,title')->where('status',1)->where('is_deleted',0)->select();
+            $this->is_top = array('0'=>'不置顶','1'=>'置顶');
+        } elseif ($this->request->isPost()) {
+            if (empty($data['image'])) $this->error('展示图片不能为空,请上传图片');
+        }
+    }
+
+    /**
+     * 表单结果处理
+     * @param boolean $result
+     */
+    protected function _form_result($result)
+    {
+        if ($result && $this->request->isPost()) {
+            $this->success('活动编辑成功!', 'javascript:history.back()');
+        }
+    }
+
+    /**
+     * 禁用咨询
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     */
+    public function forbid()
+    {
+        $this->_save($this->table, ['status' => '0']);
+    }
+
+    /**
+     * 启用咨询
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     */
+    public function resume()
+    {
+        $this->_save($this->table, ['status' => '1']);
+    }
+
+    /**
+     * 删除咨询
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     */
+    public function remove()
+    {
+        $this->_delete($this->table);
+    }
+
+}

+ 52 - 34
application/store/controller/MemberInvite.php → application/store/controller/ConsultCate.php

@@ -15,25 +15,23 @@
 
 namespace app\store\controller;
 
-use app\api\controller\Area;
 use library\Controller;
-use think\Db;
 
 /**
- * 邀请会员管理
- * Class Member
+ * 咨询分类管理
+ * Class GoodsCate
  * @package app\store\controller
  */
-class MemberInvite extends Controller
+class ConsultCate extends Controller
 {
     /**
      * 绑定数据表
      * @var string
      */
-    protected $table = 'StoreMember';
+    protected $table = 'StoreConsultCate';
 
     /**
-     * 邀请会员管理
+     * 咨询分类管理
      * @auth true
      * @menu true
      * @throws \think\Exception
@@ -44,52 +42,72 @@ class MemberInvite extends Controller
      */
     public function index()
     {
-        $member_id = input('member_id');
-        if(empty($member_id)){
-            $this->error('非法操作');
-        }
-        $this->title = '邀请会员管理';
-        $query = $this->_query($this->table)->like('phone')->equal('type');
-        $query->where('pid',$member_id)->dateBetween('create_at')->order('id desc')->page();
+        $this->title = '咨询分类管理';
+        $query = $this->_query($this->table)->like('title')->equal('status');
+        $query->where(['is_deleted' => '0'])->order('sort desc,id desc')->page();
     }
+
     /**
-     * 数据列表处理
-     * @param array $data
+     * 添加咨询分类
+     * @auth true
+     * @throws \think\Exception
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
      */
-    protected function _index_page_filter(&$data)
+    public function add()
     {
-
+        $this->title = '添加咨询分类';
+        $this->_form($this->table, 'form');
     }
-    protected function _form_filter(&$data){
-        if($this->request->isGet()) {
 
-        }else{
-
-
-        }
-    }
-    //编辑会员
+    /**
+     * 编辑咨询分类
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
+     */
     public function edit()
     {
-        $this->title = '编辑';
+        $this->title = '编辑咨询分类';
         $this->_form($this->table, 'form');
     }
-    //删除会员
-    public function remove()
-    {
-        $this->_delete($this->table);
-    }
-    //禁用会员
+
+    /**
+     * 禁用咨询分类
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     */
     public function forbid()
     {
         $this->_save($this->table, ['status' => '0']);
     }
-    //启用会员
+
+    /**
+     * 启用咨询分类
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     */
     public function resume()
     {
         $this->_save($this->table, ['status' => '1']);
     }
+
+    /**
+     * 删除咨询分类
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     */
+    public function remove()
+    {
+        $this->_delete($this->table);
+    }
+
 }

+ 0 - 69
application/store/controller/Cooperation.php

@@ -1,69 +0,0 @@
-<?php
-
-// +----------------------------------------------------------------------
-// | ThinkAdmin
-// +----------------------------------------------------------------------
-// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
-// +----------------------------------------------------------------------
-// | 官方网站: http://demo.thinkadmin.top
-// +----------------------------------------------------------------------
-// | 开源协议 ( https://mit-license.org )
-// +----------------------------------------------------------------------
-// | gitee 代码仓库:https://gitee.com/zoujingli/ThinkAdmin
-// | github 代码仓库:https://github.com/zoujingli/ThinkAdmin
-// +----------------------------------------------------------------------
-
-namespace app\store\controller;
-
-use library\Controller;
-
-/**
- * 商户合作管理
- * Class Member
- * @package app\store\controller
- */
-class Cooperation extends Controller
-{
-    /**
-     * 绑定数据表
-     * @var string
-     */
-    protected $table = 'store_shop_cooperation';
-
-    /**
-     * 商户合作管理
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function index()
-    {
-        $this->title = '商户合作管理';
-        $query = $this->_query($this->table)->equal('type')->like('name,phone');
-        $query->dateBetween('create_at')->order('id desc')->page();
-    }
-    /**
-     * 数据列表处理
-     * @param array $data
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    protected function _index_page_filter(&$data)
-    {
-        $type_arr = array('1'=>'商户上线合作','2'=>'其他商务合作','3'=>'城市加盟合作');
-        $is_company_arr = array('0'=>'未注册公司','1'=>'已注册公司');
-        foreach ($data as $k=>&$v){
-            if($v['type'] == 3){
-                $v['is_company'] = $is_company_arr[$v['is_company']];
-            }else{
-                $v['is_company'] = '--';
-            }
-            $v['type'] = $type_arr[$v['type']];
-        }
-    }
-}

+ 8 - 8
application/store/controller/Goods.php

@@ -20,7 +20,7 @@ use library\tools\Data;
 use think\Db;
 
 /**
- * 活动信息管理
+ * 新闻管理
  * Class Goods
  * @package app\store\controller
  */
@@ -33,7 +33,7 @@ class Goods extends Controller
     protected $table = 'StoreGoods';
 
     /**
-     * 活动信息管理
+     * 新闻管理
      * @auth true
      * @menu true
      * @throws \think\Exception
@@ -44,7 +44,7 @@ class Goods extends Controller
      */
     public function index()
     {
-        $this->title = '活动信息管理';
+        $this->title = '新闻管理';
         $query = $this->_query($this->table)->equal('status,cate_id')->like('title');
         $query->where(['is_deleted' => '0'])->order(['is_top'=>'desc','sort'=>'desc','id'=>'desc'])->page();
     }
@@ -68,7 +68,7 @@ class Goods extends Controller
     }
 
     /**
-     * 添加活动信息
+     * 添加新闻
      * @auth true
      * @throws \think\Exception
      * @throws \think\db\exception\DataNotFoundException
@@ -86,7 +86,7 @@ class Goods extends Controller
     }
 
     /**
-     * 编辑活动信息
+     * 编辑新闻
      * @auth true
      * @throws \think\Exception
      * @throws \think\db\exception\DataNotFoundException
@@ -133,7 +133,7 @@ class Goods extends Controller
     }
 
     /**
-     * 禁用活动信息
+     * 禁用新闻
      * @auth true
      * @throws \think\Exception
      * @throws \think\exception\PDOException
@@ -144,7 +144,7 @@ class Goods extends Controller
     }
 
     /**
-     * 启用活动信息
+     * 启用新闻
      * @auth true
      * @throws \think\Exception
      * @throws \think\exception\PDOException
@@ -155,7 +155,7 @@ class Goods extends Controller
     }
 
     /**
-     * 删除活动信息
+     * 删除新闻
      * @auth true
      * @throws \think\Exception
      * @throws \think\exception\PDOException

+ 10 - 10
application/store/controller/GoodsCate.php

@@ -18,7 +18,7 @@ namespace app\store\controller;
 use library\Controller;
 
 /**
- * 活动分类管理
+ * 新闻分类管理
  * Class GoodsCate
  * @package app\store\controller
  */
@@ -31,7 +31,7 @@ class GoodsCate extends Controller
     protected $table = 'StoreGoodsCate';
 
     /**
-     * 活动分类管理
+     * 新闻分类管理
      * @auth true
      * @menu true
      * @throws \think\Exception
@@ -42,13 +42,13 @@ class GoodsCate extends Controller
      */
     public function index()
     {
-        $this->title = '活动分类管理';
+        $this->title = '新闻分类管理';
         $query = $this->_query($this->table)->like('title')->equal('status');
         $query->where(['is_deleted' => '0'])->order('sort desc,id desc')->page();
     }
 
     /**
-     * 添加活动分类
+     * 添加新闻分类
      * @auth true
      * @throws \think\Exception
      * @throws \think\db\exception\DataNotFoundException
@@ -58,12 +58,12 @@ class GoodsCate extends Controller
      */
     public function add()
     {
-        $this->title = '添加活动分类';
+        $this->title = '添加新闻分类';
         $this->_form($this->table, 'form');
     }
 
     /**
-     * 编辑活动分类
+     * 编辑新闻分类
      * @auth true
      * @throws \think\Exception
      * @throws \think\db\exception\DataNotFoundException
@@ -73,12 +73,12 @@ class GoodsCate extends Controller
      */
     public function edit()
     {
-        $this->title = '编辑活动分类';
+        $this->title = '编辑新闻分类';
         $this->_form($this->table, 'form');
     }
 
     /**
-     * 禁用活动分类
+     * 禁用新闻分类
      * @auth true
      * @throws \think\Exception
      * @throws \think\exception\PDOException
@@ -89,7 +89,7 @@ class GoodsCate extends Controller
     }
 
     /**
-     * 启用活动分类
+     * 启用新闻分类
      * @auth true
      * @throws \think\Exception
      * @throws \think\exception\PDOException
@@ -100,7 +100,7 @@ class GoodsCate extends Controller
     }
 
     /**
-     * 删除活动分类
+     * 删除新闻分类
      * @auth true
      * @throws \think\Exception
      * @throws \think\exception\PDOException

+ 0 - 63
application/store/controller/Merchant.php

@@ -1,63 +0,0 @@
-<?php
-
-// +----------------------------------------------------------------------
-// | ThinkAdmin
-// +----------------------------------------------------------------------
-// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
-// +----------------------------------------------------------------------
-// | 官方网站: http://demo.thinkadmin.top
-// +----------------------------------------------------------------------
-// | 开源协议 ( https://mit-license.org )
-// +----------------------------------------------------------------------
-// | gitee 代码仓库:https://gitee.com/zoujingli/ThinkAdmin
-// | github 代码仓库:https://github.com/zoujingli/ThinkAdmin
-// +----------------------------------------------------------------------
-
-namespace app\store\controller;
-
-use library\Controller;
-
-/**
- * 商家信息管理
- * Class Member
- * @package app\store\controller
- */
-class Merchant extends Controller
-{
-    /**
-     * 绑定数据表
-     * @var string
-     */
-    protected $table = 'StoreMember';
-
-    /**
-     * 商家信息管理
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function index()
-    {
-        $this->title = '商家信息管理';
-        $query = $this->_query($this->table)->where('is_merchant',1)->equal('is_merchant')->like('nickname,phone');
-        $query->dateBetween('create_at')->order('id desc')->page();
-    }
-    /**
-     * 数据列表处理
-     * @param array $data
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    protected function _index_page_filter(&$data)
-    {
-        foreach ($data as $k=>&$v){
-            $v['gender'] = $v['gender'] == 1?'男':'女';
-            $v['is_merchant'] = $v['is_merchant'] == 1?'商家':'普通会员';
-        }
-    }
-}

+ 0 - 126
application/store/controller/Order.php

@@ -1,126 +0,0 @@
-<?php
-
-// +----------------------------------------------------------------------
-// | ThinkAdmin
-// +----------------------------------------------------------------------
-// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
-// +----------------------------------------------------------------------
-// | 官方网站: http://demo.thinkadmin.top
-// +----------------------------------------------------------------------
-// | 开源协议 ( https://mit-license.org )
-// +----------------------------------------------------------------------
-// | gitee 代码仓库:https://gitee.com/zoujingli/ThinkAdmin
-// | github 代码仓库:https://github.com/zoujingli/ThinkAdmin
-// +----------------------------------------------------------------------
-
-namespace app\store\controller;
-
-use library\Controller;
-use library\tools\Express;
-use think\Db;
-
-/**
- * 订单记录管理
- * Class Order
- * @package app\store\controller
- */
-class Order extends Controller
-{
-    /**
-     * 绑定数据表
-     * @var string
-     */
-    protected $table = 'StoreOrder';
-
-    /**
-     * 订单记录管理
-     * @auth true
-     * @menu true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function index()
-    {
-        $this->title = '订单记录管理';
-        $this->_query($this->table)->order('id desc')->page();
-    }
-
-    /**
-     * 订单列表处理
-     * @param array $data
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    protected function _index_page_filter(array &$data)
-    {
-        $goodsList = Db::name('StoreOrderList')->whereIn('order_no', array_unique(array_column($data, 'order_no')))->select();
-        $mids = array_unique(array_merge(array_column($data, 'mid'), array_column($data, 'from_mid')));
-        $memberList = Db::name('StoreMember')->whereIn('id', $mids)->select();
-        foreach ($data as &$vo) {
-            list($vo['member'], $vo['from_member'], $vo['list']) = [[], [], []];
-            foreach ($goodsList as $goods) if ($goods['order_no'] === $vo['order_no']) {
-                $vo['list'][] = $goods;
-            }
-            foreach ($memberList as $member) if ($member['id'] === $vo['mid']) {
-                $vo['member'] = $member;
-            }
-        }
-    }
-
-    /**
-     * 修改快递管理
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function express()
-    {
-        if ($this->request->isGet()) {
-            $where = ['is_deleted' => '0', 'status' => '1'];
-            $this->expressList = Db::name('StoreExpress')->where($where)->order('sort desc,id desc')->select();
-        }
-        $this->_form($this->table);
-    }
-
-    /**
-     * 快递追踪查询
-     * @auth true
-     */
-    public function expressQuery()
-    {
-        list($code, $no) = [input('code', ''), input('no', '')];
-        if (empty($no)) $this->error('快递编号不能为空!');
-        if (empty($code)) $this->error('快递公司编码不能为空!');
-        $this->result = Express::query($code, $no);
-        $this->fetch();
-    }
-
-    /**
-     * 快递表单处理
-     * @param array $vo
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
-    protected function _express_form_filter(&$vo)
-    {
-        if ($this->request->isPost()) {
-            $order = Db::name($this->table)->where(['id' => $vo['id']])->find();
-            if (empty($order)) $this->error('订单查询异常,请稍候再试!');
-            $express = Db::name('StoreExpress')->where(['express_code' => $vo['express_company_code']])->find();
-            if (empty($express)) $this->error('发货快递公司异常,请重新选择快递公司!');
-            $vo['express_company_title'] = $express['express_title'];
-            $vo['express_send_at'] = empty($order['express_send_at']) ? date('Y-m-d H:i:s') : $order['express_send_at'];
-            $vo['express_state'] = '1';
-            $vo['status'] = '4';
-        }
-    }
-
-}

+ 103 - 0
application/store/view/consult/form.html

@@ -0,0 +1,103 @@
+{extend name='admin@main'}
+
+{block name="content"}
+
+{include file='store@goods/form_style'}
+
+<form onsubmit="return false;" id="GoodsForm" data-auto="true" method="post" class='layui-form layui-card' autocomplete="off">
+
+    <div class="layui-card-body think-box-shadow padding-left-40">
+
+        <div class="layui-form-item layui-row layui-col-space15">
+
+            <label class="layui-col-xs9 relative">
+                <span class="color-green">咨询标题</span>
+                <input name="title" required class="layui-input" placeholder="请输入咨询标题" value="{$vo.title|default=''}">
+            </label>
+        </div>
+
+        <div class="layui-form-item layui-row layui-col-space15">
+            <label class="layui-col-xs3 relative">
+                <span class="color-green">咨询分类</span>
+                <select class="layui-select" required name="cate_id" lay-search>
+                    {foreach $cate_arr as $cate}
+                    {if isset($vo.cate_id) and $vo.cate_id eq $cate.id}
+                    <option selected value="{$cate.id}">{$cate.title|default=''}</option>
+                    {else}
+                    <option value="{$cate.id}">{$cate.title|default=''}</option>
+                    {/if}
+                    {/foreach}
+                </select>
+            </label>
+            <label class="layui-col-xs3 relative">
+                <span class="color-green">是否置顶</span>
+                <select class="layui-select" required name="is_top" lay-search>
+                    {foreach $is_top as $key=>$value}
+                    {if isset($vo.is_top) and $vo.is_top eq $key}
+                    <option selected value="{$key}">{$value|default=''}</option>
+                    {else}
+                    <option value="{$key}">{$value|default=''}</option>
+                    {/if}
+                    {/foreach}
+                </select>
+            </label>
+        </div>
+
+        <div class="layui-form-item layui-row layui-col-space15">
+            <label class="layui-col-xs3 relative">
+                <span class="color-green">咨询来源</span>
+                <select class="layui-select" required name="media_id" lay-search>
+                    {foreach $media_arr as $media}
+                    {if isset($vo.media_id) and $vo.media_id eq $media.id}
+                    <option selected value="{$media.id}">{$media.title|default=''}</option>
+                    {else}
+                    <option value="{$media.id}">{$media.title|default=''}</option>
+                    {/if}
+                    {/foreach}
+                </select>
+            </label>
+            <label class="layui-col-xs9 relative" style="width: 408px">
+                <span class="color-green">咨询作者</span>
+                <input name="author" required class="layui-input" placeholder="请输入咨询作者" value="{$vo.author|default=''}">
+            </label>
+        </div>
+
+        <div class="layui-form-item">
+            <span class="color-green label-required-prev">咨询视频及图片(如果不是视频可以不添加,图片用于咨询列表的展示,可以添加多张,注意图片尺寸)</span>
+            <table class="layui-table">
+                <thead>
+                <tr>
+                    <th class="text-center">视频</th>
+                    <th class="text-left">图片</th>
+                </tr>
+                <tr>
+                    <td width="90px" class="text-center"><input name="video" type="hidden" value="{$vo.video|default=''}"></td>
+                    <td width="auto" class="text-left"><input name="image" type="hidden" value="{$vo.image|default=''}"></td>
+                </tr>
+                </thead>
+            </table>
+            <script>$('[name="video"]').uploadOneVideo(),$('[name="image"]').uploadMultipleImage()</script>
+        </div>
+
+        <div class="layui-form-item block">
+            <span class="label-required-prev color-green">咨询详细内容</span>
+            <textarea name="content">{$vo.content|default=''|raw}</textarea>
+        </div>
+        <div class="layui-form-item text-center">
+            {notempty name='vo.id'}<input type="hidden" name="id" value="{$vo.id}">{/notempty}
+            {notempty name='vo.update_at'}<input type="hidden" name="update_at" value="{$vo.update_at}">{/notempty}
+            <button class="layui-btn layui-btn-danger" ng-click="hsitoryBack()" type="button">取消编辑</button>
+            <button class="layui-btn" type="submit">保存活动</button>
+        </div>
+    </div>
+</form>
+{/block}
+
+{block name='script'}
+<script>
+    window.form.render();
+    require(['ckeditor', 'angular','pcasunzips'], function () {
+        window.createEditor('[name="content"]', {height: 500});
+    })
+</script>
+{/block}

+ 89 - 0
application/store/view/consult/index.html

@@ -0,0 +1,89 @@
+{extend name='admin@main'}
+
+{block name="button"}
+<!--{if auth("store/consult/add")}-->
+<button data-open='{:url("add")}' data-title="添加咨询" class='layui-btn layui-btn-sm layui-btn-primary'>添加咨询</button>
+<!--{/if}-->
+<!--{if auth("store/consult/remove")}-->
+<button data-action='{:url("remove")}' data-rule="id#{key}" class='layui-btn layui-btn-sm layui-btn-primary'>删除咨询</button>
+<!--{/if}-->
+{/block}
+
+{block name="content"}
+<div class="think-box-shadow">
+    {include file='consult/index_search'}
+    <table class="layui-table margin-top-10" lay-skin="line">
+        {notempty name='list'}
+        <thead>
+        <tr>
+            <th class='list-table-check-td think-checkbox'>
+                <input data-auto-none data-check-target='.list-check-box' type='checkbox'>
+            </th>
+            <th class='list-table-sort-td'>
+                <button type="button" data-reload class="layui-btn layui-btn-xs">刷 新</button>
+            </th>
+            <th class='text-left nowrap' width="22%">咨询标题</th>
+            <th class='text-left nowrap' width="15%">咨询分类</th>
+            <th class='text-left nowrap' width="12%">来源媒体</th>
+            <th class='text-left nowrap' width="8%">咨询作者</th>
+            <th class='text-left nowrap' width="12%">新发布状态</th>
+            <th class='text-left nowrap' width="15%">发布时间</th>
+            <th class='text-center nowrap' width="15%">操作</th>
+        </tr>
+        </thead>
+        {/notempty}
+        <tbody>
+        {foreach $list as $key=>$vo}
+        <tr data-dbclick>
+            <td class='list-table-check-td think-checkbox'><input class="list-check-box" value='{$vo.id}' type='checkbox'></td>
+            <td class='list-table-sort-td'><input data-action-blur="{:request()->url()}" data-value="id#{$vo.id};action#sort;sort#{value}" data-loading="false" value="{$vo.sort}" class="list-sort-input"></td>
+            <td class='text-left nowrap'>
+                {$vo.title|default=''}
+            </td>
+            <td class='text-left nowrap padding-0 relative'>
+                {$vo.cate_name|default=''}
+            </td>
+            <td class='text-left nowrap padding-0 relative'>
+                {notempty name='vo.media_logo'}
+                <img data-tips-image style="width:20px;height:20px;vertical-align:top" src="{$vo.media_logo|default=''}" class="margin-right-5">
+                {/notempty}
+                <div class="inline-block">{$vo.media_title|default='--'}</div>
+            </td>
+            <td class='text-left nowrap padding-0 relative'>
+                {$vo.author|default=''}
+            </td>
+            <td class='text-left nowrap'>
+                {eq name='vo.status' value='0'}<span class="layui-badge">已下架</span>{else}<span class="layui-badge layui-bg-green">发布中</span>{/eq}<br>
+            </td>
+            <td class='text-left nowrap padding-0 relative'>
+                {$vo.create_at|default='--'}
+            </td>
+            <td class='text-center nowrap'>
+
+                <div class="nowrap margin-bottom-5">
+                    {if auth("store/consult/edit")}
+                    <a data-dbclick class="layui-btn layui-btn-sm" data-open='{:url("edit")}?id={$vo.id}&no_edit=0'>编 辑</a>
+                    {else}
+                    <a data-tips-text="您没有编辑活动的权限哦!" class="layui-btn layui-btn-sm layui-btn-primary layui-disabled">编 辑</a>
+                    {/if}
+
+                    {if isset($vo.status) and $vo.status eq 1}
+                        <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('forbid')}" data-value="id#{$vo.id};status#0">下 架</a>
+                    {else}
+                        <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('resume')}" data-value="id#{$vo.id};status#1">上 架</a>
+                    {/if}
+                    {if auth("store/consult/remove")}
+                        <a class="layui-btn layui-btn-sm layui-btn-danger" data-confirm="确定要删除数据吗?" data-action="{:url('remove')}" data-value="id#{$vo.id}">删 除</a>
+                    {/if}
+                </div>
+
+            </td>
+        </tr>
+        {/foreach}
+        </tbody>
+    </table>
+
+    {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
+
+</div>
+{/block}

+ 44 - 0
application/store/view/consult/index_search.html

@@ -0,0 +1,44 @@
+<fieldset>
+    <legend>条件搜索</legend>
+    <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get" autocomplete="off">
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">咨询标题</label>
+            <div class="layui-input-inline">
+                <input name="title" value="{$Think.get.title|default=''}" placeholder="请输入咨询标题" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">咨询分类</label>
+            <div class="layui-input-inline">
+                <select class="layui-select" name="cate_id" lay-search>
+                    <option value="">-- 全部咨询 --</option>
+                    {foreach $cate_arr as $v}
+                    <!--{eq name='Think.get.cate_id' value='$v.id.""'}-->
+                    <option selected value="{$v.id}">{$v.title}</option>
+                    <!--{else}-->
+                    <option value="{$v.id}">{$v.title}</option>
+                    <!--{/eq}-->
+                    {/foreach}
+                </select>
+            </div>
+        </div>
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">发布状态</label>
+            <div class="layui-input-inline">
+                <select class="layui-select" name="status">
+                    {foreach [''=>'- 全部状态 -','1'=>'发布中','0'=>'已下架'] as $k=>$v}
+                    <!--{eq name='Think.get.status' value='$k.""'}-->
+                    <option selected value="{$k}">{$v}</option>
+                    <!--{else}-->
+                    <option value="{$k}">{$v}</option>
+                    <!--{/eq}-->
+                    {/foreach}
+                </select>
+            </div>
+        </div>
+        <div class="layui-form-item layui-inline">
+            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
+        </div>
+    </form>
+    <script>form.render()</script>
+</fieldset>

+ 21 - 0
application/store/view/consult_cate/form.html

@@ -0,0 +1,21 @@
+<form onsubmit="return false;" action="{:request()->url()}" data-auto="true" method="post" class='layui-form layui-card' autocomplete="off">
+
+    <div class="layui-card-body">
+
+        <div class="layui-row margin-bottom-15">
+            <label class="layui-col-xs2 think-form-label">新闻分类名称</label>
+            <label class="layui-col-xs10">
+                <input name="title" required value='{$vo.title|default=""}' placeholder="请输入新闻分类名称" class="layui-input">
+            </label>
+        </div>
+
+
+    </div>
+
+    <div class="hr-line-dashed"></div>
+    <div class="layui-form-item text-center">
+        {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
+        <button class="layui-btn" type='submit'>保存数据</button>
+        <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗?" data-close>取消编辑</button>
+    </div>
+</form>

+ 71 - 0
application/store/view/consult_cate/index.html

@@ -0,0 +1,71 @@
+{extend name='admin@main'}
+
+{block name="button"}
+{if auth("store/consult_cate/add")}
+<button data-modal='{:url("add")}' data-title="添加咨询分类" class='layui-btn layui-btn-sm layui-btn-primary'>添加咨询分类</button>
+{/if}
+{if auth("store/consult_cate/remove")}
+<button data-action='{:url("remove")}' data-rule="id#{key}" class='layui-btn layui-btn-sm layui-btn-primary'>删除咨询分类</button>
+{/if}
+{/block}
+
+{block name="content"}
+<div class="think-box-shadow">
+    {include file='consult_cate/index_search'}
+    <table class="layui-table margin-top-10" lay-skin="line">
+        {notempty name='list'}
+        <thead>
+        <tr>
+            <th class='list-table-check-td think-checkbox'>
+                <input data-auto-none data-check-target='.list-check-box' type='checkbox'>
+            </th>
+            <th class='list-table-sort-td'>
+                <button type="button" data-reload class="layui-btn layui-btn-xs">刷 新</button>
+            </th>
+            <th class='text-left nowrap'>分类名称</th>
+            <th class="text-center">状态</th>
+            <th class="text-center">添加时间</th>
+            <th class="text-center">操作</th>
+        </tr>
+        </thead>
+        {/notempty}
+        <tbody>
+        {foreach $list as $key=>$vo}
+        <tr>
+            <td class='list-table-check-td think-checkbox'>
+                <input class="list-check-box" value='{$vo.id}' type='checkbox'>
+            </td>
+            <td class='list-table-sort-td'>
+                <input data-action-blur="{:request()->url()}" data-value="id#{$vo.id};action#sort;sort#{value}" data-loading="false" value="{$vo.sort}" class="list-sort-input">
+            </td>
+            <td class='text-left nowrap'>
+                {$vo.title|default=''}
+            </td>
+            <td class='text-center nowrap'>
+                {eq name='vo.status' value='0'}<span class="layui-badge">已禁用</span>{else}<span class="layui-badge layui-bg-green">使用中</span>{/eq}<br>
+            </td>
+            <td class='text-center nowrap'>{$vo.create_at|format_datetime}</td>
+            <td class='text-center nowrap'>
+
+                {if auth("store/consult_cate/edit")}
+                <a data-title="编辑咨询分类" class="layui-btn layui-btn-sm" data-modal='{:url("edit")}?id={$vo.id}'>编 辑</a>
+                {/if}
+
+                {if $vo.status eq 1 and auth("store/consult_cate/forbid")}
+                <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('forbid')}" data-value="id#{$vo.id};status#0">禁 用</a>
+                {elseif auth("store/consult_cate/resume")}
+                <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('resume')}" data-value="id#{$vo.id};status#1">启 用</a>
+                {/if}
+
+                {if auth("store/consult_cate/remove")}
+                <a class="layui-btn layui-btn-sm layui-btn-danger" data-confirm="确定要删除数据吗?" data-action="{:url('remove')}" data-value="id#{$vo.id}">删 除</a>
+                {/if}
+
+            </td>
+        </tr>
+        {/foreach}
+        </tbody>
+    </table>
+    {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
+</div>
+{/block}

+ 30 - 0
application/store/view/consult_cate/index_search.html

@@ -0,0 +1,30 @@
+<fieldset>
+    <legend>条件搜索</legend>
+    <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get" autocomplete="off">
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">分类名称</label>
+            <div class="layui-input-inline">
+                <input name="title" value="{$Think.get.title|default=''}" placeholder="请输入分类名称" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">使用状态</label>
+            <div class="layui-input-inline">
+                <select class="layui-select" name="status">
+                    {foreach [''=>'- 全部状态 -','1'=>'使用中的活动分类','0'=>'已禁用的活动分类'] as $k=>$v}
+                    <!--{eq name='Think.get.status' value='$k.""'}-->
+                    <option selected value="{$k}">{$v}</option>
+                    <!--{else}-->
+                    <option value="{$k}">{$v}</option>
+                    <!--{/eq}-->
+                    {/foreach}
+                </select>
+            </div>
+        </div>
+
+        <div class="layui-form-item layui-inline">
+            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
+        </div>
+    </form>
+    <script>form.render()</script>
+</fieldset>

+ 0 - 40
application/store/view/cooperation/index.html

@@ -1,40 +0,0 @@
-{extend name='admin@main'}
-
-{block name="content"}
-<div class="think-box-shadow">
-    {include file='cooperation/index_search'}
-    <table class="layui-table margin-top-10" lay-skin="line">
-        {notempty name='list'}
-        <thead>
-        <tr>
-            <th class='text-left nowrap'>联系姓名</th>
-            <th class='text-left nowrap'>联系手机</th>
-            <th class='text-left nowrap'>店铺/企业名称</th>
-            <th class='text-left nowrap'>合作类型</th>
-            <th class='text-left nowrap'>店铺地址</th>
-            <th class='text-left nowrap'>合作事项</th>
-            <th class='text-left nowrap'>合作省市</th>
-            <th class='text-left nowrap'>是否已注册公司</th>
-            <th class='text-left nowrap'>床架时间</th>
-        </tr>
-        </thead>
-        {/notempty}
-        <tbody>
-        {foreach $list as $key=>$vo}
-        <tr>
-            <td class='text-left'>{$vo.name|default='--'}</td>
-            <td class='text-left'>{$vo.phone|default='--'}</td>
-            <td class='text-left'>{$vo.shop_name|default='--'}</td>
-            <td class='text-left'>{$vo.type|default='--'}</td>
-            <td class='text-left'>{$vo.shop_address|default='--'}</td>
-            <td class='text-left'>{$vo.matter|default='--'}</td>
-            <td class='text-left'>{$vo.area|default='--'}</td>
-            <td class='text-left'>{$vo.is_company|default='--'}</td>
-            <td class='text-left'>{$vo.create_at|format_datetime}</td>
-        </tr>
-        {/foreach}
-        </tbody>
-    </table>
-    {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
-</div>
-{/block}

+ 0 - 47
application/store/view/cooperation/index_search.html

@@ -1,47 +0,0 @@
-<fieldset>
-    <legend>条件搜索</legend>
-    <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get" autocomplete="off">
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">联系姓名</label>
-            <div class="layui-input-inline">
-                <input name="nickname" value="{$Think.get.nickname|default=''}" placeholder="请输入联系姓名" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">联系手机</label>
-            <div class="layui-input-inline">
-                <input name="phone" value="{$Think.get.phone|default=''}" placeholder="请输入联系手机" class="layui-input">
-            </div>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">类型</label>
-            <div class="layui-input-inline">
-                <select class="layui-select" name="type">
-                    {foreach [''=>'- 全部类型 -','1'=>'商户上线合作','2'=>'其他商务合作','3'=>'城市加密合作'] as $k=>$v}
-                    <!--{eq name='Think.get.type' value='$k.""'}-->
-                    <option selected value="{$k}">{$v}</option>
-                    <!--{else}-->
-                    <option value="{$k}">{$v}</option>
-                    <!--{/eq}-->
-                    {/foreach}
-                </select>
-            </div>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">创建时间</label>
-            <div class="layui-input-inline">
-                <input name="create_at" value="{$Think.get.create_at|default=''}" placeholder="请选择创建时间" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item layui-inline">
-            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
-            <button type="button" data-export-list class="layui-btn layui-btn-primary layui-hide"><i class="layui-icon layui-icon-export"></i> 导 出</button>
-        </div>
-    </form>
-    <script>
-        form.render();
-        laydate.render({range: true, elem: '[name="create_at"]'})
-    </script>
-</fieldset>

+ 0 - 52
application/store/view/member_invite/index.html

@@ -1,52 +0,0 @@
-{extend name='admin@main'}
-
-{block name="button"}
-<button data-open='{:url("store/member/index")}' data-title="返回" class='layui-btn layui-btn-sm layui-btn-primary'>返回</button>
-{/block}
-{block name="content"}
-<div class="think-box-shadow">
-    {include file='member_invite/index_search'}
-    <table class="layui-table margin-top-10" lay-skin="line">
-        {notempty name='list'}
-        <thead>
-        <tr>
-            <th class='list-table-check-td think-checkbox'>
-                <input data-auto-none data-check-target='.list-check-box' type='checkbox'>
-            </th>
-            <th class='text-left nowrap'>会员头像</th>
-            <th class='text-left nowrap'>会员名称</th>
-            <th class='text-left nowrap'>会员手机</th>
-            <th class='text-left nowrap'>注册时间</th>
-            <th class='text-left nowrap'>状态</th>
-        </tr>
-        </thead>
-        {/notempty}
-        <tbody>
-        {foreach $list as $key=>$vo}
-        <tr>
-            <td class='list-table-check-td think-checkbox'>
-                <label><input class="list-check-box" value='{$vo.id}' type='checkbox'></label>
-            </td>
-            <td class='text-left nowrap'>
-                {notempty name='vo.headimg'}
-                <img data-tips-image style="width:20px;height:20px;vertical-align:top" src="{$vo.headimg|default=''}" class="margin-right-5">
-                {/notempty}
-                {empty name='vo.headimg'}
-                --
-                {/empty}
-            </td>
-            <td><div class="inline-block">{$vo.name|default='--'}</div></td>
-            <td class='text-left'>{$vo.phone|default='--'}</td>
-            <td class='text-left'>{$vo.create_at|format_datetime}</td>
-            <td class='text-left nowrap'>
-                {eq name='vo.status' value='0'}
-                <span class="layui-badge">已禁用</span>{else}<span class="layui-badge layui-bg-green">使用中</span>
-                {/eq}
-            </td>
-        </tr>
-        {/foreach}
-        </tbody>
-    </table>
-    {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
-</div>
-{/block}

+ 0 - 25
application/store/view/member_invite/index_search.html

@@ -1,25 +0,0 @@
-<fieldset>
-    <legend>条件搜索</legend>
-    <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get" autocomplete="off">
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">会员手机</label>
-            <div class="layui-input-inline">
-                <input name="phone" value="{$Think.get.phone|default=''}" placeholder="请输入会员手机" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">注册时间</label>
-            <div class="layui-input-inline">
-                <input name="create_at" value="{$Think.get.create_at|default=''}" placeholder="请选择时间" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item layui-inline">
-            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
-            <button type="button" data-export-list class="layui-btn layui-btn-primary layui-hide"><i class="layui-icon layui-icon-export"></i> 导 出</button>
-        </div>
-    </form>
-    <script>
-        form.render();
-        laydate.render({range: true, elem: '[name="create_at"]'})
-    </script>
-</fieldset>

+ 0 - 49
application/store/view/merchant/index.html

@@ -1,49 +0,0 @@
-{extend name='admin@main'}
-
-{block name="content"}
-<div class="think-box-shadow">
-    {include file='merchant/index_search'}
-    <table class="layui-table margin-top-10" lay-skin="line">
-        {notempty name='list'}
-        <thead>
-        <tr>
-            <th class='list-table-check-td think-checkbox'>
-                <input data-auto-none data-check-target='.list-check-box' type='checkbox'>
-            </th>
-            <th class='text-left nowrap'>商家姓名</th>
-            <th class='text-left nowrap'>商家手机</th>
-            <th class='text-left nowrap'>支付宝账号</th>
-            <th class='text-left nowrap'>商家性别</th>
-            <th class='text-left nowrap'>出生日期</th>
-            <th class='text-left nowrap'>商家名称</th>
-            <th class='text-left nowrap'>商家地址</th>
-            <th class='text-left nowrap'>注册时间</th>
-        </tr>
-        </thead>
-        {/notempty}
-        <tbody>
-        {foreach $list as $key=>$vo}
-        <tr>
-            <td class='list-table-check-td think-checkbox'>
-                <label><input class="list-check-box" value='{$vo.id}' type='checkbox'></label>
-            </td>
-            <td class='text-left nowrap'>
-                {notempty name='vo.headimg'}
-                <img data-tips-image style="width:20px;height:20px;vertical-align:top" src="{$vo.headimg|default=''}" class="margin-right-5">
-                {/notempty}
-                <div class="inline-block">{$vo.nickname|default='--'}</div>
-            </td>
-            <td class='text-left'>{$vo.phone|default='--'}</td>
-            <td class='text-left'>{$vo.alipay|default='--'}</td>
-            <td class='text-left'>{$vo.gender|default='--'}</td>
-            <td class='text-left'>{$vo.birthday|default='--'}</td>
-            <td class='text-left'>{$vo.merchant_name|default='--'}</td>
-            <td class='text-left'>{$vo.merchant_address|default='--'}</td>
-            <td class='text-left'>{$vo.create_at|format_datetime}</td>
-        </tr>
-        {/foreach}
-        </tbody>
-    </table>
-    {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
-</div>
-{/block}

+ 0 - 46
application/store/view/merchant/index_search.html

@@ -1,46 +0,0 @@
-<fieldset>
-    <legend>条件搜索</legend>
-    <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get" autocomplete="off">
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">商家姓名</label>
-            <div class="layui-input-inline">
-                <input name="nickname" value="{$Think.get.nickname|default=''}" placeholder="请输入商家姓名" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">商家手机</label>
-            <div class="layui-input-inline">
-                <input name="phone" value="{$Think.get.phone|default=''}" placeholder="请输入商家手机" class="layui-input">
-            </div>
-        </div>
-        <!--<div class="layui-form-item layui-inline">
-            <label class="layui-form-label">类型</label>
-            <div class="layui-input-inline">
-                <select class="layui-select" name="is_merchant">
-                    {foreach [''=>'- 全部会员 -','0'=>'普通会员','1'=>'商家'] as $k=>$v}
-                    &lt;!&ndash;{eq name='Think.get.is_merchant' value='$k.""'}&ndash;&gt;
-                    <option selected value="{$k}">{$v}</option>
-                    &lt;!&ndash;{else}&ndash;&gt;
-                    <option value="{$k}">{$v}</option>
-                    &lt;!&ndash;{/eq}&ndash;&gt;
-                    {/foreach}
-                </select>
-            </div>
-        </div>-->
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">注册时间</label>
-            <div class="layui-input-inline">
-                <input name="create_at" value="{$Think.get.create_at|default=''}" placeholder="请选择注册时间" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item layui-inline">
-            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
-            <button type="button" data-export-list class="layui-btn layui-btn-primary layui-hide"><i class="layui-icon layui-icon-export"></i> 导 出</button>
-        </div>
-    </form>
-    <script>
-        form.render();
-        laydate.render({range: true, elem: '[name="create_at"]'})
-    </script>
-</fieldset>

+ 0 - 89
application/store/view/order/express.html

@@ -1,89 +0,0 @@
-<form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
-    <div class="layui-card-body" style="padding-left:40px">
-
-        <fieldset>
-            <legend>收货信息</legend>
-            <div class="layui-form-item">
-                <label style='width:50px' class="layui-form-label">收货姓名</label>
-                <div class="layui-input-block" style="margin-left:80px">
-                    <input name="express_name" required value='{$vo.express_name|default=""}' placeholder="请输入收货姓名" class="layui-input">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label style='width:50px' class="layui-form-label">收货手机</label>
-                <div class="layui-input-block" style="margin-left:80px">
-                    <input name="express_phone" required value='{$vo.express_phone|default=""}' placeholder="请输入收货手机" class="layui-input">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label style='width:50px' class="layui-form-label label-required">收货区域</label>
-                <div class="layui-input-block" style="margin-left:80px">
-                    <div class="color-blue" style="line-height:38px;">{$vo.express_province|default='--'} {$vo.express_city|default=''} {$vo.express_area|default=''}</div>
-                    <div class="layui-row">
-                        <div class="layui-col-xs4"><select class="layui-select block full-width" lay-ignore name="form_province"></select></div>
-                        <div class="layui-col-xs4"><select class="layui-select block full-width" lay-ignore name="form_city"></select></div>
-                        <div class="layui-col-xs4"><select class="layui-select block full-width" lay-ignore name="form_area"></select></div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label style='width:50px' class="layui-form-label">收货地址</label>
-                <div class="layui-input-block" style="margin-left:80px">
-                    <input name="express_address" required value='{$vo.express_address|default=""}' placeholder="请输入收货地址" class="layui-input">
-                </div>
-            </div>
-        </fieldset>
-
-        <fieldset class="margin-top-20">
-            <legend>快递信息</legend>
-            <div class="layui-form-item">
-                <label style='width:50px' class="layui-form-label label-required">快递公司</label>
-                <div class="layui-input-block" style="margin-left:80px">
-                    <select class="layui-select" name="express_company_code" lay-search>
-                        {foreach $expressList as $express}
-                        {if $vo.express_company_code eq $express.express_code}
-                        <option selected value="{$express.express_code}">{$express.express_title}</option>
-                        {else}
-                        <option value="{$express.express_code}">{$express.express_title}</option>
-                        {/if}
-                        {/foreach}
-                    </select>
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label style='width:50px' class="layui-form-label">快递单号</label>
-                <div class="layui-input-block" style="margin-left:80px">
-                    <input name="express_send_no" required value='{$vo.express_send_no|default=""}' placeholder="请输入快递单号" class="layui-input">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label style='width:50px' class="layui-form-label">订单描述</label>
-                <div class="layui-input-block" style="margin-left:80px">
-                    <textarea placeholder="请输入订单描述" class="layui-textarea" name="express_desc">{$vo.express_desc|default=""}</textarea>
-                </div>
-            </div>
-
-        </fieldset>
-    </div>
-
-    <div class="hr-line-dashed"></div>
-
-    <div class="layui-form-item text-center">
-        <!--{notempty name='vo.id'}-->
-        <input type='hidden' value='{$vo.id}' name='id'>
-        <!--{/notempty}-->
-        <button class="layui-btn" type='submit'>保存数据</button>
-        <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗?" data-close>取消编辑</button>
-    </div>
-    <script>
-        require(['pcasunzips'], function () {
-            new PCAS("form_province", "form_city", "form_area", '{$vo.express_province|default=""}', '{$vo.express_city|default=""}', '{$vo.express_area|default=""}');
-            window.form.render();
-        });
-    </script>
-</form>

+ 0 - 17
application/store/view/order/express_query.html

@@ -1,17 +0,0 @@
-<div class="padding-25" style="max-height:450px;overflow:auto">
-    {empty name='result.data'}
-    <div>还没有快递记录哦!</div>
-    {else}
-    <ul class="layui-timeline">
-        {foreach $result.data as $key=>$vo}
-        <li class="layui-timeline-item">
-            <i class="layui-icon layui-timeline-axis">{if $key eq 0 }&#xe756;{else}&#xe63f;{/if}</i>
-            <div class="layui-timeline-content layui-text">
-                <strong class="layui-timeline-title">{$vo.time|format_datetime|default='--'}</strong>
-                <p>{$vo.context|default='--'}</p>
-            </div>
-        </li>
-        {/foreach}
-    </ul>
-    {/empty}
-</div>

+ 0 - 86
application/store/view/order/index.html

@@ -1,86 +0,0 @@
-{extend name='admin@main'}
-
-{block name="content"}
-<div class="think-box-shadow">
-    {include file='order/index_search'}
-    <table class="layui-table margin-top-10" lay-skin="line">
-        {notempty name='list'}
-        <thead>
-        <tr>
-            <th class='list-table-check-td think-checkbox'>
-                <input data-auto-none data-check-target='.list-check-box' type='checkbox'>
-            </th>
-            <th class="text-left nowrap">会员信息</th>
-            <th class='text-left nowrap'>订单信息</th>
-            <th class='text-left nowrap'>发货信息</th>
-            <th class='text-right nowrap'>商品信息</th>
-        </tr>
-        </thead>
-        {/notempty}
-        <tbody>
-        {foreach $list as $key=>$vo}
-        <tr>
-            <td class='list-table-check-td think-checkbox'><input class="list-check-box" value='{$vo.id}' type='checkbox'></td>
-            <td class="text-left nowrap relative">
-                {notempty name='vo.member.headimg'}
-                <img data-tips-image style="width:80px;height:80px" src="{$vo.member.headimg|default=''}" class="margin-right-5 text-top">
-                {/notempty}
-                <div class="inline-block">
-                    推荐会员:{$vo.from_member.nickname|default='--'}<br>
-                    推荐手机:{$vo.from_member.phone|default='--'}<br>
-                    会员昵称:{$vo.member.nickname|default='--'}<br>
-                    会员手机:{$vo.member.phone|default='--'}<br>
-                </div>
-            </td>
-            <td class='text-left nowrap'>
-                订单单号:<span class="color-blue">{$vo.order_no|default=''}</span>
-                {eq name='vo.status' value='1'}<span class="layui-badge layui-bg-red margin-left-5">预订单</span>{/eq}
-                {eq name='vo.status' value='2'}<span class="layui-badge layui-bg-orange margin-left-5">待付款</span>{/eq}
-                {eq name='vo.status' value='3'}<span class="layui-badge layui-bg-black margin-left-5">待发货</span>{/eq}
-                {eq name='vo.status' value='4'}<span class="layui-badge layui-bg-green margin-left-5">已发货</span>{/eq}
-                {eq name='vo.status' value='5'}<span class="layui-badge layui-bg-blue margin-left-5">已完成</span>{/eq}
-                <br>
-                订单金额:<strong class="color-blue">{$vo.price_total+0}</strong> 元
-                分成 <strong class="color-blue">{$vo.price_rate_amount+0}</strong> 元
-                已支付 <strong class="color-blue">{$vo.pay_price+0}</strong> 元<br>
-                下单时间:{$vo.create_at|format_datetime}<br>
-                支付时间:{$vo.pay_at|format_datetime|default='--'}<br>
-            </td>
-            <td class="text-left nowrap">
-                收货信息:{$vo.express_name|default='--'}<span class="margin-left-5 color-blue">{$vo.express_phone}</span><br>
-                收货地址:{$vo.express_province|default='--'}{$vo.express_city}{$vo.express_area}{$vo.express_address}<br>
-                发货状态:{eq name='vo.express_state' value='0'}
-                <span class="layui-badge layui-bg-black">未发货</span>
-                {else}
-                <span class="layui-badge layui-bg-blue">{$vo.express_company_title|default='--'}</span>
-                <a data-title="{$vo.express_company_title}({$vo.express_send_no})" data-tips-text="快递追踪查询"
-                   data-modal="{:url('expressQuery')}?code={$vo.express_company_code}&no={$vo.express_send_no}"
-                   class="layui-badge layui-bg-gray margin-left-5">{$vo.express_send_no|default='--'}</a>
-                {/eq}
-                {if $vo.status eq 3}
-                <a class=" margin-left-5" data-title="填写订单信息" data-modal="{:url('express')}?id={$vo.id}">填写发货信息</a>
-                {elseif $vo.status eq 4}
-                <a class=" margin-left-5" data-title="修改发货信息" data-modal="{:url('express')}?id={$vo.id}">修改发货信息</a>
-                {/if}
-                <br>
-                发货时间:{$vo.express_send_at|format_datetime}<br>
-            </td>
-            <td class="nowrap">
-                {foreach $vo.list as $g}
-                <div class="nowrap">
-                    <p class="text-right">{$g.goods_title|default=''} x{$g.number_goods|default=0}</p>
-                    <p class="text-right color-desc">
-                        售价 {$g.price_real} 元,分成比例 {$g.price_rate+0}%,分成金额 {$g.price_rate_amount+0} 元
-                    </p>
-                </div>
-                {/foreach}
-            </td>
-        </tr>
-        {/foreach}
-        </tbody>
-    </table>
-
-    {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
-
-</div>
-{/block}

+ 0 - 102
application/store/view/order/index_search.html

@@ -1,102 +0,0 @@
-<fieldset>
-    <legend>条件搜索</legend>
-    <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get" autocomplete="off">
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">订单单号</label>
-            <div class="layui-input-inline">
-                <input name="order_no" value="{$Think.get.order_no|default=''}" placeholder="请输入订单单号" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">发货单号</label>
-            <div class="layui-input-inline">
-                <input name="api_tracking_no" value="{$Think.get.api_tracking_no|default=''}" placeholder="请输入发货单号" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">订单状态</label>
-            <div class="layui-input-inline">
-                <select class="layui-select" name="status">
-                    {foreach [''=>'- 全部订单 -','2'=>'待付款','3'=>'待发货','4'=>'已发货','5'=>'已完成'] as $k=>$v}
-                    <!--{eq name='Think.get.status' value='$k.""'}-->
-                    <option selected value="{$k}">{$v}</option>
-                    <!--{else}-->
-                    <option value="{$k}">{$v}</option>
-                    <!--{/eq}-->
-                    {/foreach}
-                </select>
-            </div>
-        </div>
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">付款状态</label>
-            <div class="layui-input-inline">
-                <select class="layui-select" name="pay_state">
-                    {foreach [''=>'- 全部订单 -','0'=>'未支付的订单','1'=>'已支付的订单'] as $k=>$v}
-                    <!--{eq name='Think.get.pay_state' value='$k.""'}-->
-                    <option selected value="{$k}">{$v}</option>
-                    <!--{else}-->
-                    <option value="{$k}">{$v}</option>
-                    <!--{/eq}-->
-                    {/foreach}
-                </select>
-            </div>
-        </div>
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">下单时间</label>
-            <div class="layui-input-inline">
-                <input data-date-range name="create_at" value="{$Think.get.create_at|default=''}" placeholder="请选择下单时间" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">支付时间</label>
-            <div class="layui-input-inline">
-                <input data-date-range name="pay_at" value="{$Think.get.pay_at|default=''}" placeholder="请选择支付时间" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">收货姓名</label>
-            <div class="layui-input-inline">
-                <input name="express_name" value="{$Think.get.express_name|default=''}" placeholder="请输入收货姓名" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">收货手机</label>
-            <div class="layui-input-inline">
-                <input name="express_phone" value="{$Think.get.express_phone|default=''}" placeholder="请输入收货手机" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">收货省份</label>
-            <div class="layui-input-inline">
-                <input name="express_province" value="{$Think.get.express_province|default=''}" placeholder="请输入收货省份" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">收货城市</label>
-            <div class="layui-input-inline">
-                <input name="express_city" value="{$Think.get.express_city|default=''}" placeholder="请输入收货城市" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">收货区域</label>
-            <div class="layui-input-inline">
-                <input name="express_area" value="{$Think.get.express_area|default=''}" placeholder="请输入收货区域" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">详细地址</label>
-            <div class="layui-input-inline">
-                <input name="express_address" value="{$Think.get.express_address|default=''}" placeholder="请输入详细地址" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item layui-inline">
-            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
-        </div>
-    </form>
-    <script>
-        window.form.render();
-        $('[data-export-list]').on('click', function () {
-            window.location.href = '{:url("@")}?s=store/order/index&' + $(this).parents('form').serialize() + '&action=export'
-        });
-    </script>
-</fieldset>