diff --git a/app/wechat/controller/api/Push.php b/app/wechat/controller/api/Push.php
index 374fafbb1..ade3be658 100644
--- a/app/wechat/controller/api/Push.php
+++ b/app/wechat/controller/api/Push.php
@@ -223,7 +223,7 @@ class Push extends Controller
[$news, $articles] = [MediaService::instance()->news($data['news_id']), []];
if (empty($news['articles'])) return false;
foreach ($news['articles'] as $vo) array_push($articles, [
- 'url' => url("@wechat/api.review/view/id/{$vo['id']}", [], false, true)->build(),
+ 'url' => url("@wechat/api.view/item/id/{$vo['id']}", [], false, true)->build(),
'title' => $vo['title'], 'picurl' => $vo['local_url'], 'description' => $vo['digest'],
]);
return $this->_sendMessage('news', ['articles' => $articles], $custom);
diff --git a/app/wechat/controller/api/Review.php b/app/wechat/controller/api/View.php
similarity index 95%
rename from app/wechat/controller/api/Review.php
rename to app/wechat/controller/api/View.php
index 5284ce315..d6a055dd1 100644
--- a/app/wechat/controller/api/Review.php
+++ b/app/wechat/controller/api/View.php
@@ -19,14 +19,15 @@ use app\wechat\service\MediaService;
use think\admin\Controller;
/**
- * Class Review
+ * 微信图文显示
+ * Class View
* @package app\wechat\controller\api
*/
-class Review extends Controller
+class View extends Controller
{
/**
- * 图文展示
+ * 图文列表展示
* @param integer $id 图文ID
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
@@ -40,13 +41,13 @@ class Review extends Controller
}
/**
- * 文章展示
+ * 文章内容展示
* @param integer $id 文章ID
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
- public function view($id = 0)
+ public function item($id = 0)
{
$map = ['id' => $id ?: input('id', 0)];
$this->app->db->name('WechatNewsArticle')->where($map)->update([
diff --git a/app/wechat/view/api/review/image.html b/app/wechat/view/api/view/image.html
similarity index 94%
rename from app/wechat/view/api/review/image.html
rename to app/wechat/view/api/view/image.html
index d678e4cf5..8dfe6226c 100644
--- a/app/wechat/view/api/review/image.html
+++ b/app/wechat/view/api/view/image.html
@@ -1,4 +1,4 @@
-{extend name='api/review/main'}
+{extend name='api/view/main'}
{block name='content'}
diff --git a/app/wechat/view/api/review/view.html b/app/wechat/view/api/view/item.html
similarity index 97%
rename from app/wechat/view/api/review/view.html
rename to app/wechat/view/api/view/item.html
index 89ba425fa..da2fa9406 100644
--- a/app/wechat/view/api/review/view.html
+++ b/app/wechat/view/api/view/item.html
@@ -1,4 +1,4 @@
-{extend name='api/review/main'}
+{extend name='api/view/main'}
{block name='title'}{/block}
diff --git a/app/wechat/view/api/review/main.html b/app/wechat/view/api/view/main.html
similarity index 100%
rename from app/wechat/view/api/review/main.html
rename to app/wechat/view/api/view/main.html
diff --git a/app/wechat/view/api/review/music.html b/app/wechat/view/api/view/music.html
similarity index 98%
rename from app/wechat/view/api/review/music.html
rename to app/wechat/view/api/view/music.html
index 59cfa664d..95e4d0a73 100644
--- a/app/wechat/view/api/review/music.html
+++ b/app/wechat/view/api/view/music.html
@@ -1,4 +1,4 @@
-{extend name='api/review/main'}
+{extend name='api/view/main'}
{block name='content'}
diff --git a/app/wechat/view/api/review/news.html b/app/wechat/view/api/view/news.html
similarity index 92%
rename from app/wechat/view/api/review/news.html
rename to app/wechat/view/api/view/news.html
index 246976900..2aab383e1 100644
--- a/app/wechat/view/api/review/news.html
+++ b/app/wechat/view/api/view/news.html
@@ -1,15 +1,15 @@
-{extend name='api/review/main'}
+{extend name='api/view/main'}
{block name='content'}
{notempty name='news.articles'} {foreach $news.articles as $k => $v} {if $k < 1}
-
+
{if $v.title}{$v.title}{/if}
{else}
-
+
{$v.title}
diff --git a/app/wechat/view/api/review/text.html b/app/wechat/view/api/view/text.html
similarity index 86%
rename from app/wechat/view/api/review/text.html
rename to app/wechat/view/api/view/text.html
index 2ad1439f5..bbd93a3f2 100644
--- a/app/wechat/view/api/review/text.html
+++ b/app/wechat/view/api/view/text.html
@@ -1,4 +1,4 @@
-{extend name='api/review/main'}
+{extend name='api/view/main'}
{block name='content'}
diff --git a/app/wechat/view/api/review/video.html b/app/wechat/view/api/view/video.html
similarity index 96%
rename from app/wechat/view/api/review/video.html
rename to app/wechat/view/api/view/video.html
index 599aa7ee1..bea97033e 100644
--- a/app/wechat/view/api/review/video.html
+++ b/app/wechat/view/api/view/video.html
@@ -1,4 +1,4 @@
-{extend name='api/review/main'}
+{extend name='api/view/main'}
{block name='content'}
diff --git a/app/wechat/view/api/review/voice.html b/app/wechat/view/api/view/voice.html
similarity index 97%
rename from app/wechat/view/api/review/voice.html
rename to app/wechat/view/api/view/voice.html
index 36c94e446..12b3a8038 100644
--- a/app/wechat/view/api/review/voice.html
+++ b/app/wechat/view/api/view/voice.html
@@ -1,4 +1,4 @@
-{extend name='api/review/main'}
+{extend name='api/view/main'}
{block name='content'}
diff --git a/app/wechat/view/keys/form.html b/app/wechat/view/keys/form.html
index d6fa1f1f7..de919bde1 100644
--- a/app/wechat/view/keys/form.html
+++ b/app/wechat/view/keys/form.html
@@ -14,10 +14,20 @@
padding-right: 50px
}
- .keys-container .layui-card [data-tips-image] {
+ .keys-container .layui-card .layui-card-body [data-tips-image] {
width: 112px;
height: auto
}
+
+ .keys-container .layui-card .layui-card-body .layui-form-label {
+ width: 60px;
+ color: #6c6c6c;
+ font-weight: 700;
+ }
+
+ .keys-container .layui-card .layui-card-body .layui-form-label + .layui-input-block {
+ margin-left: 100px;
+ }
{/block}
@@ -73,9 +83,9 @@
@@ -182,9 +192,9 @@
/*! 刷新预览显示 */
function showReview(params, location) {
if (params['type'] === 'news') {
- location = '{:url("@wechat/api.review/news")}?id=_id_'.replace('_id_', params.content);
+ location = '{:url("@wechat/api.view/news")}?id=_id_'.replace('_id_', params.content);
} else {
- location = '{:url("@wechat/api.review/_type_")}?'.replace('_type_', params.type) + $.param(params || {});
+ location = '{:url("@wechat/api.view/_type_")}?'.replace('_type_', params.type) + $.param(params || {});
}
var iframe = '';
$('[data-iframe-box]').empty().append($(iframe).attr('src', location));
diff --git a/app/wechat/view/keys/index.html b/app/wechat/view/keys/index.html
index 2527ef4c7..86b9aaaca 100644
--- a/app/wechat/view/keys/index.html
+++ b/app/wechat/view/keys/index.html
@@ -47,17 +47,17 @@
{$vo.type} |
{if $vo.type eq '音乐'}
- 预览
+ 预览
{elseif in_array($vo.type,['文字','转客服'])}
- 预览
+ 预览
{elseif $vo.type eq '图片'}
- 预览
+ 预览
{elseif $vo.type eq '图文'}
- 预览
+ 预览
{elseif $vo.type eq '视频'}
- 预览
+ 预览
{elseif $vo.type eq '语音'}
- 预览
+ 预览
{else} {$vo.content} {/if}
|
{$vo.create_at|format_datetime} |
@@ -85,78 +85,4 @@
{empty name='list'}没有记录哦{else}{$pagehtml|raw|default=''}{/empty}
-{/block}
-
-{block name="script"}
-
-{/block}
+{/block}
\ No newline at end of file
diff --git a/app/wechat/view/keys/index_search.html b/app/wechat/view/keys/index_search.html
index ca1e0ac56..a02eb9e59 100644
--- a/app/wechat/view/keys/index_search.html
+++ b/app/wechat/view/keys/index_search.html
@@ -12,13 +12,11 @@
@@ -26,13 +24,13 @@
@@ -46,6 +44,6 @@
+
-
diff --git a/app/wechat/view/news/index.html b/app/wechat/view/news/index.html
index a819520be..009acd281 100644
--- a/app/wechat/view/news/index.html
+++ b/app/wechat/view/news/index.html
@@ -14,7 +14,7 @@
{foreach $list as $vo}