Compare commits

..

No commits in common. "ccc3bbc73bbdb6076793d0a44856d30c354577bc" and "5490c99062f6ce4071ff59558a1558ad7951673a" have entirely different histories.

7 changed files with 108 additions and 100 deletions

View File

@ -19,7 +19,6 @@ namespace app\wechat\controller;
use app\wechat\model\WechatAuto;
use think\admin\Controller;
use think\admin\extend\CodeExtend;
use think\admin\helper\QueryHelper;
/**
* 关注自动回复
@ -42,14 +41,15 @@ class Auto extends Controller
* 关注自动回复
* @auth true
* @menu true
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public function index()
{
$this->title = '关注自动回复';
WechatAuto::mQuery(null, function (QueryHelper $query) {
$query->like('code,type')->equal('status');
$query->dateBetween('create_at')->order('time asc')->page();
});
$query = WechatAuto::mQuery()->like('code,type');
$query->equal('status')->dateBetween('create_at')->order('time asc')->page();
}
/**

View File

@ -17,7 +17,6 @@
namespace app\wechat\controller;
use app\wechat\model\WechatFans;
use app\wechat\model\WechatFansTags;
use app\wechat\service\WechatService;
use think\admin\Controller;
use think\admin\helper\QueryHelper;
@ -116,7 +115,7 @@ class Fans extends Controller
{
try {
WechatFans::mQuery()->empty();
WechatFansTags::mQuery()->empty();
WechatFans::mQuery()->empty();
$this->success('清空用户数据成功!');
} catch (HttpResponseException $exception) {
throw $exception;

View File

@ -19,7 +19,6 @@ namespace app\wechat\controller;
use app\wechat\model\WechatKeys;
use app\wechat\service\WechatService;
use think\admin\Controller;
use think\admin\helper\QueryHelper;
use think\exception\HttpResponseException;
/**
@ -42,6 +41,9 @@ class Keys extends Controller
* 回复规则管理
* @auth true
* @menu true
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public function index()
{
@ -57,10 +59,8 @@ class Keys extends Controller
}
// 数据列表分页处理
$this->title = '回复规则管理';
WechatKeys::mQuery(null, function (QueryHelper $query) {
$query->equal('status')->like('keys,type')->dateBetween('create_at');
$query->whereNotIn('keys', ['subscribe', 'default'])->order('sort desc,id desc')->page();
});
$query = WechatKeys::mQuery()->whereNotIn('keys', ['subscribe', 'default']);
$query->equal('status')->like('keys,type')->dateBetween('create_at')->order('sort desc,id desc')->page();
}
/**

View File

@ -20,7 +20,6 @@ use app\wechat\model\WechatNews;
use app\wechat\model\WechatNewsArticle;
use app\wechat\service\MediaService;
use think\admin\Controller;
use think\admin\helper\QueryHelper;
use think\admin\service\AdminService;
/**
@ -34,13 +33,14 @@ class News extends Controller
* 微信图文管理
* @auth true
* @menu true
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public function index()
{
$this->title = '微信图文列表';
WechatNews::mQuery(null, function (QueryHelper $query) {
$query->where(['is_deleted' => 0])->order('id desc')->page();
});
WechatNews::mQuery()->where(['is_deleted' => 0])->order('id desc')->page();
}
/**
@ -60,6 +60,9 @@ class News extends Controller
/**
* 图文选择器
* @auth true
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public function select()
{

View File

@ -1,120 +1,126 @@
@charset "UTF-8";
@import "_config.less";
.layui-layout-theme-white > .layui-layout-admin {
> .layui-side {
box-shadow: none;
background-color: #fff !important;
.layui-layout-theme-white {
.layui-logo {
color: #333;
> .layui-layout-admin {
> .layui-side {
box-shadow: none;
font-weight: bold;
}
background-color: #fff !important;
.layui-side-scroll {
display: flex !important;
box-sizing: border-box;
.layui-nav-child {
background: none !important;
.layui-logo {
color: #333;
box-shadow: none;
font-weight: bold;
}
.layui-side-icon {
width: 60px;
display: none;
background: #fff;
.layui-side-scroll {
display: flex !important;
box-sizing: border-box;
a {
height: 60px;
display: block;
text-align: center;
line-height: 60px;
.layui-nav-child {
background: none !important;
}
.layui-icon {
color: #999;
}
> .layui-this {
.layui-side-icon {
width: 60px;
display: none;
background: #fff;
.layui-icon {
color: #090 !important;
}
}
}
.layui-side-tree {
flex: 1;
.layui-nav-item {
background: none !important;
border-bottom-color: #fff;
a {
color: #333 !important;
background: none !important;
border-bottom: none !important;
height: 60px;
display: block;
text-align: center;
line-height: 60px;
}
&:hover {
color: #090 !important;
.layui-icon {
color: #999;
}
> .layui-this {
background: #fff;
.layui-icon {
color: #098 !important;
}
}
}
.layui-this, &.layui-this {
> a {
color: #090 !important;
.layui-side-tree {
flex: 1;
.layui-nav-item {
background: none !important;
border-bottom-color: #fff;
a {
color: #333 !important;
background: none !important;
font-weight: bold !important;
border-bottom: none !important;
&:hover {
background: none !important;
color: #098 !important;
}
}
}
&ed > a {
color: #999 !important;
.layui-this, &.layui-this {
> a {
color: #098 !important;
background: none !important;
font-weight: bold !important;
&:hover {
background: none !important;
}
}
}
&ed > a {
color: #999 !important;
}
}
}
}
}
}
> .layui-body > .think-page-body > .layui-card {
&:before {
top: 0;
left: 0;
bottom: 0;
z-index: 4;
content: '';
position: absolute;
box-shadow: @ShadowBodyRight;
}
> .layui-body {
> .think-page-body > .layui-card {
&:before {
top: 0;
left: 0;
bottom: 0;
z-index: 4;
content: '';
position: absolute;
box-shadow: @ShadowBodyRight;
}
> .layui-card-header {
border-left: @BoxBottomLine;
}
}
> .layui-header {
background: #fff !important;
.layui-nav-item {
&.layui-this > a {
color: #090 !important;
font-weight: bold;
background: none !important;
> .layui-card-header {
box-shadow: none !important;
border-left: @BoxBottomLine;
}
}
}
> a {
color: #333 !important;
> .layui-header {
background: none !important;
&:hover {
color: #090 !important;
.layui-nav-item {
&.layui-this > a {
color: #098 !important;
font-weight: bold;
background: none !important;
}
> a {
color: #333 !important;
&:hover {
color: #098 !important;
background: none !important;
}
}
}
}
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long