From d454f75129b12e57eebf37f12bb43edc5712d8de Mon Sep 17 00:00:00 2001
From: Anyon <Anyon@windows10.microdone.cn>
Date: Fri, 16 Jun 2017 19:22:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E8=8F=9C=E5=8D=95=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E5=8F=91=E5=B8=83=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/wechat/view/menu.index.html | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/application/wechat/view/menu.index.html b/application/wechat/view/menu.index.html
index 990caf731..5a18884b0 100644
--- a/application/wechat/view/menu.index.html
+++ b/application/wechat/view/menu.index.html
@@ -300,12 +300,7 @@
                 var menudata = {};
                 menudata.name = $span.text();
                 menudata.type = $span.attr('data-type');
-                // 小程序要特殊处理
-                if (menudata.type === 'miniprogram') {
-                    menudata.content = $span.data('appid') + ',' + $span.data('url') + ',' + $span.data('pagepath');
-                } else {
-                    menudata.content = $span.data('content') || '';
-                }
+                menudata.content = $span.data('content') || '';
                 return menudata;
             }
 

From 1f452ab5d52da0ae1fa3d2549f6ae799ba411b70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Fri, 16 Jun 2017 19:33:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E8=8F=9C=E5=8D=95=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/wechat/controller/Menu.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/wechat/controller/Menu.php b/application/wechat/controller/Menu.php
index 3aac77e13..c4d928048 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'], $row['url']) = explode(',', $row['content'] . ',,');
+                    list($row['appid'], $row['url'], $row['pagepath']) = explode(',', $row['content'] . ',,');
                     break;
                 case 'view':
                     $row['url'] = preg_match('#^(\w+:)?//#i', $row['content']) ? $row['content'] : url($row['content'], '', true, true);