From cd58494c48b9341106b9983ee8236e847154a4d1 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Sat, 14 Dec 2019 14:25:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=AC=E4=BC=97=E5=8F=B7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/wechat/controller/Keys.php         |  4 ++-
 app/wechat/controller/api/Review.php   |  8 +++---
 app/wechat/view/api/review/image.html  |  2 +-
 app/wechat/view/api/review/music.html  |  2 +-
 app/wechat/view/api/review/news.html   |  2 +-
 app/wechat/view/api/review/text.html   |  2 +-
 app/wechat/view/api/review/video.html  |  2 +-
 app/wechat/view/api/review/view.html   |  2 +-
 app/wechat/view/api/review/voice.html  |  2 +-
 app/wechat/view/keys/form.html         | 34 ++++++++++++++++++++++----
 app/wechat/view/keys/index_search.html |  4 +--
 11 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/app/wechat/controller/Keys.php b/app/wechat/controller/Keys.php
index 44d4002aa..61de63abd 100644
--- a/app/wechat/controller/Keys.php
+++ b/app/wechat/controller/Keys.php
@@ -145,6 +145,7 @@ class Keys extends Controller
     /**
      * 配置关注回复
      * @auth true
+     * @menu true
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
@@ -159,6 +160,7 @@ class Keys extends Controller
     /**
      * 配置默认回复
      * @auth true
+     * @menu true
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
@@ -178,7 +180,7 @@ class Keys extends Controller
     {
         if ($this->request->isPost() && isset($data['keys'])) {
             $db = $this->app->db->name($this->table)->where('keys', $data['keys']);
-            empty($data['id']) || $db->where('id', 'neq', $data['id']);
+            empty($data['id']) || $db->where('id', '<>', $data['id']);
             if ($db->count() > 0) {
                 $this->error('关键字已经存在，请使用其它关键字！');
             }
diff --git a/app/wechat/controller/api/Review.php b/app/wechat/controller/api/Review.php
index 0d844d8d9..44a48e213 100644
--- a/app/wechat/controller/api/Review.php
+++ b/app/wechat/controller/api/Review.php
@@ -29,13 +29,13 @@ class Review extends Controller
      * 图文展示
      * @param integer $id 图文ID
      * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
      */
     public function news($id = 0)
     {
         $this->id = empty($id) ? input('id') : $id;
-        $this->news = MediaService::news($this->id);
+        $this->news = MediaService::instance()->news($this->id);
         $this->fetch();
     }
 
@@ -49,7 +49,9 @@ class Review extends Controller
     public function view($id = 0)
     {
         $where = ['id' => empty($id) ? input('id') : $id];
-        $this->app->db->name('WechatNewsArticle')->where($where)->update(['read_num' => $this->app->db->raw('read_num+1')]);
+        $this->app->db->name('WechatNewsArticle')->where($where)->update([
+            'read_num' => $this->app->db->raw('read_num+1')
+        ]);
         $this->info = $this->app->db->name('WechatNewsArticle')->where($where)->find();
         $this->fetch();
     }
diff --git a/app/wechat/view/api/review/image.html b/app/wechat/view/api/review/image.html
index 5ab4feda8..e260e57b5 100644
--- a/app/wechat/view/api/review/image.html
+++ b/app/wechat/view/api/review/image.html
@@ -1,4 +1,4 @@
-{extend name='wechat@api/review/main'}
+{extend name='api/review/main'}
 
 {block name='content'}
 <div class="header"><span>{:date('H:i')}</span></div>
diff --git a/app/wechat/view/api/review/music.html b/app/wechat/view/api/review/music.html
index 527a3ab49..eaa17905a 100644
--- a/app/wechat/view/api/review/music.html
+++ b/app/wechat/view/api/review/music.html
@@ -1,4 +1,4 @@
-{extend name='wechat@api/review/main'}
+{extend name='api/review/main'}
 
 {block name='content'}
 <div class="header"><span>{:date('H:i')}</span></div>
diff --git a/app/wechat/view/api/review/news.html b/app/wechat/view/api/review/news.html
index 83e8b8efd..120c4b7a9 100644
--- a/app/wechat/view/api/review/news.html
+++ b/app/wechat/view/api/review/news.html
@@ -1,4 +1,4 @@
-{extend name='wechat@api/review/main'}
+{extend name='api/review/main'}
 
 {block name='content'}
 <div class="header"><span>{:date('H:i')}</span></div>
