1

application/admin/controller/Auth.php

@@ -30,7 +30,7 @@ class Auth extends Controller
      * 默认数据模型
      * @var string
      */
-    public $table = 'Auth';
+    public $table = 'SystemAuth';
 
     /**
      * 系统权限管理
@@ -61,15 +61,15 @@ class Auth extends Controller
         $map = ['auth' => input('id', '0')];
         $action = strtolower(input('action', ''));
         if ($action === 'get') {
-            $checkeds = Db::name('AuthNode')->where($map)->column('node');
+            $checkeds = Db::name('SystemAuthNode')->where($map)->column('node');
             $this->success('获取权限节点成功！', AdminService::instance()->getTree($checkeds));
         } elseif ($action === 'save') {
             list($post, $data) = [$this->request->post(), []];
             foreach (isset($post['nodes']) ? $post['nodes'] : [] as $node) {
                 $data[] = ['auth' => $map['auth'], 'node' => $node];
             }
-            Db::name('AuthNode')->where($map)->delete();
-            Db::name('AuthNode')->insertAll($data);
+            Db::name('SystemAuthNode')->where($map)->delete();
+            Db::name('SystemAuthNode')->insertAll($data);
             AdminService::instance()->apply(true);
             $this->success('权限授权更新成功！', 'javascript:history.back()');
         } else {
@@ -170,7 +170,7 @@ class Auth extends Controller
     {
         if ($result) {
             $map = ['auth' => $this->request->post('id')];
-            Db::name('AuthNode')->where($map)->delete();
+            Db::name('SystemAuthNode')->where($map)->delete();
             $this->success("权限删除成功！", '');
         } else {
             $this->error("权限删除失败，请稍候再试！");

application/admin/controller/Config.php

@@ -16,7 +16,6 @@
 namespace app\admin\controller;
 
 use library\Controller;
-use think\Db;
 use think\exception\HttpResponseException;
 use think\facade\Request;
 
@@ -31,7 +30,7 @@ class Config extends Controller
      * 默认数据模型
      * @var string
      */
-    protected $table = 'Config';
+    protected $table = 'SystemConfig';
 
     /**
      * 阿里云OSS上传点
@@ -82,21 +81,12 @@ class Config extends Controller
         if (Request::isGet()) {
             $this->fetch('system-config');
         }
-        $uptype = Db::name('config')->where('name','storage_type')->value('value');
-        $post = Request::post();
-        if ($uptype!='local'){
-            $post['bot_img'] = 'http://'.$_SERVER['SERVER_NAME'].self::crabImage($post['bot_img']);
-        }
-        $post['integral_share_img'] = $post['logo'];
-        unset($post['logo']);
-        foreach ($post as $key => $value) {
+        foreach (Request::post() as $key => $value) {
             sysconf($key, $value);
         }
         $this->success('系统参数配置成功！');
     }
 
-
-
     /**
      * 文件存储引擎
      * @auth true
@@ -137,51 +127,4 @@ class Config extends Controller
         }
     }
 
-
-    /**
-     * PHP将网页上的图片攫取到本地存储
-     * @param $imgUrl  图片url地址
-     * @param string $saveDir 本地存储路径 默认存储在当前路径
-     * @param null $fileName 图片存储到本地的文件名
-     * @return mix
-     */
-    public static function crabImage($imgUrl, $saveDir='./upload/', $fileName=null){
-        if(empty($imgUrl)){
-            return false;
-        }
-        //获取图片信息大小
-        $imgSize = getImageSize($imgUrl);
-        if(!in_array($imgSize['mime'],array('image/jpg', 'image/gif', 'image/png', 'image/jpeg'),true)){
-            return false;
-        }
-
-        //获取后缀名
-        $_mime = explode('/', $imgSize['mime']);
-        $_ext = '.'.end($_mime);
-
-        if(empty($fileName)){  //生成唯一的文件名
-            $fileName = uniqid(time(),true).$_ext;
-        }
-
-        //开始攫取
-        ob_start();
-        readfile($imgUrl);
-        $imgInfo = ob_get_contents();
-        ob_end_clean();
-
-        if(!file_exists($saveDir)){
-            mkdir($saveDir,0777,true);
-        }
-        $fp = fopen($saveDir.$fileName, 'a');
-        $imgLen = strlen($imgInfo);    //计算图片源码大小
-        $_inx = 2048;   //每次写入2k
-        $_time = ceil($imgLen/$_inx);
-        for($i=0; $i<$_time; $i++){
-            fwrite($fp,substr($imgInfo, $i*$_inx, $_inx));
-        }
-        fclose($fp);
-        return substr($saveDir.$fileName, 1);
-        //return array('file_name'=>$fileName,'save_path'=>$saveDir.$fileName);
-    }
-
 }

application/admin/controller/Index.php

@@ -81,7 +81,7 @@ class Index extends Controller
         }
         if ($this->request->isGet()) {
             $this->verify = true;
-            $this->_form('AdminUser', 'admin@user/pass', 'id', [], ['id' => $id]);
+            $this->_form('SystemUser', 'admin@user/pass', 'id', [], ['id' => $id]);
         } else {
             $data = $this->_input([
                 'password'    => $this->request->post('password'),
@@ -98,11 +98,11 @@ class Index extends Controller
                 'repassword.require'  => '重复密码不能为空！',
                 'repassword.confirm'  => '重复密码与登录密码不匹配，请重新输入！',
             ]);
-            $user = Db::name('AdminUser')->where(['id' => $id])->find();
+            $user = Db::name('SystemUser')->where(['id' => $id])->find();
             if (md5($data['oldpassword']) !== $user['password']) {
                 $this->error('旧密码验证失败，请重新输入！');
             }
-            if (Data::save('AdminUser', ['id' => $user['id'], 'password' => md5($data['password'])])) {
+            if (Data::save('SystemUser', ['id' => $user['id'], 'password' => md5($data['password'])])) {
                 $this->success('密码修改成功，下次请使用新密码登录！', '');
             } else {
                 $this->error('密码修改失败，请稍候再试！');
@@ -127,7 +127,7 @@ class Index extends Controller
         }
         $this->applyCsrfToken();
         if (intval($id) === intval(session('user.id'))) {
-            $this->_form('AdminUser', 'admin@user/form', 'id', [], ['id' => $id]);
+            $this->_form('SystemUser', 'admin@user/form', 'id', [], ['id' => $id]);
         } else {
             $this->error('只能修改登录用户的资料！');
         }

application/admin/controller/Login.php

@@ -23,7 +23,6 @@ use library\tools\Data;
 use think\Db;
 use think\facade\Request;
 
-header('Access-Control-Allow-Origin: *');
 /**
  * 用户登录管理
  * Class Login
@@ -67,7 +66,7 @@ class Login extends Controller
             }
             // 用户信息验证
             $map = ['is_deleted' => '0', 'username' => $data['username']];
-            $user = Db::name('AdminUser')->where($map)->order('id desc')->find();
+            $user = Db::name('SystemUser')->where($map)->order('id desc')->find();
             if (empty($user)) {
                 $this->error('登录账号或密码错误，请重新输入1!');
             }
@@ -77,7 +76,7 @@ class Login extends Controller
             if (empty($user['status'])) {
                 $this->error('账号已经被禁用，请联系管理员!');
             }
-            Db::name('AdminUser')->where(['id' => $user['id']])->update([
+            Db::name('SystemUser')->where(['id' => $user['id']])->update([
                 'login_ip'  => Request::ip(),
                 'login_at'  => Db::raw('now()'),
                 'login_num' => Db::raw('login_num+1'),

application/admin/controller/Menu.php

@@ -32,7 +32,7 @@ class Menu extends Controller
      * 当前操作数据库
      * @var string
      */
-    protected $table = 'Menu';
+    protected $table = 'SystemMenu';
 
     /**
      * 系统菜单管理

application/admin/controller/Oplog.php

@@ -30,7 +30,7 @@ class Oplog extends Controller
      * 指定当前数据表
      * @var string
      */
-    public $table = 'Log';
+    public $table = 'SystemLog';
 
     /**
      * 系统操作日志

application/admin/controller/Queue.php

@@ -32,7 +32,7 @@ class Queue extends Controller
      * 绑定数据表
      * @var string
      */
-    protected $table = 'Queue';
+    protected $table = 'SystemQueue';
 
     /**
      * 系统系统任务

application/admin/controller/User.php

@@ -31,7 +31,7 @@ class User extends Controller
      * 指定当前数据表
      * @var string
      */
-    public $table = 'AdminUser';
+    public $table = 'SystemUser';
 
     /**
      * 系统用户管理
@@ -124,7 +124,7 @@ class User extends Controller
             }
         } else {
             $data['authorize'] = explode(',', isset($data['authorize']) ? $data['authorize'] : '');
-            $this->authorizes = Db::name('Auth')->where(['status' => '1'])->order('sort desc,id desc')->select();
+            $this->authorizes = Db::name('SystemAuth')->where(['status' => '1'])->order('sort desc,id desc')->select();
         }
     }
 

application/admin/controller/api/Update.php

@@ -26,10 +26,15 @@ use library\Controller;
 class Update extends Controller
 {
     /**
-     * 基础URL地址
-     * @var string
+     * 访问权限
      */
-    protected $baseUri = 'https://demo.thinkadmin.top';
+    protected function initialize()
+    {
+        $domain = $this->app->request->host(true);
+        $isDemo = is_numeric(stripos($domain, 'thinkadmin.top'));
+        $isLocal = in_array($domain, ['127.0.0.1', 'localhost']);
+        if (!$isLocal && !$isDemo) $this->error('只允许访问本地或官方代码！');
+    }
 
     /**
      * 获取文件列表

application/admin/view/config/info.html

@@ -12,8 +12,7 @@
 
 <div class="think-box-shadow margin-bottom-15">
     <span class="color-green font-w7 text-middle">文件存储引擎：</span>
-    <!--{foreach ['local'=>'本地服务器存储','qiniu'=>'七牛云对象存储','oss'=>'阿里云OSS存储'] as $k=>$v}-->
-    {foreach ['local'=>'本地服务器存储','oss'=>'阿里云OSS存储'] as $k=>$v}
+    {foreach ['local'=>'本地服务器存储','qiniu'=>'七牛云对象存储','oss'=>'阿里云OSS存储'] as $k=>$v}
     {if sysconf('storage_type') eq $k}
     {if auth('file')}<a data-modal="{:url('file')}?type={$k}" class="layui-btn layui-btn-sm">{$v}</a>{else}<a class="layui-btn layui-btn-sm">{$v}</a>{/if}
     {elseif auth('file')}<a data-modal="{:url('file')}?type={$k}" class="layui-btn layui-btn-sm layui-btn-primary">{$v}</a>{/if}
@@ -22,6 +21,14 @@
 
 <div class="think-box-shadow padding-40">
     <div class="layui-form-item">
+        <span class="color-green font-w7">网站名称 Website</span>
+        <label class="relative block">
+            <input readonly value="{:sysconf('site_name')}" class="layui-input layui-bg-gray">
+            <a data-copy="{:sysconf('site_name')}" class="fa fa-copy right-btn"></a>
+        </label>
+        <p class="help-block">网站名称及网站图标，将显示在浏览器的标签上</p>
+    </div>
+    <div class="layui-form-item">
         <span class="color-green font-w7">管理程序名称 Name</span>
         <label class="relative block">
             <input readonly placeholder="请输入程序名称" value="{:sysconf('app_name')}" class="layui-input layui-bg-gray">
@@ -30,7 +37,7 @@
         <p class="help-block">管理程序名称，将显示在后台左上角标题</p>
     </div>
     <div class="layui-form-item">
-        <span class="color-green font-w7">管理程序小文字 Version</span>
+        <span class="color-green font-w7">管理程序版本 Version</span>
         <label class="relative block">
             <input readonly value="{:sysconf('app_version')}" class="layui-input layui-bg-gray">
             <a data-copy="{:sysconf('app_version')}" class="fa fa-copy right-btn"></a>
@@ -39,508 +46,21 @@
     </div>
 
     <div class="layui-form-item">
-        <span class="color-green font-w7">平台客服电话 PlatformTelphone</span>
-        <label class="relative block">
-            <input readonly value="{:sysconf('platform_telphone')}" class="layui-input layui-bg-gray">
-            <a data-copy="{:sysconf('platform_telphone')}" class="fa fa-copy right-btn"></a>
-        </label>
-        <p class="help-block">平台客服电话</p>
-    </div>
-
-    <div class="layui-form-item">
-        <span class="color-green font-w7">微信appid Appid</span>
-        <label class="relative block">
-            <input readonly value="{:sysconf('wechat_appid')}" class="layui-input layui-bg-gray">
-            <a data-copy="{:sysconf('wechat_appid')}" class="fa fa-copy right-btn"></a>
-        </label>
-        <p class="help-block">微信开放平台的appid</p>
-    </div>
-
-    <div class="layui-form-item">
-        <span class="color-green font-w7">微信appsecret Appsecret</span>
+        <span class="color-green font-w7">网站备案号 Miitbeian</span>
         <label class="relative block">
-            <input readonly value="{:sysconf('wechat_appsecret')}" class="layui-input layui-bg-gray">
-            <a data-copy="{:sysconf('wechat_appsecret')}" class="fa fa-copy right-btn"></a>
+            <input readonly value="{:sysconf('miitbeian')}" class="layui-input layui-bg-gray">
+            <a data-copy="{:sysconf('miitbeian')}" class="fa fa-copy right-btn"></a>
         </label>
-        <p class="help-block">微信开放平台的appsecret</p>
+        <p class="help-block">网站备案号，可以在<a target="_blank" href="http://beian.miit.gov.cn">备案管理中心</a>查询获取，将显示在登录页面下面</p>
     </div>
-
-<!--    <div class="layui-form-item">-->
-<!--        <span class="color-green font-w7">注册赠送积分数量 RegisterGiveIntegral</span>-->
-<!--        <label class="relative block">-->
-<!--            <input readonly value="{:sysconf('register_give_integral')}" class="layui-input layui-bg-gray">-->
-<!--            <a data-copy="{:sysconf('register_give_integral')}" class="fa fa-copy right-btn"></a>-->
-<!--        </label>-->
-<!--        <p class="help-block">注册赠送积分数量 0:不送</p>-->
-<!--    </div>-->
-
     <div class="layui-form-item">
-        <span class="color-green font-w7">想认识扣除积分 WantKnowIntegral</span>
+        <span class="color-green font-w7">网站版权信息 Copyright</span>
         <label class="relative block">
-            <input readonly value="{:sysconf('want_know_integral')}" class="layui-input layui-bg-gray">
-            <a data-copy="{:sysconf('want_know_integral')}" class="fa fa-copy right-btn"></a>
+            <input readonly value="{:sysconf('site_copy')}" class="layui-input layui-bg-gray">
+            <a data-copy="{:sysconf('site_copy')}" class="fa fa-copy right-btn"></a>
         </label>
-        <p class="help-block">想认识扣除积分</p>
+        <p class="help-block">网站版权信息，在后台登录页面显示版本信息并链接到备案到信息备案管理系统</p>
     </div>
-
-<!--    <div class="layui-form-item">-->
-<!--        <span class="color-green font-w7">积分获取联系方式扣除积分 IntegralContact</span>-->
-<!--        <label class="relative block">-->
-<!--            <input readonly value="{:sysconf('integral_contact')}" class="layui-input layui-bg-gray">-->
-<!--            <a data-copy="{:sysconf('integral_contact')}" class="fa fa-copy right-btn"></a>-->
-<!--        </label>-->
-<!--        <p class="help-block">积分获取联系方式扣除积分</p>-->
-<!--    </div>-->
-<!--    <div class="layui-col-md12">-->
-<!--        <div class="layui-col-md3">-->
-<!--            <div class="layui-form-item">-->
-<!--                <span class="color-green font-w7">分享次数（每天）（分享小程序） shareCountDay</span>-->
-<!--                <label class="relative block">-->
-<!--                    <input readonly value="{:sysconf('share_applet_count_day')}" class="layui-input layui-bg-gray">-->
-<!--                    <a data-copy="{:sysconf('share_applet_count_day')}" class="fa fa-copy right-btn"></a>-->
-<!--                </label>-->
-<!--                <p class="help-block">一天分享几次有积分（分享小程序）</p>-->
-<!--            </div>-->
-<!--        </div>-->
-
-<!--        <div class="layui-col-md3" style="margin-left: 10px">-->
-<!--            <div class="layui-form-item">-->
-<!--                <span class="color-green font-w7">分享一次获得多少积分（分享小程序） shareIntegral</span>-->
-<!--                <label class="relative block">-->
-<!--                    <input readonly value="{:sysconf('share_applet_integral')}" class="layui-input layui-bg-gray">-->
-<!--                    <a data-copy="{:sysconf('share_applet_integral')}" class="fa fa-copy right-btn"></a>-->
-<!--                </label>-->
-<!--                <p class="help-block">分享一次获得多少积分（分享小程序）</p>-->
-<!--            </div>-->
-<!--        </div>-->
-
-<!--        <div class="layui-col-md3" style="margin-left: 10px">-->
-<!--            <div class="layui-form-item">-->
-<!--                <span class="color-green font-w7">分享小程序标题 ShareAppletTitle</span>-->
-<!--                <label class="relative block">-->
-<!--                    <input readonly value="{:sysconf('share_applet_title')}" class="layui-input layui-bg-gray">-->
-<!--                    <a data-copy="{:sysconf('share_applet_title')}" class="fa fa-copy right-btn"></a>-->
-<!--                </label>-->
-<!--                <p class="help-block">分享小程序标题</p>-->
-<!--            </div>-->
-<!--        </div>-->
-<!--    </div>-->
-
-<!--    <div class="layui-col-md12">-->
-<!--        <div class="layui-col-md3">-->
-<!--            <div class="layui-form-item">-->
-<!--                <span class="color-green font-w7">分享次数（每天）（分享互选池） shareCountDay</span>-->
-<!--                <label class="relative block">-->
-<!--                    <input readonly value="{:sysconf('share_pool_count_day')}" class="layui-input layui-bg-gray">-->
-<!--                    <a data-copy="{:sysconf('share_pool_count_day')}" class="fa fa-copy right-btn"></a>-->
-<!--                </label>-->
-<!--                <p class="help-block">一天分享几次有积分（分享互选池）</p>-->
-<!--            </div>-->
-<!--        </div>-->
-
-<!--        <div class="layui-col-md3" style="margin-left: 10px">-->
-<!--            <div class="layui-form-item ">-->
-<!--                <span class="color-green font-w7">分享一次获得多少积分（分享互选池） shareIntegral</span>-->
-<!--                <label class="relative block">-->
-<!--                    <input readonly value="{:sysconf('share_pool_integral')}" class="layui-input layui-bg-gray">-->
-<!--                    <a data-copy="{:sysconf('share_pool_integral')}" class="fa fa-copy right-btn"></a>-->
-<!--                </label>-->
-<!--                <p class="help-block">分享一次获得多少积分（分享互选池）</p>-->
-<!--            </div>-->
-<!--        </div>-->
-
-<!--        <div class="layui-col-md3" style="margin-left: 10px">-->
-<!--            <div class="layui-form-item">-->
-<!--                <span class="color-green font-w7">分享互选池标题 SharePoolTitle</span>-->
-<!--                <label class="relative block">-->
-<!--                    <input readonly value="{:sysconf('share_pool_title')}" class="layui-input layui-bg-gray">-->
-<!--                    <a data-copy="{:sysconf('share_pool_title')}" class="fa fa-copy right-btn"></a>-->
-<!--                </label>-->
-<!--                <p class="help-block">分享小程序标题</p>-->
-<!--            </div>-->
-<!--        </div>-->
-<!--    </div>-->
-
-<!--    <div class="layui-col-md12">-->
-<!--        <div class="layui-col-md3">-->
-<!--            <div class="layui-form-item">-->
-<!--                <span class="color-green font-w7">分享次数（每天）（分享个人主页） shareCountDay</span>-->
-<!--                <label class="relative block">-->
-<!--                    <input readonly value="{:sysconf('share_myinfo_count_day')}" class="layui-input layui-bg-gray">-->
-<!--                    <a data-copy="{:sysconf('share_myinfo_count_day')}" class="fa fa-copy right-btn"></a>-->
-<!--                </label>-->
-<!--                <p class="help-block">一天分享几次有积分（分享个人主页）</p>-->
-<!--            </div>-->
-<!--        </div>-->
-
-<!--        <div class="layui-col-md3" style="margin-left: 10px">-->
-<!--            <div class="layui-form-item ">-->
-<!--                <span class="color-green font-w7">分享一次获得多少积分（分享个人主页） shareIntegral</span>-->
-<!--                <label class="relative block">-->
-<!--                    <input readonly value="{:sysconf('share_myinfo_integral')}" class="layui-input layui-bg-gray">-->
-<!--                    <a data-copy="{:sysconf('share_myinfo_integral')}" class="fa fa-copy right-btn"></a>-->
-<!--                </label>-->
-<!--                <p class="help-block">分享一次获得多少积分（分享个人主页）</p>-->
-<!--            </div>-->
-<!--        </div>-->
-
-<!--        <div class="layui-col-md3" style="margin-left: 10px">-->
-<!--            <div class="layui-form-item">-->
-<!--                <span class="color-green font-w7">分享个人主页标题 ShareMyinfoTitle</span>-->
-<!--                <label class="relative block">-->
-<!--                    <input readonly value="{:sysconf('share_myinfo_title')}" class="layui-input layui-bg-gray">-->
-<!--                    <a data-copy="{:sysconf('share_myinfo_title')}" class="fa fa-copy right-btn"></a>-->
-<!--                </label>-->
-<!--                <p class="help-block">分享个人主页标题</p>-->
-<!--            </div>-->
-<!--        </div>-->
-<!--    </div>-->
-
-<!--    <div class="layui-col-md12">-->
-<!--        <div class="layui-col-md3">-->
-<!--            <div class="layui-form-item">-->
-<!--                <span class="color-green font-w7">分享次数（每天）（分享他人主页） shareCountDay</span>-->
-<!--                <label class="relative block">-->
-<!--                    <input readonly value="{:sysconf('share_others_count_day')}" class="layui-input layui-bg-gray">-->
-<!--                    <a data-copy="{:sysconf('share_others_count_day')}" class="fa fa-copy right-btn"></a>-->
-<!--                </label>-->
-<!--                <p class="help-block">一天分享几次有积分（分享他人主页）</p>-->
-<!--            </div>-->
-<!--        </div>-->
-
-<!--        <div class="layui-col-md3" style="margin-left: 10px">-->
-<!--            <div class="layui-form-item ">-->
-<!--                <span class="color-green font-w7">分享一次获得多少积分（分享他人主页） shareIntegral</span>-->
-<!--                <label class="relative block">-->
-<!--                    <input readonly value="{:sysconf('share_others_integral')}" class="layui-input layui-bg-gray">-->
-<!--                    <a data-copy="{:sysconf('share_others_integral')}" class="fa fa-copy right-btn"></a>-->
-<!--                </label>-->
-<!--                <p class="help-block">分享一次获得多少积分（分享他人主页）</p>-->
-<!--            </div>-->
-<!--        </div>-->
-
-<!--        <div class="layui-col-md3" style="margin-left: 10px">-->
-<!--            <div class="layui-form-item">-->
-<!--                <span class="color-green font-w7">分享他人主页标题 ShareOthersTitle</span>-->
-<!--                <label class="relative block">-->
-<!--                    <input readonly value="{:sysconf('share_others_title')}" class="layui-input layui-bg-gray">-->
-<!--                    <a data-copy="{:sysconf('share_others_title')}" class="fa fa-copy right-btn"></a>-->
-<!--                </label>-->
-<!--                <p class="help-block">分享他人主页标题</p>-->
-<!--            </div>-->
-<!--        </div>-->
-<!--    </div>-->
-
-    <div class="layui-col-md12">
-        <div class="layui-col-md3">
-            <div class="layui-form-item">
-                <span class="color-green font-w7">原自我介绍 IntroduceTitle</span>
-                <label class="relative block">
-                    <input readonly value="{:sysconf('introduce_title')}" class="layui-input layui-bg-gray">
-                    <a data-copy="{:sysconf('introduce_title')}" class="fa fa-copy right-btn"></a>
-                </label>
-                <p class="help-block">完善资料--自我介绍</p>
-            </div>
-        </div>
-
-        <div class="layui-col-md3">
-            <div class="layui-form-item ">
-                <span class="color-green font-w7">原家庭背景 FamilyTitle</span>
-                <label class="relative block">
-                    <input readonly value="{:sysconf('family_title')}" class="layui-input layui-bg-gray">
-                    <a data-copy="{:sysconf('family_title')}" class="fa fa-copy right-btn"></a>
-                </label>
-                <p class="help-block">完善资料--家庭背景</p>
-            </div>
-        </div>
-
-        <div class="layui-col-md3">
-            <div class="layui-form-item">
-                <span class="color-green font-w7">原兴趣爱好 HobbiesTitle</span>
-                <label class="relative block">
-                    <input readonly value="{:sysconf('hobbies_title')}" class="layui-input layui-bg-gray">
-                    <a data-copy="{:sysconf('hobbies_title')}" class="fa fa-copy right-btn"></a>
-                </label>
-                <p class="help-block">完善资料--兴趣爱好</p>
-            </div>
-        </div>
-
-        <div class="layui-col-md3">
-            <div class="layui-form-item">
-                <span class="color-green font-w7">原爱情观 LoveTitle</span>
-                <label class="relative block">
-                    <input readonly value="{:sysconf('love_title')}" class="layui-input layui-bg-gray">
-                    <a data-copy="{:sysconf('love_title')}" class="fa fa-copy right-btn"></a>
-                </label>
-                <p class="help-block">完善资料--爱情观</p>
-            </div>
-        </div>
-    </div>
-
-    <div class="layui-col-md12">
-        <div class="layui-col-md3">
-            <div class="layui-form-item">
-                <span class="color-green font-w7">原理想的另一半 partner_title</span>
-                <label class="relative block">
-                    <input readonly value="{:sysconf('partner_title')}" class="layui-input layui-bg-gray">
-                    <a data-copy="{:sysconf('partner_title')}" class="fa fa-copy right-btn"></a>
-                </label>
-                <p class="help-block">完善资料--理想的另一半</p>
-            </div>
-        </div>
-
-        <div class="layui-col-md3">
-            <div class="layui-form-item ">
-                <span class="color-green font-w7">原为什么单身 single_title</span>
-                <label class="relative block">
-                    <input readonly value="{:sysconf('single_title')}" class="layui-input layui-bg-gray">
-                    <a data-copy="{:sysconf('single_title')}" class="fa fa-copy right-btn"></a>
-                </label>
-                <p class="help-block">完善资料--为什么单身</p>
-            </div>
-        </div>
-
-        <div class="layui-col-md3">
-            <div class="layui-form-item">
-                <span class="color-green font-w7">原期待什么样的生活 what_life_title</span>
-                <label class="relative block">
-                    <input readonly value="{:sysconf('what_life_title')}" class="layui-input layui-bg-gray">
-                    <a data-copy="{:sysconf('what_life_title')}" class="fa fa-copy right-btn"></a>
-                </label>
-                <p class="help-block">完善资料--期待什么样的生活</p>
-            </div>
-        </div>
-
-    </div>
-
-    <div class="layui-col-md12">
-        <div class="layui-col-md3">
-            <div class="layui-form-item">
-                <span class="color-green font-w7">原心动区 cardiac_area_title</span>
-                <label class="relative block">
-                    <input readonly value="{:sysconf('cardiac_area_title')}" class="layui-input layui-bg-gray">
-                    <a data-copy="{:sysconf('cardiac_area_title')}" class="fa fa-copy right-btn"></a>
-                </label>
-                <p class="help-block">个人中心--心动区</p>
-            </div>
-        </div>
-
-        <div class="layui-col-md3">
-            <div class="layui-form-item ">
-                <span class="color-green font-w7">原互选区 each_district_title</span>
-                <label class="relative block">
-                    <input readonly value="{:sysconf('each_district_title')}" class="layui-input layui-bg-gray">
-                    <a data-copy="{:sysconf('each_district_title')}" class="fa fa-copy right-btn"></a>
-                </label>
-                <p class="help-block">个人中心--互选区</p>
-            </div>
-        </div>
-
-    </div>
-
-    <div class="layui-col-md12">
-<!--        <div class="layui-col-md3">-->
-<!--            <div class="layui-form-item">-->
-<!--                <span class="color-green font-w7">积分获取联系方式开关</span>-->
-<!--                <label class="relative block">-->
-<!--                    <input readonly value="{:sysconf('integral_get_contact_switch')}" class="layui-input layui-bg-gray">-->
-<!--                </label>-->
-<!--                <p class="help-block">积分获取联系方式开关    1:开  0:关</p>-->
-<!--            </div>-->
-<!--        </div>-->
-
-        <div class="layui-col-md3">
-            <div class="layui-form-item ">
-                <span class="color-green font-w7">想认识开关</span>
-                <label class="relative block">
-                    <input readonly value="{:sysconf('want_to_know_switch')}" class="layui-input layui-bg-gray">
-                </label>
-                <p class="help-block">想认识开关   1:开  0:关</p>
-            </div>
-        </div>
-
-    </div>
-
-    <div class="layui-form-item">
-        <span class="color-green font-w7">官方微信号 WechatId</span>
-        <label class="relative block">
-            <input readonly value="{:sysconf('wechat_id')}" class="layui-input layui-bg-gray">
-            <a data-copy="{:sysconf('wechat_id')}" class="fa fa-copy right-btn"></a>
-        </label>
-        <p class="help-block">官方微信号,用于充值积分</p>
-    </div>
-
-    <div class="layui-form-item">
-        <span class="color-green font-w7">积分不足及时充值提示图片 IntegralShareImg</span>
-        <label class="relative block">
-            <img data-tips-image style="width:100px;height:100px;vertical-align:top" src="{:sysconf('integral_share_img')}" class="margin-right-5">
-        </label>
-        <p class="help-block">积分不足及时充值提示图片</p>
-    </div>
-
-    <div class="layui-form-item">
-        <span class="color-green font-w7">积分不足及时充值提示文字 IntegralShareReminder</span>
-        <label class="relative block">
-            <input readonly value="{:sysconf('integral_share_reminder')}" class="layui-input layui-bg-gray">
-            <a data-copy="{:sysconf('integral_share_reminder')}" class="fa fa-copy right-btn"></a>
-        </label>
-        <p class="help-block">积分不足及时充值提示文字</p>
-    </div>
-
-
-    <div class="layui-form-item">
-        <span class="color-green font-w7">学历配置 Education</span>
-        <label class="relative block">
-            <input readonly value="{:sysconf('education')}" class="layui-input layui-bg-gray">
-            <a data-copy="{:sysconf('education')}" class="fa fa-copy right-btn"></a>
-        </label>
-        <p class="help-block">创建互选池时学历列表</p>
-    </div>
-
-    <div class="layui-form-item">
-        <span class="color-green font-w7">用户标签 Label</span>
-        <label class="relative block">
-            <input readonly value="{:sysconf('label')}" class="layui-input layui-bg-gray">
-            <a data-copy="{:sysconf('label')}" class="fa fa-copy right-btn"></a>
-        </label>
-        <p class="help-block">用户完善资料中标签</p>
-    </div>
-
-    <div class="layui-form-item">
-        <span class="color-green font-w7">职业 Professional</span>
-        <label class="relative block">
-            <input readonly value="{:sysconf('professional')}" class="layui-input layui-bg-gray">
-            <a data-copy="{:sysconf('professional')}" class="fa fa-copy right-btn"></a>
-        </label>
-        <p class="help-block">用户完善资料中职业</p>
-    </div>
-
-    <div class="layui-form-item">
-        <span class="color-green font-w7">收藏卡数量 CollectNum</span>
-        <label class="relative block">
-            <input readonly value="{:sysconf('collect_num')}" class="layui-input layui-bg-gray">
-            <a data-copy="{:sysconf('collect_num')}" class="fa fa-copy right-btn"></a>
-        </label>
-        <p class="help-block">用户每周的收藏卡数量</p>
-    </div>
-
-<!--    <div class="layui-form-item">-->
-<!--        <span class="color-green font-w7">想认识拒绝返积分百分比 notAgreeReturnIntegral</span>-->
-<!--        <label class="relative block">-->
-<!--            <input readonly value="{:sysconf('notAgreeReturnIntegral')}" class="layui-input layui-bg-gray">-->
-<!--            <a data-copy="{:sysconf('notAgreeReturnIntegral')}" class="fa fa-copy right-btn"></a>-->
-<!--        </label>-->
-<!--        <p class="help-block">想认识拒绝返积分百分比，例如50%</p>-->
-<!--    </div>-->
-
-    <div class="layui-form-item">
-        <span class="color-green font-w7">举报动态内容 Report Content</span>
-        <label class="relative block">
-            <input readonly value="{:sysconf('report_content')}" class="layui-input layui-bg-gray">
-            <a data-copy="{:sysconf('report_content')}" class="fa fa-copy right-btn"></a>
-        </label>
-        <p class="help-block">动态、评论举报内容</p>
-    </div>
-
-<!--    <div class="layui-form-item">-->
-<!--        <span class="color-green font-w7">拒绝申请理由 Reasons Inadequacy</span>-->
-<!--        <label class="relative block">-->
-<!--            <input readonly value="{:sysconf('reasons_inadequacy')}" class="layui-input layui-bg-gray">-->
-<!--            <a data-copy="{:sysconf('reasons_inadequacy')}" class="fa fa-copy right-btn"></a>-->
-<!--        </label>-->
-<!--        <p class="help-block">拒绝申请理由</p>-->
-<!--    </div>-->
-    <div class="layui-form-item">
-        <span class="color-green font-w7">举报用户类型 Report User Content</span>
-        <label class="relative block">
-            <input readonly value="{:sysconf('report_user_content')}" class="layui-input layui-bg-gray">
-            <a data-copy="{:sysconf('report_user_content')}" class="fa fa-copy right-btn"></a>
-        </label>
-        <p class="help-block">举报用户类型</p>
-    </div>
-
-
-<!--    <div class="layui-form-item">-->
-<!--        <span class="color-green font-w7">打招呼语句 Greet</span>-->
-<!--        <label class="relative block">-->
-<!--            <input readonly value="{:sysconf('greet')}" class="layui-input layui-bg-gray">-->
-<!--            <a data-copy="{:sysconf('greet')}" class="fa fa-copy right-btn"></a>-->
-<!--        </label>-->
-<!--        <p class="help-block">聊天打招呼语句</p>-->
-<!--    </div>-->
-
-<!--    <div class="layui-form-item">-->
-<!--        <span class="color-green font-w7">聊兴趣语句 Chatting</span>-->
-<!--        <label class="relative block">-->
-<!--            <input readonly value="{:sysconf('chatting')}" class="layui-input layui-bg-gray">-->
-<!--            <a data-copy="{:sysconf('chatting')}" class="fa fa-copy right-btn"></a>-->
-<!--        </label>-->
-<!--        <p class="help-block">聊天聊兴趣语句</p>-->
-<!--    </div>-->
-
-<!--    <div class="layui-form-item">-->
-<!--        <span class="color-green font-w7">聊过往语句 Talk Past</span>-->
-<!--        <label class="relative block">-->
-<!--            <input readonly value="{:sysconf('talk_past')}" class="layui-input layui-bg-gray">-->
-<!--            <a data-copy="{:sysconf('talk_past')}" class="fa fa-copy right-btn"></a>-->
-<!--        </label>-->
-<!--        <p class="help-block">聊天聊过往语句</p>-->
-<!--    </div>-->
-
-
-<!--    <div class="layui-form-item">-->
-<!--        <span class="color-green font-w7">付费查看需付多少 pay_check_money</span>-->
-<!--        <label class="relative block">-->
-<!--            <input readonly value="{:sysconf('pay_check_money')}" class="layui-input layui-bg-gray">-->
-<!--            <a data-copy="{:sysconf('pay_check_money')}" class="fa fa-copy right-btn"></a>-->
-<!--        </label>-->
-<!--        <p class="help-block">用户付费查看需付多少钱</p>-->
-<!--    </div>-->
-
-
-    <div class="layui-form-item">
-        <span class="color-green font-w7">被查看用户获得多少 get_check_money</span>
-        <label class="relative block">
-            <input readonly value="{:sysconf('get_check_money')}%" class="layui-input layui-bg-gray">
-            <a data-copy="{:sysconf('get_check_money')}" class="fa fa-copy right-btn"></a>
-        </label>
-        <p class="help-block">被查看用户获得多少钱  百分比%，例如：50块钱，50%返25块</p>
-    </div>
-
-    <div class="layui-form-item">
-        <span class="color-green font-w7">提现服务费百分比 PoundageProportion</span>
-        <label class="relative block">
-            <input readonly value="{:sysconf('poundage_proportion')}%" class="layui-input layui-bg-gray">
-            <a data-copy="{:sysconf('poundage_proportion')}" class="fa fa-copy right-btn"></a>
-        </label>
-        <p class="help-block">提现操作服务费百分比%</p>
-    </div>
-    <div class="layui-form-item">
-        <span class="color-green font-w7">提现最小金额 WithdrawMinPrice</span>
-        <label class="relative block">
-            <input readonly value="{:sysconf('withdraw_min_price')}" class="layui-input layui-bg-gray">
-            <a data-copy="{:sysconf('withdraw_min_price')}" class="fa fa-copy right-btn"></a>
-        </label>
-        <p class="help-block">提现最小金额</p>
-    </div>
-    <div class="layui-form-item">
-        <span class="color-green font-w7">提现最大金额 WithdrawMaxPrice</span>
-        <label class="relative block">
-            <input readonly value="{:sysconf('withdraw_max_price')}" class="layui-input layui-bg-gray">
-            <a data-copy="{:sysconf('withdraw_max_price')}" class="fa fa-copy right-btn"></a>
-        </label>
-        <p class="help-block">提现最大金额</p>
-    </div>
-
-    <div class="layui-form-item">
-        <span class="color-green font-w7">微信客服回复图片 BotImg</span>
-        <label class="relative block">
-            <img data-tips-image style="width:100px;height:100px;vertical-align:top" src="{:sysconf('bot_img')}" class="margin-right-5">
-        </label>
-        <p class="help-block">微信客服回复图片</p>
-    </div>
-
-
 </div>
 {/block}
 

application/admin/view/config/storage-oss.html

@@ -51,7 +51,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">AccessKey<br><span class="nowrap color-desc">访问密钥</span></label>
             <div class="layui-input-block">
-                <input type="text" name="storage_oss_keyid" required value="{:sysconf('storage_oss_keyid')}" maxlength="30" placeholder="请输入OSS AccessKey (访问密钥)" class="layui-input">
+                <input type="text" name="storage_oss_keyid" required value="{:sysconf('storage_oss_keyid')}" maxlength="16" placeholder="请输入OSS AccessKey (访问密钥)" class="layui-input">
                 <p class="help-block">可以在 [ 阿里云 > 个人中心 ] 设置并获取到访问密钥。</p>
             </div>
         </div>

application/admin/view/config/storage-qiniu.html

@@ -2,7 +2,7 @@
     <div class="layui-card-body">
         <div class="color-text margin-left-40 margin-bottom-20 layui-code" style="border-left-width:1px;background:none">
             <p class="margin-bottom-5 font-w7">文件将上传到七牛云存储，对象存储需要配置为公开访问的Bucket空间！</p>
-            完成实名认证后可获得10G免费存储空间哦！<a target="_blank" href="https://portal.qiniu.com/signup?code=3lhz6nmnwbple">我要免费申请</a>
+            完成实名认证后可获得10G免费存储空间哦！<a target="_blank" href="https://portal.qiniu.com/signup?code=1hefnmobzees2">我要免费申请</a>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label">AllowExts<br><span class="nowrap color-desc">允许类型</span></label>

application/admin/view/config/system-config.html

@@ -3,480 +3,55 @@
 
         <div class="layui-form-item">
             <label class="relative block">
-                <span class="color-green font-w7">管理程序名称 Name</span>
-                <input name="app_name" required placeholder="请输入程序名称" value="{:sysconf('app_name')}" class="layui-input">
-            </label>
-            <p class="help-block">管理程序名称，在后台左上角标题处理显示</p>
-        </div>
-        <div class="layui-form-item">
-            <label class="relative block">
-                <span class="color-green font-w7">管理程序小文字 Version</span>
-                <input name="app_version" placeholder="请输入程序小文字" value="{:sysconf('app_version')}" class="layui-input">
+                <span class="color-green font-w7">网站名称 Website</span>
+                <input name="site_name" required placeholder="请输入网站名称" value="{:sysconf('site_name')}" class="layui-input">
             </label>
-            <p class="help-block">管理程序版本，在后台左上角标题处理显示</p>
+            <p class="help-block">网站名称，将在浏览器的标签上显示名称</p>
         </div>
         <div class="layui-form-item">
             <label class="relative block">
-                <span class="color-green font-w7">平台客服电话 PlatformTelphone</span>
-                <input name="platform_telphone" required placeholder="请输入平台客服电话" value="{:sysconf('platform_telphone')}" class="layui-input">
-            </label>
-            <p class="help-block">平台客服电话</p>
-        </div>
-
-        <div class="layui-form-item">
-            <label class="relative block">
-                <span class="color-green font-w7">微信appid Appid</span>
-                <input name="wechat_appid" required placeholder="请输入微信appid" value="{:sysconf('wechat_appid')}" class="layui-input">
+                <span class="color-green font-w7">管理程序名称 Name</span>
+                <input name="app_name" required placeholder="请输入程序名称" value="{:sysconf('app_name')}" class="layui-input">
             </label>
-            <p class="help-block">微信开放平台的appid</p>
+            <p class="help-block">管理程序名称，在后台左上角标题处理显示</p>
         </div>
-
         <div class="layui-form-item">
             <label class="relative block">
-                <span class="color-green font-w7">微信appsecret Appsecret</span>
-                <input name="wechat_appsecret" required placeholder="请输入微信appsecret" value="{:sysconf('wechat_appsecret')}" class="layui-input">
+                <span class="color-green font-w7">管理程序版本 Version</span>
+                <input name="app_version" placeholder="请输入程序版本" value="{:sysconf('app_version')}" class="layui-input">
             </label>
-            <p class="help-block">微信开放平台的appsecret</p>
+            <p class="help-block">管理程序版本，在后台左上角标题处理显示</p>
         </div>
-
-<!--        <div class="layui-form-item">-->
-<!--            <label class="relative block">-->
-<!--                <span class="color-green font-w7">注册赠送积分数量 RegisterGiveIntegral</span>-->
-<!--                <input name="register_give_integral" required placeholder="请输入积分" value="{:sysconf('register_give_integral')}" class="layui-input">-->
-<!--            </label>-->
-<!--            <p class="help-block">注册赠送积分数量 0:不送</p>-->
-<!--        </div>-->
-
         <div class="layui-form-item">
-            <label class="relative block">
-                <span class="color-green font-w7">想认识扣除积分 WantKnowIntegral</span>
-                <input name="want_know_integral" required placeholder="请输入积分" value="{:sysconf('want_know_integral')}" class="layui-input">
-            </label>
-            <p class="help-block">想认识扣除积分</p>
-        </div>
-
-<!--        <div class="layui-form-item">-->
-<!--            <label class="relative block">-->
-<!--                <span class="color-green font-w7">积分获取联系方式扣除积分 IntegralContact</span>-->
-<!--                <input name="integral_contact" required placeholder="请输入积分" value="{:sysconf('integral_contact')}" class="layui-input">-->
-<!--            </label>-->
-<!--            <p class="help-block">积分获取联系方式扣除积分</p>-->
-<!--        </div>-->
-<!--        <div class="layui-col-md12">-->
-<!--            <div class="layui-col-md4">-->
-<!--                <div class="layui-form-item">-->
-<!--                    <label class="relative block">-->
-<!--                        <span class="color-green font-w7">分享次数（每天）（分享小程序）</span>-->
-<!--                        <input name="share_applet_count_day" required placeholder="请输入次数" value="{:sysconf('share_applet_count_day')}" class="layui-input">-->
-<!--                    </label>-->
-<!--                    <p class="help-block">一天分享几次有积分（分享小程序）</p>-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="layui-col-md4">-->
-<!--                <div class="layui-form-item">-->
-<!--                    <label class="relative block">-->
-<!--                        <span class="color-green font-w7">分享一次获得多少积分（分享小程序）</span>-->
-<!--                        <input name="share_applet_integral" required placeholder="请输入积分" value="{:sysconf('share_applet_integral')}" class="layui-input">-->
-<!--                    </label>-->
-<!--                    <p class="help-block">分享一次获得多少积分（分享小程序）</p>-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="layui-col-md4">-->
-<!--                <div class="layui-form-item">-->
-<!--                    <label class="relative block">-->
-<!--                        <span class="color-green font-w7">分享小程序标题</span>-->
-<!--                        <input name="share_applet_title" required placeholder="请输入标题" value="{:sysconf('share_applet_title')}" class="layui-input">-->
-<!--                    </label>-->
-<!--                    <p class="help-block">分享小程序标题</p>-->
-<!--                </div>-->
-<!--            </div>-->
-<!--        </div>-->
-<!--        <div class="layui-col-md12">-->
-<!--            <div class="layui-col-md4">-->
-<!--                <div class="layui-form-item">-->
-<!--                    <label class="relative block">-->
-<!--                        <span class="color-green font-w7">分享次数（每天）（分享互选池）</span>-->
-<!--                        <input name="share_pool_count_day" required placeholder="请输入次数" value="{:sysconf('share_pool_count_day')}" class="layui-input">-->
-<!--                    </label>-->
-<!--                    <p class="help-block">一天分享几次有积分（分享互选池）</p>-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="layui-col-md4">-->
-<!--                <div class="layui-form-item">-->
-<!--                    <label class="relative block">-->
-<!--                        <span class="color-green font-w7">分享一次获得多少积分（分享互选池）</span>-->
-<!--                        <input name="share_pool_integral" required placeholder="请输入积分" value="{:sysconf('share_pool_integral')}" class="layui-input">-->
-<!--                    </label>-->
-<!--                    <p class="help-block">分享一次获得多少积分（分享互选池）</p>-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="layui-col-md4">-->
-<!--                <div class="layui-form-item">-->
-<!--                    <label class="relative block">-->
-<!--                        <span class="color-green font-w7">分享互选池标题</span>-->
-<!--                        <input name="share_pool_title" required placeholder="请输入标题" value="{:sysconf('share_pool_title')}" class="layui-input">-->
-<!--                    </label>-->
-<!--                    <p class="help-block">分享互选池标题</p>-->
-<!--                </div>-->
-<!--            </div>-->
-<!--        </div>-->
-<!--        <div class="layui-col-md12">-->
-<!--            <div class="layui-col-md4">-->
-<!--                <div class="layui-form-item">-->
-<!--                    <label class="relative block">-->
-<!--                        <span class="color-green font-w7">分享次数（每天）（分享个人主页）</span>-->
-<!--                        <input name="share_myinfo_count_day" required placeholder="请输入次数" value="{:sysconf('share_myinfo_count_day')}" class="layui-input">-->
-<!--                    </label>-->
-<!--                    <p class="help-block">一天分享几次有积分（分享个人主页）</p>-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="layui-col-md4">-->
-<!--                <div class="layui-form-item">-->
-<!--                    <label class="relative block">-->
-<!--                        <span class="color-green font-w7">分享一次获得多少积分（分享个人主页）</span>-->
-<!--                        <input name="share_myinfo_integral" required placeholder="请输入积分" value="{:sysconf('share_myinfo_integral')}" class="layui-input">-->
-<!--                    </label>-->
-<!--                    <p class="help-block">分享一次获得多少积分（分享个人主页）</p>-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="layui-col-md4">-->
-<!--                <div class="layui-form-item">-->
-<!--                    <label class="relative block">-->
-<!--                        <span class="color-green font-w7">分享个人主页标题</span>-->
-<!--                        <input name="share_myinfo_title" required placeholder="请输入标题" value="{:sysconf('share_myinfo_title')}" class="layui-input">-->
-<!--                    </label>-->
-<!--                    <p class="help-block">分享个人主页标题</p>-->
-<!--                </div>-->
-<!--            </div>-->
-<!--        </div>-->
-<!--        <div class="layui-col-md12">-->
-<!--            <div class="layui-col-md4">-->
-<!--                <div class="layui-form-item">-->
-<!--                    <label class="relative block">-->
-<!--                        <span class="color-green font-w7">分享次数（每天）（分享他人主页）</span>-->
-<!--                        <input name="share_others_count_day" required placeholder="请输入次数" value="{:sysconf('share_others_count_day')}" class="layui-input">-->
-<!--                    </label>-->
-<!--                    <p class="help-block">一天分享几次有积分（分享他人主页）</p>-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="layui-col-md4">-->
-<!--                <div class="layui-form-item">-->
-<!--                    <label class="relative block">-->
-<!--                        <span class="color-green font-w7">分享一次获得多少积分（分享他人主页）</span>-->
-<!--                        <input name="share_others_integral" required placeholder="请输入积分" value="{:sysconf('share_others_integral')}" class="layui-input">-->
-<!--                    </label>-->
-<!--                    <p class="help-block">分享一次获得多少积分（分享他人主页）</p>-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="layui-col-md4">-->
-<!--                <div class="layui-form-item">-->
-<!--                    <label class="relative block">-->
-<!--                        <span class="color-green font-w7">分享他人主页标题</span>-->
-<!--                        <input name="share_others_title" required placeholder="请输入标题" value="{:sysconf('share_others_title')}" class="layui-input">-->
-<!--                    </label>-->
-<!--                    <p class="help-block">分享他人主页标题</p>-->
-<!--                </div>-->
-<!--            </div>-->
-<!--        </div>-->
-
-        <div class="layui-col-md12">
-            <div class="layui-col-md3">
-                <div class="layui-form-item">
-                    <label class="relative block">
-                        <span class="color-green font-w7">原自我介绍</span>
-                        <input name="introduce_title" required placeholder="请输入" value="{:sysconf('introduce_title')}" class="layui-input">
-                    </label>
-                    <p class="help-block">完善资料--自我介绍</p>
-                </div>
-            </div>
-            <div class="layui-col-md3">
-                <div class="layui-form-item">
-                    <label class="relative block">
-                        <span class="color-green font-w7">原家庭背景</span>
-                        <input name="family_title" required placeholder="请输入" value="{:sysconf('family_title')}" class="layui-input">
-                    </label>
-                    <p class="help-block">完善资料--家庭背景</p>
-                </div>
-            </div>
-            <div class="layui-col-md3">
-                <div class="layui-form-item">
-                    <label class="relative block">
-                        <span class="color-green font-w7">原兴趣爱好</span>
-                        <input name="hobbies_title" required placeholder="请输入" value="{:sysconf('hobbies_title')}" class="layui-input">
-                    </label>
-                    <p class="help-block">完善资料--兴趣爱好</p>
-                </div>
-            </div>
-            <div class="layui-col-md3">
-                <div class="layui-form-item">
-                    <label class="relative block">
-                        <span class="color-green font-w7">原爱情观</span>
-                        <input name="love_title" required placeholder="请输入" value="{:sysconf('love_title')}" class="layui-input">
-                    </label>
-                    <p class="help-block">完善资料--爱情观</p>
-                </div>
+            <span class="color-green font-w7">浏览器图标 Browser</span>
+            <div class="relative block">
+                <img alt="icon" data-tips-image style="height:auto;max-height:42px;min-width:42px" src="{:sysconf('site_icon')}"/>
+                <input type="hidden" name="site_icon" onchange="$(this).prev('img').attr('src', this.value)" value="{:sysconf('site_icon')}" class="layui-input">
+                <a class="margin-left-10" data-file="btn" data-type="ico,png" data-field="site_icon">上传图片</a>
+                <p class="help-block">建议上传 ICO 图标的尺寸为 128x128 <a href="http://www.favicon-icon-generator.com" target="_blank">ICON在线制作</a></p>
             </div>
         </div>
-
-        <div class="layui-col-md12">
-            <div class="layui-col-md3">
-                <div class="layui-form-item">
-                    <label class="relative block">
-                        <span class="color-green font-w7">原理想的另一半</span>
-                        <input name="partner_title" required placeholder="请输入" value="{:sysconf('partner_title')}" class="layui-input">
-                    </label>
-                    <p class="help-block">完善资料--理想的另一半</p>
-                </div>
-            </div>
-            <div class="layui-col-md3">
-                <div class="layui-form-item">
-                    <label class="relative block">
-                        <span class="color-green font-w7">原为什么单身</span>
-                        <input name="single_title" required placeholder="请输入" value="{:sysconf('single_title')}" class="layui-input">
-                    </label>
-                    <p class="help-block">完善资料--为什么单身</p>
-                </div>
-            </div>
-            <div class="layui-col-md3">
-                <div class="layui-form-item">
-                    <label class="relative block">
-                        <span class="color-green font-w7">原期待什么样的生活</span>
-                        <input name="what_life_title" required placeholder="请输入" value="{:sysconf('what_life_title')}" class="layui-input">
-                    </label>
-                    <p class="help-block">完善资料--原期待什么样的生活</p>
-                </div>
-            </div>
-
-        </div>
-
-        <div class="layui-col-md12">
-            <div class="layui-col-md3">
-                <div class="layui-form-item">
-                    <label class="relative block">
-                        <span class="color-green font-w7">原心动区</span>
-                        <input name="cardiac_area_title" required placeholder="请输入" value="{:sysconf('cardiac_area_title')}" class="layui-input">
-                    </label>
-                    <p class="help-block">个人中心--心动区</p>
-                </div>
-            </div>
-            <div class="layui-col-md3">
-                <div class="layui-form-item">
-                    <label class="relative block">
-                        <span class="color-green font-w7">原互选区</span>
-                        <input name="each_district_title" required placeholder="请输入" value="{:sysconf('each_district_title')}" class="layui-input">
-                    </label>
-                    <p class="help-block">个人中心--互选区</p>
-                </div>
-            </div>
-        </div>
-
-        <div class="layui-col-md12">
-<!--            <div class="layui-col-md3">-->
-<!--                <div class="layui-form-item">-->
-<!--                    <label class="relative block">-->
-<!--                        <span class="color-green font-w7">积分获取联系方式开关</span>-->
-<!--                        <br/>-->
-<!--                        <input type="radio" name="integral_get_contact_switch" value="1" lay-ignore> 开-->
-<!--                        <input type="radio" name="integral_get_contact_switch" value="0" lay-ignore> 关-->
-
-<!--                    </label>-->
-<!--                    <p class="help-block">积分获取联系方式开关</p>-->
-<!--                </div>-->
-<!--            </div>-->
-            <div class="layui-col-md3">
-                <div class="layui-form-item">
-                    <label class="relative block">
-                        <span class="color-green font-w7">想认识开关</span>
-                        <br/>
-                        <input type="radio" name="want_to_know_switch" value="1" lay-ignore> 开
-                        <input type="radio" name="want_to_know_switch" value="0" lay-ignore> 关
-                    </label>
-                    <p class="help-block">想认识开关</p>
-                </div>
-            </div>
-        </div>
-
-        <div class="layui-form-item">
-            <label class="relative block">
-                <span class="color-green font-w7">官方微信号 WechatId</span>
-                <input name="wechat_id" required placeholder="请输入官方微信号" value="{:sysconf('wechat_id')}" class="layui-input">
-            </label>
-            <p class="help-block">官方微信号,用于充值积分</p>
-        </div>
-
-        <div class="layui-form-item">
-            <span class="color-green label-required-prev">积分不足及时充值图片</span>
-            <table class="layui-table">
-                <thead>
-                <tr>
-                    <!--                    <th class="text-center">LOGO</th>-->
-                    <!--                    <th class="text-left">展示图片</th>-->
-                </tr>
-                <tr>
-                    <td width="90px" class="text-left"><input name="logo" type="hidden" value="{:sysconf('integral_share_img')}"></td>
-                    <!--                    <td width="auto" class="text-left"><input name="imgs" type="hidden" value=""></td>-->
-                </tr>
-                </thead>
-            </table>
-            <p class="help-block">积分不足及时充值图片</p>
-            <script>$('[name="logo"]').uploadOneImage(), $('[name="integral_share_img"]').uploadMultipleImage()</script>
-        </div>
-
-        <div class="layui-form-item">
-            <label class="relative block">
-                <span class="color-green font-w7">积分不足及时充值提示文字 IntegralShareReminder</span>
-                <input name="integral_share_reminder" required placeholder="请输入提示文字" value="{:sysconf('integral_share_reminder')}" class="layui-input">
-            </label>
-            <p class="help-block">积分不足及时充值提示文字</p>
-        </div>
-
-        <div class="layui-form-item">
-            <label class="relative block">
-                <span class="color-green font-w7">学历配置 Education</span>
-                <input name="education" required placeholder="请输入学历配置" value="{:sysconf('education')}" class="layui-input">
-            </label>
-            <p class="help-block">创建互选池时学历列表,以英文逗号隔开</p>
-        </div>
-
-
-        <div class="layui-form-item">
-            <label class="relative block">
-                <span class="color-green font-w7">用户标签 Label</span>
-                <input name="label" required placeholder="请输入用户标签" value="{:sysconf('label')}" class="layui-input">
-            </label>
-            <p class="help-block">用户标签列表,以英文逗号隔开</p>
-        </div>
-
-        <div class="layui-form-item">
-            <label class="relative block">
-                <span class="color-green font-w7">职业 Professional</span>
-                <input name="professional" required placeholder="请输入职业" value="{:sysconf('professional')}" class="layui-input">
-            </label>
-            <p class="help-block">职业列表,以英文逗号隔开</p>
-        </div>
-
-        <div class="layui-form-item">
-            <label class="relative block">
-                <span class="color-green font-w7">收藏卡数量 CollectNum</span>
-                <input name="collect_num" required placeholder="请输入收藏卡数量" value="{:sysconf('collect_num')}" class="layui-input">
-            </label>
-            <p class="help-block">用户每周的收藏卡数量</p>
-        </div>
-
-<!--        <div class="layui-form-item">-->
-<!--            <label class="relative block">-->
-<!--                <span class="color-green font-w7">想认识拒绝返积分百分比 notAgreeReturnIntegral</span>-->
-<!--                <input name="notAgreeReturnIntegral" required placeholder="请输入想认识拒绝返积分百分比" value="{:sysconf('notAgreeReturnIntegral')}" class="layui-input">-->
-<!--            </label>-->
-<!--            <p class="help-block">想认识拒绝返积分百分比  %</p>-->
-<!--        </div>-->
-
         <div class="layui-form-item">
             <label class="relative block">
-                <span class="color-green font-w7">举报内容 Report Content</span>
-                <input name="report_content" required placeholder="请输入举报内容" value="{:sysconf('report_content')}" class="layui-input">
+                <span class="color-green font-w7">网站备案号 Miitbeian</span>
+                <input name="miitbeian" required placeholder="请输入网站备案号" value="{:sysconf('miitbeian')}" class="layui-input">
             </label>
-            <p class="help-block">动态、评论举报内容,以英文逗号隔开</p>
+            <p class="help-block">网站备案号，可以在<a target="_blank" href="http://beian.miit.gov.cn">备案管理中心</a>查询获取，将在登录页面下面显示</p>
         </div>
-
-<!--        <div class="layui-form-item">-->
-<!--            <label class="relative block">-->
-<!--                <span class="color-green font-w7">拒绝申请理由 Reasons Inadequacy</span>-->
-<!--                <input name="reasons_inadequacy" required placeholder="请输入拒绝申请理由" value="{:sysconf('reasons_inadequacy')}" class="layui-input">-->
-<!--            </label>-->
-<!--            <p class="help-block">拒绝申请理由,以英文逗号隔开</p>-->
-<!--        </div>-->
-
         <div class="layui-form-item">
             <label class="relative block">
-                <span class="color-green font-w7">举报用户类型 Report User Content</span>
-                <input name="report_user_content" required placeholder="请输入举报用户类型" value="{:sysconf('report_user_content')}" class="layui-input">
+                <span class="color-green font-w7">网站版权信息 Copyright</span>
+                <input name="site_copy" required placeholder="请输入版权信息" value="{:sysconf('site_copy')}" class="layui-input">
             </label>
-            <p class="help-block">举报用户类型,以英文逗号隔开</p>
+            <p class="help-block">网站版权信息，在后台登录页面显示版本信息并链接到备案到信息备案管理系统</p>
         </div>
 
-<!--        <div class="layui-form-item">-->
-<!--            <label class="relative block">-->
-<!--                <span class="color-green font-w7">打招呼语句 Greet</span>-->
-<!--                <input name="greet" required placeholder="请输入打招呼语句" value="{:sysconf('greet')}" class="layui-input">-->
-<!--            </label>-->
-<!--            <p class="help-block">聊天打招呼语句</p>-->
-<!--        </div>-->
-
-<!--        <div class="layui-form-item">-->
-<!--            <label class="relative block">-->
-<!--                <span class="color-green font-w7">聊兴趣语句 Chatting</span>-->
-<!--                <input name="chatting" required placeholder="请输入聊兴趣语句" value="{:sysconf('chatting')}" class="layui-input">-->
-<!--            </label>-->
-<!--            <p class="help-block">聊天聊兴趣语句</p>-->
-<!--        </div>-->
-
-<!--        <div class="layui-form-item">-->
-<!--            <label class="relative block">-->
-<!--                <span class="color-green font-w7">聊过往语句 Talk Past</span>-->
-<!--                <input name="talk_past" required placeholder="请输入聊兴趣语句" value="{:sysconf('talk_past')}" class="layui-input">-->
-<!--            </label>-->
-<!--            <p class="help-block">聊天聊过往语句</p>-->
-<!--        </div>-->
-
-<!--        <div class="layui-form-item">-->
-<!--            <label class="relative block">-->
-<!--                <span class="color-green font-w7">付费查看需付多少钱 pay_check_money</span>-->
-<!--                <input name="pay_check_money" required placeholder="请输入付费查看需付多少钱" value="{:sysconf('pay_check_money')}" class="layui-input">-->
-<!--            </label>-->
-<!--            <p class="help-block">付费查看需付多少钱</p>-->
-<!--        </div>-->
-
-        <div class="layui-form-item">
-            <label class="relative block">
-                <span class="color-green font-w7">被查看用户获得多少百分比 get_check_money</span>
-                <input name="get_check_money" required placeholder="请输入被查看用户获得多少钱百分比" value="{:sysconf('get_check_money')}" class="layui-input">
-            </label>
-            <p class="help-block">被查看用户获得多少  百分比%</p>
-        </div>
-
-        <div class="layui-form-item">
-            <label class="relative block">
-                <span class="color-green font-w7">提现服务费百分比 PoundageProportion</span>
-                <input name="poundage_proportion" required placeholder="请输入提现服务费百分比" value="{:sysconf('poundage_proportion')}" class="layui-input">
-            </label>
-            <p class="help-block">提现服务费百分比</p>
-        </div>
-        <div class="layui-form-item">
-            <label class="relative block">
-                <span class="color-green font-w7">提现最小金额 WithdrawMinPrice</span>
-                <input name="withdraw_min_price" required placeholder="请输入提现最小金额" value="{:sysconf('withdraw_min_price')}" class="layui-input">
-            </label>
-            <p class="help-block">提现最小金额</p>
-        </div>
-        <div class="layui-form-item">
-            <label class="relative block">
-                <span class="color-green font-w7">提现最大金额 WithdrawMaxPrice</span>
-                <input name="withdraw_max_price" required placeholder="请输入提现最大金额" value="{:sysconf('withdraw_max_price')}" class="layui-input">
-            </label>
-            <p class="help-block">提现最大金额</p>
-        </div>
-
-        <div class="layui-form-item">
-            <span class="color-green label-required-prev">微信客服回复图片</span>
-            <table class="layui-table">
-                <td width="90px" required class="text-left"><input required name="bot_img" type="hidden" value="{:sysconf('bot_img')}"></td>
-                <script>$('[name="bot_img"]').uploadOneImage()</script>
-            </table>
-        </div>
-
-
         <div class="hr-line-dashed"></div>
 
         <div class="layui-form-item text-center">
             <button class="layui-btn" type="submit">保存配置</button>
             <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消修改吗？" data-close>取消修改</button>
         </div>
-
-
-
-
     </div>
 
-</form>
-<script>form.render()</script>
+</form>

application/admin/view/index/index.html

@@ -50,9 +50,9 @@
                 <dl class="layui-nav-child">
                     <dd lay-unselect><a data-modal="{:url('admin/index/info',['id'=>session('user.id')])}"><i class="layui-icon layui-icon-set-fill margin-right-5"></i>基本资料</a></dd>
                     <dd lay-unselect><a data-modal="{:url('admin/index/pass',['id'=>session('user.id')])}"><i class="layui-icon layui-icon-component margin-right-5"></i>安全设置</a></dd>
-                    <!--{if auth('admin/index/buildoptimize')}-->
-                    <!--<dd lay-unselect><a data-modal="{:url('admin/index/buildOptimize')}"><i class="layui-icon layui-icon-template-1 margin-right-5"></i>压缩发布</a></dd>-->
-                    <!--{/if}-->
+                    {if auth('admin/index/buildoptimize')}
+                    <dd lay-unselect><a data-modal="{:url('admin/index/buildOptimize')}"><i class="layui-icon layui-icon-template-1 margin-right-5"></i>压缩发布</a></dd>
+                    {/if}
                     {if auth('admin/index/clearruntime')}
                     <dd lay-unselect><a data-modal="{:url('admin/index/clearRuntime')}"><i class="layui-icon layui-icon-fonts-clear margin-right-5"></i>清理缓存</a></dd>
                     {/if}

application/admin/view/index/main.html

@@ -32,83 +32,83 @@
 
 </style>
 
-<!--<div class="think-box-shadow store-total-container notselect">-->
-<!--    <div class="margin-bottom-15">商城统计</div>-->
-<!--    <div class="layui-row layui-col-space15">-->
-<!--        <div class="layui-col-sm6 layui-col-md3">-->
-<!--            <div class="store-total-item nowrap" style="background:linear-gradient(-125deg,#57bdbf,#2f9de2)">-->
-<!--                <div>商品总量</div>-->
-<!--                <div>11</div>-->
-<!--                <div>当前商品总数量</div>-->
-<!--            </div>-->
-<!--            <i class="store-total-icon layui-icon layui-icon-template-1"></i>-->
-<!--        </div>-->
-<!--        <div class="layui-col-sm6 layui-col-md3">-->
-<!--            <div class="store-total-item nowrap" style="background:linear-gradient(-125deg,#ff7d7d,#fb2c95)">-->
-<!--                <div>用户总量</div>-->
-<!--                <div>11</div>-->
-<!--                <div>当前用户总数量</div>-->
-<!--            </div>-->
-<!--            <i class="store-total-icon layui-icon layui-icon-user"></i>-->
-<!--        </div>-->
-<!--        <div class="layui-col-sm6 layui-col-md3">-->
-<!--            <div class="store-total-item nowrap" style="background:linear-gradient(-113deg,#c543d8,#925cc3)">-->
-<!--                <div>订单总量</div>-->
-<!--                <div>11</div>-->
-<!--                <div>已付款订单总数量</div>-->
-<!--            </div>-->
-<!--            <i class="store-total-icon layui-icon layui-icon-read"></i>-->
-<!--        </div>-->
-<!--        <div class="layui-col-sm6 layui-col-md3">-->
-<!--            <div class="store-total-item nowrap" style="background:linear-gradient(-141deg,#ecca1b,#f39526)">-->
-<!--                <div>评价总量</div>-->
-<!--                <div>121</div>-->
-<!--                <div>订单评价总数量</div>-->
-<!--            </div>-->
-<!--            <i class="store-total-icon layui-icon layui-icon-survey"></i>-->
-<!--        </div>-->
-<!--    </div>-->
-<!--</div>-->
+<div class="think-box-shadow store-total-container notselect">
+    <div class="margin-bottom-15">商城统计</div>
+    <div class="layui-row layui-col-space15">
+        <div class="layui-col-sm6 layui-col-md3">
+            <div class="store-total-item nowrap" style="background:linear-gradient(-125deg,#57bdbf,#2f9de2)">
+                <div>商品总量</div>
+                <div>63</div>
+                <div>当前商品总数量</div>
+            </div>
+            <i class="store-total-icon layui-icon layui-icon-template-1"></i>
+        </div>
+        <div class="layui-col-sm6 layui-col-md3">
+            <div class="store-total-item nowrap" style="background:linear-gradient(-125deg,#ff7d7d,#fb2c95)">
+                <div>用户总量</div>
+                <div>1,634</div>
+                <div>当前用户总数量</div>
+            </div>
+            <i class="store-total-icon layui-icon layui-icon-user"></i>
+        </div>
+        <div class="layui-col-sm6 layui-col-md3">
+            <div class="store-total-item nowrap" style="background:linear-gradient(-113deg,#c543d8,#925cc3)">
+                <div>订单总量</div>
+                <div>148</div>
+                <div>已付款订单总数量</div>
+            </div>
+            <i class="store-total-icon layui-icon layui-icon-read"></i>
+        </div>
+        <div class="layui-col-sm6 layui-col-md3">
+            <div class="store-total-item nowrap" style="background:linear-gradient(-141deg,#ecca1b,#f39526)">
+                <div>评价总量</div>
+                <div>0</div>
+                <div>订单评价总数量</div>
+            </div>
+            <i class="store-total-icon layui-icon layui-icon-survey"></i>
+        </div>
+    </div>
+</div>
 
-<!--<div class="think-box-shadow store-total-container">-->
-<!--    <div class="margin-bottom-15">实时概况</div>-->
-<!--    <div class="layui-row layui-col-space15">-->
-<!--        <div class="layui-col-md6 margin-bottom-15">-->
-<!--            <div class="layui-row">-->
-<!--                <div class="layui-col-xs3 text-center">-->
-<!--                    <i class="layui-icon color-blue" style="font-size:60px;line-height:72px">&#xe65e;</i>-->
-<!--                </div>-->
-<!--                <div class="layui-col-xs4">-->
-<!--                    <div class="font-s14">销售额（元）</div>-->
-<!--                    <div class="font-s16">111</div>-->
-<!--                    <div class="font-s12 color-desc">昨日：1212</div>-->
-<!--                </div>-->
-<!--                <div class="layui-col-xs5">-->
-<!--                    <div class="font-s14">支付订单数</div>-->
-<!--                    <div class="font-s16">222</div>-->
-<!--                    <div class="font-s12 color-desc">昨日：1212</div>-->
-<!--                </div>-->
-<!--            </div>-->
-<!--        </div>-->
-<!--        <div class="layui-col-md6 margin-bottom-15">-->
-<!--            <div class="layui-row">-->
-<!--                <div class="layui-col-xs3 text-center">-->
-<!--                    <i class="layui-icon color-blue" style="font-size:60px;line-height:72px">&#xe663;</i>-->
-<!--                </div>-->
-<!--                <div class="layui-col-xs4">-->
-<!--                    <div class="font-s14">新增用户数</div>-->
-<!--                    <div class="font-s16">111</div>-->
-<!--                    <div class="font-s12 color-desc">昨日：1212</div>-->
-<!--                </div>-->
-<!--&lt;!&ndash;                <div class="layui-col-xs5">&ndash;&gt;-->
-<!--&lt;!&ndash;                    <div class="font-s14">下单用户数</div>&ndash;&gt;-->
-<!--&lt;!&ndash;                    <div class="font-s16">69</div>&ndash;&gt;-->
-<!--&lt;!&ndash;                    <div class="font-s12 color-desc">昨日：34</div>&ndash;&gt;-->
-<!--&lt;!&ndash;                </div>&ndash;&gt;-->
-<!--            </div>-->
-<!--        </div>-->
-<!--    </div>-->
-<!--</div>-->
+<div class="think-box-shadow store-total-container">
+    <div class="margin-bottom-15">实时概况</div>
+    <div class="layui-row layui-col-space15">
+        <div class="layui-col-md6 margin-bottom-15">
+            <div class="layui-row">
+                <div class="layui-col-xs3 text-center">
+                    <i class="layui-icon color-blue" style="font-size:60px;line-height:72px">&#xe65e;</i>
+                </div>
+                <div class="layui-col-xs4">
+                    <div class="font-s14">销售额（元）</div>
+                    <div class="font-s16">1351.00</div>
+                    <div class="font-s12 color-desc">昨日：974.00</div>
+                </div>
+                <div class="layui-col-xs5">
+                    <div class="font-s14">支付订单数</div>
+                    <div class="font-s16">106</div>
+                    <div class="font-s12 color-desc">昨日：76</div>
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-md6 margin-bottom-15">
+            <div class="layui-row">
+                <div class="layui-col-xs3 text-center">
+                    <i class="layui-icon color-blue" style="font-size:60px;line-height:72px">&#xe663;</i>
+                </div>
+                <div class="layui-col-xs4">
+                    <div class="font-s14">新增用户数</div>
+                    <div class="font-s16">327</div>
+                    <div class="font-s12 color-desc">昨日：238</div>
+                </div>
+                <div class="layui-col-xs5">
+                    <div class="font-s14">下单用户数</div>
+                    <div class="font-s16">69</div>
+                    <div class="font-s12 color-desc">昨日：34</div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
 
 <div class="layui-row layui-col-space15">
     <div class="layui-col-md6">
@@ -155,6 +155,53 @@
             </table>
         </div>
     </div>
+    <div class="layui-col-md6">
+        <div class="think-box-shadow">
+            <table class="layui-table" lay-skin="line" lay-even>
+                <caption class="text-left margin-bottom-15 font-s14">产品团队</caption>
+                <colgroup>
+                    <col width="30%">
+                </colgroup>
+                <tbody>
+                <tr>
+                    <td>产品名称</td>
+                    <td>ThinkAdmin</td>
+                </tr>
+                <tr>
+                    <td>在线体验</td>
+                    <td><a target="_blank" href="http://demo.thinkadmin.top">http://demo.thinkadmin.top</a></td>
+                </tr>
+                <tr>
+                    <td>官方QQ群</td>
+                    <td>
+                        <a href="http://shang.qq.com/wpa/qunwpa?idkey=ae25cf789dafbef62e50a980ffc31242f150bc61a61164458216dd98c411832a">
+                            <img src="//pub.idqqimg.com/wpa/images/group.png" style="height:18px;width:auto" target="_blank">
+                        </a>
+                    </td>
+                </tr>
+                <tr>
+                    <td>项目地址</td>
+                    <td><a target="_blank" href="https://github.com/zoujingli/ThinkAdmin">https://github.com/zoujingli/ThinkAdmin</a></td>
+                </tr>
+                <tr>
+                    <td>BUG反馈</td>
+                    <td><a target="_blank" href="https://github.com/zoujingli/ThinkAdmin/issues">https://github.com/zoujingli/ThinkAdmin/issues</a></td>
+                </tr>
+                <tr>
+                    <td>开发团队</td>
+                    <td><a href="http://www.cuci.cc" target="_blank">广州楚才信息科技有限公司</a></td>
+                </tr>
+                <tr>
+                    <td>团队官网</td>
+                    <td><a target="_blank" href="http://www.cuci.cc">http://www.cuci.cc</a></td>
+                </tr>
+                <tr>
+                    <td>办公地址</td>
+                    <td>广州市天河区东圃一横路东泷商贸中心G02</td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
     </div>
 </div>
 {/block}

application/admin/view/menu/form.html

@@ -1,4 +1,4 @@
-<form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" class='layui-form layui-card' autocomplete="off">
+<form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
 
     <div class="layui-card-body">
 

application/admin/view/user/pass.html

@@ -30,7 +30,7 @@
             <label class="relative block">
                 <span class="color-green font-w7">新的登录密码</span>
                 <span class="color-desc margin-left-5">New Password</span>
-                <input type="password" name="password" value="" maxlength="32" pattern="^(?![\d]+$)(?![a-zA-Z]+$)(?![^\da-zA-Z]+$).{6,32}$" required placeholder="请输入新的登录密码" class="layui-input">
+                <input type="password" name="password" maxlength="32" pattern="^(?![\d]+$)(?![a-zA-Z]+$)(?![^\da-zA-Z]+$).{6,32}$" required placeholder="请输入新的登录密码" class="layui-input">
             </label>
             <p class="color-desc">密码必需包含大小写字母、数字、符号的任意两者组合。</p>
         </div>
@@ -39,7 +39,7 @@
             <label class="relative block">
                 <span class="color-green font-w7">重复登录密码</span>
                 <span class="color-desc margin-left-5">Retype Password</span>
-                <input type="password" name="repassword" value="" maxlength="32" pattern="^(?![\d]+$)(?![a-zA-Z]+$)(?![^\da-zA-Z]+$).{6,32}$" required placeholder="请输入重复登录密码" class="layui-input">
+                <input type="password" name="repassword" maxlength="32" pattern="^(?![\d]+$)(?![a-zA-Z]+$)(?![^\da-zA-Z]+$).{6,32}$" required placeholder="请输入重复登录密码" class="layui-input">
             </label>
             <p class="color-desc">密码必需包含大小写字母、数字、符号的任意两者组合。</p>
         </div>

application/api/controller/Dynamic.php

@@ -1,293 +0,0 @@
-<?php
-
-
-namespace app\api\controller;
-
-use app\common\model\Dynamic as Dynamics;
-use app\common\controller\Api;
-use think\facade\Validate;
-
-
-/**
- * 动态
- * Class Index
- */
-class Dynamic extends Api
-{
-    /**
-     * 写动态、修改动态
-     */
-    public function write_up_dynamic(){
-        $this->check_login();
-        $topic_id = input('topic_id');  //话题ID
-        $content = input('content');    //内容
-        $imgs = input('imgs');     //图片
-        $id = input('id');    //动态ID ，有则修改，无则添加
-        if (!$topic_id) $this->error('话题为空');
-        if (!$content && !$imgs) $this->error('参数错误');
-        if ($imgs)
-            $imgs = implode(',',$imgs);
-        $result = Dynamics::writeUpDynamic($topic_id,$content,$imgs,$id);
-        if ($result['code']){
-            $this->success($result['msg']);
-        }else{
-            $this->error($result['msg']);
-        }
-    }
-
-
-    /**
-     * 删除动态
-     */
-    public function del_dynamic(){
-        $this->check_login();
-        $id = input('id');  //动态ID
-        if (!$id) $this->error('参数错误');
-        $result = Dynamics::delDynamic($id);
-        if ($result['code']){
-            $this->success($result['msg']);
-        }else{
-            $this->error($result['msg']);
-        }
-    }
-
-
-    /**
-     * 我的，别人的动态列表
-     */
-    public function dynamic_list(){
-        $this->check_login();
-        $sel_user_id = input('sel_user_id');
-        $Nowpage = input('page',1);
-        $limits = input("limit",10);
-        $result = Dynamics::dynamicList($sel_user_id,$Nowpage,$limits);
-        $this->success($result['msg'],$result['data']);
-    }
-
-
-    /**
-     * 动态详情页
-     */
-    public function dynamic_detail(){
-        $this->check_login();
-        $id = input('id');   //动态ID
-        if (!$id) $this->error('参数错误');
-        $result = Dynamics::dynamicDetail($id);
-        $this->success($result['msg'],$result['data']);
-    }
-
-    /**
-     * 动态点赞用户列表
-     */
-    public function dynamic_zan_list(){
-        $this->check_login();
-        $id = input('id');   //动态ID
-        $Nowpage = input('page',1);
-        $limits = input("limit",10);
-        if (!$id) $this->error('参数错误');
-        $result = Dynamics::dynamicZanList($id,$Nowpage,$limits);
-        $this->success($result['msg'],$result['data']);
-    }
-
-
-    /**
-     * 动态评论列表
-     */
-    public function dynamic_comments_list(){
-        $this->check_login();
-        $id = input('id');   //动态ID
-        $Nowpage = input('page',1);
-        $limits = input("limit",10);
-        if (!$id) $this->error('参数错误');
-        $result = Dynamics::dynamicCommentsList($id,$Nowpage,$limits);
-        $this->success($result['msg'],$result['data']);
-    }
-
-    /**
-     * 评论详情页
-     */
-    public function dynamic_comments_detail(){
-        $this->check_login();
-        $id = input('id');   //评论ID
-        $Nowpage = input('page',1);
-        $limits = input("limit",10);
-        if (!$id) $this->error('参数错误');
-        $result = Dynamics::dynamicCommentsDetail($id,$Nowpage,$limits);
-        $this->success($result['msg'],$result['data']);
-    }
-
-
-    /**
-     * 删除评论(自己的评论)
-     */
-    public function del_comments_by_my(){
-        $this->check_login();
-        $id = input('id');   //评论(回复)ID
-        if (!$id) $this->error('参数错误');
-        $result = Dynamics::delCommentsByMy($id);
-        if ($result['code']){
-            $this->success($result['msg']);
-        }else{
-            $this->error($result['msg']);
-        }
-    }
-
-
-
-    /**
-     * 点赞
-     */
-    public function zan(){
-        $this->check_login();
-        $type = input('type',1);   //1:动态点赞   2：评论点赞
-        $link_id = input('link_id');   //关联ID
-        if (!$link_id) $this->error('参数错误');
-        $result = Dynamics::zan($type,$link_id);
-        if ($result['code']){
-            $this->success($result['msg']);
-        }else{
-            $this->error($result['msg']);
-        }
-    }
-
-
-    /**
-     * 取消赞
-     */
-    public function del_zan(){
-        $this->check_login();
-        $type = input('type',1);   //1:动态点赞   2：评论点赞
-        $link_id = input('link_id');   //关联ID
-        if (!$link_id) $this->error('参数错误');
-        $result = Dynamics::delZan($type,$link_id);
-        if ($result['code']){
-            $this->success($result['msg']);
-        }else{
-            $this->error($result['msg']);
-        }
-    }
-
-
-    /**
-     * 评论/回复
-     */
-    public function comments(){
-        $this->check_login();
-        $dynamic_id = input('dynamic_id');  //动态ID
-        $type = input('type',1);    //1:评论动态  2：回复评论
-        $comments_id = input('comments_id');   //回复的评论ID
-        $to_user_id = input('to_user_id');  //被回复的用户ID
-        $content = input('content');     //回复内容
-        if (!$dynamic_id || !$content) $this->error('参数错误');
-        if ($type==2){
-            if (!$comments_id || !$to_user_id)
-                $this->error('参数错误');
-        }
-        $result = Dynamics::comments($dynamic_id,$type,$content,$comments_id,$to_user_id);
-        if ($result['code']){
-            $this->success($result['msg']);
-        }else{
-            $this->error($result['msg']);
-        }
-    }
-
-
-    /**
-     * 不看他的动态
-     */
-    public function shielding_user(){
-        $this->check_login();
-        $to_user_id = input('to_user_id');  //被屏蔽的用户ID
-        if (!$to_user_id) $this->error('参数错误');
-        $result = Dynamics::shieldingUser($to_user_id);
-        if ($result['code']){
-            $this->success($result['msg']);
-        }else{
-            $this->error($result['msg']);
-        }
-    }
-
-
-    /**
-     * 举报
-     */
-    public function dynamic_report(){
-        $this->check_login();
-        $type = input('type',1); //1:举报动态   2：举报评论回复
-        $link_id = input('link_id');   //举报的ID
-        $content = input('content');    //举报内容
-        if (!$link_id || !$content) $this->error('参数错误');
-        $result = Dynamics::dynamicReport($type,$link_id,$content);
-        if ($result['code']){
-            $this->success($result['msg']);
-        }else{
-            $this->error($result['msg']);
-        }
-    }
-
-
-
-
-    /**
-     * 星球首页
-     */
-    public function dynamic_index(){
-        $this->check_login();
-        $type = input('type',1);  //1:全部   2：男或者女
-        $Nowpage = input('page',1);
-        $limits = input("limit",10);
-        $result = Dynamics::dynamicIndex($type,$Nowpage,$limits);
-        $this->success($result['msg'],$result['data']);
-    }
-
-
-
-    /**
-     * 话题下动态列表
-     */
-    public function topic_dynamic_list(){
-        $this->check_login();
-        $type = input('type',1);   //1：按热度   2：按时间
-        $topic_id = input('topic_id');  //话题ID
-        $Nowpage = input('page',1);
-        $limits = input("limit",10);
-        if (!$topic_id) $this->error('参数错误');
-        $result = Dynamics::topicDynamicList($type,$topic_id,$Nowpage,$limits);
-        $this->success($result['msg'],$result['data']);
-    }
-
-
-
-
-    /**
-     * 我屏蔽的用户列表
-     */
-    public function shielding_users_list(){
-        $this->check_login();
-        $Nowpage = input('page',1);
-        $limits = input("limit",10);
-        $result = Dynamics::shieldingUsersList($Nowpage,$limits);
-        $this->success($result['msg'],$result['data']);
-    }
-
-
-    /**
-     * 取消屏蔽
-     */
-    public function del_shielding(){
-        $this->check_login();
-        $id = input('id');
-        if (!$id) $this->error('参数错误');
-        $result = Dynamics::delShielding($id);
-        if ($result['code']){
-            $this->success($result['msg']);
-        }else{
-            $this->error($result['msg']);
-        }
-    }
-
-
-
-
-
-}

application/api/controller/Index.php

@@ -3,8 +3,6 @@
 
 namespace app\api\controller;
 
-use app\common\model\Article;
-use app\common\model\Banner;
 use app\common\model\Config;
 use app\common\model\ElectPool;
 use app\common\model\SearchHistory;
@@ -352,25 +350,6 @@ class Index extends Api
         }
     }
 
-
-
-
-
-    //付费查看提交
-    public function pay_check(){
-        $this->check_login();
-        $user_id = intval(input('user_id')); //用户ID
-        if (!$user_id) $this->error('用户ID为空！');
-        $result = ElectPool::payCheck($user_id);
-        if ($result['code']){
-            $this->success($result['msg'],$result['data']);
-        }else{
-            $this->error($result['msg']);
-        }
-    }
-
-
-
     /**
      * @title 不合适
      * @desc 不合适
@@ -418,6 +397,8 @@ class Index extends Api
 
 
 
+
+
     /**
      * 积分获取联系方式
      */
@@ -515,44 +496,6 @@ class Index extends Api
         }
     }
 
-    /**
-     * @title banner列表
-     * @desc banner列表
-     * @url /api/Index/banner_list
-     * @method POST
-     * @tag 基础
-     * @header
-     */
-    public function banner_list(){
-        $result = Banner::BannerList();
-        if ($result['code']){
-            $this->success($result['msg'],$result['data']);
-        }else{
-            $this->error($result['msg']);
-        }
-    }
-
-
-    /**
-     * @title 文章列表
-     * @desc 文章列表
-     * @url /api/Index/article_list
-     * @method POST
-     * @tag 基础
-     * @header
-     */
-    public function article_list(){
-        $result = Article::articleList();
-        if ($result['code']){
-            $this->success($result['msg'],$result['data']);
-        }else{
-            $this->error($result['msg']);
-        }
-    }
-
-
-
-
 
     /**
      * 特权过期脚本

application/api/controller/Login.php

@@ -0,0 +1,121 @@
+<?php
+
+
+namespace app\api\controller;
+
+use app\common\model\Config;
+use app\common\model\User;
+use app\common\controller\Api;
+use think\Db;
+use think\facade\Validate;
+
+
+/**
+ * @title 登录注册
+ * @controller Login
+ */
+class Login extends Api
+{
+
+    /**
+     * @title 注册
+     * @desc 注册
+     * @url /api/Login/register
+     * @method POST
+     * @tag 基础
+     * @header
+     * @param  name:phone type:string require:1 desc:手机号
+     * @param  name:password type:string require:1 desc:密码
+     * @param  name:ver_code type:string require:1 desc:验证码
+     */
+    public function register(){
+        $phone = input('phone');     //手机号
+        $password = input('password');    //密码
+        $ver_code = input('ver_code');     //验证码
+        if (!$phone || !$password){
+            $this->error('参数错误');
+        }
+        if (!Validate::regex($phone, "^1\d{10}$")) {
+            $this->error('手机号格式错误');
+        }
+
+        $us = User::register($phone,$password,$ver_code);
+        if ($us['code']){
+            $this->success($us['msg'],$us['data']);
+        }else{
+            $this->error($us['msg']);
+        }
+    }
+
+    /**
+     * @title 登录
+     * @desc 登录
+     * @url /api/Login/login
+     * @method POST
+     * @tag 基础
+     * @header
+     * @param  name:phone type:string require:1 desc:手机号
+     * @param  name:type type:string require:1 desc:1：密码登录2：验证码登录
+     * @param  name:password type:string require:0 desc:密码(密码登录时传)
+     * @param  name:ver_code type:string require:0 desc:验证码(验证码登录时传)
+     *
+     * @return name:token type:string desc:token
+     */
+    public function login(){
+        $phone = input('phone');  //手机号
+        $type  = input('type',1);   //1：密码登录  2：验证码登录
+        $password = input('password');    //密码
+        $ver_code = input('ver_code');    //验证码
+        if (!$phone || !Validate::regex($phone, "^1\d{10}$")) {
+            $this->error('手机号格式错误');
+        }
+        if (!in_array($type,['1','2'])){
+            $this->error('非法操作');
+        }
+        if ($type==1){
+            if (!$password){
+                $this->error('密码为空');
+            }
+        }elseif ($type==2){
+            if (!$ver_code){
+                $this->error('短信验证码为空');
+            }
+        }
+        $result = User::login($phone,$password,$type,$ver_code);
+        if ($result['code']){
+            $this->success($result['msg'],$result['data']);
+        }else{
+            $this->error($result['msg']);
+        }
+    }
+    /**
+     * @title 忘记密码
+     * @desc 忘记密码
+     * @url /api/Login/forgot_password
+     * @method POST
+     * @tag 基础
+     * @header
+     * @param  name:phone type:string require:1 desc:手机号
+     * @param  name:password type:string require:0 desc:密码
+     * @param  name:ver_code type:string require:0 desc:验证码
+     *
+     */
+    public function forgot_password(){
+        $phone = input('phone');  //手机号
+        $password = input('password');    //密码
+        $ver_code = input('ver_code');    //验证码
+        if (!$phone || !$password){
+            $this->error('参数错误');
+        }
+        if (!$phone || !Validate::regex($phone, "^1\d{10}$")) {
+            $this->error('手机号格式错误');
+        }
+        $result = User::forgotPassword($phone,$password,$ver_code);
+        if ($result['code']){
+            $this->success($result['msg'],$result['data']);
+        }else{
+            $this->error($result['msg']);
+        }
+    }
+
+}

application/api/controller/Pay.php

@@ -1,67 +0,0 @@
-<?php
-
-namespace app\api\controller;
-
-use app\common\controller\Api;
-use app\common\library\AopClient;
-use app\common\model\Config;
-use app\common\model\User;
-use think\Db;
-use think\Request;
-
-/**
- * 支付成功回调
- */
-class Pay extends Api
-{
-    /**
-     * 微信支付--付费查看提交回调
-     */
-    public function pay_check_order(){
-        $payXml = file_get_contents("php://input");
-        //将xml格式转化为json格式
-        $jsonXml = json_encode(simplexml_load_string($payXml, 'SimpleXMLElement', LIBXML_NOCDATA));
-        //将json格式转成数组格式 $result['out_trade_no']
-        $result = json_decode($jsonXml, true);
-        if ($result['return_code'] == 'SUCCESS' && $result['result_code'] == 'SUCCESS') {
-            $order = Db::name('UserRecharge')->where('paid',0)->where('order_no',$result['out_trade_no'])->find();
-            if ($order){
-                Db::startTrans();
-                try {
-                    $da['pay_time'] = time();
-                    $da['paid'] = 1;
-                    $da['return_success_info'] = json_encode($result,true);
-                    Db::name('UserRecharge')->where('id',$order['id'])->update($da);
-                    User::integral($order['price'],$order['user_id'],'微信充值积分',1);
-                    $arr = array(
-                        'return_code' => 'SUCCESS',
-                        'return_msg'  => 'OK',
-                    );
-                    return $this->arrayToXml($arr);
-                }catch (Exception $e) {
-                    Db::rollback();
-                    file_put_contents("order_pay_error.txt", file_get_contents("php://input") . "\n" . json_encode($result) . "\n" . "\n", FILE_APPEND);
-                }
-            }
-        }
-    }
-
-
-    /**
-     * 数组转xml
-     * @ApiInternal
-     */
-    public function arrayToXml($arr)
-    {
-        $xml = "<xml>";
-        foreach ($arr as $key => $val) {
-            if (is_numeric($val)) {
-                $xml .= "<" . $key . ">" . $val . "</" . $key . ">";
-            } else
-                $xml .= "<" . $key . "><![CDATA[" . $val . "]]></" . $key . ">";
-        }
-        $xml .= "</xml>";
-        return $xml;
-    }
-
-}

application/api/controller/Publics.php

@@ -3,25 +3,32 @@
 namespace app\api\controller;
 
 use app\common\controller\Api;
-use app\common\library\Common;
 use app\common\model\Config;
-use app\common\model\Icon;
 use think\facade\Validate;
 use think\Request;
+use app\common\model\Category;
 use app\common\model\SearchHistory;
 use OSS\OssClient;
 use app\common\model\User;
 use OSS\Core\OssException;
+use app\common\model\Order;
 
 /**
- * 公共类
+ * @title 公共类
+ * @controller Publics
  */
 class Publics extends Api
 {
-
     /**
-     * uploadLocality图片上传至本地&压缩
-     */
+     * @title 上传图片
+     * @desc 上传图片
+     * @url /api/Publics/uploadLocality
+     * @method POST
+     * @tag 基础
+     *
+     * @param  name:file type:file require:1 desc:上传
+     * @return name:data@url type:string desc:图片地址
+     **/
     public function uploadLocality(){
         $file = request()->file('file');
         $dir = dirname(realpath(dirname($_SERVER['SCRIPT_FILENAME']))) . '/public/upload';
@@ -29,118 +36,21 @@ class Publics extends Api
             //检查是否有该文件夹，如果没有就创建，并给予最高权限
             mkdir($dir, 0700,true);
         }
-        $array = array();
-        $ossClient = new OssClient(Config::get_values('storage_oss_keyid'), Config::get_values('storage_oss_secret'), Config::get_values('storage_oss_endpoint'));
-        foreach ($file as $file){
-            $wx_check = $this->wx_check($file,1);
-            if ($wx_check['errcode']=='87014'){
-                $this->error('含有违规图片');
-            }
-            $info = $file->move($dir);
-            if($info){
-                $newName = $info->getSaveName();
-                $storage_type = Config::get_values('storage_type');
-                if ($storage_type == 'oss'){
-                    $file_path = dirname($_SERVER['SCRIPT_FILENAME']) . "/upload/".$newName;
-                    $result = $ossClient->uploadFile(Config::get_values('storage_oss_bucket'), $newName, $file_path);
-                    array_push($array,$result['info']['url']);
-                    unlink($file_path);
-                }elseif ($storage_type=='local'){
-                    //压缩图片
-                    //image_png_size_add(ROOT_PATH . 'public' . DS . 'uploads/images/'.$newName,ROOT_PATH . 'public' . DS . 'uploads/images/'.$newName);
-                    $url =  'http://'.$_SERVER['SERVER_NAME']."/upload/{$newName}";
-                    array_push($array,$url);
-                }
-            }else{
-                echo $file->getError();
-            }
-        }
-        $this->success('上传成功',$array);
-    }
-    /**
-     * 获取分类列表
-     */
-    public function category_list(){
-        $list = Category::get_list(1);
-        $this->success('成功',$list);
-    }
 
-
-    /**
-     * 获取搜索历史
-     */
-    public function search_history(){
-        $Search = SearchHistory::getHistoryData();
-        $searchKeyword = [];
-        if (count($Search)){
-            foreach ($Search as $key=>&$item){
-                array_push($searchKeyword, $item['keywords']);
-            }
+        $ossClient = new OssClient(self::getOneValues('storage_oss_keyid'), self::getOneValues('storage_oss_secret'), self::getOneValues('storage_oss_endpoint'));
+        $info = $file->move($dir);
+        $newName = $info->getSaveName();
+        $storage_type = self::getOneValues('storage_type');
+        if ($storage_type == 'oss'){
+            $file_path = dirname($_SERVER['SCRIPT_FILENAME']) . "/upload/".$newName;
+            $result = $ossClient->uploadFile(self::getOneValues('storage_oss_bucket'), $newName, $file_path);
+            $data['url'] = $result['info']['url'];
+            unlink($file_path);
+        }elseif ($storage_type=='local'){
+            //压缩图片
+            //image_png_size_add(ROOT_PATH . 'public' . DS . 'uploads/images/'.$newName,ROOT_PATH . 'public' . DS . 'uploads/images/'.$newName);
+            $data['url'] =  'http://'.$_SERVER['SERVER_NAME']."/upload/{$newName}";
         }
-        $this->success('成功',$searchKeyword);
+        $this->success('上传成功',$data);
     }
-
-    /**
-     * 清空用户搜索的关键词
-     */
-    public function del_user_key(){
-        if(SearchHistory::delUserHistory())
-             $this->success('成功');
-        else
-             $this->error('失败');
-    }
-
-    /**
-     * 获取系统配置
-     */
-    public function config_info(){
-        $array['education'] = explode(',',Config::get_values('education'));
-        $array['label'] = explode(',',Config::get_values('label'));
-        $array['share_applet_count_day'] = Config::get_values('share_applet_count_day');
-        $array['share_applet_integral'] = Config::get_values('share_applet_integral');
-        $array['share_pool_count_day'] = Config::get_values('share_pool_count_day');
-        $array['share_pool_integral'] = Config::get_values('share_pool_integral');
-        $array['share_myinfo_count_day'] = Config::get_values('share_myinfo_count_day');
-        $array['share_myinfo_integral'] = Config::get_values('share_myinfo_integral');
-        $array['share_others_count_day'] = Config::get_values('share_others_count_day');
-        $array['share_others_integral'] = Config::get_values('share_others_integral');
-        $array['wechat_id'] = Config::get_values('wechat_id');
-        $array['integral_share_img'] = Config::get_values('integral_share_img');
-        $array['integral_share_reminder'] = Config::get_values('integral_share_reminder');
-        $array['share_applet_title'] = Config::get_values('share_applet_title');
-        $array['share_pool_title'] = Config::get_values('share_pool_title');
-        $array['share_myinfo_title'] = Config::get_values('share_myinfo_title');
-        $array['share_others_title'] = Config::get_values('share_others_title');
-        $array['audit'] = Config::get_values('audit');
-        $array['uihide'] = Config::get_values('audit');
-        $array['introduce_title'] = Config::get_values('introduce_title');
-        $array['family_title'] = Config::get_values('family_title');
-        $array['hobbies_title'] = Config::get_values('hobbies_title');
-        $array['love_title'] = Config::get_values('love_title');
-        $array['partner_title'] = Config::get_values('partner_title');
-        $array['single_title'] = Config::get_values('single_title');
-        $array['what_life_title'] = Config::get_values('what_life_title');
-        $array['cardiac_area_title'] = Config::get_values('cardiac_area_title');
-        $array['each_district_title'] = Config::get_values('each_district_title');
-        $array['integral_get_contact_switch'] = Config::get_values('integral_get_contact_switch');
-        $array['want_to_know_switch'] = Config::get_values('want_to_know_switch');
-        $array['professional'] = explode(',',Config::get_values('professional'));
-        $array['want_know_integral'] = Config::get_values('want_know_integral');
-        $array['integral_contact'] = Config::get_values('integral_contact');
-        $array['report_content'] = explode(',',Config::get_values('report_content'));
-        $array['reasons_inadequacy'] = explode(',',Config::get_values('reasons_inadequacy'));
-        $array['report_user_content'] = explode(',',Config::get_values('report_user_content'));
-        $array['greet'] = Config::get_values('greet') ? explode(',',Config::get_values('greet')) : [];
-        $array['chatting'] = Config::get_values('chatting') ? explode(',',Config::get_values('chatting')) : [];
-        $array['talk_past'] = Config::get_values('talk_past') ? explode(',',Config::get_values('talk_past')) : [];
-        //聊天小图标
-        $array['icon_list'] =  Icon::where('status',1)
-            ->where('is_del',1)
-            ->column('img');
-
-        $this->success('成功',$array);
-    }
-
-
-
 }

application/api/controller/Sms.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace app\api\controller;
+
+use app\common\controller\Api;
+use app\common\model\Sms as smss;
+use think\facade\Validate;
+use think\Request;
+
+/**
+ * @title 发送短信
+ * @controller Sms
+ */
+class Sms extends Api
+{
+    /**
+     * @title 发送短信
+     * @desc 发送短信
+     * @url /api/Sms/alsend
+     * @method POST
+     * @tag 基础
+     * @header
+     * @param  name:phone type:string require:1 desc:手机号
+     * @param  name:event type:string require:0 desc:发送类型register：注册forgetpwd：修改密码login:登录changepwd：修改密码
+     */
+    public function alsend()
+    {
+        $mobile = input("phone");
+        $event = input("event",'register');
+        if (!$mobile || !Validate::regex($mobile, "^1\d{10}$")) {
+            $this->error('手机号不正确');
+        }
+        $result = smss::send_sms($mobile,$event);
+        if ($result['code']){
+            $this->success($result['msg'],$result['data']);
+        }else{
+            $this->error($result['msg']);
+        }
+    }
+}

application/api/controller/Topic.php

@@ -1,74 +0,0 @@
-<?php
-
-
-namespace app\api\controller;
-
-use app\common\model\Topic as Topics;
-use app\common\controller\Api;
-use think\facade\Validate;
-
-
-/**
- * 话题
- * Class Index
- */
-class Topic extends Api
-{
-    /**
-     * 话题列表
-     */
-    public function topic_list(){
-        $this->check_login();
-        $type = input('type',0);    //1：banner列表  2：导航列表  3：推荐列表
-        $attention = input('attention',0); //1：我关注的
-        $result = Topics::topicList($type,$attention);
-        $this->success($result['msg'],$result['data']);
-    }
-
-
-    /**
-     * 关注话题
-     */
-    public function attention_topic(){
-        $this->check_login();
-        $topic_id = input('topic_id');  //话题ID
-        if (!$topic_id) $this->error('参数错误');
-        $result = Topics::attentionTopic($topic_id);
-        if ($result['code']){
-            $this->success($result['msg']);
-        }else{
-            $this->error($result['msg']);
-        }
-    }
-
-    /**
-     * 取消关注话题
-     */
-    public function del_attention_topic(){
-        $this->check_login();
-        $topic_id = input('topic_id');  //话题ID
-        if (!$topic_id) $this->error('参数错误');
-        $result = Topics::delAttentionTopic($topic_id);
-        if ($result['code']){
-            $this->success($result['msg']);
-        }else{
-            $this->error($result['msg']);
-        }
-    }
-
-
-    /**
-     * 话题主页
-     */
-    public function topic_detail(){
-        $this->check_login();
-        $topic_id = input('topic_id');  //话题ID
-        if (!$topic_id) $this->error('参数错误');
-        $result = Topics::topicDetail($topic_id);
-        $this->success($result['msg'],$result['data']);
-    }
-
-
-
-
-}

application/api/controller/User.php

@@ -2,6 +2,7 @@
 
 namespace app\api\controller;
 
+use app\common\library\Common;
 use think\Console;
 use think\Db;
 use think\Request;
@@ -9,130 +10,41 @@ use app\common\model\User as Users;
 use think\facade\Validate;
 use app\common\controller\Api;
 
-
 /**
  * @title 个人中心
  * @controller User
  */
 class User extends Api
 {
-
-    /**
-     * 微信授权登录
-     * code
-     */
-    public function wechat_login(){
-        $code = input('code');
-        if (!$code) $this->error('code为空');
-        $rawData = input('rawData');    //用户信息
-        $result = Users::wechatLogin($code,$rawData);
-        if ($result['code']){
-            $this->success($result['msg'],$result['data']);
-        }else{
-            $this->error($result['msg']);
-        }
-    }
-
-
     /**
-     * 获取用户信息
+     * @title 获取用户信息
+     * @desc 获取用户信息
+     * @url /api/User/userinfo
+     * @method POST
+     * @tag 基础
+     * @header name:Authorization require:1 default: desc:验证token
      */
     public function userinfo(){
-        $this->check_login();
-        $userinfo = Users::getUserInfo();
+        $user_id = $this->check_login();
+        $userinfo = Users::getUserInfo($user_id);
         $this->success('成功',$userinfo);
     }
 
-
-
-    /**
-     * 完善资料--基本资料
-     */
-    public function perfect_information_one(){
-        $this->check_login();
-        $data = input();
-//        if (!$data['imgs']  || !$data['nickname'] || !$data['date_of_birth'] || !in_array($data['sex'],array('1','2')) || !$data['height'] || !$data['phone'] || !$data['wechat_id'] ||
-//            !$data['annual_income'] || !$data['household'] || !$data['education'] || !$data['graduated_from'] || !$data['province'] || !$data['city'] || !$data['area'] || !$data['marriage'] ||
-//            !in_array($data['marriage'],array('1','2','3','4')) || !$data['is_integral_to_phone'] || !in_array($data['is_integral_to_phone'],array('1','2'))){
-//            $this->error('参数错误');
-//        }
-        if (!Validate::regex($data['phone'], "^1\d{10}$")) {
-            $this->error('手机号格式错误');
-        }
-        $data['imgs'] = implode(',',$data['imgs']);
-
-        //计算年龄
-        $data['age'] = date('Y',time())-date('Y',strtotime($data['date_of_birth']));
-
-        $result = Users::perfectInformation($data);
-        if ($result['code']){
-            $this->success($result['msg']);
-        }else{
-            $this->error($result['msg']);
-        }
-    }
-
-
-    /**
-     * 完善资料--关于我
-     */
-    public function perfect_information_two(){
-        $this->check_login();
-        $data = input();
-//        if (!$data['introduce_myself'] || !$data['family_background'] || !$data['interests_hobbies'] || !$data['love'] || !$data['other_half'] || !$data['why_single'] || !$data['look_life']){
-//            $this->error('参数错误');
-//        }
-        if (isset($data['introduce_myself_imgs']))
-            $data['introduce_myself_imgs'] = implode(',',$data['introduce_myself_imgs']);
-        if (isset($data['family_background_imgs']))
-            $data['family_background_imgs'] = implode(',',$data['family_background_imgs']);
-        if (isset($data['interests_hobbies_imgs']))
-            $data['interests_hobbies_imgs'] = implode(',',$data['interests_hobbies_imgs']);
-        if (isset($data['love_imgs']))
-            $data['love_imgs'] = implode(',',$data['love_imgs']);
-        if (isset($data['other_half_imgs']))
-            $data['other_half_imgs'] = implode(',',$data['other_half_imgs']);
-        if (isset($data['why_single_imgs']))
-            $data['why_single_imgs'] = implode(',',$data['why_single_imgs']);
-        if (isset($data['look_life_imgs']))
-            $data['look_life_imgs'] = implode(',',$data['look_life_imgs']);
-
-        $result = Users::perfectInformation($data);
-        if ($result['code']){
-            $this->success($result['msg']);
-        }else{
-            $this->error($result['msg']);
-        }
-    }
-
     /**
-     * 完善资料--我的标签、照片
-     */
-    public function perfect_information_three(){
-        $this->check_login();
-        $data = input();
-//        if (!$data['label']){
-//            $this->error('参数错误');
-//        }
-        $data['label'] = implode(',',$data['label']);
-        $result = Users::perfectInformation($data);
-        if ($result['code']){
-            $this->success($result['msg']);
-        }else{
-            $this->error($result['msg']);
-        }
-    }
-
-
-    /**
-     * 对另一半的要求
+     * @title 修改头像
+     * @desc 获取用户信息
+     * @url /api/User/edit_headimg
+     * @method POST
+     * @tag 基础
+     * @header name:Authorization require:1 default: desc:验证token
+     *
+     * @param  name:headimg type:string require:1 desc:头像地址
      */
-    public function requirements_to_other(){
-        $this->check_login();
-        $data = input();
-        if (!$data['hope_age'] || !$data['hope_height'] || !$data['hope_city'] || !$data['hope_hometown'] || !$data['hope_marriage'])
-            $this->error('参数错误');
-        $result = Users::perfectInformation($data);
+    public function edit_headimg(){
+        $user_id = $this->check_login();
+        $headimg = input('headimg'); //头像
+        if (!$headimg) $this->error('参数错误');
+        $result = Users::editHeadimg($user_id,$headimg);
         if ($result['code']){
             $this->success($result['msg']);
         }else{
@@ -140,57 +52,45 @@ class User extends Api
         }
     }
 
-
     /**
-     * 实名认证
-     */
-    public function real_auth(){
-        $this->check_login();
-        $data = input();
-        if (!$data['real_auth_img'] || !$data['real_auth_name'] || !$data['real_auth_id'])
+     * @title 申请成为骑手
+     * @desc 申请成为骑手
+     * @url /api/User/apply_rider
+     * @method POST
+     * @tag 基础
+     * @header name:Authorization require:1 default: desc:验证token
+     *
+     * @param  name:name type:string require:1 desc:姓名
+     * @param  name:identity_card type:string require:1 desc:身份证号
+     * @param  name:identity_card_zheng type:string require:1 desc:身份证正面
+     * @param  name:identity_card_fan type:string require:1 desc:身份证反面
+     * @param  name:province type:string require:1 desc:省
+     * @param  name:city type:string require:1 desc:市
+     * @param  name:area type:string require:1 desc:区
+     * @param  name:address type:string require:1 desc:详细地址
+     * @param  name:health_certificate type:string require:1 desc:健康证
+     */
+    public function apply_rider(){
+        $user_id = $this->check_login();
+        $data['name'] = input('name'); //姓名
+        $data['identity_card'] = input('identity_card'); //身份证号
+        $data['identity_card_zheng'] = input('identity_card_zheng'); //身份证正面
+        $data['identity_card_fan'] = input('identity_card_fan'); //身份证反面
+        $data['province'] = input('province');      //省
+        $data['city'] = input('city');      //市
+        $data['area'] = input('area');      //区
+        $data['address'] = input('address');      //地址
+        $data['health_certificate'] = input('health_certificate');      //健康证
+        if (!$data['name'] || !$data['identity_card'] || !$data['identity_card_zheng'] || !$data['identity_card_fan'] || !$data['province']
+            || !$data['city'] || !$data['area'] || !$data['address'] || !$data['health_certificate']){
             $this->error('参数错误');
-        $data['real_auth_img'] = implode(',',$data['real_auth_img']);
-        if (!Users::check_auth(1))
-            $this->error('已认证成功');
-        $result = Users::perfectInformation($data);
-        if ($result['code']){
-            $this->success($result['msg']);
-        }else{
-            $this->error($result['msg']);
         }
-    }
-
-    /**
-     * 工作认证
-     */
-    public function work_auth(){
-        $this->check_login();
-        $data = input();
-        if (!$data['work_auth_img'] || !$data['work_auth_company_name'] || !$data['shielding_colleagues_switch'])
-            $this->error('参数错误');
-        $data['work_auth_img'] = implode(',',$data['work_auth_img']);
-        if (!Users::check_auth(2))
-            $this->error('已认证成功');
-        $result = Users::perfectInformation($data);
-        if ($result['code']){
-            $this->success($result['msg']);
-        }else{
-            $this->error($result['msg']);
+        //判断身份证
+        $idcard = Common::setCard($data['identity_card']);
+        if (!$idcard){
+            $this->error('身份证格式错误');
         }
-    }
-
-    /**
-     * 学历认证
-     */
-    public function education_auth(){
-        $this->check_login();
-        $data = input();
-        if (!$data['education_auth_img'] || !$data['education_auth_school'] || !$data['education'])
-            $this->error('参数错误');
-        $data['education_auth_img'] = implode(',',$data['education_auth_img']);
-        if (!Users::check_auth(3))
-            $this->error('已认证成功');
-        $result = Users::perfectInformation($data);
+        $result = Users::applyRider($user_id,$data);
         if ($result['code']){
             $this->success($result['msg']);
         }else{
@@ -200,112 +100,25 @@ class User extends Api
 
 
     /**
-     * 心动区
-     */
-    public function cardiac_area(){
-        $this->check_login();
-        $Nowpage = input('page') ? input('page') : 1;
-        $limits = input("limit") ? input("limit") : 10;
-        $result = Users::cardiacArea($Nowpage,$limits);
-        $this->success($result['msg'],$result['data']);
-    }
-
-
-    /**
-     * 互选池
-     */
-    public function elect_area(){
-        $this->check_login();
-        $Nowpage = input('page') ? input('page') : 1;
-        $limits = input("limit") ? input("limit") : 10;
-        $result = Users::electArea($Nowpage,$limits);
-        $this->success($result['msg'],$result['data']);
-    }
-
-
-    /**
-     * 我的积分
-     */
-    public function my_integral(){
-        $this->check_login();
-        $Nowpage = input('page') ? input('page') : 1;
-        $limits = input("limit") ? input("limit") : 10;
-        $type = input('type');
-        $result = Users::myIntegral($Nowpage,$limits,$type);
-        $this->success($result['msg'],$result['data']);
-    }
-
-    /**
-     * 消息
-     */
-    public function message(){
-        $this->check_login();
-        $Nowpage = input('page') ? input('page') : 1;
-        $limits = input("limit") ? input("limit") : 10;
-        $result = Users::message($Nowpage,$limits);
-        $this->success($result['msg'],$result['data']);
-    }
-
-
-    /**
-     * 读取消息
-     */
-    public function read_message(){
-        $this->check_login();
-        $message_id = input('message_id');
-        if (!$message_id) $this->error('消息ID为空');
-        $result = Users::readMessage($message_id);
-        $this->success($result['msg'],$result['data']);
-    }
-
-
-    /**
-     * 消息数量
-     */
-    public function message_count(){
-        $result = Users::messageCount();
-        $this->success($result['msg'],$result['data']);
-    }
-
-
-    /**
-     * 隐私设置
+     * @title 修改密码
+     * @desc 修改密码
+     * @url /api/User/change_password
+     * @method POST
+     * @tag 基础
+     * @header name:Authorization require:1 default: desc:验证token
+     *
+     * @param  name:password type:string require:0 desc:密码
+     * @param  name:ver_code type:string require:0 desc:验证码
      */
-    public function privacy_settings(){
-        $this->check_login();
-        $data = input();
-        $result = Users::perfectInformation($data);
-        if ($result['code']){
-            $this->success($result['msg']);
-        }else{
-            $this->error($result['msg']);
-        }
-    }
-
 
-    /**
-     * 收藏用户
-     */
-    public function collect_user(){
-        $this->check_login();
-        $user_id = intval(input('user_id'));  //用户id
-        if (!$user_id) $this->error('用户ID为空！');
-        $result = Users::collectUser($user_id);
-        if ($result['code']){
-            $this->success($result['msg']);
-        }else{
-            $this->error($result['msg']);
+    public function change_password(){
+        $user_id = $this->check_login();
+        $password = input('password'); //密码
+        $ver_code = input('ver_code'); //验证码
+        if (!$password || !$ver_code){
+            $this->error('参数错误');
         }
-    }
-
-    /**
-     * 取消收藏
-     */
-    public function del_collect_user(){
-        $this->check_login();
-        $user_id = intval(input('user_id'));  //用户id
-        if (!$user_id) $this->error('用户ID为空！');
-        $result = Users::delCollectUser($user_id);
+        $result = Users::changePassword($user_id,$password,$ver_code);
         if ($result['code']){
             $this->success($result['msg']);
         }else{
@@ -315,178 +128,23 @@ class User extends Api
 
 
     /**
-     * 收藏用户列表
-     */
-    public function collect_list(){
-        $this->check_login();
-        $result = Users::collectList();
-        if ($result['code']){
-            $this->success($result['msg'],$result['data']);
-        }else{
-            $this->error($result['msg']);
-        }
-    }
-
-
-    /**
-     * 获取特权价格列表
-     */
-    public function privilege_price_list(){
-        $result = Users::privilegePriceList();
-        $this->success($result['msg'],$result['data']);
-    }
-
-
-    /**
-     * 开通特权
-     */
-    public function open_privilege(){
-        $this->check_login();
-        $privilege_id = intval(input('privilege_id'));
-        if (!$privilege_id) $this->error('参数错误');
-        $result = Users::openPrivilege($privilege_id);
-        if ($result['code']){
-            $this->success($result['msg'],$result['data']);
-        }else{
-            $this->error($result['msg']);
-        }
-    }
-
-
-
-    /**
-     * 想认识我列表
-     */
-    public function want_to_me_list(){
-        $this->check_login();
-        $Nowpage = input('page',1);
-        $limits = input("limit",10);
-        $result = Users::wantToMeList($Nowpage,$limits);
-        $this->success($result['msg'],$result['data']);
-    }
-
-
-
-    /**
-     * @title 我想认识-收到的
-     * @desc 我想认识-收到的
-     * @url /api/User/receive_want_know
+     * @title 绑定支付宝
+     * @desc 绑定支付宝
+     * @url /api/User/bind_zfb
      * @method POST
      * @tag 基础
-     * @header
-     * @return name:pending@count type:int desc:待处理数量
-     * @return name:pending@list type:array desc:待处理数量
-     * @return name:pending@list@id type:int desc:申请ID
-     * @return name:pending@list@leave_message type:int desc:留言
-     * @return name:pending@list@state type:int desc:1:申请中2:同意3:不通过4:不合适5：终止申请
-     * @return name:pending@list@create_at type:int desc:时间
-     * @return name:pending@list@seven type:string desc:几天后自动拒绝
+     * @header name:Authorization require:1 default: desc:验证token
      *
-     * @return name:have_deal@count type:int desc:已处理数量
-     * @return name:have_deal@list type:array desc:已处理数量
-     * @return name:have_deal@list@id type:int desc:申请ID
-     * @return name:have_deal@list@leave_message type:int desc:留言
-     * @return name:have_deal@list@state type:int desc:1:申请中2:同意3:不通过4:不合适5：终止申请
-     * @return name:have_deal@list@create_at type:int desc:时间
+     * @param  name:account type:string require:0 desc:账号
+     * @param  name:real_name type:string require:0 desc:真实姓名
      */
-    public function receive_want_know(){
-        $this->check_login();
-        $result = Users::ReceiveWantKnow();
-        $this->success($result['msg'],$result['data']);
-    }
-
-
-    /**
-     * @title 我想认识-我发出的
-     * @desc 我想认识-我发出的
-     * @url /api/User/apply_want_know
-     * @method POST
-     * @tag 基础
-     * @header
-     * @return name:count type:int desc:数量
-     * @return name:list type:array desc:列表
-     * @return name:list@id type:int desc:申请ID
-     * @return name:list@leave_message type:int desc:留言
-     * @return name:list@state type:int desc:1:申请中2:同意3:不通过4:不合适5：终止申请
-     * @return name:list@create_at type:int desc:时间
-     */
-    public function apply_want_know(){
-        $this->check_login();
-        $result = Users::ApplyWantKnow();
-        $this->success($result['msg'],$result['data']);
-    }
-
-    /**
-     * @title 我想认识-查看详情
-     * @desc 我想认识-查看详情
-     * @url /api/User/want_know_detail
-     * @method POST
-     * @tag 基础
-     * @header
-     * @param  name:id type:int require:1 desc:申请主键ID
-
-     */
-    public function want_know_detail(){
-        $this->check_login();
-        $id = intval(input('id'));
-        if (!$id) $this->error('参数错误');
-        $result = Users::WantKnowDetail($id);
-        $this->success($result['msg'],$result['data']);
-    }
-
-
-
-    /**
-     * @title 好友列表
-     * @desc 好友列表
-     * @url /api/User/friend_list
-     * @method POST
-     * @tag 基础
-     * @header
-     * @return name:good_friends type:array desc:好友列表
-     * @return name:star_friends type:array desc:星标好友列表
-     * @return name:message_list type:array desc:消息列表
-     */
-    public function friend_list(){
-        $this->check_login();
-        $result = Users::FriendList();
-        $this->success($result['msg'],$result['data']);
-    }
-
-
-    /**
-     * @title 聊天小图标列表
-     * @desc 聊天小图标列表
-     * @url /api/User/icon_list
-     * @method POST
-     * @tag 基础
-     * @header
-     */
-    public function icon_list(){
-        $this->check_login();
-        $result = Users::IconList();
-        $this->success($result['msg'],$result['data']);
-    }
-
-
-    /**
-     * @title 充值积分
-     * @desc 充值积分
-     * @url /api/User/user_recharge
-     * @method POST
-     * @tag 基础
-     * @header
-     *
-     * @param  name:integral type:int require:1 desc:充值积分数
-     */
-    public function user_recharge(){
-        $this->check_login();
-        $integral = input('integral');      //充值积分数
-        if (!$integral || $integral<=0) $this->error('积分数错误');
-        if ((floor($integral) - $integral) !==0){
-            $this->error('积分格式错误');
-        }
-        $result = Users::userRecharge($integral);
+    public function bind_zfb(){
+        $user_id = $this->check_login();
+        $account = input('account');    //账号
+        $real_name = input('real_name'); //真实姓名
+        if (!$account) $this->error('支付宝账号为空');
+        if (!$real_name) $this->error('真实姓名为空');
+        $result = Users::bindZfb($user_id,$account,$real_name);
         if ($result['code']){
             $this->success($result['msg'],$result['data']);
         }else{
@@ -494,38 +152,21 @@ class User extends Api
         }
     }
 
-
     /**
-     * @title 余额提现
-     * @desc 余额提现
-     * @url /api/User/user_withdraw
+     * @title 绑定微信
+     * @desc 绑定微信
+     * @url /api/User/bind_weixin
      * @method POST
      * @tag 基础
-     * @header
-     * @param  name:money type:int require:1 desc:提现金额
+     * @header name:Authorization require:1 default: desc:验证token
      *
+     * @param  name:code type:string require:0 desc:code
      */
-    public function user_withdraw(){
-        $this->check_login();
-        $integral = input('integral');      //提现金额
-        if (!$integral || $integral<=0) $this->error('积分错误');
-        if ((floor($integral) - $integral) !==0){
-            $this->error('积分格式错误');
-        }
-        $result = Users::userWithdraw($integral);
-        if ($result['code']){
-            $this->success($result['msg']);
-        }else{
-            $this->error($result['msg']);
-        }
-    }
-
-
-    /**
-     * 退出登录
-     */
-    public function cancellation_account(){
-        $result = Users::cancellationAccount();
+    public function bind_weixin(){
+        $user_id = $this->check_login();
+        $code = input('code');
+        if (!$code) $this->error('code为空');
+        $result = Users::getOpenId($user_id,$code);
         if ($result['code']){
             $this->success($result['msg'],$result['data']);
         }else{
@@ -534,14 +175,6 @@ class User extends Api
     }
 
 
-    /**
-     * 退出登录
-     */
-    public function login_out(){
-        app()->session->clear();
-        app()->session->destroy();
-        $this->success('退出登录成功！');
-    }
 
 
 }

application/common/controller/Api.php

@@ -5,6 +5,7 @@ namespace app\common\controller;
 use app\common\library\Common;
 use app\common\model\Config;
 use app\common\model\User;
+use Firebase\JWT\JWT;
 use think\exception\HttpResponseException;
 use think\facade\Request;
 use think\Response;
@@ -101,22 +102,47 @@ class Api
      * @return bool
      */
     protected function check_login(){
-        $user =  app()->session->get('us');
-        if (!$user){
-            $this->error('请先登录','',0);
+        try {
+            $token = app()->request->header('Authorization');
+            if ( ! $token) {
+                $this->error('请先登录', '', 0);
+            }
+            $user = JWT::decode($token, config('jwt.key'), ['HS256']);
+            if ( ! $user) {
+                $this->error('请先登录', '', 0);
+            }
+            $userinfo = User::where('id', $user->id)->find();
+            if (1 != $userinfo['status']) {
+                $this->error('账号被禁用', '', 0);
+            }
+
+            return $user->id;
+        } catch (\UnexpectedValueException $e) {
+            $this->error('请先登录', '', 0);
         }
-        $userinfo = User::where('id',$user['id'])->find();
-        if ($userinfo['is_del']!=1){
-            $this->error('请先登录','',0);
-        }
-        if ($userinfo['status']!=1){
-//            app()->session->clear();
-//            app()->session->destroy();
-            $data['disable_reason'] = $userinfo['disable_reason'];
-            $data['disable_time'] = $userinfo['disable_time'];
-            $this->error('账号被禁用',$data,0,1);
+    }
+
+
+    /**
+     * 获取单个配置信息.
+     */
+    public static function getOneValues($config_name)
+    {
+        return Config::where('name', $config_name)->value('value');
+    }
+
+    /**
+     * 获取多个配置信息.
+     */
+    public static function getMoreValues($config_names)
+    {
+        $menus = is_array($config_names) ? implode(',', $config_names) : $config_names;
+        $list = Config::where('name', 'IN', $menus)->column('value', 'name') ?: [];
+        foreach ($list as $menu => $value) {
+            $list[$menu] = $value;
         }
-        return true;
+
+        return $list;
     }
 
 

application/common/library/WxMerchPay.php

@@ -1,189 +0,0 @@
-<?php
-namespace app\common\library;
-
-use think\Controller;
-use app\common\model\Config;
-
-class WxMerchPay extends Controller
-{
-    //企业付款到微信零钱，PHP接口调用方法
-    /*
-      配置参数
-      */
-    /*
-  配置参数
-  */
-    public function __construct()
-    {
-        $this->appid = Config::get_values('wechat_appid');
-        $this->api_key = Config::get_values('wechat_mch_key');
-        $this->mch_id = Config::get_values('wechat_mch_id');
-    }
-//    private $config = array(
-//        'appid' => "wx57f0ba125c0f9351" ,//"wxcf1dded808489e2c",    /*微信开放平台上的应用id*/
-//        'mch_id' => "1526848461",//"1440493402",   /*微信申请成功之后邮件中的商户id*/
-//        'api_key' => "quanminchuangquanminchuang123521"    /*在微信商户平台上自己设定的api密钥 32位*/
-//    );
-
-
-    /**
-     * [xmltoarray xml格式转换为数组]
-     * @param [type] $xml [xml]
-     * @return [type]  [xml 转化为array]
-     */
-    function xmltoarray($xml) {
-        //禁止引用外部xml实体
-        libxml_disable_entity_loader(true);
-        $xmlstring = simplexml_load_string($xml, 'SimpleXMLElement', LIBXML_NOCDATA);
-        $val = json_decode(json_encode($xmlstring),true);
-        return $val;
-    }
-
-    /**
-     * [arraytoxml 将数组转换成xml格式（简单方法）:]
-     * @param [type] $data [数组]
-     * @return [type]  [array 转 xml]
-     */
-    function arraytoxml($data){
-        $str='<xml>';
-        foreach($data as $k=>$v) {
-            $str.='<'.$k.'>'.$v.'</'.$k.'>';
-        }
-        $str.='</xml>';
-        return $str;
-    }
-
-    /**
-     * [createNoncestr 生成随机字符串]
-     * @param integer $length [长度]
-     * @return [type]   [字母大小写加数字]
-     */
-    function createNoncestr($length =32){
-        $chars = "ABCDEFGHIJKLMNOPQRSTUVWXYabcdefghijklmnopqrstuvwxyz0123456789";
-        $str ="";
-
-        for($i=0;$i<$length;$i++){
-            $str.= substr($chars, mt_rand(0, strlen($chars)-1), 1);
-        }
-        return $str;
-    }
-
-    /**
-     * [curl_post_ssl 发送curl_post数据]
-     * @param [type] $url  [发送地址]
-     * @param [type] $xmldata [发送文件格式]
-     * @param [type] $second [设置执行最长秒数]
-     * @param [type] $aHeader [设置头部]
-     * @return [type]   [description]
-     */
-    function curl_post_ssl($url, $xmldata, $second = 30, $aHeader = array()){
-        $isdir = dirname(__DIR__) . "/wxcert/";//证书位置;绝对路径
-        $ch = curl_init();//初始化curl
-        curl_setopt($ch, CURLOPT_TIMEOUT, $second);//设置执行最长秒数
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);//要求结果为字符串且输出到屏幕上
-        curl_setopt($ch, CURLOPT_URL, $url);//抓取指定网页
-        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);// 终止从服务端进行验证
-        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);//
-        curl_setopt($ch, CURLOPT_SSLCERTTYPE, 'PEM');//证书类型
-        curl_setopt($ch, CURLOPT_SSLCERT, $isdir . 'apiclient_cert.pem');//证书位置
-        curl_setopt($ch, CURLOPT_SSLKEYTYPE, 'PEM');//CURLOPT_SSLKEY中规定的私钥的加密类型
-        curl_setopt($ch, CURLOPT_SSLKEY, $isdir . 'apiclient_key.pem');//证书位置
-        curl_setopt($ch, CURLOPT_CAINFO, 'PEM');
-        curl_setopt($ch, CURLOPT_CAINFO, $isdir . 'rootca.pem');
-        if (count($aHeader) >= 1) {
-            curl_setopt($ch, CURLOPT_HTTPHEADER, $aHeader);//设置头部
-        }
-        curl_setopt($ch, CURLOPT_POST, 1);//post提交方式
-        curl_setopt($ch, CURLOPT_POSTFIELDS, $xmldata);//全部数据使用HTTP协议中的"POST"操作来发送
-
-        $data = curl_exec($ch);//执行回话
-        if ($data) {
-            curl_close($ch);
-            return $data;
-        } else {
-            $error = curl_errno($ch);
-            echo "call faild, errorCode:$error\n";
-            curl_close($ch);
-            return false;
-        }
-    }
-
-
-    /**
-     * [sendMoney 企业付款到零钱]
-     * @param [type] $amount  [发送的金额（分）目前发送金额不能少于1元]
-     * @param [type] $re_openid [发送人的 openid]
-     * @param string $desc  [企业付款描述信息 (必填)]
-     * @param string $check_name [收款用户姓名 (选填)]
-     * @return [type]    [description]
-     */
-    function sendMoney($amount,$re_openid,$partner_trade_no,$desc='测试',$check_name=''){
-
-        $total_amount = (100) * $amount;
-        $data=array(
-            'mch_appid'=> $this->appid,//商户账号appid
-            'mchid'=>  $this->mch_id,//商户号
-            'nonce_str'=>$this->createNoncestr(),//随机字符串
-            'partner_trade_no'=> $partner_trade_no,//商户订单号
-            'openid'=> $re_openid,//用户openid
-            'check_name'=>'NO_CHECK',//校验用户姓名选项,
-            're_user_name'=> $check_name,//收款用户姓名
-            'amount'=>$total_amount,//金额
-            'desc'=> $desc,//企业付款描述信息
-            'spbill_create_ip'=> request()->ip(),//Ip地址
-        );
-
-        //生成签名算法
-        $secrect_key=$this->api_key;///这个就是个API密码。MD5 32位。
-        $data=array_filter($data);
-        ksort($data);
-        $str='';
-        foreach($data as $k=>$v) {
-            $str.=$k.'='.$v.'&';
-        }
-        $str.='key='.$secrect_key;
-        $data['sign']=md5($str);
-        //生成签名算法
-
-        $xml=$this->arraytoxml($data);
-
-        $url='https://api.mch.weixin.qq.com/mmpaymkttransfers/promotion/transfers'; //调用接口
-        $res=$this->curl_post_ssl($url,$xml);
-        $return=$this->xmltoarray($res);
-
-        return $return;
-
-//        print_r($return);
-//        die;
-        //返回来的结果是xml，最后转换成数组
-        /*
-        array(9) {
-         ["return_code"]=>
-         string(7) "SUCCESS"
-         ["return_msg"]=>
-         array(0) {
-         }
-         ["mch_appid"]=>
-         string(18) "wx57676786465544b2a5"
-         ["mchid"]=>
-         string(10) "143345612"
-         ["nonce_str"]=>
-         string(32) "iw6TtHdOySMAfS81qcnqXojwUMn8l8mY"
-         ["result_code"]=>
-         string(7) "SUCCESS"
-         ["partner_trade_no"]=>
-         string(18) "201807011410504098"
-         ["payment_no"]=>
-         string(28) "1000018301201807019357038738"
-         ["payment_time"]=>
-         string(19) "2018-07-01 14:56:35"
-        }
-        */
-
-
-//        $responseObj = simplexml_load_string($res, 'SimpleXMLElement', LIBXML_NOCDATA);
-       // echo $res= $responseObj->return_code; //SUCCESS 如果返回来SUCCESS,则发生成功，处理自己的逻辑
-      //  return $responseObj;
-    }
-
-}

application/common/library/WxPay.php

@@ -1,391 +0,0 @@
-<?php
-namespace app\common\library;
-
-use app\common\model\Config;
-use think\Controller;
-use think\Facade;
-use EasyWeChat\Factory;
-
-class WxPay extends Controller
-{
-    /*
-   配置参数
-   */
-    public function __construct()
-    {
-       // $this->appid = Config::get_values('small_wechat_id');
-        $this->appid = Config::get_values('wechat_appid');
-        $this->api_key = Config::get_values('wechat_mch_key');
-        $this->mch_id = Config::get_values('wechat_mch_id');
-
-    }
-//    private $config = array(
-//        'appid' => "wx57f0ba125c0f9351" ,//"wxcf1dded808489e2c",    /*微信开放平台上的应用id*/
-//        'mch_id' => "1526848461",//"1440493402",   /*微信申请成功之后邮件中的商户id*/
-//        'api_key' => "quanminchuangquanminchuang123521"    /*在微信商户平台上自己设定的api密钥 32位*/
-//    );
-
-    public function retrunconfig(){
-        $config = [
-            'app_id' => Config::get_values('small_wechat_id'),
-            'mch_id' =>Config::get_values('wechat_mch_id'),
-            'key' =>Config::get_values('wechat_mch_key')
-        ];
-        return $config;
-    }
-
-    public function retrunconfig2(){
-        $config = [
-            'app_id' => Config::get_values('wechat_appid'),
-            'mch_id' =>Config::get_values('wechat_mch_id'),
-            'key' =>Config::get_values('wechat_mch_key')
-        ];
-        return $config;
-    }
-
-    //获取预支付订单
-    public function getPrePayOrder($body, $out_trade_no, $total_fee, $notify_url,$come,$openid){
-
-        $url = "https://api.mch.weixin.qq.com/pay/unifiedorder";
-
-        $onoce_str = $this->getRandChar(32);
-
-        $data["appid"] =  $this->appid;
-        $data["body"] = $body;
-        $data["mch_id"] = $this->mch_id;
-        $data["nonce_str"] = $onoce_str;
-        $data["notify_url"] = $notify_url;
-        $data["out_trade_no"] = $out_trade_no;
-        $data["spbill_create_ip"] = $this->get_client_ip();
-        $data["total_fee"] = floatval($total_fee);
-        //$data["trade_type"] = $come=='weixin' ? "JSAPI" : "APP";
-        $data["trade_type"] = "APP";
-        $data['sign_type'] = "MD5";
-//        if ($come=='weixin'){
-//            $data['openid'] = $openid;
-//        }
-        $s = $this->getSign($data);
-
-        $data["sign"] = $s;
-
-        $xml = $this->arrayToXml($data);
-
-        $response = $this->postXmlCurl($xml, $url);
-
-        //将微信返回的结果xml转成数组
-       //return $this->xmlstr_to_array($response);
-        return $this->xmlToArray($response);
-    }
-
-
-    public function wxrefund($out_trade_no,$out_refund_no,$total_fee,$refund_fee)
-    {
-        $param = array(
-            'appid'=> $this->appid,
-            'mch_id'=> $this->mch_id,
-            'nonce_str'=>  $this->getRandChar(32),
-            'out_trade_no'=>$out_trade_no,
-            'out_refund_no'=>$out_refund_no,//订单号
-          //  'transaction_id'=> $transactionId,//微信订单号
-            'total_fee'=> $total_fee*100,
-            'refund_fee'=>$refund_fee*100
-        );
-
-        $param['sign'] = $this->getSign($param);
-        $xmldata = $this->arrayToXml($param);
-        $xmlresult = $this->postXmlSSLCurl($xmldata,'https://api.mch.weixin.qq.com/secapi/pay/refund');
-        $result = $this->xmlToArray($xmlresult);
-        return $result;
-    }
-
-
-    //执行第二次签名，才能返回给客户端使用
-    public function getOrder($prepayId){
-        $data["appid"] = $this->appid;
-        $data["noncestr"] = $this->getRandChar(32);
-        $data["package"] = "Sign=WXPay";
-       // $data['package'] = "prepay_id=".$prepayId;
-        $data["partnerid"] = $this->mch_id;
-        $data["prepayid"] = $prepayId;
-        $data["signType"] = "MD5";
-        $data["timestamp"] = '' . time() . '';
-        $s = $this->getSign($data, false);
-        $data["sign"] = $s;
-
-        return $data;
-    }
-
-    /*
-        生成签名
-    */
-    function getSign($Obj)
-    {
-        foreach ($Obj as $k => $v)
-        {
-            $Parameters[strtolower($k)] = $v;
-        }
-        //签名步骤一：按字典序排序参数
-        ksort($Parameters);
-        $String = $this->formatBizQueryParaMap($Parameters, false);
-        //echo "【string】 =".$String."</br>";
-        //签名步骤二：在string后加入KEY
-        $String = $String."&key=".$this->api_key;
-//        echo "<textarea style='width: 50%; height: 150px;'>$String</textarea> <br />";
-        //签名步骤三：MD5加密
-        $result_ = strtoupper(md5($String));
-        return $result_;
-    }
-
-
-
-
-    //获取指定长度的随机字符串
-    function getRandChar($length){
-        $str = null;
-        $strPol = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyz";
-        $max = strlen($strPol)-1;
-
-        for($i=0;$i<$length;$i++){
-            $str.=$strPol[rand(0,$max)];//rand($min,$max)生成介于min和max两个数之间的一个随机整数
-        }
-
-        return $str;
-    }
-
-    //数组转xml
-    function arrayToXml($arr)
-    {
-        $xml = "<xml>";
-        foreach ($arr as $key=>$val)
-        {
-
-            if (is_numeric($val))
-            {
-                $xml.="<".$key.">".$val."</".$key.">";
-
-            }
-            else
-                $xml.="<".$key."><![CDATA[".$val."]]></".$key.">";
-        }
-        $xml.="</xml>";
-        return $xml;
-    }
-
-    //post https请求，CURLOPT_POSTFIELDS xml格式
-    function postXmlCurl($xml,$url,$second=30)
-    {
-        //初始化curl
-        $ch = curl_init();
-        //超时时间
-        curl_setopt($ch,CURLOPT_TIMEOUT,$second);
-        //这里设置代理，如果有的话
-        //curl_setopt($ch,CURLOPT_PROXY, '8.8.8.8');
-        //curl_setopt($ch,CURLOPT_PROXYPORT, 8080);
-        curl_setopt($ch,CURLOPT_URL, $url);
-        curl_setopt($ch,CURLOPT_SSL_VERIFYPEER,FALSE);
-        curl_setopt($ch,CURLOPT_SSL_VERIFYHOST,FALSE);
-        //设置header
-        curl_setopt($ch, CURLOPT_HEADER, FALSE);
-        //要求结果为字符串且输出到屏幕上
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE);
-        //post提交方式
-        curl_setopt($ch, CURLOPT_POST, TRUE);
-        curl_setopt($ch, CURLOPT_POSTFIELDS, $xml);
-        //运行curl
-        $data = curl_exec($ch);
-        //返回结果
-        if($data)
-        {
-            curl_close($ch);
-            return $data;
-        }
-        else
-        {
-            $error = curl_errno($ch);
-            echo "curl出错，错误码:$error"."<br>";
-            echo "<a href='http://curl.haxx.se/libcurl/c/libcurl-errors.html'>错误原因查询</a></br>";
-            curl_close($ch);
-            return false;
-        }
-    }
-
-
-
-   //需要使用证书的请求
-    private function postXmlSSLCurl($xml,$url,$second=30)
-    {
-        $ch = curl_init();
-        //超时时间
-        curl_setopt($ch,CURLOPT_TIMEOUT,$second);
-        //这里设置代理，如果有的话
-        //curl_setopt($ch,CURLOPT_PROXY, '8.8.8.8');
-        //curl_setopt($ch,CURLOPT_PROXYPORT, 8080);
-        curl_setopt($ch,CURLOPT_URL, $url);
-        curl_setopt($ch,CURLOPT_SSL_VERIFYPEER,FALSE);
-        curl_setopt($ch,CURLOPT_SSL_VERIFYHOST,FALSE);
-        //设置header
-        curl_setopt($ch,CURLOPT_HEADER,FALSE);
-        //要求结果为字符串且输出到屏幕上
-        curl_setopt($ch,CURLOPT_RETURNTRANSFER,TRUE);
-        //设置证书
-        //使用证书：cert 与 key 分别属于两个.pem文件
-        //默认格式为PEM，可以注释
-        curl_setopt($ch,CURLOPT_SSLCERTTYPE,'PEM');
-        curl_setopt($ch,CURLOPT_SSLCERT, dirname(__DIR__) . '/wxcert/apiclient_cert.pem');
-        //默认格式为PEM，可以注释
-        curl_setopt($ch,CURLOPT_SSLKEYTYPE,'PEM');
-        curl_setopt($ch,CURLOPT_SSLKEY, dirname(__DIR__) . '/wxcert/apiclient_key.pem');
-        //post提交方式
-        curl_setopt($ch,CURLOPT_POST, true);
-        curl_setopt($ch,CURLOPT_POSTFIELDS,$xml);
-        $data = curl_exec($ch);
-        //返回结果
-        if($data){
-            curl_close($ch);
-            return $data;
-        }
-        else {
-            $error = curl_errno($ch);
-            echo "curl出错，错误码:$error"."<br>";
-            curl_close($ch);
-            return false;
-        }
-    }
-    /*
-        获取当前服务器的IP
-    */
-    function get_client_ip()
-    {
-        if ($_SERVER['REMOTE_ADDR']) {
-            $cip = $_SERVER['REMOTE_ADDR'];
-        } elseif (getenv("REMOTE_ADDR")) {
-            $cip = getenv("REMOTE_ADDR");
-        } elseif (getenv("HTTP_CLIENT_IP")) {
-            $cip = getenv("HTTP_CLIENT_IP");
-        } else {
-            $cip = "unknown";
-        }
-        return $cip;
-    }
-
-    //将数组转成uri字符串
-    function formatBizQueryParaMap($paraMap, $urlencode)
-    {
-        $buff = "";
-        ksort($paraMap);
-        foreach ($paraMap as $k => $v)
-        {
-            if($urlencode)
-            {
-                $v = urlencode($v);
-            }
-            $buff .= strtolower($k) . "=" . $v . "&";
-        }
-        $reqPar;
-        if (strlen($buff) > 0)
-        {
-            $reqPar = substr($buff, 0, strlen($buff)-1);
-        }
-        return $reqPar;
-    }
-
-    /**
-    xml转成数组
-     */
-//    function xmlstr_to_array($xmlstr) {
-//        $doc = new DOMDocument();
-//        $doc->loadXML($xmlstr);
-//        return $this->domnode_to_array($doc->documentElement);
-//    }
-    function domnode_to_array($node) {
-        $output = array();
-        switch ($node->nodeType) {
-            case XML_CDATA_SECTION_NODE:
-            case XML_TEXT_NODE:
-                $output = trim($node->textContent);
-                break;
-            case XML_ELEMENT_NODE:
-                for ($i=0, $m=$node->childNodes->length; $i<$m; $i++) {
-                    $child = $node->childNodes->item($i);
-                    $v = $this->domnode_to_array($child);
-                    if(isset($child->tagName)) {
-                        $t = $child->tagName;
-                        if(!isset($output[$t])) {
-                            $output[$t] = array();
-                        }
-                        $output[$t][] = $v;
-                    }
-                    elseif($v) {
-                        $output = (string) $v;
-                    }
-                }
-                if(is_array($output)) {
-                    if($node->attributes->length) {
-                        $a = array();
-                        foreach($node->attributes as $attrName => $attrNode) {
-                            $a[$attrName] = (string) $attrNode->value;
-                        }
-                        $output['@attributes'] = $a;
-                    }
-                    foreach ($output as $t => $v) {
-                        if(is_array($v) && count($v)==1 && $t!='@attributes') {
-                            $output[$t] = $v[0];
-                        }
-                    }
-                }
-                break;
-        }
-        return $output;
-    }
-//    public function xmltoarray( $xml )
-//    {
-//        $arr = $this->xml_to_array($xml);
-//        $key = array_keys($arr);
-//        return $arr[$key[0]];
-//    }
-
-    /**
-     * 	作用：将xml转为array
-     */
-    public function xmlToArray($xml)
-    {
-        //将XML转为array
-        $array_data = json_decode(json_encode(simplexml_load_string($xml, 'SimpleXMLElement', LIBXML_NOCDATA)), true);
-        return $array_data;
-    }
-
-
-    public function xml_to_array( $xml )
-    {
-        $reg = "/<(\\w+)[^>]*?>([\\x00-\\xFF]*?)<\\/\\1>/";
-        if(preg_match_all($reg, $xml, $matches))
-        {
-            $count = count($matches[0]);
-            $arr = array();
-            for($i = 0; $i < $count; $i++)
-            {
-                $key = $matches[1][$i];
-                $val = $this->xml_to_array( $matches[2][$i] );  // 递归
-                if(array_key_exists($key, $arr))
-                {
-                    if(is_array($arr[$key]))
-                    {
-                        if(!array_key_exists(0,$arr[$key]))
-                        {
-                            $arr[$key] = array($arr[$key]);
-                        }
-                    }else{
-                        $arr[$key] = array($arr[$key]);
-                    }
-                    $arr[$key][] = $val;
-                }else{
-                    $arr[$key] = $val;
-                }
-            }
-            return $arr;
-        }else{
-            return $xml;
-        }
-    }
-
-}

application/common/model/Article.php

@@ -1,38 +0,0 @@
-<?php
-
-namespace app\common\model;
-
-use app\common\model\Sms;
-use app\common\library\Email;
-use phpDocumentor\Reflection\Type;
-use think\Model;
-use app\common\library\Common;
-use think\facade\Validate;
-use think\Request;
-use think\Db;
-
-/**
- * 文章列表
- */
-class Article Extends Model
-{
-    // 开启自动写入时间戳字段
-    protected $autoWriteTimestamp = 'TIMESTAMP';
-    // 定义时间戳字段名
-    protected $createTime = 'create_at';
-    protected $updateTime = false;
-
-
-    /**
-     * 文章列表
-     */
-    public static function articleList(){
-        $list = self::where('is_del',1)
-            ->where('is_show',1)
-            ->order('sort desc')
-            ->select();
-        return Common::return_success('成功',$list);
-    }
-
-
-}

application/common/model/Banner.php

@@ -1,38 +0,0 @@
-<?php
-
-namespace app\common\model;
-
-use app\common\model\Sms;
-use app\common\library\Email;
-use phpDocumentor\Reflection\Type;
-use think\Model;
-use app\common\library\Common;
-use think\facade\Validate;
-use think\Request;
-use think\Db;
-
-/**
- * banner
- */
-class Banner Extends Model
-{
-    // 开启自动写入时间戳字段
-    protected $autoWriteTimestamp = 'TIMESTAMP';
-    // 定义时间戳字段名
-    protected $createTime = 'create_at';
-    protected $updateTime = false;
-
-
-    /**
-     * banner
-     */
-    public static function BannerList(){
-        $list = self::where('is_del',1)
-            ->where('is_show',1)
-            ->order('sort desc')
-            ->select();
-        return Common::return_success('成功',$list);
-    }
-
-
-}

application/common/model/Config.php

@@ -18,6 +18,8 @@ class Config extends Model
     protected $append = [
     ];
 
+    protected $table = 'system_config';
+
     /**
      * 获取配置信息
      */

application/common/model/ElectPool.php

@@ -1,8 +1,6 @@
 <?php
 
 namespace app\common\model;
-use app\common\library\WxPay;
-use EasyWeChat\Factory;
 use think\Model;
 use app\common\library\Common;
 use think\Db;
@@ -484,7 +482,7 @@ class ElectPool Extends Model
             $touser['wechat_id'] = "";
             $touser['is_collection'] = false;
             $touser['is_shielding'] = false;
-            $touser['apply_state'] = false;
+            $touser['apply_state'] = 0;
             $touser['star_switch'] = false;
             $touser['star'] = false;
         }else{
@@ -509,11 +507,27 @@ class ElectPool Extends Model
             $touser['is_shielding'] = $info > 0 ? true : false;
 
             //查看申请状态
-            $apply = UserWantKnow::where('user_id',$user['id'])->where('to_user_id',$user_id)->count();
+
+            $apply = UserWantKnow::where('user_id',$user['id'])->where('to_user_id',$user_id)->where('state',2)->count();
             if (!$apply){
-                $touser['apply_state'] = false;
+                $apply = UserWantKnow::where('user_id',$user_id)->where('to_user_id',$user['id'])->where('state',2)->count();
+                if (!$apply){
+                    $apply = UserWantKnow::where('user_id',$user['id'])->where('to_user_id',$user_id)->where('state',1)->count();
+                    if (!$apply){
+                        $apply = UserWantKnow::where('user_id',$user_id)->where('to_user_id',$user['id'])->where('state',1)->count();
+                        if (!$apply){
+                            $touser['apply_state'] = 0;
+                        }else{
+                            $touser['apply_state'] = 1;
+                        }
+                    }else{
+                        $touser['apply_state'] = 1;
+                    }
+                }else{
+                    $touser['apply_state'] = 2;
+                }
             }else{
-                $touser['apply_state'] = true;
+                $touser['apply_state'] = 2;
             }
 
             //星标开关
@@ -523,7 +537,6 @@ class ElectPool Extends Model
             //是否星标好友
             $star2 = UserStar::where('user_id',$user['id'])->where('to_user_id',$user_id)->count();
             $touser['star'] = $star2 ? true : false;
-
         }
         return Common::return_success('成功',$touser);
     }
@@ -794,7 +807,7 @@ class ElectPool Extends Model
             UserWantKnowRecord::create(
                 [
                     'know_id'=>$id,
-                    'user_id'=>$info['user_id'],
+                    'user_id'=>$user['id'],
                     'content'=>'拒绝申请',
                     'sort'=>5
                 ]
@@ -974,50 +987,93 @@ class ElectPool Extends Model
             return Common::return_error('积分不足');
 
         //查看我是否已经喜欢过
-        $want_know = UserWantKnow::where('user_id',$user['id'])->where('to_user_id',$user_id)->count();
-        if ($want_know)
+        $want_know = UserWantKnow::where('user_id',$user['id'])->where('to_user_id',$user_id)->whereIn('state','1,2')->count();
+        $want_know2 = UserWantKnow::where('to_user_id',$user['id'])->where('user_id',$user_id)->whereIn('state','1,2')->count();
+        if ($want_know || $want_know2)
             return Common::return_error('已经认识过');
         $data['user_id'] = $user['id'];
         $data['to_user_id'] = $user_id;
         $data['pool_id'] = $pool_id;
+        $data['leave_message'] = $leave_message;
         Db::startTrans();
         try {
-            User::integral($integral,$user['id'],'想查看 '.$touser['nickname'].'资料');
+            //扣除积分(如果被拒绝过，则积分翻倍)
+            $info = UserWantKnow::where('user_id',$user['id'])->where('to_user_id',$user_id)->where('state',3)->count();
+            if ($info > 0)
+                $integral = $integral * 2;
+            User::integral($integral,$user['id'],'想认识 '.$touser['nickname']);
             $data['integral'] = $integral;
             $knowid = UserWantKnow::create($data);
+            $knowid = json_decode($knowid,true);
+            //查看对方是否也喜欢我
+            $want_know2 = UserWantKnow::where('user_id',$user_id)->where('to_user_id',$user['id'])->count();
+            //系统消息
+            if ($want_know2){
+                Message::create_message($user_id,'您与 '. $userinfo['nickname'] .' 互选成功','互选消息',2);
+                $nickname = User::where('id',$user_id)->value('nickname');
+                Message::create_message($user['id'],'您与 '. $nickname .' 互选成功','互选消息',2);
+            }
+
+            //记录
+            UserWantKnowRecord::create(
+                [
+                    'know_id'=>$knowid['id'],
+                    'user_id'=>$user['id'],
+                    'content'=>'发出申请',
+                    'sort'=>1
+                ]
+            );
+
+            UserWantKnowRecord::create(
+                [
+                    'know_id'=>$knowid['id'],
+                    'user_id'=>$user['id'],
+                    'content'=>'等待对方查看',
+                    'sort'=>2
+                ]
+            );
+
+            UserWantKnowRecord::create(
+                [
+                    'know_id'=>$knowid['id'],
+                    'user_id'=>$user_id,
+                    'content'=>'收到申请',
+                    'sort'=>1
+                ]
+            );
 
 
             //消息推送
-//            $openid = User::where('id',$user_id)->value('openid');
-//            $template_id = "50XKLuXe12kb_niiwvQ7xd4cjXBh_y_T7Oyp_HjGWzE";
-//            $path = "";
-//            $data = [
-//                'first'=>[
-//                    "value"=>'你好，你有一条待处理的申请，请及时处理',
-//                    "color"=>"#173177"
-//                ],
-//                'keyword1'=>[
-//                    "value"=>'好友申请',
-//                    "color"=>"#173177"
-//                ],
-//                'keyword2'=>[
-//                    "value"=>$userinfo['nickname'],
-//                    "color"=>"#173177"
-//                ],
-//                'keyword3'=>[
-//                    "value"=>$userinfo['nickname'].'想认识你',
-//                    "color"=>"#173177"
-//                ],
-//                'keyword4'=>[
-//                    "value"=>date('Y-m-d H:i'),
-//                    "color"=>"#173177"
-//                ],
-//                'remark'=>[
-//                    "value"=>'收到好友申请通知，请查看',
-//                    "color"=>"#173177"
-//                ]
-//            ];
-//            Common::sendTemplateMsg($openid,$template_id,$path,$data);
+            $openid = User::where('id',$user_id)->value('openid');
+            $template_id = "50XKLuXe12kb_niiwvQ7xd4cjXBh_y_T7Oyp_HjGWzE";
+            $path = "";
+            $data = [
+                'first'=>[
+                    "value"=>'你好，你有一条待处理的申请，请及时处理',
+                    "color"=>"#173177"
+                ],
+                'keyword1'=>[
+                    "value"=>'好友申请',
+                    "color"=>"#173177"
+                ],
+                'keyword2'=>[
+                    "value"=>$userinfo['nickname'],
+                    "color"=>"#173177"
+                ],
+                'keyword3'=>[
+                    "value"=>$userinfo['nickname'].'想认识你',
+                    "color"=>"#173177"
+                ],
+                'keyword4'=>[
+                    "value"=>date('Y-m-d H:i'),
+                    "color"=>"#173177"
+                ],
+                'remark'=>[
+                    "value"=>'收到好友申请通知，请查看',
+                    "color"=>"#173177"
+                ]
+            ];
+            Common::sendTemplateMsg($openid,$template_id,$path,$data);
 
 
             Db::commit();
@@ -1030,74 +1086,6 @@ class ElectPool Extends Model
 
 
 
-    /**
-     * 付费查看提交
-     */
-    public static function payCheck($user_id){
-        $user = app()->session->get('us');
-        $userinfo = User::get($user['id']);
-        $touser = Db::name('User')->where('id',$user_id)->find();
-        if (!$touser)
-            return Common::return_error('用户不存在');
-
-        $info = PayCheck::where('user_id',$user['id'])->where('to_user_id',$user_id)->where('paid',1)->find();
-        if ($info)
-            return Common::return_error('已经付费查看过');
-
-        //获取支付金额
-        $pay_money = Config::get_values('pay_check_money');
-        $wx = new WxPay();//实例化微信torganizationid支付控制器
-        $notify_url = 'https://'.$_SERVER['SERVER_NAME'].'/api/pay/pay_check_order';//回调地址
-        $config = $wx->retrunconfig();
-        $config['notify_url'] = $notify_url;
-        $order_no = Common::getNewOrderId($user['id']);
-        $body = '订单号' . $order_no;//支付说明
-        $total_fee = $pay_money * 100;//支付金额(乘以100)
-        Db::startTrans();
-        try{
-
-            $data['user_id'] = $user['id'];
-            $data['to_user_id'] = $user_id;
-            $data['order_no'] = $order_no;
-            $data['price'] = $pay_money;
-            $get_check_money = Config::get_values('get_check_money');
-            $get_price = sprintf("%.2f",substr(sprintf("%.3f", ($pay_money*($get_check_money/100))), 0, -2));
-            $data['get_price'] = $get_price;
-
-            PayCheck::create($data);
-
-            $app =  Factory::payment($config);
-            $order = $app->order->unify([
-                'body' => $body,
-                'out_trade_no' => $order_no,
-                'total_fee' => $total_fee,
-                'trade_type' => "JSAPI", // JSAPI--JSAPI支付（或小程序支付）、NATIVE--Native支付、APP--app支付，MWEB--H5支付
-                'openid' => $userinfo['openid'],
-            ]);
-
-            if ($order['return_msg']=='OK'){
-                if ($order['result_code']=='FAIL'){
-                    Db::rollback();
-                    return Common::return_error($order['err_code_des']);
-                }else{
-                    $order1 = $app->jssdk->bridgeConfig($order['prepay_id']);//执行二次签名返回参数
-                    $retrun_data['order_no'] = $order_no;
-                    $retrun_data['pay'] = json_decode($order1,true);
-                    Db::commit();
-                    return Common::return_success('成功',$retrun_data);
-                }
-            } else {
-                Db::rollback();
-                return Common::return_error($order['return_msg']);
-            }
-        }catch (Exception $e){
-            Db::rollback();
-            return Common::return_error($order['return_msg']);
-        }
-    }
-
-
-
 
 
     /**

application/common/model/LoginLog.php

@@ -21,6 +21,8 @@ class LoginLog Extends Model
     protected $append = [
     ];
 
+    protected $table = 'q_login_log';
+
 
 
 }

application/common/model/MoneyLog2.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace app\common\model;
-
-use think\Model;
-
-/**
- * 会员余额日志模型
- */
-class MoneyLog2 Extends Model
-{
-
-    // 表名
-    protected $name = 'store_user_money_log';
-    // 开启自动写入时间戳字段
-    protected $autoWriteTimestamp = 'TIMESTAMP';
-    // 定义时间戳字段名
-    protected $createTime = 'create_at';
-    protected $updateTime = '';
-    // 追加属性
-    protected $append = [
-    ];
-}

application/common/model/PayCheck.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace app\common\model;
-
-use think\Model;
-
-class PayCheck extends Model
-{
-
-    // 开启自动写入时间戳字段
-    protected $autoWriteTimestamp = 'TIMESTAMP';
-    // 定义时间戳字段名
-    protected $createTime = 'create_at';
-    protected $updateTime = false;
-    // 定义字段类型
-    protected $type = [
-    ];
-
-
-}

application/common/model/Sms.php

@@ -0,0 +1,115 @@
+<?php
+
+namespace app\common\model;
+
+use app\common\model\Config;
+use think\Model;
+use app\common\library\Common;
+use AlibabaCloud\Client\AlibabaCloud;
+use AlibabaCloud\Client\Exception\ClientException;
+use AlibabaCloud\Client\Exception\ServerException;
+
+/**
+ * 短信验证码
+ */
+class Sms Extends Model
+{
+
+    // 开启自动写入时间戳字段
+    protected $autoWriteTimestamp = 'int';
+    // 定义时间戳字段名
+    protected $createTime = 'createtime';
+    protected $updateTime = false;
+    // 追加属性
+    protected $append = [
+    ];
+
+    protected $table = 'q_sms';
+
+
+    /**
+     * 发送短信
+     * @param $mobile
+     * @param $event
+     * @return array
+     */
+    public static function send_sms($mobile,$event){
+        $last = self::where(['mobile' => $mobile, 'event' => $event])
+            ->order('id', 'DESC')
+            ->find();
+        if ($last && time() - strtotime($last->createtime) < 60) {
+            return Common::return_error('发送频繁！');
+        }
+        $ipSendTotal = Sms::where(['ip' => request()->ip()])->whereTime('createtime', '-1 hours')->count();
+        if ($ipSendTotal >= 5) {
+            return Common::return_error('发送频繁！');
+        }
+        $userinfo = User::getByMobile($mobile);
+        if ($event == 'register' && $userinfo) {
+            //已被注册
+            return Common::return_error('已被注册！');
+        } else if (in_array($event, ['changepwd', 'login']) && !$userinfo) {
+            //未注册
+            return Common::return_error('未注册！');
+        }
+
+        //发送阿里云短信
+        $ret = self::accessKeyClient($event, $mobile, mt_rand(100000, 999999));
+
+        if ($ret['Code'] === 'OK') {
+            return Common::return_success('发送成功');
+        } elseif ($ret['Code'] === 'isv.BUSINESS_LIMIT_CONTROL') {
+            return Common::return_error('发送太过频繁！');
+        } else {
+            return Common::return_error($ret['msg']);
+        }
+    }
+
+    public static function accessKeyClient($event, $mobile, $num)
+    {
+
+        $ip = request()->ip();
+        self::create(['event' => $event, 'mobile' => $mobile, 'code' => $num, 'ip' => $ip]);
+        $info['Code'] = "OK";
+        return $info;
+
+
+        $ali_accesskey = Config::get_values('ali_accesskey');
+        $ali_accesskey_secret = Config::get_values('ali_accesskey_secret');
+        $templateCode = Config::get_values('templateCode');
+        AlibabaCloud::accessKeyClient($ali_accesskey, $ali_accesskey_secret)
+            ->regionId('cn-hangzhou')
+            ->asDefaultClient();
+
+        try {
+            $result = AlibabaCloud::rpc()
+                ->product('Dysmsapi')
+                // ->scheme('https') // https | http
+                ->version('2017-05-25')
+                ->action('SendSms')
+                ->method('POST')
+                ->host('dysmsapi.aliyuncs.com')
+                ->options([
+                    'query' => [
+                        'PhoneNumbers' => $mobile,
+                        'SignName' => '全民创',
+                        'TemplateCode' => $templateCode,
+                        'TemplateParam' => '{"code":' . $num . '}',
+                    ],
+                ])
+                ->request();
+            $info = $result->toArray();
+            if ($info['Code'] == 'OK') {
+                $ip = request()->ip();
+                Sms::create(['event' => $event, 'mobile' => $mobile, 'code' => $num, 'ip' => $ip]);
+            }
+            return $info;
+        } catch (ClientException $e) {
+            echo $e->getErrorMessage() . PHP_EOL;
+        } catch (ServerException $e) {
+            echo $e->getErrorMessage() . PHP_EOL;
+        }
+    }
+
+
+}

application/common/model/User.php

@@ -2,12 +2,9 @@
 
 namespace app\common\model;
 
-use app\common\library\AliPay;
-use app\common\library\WxMerchPay;
-use app\common\library\WxPay;
 use app\common\model\Sms;
 use app\common\library\Email;
-use EasyWeChat\Factory;
+use Firebase\JWT\JWT;
 use phpDocumentor\Reflection\Type;
 use app\common\model\UserIntegralLog;
 use think\Model;
@@ -31,201 +28,240 @@ class User Extends Model
     protected $updateTime = 'update_at';
     // 追加属性
     protected $append = [
-        'url',
     ];
 
+    protected $table = 'q_user';
 
     /**
-     * 微信授权登录、注册
+     * 注册
      */
-    public static function wechatLogin($code,$rawData){
-        $appid = Config::get_values('wechat_appid');
-        $secret = Config::get_values('wechat_appsecret');
-        $url = "https://api.weixin.qq.com/sns/jscode2session?appid=" . $appid . "&secret=" . $secret . "&js_code=" . $code . "&grant_type=authorization_code";
-        $session_key = Common::curlRequest($url);
-
-        //数据库是否已注册
-//        $user = Db::name('User')->where('openid','oo7E85LrD0ovt7hbz4sZGrf-_flA')->find();
-//        $user = Db::name('User')->where('id',53)->find();
-//        if ($user){
-//            $user['UserIformationPerfect'] =  self::checkUserIformationPerfect($user['id']) ? true : false;
-//            app()->session->set('us', $user);
-//            //注册环信
-//           // Common::huanxin_zhuce('huxuanmao-'.$user['id'],$user['nickname']);
-//            return Common::return_success('授权成功',$user);
+    public static function register($phone,$password,$ver_code){
+        $phone_use = self::where('phone',$phone)->find();
+        if ($phone_use){
+            return Common::return_error('手机号已注册！');
+        }
+
+        //获取最后的验证码
+//        $time = time()-90;
+//        $sms = Sms::where(['mobile' => $phone, 'event' => 'register'])
+//            ->where('createtime','>',$time)
+//            ->order('id', 'DESC')
+//            ->find();
+//        if (!$sms || $sms->code != $ver_code){
+//            return Common::return_error('短信验证码不正确！');
 //        }
-        if (!empty($session_key['session_key'])) {
-            $openid = $session_key['openid'];
-            //数据库是否已注册
-            $user = Db::name('User')->where('openid',$openid)
-                ->where('is_cancellation_account',1)
-                ->where('is_del',1)
-                ->find();
-            if ($user){
-                $user['UserIformationPerfect'] =  self::checkUserIformationPerfect($user['id']) ? true : false;
-                app()->session->set('us', $user);
-                $users = self::getUserInfo($user['id']);
-
-                User::where('id',$user['id'])->update(['huanxinID'=>'huxuanmao-'.$user['id']]);
-                //注册环信
-                Common::huanxin_zhuce('huxuanmao-'.$users['id'],$users['nickname']);
-                return Common::return_success('授权成功',$users);
-            }else{
-                $data['sex'] = 0;
-                if ($rawData){
-                    $rawData = json_decode($rawData,true);
-                    $data['nickname'] = $rawData['nickName'];
-                    $data['openid'] = $openid;
-                    $data['sex'] = $rawData['gender'];
-                    $data['headimgurl'] = $rawData['avatarUrl'];
-                }
-//                $data['province'] = $rawData['province'];
-//                $data['city'] = $rawData['city'];
-                Db::startTrans();
-                try {
-                    $user = self::create($data);
-                    Db::commit();
-                    $userId =$user->id;
-                    $us =Db::name('User')->where('id',$userId)->find();
-                    $us['UserIformationPerfect'] =  false;
-                    app()->session->set('us', $us);
-                    //系统赠送注册积分数量
-                    $register_give_integral = Config::get_values('register_give_integral');
-                    if ($register_give_integral>0){
-                        //加积分
-                        self::integral($register_give_integral,$userId, '注册赠送积分',1);
-                    }
-                    User::where('id',$userId)->update(['huanxinID'=>'huxuanmao-'.$userId]);
-                    $users = self::getUserInfo($userId);
-                    //注册环信
-                    Common::huanxin_zhuce('huxuanmao-'.$userId,$users['nickname']);
-                    return Common::return_success('授权成功',$users);
-                }catch (Exception $e) {
-                    Db::rollback();
-                    return Common::return_error('授权失败');
-                }
-            }
-        }else{
-            return Common::return_error('获取session_key失败！');
+
+        $data['phone'] = $phone;
+        $data['password'] = md5($password);
+        $data['ip'] = request()->ip();
+        Db::startTrans();
+        try {
+            self::create($data);
+            Db::commit();
+            return Common::return_success('注册成功');
+        }catch (Exception $e) {
+            Db::rollback();
+            return Common::return_error('注册失败');
         }
     }
 
+
     /**
-     * 获取用户信息
+     * 登录
      */
-    public static function getUserInfo($id=''){
-        $user = app()->session->get('us');
-        if ($id){
-            $userid = $id;
-        }else{
-            $userid = $user['id'];
-        }
-        $userinfo = Db::name('user')->where('id',$userid)->find();
-        if ($userinfo['sex']==0){
-            $userinfo['sex'] = null;
-        }
-        if (!$userinfo['hope_age']){
-            $userinfo['hope_age'] = [];
-        }else{
-            $userinfo['hope_age'] = explode(',',$userinfo['hope_age']);
-        }
-        if (!$userinfo['hope_height']){
-            $userinfo['hope_height'] = [];
-        }else{
-            $userinfo['hope_height'] = explode(',',$userinfo['hope_height']);
+    public static function login($phone,$password,$type,$ver_code){
+        $phone_use = self::where('phone',$phone)->find();
+        if (!$phone_use){
+            return Common::return_error('手机号未注册！');
         }
-        if (!$userinfo['imgs']){
-            $userinfo['imgs'] = [];
-        }else{
-            $userinfo['imgs'] = explode(',',$userinfo['imgs']);
+        if ($phone_use['status']!=1){
+            return Common::return_error('账号已禁用！');
         }
-        if (!$userinfo['label']){
-            $userinfo['label'] = [];
-        }else{
-            $userinfo['label'] = explode(',',$userinfo['label']);
+        if ($type==1){
+            if ($phone_use['password'] != md5($password)){
+                return Common::return_error('密码错误！');
+            }
+        }elseif ($type==2){
+            //获取最后的验证码
+//            $time = time()-90;
+//            $sms = Sms::where(['mobile' => $phone, 'event' => 'login'])
+//                ->where('createtime','>',$time)
+//                ->order('id', 'DESC')
+//                ->find();
+//            if (!$sms || $sms->code != $ver_code){
+//                return Common::return_error('短信验证码不正确！');
+//            }
         }
+        self::where('id',$phone_use['id'])->update(['ip'=>request()->ip()]);
+        LoginLog::create(['user_id'=>$phone_use['id'],'ip'=>request()->ip()]);
+        $token = JWT::encode($phone_use,config('jwt.key'));
+        return Common::return_success('登录成功',['token'=>$token]);
+    }
 
-        if (!$userinfo['introduce_myself_imgs']) {
-            $userinfo['introduce_myself_imgs'] = [];
-        }else{
-            $userinfo['introduce_myself_imgs'] = explode(',',$userinfo['introduce_myself_imgs']);
+
+    /**
+     * 忘记密码
+     */
+    public static function forgotPassword($phone,$password,$ver_code){
+        $phone_use = self::where('phone',$phone)->find();
+        if (!$phone_use){
+            return Common::return_error('手机号未注册！');
         }
-        if (!$userinfo['family_background_imgs']) {
-            $userinfo['family_background_imgs'] = [];
-        }else{
-            $userinfo['family_background_imgs'] = explode(',',$userinfo['family_background_imgs']);
+        //获取最后的验证码
+//        $time = time()-90;
+//        $sms = Sms::where(['mobile' => $phone, 'event' => 'forgetpwd'])
+//            ->where('createtime','>',$time)
+//            ->order('id', 'DESC')
+//            ->find();
+//        if (!$sms || $sms->code != $ver_code){
+//            return Common::return_error('短信验证码不正确！');
+//        }
+        $phone_use->password = md5($password);
+        Db::startTrans();
+        try {
+            $phone_use->save();
+            Db::commit();
+            return Common::return_success('修改成功');
+        }catch (Exception $e) {
+            Db::rollback();
+            return Common::return_error('修改失败');
         }
+    }
 
-        if (!$userinfo['interests_hobbies_imgs']) {
-            $userinfo['interests_hobbies_imgs'] = [];
-        }else{
-            $userinfo['interests_hobbies_imgs'] = explode(',',$userinfo['interests_hobbies_imgs']);
-        }
 
-        if (!$userinfo['love_imgs']){
-            $userinfo['love_imgs'] = [];
-        }else{
-            $userinfo['love_imgs'] = explode(',',$userinfo['love_imgs']);
-        }
-        if (!$userinfo['other_half_imgs']){
-            $userinfo['other_half_imgs'] = [];
-        }else{
-            $userinfo['other_half_imgs'] = explode(',',$userinfo['other_half_imgs']);
-        }
-        if (!$userinfo['why_single_imgs']){
-            $userinfo['why_single_imgs'] = [];
-        }else{
-            $userinfo['why_single_imgs'] = explode(',',$userinfo['why_single_imgs']);
-        }
-        if (!$userinfo['look_life_imgs']){
-            $userinfo['look_life_imgs'] = [];
-        }else{
-            $userinfo['look_life_imgs'] = explode(',',$userinfo['look_life_imgs']);
+    /**
+     * 修改密码
+     */
+    public static function changePassword($user_id,$password,$ver_code){
+        $phone_use = self::where('id',$user_id)->find();
+        //获取最后的验证码
+//        $time = time()-90;
+//        $sms = Sms::where(['mobile' => $phone_use['phone'], 'event' => 'changepwd'])
+//            ->where('createtime','>',$time)
+//            ->order('id', 'DESC')
+//            ->find();
+//        if (!$sms || $sms->code != $ver_code){
+//            return Common::return_error('短信验证码不正确！');
+//        }
+        $phone_use->password = md5($password);
+        Db::startTrans();
+        try {
+            $phone_use->save();
+            Db::commit();
+            return Common::return_success('修改成功');
+        }catch (Exception $e) {
+            Db::rollback();
+            return Common::return_error('修改失败');
         }
-        if (!$userinfo['real_auth_img']){
-            $userinfo['real_auth_img'] = [];
-        }else{
-            $userinfo['real_auth_img'] = explode(',',$userinfo['real_auth_img']);
+    }
+
+
+
+    /**
+     * 根据手机号获取用户信息
+     */
+    public static function getByMobile($phone){
+        $userinfo = self::where('phone',$phone)->find();
+        return $userinfo;
+    }
+
+    /**
+     * 获取用户信息
+     */
+    public static function getUserInfo($id){
+        $info = self::where('id',$id)->field('password',true)->find();
+        return $info;
+    }
+
+
+    /**
+     * 修改头像
+     */
+    public static function editHeadimg($user_id,$headimg){
+        $data['headimg'] = $headimg;
+        Db::startTrans();
+        try {
+            self::where('id',$user_id)->update($data);
+            Db::commit();
+            return Common::return_success('修改成功');
+        }catch (Exception $e) {
+            Db::rollback();
+            return Common::return_error('修改失败');
         }
-        if (!$userinfo['work_auth_img']){
-            $userinfo['work_auth_img'] = [];
-        }else{
-            $userinfo['work_auth_img'] = explode(',',$userinfo['work_auth_img']);
+    }
+
+    /**
+     * 申请成为骑手
+     */
+    public static function applyRider($user_id,$data){
+        $data['type'] = 1;
+        $data['audit'] = 1;
+        Db::startTrans();
+        try {
+            self::where('id',$user_id)->update($data);
+            Db::commit();
+            return Common::return_success('提交成功');
+        }catch (Exception $e) {
+            Db::rollback();
+            return Common::return_error('提交失败');
         }
-        if (!$userinfo['education_auth_img']){
-            $userinfo['education_auth_img'] = [];
-        }else{
-            $userinfo['education_auth_img'] = explode(',',$userinfo['education_auth_img']);
+    }
+
+
+    /**
+     * 绑定支付宝
+     */
+    public static function bindZfb($user_id,$account,$real_name){
+        $userInfo = self::where('id',$user_id)->find();
+        $userInfo->zfb_account = $account;
+        $userInfo->zfb_real_name = $real_name;
+        Db::startTrans();
+        try {
+            $userInfo->save();
+            Db::commit();
+            return Common::return_success('成功');
+        }catch (Exception $e) {
+            Db::rollback();
+            return Common::return_error('失败');
         }
-        $userinfo['UserIformationPerfect'] =  self::checkUserIformationPerfect($userid) ? true : false;
-        $count = Collection::where('a.user_id',$userid)
-            ->alias('a')
-            ->where('b.is_del',1)
-            ->join('User b','a.to_user_id=b.id')
-            ->where('a.is_effective',1)
-            ->count();
-        $collect_num = Config::get_values('collect_num');
-        $collect_num = $collect_num ? $collect_num : 10;
-        $userinfo['remaining_collect_num'] = bcsub($collect_num,$count);
-        $userinfo['want_know_num'] = UserWantKnow::where('a.to_user_id',$userid)
-            ->alias('a')
-            ->where('b.is_del',1)
-            ->join('User b','a.user_id=b.id')
-            ->count();
-        if ($userinfo['stealth_switch_time'] && ($userinfo['stealth_switch_time']+(7*24*60*60))>time()){
-            $userinfo['stealth_is_allow_open'] = false;
+    }
+
+
+
+    /**
+     * 绑定微信
+     * @param $code
+     * @return array|int
+     */
+    public static function getOpenId($user_id,$code){
+        $userInfo = self::where('id',$user_id)->find();
+        $appid = Config::get_values('wechat_appid');
+        $secret = Config::get_values('wechat_appsecret');
+        $url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=$appid&secret=$secret&code=$code&grant_type=authorization_code";
+        $result = Common::curlRequest($url);
+        if (isset($result['access_token'])){
+            $access_token=$result['access_token'];
+            $openid=$result['openid'];
+            $urltoc = "https://api.weixin.qq.com/sns/userinfo?access_token=$access_token&openid=$openid&lang=zh_CN";
+            $resinfos =Common::http_curl($urltoc);
+            $userInfo->openid = $resinfos['openid'];
+            Db::startTrans();
+            try {
+                $userInfo->save();
+                Db::commit();
+                return Common::return_success('成功');
+            }catch (Exception $e) {
+                Db::rollback();
+                return Common::return_error('失败');
+            }
         }else{
-            $userinfo['stealth_is_allow_open'] = true;
+            return Common::return_error('失败');
         }
-
-        $userinfo['stealth_switch_end_time'] = date('Y-m-d H:i:s',$userinfo['stealth_switch_time']+(7*24*60*60)); //隐私模式下次可以开启时间
-        $userinfo['stealth_switch_time'] = date('Y-m-d H:i:s',$userinfo['stealth_switch_time']); //隐私模式开启时间
-        //我的动态数量
-        $userinfo['dynamic_count'] = Dynamic::where('user_id',$userid)->where('is_del',1)->count();
-        return $userinfo;
     }
 
 
+
+
     /**
      * 完善资料
      */
@@ -502,31 +538,6 @@ class User Extends Model
     }
 
     /**
-     * 变更会员余额
-     * @param int $money    余额
-     * @param int $user_id  会员ID
-     * @param string $memo  备注
-     */
-    public static function money($money, $user_id, $memo, $pm = 0)
-    {
-        $user = self::get($user_id);
-        if ($user)
-        {
-            $before = $user->money;
-            if ($pm==1){
-                $after = $user->money + $money;
-            }else{
-                $after = $user->money - $money;
-            }
-            //更新会员信息
-            $user->save(['money' => $after]);
-            //写入日志
-            MoneyLog2::create(['user_id' => $user_id,'pm' => $pm, 'change_money' => $money, 'before' => $before, 'after' => $after, 'title' => $memo]);
-        }
-    }
-
-
-    /**
      * 置顶用户列表
      */
     public static function topUser($city){
@@ -1180,10 +1191,6 @@ class User Extends Model
             ->all()
             ->toArray();
         foreach ($list as &$v){
-
-            $seven = date('Y-m-d H:i:s',strtotime($v['create_at'])+(7*24*60*60));
-            $v['seven'] = Common::timeTranRun($seven);
-
             $touser = Db::name('User')->where('id',$v['to_user_id'])->find();
             if (!$touser)
                 return Common::return_error('用户不存在');
@@ -1281,15 +1288,6 @@ class User Extends Model
         $user = app()->session->get('us');
 
         $info = UserWantKnow::where('id',$id)->find()->toArray();
-
-        $seven = date('Y-m-d H:i:s',strtotime($info['create_at'])+(7*24*60*60));
-        $info['seven'] = Common::timeTranRun($seven);
-
-        $times = Common::timeTranRun2($seven);
-        $info['day'] = $times['date'];
-        $info['hour'] = $times['hour'];
-        $info['minute'] = $times['minute'];
-        $info['seconds'] = $times['seconds'];
         $info['list'] = UserWantKnowRecord::where('know_id',$id)
             ->where('user_id',$user['id'])
             ->order('sort desc')
@@ -1395,113 +1393,6 @@ class User Extends Model
     }
 
 
-    /**
-     * 积分充值
-     */
-    public static function userRecharge($integral){
-        $user = app()->session->get('us');
-        $userinfo = self::where('id',$user['id'])->find();
-        //获取支付金额
-        $pay_money = $integral;
-        $wx = new WxPay();//实例化微信torganizationid支付控制器
-        $notify_url = 'https://'.$_SERVER['SERVER_NAME'].'/api/pay/pay_check_order';//回调地址
-        $config = $wx->retrunconfig();
-        $config['notify_url'] = $notify_url;
-        $order_no = Common::getNewOrderId($user['id']);
-        $body = '订单号' . $order_no;//支付说明
-        $total_fee = $pay_money * 100;//支付金额(乘以100)
-        Db::startTrans();
-        try{
-
-            $data['user_id'] = $user['id'];
-            $data['order_no'] = $order_no;
-            $data['price'] = $pay_money;
-
-            UserRecharge::create($data);
-
-            $app =  Factory::payment($config);
-            $order = $app->order->unify([
-                'body' => $body,
-                'out_trade_no' => $order_no,
-                'total_fee' => $total_fee,
-                'trade_type' => "JSAPI", // JSAPI--JSAPI支付（或小程序支付）、NATIVE--Native支付、APP--app支付，MWEB--H5支付
-                'openid' => $userinfo['openid'],
-            ]);
-
-            if ($order['return_msg']=='OK'){
-                if ($order['result_code']=='FAIL'){
-                    Db::rollback();
-                    return Common::return_error($order['err_code_des']);
-                }else{
-                    $order1 = $app->jssdk->bridgeConfig($order['prepay_id']);//执行二次签名返回参数
-                    $retrun_data['order_no'] = $order_no;
-                    $retrun_data['pay'] = json_decode($order1,true);
-                    Db::commit();
-                    return Common::return_success('成功',$retrun_data);
-                }
-            } else {
-                Db::rollback();
-                return Common::return_error($order['return_msg']);
-            }
-        }catch (Exception $e){
-            Db::rollback();
-            return Common::return_error($order['return_msg']);
-        }
-    }
-
-
-    /**
-     * 余额提现
-     */
-    public static function userWithdraw($money){
-        $user = app()->session->get('us');
-        $userinfo = self::where('id',$user['id'])->find();
-
-        $withdraw_min_price = Config::get_values('withdraw_min_price');  //最小提现金额
-        $withdraw_max_price = Config::get_values('withdraw_max_price');  //最大提现金额
-        if ($money < $withdraw_min_price)
-            return Common::return_error('最低提现'.$withdraw_min_price.'元');
-        if ($money > $withdraw_max_price)
-            return Common::return_error('最大提现'.$withdraw_min_price.'元');
-        if ($userinfo['integral']<$money)
-            return Common::return_error('余额不足');
-
-        $data['user_id'] = $user['id'];
-        $order_no = Common::getNewOrderId($user['id']);
-        $data['order_no'] = $order_no;
-        $data['price'] = $money;
-        $poundage_proportion = Config::get_values('poundage_proportion');    //手续费百分比
-        $data['poundage_proportion'] = $poundage_proportion;
-        $proportion = sprintf("%.2f", $money*($poundage_proportion/100));    //四舍五入保留两位小数点
-        $data['proportion'] = $proportion;
-        $real_money = $money-$proportion;
-        $data['real_money'] = $real_money;
-
-        Db::startTrans();
-        try {
-            UserWithdraw::create($data);
-            $opend_id = $userinfo['openid'];
-            if (!$opend_id)
-                return Common::return_error('未绑定微信，无法提现');
-            $wx = new WxMerchPay();
-            $result = $wx->sendMoney($real_money,$opend_id,$order_no,'余额提现');
-            if ($result['return_code']=='SUCCESS' && $result['result_code']=='SUCCESS'){
-                User::integral($money,$user['id'],'微信提现'.$money);
-                UserWithdraw::where('order_no',$order_no)->update(['paid'=>1,'pay_time'=>time(),'return_info'=>json_encode($result,true)]);
-                Db::commit();
-                return Common::return_success('提现成功');
-            }else{
-                UserWithdraw::where('order_no',$order_no)->update(['return_info'=>json_encode($result,true)]);
-                Db::commit();
-                return Common::return_error('提现失败');
-            }
-        }catch (Exception $e) {
-            Db::rollback();
-            return Common::return_error('提现失败');
-        }
-    }
-
-
 
     /**
      * 注销账号

application/common/model/UserRecharge.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace app\common\model;
-use think\Model;
-use think\Db;
-
-/**
- * 充值
- */
-class UserRecharge Extends Model
-{
-    // 开启自动写入时间戳字段
-    protected $autoWriteTimestamp = 'TIMESTAMP';
-    // 定义时间戳字段名
-    protected $createTime = 'create_at';
-    protected $updateTime = false;
-
-
-}

application/common/model/UserWithdraw.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace app\common\model;
-use think\Model;
-use think\Db;
-
-/**
- * 提现
- */
-class UserWithdraw Extends Model
-{
-    // 开启自动写入时间戳字段
-    protected $autoWriteTimestamp = 'TIMESTAMP';
-    // 定义时间戳字段名
-    protected $createTime = 'create_at';
-    protected $updateTime = false;
-
-
-}

application/company/command/Subversion.php

@@ -0,0 +1,103 @@
+<?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\company\command;
+
+use think\console\Command;
+use think\console\Input;
+use think\console\Output;
+use think\Db;
+
+/**
+ * SVN 版本指令
+ * Class Subversion
+ * @package app\company\command
+ */
+class Subversion extends Command
+{
+    /**
+     * 账号授权文件位置
+     * @var string
+     */
+    protected $authzFile = 'php://output';
+
+    /**
+     * 账号管理文件位置
+     * @var string
+     */
+    protected $passwdFile = 'php://output';
+
+    /**
+     * 配置指令配置
+     */
+    protected function configure()
+    {
+        $this->setName('xsubversion:config')->setDescription('从数据库的配置同步到SVN配置文件');
+    }
+
+    /**
+     * @param Input $input
+     * @param Output $output
+     * @return int|void|null
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    protected function execute(Input $input, Output $output)
+    {
+        $paths = ['/' => [0]];
+        $where = ['status' => '1', 'is_deleted' => '0'];
+        // 取得可用的用户账号
+        $users = Db::name('CompanyUser')->field('svn_username,svn_password,svn_authorize')->where($where)->select();
+        $authids = array_unique(explode(',', join(',', array_column($users, 'svn_authorize'))));
+        // 取得可用的权限配置
+        $userAuths = Db::name('CompanyUserAuth')->field('id,path')->where($where)->whereIn('id', $authids)->order('sort desc,id desc')->select();
+        foreach ($userAuths as $item) foreach (explode("\n", preg_replace('/\s+/i', "\n", trim($item['path']))) as $path) {
+            $paths[$path][] = $item['id'];
+        }
+        $this->writeAuth($users, $paths);
+    }
+
+    /**
+     * 写入 SVN 配置文件
+     * @param array $users
+     * @param array $paths
+     */
+    protected function writeAuth($users, $paths)
+    {
+        $output = [];
+        // Passwd 用户账号处理
+        foreach ($users as $user) $output[] = "{$user['svn_username']}={$user['svn_password']}";
+        file_put_contents($this->passwdFile, join(PHP_EOL, $output));
+        // Authz 授权配置处理
+        $groups = ['_0' => []];
+        foreach ($users as $user) {
+            $ids = array_unique(explode(',', $user['svn_authorize']));
+            foreach ($ids as $id) $groups["_{$id}"][] = $user['svn_username'];
+        }
+        $output = [];
+        $output[] = '[groups]';
+        foreach ($groups as $key => $group) $output[] = "group{$key}=" . join(',', $group);
+        $output[] = '';
+        foreach ($paths as $path => $ids) {
+            $output[] = "[{$path}]";
+            $output[] = "* =";
+            $output[] = '@group_0 = rw';
+            foreach ($ids as $id) if ($id > 0) $output[] = "@group_{$id} = rw";
+            $output[] = '';
+        }
+        file_put_contents($this->authzFile, join(PHP_EOL, $output));
+    }
+}

application/company/controller/Auth.php

@@ -0,0 +1,101 @@
+<?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\company\controller;
+
+use library\Controller;
+
+/**
+ * 仓库权限管理
+ * Class Auth
+ * @package app\company\controller
+ */
+class Auth extends Controller
+{
+    /**
+     * 绑定数据表
+     * @var string
+     */
+    protected $table = 'CompanyUserAuth';
+
+    /**
+     * 仓库权限管理
+     * @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)->like('title,path')->equal('status');
+        $query->dateBetween('create_at')->where(['is_deleted' => '0'])->page();
+    }
+
+    /**
+     * 添加SVN权限
+     * @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 = '添加SVN权限';
+        $this->_form($this->table, 'form');
+    }
+
+    /**
+     * 编辑SVN权限
+     * @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->_form($this->table, 'form');
+    }
+
+    /**
+     * 修改SVN权限状态
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     */
+    public function state()
+    {
+        $this->_save($this->table, ['status' => input('status')]);
+    }
+
+    /**
+     * 删除SVN权限
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     */
+    public function remove()
+    {
+        $this->_delete($this->table);
+    }
+
+}

application/company/controller/Clock.php

@@ -0,0 +1,49 @@
+<?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\company\controller;
+
+use library\Controller;
+
+/**
+ * 网络打卡管理
+ * Class Clock
+ * @package app\company\controller
+ */
+class Clock extends Controller
+{
+    /**
+     * 绑定数据表
+     * @var string
+     */
+    protected $table = 'CompanyUserClock';
+
+    /**
+     * 网络打卡管理
+     * @auth true
+     * @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 index()
+    {
+        $this->title = '网络打卡管理';
+        $this->_query($this->table)->like('name')->equal('date')->order('id asc')->page();
+    }
+
+}

application/company/controller/User.php

@@ -0,0 +1,131 @@
+<?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\company\controller;
+
+use app\company\service\DataService;
+use library\Controller;
+use think\Db;
+
+/**
+ * 企业员工管理
+ * Class User
+ * @package app\worker\controller
+ */
+class User extends Controller
+{
+
+    /**
+     * 绑定当前数据表
+     * @var string
+     */
+    protected $table = 'CompanyUser';
+
+    /**
+     * 企业员工管理
+     * @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)->like('nickname,svn_username')->equal('status')->page();
+    }
+
+    /**
+     * 添加企业员工
+     * @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->_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->_form($this->table, 'form');
+    }
+
+    /**
+     * 权限表单数据处理
+     * @param array $data 表单数据
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    protected function _form_filter(&$data)
+    {
+        if ($this->request->isGet()) {
+            $where = ['status' => '1', 'is_deleted' => '0'];
+            $this->auths = Db::name('company_user_auth')->where($where)->order('sort desc,id desc')->select();
+            array_unshift($this->auths, ['id' => '0', 'title' => '所有权限', 'path' => '/']);
+            $data['svn_authorize'] = isset($data['svn_authorize']) ? explode(',', $data['svn_authorize']) : [];
+        } else {
+            if (isset($data['svn_authorize']) && is_array($data['svn_authorize'])) {
+                $data['svn_authorize'] = join(',', $data['svn_authorize']);
+            } else {
+                $data['svn_authorize'] = '';
+            }
+            $macs = [];
+            foreach (explode(PHP_EOL, preg_replace("/\s+/", PHP_EOL, trim($data['mobile_macs']))) as $mac) {
+                if (DataService::applyMacValue($mac)) $macs[] = $mac;
+            }
+            $data['mobile_macs'] = join(PHP_EOL, array_unique($macs));
+        }
+    }
+
+    /**
+     * 更改企业员工状态
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     */
+    public function state()
+    {
+        $this->_save($this->table, ['status' => input('status', '0')]);
+    }
+
+    /**
+     * 删除企业员工
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     */
+    public function remove()
+    {
+        $this->_delete($this->table);
+    }
+
+}

application/company/controller/api/Push.php

@@ -0,0 +1,97 @@
+<?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\company\controller\api;
+
+use app\company\service\DataService;
+use library\Controller;
+use think\Db;
+
+/**
+ * ARP-SAN 推送内容接收
+ * Class Push
+ * @package app\company\controller\api
+ */
+class Push extends Controller
+{
+    /**
+     * ARP-SAN 推送内容接收
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     */
+    public function index()
+    {
+        // 数据输入检查
+        $content = file_get_contents('php://input');
+        if (empty($content)) $this->error('没有接收到数据');
+        // 企业员工检查
+        $where = ['is_deleted' => '0', 'status' => '1'];
+        $users = Db::name('CompanyUser')->cache(10)->where($where)->column('id uid,nickname name,mobile_macs mac');
+        if (empty($users)) $this->error('没有需要打卡的用户');
+        // 企业员工检查
+        $macs = [];
+        foreach ($users as $user) foreach (explode("\n", preg_replace('/\s+/', "\n", $user['mac'])) as $mac) {
+            if (DataService::applyMacValue($mac)) $macs[$mac] = ['uid' => $user['uid'], 'name' => $user['name']];
+        }
+        // 数据内容解析
+        list($s, $e) = [0, 0];
+        foreach (explode("\n", $content) as $line) {
+            list($ip, $mac, $dsc) = explode(' ', preg_replace('/\s+/', ' ', trim($line)) . '  ');
+            if (preg_match('/^(\d+\.?){4}$/', $ip) && DataService::applyMacValue($mac)) {
+                if (isset($macs[$mac])) {
+                    $s++;
+                    $this->writeUser($ip, $mac, strtoupper($dsc), $macs);
+                } else {
+                    $e++;
+                    $this->writeNone($ip, $mac, strtoupper($dsc));
+                }
+            }
+        }
+        return "接收到{$s}个已知设备推送，{$e}个未知设备推送。" . PHP_EOL . PHP_EOL;
+    }
+
+    /**
+     * 已知设备打卡记录
+     * @param string $ip 内网地址
+     * @param string $mac 设备地址
+     * @param string $desc 设备描述
+     * @param array $macs 用户MAC列表
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     */
+    private function writeUser($ip, $mac, $desc, $macs)
+    {
+        if (isset($macs[$mac])) {
+            $data = $macs[$mac];
+            $data['ip'] = $ip;
+            $data['mac'] = $mac;
+            $data['desc'] = $desc;
+            $data['date'] = date('Y-m-d');
+            $data['end_at'] = date('Y-m-d H:i:s');
+            data_save('CompanyUserClock', $data, 'uid', ['date' => $data['date']]);
+        }
+    }
+
+    /**
+     * 未知设备额外标识
+     * @param string $ip 内网地址
+     * @param string $mac 设备地址
+     * @param string $desc 设备描述
+     */
+    private function writeNone($ip, $mac, $desc)
+    {
+        // @todo 记录未匹配成功的设备标识
+    }
+}

application/company/service/DataService.php

@@ -0,0 +1,40 @@
+<?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\company\service;
+
+/**
+ * 企业数据处理服务
+ * Class DataService
+ * @package app\company\service
+ */
+class DataService
+{
+    /**
+     * 格式化MAC地址信息
+     * @param string $mac
+     * @return string
+     */
+    public static function applyMacValue(&$mac)
+    {
+        $mac = strtoupper(str_replace('-', ':', $mac));
+        if (preg_match('/([A-F0-9]{2}:){5}[A-F0-9]{2}/', $mac)) {
+            return $mac;
+        } else {
+            return false;
+        }
+    }
+
+}

application/company/sys.php

@@ -0,0 +1,21 @@
+<?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
+// +----------------------------------------------------------------------
+
+// 注册系统指令
+// use think\Console;
+
+// Console::addDefaultCommands([
+//    'app\company\command\Subversion',
+// ]);

application/company/view/auth/form.html

@@ -0,0 +1,35 @@
+<form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
+    <div class="layui-card-body">
+        <div class="layui-form-item">
+            <label class="layui-form-label label-required">权限名称</label>
+            <div class="layui-input-block">
+                <input name="title" value='{$vo.title|default=""}' required placeholder="请输入权限名称" class="layui-input">
+                <p class="help-block">权限名称将出现在员工SVN授权处，请根据需求准确填写权限名称。</p>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label label-required">权限路径</label>
+            <div class="layui-input-block">
+                <textarea class="layui-textarea" name="path" placeholder="请输入权限路径">{$vo.path|default=''}</textarea>
+                <p class="help-block">权限路径将配置到SVN权限分组上，务必要保证路径与SVN文件路径一致。</p>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">权限描述</label>
+            <div class="layui-input-block">
+                <textarea class="layui-textarea" name="desc" placeholder="请输入权限描述">{$vo.desc|default=''}</textarea>
+            </div>
+        </div>
+    </div>
+
+    <div class="hr-line-dashed"></div>
+    {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
+
+    <div class="layui-form-item text-center">
+        <button class="layui-btn" type='submit'>保存数据</button>
+        <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>
+    </div>
+
+    <script>window.form.render();</script>
+
+</form>

application/company/view/auth/index.html

@@ -0,0 +1,78 @@
+{extend name='admin@main'}
+
+{block name="button"}
+
+{if auth("add")}
+<button data-modal='{:url("add")}' data-title="添加仓库权限" class='layui-btn layui-btn-sm layui-btn-primary'>添加仓库权限</button>
+{/if}
+
+{if auth("remove")}
+<button data-action='{:url("remove")}' data-rule="id#{key}" data-csrf="{:systoken('remove')}" data-confirm="确定要删除这些权限吗？" class='layui-btn layui-btn-sm layui-btn-primary'>添加仓库权限</button>
+{/if}
+
+{/block}
+
+{block name="content"}
+<div class="think-box-shadow">
+    {include file='auth/index_search'}
+    <table class="layui-table" lay-skin="line">
+        {notempty name='list'}
+        <thead>
+        <tr>
+            <th class='list-table-check-td think-checkbox'>
+                <label><input data-auto-none data-check-target='.list-check-box' type='checkbox'></label>
+            </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-left nowrap'>权限路径</th>
+            <th class='text-center nowrap'>使用状态</th>
+            <th class='text-left nowrap'>登录时间</th>
+            <th class='text-left nowrap'></th>
+        </tr>
+        </thead>
+        {/notempty}
+        <tbody>
+        {foreach $list as $key=>$vo}
+        <tr data-dbclick>
+            <td class='list-table-check-td think-checkbox'>
+                <label><input class="list-check-box" value='{$vo.id}' type='checkbox'></label>
+            </td>
+            <td class='list-table-sort-td'>
+                <label><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"></label>
+            </td>
+            <td class='text-left nowrap'>{$vo.title|default=''}</td>
+            <td class='text-left nowrap'>{$vo.path|nl2br|raw}</td>
+            <td class='text-center nowrap'>
+                {eq name='vo.status' value='0'}<span class="color-red">已禁用</span>{/eq}
+                {eq name='vo.status' value='1'}<span class="color-green">使用中</span>{/eq}
+            </td>
+            <td class='text-left nowrap'>{$vo.create_at|format_datetime}</td>
+            <td class='text-left nowrap'>
+
+                {if auth("edit")}
+                <a data-dbclick class="layui-btn layui-btn-sm" data-title="编辑仓库权限" data-modal='{:url("edit")}?id={$vo.id}'>编 辑</a>
+                {/if}
+
+                {if auth("state") and $vo.status neq 0}
+                <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('state')}" data-value="id#{$vo.id};status#0" data-csrf="{:systoken('state')}">禁 用</a>
+                {elseif auth("state") and $vo.status neq 1 }
+                <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('state')}" data-value="id#{$vo.id};status#1" data-csrf="{:systoken('state')}">启 用</a>
+                {/if}
+
+                {if auth("remove")}
+                <a class="layui-btn layui-btn-sm layui-btn-danger" data-confirm="确定要删除该权限吗？" data-action="{:url('remove')}" data-value="id#{$vo.id}" data-csrf="{:systoken('remove')}">删 除</a>
+                {/if}
+
+            </td>
+        </tr>
+        {/foreach}
+        </tbody>
+    </table>
+
+    {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
+
+</div>
+
+{/block}

application/company/view/auth/index_search.html

@@ -0,0 +1,50 @@
+<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">
+                <input name="path" value="{$Think.get.path|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 [''=>'-- 全部状态 --','0'=>'已禁用的权限','1'=>'使用中的权限'] 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">
+                <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">
+            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
+        </div>
+    </form>
+
+</fieldset>
+
+<script>form.render()</script>

application/company/view/clock/index.html

@@ -0,0 +1,41 @@
+{extend name='admin@main'}
+
+{block name="content"}
+<div class="think-box-shadow">
+    {include file='clock/index_search'}
+    <table class="layui-table" lay-skin="line">
+        {notempty name='list'}
+        <thead>
+        <tr>
+            <th class='list-table-check-td think-checkbox'>
+                <label><input data-auto-none data-check-target='.list-check-box' type='checkbox'></label>
+            </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 data-dbclick>
+            <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'>{$vo.name|default=''}</td>
+            <td class='text-left nowrap'>{$vo.date|default='-'}</td>
+            <td class='text-left nowrap'>{$vo.ip|default='-'}</td>
+            <td class='text-left nowrap'>{$vo.start_at|format_datetime}</td>
+            <td class='text-left nowrap'>{$vo.end_at|format_datetime}</td>
+        </tr>
+        {/foreach}
+        </tbody>
+    </table>
+
+    {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
+
+</div>
+
+{/block}

application/company/view/clock/index_search.html

@@ -0,0 +1,28 @@
+<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="name" value="{$Think.get.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 data-date-input="date" name="date" value="{$Think.get.date|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>
+
+</fieldset>
+
+<script>form.render()</script>

application/company/view/user/form.html

@@ -0,0 +1,89 @@
+<form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
+    <div class="layui-card-body">
+        <div class="layui-form-item">
+            <label class="layui-form-label label-required">员工姓名</label>
+            <div class="layui-input-block">
+                <input name="nickname" value='{$vo.nickname|default=""}' required placeholder="请输入公司员工姓名" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label label-required">员工身份</label>
+            <div class="layui-input-block">
+                <input name="user_type" value='{$vo.user_type|default=""}' required placeholder="请输入公司员工身份" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label label-required">仓库账号</label>
+            <div class="layui-input-block">
+                <input name="svn_username" value='{$vo.svn_username|default=""}' required placeholder="请输入SVN授权账号" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label label-required">仓库密码</label>
+            <div class="layui-input-block">
+                <input name="svn_password" value='{$vo.svn_password|default=""}' required placeholder="请输入SVN授权密码" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label label-required">仓库权限</label>
+            <div class="layui-input-block">
+                <div class="layui-textarea padding-bottom-10" style="min-height:auto">
+                    {foreach $auths as $auth}
+                    <label class="think-checkbox layui-unselect">
+                        {if isset($vo.svn_authorize) and in_array($auth.id, $vo.svn_authorize)}
+                        <input type="checkbox" name="svn_authorize[]" value="{$auth.id}" checked lay-ignore> {$auth.title}
+                        {else}
+                        <input type="checkbox" name="svn_authorize[]" value="{$auth.id}" lay-ignore> {$auth.title}
+                        {/if}
+                    </label>
+                    {/foreach}
+                </div>
+            </div>
+        </div>
+        <div class="layui-form-item nowrap">
+            <label class="layui-form-label">入职日期</label>
+            <div class="layui-input-inline margin-right-0" style="width:164px">
+                <input type="text" data-date-input="date" name="entry_date" value='{$vo.entry_date|default=""}' placeholder="请输入入职日期" class="layui-input">
+            </div>
+            <label class="layui-form-label" style="width:auto">转正日期</label>
+            <div class="layui-input-inline margin-right-0" style="width:164px">
+                <input type="text" data-date-input="date" name="become_date" value='{$vo.become_date|default=""}' placeholder="请输入转正日期" class="layui-input">
+            </div>
+            <label class="layui-form-label" style="width:auto">离职日期</label>
+            <div class="layui-input-inline margin-right-0" style="width:164px">
+                <input type="text" data-date-input="date" name="leave_date" value='{$vo.leave_date|default=""}' placeholder="请输入离职日期" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">联系ＱＱ</label>
+            <div class="layui-input-inline margin-right-0" style="width:164px">
+                <input type="tel" autocomplete="off" name="contact_qq" value='{$vo.contact_qq|default=""}' pattern="^\d{6,}$" placeholder="请输入联系ＱＱ号码" class="layui-input">
+            </div>
+            <label class="layui-form-label" style="width:auto">联系手机</label>
+            <div class="layui-input-inline margin-right-0" style="width:164px">
+                <input type="tel" maxlength="11" autocomplete="off" name="contact_phone" value='{$vo.contact_phone|default=""}' pattern="^1[3-9][0-9]{9}$" placeholder="请输入联系手机" class="layui-input">
+            </div>
+            <label class="layui-form-label" style="width:auto">联系邮箱</label>
+            <div class="layui-input-inline margin-right-0" style="width:164px">
+                <input name="contact_mail" autocomplete="off" pattern="^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$" value='{$vo.contact_mail|default=""}' placeholder="请输入联系邮箱" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">打卡绑定</label>
+            <div class="layui-input-block">
+                <textarea placeholder="请输入绑定手机" class="layui-textarea" name="mobile_macs">{$vo.mobile_macs|default=""}</textarea>
+            </div>
+        </div>
+    </div>
+
+    <div class="hr-line-dashed"></div>
+    {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
+
+    <div class="layui-form-item text-center">
+        <button class="layui-btn" type='submit'>保存数据</button>
+        <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>
+    </div>
+
+    <script>window.form.render();</script>
+
+</form>

application/company/view/user/index.html

@@ -0,0 +1,83 @@
+{extend name='admin@main'}
+
+{block name="button"}
+
+{if auth("add")}
+<button data-modal='{:url("add")}' data-title="添加企业员工" class='layui-btn layui-btn-sm layui-btn-primary'>添加企业员工</button>
+{/if}
+
+{if auth("remove")}
+<button data-action='{:url("remove")}' data-rule="id#{key}" data-csrf="{:systoken('remove')}" data-confirm="确定要删除这些员工吗？" class='layui-btn layui-btn-sm layui-btn-primary'>删除企业员工</button>
+{/if}
+
+{/block}
+
+{block name="content"}
+<div class="think-box-shadow">
+    {include file='user/index_search'}
+    <table class="layui-table" lay-skin="line">
+        {notempty name='list'}
+        <thead>
+        <tr>
+            <th class='list-table-check-td think-checkbox'>
+                <label><input data-auto-none data-check-target='.list-check-box' type='checkbox'></label>
+            </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-left nowrap'>员工身份</th>
+            <th class='text-left nowrap'>库存账号</th>
+            <th class='text-center nowrap'>使用状态</th>
+            <th class='text-left nowrap'>添加时间</th>
+            <th class='text-left nowrap'></th>
+        </tr>
+        </thead>
+        {/notempty}
+        <tbody>
+        {foreach $list as $key=>$vo}
+        <tr data-dbclick>
+            <td class='list-table-check-td think-checkbox'>
+                <label><input class="list-check-box" value='{$vo.id}' type='checkbox'></label>
+            </td>
+            <td class='list-table-sort-td'>
+                <label><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"></label>
+            </td>
+            <td class='text-left nowrap'>{$vo.nickname|default=''}</td>
+            <td class='text-left nowrap'>{$vo.user_type|default='-'}</td>
+            <td class='text-left nowrap'>{$vo.svn_username|default='-'}</td>
+            <td class='text-center nowrap'>
+                {eq name='vo.status' value='0'}<span class="color-red">已禁用</span>{/eq}
+                {eq name='vo.status' value='1'}<span class="color-green">在职中</span>{/eq}
+                {eq name='vo.status' value='2'}<span class="color-desc">已离职</span>{/eq}
+            </td>
+            <td class='text-left nowrap'>
+                {$vo.create_at|format_datetime}
+            </td>
+            <td class='text-left nowrap'>
+
+                {if auth("edit")}
+                <a data-dbclick class="layui-btn layui-btn-sm" data-title="编辑员工信息" data-modal='{:url("edit")}?id={$vo.id}'>编 辑</a>
+                {/if}
+
+                {if auth("state") and $vo.status neq 0}
+                <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('state')}" data-value="id#{$vo.id};status#0" data-csrf="{:systoken('state')}">禁 用</a>
+                {elseif auth("state") and $vo.status neq 1 }
+                <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('state')}" data-value="id#{$vo.id};status#1" data-csrf="{:systoken('state')}">启 用</a>
+                {/if}
+
+                {if auth("remove")}
+                <a class="layui-btn layui-btn-sm layui-btn-danger" data-confirm="确定要删除该员工吗？" data-action="{:url('remove')}" data-value="id#{$vo.id}" data-csrf="{:systoken('remove')}">删 除</a>
+                {/if}
+
+            </td>
+        </tr>
+        {/foreach}
+        </tbody>
+    </table>
+
+    {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
+
+</div>
+
+{/block}

application/company/view/user/index_search.html

@@ -0,0 +1,50 @@
+<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="svn_username" value="{$Think.get.svn_username|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 [''=>'-- 全部状态 --','0'=>'禁用的员工','1'=>'正常的员工','2'=>'离职的员工'] 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">
+                <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">
+            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
+        </div>
+    </form>
+
+</fieldset>
+
+<script>form.render()</script>

application/index/controller/Index.php

@@ -31,4 +31,5 @@ class Index extends Controller
     {
         $this->redirect('@admin/login');
     }
+
 }

application/service/controller/Config.php

@@ -0,0 +1,63 @@
+<?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\service\controller;
+
+use library\Controller;
+
+/**
+ * 开放平台参数配置
+ * Class Config
+ * @package app\service\controller
+ */
+class Config extends Controller
+{
+
+    /**
+     * 定义当前操作表名
+     * @var string
+     */
+    public $table = 'WechatServiceConfig';
+
+    /**
+     * 显示参数配置
+     * @auth true
+     * @menu true
+     */
+    public function index()
+    {
+        $this->title = '开放平台参数配置';
+        $this->fetch();
+    }
+
+    /**
+     * 修改参数配置
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     */
+    public function edit()
+    {
+        $this->applyCsrfToken();
+        if ($this->request->isGet()) {
+            $this->fetch('form');
+        } else {
+            $post = $this->request->post();
+            foreach ($post as $k => $v) sysconf($k, $v);
+            $this->success('参数修改成功！');
+        }
+    }
+
+}

application/service/controller/Fans.php

@@ -0,0 +1,158 @@
+<?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\service\controller;
+
+use app\service\queue\WechatQueue;
+use app\service\service\WechatService;
+use library\Controller;
+use think\Db;
+use think\exception\HttpResponseException;
+
+/**
+ * 微信粉丝管理
+ * Class Fans
+ * @package app\wechat\controller
+ */
+class Fans extends Controller
+{
+
+    protected $appid = '';
+
+    /**
+     * 绑定数据表
+     * @var string
+     */
+    protected $table = 'WechatFans';
+
+    /**
+     * 初始化函数
+     * @return Controller|void
+     */
+    protected function initialize()
+    {
+        $this->appid = input('appid', session('current_appid'));
+        if (empty($this->appid)) {
+            $this->where = ['status' => '1', 'service_type' => '2', 'is_deleted' => '0', 'verify_type' => '0'];
+            $this->appid = Db::name('WechatServiceConfig')->where($this->where)->value('authorizer_appid');
+        }
+        if (empty($this->appid)) {
+            $this->fetch('/not-auth');
+        } else {
+            session('current_appid', $this->appid);
+        }
+        if ($this->request->isGet()) {
+            $this->where = ['status' => '1', 'service_type' => '2', 'is_deleted' => '0', 'verify_type' => '0'];
+            $this->wechats = Db::name('WechatServiceConfig')->where($this->where)->order('id desc')->column('authorizer_appid,nick_name');
+        }
+    }
+
+    /**
+     * 微信粉丝管理
+     * @auth true
+     * @menu true
+     */
+    public function index()
+    {
+        $this->title = '微信粉丝管理';
+        $query = $this->_query($this->table)->like('nickname')->equal('subscribe,is_black');
+        $query->dateBetween('subscribe_at')->where(['appid' => $this->appid])->order('subscribe_time desc')->page();
+    }
+
+    /**
+     * 列表数据处理
+     * @param array $data
+     */
+    protected function _index_page_filter(array &$data)
+    {
+        $tags = Db::name('WechatFansTags')->column('id,name');
+        foreach ($data as &$user) {
+            $user['tags'] = [];
+            foreach (explode(',', $user['tagid_list']) as $tagid) {
+                if (isset($tags[$tagid])) $user['tags'][] = $tags[$tagid];
+            }
+        }
+    }
+
+    /**
+     * 批量拉黑粉丝
+     * @auth true
+     */
+    public function setBlack()
+    {
+        try {
+            $this->applyCsrfToken();
+            foreach (array_chunk(explode(',', $this->request->post('openid')), 20) as $openids) {
+                WechatService::WeChatUser($this->appid)->batchBlackList($openids);
+                Db::name('WechatFans')->where(['appid' => $this->appid])->whereIn('openid', $openids)->update(['is_black' => '1']);
+            }
+            $this->success('拉黑粉丝信息成功！');
+        } catch (HttpResponseException $exception) {
+            throw  $exception;
+        } catch (\Exception $e) {
+            $this->error("拉黑粉丝信息失败，请稍候再试！{$e->getMessage()}");
+        }
+    }
+
+    /**
+     * 取消拉黑粉丝
+     * @auth true
+     */
+    public function delBlack()
+    {
+        try {
+            $this->applyCsrfToken();
+            foreach (array_chunk(explode(',', $this->request->post('openid')), 20) as $openids) {
+                WechatService::WeChatUser($this->appid)->batchUnblackList($openids);
+                Db::name('WechatFans')->where(['appid' => $this->appid])->whereIn('openid', $openids)->update(['is_black' => '0']);
+            }
+            $this->success('取消拉黑粉丝信息成功！');
+        } catch (HttpResponseException $exception) {
+            throw  $exception;
+        } catch (\Exception $e) {
+            $this->error("取消拉黑粉丝信息失败，请稍候再试！{$e->getMessage()}");
+        }
+    }
+
+    /**
+     * 同步粉丝列表
+     * @auth true
+     */
+    public function sync()
+    {
+        try {
+            sysoplog('微信管理', "创建微信[{$this->appid}]粉丝同步任务");
+            sysqueue("同步[{$this->appid}]粉丝列表", WechatQueue::URI, 0, ['appid' => $this->appid], 0);
+            $this->success('创建同步粉丝任务成功，需要时间来完成。<br>请到 系统管理 > 任务管理 查看执行进度！');
+        } catch (HttpResponseException $exception) {
+            throw $exception;
+        } catch (\Exception $e) {
+            $this->error("创建同步粉丝任务失败，请稍候再试！<br> {$e->getMessage()}");
+        }
+    }
+
+    /**
+     * 删除粉丝信息
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     */
+    public function remove()
+    {
+        $this->applyCsrfToken();
+        $this->_delete($this->table);
+    }
+
+}

application/service/controller/Index.php

@@ -0,0 +1,166 @@
+<?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\service\controller;
+
+use app\service\service\BuildService;
+use app\service\service\WechatService;
+use library\Controller;
+use think\Db;
+use think\exception\HttpResponseException;
+
+/**
+ * 公众授权管理
+ * @package app\service\controller
+ */
+class Index extends Controller
+{
+
+    /**
+     * 绑定数据表
+     * @var string
+     */
+    public $table = 'WechatServiceConfig';
+
+    /**
+     * 公众授权管理
+     * @auth true
+     * @menu true
+     * @return string
+     * @throws \think\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function index()
+    {
+        $this->applyCsrfToken();
+        $this->title = '公众授权管理';
+        $query = $this->_query($this->table)->like('authorizer_appid,nick_name,principal_name');
+        $query = $query->equal('service_type,status')->dateBetween('create_at');
+        $query->where(['is_deleted' => '0'])->order('id desc')->page();
+    }
+
+    /**
+     * 清理调用次数
+     * @auth true
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function clearQuota()
+    {
+        $appid = input('appid');
+        $result = WechatService::WeChatLimit($appid)->clearQuota();
+        if (empty($result['errcode']) && $result['errmsg'] === 'ok') {
+            $this->success('接口调用次数清零成功！');
+        } elseif (isset($result['errmsg'])) {
+            $this->error('接口调用次数清零失败，请稍候再试！' . $result['errmsg']);
+        } else {
+            $this->error('接口调用次数清零失败，请稍候再试！');
+        }
+    }
+
+    /**
+     * 同步指定授权公众号
+     * @auth true
+     */
+    public function sync()
+    {
+        try {
+            $appid = $this->request->get('appid');
+            $where = ['authorizer_appid' => $appid, 'is_deleted' => '0', 'status' => '1'];
+            $author = Db::name('WechatServiceConfig')->where($where)->find();
+            if (empty($author)) $this->error('无效的授权信息，请同步其它公众号！');
+            $data = BuildService::filter(WechatService::service()->getAuthorizerInfo($appid));
+            $data['authorizer_appid'] = $appid;
+            $where = ['authorizer_appid' => $data['authorizer_appid']];
+            $appkey = Db::name('WechatServiceConfig')->where($where)->value('appkey');
+            if (empty($appkey)) $data['appkey'] = md5(uniqid('', true));
+            if (data_save('WechatServiceConfig', $data, 'authorizer_appid')) {
+                $this->success('更新公众号授权成功！', '');
+            }
+        } catch (HttpResponseException $exception) {
+            throw $exception;
+        } catch (\Exception $e) {
+            $this->error("获取授权信息失败，请稍候再试！<br>{$e->getMessage()}");
+        }
+    }
+
+    /**
+     * 同步所有授权公众号
+     * @auth true
+     */
+    public function syncall()
+    {
+        try {
+            $wechat = WechatService::service();
+            $result = $wechat->getAuthorizerList();
+            foreach ($result['list'] as $item) if (!empty($item['refresh_token']) && !empty($item['auth_time'])) {
+                $data = BuildService::filter($wechat->getAuthorizerInfo($item['authorizer_appid']));
+                $data['is_deleted'] = '0';
+                $data['authorizer_appid'] = $item['authorizer_appid'];
+                $data['authorizer_refresh_token'] = $item['refresh_token'];
+                $data['create_at'] = date('Y-m-d H:i:s', $item['auth_time']);
+                $where = ['authorizer_appid' => $data['authorizer_appid']];
+                $appkey = Db::name('WechatServiceConfig')->where($where)->value('appkey');
+                if (empty($appkey)) $data['appkey'] = md5(uniqid('', true));
+                if (!data_save('WechatServiceConfig', $data, 'authorizer_appid')) {
+                    $this->error('获取授权信息失败，请稍候再试！', '');
+                }
+            }
+            $this->success('同步所有授权信息成功！', '');
+        } catch (HttpResponseException $exception) {
+            throw $exception;
+        } catch (\Exception $e) {
+            $this->error("同步授权失败，请稍候再试！<br>{$e->getMessage()}");
+        }
+    }
+
+    /**
+     * 删除公众号授权
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     */
+    public function remove()
+    {
+        $this->applyCsrfToken();
+        $this->_delete($this->table);
+    }
+
+    /**
+     * 禁用公众号授权
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     */
+    public function forbid()
+    {
+        $this->applyCsrfToken();
+        $this->_save($this->table, ['status' => '0']);
+    }
+
+    /**
+     * 启用公众号授权
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     */
+    public function resume()
+    {
+        $this->applyCsrfToken();
+        $this->_save($this->table, ['status' => '1']);
+    }
+}

application/service/controller/api/Client.php

@@ -0,0 +1,174 @@
+<?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\service\controller\api;
+
+use app\service\service\WechatService;
+use library\tools\JsonRpcServer;
+use think\Controller;
+use think\Db;
+use think\exception\HttpResponseException;
+
+/**
+ * 获取微信SDK实例对象
+ * Class Instance
+ * @package app\wechat\controller
+ */
+class Client extends Controller
+{
+
+    /**
+     * 当前配置
+     * @var string
+     */
+    protected $config = [];
+
+    /**
+     * 当前APPID
+     * @var string
+     */
+    protected $appid = '';
+
+    /**
+     * 接口实例名称
+     * @var string
+     */
+    protected $name = '';
+
+    /**
+     * 接口类型
+     * @var string
+     */
+    protected $type = '';
+
+    /**
+     * 错误消息
+     * @var string
+     */
+    protected $message = '';
+
+    /**
+     * 启动Yar接口服务
+     * @param string $param AppName-AppId-AppKey
+     * @return string
+     */
+    public function yar($param)
+    {
+        try {
+            $instance = $this->create($param);
+            $service = new \Yar_Server(empty($instance) ? $this : $instance);
+            $service->handle();
+        } catch (\Exception $e) {
+            return $e->getMessage();
+        }
+    }
+
+    /**
+     * 启动SOAP接口服务
+     * @param string $param AppName-AppId-AppKey
+     * @return string
+     */
+    public function soap($param)
+    {
+        try {
+            $instance = $this->create($param);
+            $service = new \SoapServer(null, ['uri' => strtolower($this->name)]);
+            $service->setObject(empty($instance) ? $this : $instance);
+            $service->handle();
+        } catch (\Exception $e) {
+            return $e->getMessage();
+        }
+    }
+
+    /**
+     * JsonRpc 接口标准
+     * @param string $param
+     * @return string
+     */
+    public function jsonrpc($param)
+    {
+        try {
+            $instance = $this->create($param);
+            JsonRpcServer::instance()->handle(empty($instance) ? $this : $instance);
+        } catch (HttpResponseException $exception) {
+            throw $exception;
+        } catch (\Exception $e) {
+            return $e->getMessage();
+        }
+    }
+
+    /**
+     * 创建接口服务
+     * @param string $token
+     * @return \WeChat\Oauth|\WeChat\Pay|\WeChat\Receive|\WeChat\Script|\WeChat\User|\WeOpen\Service
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     * @throws \think\Exception
+     */
+    private function create($token)
+    {
+        if ($this->auth($token)) {
+            $weminiClassName = 'Account,Basic,Code,Domain,Tester,User,Crypt,Plugs,Poi,Qrcode,Template,Total,Delivery,Image,Logistics,Message,Ocr,Security,Soter';
+            $wechatClassName = 'Card,Custom,Limit,Media,Menu,Oauth,Pay,Product,Qrcode,Receive,Scan,Script,Shake,Tags,Template,User,Wifi';
+            if ($this->type === 'wechat' && stripos($wechatClassName, $this->name) !== false) {
+                $instance = WechatService::instance($this->name, $this->appid, 'WeChat');
+            } elseif ($this->type === 'wemini' && stripos($weminiClassName, $this->name) !== false) {
+                $instance = WechatService::instance($this->name, $this->appid, 'WeMini');
+            } elseif (stripos('Service,MiniApp', $this->name) !== false) {
+                $instance = WechatService::instance($this->name, $this->appid, 'WeOpen');
+            } elseif (stripos('Wechat,Config,Handler', $this->name) !== false) {
+                $className = "\\app\\service\\handler\\WechatHandler";
+                $instance = new $className($this->config);
+            }
+            if (!empty($instance)) return $instance;
+        }
+        throw new \think\Exception($this->message);
+    }
+
+    /**
+     * 加载微信实例对象
+     * @param string $token 数据格式 name|appid|appkey
+     * @return bool
+     * @throws \think\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    private function auth($token = '')
+    {
+        list($this->name, $this->appid, $appkey, $this->type) = explode('-', $token . '---');
+        if (empty($this->name) || empty($this->appid) || empty($appkey)) {
+            $this->message = '缺少必要的参数AppId或AppKey';
+            return false;
+        }
+        $where = ['authorizer_appid' => $this->appid, 'status' => '1', 'is_deleted' => '0'];
+        $this->config = Db::name('WechatServiceConfig')->where($where)->find();
+        if (empty($this->config)) {
+            $this->message = '无效的微信绑定对象';
+            return false;
+        }
+        if (strtolower($this->config['appkey']) !== strtolower($appkey)) {
+            $this->message = '授权AppId与AppKey不匹配';
+            return false;
+        }
+        $this->message = '';
+        $this->name = ucfirst(strtolower($this->name));
+        $this->type = strtolower(empty($this->type) ? 'WeChat' : $this->type);
+        Db::name('WechatServiceConfig')->where($where)->setInc('total', 1);
+        return true;
+    }
+
+}

application/service/controller/api/Push.php

@@ -0,0 +1,184 @@
+<?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\service\controller\api;
+
+use app\service\service\BuildService;
+use app\service\service\WechatService;
+use library\Controller;
+use think\Db;
+
+/**
+ * 微信推送事件处理
+ *
+ * @author Anyon <zoujingli@qq.com>
+ * @date 2016/10/18 12:38
+ */
+class Push extends Controller
+{
+
+    /**
+     * 微信API推送事件处理
+     * @param string $appid
+     * @return string
+     * @throws \WeChat\Exceptions\InvalidDecryptException
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     * @throws \think\Exception
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function notify($appid)
+    {
+        if (in_array($appid, ['wx570bc396a51b8ff8', 'wxd101a85aa106f53e'])) {
+            # 全网发布接口测试
+            return \app\service\handler\PublishHandler::handler($appid);
+        } else {
+            # 接口类正常服务
+            return \app\service\handler\ReceiveHandler::handler($appid);
+        }
+    }
+
+    /**
+     * 一、处理服务推送Ticket
+     * 二、处理取消公众号授权
+     * @return string
+     * @throws \think\Exception
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     * @throws \think\exception\PDOException
+     */
+    public function ticket()
+    {
+        try {
+            $server = WechatService::service();
+            if (!($data = $server->getComonentTicket())) {
+                return "Ticket event handling failed.";
+            }
+        } catch (\Exception $e) {
+            return "Ticket event handling failed, {$e->getMessage()}";
+        }
+        if (!empty($data['AuthorizerAppid']) && isset($data['InfoType'])) {
+            # 授权成功通知
+            if ($data['InfoType'] === 'authorized') {
+                Db::name('WechatServiceConfig')->where(['authorizer_appid' => $data['AuthorizerAppid']])->update(['is_deleted' => '0']);
+            }
+            # 接收取消授权服务事件
+            if ($data['InfoType'] === 'unauthorized') {
+                Db::name('WechatServiceConfig')->where(['authorizer_appid' => $data['AuthorizerAppid']])->update(['is_deleted' => '1']);
+            }
+            # 授权更新通知
+            if ($data['InfoType'] === 'updateauthorized') {
+                $_GET['auth_code'] = $data['PreAuthCode'];
+                $this->applyAuth($server);
+            }
+        }
+        return 'success';
+    }
+
+    /**
+     * 网页授权
+     * @throws \think\Exception
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public function oauth()
+    {
+        list($mode, $appid, $enurl, $sessid) = [
+            $this->request->get('mode'), $this->request->get('state'),
+            $this->request->get('enurl'), $this->request->get('sessid'),
+        ];
+        $service = WechatService::service();
+        $result = $service->getOauthAccessToken($appid);
+        if (empty($result['openid'])) throw new \think\Exception('网页授权失败, 无法进一步操作！');
+        cache("{$appid}_{$sessid}_openid", $result['openid'], 3600);
+        if (!empty($mode)) {
+            $wechat = new \WeChat\Oauth($service->getConfig($appid));
+            $fans = $wechat->getUserInfo($result['access_token'], $result['openid']);
+            if (empty($fans)) throw new \think\Exception('网页授权信息获取失败, 无法进一步操作！');
+            cache("{$appid}_{$sessid}_fans", $fans, 3600);
+        }
+        redirect(decode($enurl), [], 301)->send();
+    }
+
+    /**
+     * 跳转到微信服务授权页面
+     * @param string $redirect
+     * @return string
+     * @throws \think\Exception
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     * @throws \think\exception\PDOException
+     */
+    public function auth($redirect = '')
+    {
+        $fromRedirect = decode($redirect);
+        if (empty($redirect) || empty($fromRedirect)) {
+            return '请传入回跳Redirect参数 ( 请使用ENCODE加密 )';
+        }
+        # 预授权码不为空，则表示可以进行授权处理
+        $service = WechatService::service();
+        if (($auth_code = $this->request->get('auth_code'))) {
+            return $this->applyAuth($service, $fromRedirect);
+        }
+        # 生成微信授权链接，使用刷新跳转到授权网页
+        $url = url("@service/api.push/auth/{$redirect}", false, true, true);
+        if (($redirect = $service->getAuthRedirect($url))) {
+            ob_clean();
+            header("Refresh:0;url={$redirect}");
+            return "<script>window.location.href='{$redirect}';</script><a href='{$redirect}'>跳转中...</a>";
+        }
+        # 生成微信授权链接失败
+        return "<h2>Failed to create authorization. Please return to try again.</h2>";
+    }
+
+    /**
+     * 公众号授权绑定数据处理
+     * @param \WeOpen\Service $service
+     * @param string|null $redirect 授权成功回跳地址
+     * @return string
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     */
+    private function applyAuth($service, $redirect = null)
+    {
+        // 通过授权code换取公众号信息
+        $result = $service->getQueryAuthorizerInfo();
+        if (empty($result['authorizer_appid'])) {
+            return "接收微信第三方平台授权失败! ";
+        }
+        // 重新通过接口查询公众号参数
+        if (!($update = array_merge($result, $service->getAuthorizerInfo($result['authorizer_appid'])))) {
+            return '获取授权数据失败, 请稍候再试!';
+        }
+        // 生成公众号授权参数
+        $update = array_merge(BuildService::filter($update), [
+            'status' => '1', 'is_deleted' => '0', 'expires_in' => time() + 7000, 'create_at' => date('y-m-d H:i:s'),
+        ]);
+        // 微信接口APPKEY处理与更新
+        $config = Db::name('WechatServiceConfig')->where(['authorizer_appid' => $result['authorizer_appid']])->find();
+        $update['appkey'] = empty($config['appkey']) ? md5(uniqid('', true)) : $config['appkey'];
+        data_save('WechatServiceConfig', $update, 'authorizer_appid');
+        if (!empty($redirect)) { // 带上appid与appkey跳转到应用
+            $split = stripos($redirect, '?') > 0 ? '&' : '?';
+            $realurl = preg_replace(['/appid=\w+/i', '/appkey=\w+/i', '/(\?\&)$/i'], ['', '', ''], $redirect);
+            return redirect("{$realurl}{$split}appid={$update['authorizer_appid']}&appkey={$update['appkey']}");
+        }
+    }
+
+}

application/service/handler/PublishHandler.php

@@ -0,0 +1,69 @@
+<?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\service\handler;
+
+use app\service\service\WechatService;
+
+/**
+ * 第三方平台测试上线
+ *
+ * @author Anyon <zoujingli@qq.com>
+ * @date 2016/10/27 14:14
+ */
+class PublishHandler
+{
+
+    /**
+     * 当前微信APPID
+     * @var string
+     */
+    protected static $appid;
+
+    /**
+     * 事件初始化
+     * @param string $appid
+     * @return string
+     * @throws \WeChat\Exceptions\InvalidDecryptException
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     */
+    public static function handler($appid)
+    {
+        try {
+            $wechat = WechatService::WeChatReceive($appid);
+        } catch (\Exception $e) {
+            return "Wechat message handling failed, {$e->getMessage()}";
+        }
+        /* 分别执行对应类型的操作 */
+        switch (strtolower($wechat->getMsgType())) {
+            case 'text':
+                $receive = $wechat->getReceive();
+                if ($receive['Content'] === 'TESTCOMPONENT_MSG_TYPE_TEXT') {
+                    return $wechat->text('TESTCOMPONENT_MSG_TYPE_TEXT_callback')->reply([], true);
+                } else {
+                    $key = str_replace("QUERY_AUTH_CODE:", '', $receive['Content']);
+                    WechatService::service()->getQueryAuthorizerInfo($key);
+                    return $wechat->text("{$key}_from_api")->reply([], true);
+                }
+            case 'event':
+                $receive = $wechat->getReceive();
+                return $wechat->text("{$receive['Event']}from_callback")->reply([], true);
+            default:
+                return 'success';
+        }
+    }
+
+}

application/service/handler/ReceiveHandler.php

@@ -0,0 +1,69 @@
+<?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\service\handler;
+
+use app\service\service\WechatService;
+use think\Db;
+
+/**
+ * 微信推送消息处理
+ *
+ * @author Anyon <zoujingli@qq.com>
+ * @date 2016/10/27 14:14
+ */
+class ReceiveHandler
+{
+
+    /**
+     * 事件初始化
+     * @param string $appid
+     * @return string
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     * @throws \think\Exception
+     */
+    public static function handler($appid)
+    {
+        try {
+            $wechat = WechatService::WeChatReceive($appid);
+        } catch (\Exception $e) {
+            return "Wechat message handling failed, {$e->getMessage()}";
+        }
+        // 验证微信配置信息
+        $config = Db::name('WechatServiceConfig')->where(['authorizer_appid' => $appid])->find();
+        if (empty($config) || empty($config['appuri'])) {
+            \think\facade\Log::error(($message = "微信{$appid}授权配置验证无效"));
+            return $message;
+        }
+        try {
+            list($data, $openid) = [$wechat->getReceive(), $wechat->getOpenid()];
+            if (isset($data['EventKey']) && is_object($data['EventKey'])) $data['EventKey'] = (array)$data['EventKey'];
+            $input = ['openid' => $openid, 'appid' => $appid, 'receive' => serialize($data), 'encrypt' => intval($wechat->isEncrypt())];
+            if (is_string($result = http_post($config['appuri'], $input, ['timeout' => 30]))) {
+                if (is_array($json = json_decode($result, true))) {
+                    return $wechat->reply($json, true, $wechat->isEncrypt());
+                } else {
+                    return $result;
+                }
+            }
+        } catch (\Exception $e) {
+            \think\facade\Log::error("微信{$appid}接口调用异常，{$e->getMessage()}");
+        }
+        return 'success';
+    }
+
+}

application/service/handler/WechatHandler.php

@@ -0,0 +1,161 @@
+<?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\service\handler;
+
+use app\service\service\WechatService as WechatLogic;
+use think\Db;
+
+/**
+ * 微信网页授权接口
+ * Class WechatHandler
+ * @package app\wechat\handler
+ * @author Anyon <zoujingli@qq.com>
+ */
+class WechatHandler
+{
+    /**
+     * 当前微信APPID
+     * @var string
+     */
+    protected $appid;
+
+    /**
+     * 当前微信配置
+     * @var array
+     */
+    protected $config;
+
+    /**
+     * 错误消息
+     * @var string
+     */
+    protected $message;
+
+    /**
+     * Wechat constructor.
+     * @param array $config
+     */
+    public function __construct($config = [])
+    {
+        $this->config = $config;
+        $this->appid = isset($config['authorizer_appid']) ? $config['authorizer_appid'] : '';
+    }
+
+    /**
+     * 检查微信配置服务初始化状态
+     * @return boolean
+     * @throws \think\Exception
+     */
+    private function checkInit()
+    {
+        if (!empty($this->config)) return true;
+        throw new \think\Exception('Wechat Please bind Wechat first');
+    }
+
+    /**
+     * 获取当前公众号配置
+     * @return array|boolean
+     * @throws \think\Exception
+     */
+    public function getConfig()
+    {
+        $this->checkInit();
+        $info = Db::name('WechatServiceConfig')->where(['authorizer_appid' => $this->appid])->find();
+        if (empty($info)) return false;
+        if (isset($info['id'])) unset($info['id']);
+        return $info;
+    }
+
+    /**
+     * 设置微信接口通知URL地址
+     * @param string $notifyUri 接口通知URL地址
+     * @return boolean
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     */
+    public function setApiNotifyUri($notifyUri)
+    {
+        $this->checkInit();
+        if (empty($notifyUri)) throw new \think\Exception('请传入微信通知URL');
+        list($where, $data) = [['authorizer_appid' => $this->appid], ['appuri' => $notifyUri]];
+        return Db::name('WechatServiceConfig')->where($where)->update($data) !== false;
+    }
+
+    /**
+     * 更新接口Appkey(成功返回新的Appkey)
+     * @return bool|string
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     */
+    public function updateApiAppkey()
+    {
+        $this->checkInit();
+        $data = ['appkey' => md5(uniqid())];
+        Db::name('WechatServiceConfig')->where(['authorizer_appid' => $this->appid])->update($data);
+        return $data['appkey'];
+    }
+
+    /**
+     * 获取公众号的配置参数
+     * @param string $name 参数名称
+     * @return array|string
+     * @throws \think\Exception
+     */
+    public function config($name = null)
+    {
+        $this->checkInit();
+        return WechatLogic::WeChatScript($this->appid)->config->get($name);
+    }
+
+    /**
+     * 微信网页授权
+     * @param string $sessid 当前会话id(可用session_id()获取)
+     * @param string $selfUrl 当前会话URL地址(需包含域名的完整URL地址)
+     * @param int $fullMode 网页授权模式(0静默模式,1高级授权)
+     * @return array|bool
+     * @throws \think\Exception
+     */
+    public function oauth($sessid, $selfUrl, $fullMode = 0)
+    {
+        $this->checkInit();
+        $fans = cache("{$this->appid}_{$sessid}_fans");
+        $openid = cache("{$this->appid}_{$sessid}_openid");
+        if (!empty($openid) && (empty($fullMode) || !empty($fans))) {
+            return ['openid' => $openid, 'fans' => $fans, 'url' => ''];
+        }
+        $service = WechatLogic::service();
+        $mode = empty($fullMode) ? 'snsapi_base' : 'snsapi_userinfo';
+        $url = url('@service/api.push/oauth', '', true, true);
+        $params = ['mode' => $fullMode, 'sessid' => $sessid, 'enurl' => encode($selfUrl)];
+        $authurl = $service->getOauthRedirect($this->appid, $url . '?' . http_build_query($params), $mode);
+        return ['openid' => $openid, 'fans' => $fans, 'url' => $authurl];
+    }
+
+    /**
+     * 微信网页JS签名
+     * @param string $url 当前会话URL地址(需包含域名的完整URL地址)
+     * @return array|boolean
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     * @throws \think\Exception
+     */
+    public function jsSign($url)
+    {
+        $this->checkInit();
+        return WechatLogic::WeChatScript($this->appid)->getJsSign($url);
+    }
+
+}

application/service/queue/WechatQueue.php

@@ -0,0 +1,88 @@
+<?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\service\queue;
+
+use app\service\service\WechatService;
+use app\wechat\service\FansService;
+use think\console\Input;
+use think\console\Output;
+use think\Db;
+
+/**
+ * Class Jobs
+ * @package app\wechat
+ */
+class WechatQueue
+{
+    /**
+     * 当前类名
+     * @var string
+     */
+    const URI = self::class;
+
+    /**
+     * 当前操作APPID
+     * @var string
+     */
+    protected $appid;
+
+    /**
+     * 执行任务
+     * @param Input $input
+     * @param Output $output
+     * @param array $data
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     */
+    public function execute(Input $input, Output $output, array $data = [])
+    {
+        $this->appid = $data['appid'];
+        $wechat = WechatService::WeChatUser($this->appid);
+        // 获取远程粉丝
+        list($next, $done) = ['', 0];
+        $output->writeln('Start synchronizing fans from the Wechat server');
+        while (!is_null($next) && is_array($result = $wechat->getUserList($next)) && !empty($result['data']['openid'])) {
+            $done += $result['count'];
+            foreach (array_chunk($result['data']['openid'], 100) as $chunk) {
+                if (is_array($list = $wechat->getBatchUserInfo($chunk)) && !empty($list['user_info_list'])) {
+                    foreach ($list['user_info_list'] as $user) FansService::set($user, $this->appid);
+                }
+            }
+            $next = $result['total'] > $done ? $result['next_openid'] : null;
+        }
+        // 同步粉丝黑名单
+        list($next, $done) = ['', 0];
+        $output->writeln('Start synchronizing black from the Wechat server');
+        while (!is_null($next) && is_array($result = $wechat->getBlackList($next)) && !empty($result['data']['openid'])) {
+            $done += $result['count'];
+            foreach (array_chunk($result['data']['openid'], 100) as $chunk) {
+                $where = [['is_black', 'eq', '0'], ['openid', 'in', $chunk]];
+                Db::name('WechatFans')->where($where)->update(['is_black' => '1']);
+            }
+            $next = $result['total'] > $done ? $result['next_openid'] : null;
+        }
+        // 同步粉丝标签列表
+        $output->writeln('Start synchronizing tags from the Wechat server');
+        if (is_array($list = WechatService::WeChatTags($this->appid)->getTags()) && !empty($list['tags'])) {
+            foreach ($list['tags'] as &$tag) $tag['appid'] = $this->appid;
+            Db::name('WechatFansTags')->where('1=1')->delete();
+            Db::name('WechatFansTags')->insertAll($list['tags']);
+        }
+    }
+
+}

application/service/service/BuildService.php

@@ -0,0 +1,53 @@
+<?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\service\service;
+
+/**
+ * 授权数据处理
+ * Class Build
+ * @package app\service\service
+ */
+class BuildService
+{
+
+    /**
+     * 授权数据过滤转换处理
+     * @param array $info
+     * @return mixed
+     */
+    public static function filter(array $info)
+    {
+        if (isset($info['func_info'])) $info['func_info'] = join(',', array_map(function ($tmp) {
+            return $tmp['funcscope_category']['id'];
+        }, $info['func_info']));
+        $info['verify_type_info'] = join(',', $info['verify_type_info']);
+        $info['service_type_info'] = join(',', $info['service_type_info']);
+        $info['business_info'] = json_encode($info['business_info'], JSON_UNESCAPED_UNICODE);
+        // 微信类型:  0 代表订阅号, 2 代表服务号, 3 代表小程序
+        $info['service_type'] = intval($info['service_type_info']) === 2 ? 2 : 0;
+        if (!empty($info['MiniProgramInfo'])) {
+            // 微信类型:  0 代表订阅号, 2 代表服务号, 3 代表小程序
+            $info['service_type'] = 3;
+            // 小程序信息
+            $info['miniprograminfo'] = json_encode($info['MiniProgramInfo'], JSON_UNESCAPED_UNICODE);
+        }
+        unset($info['MiniProgramInfo']);
+        // 微信认证: -1 代表未认证, 0 代表微信认证
+        $info['verify_type'] = intval($info['verify_type_info']) !== 0 ? -1 : 0;
+        return $info;
+    }
+
+}

application/service/service/MichatService.php

@@ -0,0 +1,83 @@
+<?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\service\service;
+
+use library\tools\Http;
+use think\Exception;
+
+/**
+ * 小米消息服务
+ * Class MichatService
+ * @package app\service\service
+ */
+class MichatService
+{
+    const URI = 'https://mimc.chat.xiaomi.net';
+
+    const BIZ_TYPE_PING = 'PING';
+    const BIZ_TYPE_POND = 'PONG';
+    const BIZ_TYPE_TEXT = 'TEXT';
+    const BIZ_TYPE_PIC_FILE = 'PIC_FILE';
+    const BIZ_TYPE_BIN_FILE = 'BIN_FILE';
+    const BIZ_TYPE_AUDIO_FILE = 'AUDIO_FILE';
+    const MSG_TYPE_BASE64 = 'base64';
+
+    /**
+     * 给指定账号推送消息内容
+     * @param string $from 消息来源
+     * @param string $to 消息目标
+     * @param string $message 消息内容
+     * @return bool|string
+     * @throws Exception
+     * @throws \think\exception\PDOException
+     */
+    public static function push($from, $to, $message)
+    {
+        return self::post('/api/push/p2p/', [
+            'appId'        => sysconf('michat_appid'),
+            'appKey'       => sysconf('michat_appkey'),
+            'appSecret'    => sysconf('michat_appsecert'),
+            'fromAccount'  => $from,
+            'fromResource' => $from,
+            'toAccount'    => $to,
+            'msg'          => base64_encode($message),
+            'msgType'      => 'base64',
+            'bizType'      => '',
+            'isStore'      => false,
+        ]);
+    }
+
+    /**
+     * POST提交消息数据
+     * @param string $api 接口地址
+     * @param array $data 接口数据
+     * @return bool|string
+     * @throws Exception
+     */
+    private static function post($api, array $data)
+    {
+        $result = json_decode(Http::request('post', self::URI . $api, [
+            'data'    => json_encode($data, JSON_UNESCAPED_UNICODE),
+            'headers' => ['Content-Type: application/json'],
+        ]), true);
+        if (isset($result['code']) && intval($result['code']) === 200) {
+            return $result['data'];
+        } else {
+            throw new Exception($result['message'], $result['code']);
+        }
+    }
+
+}

application/service/service/WechatService.php

@@ -0,0 +1,158 @@
+<?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\service\service;
+
+use think\Db;
+
+/**
+ * 微信数据服务
+ * Class WechatService
+ * @package app\service\service
+ * @method \WeChat\Card WeChatCard($appid) static 微信卡券管理
+ * @method \WeChat\Custom WeChatCustom($appid) static 微信客服消息
+ * @method \WeChat\Limit WeChatLimit($appid) static 接口调用频次限制
+ * @method \WeChat\Media WeChatMedia($appid) static 微信素材管理
+ * @method \WeChat\Menu WeChatMenu($appid) static 微信菜单管理
+ * @method \WeChat\Oauth WeChatOauth($appid) static 微信网页授权
+ * @method \WeChat\Pay WeChatPay($appid) static 微信支付商户
+ * @method \WeChat\Product WeChatProduct($appid) static 微信商店管理
+ * @method \WeChat\Qrcode WeChatQrcode($appid) static 微信二维码管理
+ * @method \WeChat\Receive WeChatReceive($appid) static 微信推送管理
+ * @method \WeChat\Scan WeChatScan($appid) static 微信扫一扫接入管理
+ * @method \WeChat\Script WeChatScript($appid) static 微信前端支持
+ * @method \WeChat\Shake WeChatShake($appid) static 微信揺一揺周边
+ * @method \WeChat\Tags WeChatTags($appid) static 微信用户标签管理
+ * @method \WeChat\Template WeChatTemplate($appid) static 微信模板消息
+ * @method \WeChat\User WeChatUser($appid) static 微信粉丝管理
+ * @method \WeChat\Wifi WeChatWifi($appid) static 微信门店WIFI管理
+ *
+ * ----- WeMini -----
+ * @method \WeMini\Account WeMiniAccount($appid) static 小程序账号管理
+ * @method \WeMini\Basic WeMiniBasic($appid) static 小程序基础信息设置
+ * @method \WeMini\Code WeMiniCode($appid) static 小程序代码管理
+ * @method \WeMini\Domain WeMiniDomain($appid) static 小程序域名管理
+ * @method \WeMini\Tester WeMinitester($appid) static 小程序成员管理
+ * @method \WeMini\User WeMiniUser($appid) static 小程序帐号管理
+ * --------------------
+ * @method \WeMini\Crypt WeMiniCrypt($options = []) static 小程序数据加密处理
+ * @method \WeMini\Delivery WeMiniDelivery($options = []) static 小程序即时配送
+ * @method \WeMini\Image WeMiniImage($options = []) static 小程序图像处理
+ * @method \WeMini\Logistics WeMiniLogistics($options = []) static 小程序物流助手
+ * @method \WeMini\Message WeMiniMessage($options = []) static 小程序动态消息
+ * @method \WeMini\Ocr WeMiniOcr($options = []) static 小程序ORC服务
+ * @method \WeMini\Plugs WeMiniPlugs($options = []) static 小程序插件管理
+ * @method \WeMini\Poi WeMiniPoi($options = []) static 小程序地址管理
+ * @method \WeMini\Qrcode WeMiniQrcode($options = []) static 小程序二维码管理
+ * @method \WeMini\Security WeMiniSecurity($options = []) static 小程序内容安全
+ * @method \WeMini\Soter WeMiniSoter($options = []) static 小程序生物认证
+ * @method \WeMini\Template WeMiniTemplate($options = []) static 小程序模板消息支持
+ * @method \WeMini\Total WeMiniTotal($options = []) static 小程序数据接口
+ *
+ * ----- WePay -----
+ * @method \WePay\Bill WePayBill($appid) static 微信商户账单及评论
+ * @method \WePay\Order WePayOrder($appid) static 微信商户订单
+ * @method \WePay\Refund WePayRefund($appid) static 微信商户退款
+ * @method \WePay\Coupon WePayCoupon($appid) static 微信商户代金券
+ * @method \WePay\Redpack WePayRedpack($appid) static 微信红包支持
+ * @method \WePay\Transfers WePayTransfers($appid) static 微信商户打款到零钱
+ * @method \WePay\TransfersBank WePayTransfersBank($appid) static 微信商户打款到银行卡
+ *
+ * ----- WeOpen -----
+ * @method \WeOpen\Login login() static 第三方微信登录
+ * @method \WeOpen\Service service() static 第三方服务
+ *
+ * ----- ThinkService -----
+ * @method mixed wechat() static 第三方微信工具
+ * @method mixed config() static 第三方配置工具
+ */
+class WechatService
+{
+
+    /**
+     * 接口类型模式
+     * @var string
+     */
+    private static $type = 'WeChat';
+
+    /**
+     * 实例微信对象
+     * @param string $name
+     * @param string $appid 授权公众号APPID
+     * @param string $type 将要获取SDK类型
+     * @return mixed
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     */
+    public static function instance($name, $appid = '', $type = null)
+    {
+        $config = [
+            'cache_path'               => env('runtime_path') . 'wechat',
+            'component_appid'          => sysconf('component_appid'),
+            'component_token'          => sysconf('component_token'),
+            'component_appsecret'      => sysconf('component_appsecret'),
+            'component_encodingaeskey' => sysconf('component_encodingaeskey'),
+        ];
+        // 注册授权公众号 AccessToken 处理
+        $config['GetAccessTokenCallback'] = function ($authorizerAppid) use ($config) {
+            $where = ['authorizer_appid' => $authorizerAppid];
+            if (!($refreshToken = Db::name('WechatServiceConfig')->where($where)->value('authorizer_refresh_token'))) {
+                throw new \think\Exception('The WeChat information is not configured.', '404');
+            }
+            $open = new \WeOpen\MiniApp($config);
+            $result = $open->refreshAccessToken($authorizerAppid, $refreshToken);
+            if (empty($result['authorizer_access_token']) || empty($result['authorizer_refresh_token'])) {
+                throw new \think\Exception($result['errmsg'], '0');
+            }
+            Db::name('WechatServiceConfig')->where($where)->update([
+                'authorizer_access_token'  => $result['authorizer_access_token'],
+                'authorizer_refresh_token' => $result['authorizer_refresh_token'],
+            ]);
+            return $result['authorizer_access_token'];
+        };
+        $app = new \WeOpen\MiniApp($config);
+        if (in_array(strtolower($name), ['service', 'miniapp'])) {
+            return $app;
+        }
+        if (!in_array($type, ['WeChat', 'WeMini'])) {
+            $type = self::$type;
+        }
+        return $app->instance($name, $appid, $type);
+    }
+
+    /**
+     * 静态初始化对象
+     * @param string $name
+     * @param array $arguments
+     * @return mixed
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     */
+    public static function __callStatic($name, $arguments)
+    {
+        if (substr($name, 0, 6) === 'WeMini') {
+            self::$type = 'WeMini';
+            $name = substr($name, 6);
+        } elseif (substr($name, 0, 6) === 'WeChat') {
+            self::$type = 'WeChat';
+            $name = substr($name, 6);
+        } elseif (substr($name, 0, 5) === 'WePay') {
+            self::$type = 'WePay';
+            $name = substr($name, 5);
+        }
+        return self::instance($name, isset($arguments[0]) ? $arguments[0] : '', self::$type);
+    }
+
+}

application/service/view/config/form.html

@@ -0,0 +1,44 @@
+<form onsubmit="return false;" action="{:request()->url()}" data-auto="true" method="post" class='layui-form layui-card' autocomplete="off">
+
+    <div class="layui-card-body padding-left-40">
+
+        <div class="layui-form-item">
+            <label class="relative block">
+                <span class="color-green font-w7">开放平台服务 AppID</span>
+                <input name="component_appid" required pattern="^.{18}$" maxlength="18" placeholder="请输入18位开放平台服务AppID" value="{:sysconf('component_appid')}" class="layui-input">
+            </label>
+            <p class="help-block">开放平台服务 AppID，需要在微信开放平台获取</p>
+        </div>
+
+        <div class="layui-form-item">
+            <label class="relative block">
+                <span class="color-green font-w7">开放平台服务 AppSecret</span>
+                <input name="component_appsecret" required pattern="^.{32}$" maxlength="32" placeholder="请输入32位开放平台服务AppSecret" value="{:sysconf('component_appsecret')}" class="layui-input">
+            </label>
+            <p class="help-block">开放平台服务 AppSecret，需要在微信开放平台获取</p>
+        </div>
+
+        <div class="layui-form-item">
+            <label class="relative block">
+                <span class="color-green font-w7">开放平台消息校验 Token</span>
+                <input name="component_token" required placeholder="请输入微信消息校验Token" value="{:sysconf('component_token')}" class="layui-input">
+            </label>
+            <p class="help-block">开发者在代替微信接收到消息时，用此 Token 来校验消息</p>
+        </div>
+
+        <div class="layui-form-item">
+            <label class="relative block">
+                <span class="color-green font-w7">开放平台消息加解密 AesKey</span>
+                <input name="component_encodingaeskey" required pattern="^.{43}$" maxlength="43" placeholder="请输入43位微信消息加解密Key" value="{:sysconf('component_encodingaeskey')}" class="layui-input">
+            </label>
+            <p class="help-block">在代替微信收发消息时使用，必须是长度为43位字母和数字组合的字符串</p>
+        </div>
+
+        <div class="hr-line-dashed"></div>
+
+        <div class="text-center padding-bottom-15 margin-bottom-20">
+            <button class="layui-btn" type="submit">保存配置</button>
+        </div>
+
+    </div>
+</form>

application/service/view/config/index.html

@@ -0,0 +1,113 @@
+{extend name="admin@main"}
+
+{block name="button"}
+
+{if auth("edit")}
+<button data-modal="{:url('edit')}" class='layui-btn layui-btn-sm layui-btn-primary'>配置平台参数</button>
+{/if}
+
+{/block}
+
+{block name="content"}
+<div class="relative">
+
+    <div class="think-box-shadow border-0 margin-bottom-20">
+        强烈建议安装 YAR 扩展来实现接口通信，SOAP 不能正常显示接口的异常信息
+    </div>
+
+    <div class="think-box-shadow padding-right-40 padding-left-40">
+        <div class="layui-row layui-col-space18">
+            <div class="layui-col-md6">
+                <div class="layui-form-item">
+                    <span class="color-green font-w7">开放平台服务</span>
+                    <span class="color-desc margin-left-5">AppID</span>
+                    <label class="relative block">
+                        <input disabled class="layui-input layui-bg-gray" value="{:sysconf('component_appid')}">
+                        <a data-copy="{:sysconf('component_appid')}" class="fa fa-copy right-btn"></a>
+                    </label>
+                    <p class="help-block">开放平台服务 AppID，需要在微信开放平台获取</p>
+                </div>
+                <div class="layui-form-item">
+                    <span class="color-green font-w7">开放平台服务</span>
+                    <span class="color-desc margin-left-5">AppSecret</span>
+                    <label class="relative block">
+                        <input disabled class="layui-input layui-bg-gray" value="{:sysconf('component_appsecret')}">
+                        <a data-copy="{:sysconf('component_appsecret')}" class="fa fa-copy right-btn"></a>
+                    </label>
+                    <p class="help-block">开放平台服务 AppSecret，需要在微信开放平台获取</p>
+                </div>
+                <div class="layui-form-item">
+                    <span class="color-green font-w7">开放平台消息校验</span>
+                    <span class="color-desc margin-left-5">Token</span>
+                    <label class="relative block">
+                        <input disabled class="layui-input layui-bg-gray" value="{:sysconf('component_token')}">
+                        <a data-copy="{:sysconf('component_token')}" class="fa fa-copy right-btn"></a>
+                    </label>
+                    <p class="help-block">开发者在代替微信接收到消息时，用此 Token 来校验消息</p>
+                </div>
+                <div class="layui-form-item">
+                    <span class="color-green font-w7">开放平台消息加解密</span>
+                    <span class="color-desc margin-left-5">AesKey</span>
+                    <label class="relative block">
+                        <input disabled class="layui-input layui-bg-gray" value="{:sysconf('component_encodingaeskey')}">
+                        <a data-copy="{:sysconf('component_encodingaeskey')}" class="fa fa-copy right-btn"></a>
+                    </label>
+                    <p class="help-block">在代替微信收发消息时使用，必须是长度为43位字母和数字组合的字符串</p>
+                </div>
+            </div>
+
+            <div class="layui-col-md6">
+                <div class="layui-form-item">
+                    <p class="color-green font-w7">授权发起页域名</p>
+                    <label class="relative block">
+                        <input disabled class="layui-input layui-bg-gray" value="{:request()->host()}">
+                        <a data-copy="{:request()->host()}" class="fa fa-copy right-btn"></a>
+                    </label>
+                    <p class="help-block">从本域名跳转到登录授权页才可以完成登录授权，无需填写域名协议前缀</p>
+                </div>
+                <div class="layui-form-item">
+                    <span class="color-green font-w7">授权事件接收地址</span>
+                    <label class="relative block">
+                        <input disabled class="layui-input layui-bg-gray" value="{:url('@service/api.push/ticket','',false,true)}">
+                        <a data-copy="{:url('@service/api.push/ticket','',false,true)}" class="fa fa-copy right-btn"></a>
+                    </label>
+                    <p class="help-block">用于接收取消授权通知、授权成功通知、授权更新通知、接收 TICKET 凭据</p>
+                </div>
+                <div class="layui-form-item">
+                    <span class="color-green font-w7">微信消息与事件接收</span>
+                    <label class="relative block">
+                        <input disabled class="layui-input layui-bg-gray" value="{:url('@service/api.push/notify/\$APPID\$','',false,true)}">
+                        <a data-copy="{:url('@service/api.push/notify/\$APPID\$','',false,true)}" class="fa fa-copy right-btn"></a>
+                    </label>
+                    <p class="help-block">通过该 URL 接收微信消息和事件推送，$APPID$ 将被替换为微信 AppId</p>
+                </div>
+                <div class="layui-form-item">
+                    <p class="color-green font-w7">客户端系统 Yar 模块接口</p>
+                    <label class="relative block"><input disabled class="layui-input layui-bg-gray" value="{:url('@service/api.client/yar/PARAM','',false,true)}"></label>
+                    <p class="help-block">客户端 Yar 接口，PARAM 规则 AppName-AppId-AppKey-AppType</p>
+                </div>
+                <div class="layui-form-item">
+                    <p class="color-green font-w7">客户端系统 Soap 模块接口</p>
+                    <label class="relative block"><input disabled class="layui-input layui-bg-gray" value="{:url('@service/api.client/soap/PARAM','',false,true)}"></label>
+                    <p class="help-block">客户端 Soap 接口，PARAM 规则 AppName-AppId-AppKey-AppType</p>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+{/block}
+
+{block name='style'}
+<style>
+    .right-btn {
+        top: 0;
+        right: 0;
+        width: 38px;
+        height: 38px;
+        display: inline-block;
+        position: absolute;
+        text-align: center;
+        line-height: 38px;
+    }
+</style>
+{/block}

application/service/view/fans/index.html

@@ -0,0 +1,98 @@
+{extend name='admin@main'}
+
+{block name="button"}
+
+{if auth("service/fans/setblack")}
+<button data-action='{:url("setblack")}' data-rule="openid#{key}" data-csrf="{:systoken('service/fans/setblack')}" class='layui-btn layui-btn-sm layui-btn-primary'>批量拉黑</button>
+{/if}
+
+{if auth("service/fans/delblack")}
+<button data-action='{:url("delblack")}' data-rule="openid#{key}" data-csrf="{:systoken('service/fans/delblack')}" class='layui-btn layui-btn-sm layui-btn-primary'>取消拉黑</button>
+{/if}
+
+{if auth("service/fans/sync")}
+<button data-load='{:url("sync")}' class='layui-btn layui-btn-sm layui-btn-primary'>同步粉丝</button>
+{/if}
+
+{/block}
+
+{block name="content"}
+<div class="think-box-shadow">
+    {include file='fans/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 width="180px" class='text-left nowrap'>微信昵称</th>
+            <th width="180px" class="text-left nowrap">粉丝标签</th>
+            <th width="150px" class='text-left nowrap'>性别语言</th>
+            <th width="180px" class='text-left nowrap'>关注时间</th>
+            <th width="80px"></th>
+            <th></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.openid}' type='checkbox'>
+            </td>
+            <td class='text-left nowrap relative layui-elip'>
+                <img src="{$vo.headimgurl|default=''}" onerror="$(this).remove()" data-tips-image class="inline-block" style="width:40px;height:40px;vertical-align:top;margin-right:5px">
+                <div class="inline-block">
+                    昵称：{$vo.nickname|default='--'}
+                    <br>
+                    区域：{$vo.country|default='--'} {$vo.province} {$vo.city}
+                </div>
+            </td>
+            <td class="text-left padding-0">
+                <div style="max-height:60px;overflow:auto">{foreach $vo.tags as $t}<p><span class="layui-badge layui-bg-cyan margin-right-5">{$t|default='--'}</span></p>{/foreach}</div>
+            </td>
+            <td class='text-left nowrap'>
+                性别：{switch name='vo.sex'}{case value='1'}男{/case}{case value='2'}女{/case}{default}未知{/switch}
+                <br>
+                语言：{$vo.language|raw}
+            </td>
+            <td class='text-left nowrap'>
+                日期：{$vo.subscribe_at|format_datetime|str_replace=' ','<br>时间：',###|raw}
+            </td>
+            <td class='text-center nowrap'>
+                {eq name='vo.subscribe' value='0'}
+                <span class="layui-badge">未关注</span>
+                {else}
+                <span class="layui-badge layui-bg-green">已关注</span>
+                {/eq}
+                <br>
+                {eq name='vo.is_black' value='0'}
+                <span class="layui-badge layui-bg-green">未拉黑</span>
+                {else}
+                <span class="layui-badge">已拉黑</span>
+                {/eq}
+            </td>
+            <td class="nowrap">
+
+                {eq name='vo.is_black' value='0'}
+                <!--{if auth("service/fans/setblack")}-->
+                <a class="margin-left-10 layui-btn layui-btn-normal layui-btn-sm" data-action="{:url('setblack')}" data-value="openid#{$vo.openid}" data-csrf="{:systoken('service/fans/setblack')}">拉 黑</a>
+                <!--{/if}-->
+                {else}
+                <!--{if auth("service/fans/delblack")}-->
+                <a class="margin-left-10 layui-btn layui-btn-normal layui-btn-sm" data-action="{:url('delblack')}" data-value="openid#{$vo.openid}" data-csrf="{:systoken('service/fans/delblack')}">拉 白</a>
+                <!--{/if}-->
+                {/eq}
+
+                {if auth("service/fans/remove")}
+                <a class="layui-btn layui-btn-sm layui-btn-danger" data-confirm="确定要删除该粉丝吗？" data-action="{:url('remove')}" data-value="id#{$vo.id}" data-csrf="{:systoken('service/fans/remove')}">删 除</a>
+                {/if}
+            </td>
+        </tr>
+        {/foreach}
+        </tbody>
+    </table>
+
+    {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
+
+</div>
+{/block}

application/service/view/fans/index_search.html

@@ -0,0 +1,76 @@
+<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">
+                <select class="layui-select" name="appid" lay-filter="appid" lay-search>
+                    <!--{foreach $wechats as $k=>$v}-->
+                    <!--{if $k eq $appid}-->
+                    <option selected value="{$k}">{$v}</option>
+                    <!--{else}-->
+                    <option value="{$k}">{$v}</option>
+                    <!--{/if}-->
+                    <!--{/foreach}-->
+                </select>
+            </div>
+        </div>
+
+        <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">
+                <select class="layui-select" name="subscribe">
+                    {foreach [''=>'-- 全部 --','0'=>'显示未关注的粉丝','1'=>'显示已关注的粉丝'] as $k=>$v}
+                    {eq name='Think.get.subscribe' 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="is_black">
+                    {foreach [''=>'-- 全部 --','0'=>'显示未拉黑的粉丝','1'=>'显示已拉黑的粉丝'] as $k=>$v}
+                    {eq name='Think.get.is_black' 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="subscribe_at" value="{$Think.get.subscribe_at|default=''}" placeholder="请选择关注时间" class="layui-input">
+            </div>
+        </div>
+
+        <div class="layui-form-item layui-inline">
+            <button id="SearchButton" class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
+        </div>
+    </form>
+
+</fieldset>
+
+<script>
+    form.render();
+    form.on('select(appid)', function () {
+        $('#SearchButton').trigger('click');
+    });
+</script>

application/service/view/index/index.html

@@ -0,0 +1,84 @@
+{extend name="admin@main"}
+
+{block name="button"}
+
+{if auth("service/index/syncall")}
+<button data-load="{:url('syncall')}" class='layui-btn layui-btn-sm layui-btn-primary'>同步所有授权</button>
+{/if}
+
+{/block}
+
+{block name="content"}
+<div class="think-box-shadow">
+    {include file='index/index_search'}
+    <table class="layui-table margin-top-10" lay-skin="line">
+        {notempty name='list'}
+        <thead>
+        <tr>
+            <th class='text-left nowrap' style="width:390px">接口信息</th>
+            <th class='text-left nowrap' style="width:120px">服务号信息</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 nowrap'>
+                <div class="inline-block text-top margin-right-5">
+                    <img onerror="this.src='__ROOT__/static/theme/img/404_icon.png'" style="width:60px;height:60px" data-tips-text="微信头像" data-tips-image src="{$vo.head_img|default=''}">
+                </div>
+                <div class="inline-block">
+                    公众号APPID：{$vo.authorizer_appid}&nbsp;&nbsp;&nbsp;&nbsp;调用次数：{$vo.total}<br>
+                    接口授权密钥：{$vo.appkey|default='<span class="color-desc">未生成接口服务密码, 请稍候授权绑定</span>'|raw}<br>
+                    消息推送接口：{$vo.appuri|default='<span class="color-desc">未配置消息推送接口</span>'|raw}
+                </div>
+            </td>
+            <td class='text-left nowrap'>
+                <div class="inline-block text-top margin-right-5">
+                    <img onerror="this.src='__ROOT__/static/theme/img/404_icon.png'" style="width:60px;height:60px" data-tips-text="微信二维码" data-tips-image src="{$vo.qrcode_url|local_image}">
+                </div>
+                <div class="inline-block">
+                    昵称：{$vo.nick_name|default='<span class="color-desc">未获取到公众号昵称</span>'|raw}<br>
+                    公司：{$vo.principal_name|default='<span class="color-desc">未获取到公司名字</span>'|raw}<br>
+                    状态：{if $vo.service_type eq 2}服务号{elseif $vo.service_type eq 3}小程序{else}订阅号{/if} /
+                    {$vo.verify_type == -1 ? '<span class="color-red">未认证</span>' : '<span class="color-green">已认证</span>'} /
+                    {if $vo.status eq 0}<span class="color-red">已禁用</span>{elseif $vo.status eq 1}<span class="color-green">使用中</span>{/if}
+                </div>
+            </td>
+            <td class="text-left nowrap">
+                账号：{$vo.user_name|default='--'}<br>
+                日期：{$vo.create_at|format_datetime|str_replace=' ','<br>时间：',###|raw}
+            </td>
+            <td class='text-left nowrap'>
+
+                {if $vo.status eq 1 and auth("servce/index/forbid")}
+                <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('forbid')}" data-csrf="{:systoken('service/index/forbid')}" data-value="id#{$vo.id};status#0">禁 用</a>
+                {elseif auth("servce/index/resume")}
+                <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('resume')}" data-csrf="{:systoken('service/index/resume')}" data-value="id#{$vo.id};status#1">启 用</a>
+                {/if}
+
+                {if auth("service/index/sync")}
+                <a class="layui-btn layui-btn-sm" data-load='{:url("service/index/sync")}?appid={$vo.authorizer_appid}'>同 步</a>
+                {/if}
+
+                {if auth("service/index/remove")}
+                <a class="layui-btn layui-btn-sm layui-btn-danger" data-confirm="确定要删除该公众号吗？" data-action="{:url('remove')}" data-csrf="{:systoken('service/index/remove')}" data-value="id#{$vo.id}">删 除</a>
+                {/if}
+
+                {if auth("service/index/clearquota")}
+                <a class="layui-btn layui-btn-sm layui-btn-primary" data-confirm="每个公众号每个月有10次清零机会，请谨慎使用！" data-load='{:url("service/index/clearquota")}?appid={$vo.authorizer_appid}'>清 零</a>
+                {/if}
+
+            </td>
+        </tr>
+        {/foreach}
+        </tbody>
+    </table>
+
+    {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
+
+</div>
+
+{/block}

application/service/view/index/index_search.html

@@ -0,0 +1,76 @@
+<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="authorizer_appid" value="{$Think.get.authorizer_appid|default=''}" placeholder="请输入微信APPID" 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="nick_name" value="{$Think.get.nick_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">
+                <select name="service_type" class="layui-select">
+                    <option value="">- 全部 -</option>
+                    {foreach ['0'=>'显示订阅号类型','2'=>'显示服务号类型','3'=>'显示小程序类型'] as $k=>$v}
+                    <!--{if $k.'' eq $Think.get.service_type}-->
+                    <option selected value="{$k}">{$v}</option>
+                    <!--{else}-->
+                    <option value="{$k}">{$v}</option>
+                    <!--{/if}-->
+                    {/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 [''=>'- 全部 -','0'=>'已禁用的账号','1'=>'使用中的账号'] 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">
+                <input name="principal_name" value="{$Think.get.principal_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 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">
+            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
+        </div>
+
+    </form>
+
+</fieldset>
+
+<script>
+    window.form.render();
+</script>

application/service/view/not-auth.html

@@ -0,0 +1 @@
+还没有授权，请授权公众号

application/store/controller/Article.php

@@ -1,125 +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 CategoryLabel
- * @package app\store\controller
- */
-class Article extends Controller
-{
-    
-
-    /**
-     * 绑定数据表
-     * @var string
-     */
-    protected $table = 'Article';
-
-    /**
-     * 文章列表
-     * @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)->like('title')->equal('is_show');
-        $query->where('is_del',1)->order('id desc')->page();
-    }
-
-    /**
-     * 添加
-     * @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->create_at = date('Y-m-d H:i:s');
-        $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->_form($this->table, 'form');
-    }
-
-
-    /**
-     * 禁用商品分类
-     * @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 del()
-    {
-        $this->_save($this->table, ['is_del' => '0']);
-    }
-
-    /**
-     * 删除商品分类
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function remove()
-    {
-        $this->_delete($this->table);
-    }
-
-}

application/store/controller/Banner.php

@@ -1,122 +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;
-
-/**
- * banner
- * Class CategoryLabel
- * @package app\store\controller
- */
-class Banner extends Controller
-{
-    /**
-     * 绑定数据表
-     * @var string
-     */
-    protected $table = 'Banner';
-
-    /**
-     * 轮播数据
-     * @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)->like('title');
-        $query->where('is_del',1)->order('id desc')->page();
-    }
-
-    /**
-     * 添加商品分类
-     * @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->create_at = date('Y-m-d H:i:s');
-        $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->_form($this->table, 'form');
-    }
-
-    /**
-     * 禁用商品分类
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function forbid()
-    {
-        $this->_save($this->table, ['is_show' => '0']);
-    }
-
-    /**
-     * 启用商品分类
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function resume()
-    {
-        $this->_save($this->table, ['is_show' => '1']);
-    }
-    /**
-     * 软删除
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function del()
-    {
-        $this->_save($this->table, ['is_del' => '0']);
-    }
-
-    /**
-     * 删除商品分类
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function remove()
-    {
-        $this->_delete($this->table);
-    }
-
-}

application/store/controller/Comments.php

@@ -1,227 +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 think\Db;
-use app\common\model\User;
-
-/**
- * 评论管理
- * Class Member
- * @package app\store\controller
- */
-class Comments extends Controller
-{
-    /**
-     * 绑定数据表
-     * @var string
-     */
-    protected $table = 'DynamicComments';
-
-    /**
-     * 评论管理
-     * @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)->alias('a');
-        if (isset($_GET['userinfo']) && $_GET['userinfo']){
-            $query->where('a.user_id|b.nickname','like','%'.$_GET['userinfo'].'%');
-        }
-        if (isset($_GET['dy_content']) && $_GET['dy_content']){
-            $query->where('d.content','like','%'.$_GET['dy_content'].'%');
-        }
-        if (isset($_GET['content']) && $_GET['content']){
-            $query->where('a.content','like','%'.$_GET['content'].'%');
-        }
-        if (isset($_GET['create_at']) && $_GET['create_at']) {
-            $time = explode(' - ', $_GET['create_at']);
-            $start_date_time = $time[0] . ' 00:00:00';
-            $end_date_time = $time[1] . ' 23:59:59';
-            $query->whereBetweenTime('a.create_at', $start_date_time, $end_date_time);
-        }
-        $query->join('dynamic d','a.dynamic_id=d.id')
-            ->join('user b','a.user_id=b.id')
-            ->field('a.*,b.nickname,b.headimgurl,d.content as dy_content')
-            ->order('a.id desc')
-            ->where('a.type',1)
-            ->page();
-    }
-
-    /**
-     * 列表数据处理
-     * @param array $data
-     */
-    protected function _index_page_filter(&$data)
-    {
-        //dump($data);
-        foreach ($data as &$v){
-            $v['comments_count'] = Db::name('dynamic_comments')->where('comments_id',$v['id'])->where('type',2)->where('is_del',1)->count();
-            $v['zan_count']  = Db::name('dynamic_zan')->where('type',2)->where('link_id',$v['id'])->count();
-        }
-    }
-
-    /**
-     * 解散
-     * @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\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function add()
-    {
-        $this->create_at = date('Y-m-d H:i:s');
-        $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->_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)
-    {
-        if ($this->request->isGet()) {
-//            $data['title'] = Db::name('topic')->where('id',$data['topic_id'])->value('title');
-//            $data['imgs'] = explode(',',$data['imgs']);
-            $this->data = $data;
-            //回复列表
-            $comments_list = Db::name($this->table)
-                ->alias('a')
-                ->field('a.*,b.nickname,b.headimgurl')
-                ->join('user b','a.user_id=b.id')
-                ->where('a.type',2)
-                ->where('a.comments_id',$data['id'])
-                ->where('a.is_del',1)
-                ->select();
-            $this->comments_list = $comments_list;
-           // dump($comments_list);
-        }elseif ($this->request->isPost()){
-            if (!isset($data['img']) || $data['img']==''){
-                $this->error('请上传图片');
-            }
-            if (!isset($data['background_img']) || $data['background_img']==''){
-                $this->error('请上传背景图');
-            }
-           if (isset($data['is_official']) && $data['is_official']==1){
-               $user = Db::name('user')->where('id',$data['official_user_id'])->where('is_del',1)->where('is_cancellation_account',1)->count();
-               if (!$user){
-                   $this->error('用户不存在');
-               }
-           }
-        }
-    }
-
-    /**
-     * 取消置顶
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function forbid2()
-    {
-        $this->_save($this->table, ['is_top' => '0']);
-    }
-
-    /**
-     * 置顶用户
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function resume2()
-    {
-        $this->_save($this->table, ['is_top' => '1']);
-    }
-    /**
-     * 软删除
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function del()
-    {
-        $this->_save($this->table, ['is_del' => '0']);
-    }
-
-    /**
-     * 详情
-     * @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 info()
-    {
-        $this->title = '动态详情';
-        $this->_form($this->table, 'info');
-    }
-}

application/store/controller/Config.php

@@ -53,7 +53,7 @@ class Config extends Controller
         if ($this->request->isPost()) {
             $this->applyCsrfToken('save');
             foreach ($this->request->post() as $k => $v) sysconf($k, $v);
-            $this->success('配置保存成功！');
+            $this->success('商城短信配置保存成功！');
         }
     }
 

application/store/controller/Dynamic.php

@@ -1,215 +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 think\Db;
-use app\common\model\User;
-
-/**
- * 动态管理
- * Class Member
- * @package app\store\controller
- */
-class Dynamic extends Controller
-{
-    /**
-     * 绑定数据表
-     * @var string
-     */
-    protected $table = 'Dynamic';
-
-    /**
-     * 举报信息管理
-     * @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)->alias('a');
-        if (isset($_GET['userinfo']) && $_GET['userinfo']){
-            $query->where('a.user_id|b.nickname','like','%'.$_GET['userinfo'].'%');
-        }
-        if (isset($_GET['title']) && $_GET['title']){
-            $query->where('c.title','like','%'.$_GET['title'].'%');
-        }
-        if (isset($_GET['content']) && $_GET['content']){
-            $query->where('a.content','like','%'.$_GET['content'].'%');
-        }
-        if (isset($_GET['create_at']) && $_GET['create_at']) {
-            $time = explode(' - ', $_GET['create_at']);
-            $start_date_time = $time[0] . ' 00:00:00';
-            $end_date_time = $time[1] . ' 23:59:59';
-            $query->whereBetweenTime('a.create_at', $start_date_time, $end_date_time);
-        }
-        $query->join('user b','a.user_id=b.id')
-            ->join('topic c','a.topic_id=c.id')
-            ->field('a.*,b.nickname,b.headimgurl,c.title')
-            ->order('a.id desc')
-            ->page();
-    }
-
-    /**
-     * 列表数据处理
-     * @param array $data
-     */
-    protected function _index_page_filter(&$data)
-    {
-//        dump($data);
-        foreach ($data as &$v){
-            $v['comments_count'] = Db::name('dynamic_comments')->where('dynamic_id',$v['id'])->where('type',1)->where('is_del',1)->count();
-            $v['zan_count']  = Db::name('dynamic_zan')->where('type',1)->where('link_id',$v['id'])->count();
-        }
-    }
-
-    /**
-     * 解散
-     * @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\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function add()
-    {
-        $this->create_at = date('Y-m-d H:i:s');
-        $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->_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)
-    {
-        if ($this->request->isGet()) {
-            $data['title'] = Db::name('topic')->where('id',$data['topic_id'])->value('title');
-            $data['imgs'] = explode(',',$data['imgs']);
-            $this->data = $data;
-        }elseif ($this->request->isPost()){
-            if (!isset($data['img']) || $data['img']==''){
-                $this->error('请上传图片');
-            }
-            if (!isset($data['background_img']) || $data['background_img']==''){
-                $this->error('请上传背景图');
-            }
-           if (isset($data['is_official']) && $data['is_official']==1){
-               $user = Db::name('user')->where('id',$data['official_user_id'])->where('is_del',1)->where('is_cancellation_account',1)->count();
-               if (!$user){
-                   $this->error('用户不存在');
-               }
-           }
-        }
-    }
-
-    /**
-     * 取消置顶
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function forbid2()
-    {
-        $this->_save($this->table, ['is_top' => '0']);
-    }
-
-    /**
-     * 置顶用户
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function resume2()
-    {
-        $this->_save($this->table, ['is_top' => '1']);
-    }
-    /**
-     * 软删除
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function del()
-    {
-        $this->_save($this->table, ['is_del' => '0']);
-    }
-
-    /**
-     * 详情
-     * @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 info()
-    {
-        $this->title = '动态详情';
-        $this->_form($this->table, 'info');
-    }
-}

application/store/controller/DynamicReport.php

@@ -1,221 +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 think\Db;
-use app\common\model\User;
-
-/**
- * 举报管理
- * Class Member
- * @package app\store\controller
- */
-class DynamicReport extends Controller
-{
-    /**
-     * 绑定数据表
-     * @var string
-     */
-    protected $table = 'DynamicReport';
-
-    /**
-     * 举报管理
-     * @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)->alias('a');
-        if (isset($_GET['userinfo']) && $_GET['userinfo']){
-            $query->where('a.user_id|b.nickname','like','%'.$_GET['userinfo'].'%');
-        }
-        if (isset($_GET['content']) && $_GET['content']){
-            $query->where('a.content','like','%'.$_GET['content'].'%');
-        }
-        $query->join('user b','a.user_id=b.id')
-            ->field('a.*,b.nickname,b.headimgurl')
-            ->order('a.id desc')
-            ->where('a.type',1)
-            ->page();
-    }
-
-    /**
-     * 列表数据处理
-     * @param array $data
-     */
-    protected function _index_page_filter(&$data)
-    {
-
-        foreach ($data as &$v){
-            if ($v['type']==1){
-                $v['dynamic_content'] = Db::name('dynamic')->where('id',$v['link_id'])->value('content');
-            }elseif ($v['type']==2){
-                $v['dynamic_content'] = Db::name('dynamic_comments')->where('id',$v['link_id'])->value('content');
-            }
-        }
-        //dump($data);
-    }
-
-    /**
-     * 解散
-     * @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\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function add()
-    {
-        $this->create_at = date('Y-m-d H:i:s');
-        $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->_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)
-    {
-        if ($this->request->isGet()) {
-//            $data['title'] = Db::name('topic')->where('id',$data['topic_id'])->value('title');
-//            $data['imgs'] = explode(',',$data['imgs']);
-            $this->data = $data;
-            //回复列表
-            $comments_list = Db::name($this->table)
-                ->alias('a')
-                ->field('a.*,b.nickname,b.headimgurl')
-                ->join('user b','a.user_id=b.id')
-                ->where('a.type',2)
-                ->where('a.comments_id',$data['id'])
-                ->where('a.is_del',1)
-                ->select();
-            $this->comments_list = $comments_list;
-           // dump($comments_list);
-        }elseif ($this->request->isPost()){
-            if (!isset($data['img']) || $data['img']==''){
-                $this->error('请上传图片');
-            }
-            if (!isset($data['background_img']) || $data['background_img']==''){
-                $this->error('请上传背景图');
-            }
-           if (isset($data['is_official']) && $data['is_official']==1){
-               $user = Db::name('user')->where('id',$data['official_user_id'])->where('is_del',1)->where('is_cancellation_account',1)->count();
-               if (!$user){
-                   $this->error('用户不存在');
-               }
-           }
-        }
-    }
-
-    /**
-     * 取消置顶
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function forbid2()
-    {
-        $this->_save($this->table, ['is_top' => '0']);
-    }
-
-    /**
-     * 置顶用户
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function resume2()
-    {
-        $this->_save($this->table, ['is_top' => '1']);
-    }
-    /**
-     * 软删除
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function del()
-    {
-        $this->_save($this->table, ['is_del' => '0']);
-    }
-
-    /**
-     * 详情
-     * @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 info()
-    {
-        $this->title = '动态详情';
-        $this->_form($this->table, 'info');
-    }
-}

application/store/controller/ElectPool.php

@@ -1,360 +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 app\common\model\Config;
-use app\common\model\ElectPoolMembers;
-use library\Controller;
-use think\Db;
-use app\common\model\User;
-
-/**
- * 互选池信息管理
- * Class Member
- * @package app\store\controller
- */
-class ElectPool extends Controller
-{
-    /**
-     * 绑定数据表
-     * @var string
-     */
-    protected $table = 'ElectPool';
-
-    /**
-     * 互选池信息管理
-     * @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)->alias('a');
-        if (isset($_GET['keyword']) && $_GET['keyword']){
-            $query->where('a.name|a.education|a.province|a.city|a.area|b.nickname|b.id','like','%'.$_GET['keyword'].'%');
-        }
-        if (isset($_GET['is_dissolution']) && $_GET['is_dissolution']!=''){
-            $query->where('a.is_dissolution',$_GET['is_dissolution']);
-        }
-        if (isset($_GET['type']) && $_GET['type']!=''){
-            $query->where('a.type',$_GET['type']);
-        }
-        if (isset($_GET['create_at']) && $_GET['create_at']){
-            $time = explode(' - ',$_GET['create_at']);
-            $start_date_time = $time[0].' 00:00:00';
-            $end_date_time = $time[1].' 23:59:59';
-            $query->whereBetweenTime('a.create_at',$start_date_time,$end_date_time);
-        }
-        $query->join('User b','a.user_id=b.id')
-            ->where('a.is_audit',0)
-            ->field('a.*,b.nickname,b.headimgurl,b.sex,b.id as uid')
-            ->order('a.id desc')->page();
-    }
-
-    /**
-     * 列表数据处理
-     * @param array $data
-     */
-    protected function _index_page_filter(&$data)
-    {
-        //dump($data);
-        foreach ($data as $k=>$vo) {
-
-        }
-    }
-
-    /**
-     * 解散
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function forbid()
-    {
-        $this->_save($this->table, ['is_dissolution' => '0']);
-    }
-
-    /**
-     * 启用
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function resume()
-    {
-        $this->_save($this->table, ['is_dissolution' => '1']);
-    }
-
-    /**
-     * 设置公开
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function set_type()
-    {
-        $this->_save($this->table, ['type' => '1']);
-    }
-
-    /**
-     * 设置私密
-     * @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 set_type2()
-    {
-        $id = $this->app->request->get('id');
-        $this->assign('id',$id);
-        $post = $this->app->request->post();
-        if (isset($post['id']) && $post['id']){
-            Db::name($this->table)->where('id',$post['id'])->update(['type'=>2,'update_at'=>date('Y-m-d H:i:s'),'password'=>$post['password']]);
-            $this->success('设置成功！');
-        }else{
-            $this->fetch('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)
-    {
-        if ($this->request->isGet()) {
-            if (!empty($data)){
-                $user = Db::name('User')->where('id',$data['user_id'])->field('nickname,headimgurl')->find();
-                $data['nickname'] = $user['nickname'];
-                $data['headimgurl'] = $user['headimgurl'];
-                $education = $data['education'];
-                $data['education'] = $education;
-                $education = explode(',',$education);
-                $this->data = $data;
-
-                // dump($data);
-                $member = Db::name('ElectPoolMembers')->alias('a')->where('pool_id',$data['id'])
-                    ->join('User b','a.user_id=b.id')
-                    ->field('a.*,b.nickname,b.headimgurl,b.sex,b.is_del')
-                    ->select();
-                //dump($member);
-                $this->list = $member;
-
-                //互选池移除会员记录
-                $remove = Db::name('ElectPoolRemovedUser')->alias('a')
-                    ->where('a.pool_id',$data['id'])
-                    ->join('User b','a.user_id=b.id')
-                    ->field('a.*,b.nickname,b.headimgurl,b.sex,b.is_del')
-                    ->select();
-                $this->remove_list = $remove;
-                //积分获取联系方式记录
-                $contact_record = Db::name('IntegralContactRecord')->alias('a')
-                    ->where('a.pool_id',$data['id'])
-                    ->join('User b','a.user_id=b.id')
-                    ->join('User c','a.to_user_id=c.id')
-                    ->field('a.*,b.nickname,b.headimgurl,b.sex,b.is_del as b_is_del,c.nickname as to_nickname,c.headimgurl as to_headimgurl,c.sex as to_sex,c.is_del as c_is_del')
-                    ->select();
-                if ($contact_record){
-                    foreach ($contact_record as $k=>$v){
-                        $contact_record2 = Db::name('IntegralContactRecord')->where('user_id',$v['to_user_id'])->where('to_user_id',$v['user_id'])->count();
-                        $contact_record[$k]['is_elect'] = $contact_record2 ? 1 : 0;
-                    }
-                }
-                $this->contact_record = $contact_record;
-
-                //标签列表
-                $label_list = explode(',',Config::get_values('education'));
-                $labellists = array();
-                foreach ($label_list as $k=>$v){
-                    if ($education){
-                        foreach ($education as $a=>$b){
-                            if ($b==$v){
-                                $is_hive = 1;
-                                break 1;
-                            }else{
-                                $is_hive = 0;
-                            }
-                        }
-                    }
-                    $labellist['is_hive'] = $is_hive;
-                    $labellist['name'] = $v;
-                    array_push($labellists,$labellist);
-                }
-                $this->label_list = $labellists;
-
-                //省
-                $province = Db::name('Area')->where('level',1)->select();
-                $this->province = $province;
-                //市
-                $pid = Db::name('Area')->where('name',$data['province'])->value('id');
-                $city = Db::name('Area')->where('level',2)->where('pid',$pid)->select();
-                $this->city = $city;
-                //区
-                $pid2 = Db::name('Area')->where('name',$data['city'])->value('id');
-                $area = Db::name('Area')->where('level',3)->where('pid',$pid2)->select();
-                $this->area = $area;
-            }else{
-                //标签列表
-                $label_list = explode(',',Config::get_values('education'));
-                $labellists = array();
-                foreach ($label_list as $k=>$v){
-                    $labellist['is_hive'] = 0;
-                    $labellist['name'] = $v;
-                    array_push($labellists,$labellist);
-                }
-                $this->label_list = $labellists;
-
-                //省
-                $province = Db::name('Area')->where('level',1)->select();
-                $this->province = $province;
-            }
-
-
-        }elseif ($this->request->isPost()) {
-            $data['province'] = Db::name('Area')->where('id',$data['province'])->value('name');
-            $data['city'] = Db::name('Area')->where('id',$data['city'])->value('name');
-            $data['area'] = Db::name('Area')->where('id',$data['area'])->value('name');
-            $user = Db::name('User')->where('id',$data['user_id'])->find();
-            if (!$user){
-                $this->error('用户ID不存在');
-            }
-            if (!isset($data['province']) || !isset($data['city']) || !isset($data['area'])){
-                $this->error('请选择省市区');
-            }
-            if (!isset($data['education'])){
-                $this->error('请选择学历');
-            }
-            if (!isset($data['birth_start']) || !isset($data['birth_end'])){
-                $this->error('请选择出生日期约束');
-            }
-            if (!isset($data['logo'])){
-                $this->error('请上传图片');
-            }
-
-            $data['education'] = implode(',',$data['education']);
-            $data['imgs'] = $data['logo'];
-            unset($data['logo']);
-            if (isset($data['id'])){
-                $cou = Db::name($this->table)->where('id',$data['id'])->update($data);
-            }else{
-                $cou = Db::name($this->table)->insert($data);
-            }
-            if ($cou){
-                if (!isset($data['id'])){
-                    $id = Db::name($this->table)->getLastInsID();
-                    //群主加入互选池
-                    $da['pool_id'] = $id;
-                    $da['user_id'] = $data['user_id'];
-                    ElectPoolMembers::create($da);
-                }
-                $this->success('编辑成功','/admin.html#/store/elect_pool/index.html');
-            }else{
-                $this->error('编辑失败');
-            }
-//            dump($data);die;
-        }
-    }
-
-    /**
-     * 会员详情
-     * @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 poolinfo()
-    {
-        $this->_form($this->table, 'poolinfo');
-    }
-
-
-    /**
-     * 添加互选池
-     * @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->_form($this->table, 'edit');
-    }
-
-    /**
-     * 编辑信息
-     * @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, 'edit');
-    }
-
-    /**
-     * 表单结果处理
-     * @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\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function remove()
-    {
-        $id = $this->app->request->post('id');
-        if ($id){
-            $pool_id = Db::name('ElectPoolMembers')->where('id',$id)->value('pool_id');
-            Db::name('ElectPoolMembers')->where('id',$id)->delete();
-            Db::name($this->table)->where('id',$pool_id)->setDec('now_number');
-            $this->success('移出成功！');
-        }
-    }
-
-}

application/store/controller/ExpressCompany.php

@@ -0,0 +1,128 @@
+<?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 think\Db;
+
+/**
+ * 快递公司管理
+ * Class Express
+ * @package app\store\controller
+ */
+class ExpressCompany extends Controller
+{
+    /**
+     * 指定数据表
+     * @var string
+     */
+    protected $table = 'StoreExpressCompany';
+
+    /**
+     * 快递公司管理
+     * @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')->like('express_title,express_code');
+        $query->dateBetween('create_at')->order('status desc,sort desc,id desc')->where(['is_deleted' => '0'])->page();
+    }
+
+    /**
+     * 添加快递公司
+     * @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->_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->_form($this->table, 'form');
+    }
+
+    /**
+     * 表单数据处理
+     * @param array $data
+     * @auth true
+     */
+    protected function _form_filter(array $data)
+    {
+        if ($this->request->isPost()) {
+            $where = [['express_code', 'eq', $data['express_code']], ['is_deleted', 'eq', '0']];
+            if (!empty($data['id'])) $where[] = ['id ', 'neq', $data['id']];
+            if (Db::name($this->table)->where($where)->count() > 0) {
+                $this->error('该快递编码已经存在，请使用其它编码！');
+            }
+        }
+    }
+
+    /**
+     * 禁用快递公司
+     * @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);
+    }
+
+}

application/store/controller/ExpressTemplate.php

@@ -0,0 +1,85 @@
+<?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 think\Db;
+
+/**
+ * 邮费模板管理
+ * Class ExpressTemplate
+ * @package app\store\controller
+ */
+class ExpressTemplate extends Controller
+{
+    /**
+     * 指定数据表
+     * @var string
+     */
+    protected $table = 'StoreExpressTemplate';
+
+    /**
+     * 邮费模板管理
+     * @auth true
+     * @menu true
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function index()
+    {
+        $this->title = '邮费模板管理';
+        $filename = env('root_path') . 'public/static/plugs/jquery/area/area.json';
+        $this->provinces = array_column(json_decode(file_get_contents($filename), true), 'name');
+        $this->list = Db::name($this->table)->where(['is_default' => '0'])->select();
+        foreach ($this->list as &$item) $item['rule'] = explode(',', $item['rule']);
+        $this->default = Db::name($this->table)->where(['is_default' => '1'])->find();
+        $this->fetch();
+    }
+
+    /**
+     * 保存邮费模板
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     */
+    public function save()
+    {
+        list($list, $idxs, $post) = [[], [], $this->request->post()];
+        foreach (array_keys($post) as $key) if (stripos($key, 'order_reduction_state_') !== false) {
+            $idxs[] = str_replace('order_reduction_state_', '', $key);
+        }
+        foreach (array_unique($idxs) as $index) if (!empty($post["rule_{$index}"])) $list[] = [
+            'rule'                  => join(',', $post["rule_{$index}"]),
+            // 订单满减配置
+            'order_reduction_state' => $post["order_reduction_state_{$index}"],
+            'order_reduction_price' => $post["order_reduction_price_{$index}"],
+            // 首件邮费配置
+            'first_number'          => $post["first_number_{$index}"],
+            'first_price'           => $post["first_price_{$index}"],
+            // 首件邮费配置
+            'next_number'           => $post["next_number_{$index}"],
+            'next_price'            => $post["next_price_{$index}"],
+            // 默认邮费规则
+            'is_default'            => $post["is_default_{$index}"],
+        ];
+        if (empty($list)) $this->error('请配置有效的邮费规则');
+        Db::name($this->table)->where('1=1')->delete();
+        Db::name($this->table)->insertAll($list);
+        $this->success('邮费规则配置成功！');
+    }
+
+}

application/store/controller/Goods.php

@@ -0,0 +1,215 @@
+<?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 Goods extends Controller
+{
+    /**
+     * 指定数据表
+     * @var string
+     */
+    protected $table = 'StoreGoods';
+
+    /**
+     * 商品信息管理
+     * @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('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)
+    {
+        $this->clist = Db::name('StoreGoodsCate')->where(['is_deleted' => '0', 'status' => '1'])->select();
+        $list = Db::name('StoreGoodsList')->where('status', '1')->whereIn('goods_id', array_unique(array_column($data, 'id')))->select();
+        foreach ($data as &$vo) {
+            list($vo['list'], $vo['cate']) = [[], []];
+            foreach ($list as $goods) if ($goods['goods_id'] === $vo['id']) array_push($vo['list'], $goods);
+            foreach ($this->clist as $cate) if ($cate['id'] === $vo['cate_id']) $vo['cate'] = $cate;
+        }
+    }
+
+    /**
+     * 商品库存入库
+     * @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 stock()
+    {
+        if ($this->request->isGet()) {
+            $GoodsId = $this->request->get('id');
+            $goods = Db::name('StoreGoods')->where(['id' => $GoodsId])->find();
+            empty($goods) && $this->error('无效的商品信息，请稍候再试！');
+            $goods['list'] = Db::name('StoreGoodsList')->where(['goods_id' => $GoodsId])->select();
+            $this->fetch('', ['vo' => $goods]);
+        } else {
+            list($post, $data) = [$this->request->post(), []];
+            if (isset($post['id']) && isset($post['goods_id']) && is_array($post['goods_id'])) {
+                foreach (array_keys($post['goods_id']) as $key) if ($post['goods_number'][$key] > 0) array_push($data, [
+                    'goods_id'     => $post['goods_id'][$key],
+                    'goods_spec'   => $post['goods_spec'][$key],
+                    'number_stock' => $post['goods_number'][$key],
+                ]);
+                if (!empty($data)) {
+                    Db::name('StoreGoodsStock')->insertAll($data);
+                    \app\store\service\GoodsService::syncStock($post['id']);
+                    $this->success('商品信息入库成功！');
+                }
+            }
+            $this->error('没有需要商品入库的数据！');
+        }
+    }
+
+    /**
+     * 添加商品信息
+     * @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->isAddMode = '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->isAddMode = '0';
+        $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 (empty($data['id'])) $data['id'] = Data::uniqidNumberCode(14);
+        if ($this->request->isGet()) {
+            $fields = 'goods_spec,goods_id,status,price_market market,price_selling selling,number_virtual `virtual`,number_express express';
+            $defaultValues = Db::name('StoreGoodsList')->where(['goods_id' => $data['id']])->column($fields);
+            $this->defaultValues = json_encode($defaultValues, JSON_UNESCAPED_UNICODE);
+            $this->cates = Db::name('StoreGoodsCate')->where(['is_deleted' => '0', 'status' => '1'])->order('sort desc,id desc')->select();
+        } elseif ($this->request->isPost()) {
+            if (empty($data['logo'])) $this->error('商品LOGO不能为空，请上传图片');
+            if (empty($data['image'])) $this->error('商品展示图片不能为空，请上传图片');
+            Db::name('StoreGoodsList')->where(['goods_id' => $data['id']])->update(['status' => '0']);
+            foreach (json_decode($data['lists'], true) as $vo) Data::save('StoreGoodsList', [
+                'goods_id'       => $data['id'],
+                'goods_spec'     => $vo[0]['key'],
+                'price_market'   => $vo[0]['market'],
+                'price_selling'  => $vo[0]['selling'],
+                'number_virtual' => $vo[0]['virtual'],
+                'number_express' => $vo[0]['express'],
+                'status'         => $vo[0]['status'] ? 1 : 0,
+            ], 'goods_spec', ['goods_id' => $data['id']]);
+        }
+    }
+
+    /**
+     * 表单结果处理
+     * @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);
+    }
+
+}

application/store/controller/GoodsCate.php

@@ -0,0 +1,113 @@
+<?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 GoodsCate
+ * @package app\store\controller
+ */
+class GoodsCate extends Controller
+{
+    /**
+     * 绑定数据表
+     * @var string
+     */
+    protected $table = 'StoreGoodsCate';
+
+    /**
+     * 商品分类管理
+     * @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)->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
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     * @throws \think\exception\PDOException
+     */
+    public function add()
+    {
+        $this->title = '添加商品分类';
+        $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');
+    }
+
+    /**
+     * 禁用商品分类
+     * @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);
+    }
+
+}

application/store/controller/Icon.php

@@ -1,140 +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 think\Db;
-use app\common\model\User;
-
-/**
- * 聊天小图标
- * Class Icon
- * @package app\store\controller
- */
-class Icon extends Controller
-{
-    /**
-     * 绑定数据表
-     * @var string
-     */
-    protected $table = 'Icon';
-
-    /**
-     * 举报信息管理
-     * @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)
-            ->where('is_del',1)
-            ->order('id desc')
-            ->page();
-    }
-
-    /**
-     * 列表数据处理
-     * @param array $data
-     */
-    protected function _index_page_filter(&$data)
-    {
-    }
-
-    /**
-     * 解散
-     * @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\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function add()
-    {
-        $this->create_at = date('Y-m-d H:i:s');
-        $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->_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)
-    {
-        if ($this->request->isGet()) {
-
-        }
-    }
-    /**
-     * 软删除
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function del()
-    {
-        $this->_save($this->table, ['is_del' => '0']);
-    }
-}

application/store/controller/Member.php

@@ -15,11 +15,7 @@
 
 namespace app\store\controller;
 
-use app\common\model\Config;
-use app\common\model\Message;
 use library\Controller;
-use think\Db;
-use app\common\model\User;
 
 /**
  * 会员信息管理
@@ -32,7 +28,7 @@ class Member extends Controller
      * 绑定数据表
      * @var string
      */
-    protected $table = 'User';
+    protected $table = 'StoreMember';
 
     /**
      * 会员信息管理
@@ -47,570 +43,8 @@ class Member extends Controller
     public function index()
     {
         $this->title = '会员信息管理';
-        $query = $this->_query($this->table)->like('phone')->equal('sex,status,is_cancellation_account,is_home');
-        if (isset($_GET['keyword']) && $_GET['keyword']){
-            $query->where('id|nickname|wechat_id|household|education|graduated_from|province|city|area','like','%'.$_GET['keyword'].'%');
-        }
-        if (isset($_GET['real_auth_status']) && $_GET['real_auth_status']!=''){
-            if ($_GET['real_auth_status']==-1){
-                $query->where('real_auth_status',0)->whereNull('real_auth_name');
-            }elseif ($_GET['real_auth_status']==0){
-                $query->where('real_auth_status',0)->whereNotNull('real_auth_name');
-            }else{
-                $query->where('real_auth_status',$_GET['real_auth_status']);
-            }
-        }
-        if (isset($_GET['work_auth_status']) && $_GET['work_auth_status']!=''){
-            if ($_GET['work_auth_status']==-1){
-                //$query->where('work_auth_status',0)->whereNull('work_auth_company_name');
-                $query->where('work_auth_status',0)->where('work_auth_company_name','');
-            }elseif ($_GET['work_auth_status']==0){
-              //  $query->where('work_auth_status',0)->whereNotNull('work_auth_company_name');
-                $query->where('work_auth_status',0)->where('work_auth_company_name','neq','');
-            }else{
-                $query->where('work_auth_status',$_GET['work_auth_status']);
-            }
-        }
-        if (isset($_GET['education_auth_status']) && $_GET['education_auth_status']!=''){
-            if ($_GET['education_auth_status']==-1){
-                $query->where('education_auth_status',0)->whereNull('education_auth_school');
-            }elseif ($_GET['education_auth_status']==0){
-                $query->where('education_auth_status',0)->whereNotNull('education_auth_school');
-            }else{
-                $query->where('education_auth_status',$_GET['education_auth_status']);
-            }
-        }
-        $query->where('is_del',1)->dateBetween('create_at')
-            ->order('id desc')->page();
-
-    }
-
-    /**
-     * 列表数据处理
-     * @param array $data
-     */
-    protected function _index_page_filter(&$data)
-    {
-
-    }
-    /**
-     * 更新用户余额
-     * @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_money()
-    {
-        $id = $this->app->request->get('id');
-        $this->assign('id',$id);
-        $post = $this->app->request->post();
-        if (isset($post['id']) && $post['id']){
-            $user = Db::name('user')->where('id',$post['id'])->find();
-            $pm = $post['integral']>0 ? 1 : 0;
-            $title = $post['integral']>0 ? '系统增加' : '系统减少';
-            $money = str_replace("-", "", $post['integral']);
-            if ($post['integral']<0){
-                if ($money>$user['integral']){
-                    $this->error('金额超出范围！');
-                }
-            }
-            User::integral($money,$post['id'],$title.$money.'积分',$pm);
-            $this->success('编辑成功！');
-        }else{
-            $this->fetch('form');
-        }
-
-    }
-
-    /**
-     * 禁用用户
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function forbid()
-    {
-        $id = $this->app->request->get('id');
-        $this->assign('id',$id);
-        $post = $this->app->request->post();
-
-        if (isset($post['id']) && $post['id']){
-            Db::name($this->table)->where('id',$post['id'])->update(['status'=>0,'disable_reason'=>$post['disable_reason'],'due_time'=>$post['due_time'],'disable_time'=>date('Y-m-d H:i:s')]);
-            $this->success('成功！');
-        }else{
-            $this->_form($this->table, '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 forbid2()
-    {
-        $this->_save($this->table, ['is_home' => '0']);
-    }
-
-    /**
-     * 置顶用户
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function resume2()
-    {
-        $this->_save($this->table, ['is_home' => '1']);
+        $query = $this->_query($this->table)->like('nickname,phone')->equal('vip_level');
+        $query->dateBetween('create_at')->order('id desc')->page();
     }
 
-
-
-    /**
-     * 表单数据处理
-     * @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)
-    {
-        if ($this->request->isGet()) {
-            if (isset($data['id'])){
-                $money_log = Db::name('UserIntegralLog')->where('user_id',$data['id'])->order('id desc')->select();
-                $data['money_log'] = $money_log;
-                $img = $data['imgs'];
-                $data['imgs'] = explode(',',$img);
-                $data['imgss'] = implode('|',explode(',',$img));
-                $label = $data['label'];
-                $data['label'] = $label;
-                $label = explode(',',$label);
-                $real_auth_img = $data['real_auth_img'];
-                $data['real_auth_img'] = explode(',', $real_auth_img);
-                $data['real_auth_imgs'] = implode('|',explode(',',$real_auth_img));
-                $work_auth_img = $data['work_auth_img'];
-                $data['work_auth_img'] = explode(',', $work_auth_img);
-                $data['work_auth_imgs'] = implode('|',explode(',',$work_auth_img));
-                $education_auth_img = $data['education_auth_img'];
-                $data['education_auth_img'] = explode(',', $education_auth_img);
-                $data['education_auth_imgs'] = implode('|',explode(',',$education_auth_img));
-
-                $introduce_myself_imgs = $data['introduce_myself_imgs'];
-                $data['introduce_myself_imgs'] = explode(',',$introduce_myself_imgs);
-                $data['introduce_myself_imgss'] = implode('|',explode(',',$introduce_myself_imgs));
-                $family_background_imgs = $data['family_background_imgs'];
-                $data['family_background_imgs'] = explode(',',$family_background_imgs);
-                $data['family_background_imgss'] = implode('|',explode(',',$family_background_imgs));
-                $interests_hobbies_imgs = $data['interests_hobbies_imgs'];
-                $data['interests_hobbies_imgs'] = explode(',',$interests_hobbies_imgs);
-                $data['interests_hobbies_imgss'] = implode('|',explode(',',$interests_hobbies_imgs));
-                $love_imgs = $data['love_imgs'];
-                $data['love_imgs'] = explode(',',$love_imgs);
-                $data['love_imgss'] = implode('|',explode(',',$love_imgs));
-                $other_half_imgs = $data['other_half_imgs'];
-                $data['other_half_imgs'] = explode(',',$other_half_imgs);
-                $data['other_half_imgss'] = implode('|',explode(',',$other_half_imgs));
-                $why_single_imgs = $data['why_single_imgs'];
-                $data['why_single_imgs'] = explode(',',$why_single_imgs);
-                $data['why_single_imgss'] = implode('|',explode(',',$why_single_imgs));
-                $look_life_imgs = $data['look_life_imgs'];
-                $data['look_life_imgs'] = explode(',',$look_life_imgs);
-                $data['look_life_imgss'] = implode('|',explode(',',$look_life_imgs));
-                if ($data['hope_age']){
-                    $data['hope_age1'] =  explode(',',$data['hope_age'])[0];
-                    $data['hope_age2'] =  explode(',',$data['hope_age'])[1];
-                }
-                if ($data['hope_height']){
-                    $data['hope_height1'] =  explode(',',$data['hope_height'])[0];
-                    $data['hope_height2'] =  explode(',',$data['hope_height'])[1];
-                }
-                $all = ['all'];
-                $education_list = explode(',',Config::get_values('education'));
-                $data['education_list'] = array_merge($all,$education_list);
-//            dump($data);
-                $this->data = $data;
-                //加入的互选池
-                $join_pool = Db::name('ElectPoolMembers')->alias('a')
-                    ->where('a.user_id',$data['id'])
-                    ->where('b.is_dissolution',1)
-                    ->field('a.user_id,a.create_at,b.user_id as pool_user_id,b.name,b.type,b.imgs')
-                    ->join('ElectPool b','a.pool_id=b.id')
-                    ->order('a.id desc')
-                    ->select();
-                //dump($join_pool);
-                $this->join_pool = $join_pool;
-                //想认识我会员列表
-                $want_to_me = Db::name('UserWantKnow')->alias('a')
-                    ->where('a.to_user_id',$data['id'])
-                    ->field('a.user_id,a.create_at,b.id as uid,b.nickname,b.headimgurl,b.sex,b.wechat_id')
-                    ->join('User b','a.user_id=b.id')
-                    ->order('a.id desc')
-                    ->select();
-//            dump($want_to_me);
-                $this->want_to_me = $want_to_me;
-                //特权开通记录
-                $privilege_log = Db::name('PrivilegeLog')
-                    ->where('user_id',$data['id'])
-                    ->order('id desc')
-                    ->select();
-                $this->privilege_log = $privilege_log;
-                //标签列表
-                $label_list = explode(',',Config::get_values('label'));
-                $label_list = array_unique(array_merge($label_list,$label));
-                $labellists = array();
-                foreach ($label_list as $k=>$v){
-                    if ($label){
-                        foreach ($label as $a=>$b){
-                            if ($b==$v){
-                                $is_hive = 1;
-                                break 1;
-                            }else{
-                                $is_hive = 0;
-                            }
-                        }
-                    }
-                    $labellist['is_hive'] = $is_hive;
-                    $labellist['name'] = $v;
-                    array_push($labellists,$labellist);
-                }
-                $this->label_list = $labellists;
-                //市
-                $pid = Db::name('Area')->where('name',$data['province'])->value('id');
-                $city = Db::name('Area')->where('level',2)->where('pid',$pid)->select();
-                $this->city = $city;
-                //区
-                $pid2 = Db::name('Area')->where('name',$data['city'])->value('id');
-                $area = Db::name('Area')->where('level',3)->where('pid',$pid2)->select();
-                $this->area = $area;
-            }else{
-                //标签列表
-                $label_list = explode(',',Config::get_values('label'));
-                $labellists = array();
-                foreach ($label_list as $k=>$v){
-                    $labellist['is_hive'] = 0;
-                    $labellist['name'] = $v;
-                    array_push($labellists,$labellist);
-                }
-                $this->label_list = $labellists;
-            }
-            //省
-            $province = Db::name('Area')->where('level',1)->select();
-            $this->province = $province;
-        }elseif ($this->request->isPost()) {
-
-            if (isset($data['date_of_birth'])){
-                //计算年龄
-                $data['age'] = date('Y',time())-date('Y',strtotime($data['date_of_birth']));
-            }
-            if (isset($data['province'])){
-                $data['province'] = Db::name('Area')->where('id',$data['province'])->value('name');
-            }
-            if (isset($data['city'])){
-                $data['city'] = Db::name('Area')->where('id',$data['city'])->value('name');
-            }
-            if (isset($data['area'])){
-                $data['area'] = Db::name('Area')->where('id',$data['area'])->value('name');
-            }
-            if (isset($data['label'])){
-                $data['label'] = implode(',',$data['label']);
-            }
-            if (isset($data['imgs'])){
-                $im = explode('|',$data['imgs']);
-                $data['headimgurl'] = $im[0];
-                $data['imgs'] = implode(',',$im);
-            }
-            if (isset($data['introduce_myself_imgs'])){
-                $data['introduce_myself_imgs'] = implode(',',explode('|',$data['introduce_myself_imgs']));
-            }
-            if (isset($data['family_background_imgs'])){
-                $data['family_background_imgs'] = implode(',',explode('|',$data['family_background_imgs']));
-            }
-            if (isset($data['interests_hobbies_imgs'])){
-                $data['interests_hobbies_imgs'] = implode(',',explode('|',$data['interests_hobbies_imgs']));
-            }
-            if (isset($data['love_imgs'])){
-                $data['love_imgs'] = implode(',',explode('|',$data['love_imgs']));
-            }
-            if (isset($data['other_half_imgs'])){
-                $data['other_half_imgs'] = implode(',',explode('|',$data['other_half_imgs']));
-            }
-            if (isset($data['why_single_imgs'])){
-                $data['why_single_imgs'] = implode(',',explode('|',$data['why_single_imgs']));
-            }
-            if (isset($data['look_life_imgs'])){
-                $data['look_life_imgs'] = implode(',',explode('|',$data['look_life_imgs']));
-            }
-            if (isset($data['hope_age1']) && isset($data['hope_age2'])){
-                $data['hope_age'] = $data['hope_age1'].','.$data['hope_age2'];
-                unset($data['hope_age1']);  unset($data['hope_age2']);
-            }
-            if (isset($data['hope_height1']) && isset($data['hope_height2'])){
-                $data['hope_height'] = $data['hope_height1'].','.$data['hope_height2'];
-                unset($data['hope_height1']);  unset($data['hope_height2']);
-            }
-
-            if (isset($data['real_auth_img'])){
-                $data['real_auth_img'] = implode(',',explode('|',$data['real_auth_img']));
-            }
-            if (isset($data['work_auth_img'])){
-                $data['work_auth_img'] = implode(',',explode('|',$data['work_auth_img']));
-            }
-            if (isset($data['education_auth_img'])){
-                $data['education_auth_img'] = implode(',',explode('|',$data['education_auth_img']));
-            }
-
-            if (isset($data['id'])){
-                $data['update_at'] = date('Y-m-d H:i:s');
-            }else{
-                $data['create_at'] = date('Y-m-d H:i:s');
-            }
-
-
-        }
-    }
-
-    /**
-     * 获取市
-     */
-    public function get_city(){
-        $id = $this->app->request->get('id');
-        $city_list = Db::name('Area')->where('pid',$id)->where('level',2)->select();
-        $this->success('成功',$city_list);
-    }
-
-    /**
-     * 获取区
-     */
-    public function get_area(){
-        $id = $this->app->request->get('id');
-        $area_list = Db::name('Area')->where('pid',$id)->where('level',3)->select();
-        $this->success('成功',$area_list);
-    }
-
-    /**
-     * 会员详情
-     * @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 userinfo()
-    {
-        $this->title = '会员详情';
-        $this->_form($this->table, 'userinfo');
-    }
-
-
-    /**
-     * 警告消息
-     * @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 warning()
-    {
-        $id = $this->app->request->get('id');
-        $this->assign('id',$id);
-        $post = $this->app->request->post();
-        if (isset($post['id']) && $post['id']){
-            Message::create_message($post['id'],$post['warnimg'],$post['title'],1);
-            $this->success('成功！');
-        }else{
-            $this->fetch('warning');
-        }
-    }
-
-
-    /**
-     * 实名认证审核
-     * @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 real_audit()
-    {
-        $id = $this->app->request->get('id');
-        $this->assign('id',$id);
-        $post = $this->app->request->post();
-        if (isset($post['id']) && $post['id']){
-            if (Db::name($this->table)->where('id',$post['id'])->update(['real_auth_status'=>$post['real_auth_status'],'real_auth_why'=>$post['real_auth_why'],'real_auth_time'=>date('Y-m-d H:i:s')])){
-                $this->success('成功！');
-            }else{
-                $this->error('失败');
-            }
-        }else{
-            $data = Db::name($this->table)->where('id',$id)->find();
-            $data['real_auth_img'] = explode(',',$data['real_auth_img']);
-            $this->data = $data;
-            $this->fetch('real_audit');
-        }
-    }
-
-    /**
-     * 工作认证审核
-     * @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 work_audit()
-    {
-        $id = $this->app->request->get('id');
-        $this->assign('id',$id);
-        $post = $this->app->request->post();
-        if (isset($post['id']) && $post['id']){
-            if (Db::name($this->table)->where('id',$post['id'])->update(['work_auth_status'=>$post['work_auth_status'],'work_auth_why'=>$post['work_auth_why'],'work_auth_time'=>date('Y-m-d H:i:s')])){
-                $this->success('成功！');
-            }else{
-                $this->error('失败');
-            }
-        }else{
-            $data = Db::name($this->table)->where('id',$id)->find();
-            $data['work_auth_img'] = explode(',',$data['work_auth_img']);
-            $this->data = $data;
-            $this->fetch('work_audit');
-        }
-    }
-
-    /**
-     * 工作认证审核
-     * @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 education_audit()
-    {
-        $id = $this->app->request->get('id');
-        $this->assign('id',$id);
-        $post = $this->app->request->post();
-        if (isset($post['id']) && $post['id']){
-            if (Db::name($this->table)->where('id',$post['id'])->update(['education_auth_status'=>$post['education_auth_status'],'education_auth_why'=>$post['education_auth_why'],'education_time'=>date('Y-m-d H:i:s')])){
-                $this->success('成功！');
-            }else{
-                $this->error('失败');
-            }
-        }else{
-            $data = Db::name($this->table)->where('id',$id)->find();
-            $data['education_auth_img'] = explode(',',$data['education_auth_img']);
-            $this->data = $data;
-            $this->fetch('education_audit');
-        }
-    }
-
-    /**
-     * 添加信息
-     * @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->_form($this->table, 'edit');
-    }
-
-
-    /**
-     * 编辑信息
-     * @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, 'edit');
-    }
-
-
-    /**
-     * 对另一半的要求
-     * @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 hope()
-    {
-        $this->title = '对另一半的要求';
-        $this->_form($this->table, 'hope');
-    }
-
-    /**
-     * 认证信息编辑
-     * @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 auth()
-    {
-        $this->title = '认证信息编辑';
-        $this->_form($this->table, 'auth');
-    }
-
-
-    /**
-     * 表单结果处理
-     * @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 del()
-    {
-        $this->_save($this->table, ['is_del' => '0']);
-    }
 }

application/store/controller/Message.php

@@ -16,12 +16,10 @@
 namespace app\store\controller;
 
 use library\Controller;
-use think\Db;
-use app\common\model\User;
 
 /**
- * 消息信息管理
- * Class Member
+ * 短信发送管理
+ * Class Message
  * @package app\store\controller
  */
 class Message extends Controller
@@ -30,10 +28,10 @@ class Message extends Controller
      * 绑定数据表
      * @var string
      */
-    protected $table = 'Message';
+    protected $table = 'StoreMemberSmsHistory';
 
     /**
-     * 举报信息管理
+     * 短信发送管理
      * @auth true
      * @menu true
      * @throws \think\Exception
@@ -44,157 +42,20 @@ class Message extends Controller
      */
     public function index()
     {
-        $this->title = '消息信息管理';
-        $query = $this->_query($this->table)->alias('a');
-        if (isset($_GET['keyword']) && $_GET['keyword']){
-            $query->where('a.content|b.nickname|a.user_id','like','%'.$_GET['keyword'].'%');
-        }
-        if (isset($_GET['create_at']) && $_GET['create_at']){
-            $time = explode(' - ',$_GET['create_at']);
-            $start_date_time = $time[0].' 00:00:00';
-            $end_date_time = $time[1].' 23:59:59';
-            $query->whereBetweenTime('a.create_at',$start_date_time,$end_date_time);
-        }
-        $query->join('User b','a.user_id=b.id')
-            ->field('a.*,b.nickname,b.headimgurl,b.is_del')
-            ->order('a.id desc')->page();
+        $this->title = '短信发送管理';
+        $query = $this->_query($this->table)->like('phone,content,result');
+        $query->dateBetween('create_at')->order('id desc')->page();
     }
 
     /**
-     * 列表数据处理
-     * @param array $data
-     */
-    protected function _index_page_filter(&$data)
-    {
-        foreach ($data as $k=>$vo) {
-
-        }
-    }
-    /**
-     * 更新用户余额
-     * @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_money()
-    {
-        $id = $this->app->request->get('id');
-        $this->assign('id',$id);
-        $post = $this->app->request->post();
-        if (isset($post['id']) && $post['id']){
-            $user = Db::name('user')->where('id',$post['id'])->find();
-            $pm = $post['integral']>0 ? 1 : 0;
-            $title = $post['integral']>0 ? '系统增加' : '系统减少';
-            $money = str_replace("-", "", $post['integral']);
-            if ($post['integral']<0){
-                if ($money>$user['integral']){
-                    $this->error('金额超出范围！');
-                }
-            }
-            User::integral($money,$post['id'],$title.$money.'积分',$pm);
-            $this->success('编辑成功！');
-        }else{
-            $this->fetch('form');
-        }
-
-    }
-
-    /**
-     * 解散
+     * 删除短信记录
      * @auth true
      * @throws \think\Exception
      * @throws \think\exception\PDOException
      */
-    public function forbid()
-    {
-        $this->_save($this->table, ['is_dissolution' => '0']);
-    }
-
-    /**
-     * 启用
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function resume()
-    {
-        $this->_save($this->table, ['is_dissolution' => '1']);
-    }
-
-    /**
-     * 设置公开
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function set_type()
-    {
-        $this->_save($this->table, ['type' => '1']);
-    }
-
-    /**
-     * 设置私密
-     * @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 set_type2()
-    {
-        $id = $this->app->request->get('id');
-        $this->assign('id',$id);
-        $post = $this->app->request->post();
-        if (isset($post['id']) && $post['id']){
-            Db::name($this->table)->where('id',$post['id'])->update(['type'=>2,'update_at'=>date('Y-m-d H:i:s'),'password'=>$post['password']]);
-            $this->success('设置成功！');
-        }else{
-            $this->fetch('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)
-    {
-        if ($this->request->isGet()) {
-            $user = Db::name('User')->where('id',$data['user_id'])->field('nickname,headimgurl')->find();
-            $data['nickname'] = $user['nickname'];
-            $data['headimgurl'] = $user['headimgurl'];
-            $this->data = $data;
-            $member = Db::name('ElectPoolMembers')->alias('a')->where('pool_id',$data['id'])
-                ->join('User b','a.user_id=b.id')
-                ->field('a.*,b.nickname,b.headimgurl,b.sex')
-                ->select();
-            $this->list = $member;
-        }
-    }
-
-    /**
-     * 会员详情
-     * @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 poolinfo()
+    public function remove()
     {
-        $this->_form($this->table, 'poolinfo');
+        $this->_delete($this->table);
     }
 
 }

application/store/controller/OfficialMessage.php

@@ -1,141 +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 think\Db;
-use app\common\model\User;
-
-/**
- * 官方消息
- * Class Member
- * @package app\store\controller
- */
-class OfficialMessage extends Controller
-{
-    /**
-     * 绑定数据表
-     * @var string
-     */
-    protected $table = 'OfficialMessage';
-
-    /**
-     * 官方消息
-     * @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)
-            ->like('title')
-            ->where('is_del',1)
-            ->order('id desc')
-            ->page();
-    }
-
-    /**
-     * 列表数据处理
-     * @param array $data
-     */
-    protected function _index_page_filter(&$data)
-    {
-    }
-
-    /**
-     * 解散
-     * @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\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function add()
-    {
-        $this->create_at = date('Y-m-d H:i:s');
-        $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->_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)
-    {
-        if ($this->request->isGet()) {
-
-        }
-    }
-    /**
-     * 软删除
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function del()
-    {
-        $this->_save($this->table, ['is_del' => '0']);
-    }
-}

application/store/controller/Order.php

@@ -0,0 +1,126 @@
+<?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';
+        }
+    }
+
+}

application/store/controller/Privilege.php

@@ -1,141 +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 think\Db;
-use app\common\model\User;
-
-/**
- * 特权价格管理
- * Class Member
- * @package app\store\controller
- */
-class Privilege extends Controller
-{
-    /**
-     * 绑定数据表
-     * @var string
-     */
-    protected $table = 'PrivilegePrice';
-
-    /**
-     * 举报信息管理
-     * @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)
-            ->like('title')
-            ->where('is_del',1)
-            ->order('id desc')
-            ->page();
-    }
-
-    /**
-     * 列表数据处理
-     * @param array $data
-     */
-    protected function _index_page_filter(&$data)
-    {
-    }
-
-    /**
-     * 解散
-     * @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\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function add()
-    {
-        $this->create_at = date('Y-m-d H:i:s');
-        $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->_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)
-    {
-        if ($this->request->isGet()) {
-
-        }
-    }
-    /**
-     * 软删除
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function del()
-    {
-        $this->_save($this->table, ['is_del' => '0']);
-    }
-}

application/store/controller/Report.php

@@ -1,207 +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 think\Db;
-use app\common\model\User;
-
-/**
- * 举报信息管理
- * Class Member
- * @package app\store\controller
- */
-class Report extends Controller
-{
-    /**
-     * 绑定数据表
-     * @var string
-     */
-    protected $table = 'UserReport';
-
-    /**
-     * 举报信息管理
-     * @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)->alias('a');
-        if (isset($_GET['keyword']) && $_GET['keyword']){
-            $query->where('a.content|b.nickname|c.nickname|a.user_id|a.to_user_id','like','%'.$_GET['keyword'].'%');
-        }
-        if (isset($_GET['create_at']) && $_GET['create_at']){
-            $time = explode(' - ',$_GET['create_at']);
-            $start_date_time = $time[0].' 00:00:00';
-            $end_date_time = $time[1].' 23:59:59';
-            $query->whereBetweenTime('a.create_at',$start_date_time,$end_date_time);
-        }
-        $query->join('User b','a.user_id=b.id')
-            ->join('User c','a.to_user_id=c.id')
-            ->field('a.*,b.nickname,b.headimgurl,b.is_del as b_is_del,c.nickname as to_nickname,c.headimgurl as to_headimgurl,c.is_del as c_is_del')
-            ->order('a.id desc')->page();
-    }
-
-    /**
-     * 列表数据处理
-     * @param array $data
-     */
-    protected function _index_page_filter(&$data)
-    {
-
-        foreach ($data as &$vo) {
-            if ($vo['imgs']){
-                $vo['imgs'] = explode(',',$vo['imgs']);
-            }else{
-                $vo['imgs'] = [];
-            }
-        }
-        //dump($data);
-    }
-    /**
-     * 更新用户余额
-     * @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_money()
-    {
-        $id = $this->app->request->get('id');
-        $this->assign('id',$id);
-        $post = $this->app->request->post();
-        if (isset($post['id']) && $post['id']){
-            $user = Db::name('user')->where('id',$post['id'])->find();
-            $pm = $post['integral']>0 ? 1 : 0;
-            $title = $post['integral']>0 ? '系统增加' : '系统减少';
-            $money = str_replace("-", "", $post['integral']);
-            if ($post['integral']<0){
-                if ($money>$user['integral']){
-                    $this->error('金额超出范围！');
-                }
-            }
-            User::integral($money,$post['id'],$title.$money.'积分',$pm);
-            $this->success('编辑成功！');
-        }else{
-            $this->fetch('form');
-        }
-
-    }
-
-    /**
-     * 解散
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function forbid()
-    {
-        $this->_save($this->table, ['is_dissolution' => '0']);
-    }
-
-    /**
-     * 启用
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function resume()
-    {
-        $this->_save($this->table, ['is_dissolution' => '1']);
-    }
-
-    /**
-     * 设置公开
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function set_type()
-    {
-        $this->_save($this->table, ['type' => '1']);
-    }
-
-    /**
-     * 设置私密
-     * @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 set_type2()
-    {
-        $id = $this->app->request->get('id');
-        $this->assign('id',$id);
-        $post = $this->app->request->post();
-        if (isset($post['id']) && $post['id']){
-            Db::name($this->table)->where('id',$post['id'])->update(['type'=>2,'update_at'=>date('Y-m-d H:i:s'),'password'=>$post['password']]);
-            $this->success('设置成功！');
-        }else{
-            $this->fetch('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)
-    {
-        if ($this->request->isGet()) {
-            $user = Db::name('User')->where('id',$data['user_id'])->field('nickname,headimgurl')->find();
-            $data['nickname'] = $user['nickname'];
-            $data['headimgurl'] = $user['headimgurl'];
-            $this->data = $data;
-            $member = Db::name('ElectPoolMembers')->alias('a')->where('pool_id',$data['id'])
-                ->join('User b','a.user_id=b.id')
-                ->field('a.*,b.nickname,b.headimgurl,b.sex')
-                ->select();
-            $this->list = $member;
-        }
-    }
-
-    /**
-     * 会员详情
-     * @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 poolinfo()
-    {
-        $this->_form($this->table, 'poolinfo');
-    }
-
-}

application/store/controller/Topic.php

@@ -1,154 +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 think\Db;
-use app\common\model\User;
-
-/**
- * 话题管理
- * Class Member
- * @package app\store\controller
- */
-class Topic extends Controller
-{
-    /**
-     * 绑定数据表
-     * @var string
-     */
-    protected $table = 'Topic';
-
-    /**
-     * 举报信息管理
-     * @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)
-            ->like('title')
-            ->where('is_del',1)
-            ->order('id desc')
-            ->page();
-    }
-
-    /**
-     * 列表数据处理
-     * @param array $data
-     */
-    protected function _index_page_filter(&$data)
-    {
-    }
-
-    /**
-     * 解散
-     * @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\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     * @throws \think\exception\PDOException
-     */
-    public function add()
-    {
-        $this->create_at = date('Y-m-d H:i:s');
-        $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->_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)
-    {
-        if ($this->request->isGet()) {
-
-        }elseif ($this->request->isPost()){
-            if (!isset($data['img']) || $data['img']==''){
-                $this->error('请上传图片');
-            }
-            if (!isset($data['background_img']) || $data['background_img']==''){
-                $this->error('请上传背景图');
-            }
-           if (isset($data['is_official']) && $data['is_official']==1){
-               $user = Db::name('user')->where('id',$data['official_user_id'])->where('is_del',1)->where('is_cancellation_account',1)->count();
-               if (!$user){
-                   $this->error('用户不存在');
-               }
-           }
-        }
-    }
-    /**
-     * 软删除
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function del()
-    {
-        $this->_save($this->table, ['is_del' => '0']);
-    }
-}

application/store/controller/UserRecharge.php

@@ -1,127 +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 UserRecharge
- * @package app\store\controller
- */
-class UserRecharge extends Controller
-{
-    
-
-    /**
-     * 绑定数据表
-     * @var string
-     */
-    protected $table = 'UserRecharge';
-
-    /**
-     * 积分充值列表
-     * @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)->alias('a')
-            ->join('User b','a.user_id=b.id')
-            ->field('a.*,b.nickname,b.headimgurl,b.phone')->like('nickname')->equal('paid');
-        $query->order('a.id desc')->page();
-    }
-
-    /**
-     * 添加
-     * @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->create_at = date('Y-m-d H:i:s');
-        $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->_form($this->table, 'form');
-    }
-
-
-    /**
-     * 禁用商品分类
-     * @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 del()
-    {
-        $this->_save($this->table, ['is_del' => '0']);
-    }
-
-    /**
-     * 删除商品分类
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function remove()
-    {
-        $this->_delete($this->table);
-    }
-
-}

application/store/controller/UserWithdraw.php

@@ -1,127 +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 UserRecharge
- * @package app\store\controller
- */
-class UserWithdraw extends Controller
-{
-    
-
-    /**
-     * 绑定数据表
-     * @var string
-     */
-    protected $table = 'UserWithdraw';
-
-    /**
-     * 积分提现列表
-     * @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)->alias('a')
-            ->join('User b','a.user_id=b.id')
-            ->field('a.*,b.nickname,b.headimgurl,b.phone')->like('nickname')->equal('paid');
-        $query->order('a.id desc')->page();
-    }
-
-    /**
-     * 添加
-     * @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->create_at = date('Y-m-d H:i:s');
-        $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->_form($this->table, 'form');
-    }
-
-
-    /**
-     * 禁用商品分类
-     * @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 del()
-    {
-        $this->_save($this->table, ['is_del' => '0']);
-    }
-
-    /**
-     * 删除商品分类
-     * @auth true
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
-     */
-    public function remove()
-    {
-        $this->_delete($this->table);
-    }
-
-}

application/store/view/article/form.html

@@ -1,59 +0,0 @@
-<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 class="layui-form-item">
-            <label class="layui-col-xs2 think-form-label">状态</label>
-            <div class="layui-input-block">
-                <label class="think-radio">
-                    {if !isset($vo.id)}
-                    <input checked type="radio" name="is_show" value="1" lay-ignore> 正常
-                    <input type="radio" name="is_show" value="0" lay-ignore> 禁用
-                    {else}
-                    {if isset($vo.is_show) && $vo.is_show eq 1}
-                    <input checked type="radio" name="is_show" value="1" lay-ignore> 正常
-                    <input type="radio" name="is_show" value="0" lay-ignore> 禁用
-                    {else}
-                    <input type="radio" name="is_show" value="1" lay-ignore> 正常
-                    <input checked type="radio" name="is_show" value="0" lay-ignore> 禁用
-                    {/if}
-                    {/if}
-                </label>
-            </div>
-        </div>
-
-
-        <div class="layui-form-item">
-            <label class="layui-col-xs2 think-form-label">内容</label>
-            <label class="layui-col-xs10">
-                 <textarea name="content">{$vo.content|default=''|raw}</textarea>
-            </label>
-        </div>
-
-
-    </div>
-
-    <div class="hr-line-dashed"></div>
-    <div class="layui-form-item text-center">
-        <input type='hidden' value="<?php echo date('Y-m-d H:i:s'); ?>" name='create_at'>
-        {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>
-<script>
-    window.form.render();
-    require(['ckeditor', 'angular'], function () {
-        window.createEditor('[name="content"]', {height: 300});
-        var app = angular.module("GoodsForm", []).run(callback);
-        angular.bootstrap(document.getElementById(app.name), [app.name]);
-
-    })
-</script>

application/store/view/article/index.html

@@ -1,72 +0,0 @@
-{extend name='admin@main'}
-
-{block name="button"}
-{if auth("store/article/add_tuwen")}
-<button data-modal='{:url("add")}' data-title="添加" class='layui-btn layui-btn-sm layui-btn-primary'>添加</button>
-{/if}
-{/block}
-
-{block name="content"}
-<div class="think-box-shadow">
-    {include file='article/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-left nowrap'>答</th>-->
-            <th class='text-left nowrap'>状态</th>
-            <th class="text-left">时间</th>
-            <th></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-left nowrap'>
-                {eq name='vo.is_show' value='0'}<span class="layui-badge">已禁用</span>{else}<span class="layui-badge layui-bg-green">使用中</span>{/eq}<br>
-            </td>
-            <td class='text-left nowrap'>{$vo.create_at|default='--'}</td>
-            <td class='text-left nowrap'>
-
-                {if auth("store/article/edit_tuwen")}
-                <a data-title="编辑" class="layui-btn layui-btn-sm" data-modal='{:url("edit")}?id={$vo.id}'>编 辑</a>
-                {/if}
-                {if auth("store/article/del")}
-                <a class="layui-btn layui-btn-sm layui-btn-danger" data-confirm="确定要删除数据吗?" data-action="{:url('del')}" 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>
-<script>
-        function tankuang(url){
-            var loadstr = '<video width="100%" height="100%"  controls="controls" autobuffer="autobuffer"  autoplay="autoplay" loop="loop"><source src="'+ url +'" type="video/mp4"></source></video>'
-            layer.open({
-                type: 1,
-                title: '播放视频',
-                content: loadstr,
-            });
-        }
-</script>
-{/block}
-

application/store/view/article/index_search.html

@@ -1,30 +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="ask" value="{$Think.get.ask|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_show">
-                    {foreach [''=>'- 全部状态 -','1'=>'正常','0'=>'禁用'] as $k=>$v}
-                    {eq name='Think.get.is_show' 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>

application/store/view/banner/form.html

@@ -1,30 +0,0 @@
-<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-xs8 think-form-group-left">
-                <input name="img" required value='{$vo.img|default=""}' placeholder="请上传图片" class="layui-input">
-            </label>
-            <a class="layui-col-xs2 layui-btn think-form-group-right" data-file="btn" data-field="img" data-type="png,jpg,gif">
-                <i class="layui-icon layui-icon-upload"></i> 上传图片
-            </a>
-        </div>
-
-        <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">
-        {if isset($vo.id)}<input type='hidden' value="<?php echo date('Y-m-d H:i:s'); ?>" name='update_at'>{else}<input type='hidden' value="<?php echo date('Y-m-d H:i:s'); ?>" name='create_at'>{/if}
-        {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>
-<script>form.render()</script>

application/store/view/banner/index.html

@@ -1,56 +0,0 @@
-{extend name='admin@main'}
-
-{block name="button"}
-{if auth("store/goods_cate/add")}
-<button data-modal='{:url("add")}' data-title="添加banner" class='layui-btn layui-btn-sm layui-btn-primary'>添加banner</button>
-{/if}
-{/block}
-
-{block name="content"}
-<div class="think-box-shadow">
-    {include file='banner/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-center">时间</th>
-            <th></th>
-        </tr>
-        </thead>
-        {/notempty}
-        <tbody>
-        {foreach $list as $key=>$vo}
-        <tr>
-            <td class='text-left nowrap'>
-                {$vo.title|default=''}
-            </td>
-            <td class='text-left nowrap'>
-                <img data-tips-image style="width:20px;height:20px;vertical-align:top" src="{$vo.img|default=''}" class="margin-right-5">
-            </td>
-            <td class='text-left nowrap'>
-                {if $vo.is_show eq 1}显示{else}隐藏{/if}
-            </td>
-            <td class='text-center nowrap'>{$vo.create_at}</td>
-            <td class='text-left nowrap'>
-                {if auth("store/goods_cate/edit")}
-                <a data-title="编辑banner" class="layui-btn layui-btn-sm" data-modal='{:url("edit")}?id={$vo.id}'>编 辑</a>
-                {/if}
-                {if $vo.is_show eq 1 and auth("store/banner/forbid")}
-                <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('forbid')}" data-value="id#{$vo.id};is_show#0">隐 藏</a>
-                {elseif auth("store/banner/resume")}
-                <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('resume')}" data-value="id#{$vo.id};is_show#1">显 示</a>
-                {/if}
-                {if auth("store/banner/del")}
-                <a class="layui-btn layui-btn-sm layui-btn-danger" data-confirm="确定要删除数据吗?" data-action="{:url('del')}" 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}