diff --git a/application/wechat/controller/Menu.php b/application/wechat/controller/Menu.php
index 171005627..3aac77e13 100644
--- a/application/wechat/controller/Menu.php
+++ b/application/wechat/controller/Menu.php
@@ -124,7 +124,7 @@ class Menu extends BasicAdmin {
empty($row['content']) && $row['content'] = uniqid();
switch ($row['type']) {
case 'miniprogram':
- list($row['appid'], $row['pagepath']) = explode(',', $row['content'] . ',');
+ list($row['appid'], $row['pagepath'], $row['url']) = explode(',', $row['content'] . ',,');
break;
case 'view':
$row['url'] = preg_match('#^(\w+:)?//#i', $row['content']) ? $row['content'] : url($row['content'], '', true, true);
diff --git a/application/wechat/view/menu.index.html b/application/wechat/view/menu.index.html
index ffba30724..990caf731 100644
--- a/application/wechat/view/menu.index.html
+++ b/application/wechat/view/menu.index.html
@@ -239,13 +239,18 @@
var html = function () {
switch (type) {
case 'miniprogram':
- var tpl = '
';
- var _appid = '', _content = '';
+ var tpl = '';
+ var _appid = '', _pagepath = '', _url = '';
if (content.indexOf(',') > 0) {
- _appid = content.split(',')[0];
- _content = content.split(',')[1];
+ _appid = content.split(',')[0] || '';
+ _url = content.split(',')[1] || '';
+ _pagepath = content.split(',')[2] || '';
}
- return tpl.replace('{appid}', _appid).replace('{content}', _content);
+ return tpl.replace('{appid}', _appid).replace('{url}', _url).replace('{pagepath}', _pagepath);
case 'customservice':
case 'text':
return '回复内容
'.replace('{content}', content);
@@ -278,7 +283,7 @@
$span.data(this.name, $(this).val() || $(this).html());
// 如果是小程序,合并内容到span的content上
if (type === 'miniprogram') {
- $span.data('content', $span.data('appid') + ',' + $span.data('pagepath'));
+ $span.data('content', $span.data('appid') + ',' + $span.data('url') + ',' + $span.data('pagepath'));
}
});
$('.editor-content-input').html($html);
@@ -297,7 +302,7 @@
menudata.type = $span.attr('data-type');
// 小程序要特殊处理
if (menudata.type === 'miniprogram') {
- menudata.content = $span.data('appid') + ',' + $span.data('pagepath');
+ menudata.content = $span.data('appid') + ',' + $span.data('url') + ',' + $span.data('pagepath');
} else {
menudata.content = $span.data('content') || '';
}