diff --git a/app/wechat/view/api/review/text.html b/app/wechat/view/api/review/text.html
index 0f0d05bbf..eadfb6a9f 100644
--- a/app/wechat/view/api/review/text.html
+++ b/app/wechat/view/api/review/text.html
@@ -1,4 +1,4 @@
-{extend name='wechat@api/review/main'}
+{extend name='api/review/main'}
 
 {block name='content'}
 <div class="header"><span>{:date('H:i')}</span></div>
diff --git a/app/wechat/view/api/review/video.html b/app/wechat/view/api/review/video.html
index 39a324b5b..a3444456a 100644
--- a/app/wechat/view/api/review/video.html
+++ b/app/wechat/view/api/review/video.html
@@ -1,4 +1,4 @@
-{extend name='wechat@api/review/main'}
+{extend name='api/review/main'}
 
 {block name='content'}
 <div class="header"><span>{:date('H:i')}</span></div>
diff --git a/app/wechat/view/api/review/view.html b/app/wechat/view/api/review/view.html
index 1a39c7f14..571d132b8 100644
--- a/app/wechat/view/api/review/view.html
+++ b/app/wechat/view/api/review/view.html
@@ -1,4 +1,4 @@
-{extend name='wechat@api/review/main'}
+{extend name='api/review/main'}
 
 {block name='title'}{/block}
 
diff --git a/app/wechat/view/api/review/voice.html b/app/wechat/view/api/review/voice.html
index 616729bd3..842b0a78a 100644
--- a/app/wechat/view/api/review/voice.html
+++ b/app/wechat/view/api/review/voice.html
@@ -1,4 +1,4 @@
-{extend name='wechat@api/review/main'}
+{extend name='api/review/main'}
 
 {block name='content'}
 <div class="header"><span>{:date('H:i')}</span></div>
diff --git a/app/wechat/view/keys/form.html b/app/wechat/view/keys/form.html
index 309c76250..0a6a74bf2 100644
--- a/app/wechat/view/keys/form.html
+++ b/app/wechat/view/keys/form.html
@@ -1,11 +1,35 @@
-{extend name='admin@main'}
+{extend name="../../admin/view/main"}
 
 {block name="style"}
 <style>
-    .keys-container .input-group-addon{top:0;right:0;color:#eee;width:25px;padding:7px;position:absolute;margin-top:-1px;text-align:center;background:#393D49}
-    .keys-container [data-tips-image]{width:112px;height:auto}
-    .keys-container .layui-card{width:580px;height:578px;position:absolute;border:1px solid #ccc}
-    .keys-container .layui-card .layui-card-body{height:515px;padding-right:50px}
+    .keys-container .input-group-addon {
+        top: 0;
+        right: 0;
+        color: #eee;
+        width: 25px;
+        padding: 7px;
+        position: absolute;
+        margin-top: -1px;
+        text-align: center;
+        background: #393D49
+    }
+
+    .keys-container [data-tips-image] {
+        width: 112px;
+        height: auto
+    }
+
+    .keys-container .layui-card {
+        width: 580px;
+        height: 578px;
+        position: absolute;
+        border: 1px solid #ccc
+    }
+
+    .keys-container .layui-card .layui-card-body {
+        height: 515px;
+        padding-right: 50px
+    }
 </style>
 {/block}
 
diff --git a/app/wechat/view/keys/index_search.html b/app/wechat/view/keys/index_search.html
index ad3ad7fff..ca1e0ac56 100644
--- a/app/wechat/view/keys/index_search.html
+++ b/app/wechat/view/keys/index_search.html
@@ -4,7 +4,7 @@
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">匹配规则</label>
             <div class="layui-input-inline">
-                <input name="keys" value="{$Think.get.keys|default=''}" placeholder="请输入匹配规则" class="layui-input">
+                <input name="keys" value="{:input('keys','')}" placeholder="请输入匹配规则" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item layui-inline">
@@ -39,7 +39,7 @@
         <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">
+                <input data-date-range name="create_at" value="{:input('create_at','')}" placeholder="请选择创建时间" class="layui-input">
             </div>
         </div>
         <div class="layui-form-item layui-inline">