From 5e69f6ed565d1083e7f50055cebf53428416c9ed Mon Sep 17 00:00:00 2001
From: Anyon <Anyon@windows10.microdone.cn>
Date: Fri, 16 Jun 2017 18:51:02 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E8=8F=9C=E5=8D=95=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/wechat/controller/Menu.php  |  2 +-
 application/wechat/view/menu.index.html | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

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 = '<div><div>小程序APPID<input style="display:block;margin-bottom:10px" class="form-control input-sm" value="{appid}" name="appid"/></div>Pagepath<textarea style="resize:none;height:165px;" name="pagepath" class="form-control input-sm">{content}</textarea></div>';
-                                var _appid = '', _content = '';
+                                var tpl = '<div>\
+                                                <div>appid<input style="display:block;margin-bottom:10px" class="form-control input-sm" value="{appid}" name="appid"></div>\
+                                                <div>url<input style="display:block;margin-bottom:10px" class="form-control input-sm" value="{url}" name="url"></div>\
+                                                <div>pagepath<input style="display:block" name="pagepath" class="form-control input-sm" value={pagepath}></div>\
+                                            </div>';
+                                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 '<div>回复内容<textarea style="resize:none;height:225px" name="content" class="form-control input-sm">{content}</textarea></div>'.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') || '';
                 }