-
-
+{% block content %}
+
+
+
+
+
+ {{ partial('setting/wechat_oa_basic') }}
+
+
+ {{ partial('setting/wechat_oa_notice') }}
+
+
+ {{ partial('setting/wechat_oa_menu') }}
+
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Admin/Views/setting/wechat_oa_basic.volt b/app/Http/Admin/Views/setting/wechat_oa_basic.volt
new file mode 100644
index 00000000..84e952c5
--- /dev/null
+++ b/app/Http/Admin/Views/setting/wechat_oa_basic.volt
@@ -0,0 +1,66 @@
+
+
+
\ No newline at end of file
diff --git a/app/Http/Admin/Views/setting/wechat_oa_menu.volt b/app/Http/Admin/Views/setting/wechat_oa_menu.volt
new file mode 100644
index 00000000..0c34b148
--- /dev/null
+++ b/app/Http/Admin/Views/setting/wechat_oa_menu.volt
@@ -0,0 +1,42 @@
+
+
diff --git a/app/Http/Admin/Views/setting/wechat_oa_notice.volt b/app/Http/Admin/Views/setting/wechat_oa_notice.volt
new file mode 100644
index 00000000..0b7eee16
--- /dev/null
+++ b/app/Http/Admin/Views/setting/wechat_oa_notice.volt
@@ -0,0 +1,47 @@
+{% set notice_template = oa.notice_template|json_decode %}
+
+
\ No newline at end of file
diff --git a/app/Http/Home/Controllers/ErrorController.php b/app/Http/Home/Controllers/ErrorController.php
index a0155342..dfa6f7e1 100644
--- a/app/Http/Home/Controllers/ErrorController.php
+++ b/app/Http/Home/Controllers/ErrorController.php
@@ -2,6 +2,8 @@
namespace App\Http\Home\Controllers;
+use App\Models\User as UserModel;
+use App\Services\Auth\Home as HomeAuth;
use App\Services\Service as AppService;
use App\Traits\Response as ResponseTrait;
@@ -11,8 +13,27 @@ use App\Traits\Response as ResponseTrait;
class ErrorController extends \Phalcon\Mvc\Controller
{
+ /**
+ * @var array
+ */
+ protected $siteInfo;
+
+ /**
+ * @var UserModel
+ */
+ protected $authUser;
+
use ResponseTrait;
+ public function initialize()
+ {
+ $this->siteInfo = $this->getSiteInfo();
+ $this->authUser = $this->getAuthUser();
+
+ $this->view->setVar('site_info', $this->siteInfo);
+ $this->view->setVar('auth_user', $this->authUser);
+ }
+
/**
* @Get("/400", name="home.error.400")
*/
@@ -82,4 +103,21 @@ class ErrorController extends \Phalcon\Mvc\Controller
$this->view->setVar('message', $siteInfo['closed_tips']);
}
+ protected function getSiteInfo()
+ {
+ $appService = new AppService();
+
+ return $appService->getSettings('site');
+ }
+
+ protected function getAuthUser()
+ {
+ /**
+ * @var HomeAuth $auth
+ */
+ $auth = $this->getDI()->get('auth');
+
+ return $auth->getCurrentUser();
+ }
+
}
diff --git a/app/Http/Home/Controllers/HelpController.php b/app/Http/Home/Controllers/HelpController.php
index d525a80a..22d7bc29 100644
--- a/app/Http/Home/Controllers/HelpController.php
+++ b/app/Http/Home/Controllers/HelpController.php
@@ -2,6 +2,7 @@
namespace App\Http\Home\Controllers;
+use App\Http\Home\Services\Index as IndexService;
use App\Services\Logic\Help\HelpInfo as HelpInfoService;
use App\Services\Logic\Help\HelpList as HelpListService;
@@ -12,7 +13,7 @@ class HelpController extends Controller
{
/**
- * @Get("/index", name="home.help.index")
+ * @Get("/", name="home.help.index")
*/
public function indexAction()
{
@@ -34,9 +35,19 @@ class HelpController extends Controller
$help = $service->handle($id);
+ $featuredCourses = $this->getFeaturedCourses();
+
$this->seo->prependTitle(['帮助', $help['title']]);
$this->view->setVar('help', $help);
+ $this->view->setVar('featured_courses', $featuredCourses);
+ }
+
+ protected function getFeaturedCourses()
+ {
+ $service = new IndexService();
+
+ return $service->getSimpleFeaturedCourses();
}
}
diff --git a/app/Http/Home/Controllers/LayerController.php b/app/Http/Home/Controllers/LayerController.php
index 2d15d84b..7a57aacf 100644
--- a/app/Http/Home/Controllers/LayerController.php
+++ b/app/Http/Home/Controllers/LayerController.php
@@ -4,6 +4,7 @@ namespace App\Http\Home\Controllers;
use App\Models\User as UserModel;
use App\Services\Auth\Home as HomeAuth;
+use App\Services\Service as AppService;
use App\Traits\Response as ResponseTrait;
use App\Traits\Security as SecurityTrait;
use Phalcon\Mvc\Dispatcher;
@@ -11,6 +12,11 @@ use Phalcon\Mvc\Dispatcher;
class LayerController extends \Phalcon\Mvc\Controller
{
+ /**
+ * @var array
+ */
+ protected $siteInfo;
+
/**
* @var UserModel
*/
@@ -33,11 +39,20 @@ class LayerController extends \Phalcon\Mvc\Controller
public function initialize()
{
+ $this->siteInfo = $this->getSiteInfo();
$this->authUser = $this->getAuthUser();
+ $this->view->setVar('site_info', $this->siteInfo);
$this->view->setVar('auth_user', $this->authUser);
}
+ protected function getSiteInfo()
+ {
+ $appService = new AppService();
+
+ return $appService->getSettings('site');
+ }
+
protected function getAuthUser()
{
/**
diff --git a/app/Http/Home/Controllers/PageController.php b/app/Http/Home/Controllers/PageController.php
index 6796d63d..38b31f97 100644
--- a/app/Http/Home/Controllers/PageController.php
+++ b/app/Http/Home/Controllers/PageController.php
@@ -2,6 +2,7 @@
namespace App\Http\Home\Controllers;
+use App\Http\Home\Services\Index as IndexService;
use App\Services\Logic\Page\PageInfo as PageInfoService;
/**
@@ -19,9 +20,19 @@ class PageController extends Controller
$page = $service->handle($id);
- $this->seo->prependTitle(['单页', $page['title']]);
+ $featuredCourses = $this->getFeaturedCourses();
+
+ $this->seo->prependTitle($page['title']);
$this->view->setVar('page', $page);
+ $this->view->setVar('featured_courses', $featuredCourses);
+ }
+
+ protected function getFeaturedCourses()
+ {
+ $service = new IndexService();
+
+ return $service->getSimpleFeaturedCourses();
}
}
diff --git a/app/Http/Home/Services/WechatOfficialAccount.php b/app/Http/Home/Services/WechatOfficialAccount.php
index ea19fd02..6fd0e48c 100644
--- a/app/Http/Home/Services/WechatOfficialAccount.php
+++ b/app/Http/Home/Services/WechatOfficialAccount.php
@@ -3,9 +3,9 @@
namespace App\Http\Home\Services;
use App\Models\WechatSubscribe as WechatSubscribeModel;
+use App\Repos\User as UserRepo;
use App\Repos\WechatSubscribe as WechatSubscribeRepo;
use App\Services\Wechat as WechatService;
-use App\Validators\User as UserValidator;
use EasyWeChat\Kernel\Messages\Text as TextMessage;
class WechatOfficialAccount extends Service
@@ -50,7 +50,7 @@ class WechatOfficialAccount extends Service
{
$service = new WechatService();
- $service->logger->debug('Received Message ' . json_encode($message));
+ $service->logger->info('Received Message ' . json_encode($message));
switch ($message['MsgType']) {
case 'event':
@@ -74,7 +74,7 @@ class WechatOfficialAccount extends Service
return $this->handleLocationEvent($message);
break;
default:
- return $this->emptyReplyMessage();
+ return $this->noMatchReply();
break;
}
break;
@@ -100,7 +100,7 @@ class WechatOfficialAccount extends Service
return $this->handleLinkReply($message);
break;
default:
- return $this->emptyReplyMessage();
+ return $this->noMatchReply();
break;
}
}
@@ -108,16 +108,16 @@ class WechatOfficialAccount extends Service
protected function handleSubscribeEvent($message)
{
$openId = $message['FromUserName'] ?? '';
- $eventKey = $message['EventKey'] ?? '';
- if (!$eventKey) {
- return $this->emptyReplyMessage();
+ $subscribeRepo = new WechatSubscribeRepo();
+
+ $subscribe = $subscribeRepo->findByOpenId($openId);
+
+ if ($subscribe && $subscribe->deleted == 1) {
+ $subscribe->deleted = 0;
+ $subscribe->update();
}
- $userId = str_replace('qrscene_', '', $eventKey);
-
- $this->handleSubscribeRelation($userId, $openId);
-
return new TextMessage('开心呀，我们又多了一个小伙伴!');
}
@@ -129,7 +129,7 @@ class WechatOfficialAccount extends Service
$subscribe = $subscribeRepo->findByOpenId($openId);
- if ($subscribe) {
+ if ($subscribe && $subscribe->deleted == 0) {
$subscribe->deleted = 1;
$subscribe->update();
}
@@ -139,100 +139,95 @@ class WechatOfficialAccount extends Service
protected function handleScanEvent($message)
{
- /**
- * 注意:当已关注过用户扫码时,"EventKey"没有带"qrscene_"前缀
- */
$openId = $message['FromUserName'] ?? '';
$eventKey = $message['EventKey'] ?? '';
- $userId = $eventKey;
- $this->handleSubscribeRelation($userId, $openId);
- }
+ $userId = str_replace('qrscene_', '', $eventKey);
- protected function handleClickEvent($message)
- {
- $this->defaultReplyMessage();
- }
+ $userRepo = new UserRepo();
- protected function handleViewEvent($message)
- {
- $this->defaultReplyMessage();
- }
+ $user = $userRepo->findById($userId);
- protected function handleLocationEvent($message)
- {
- $this->defaultReplyMessage();
- }
-
- protected function handleTextReply($message)
- {
- return $this->defaultReplyMessage();
- }
-
- protected function handleImageReply($message)
- {
- return $this->defaultReplyMessage();
- }
-
- protected function handleVoiceReply($message)
- {
- return $this->defaultReplyMessage();
- }
-
- protected function handleVideoReply($message)
- {
- return $this->defaultReplyMessage();
- }
-
- protected function handleShortVideoReply($message)
- {
- return $this->defaultReplyMessage();
- }
-
- protected function handleLocationReply($message)
- {
- return $this->defaultReplyMessage();
- }
-
- protected function handleLinkReply($message)
- {
- return $this->defaultReplyMessage();
- }
-
- protected function emptyReplyMessage()
- {
- return new TextMessage('');
- }
-
- protected function defaultReplyMessage()
- {
- return new TextMessage('没有匹配的服务，如有需要请联系客服！');
- }
-
- protected function handleSubscribeRelation($userId, $openId)
- {
- $validator = new UserValidator();
-
- $validator->checkUser($userId);
+ if (!$user) return;
$subscribeRepo = new WechatSubscribeRepo();
$subscribe = $subscribeRepo->findByOpenId($openId);
if ($subscribe) {
+ if ($subscribe->user_id != $userId) {
+ $subscribe->user_id = $userId;
+ }
if ($subscribe->deleted == 1) {
$subscribe->deleted = 0;
- $subscribe->update();
}
+ $subscribe->update();
} else {
- $subscribe = $subscribeRepo->findSubscribe($userId, $openId);
- if (!$subscribe) {
- $subscribe = new WechatSubscribeModel();
- $subscribe->user_id = $userId;
- $subscribe->open_id = $openId;
- $subscribe->create();
- }
+ $subscribe = new WechatSubscribeModel();
+ $subscribe->user_id = $userId;
+ $subscribe->open_id = $openId;
+ $subscribe->create();
}
}
+ protected function handleClickEvent($message)
+ {
+ return $this->emptyReply();
+ }
+
+ protected function handleViewEvent($message)
+ {
+ return $this->emptyReply();
+ }
+
+ protected function handleLocationEvent($message)
+ {
+ return $this->emptyReply();
+ }
+
+ protected function handleTextReply($message)
+ {
+ return $this->emptyReply();
+ }
+
+ protected function handleImageReply($message)
+ {
+ return $this->emptyReply();
+ }
+
+ protected function handleVoiceReply($message)
+ {
+ return $this->emptyReply();
+ }
+
+ protected function handleVideoReply($message)
+ {
+ return $this->emptyReply();
+ }
+
+ protected function handleShortVideoReply($message)
+ {
+ return $this->emptyReply();
+ }
+
+ protected function handleLocationReply($message)
+ {
+ return $this->emptyReply();
+ }
+
+ protected function handleLinkReply($message)
+ {
+ return $this->emptyReply();
+ }
+
+ protected function emptyReply()
+ {
+ return null;
+ }
+
+ protected function noMatchReply()
+ {
+ return new TextMessage('没有匹配的服务哦！');
+ }
+
}
diff --git a/app/Http/Home/Views/consult/add.volt b/app/Http/Home/Views/consult/add.volt
index 17b792ee..6e1f5706 100644
--- a/app/Http/Home/Views/consult/add.volt
+++ b/app/Http/Home/Views/consult/add.volt
@@ -21,6 +21,7 @@
+