diff --git a/pom.xml b/pom.xml
index c1bf61acf..010181126 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>cn.wizzer</groupId>
     <artifactId>nutzwk</artifactId>
-    <version>3.3.6</version>
+    <version>3.3.8</version>
     <packaging>war</packaging>
     <name>NutzWk</name>
     <url>http://www.wizzer.cn</url>
diff --git a/src/main/java/cn/wizzer/common/base/Service.java b/src/main/java/cn/wizzer/common/base/Service.java
index 7754d780b..7de46427d 100644
--- a/src/main/java/cn/wizzer/common/base/Service.java
+++ b/src/main/java/cn/wizzer/common/base/Service.java
@@ -457,7 +457,7 @@ public Pagination listPage(Integer pageNumber, int pageSize, Sql sql) {
         pageNumber = getPageNumber(pageNumber);
         pageSize = getPageSize(pageSize);
         Pager pager = this.dao().createPager(pageNumber, pageSize);
-        pager.setRecordCount((int) Daos.queryCount(this.dao(), sql.toString()));// 记录数需手动设置
+        pager.setRecordCount((int) Daos.queryCount(this.dao(), sql));// 记录数需手动设置
         sql.setPager(pager);
         sql.setCallback(Sqls.callback.records());
         dao().execute(sql);
@@ -565,7 +565,7 @@ public NutMap data(int length, int start, int draw, List<DataTableOrder> orders,
     public NutMap data(int length, int start, int draw, Sql countSql, Sql orderSql) {
         NutMap re = new NutMap();
         Pager pager = new OffsetPager(start, length);
-        pager.setRecordCount((int) Daos.queryCount(this.dao(), countSql.toString()));// 记录数需手动设置
+        pager.setRecordCount((int) Daos.queryCount(this.dao(), countSql));// 记录数需手动设置
         orderSql.setPager(pager);
         orderSql.setCallback(Sqls.callback.records());
         this.dao().execute(orderSql);
diff --git a/src/main/java/cn/wizzer/modules/controllers/open/ueditor/WxController.java b/src/main/java/cn/wizzer/modules/controllers/open/ueditor/WxController.java
index 7b7d34e09..3a2a12c55 100644
--- a/src/main/java/cn/wizzer/modules/controllers/open/ueditor/WxController.java
+++ b/src/main/java/cn/wizzer/modules/controllers/open/ueditor/WxController.java
@@ -44,6 +44,7 @@ public Object index(@Param("action") String action, HttpServletRequest req) {
     @At
     @Ok("json")
     @RequiresAuthentication
+    @SuppressWarnings("deprecation")
     public Object uploadimage(@Param("Filedata") TempFile tf, HttpServletRequest req, AdaptorErrorContext err) {
         String wxid = Strings.sBlank(req.getSession().getAttribute("wxid"));
         NutMap nutMap = new NutMap();
diff --git a/src/main/java/cn/wizzer/modules/controllers/platform/wx/WxMassController.java b/src/main/java/cn/wizzer/modules/controllers/platform/wx/WxMassController.java
index c6c3b816f..4d8773500 100644
--- a/src/main/java/cn/wizzer/modules/controllers/platform/wx/WxMassController.java
+++ b/src/main/java/cn/wizzer/modules/controllers/platform/wx/WxMassController.java
@@ -142,6 +142,7 @@ public Object newsDetail(String id, HttpServletRequest req) {
     @At("/uploadThumb/?")
     @Ok("json")
     @RequiresAuthentication
+    @SuppressWarnings("deprecation")
     //AdaptorErrorContext必须是最后一个参数
     public Object uploadThumb(String wxid, @Param("Filedata") TempFile tf, HttpServletRequest req, AdaptorErrorContext err) {
         try {
diff --git a/src/main/java/cn/wizzer/modules/controllers/platform/wx/WxMenuController.java b/src/main/java/cn/wizzer/modules/controllers/platform/wx/WxMenuController.java
index b4e2ab908..b9d9e4d48 100644
--- a/src/main/java/cn/wizzer/modules/controllers/platform/wx/WxMenuController.java
+++ b/src/main/java/cn/wizzer/modules/controllers/platform/wx/WxMenuController.java
@@ -215,6 +215,12 @@ public Object pushMenu(String wxid, HttpServletRequest req) {
                                 xm2.setType(secondMenu.getMenuType());
                                 xm2.setKey(secondMenu.getMenuKey());
                                 xm2.setName(secondMenu.getMenuName());
+                            } else if ("miniprogram".equals(secondMenu.getMenuType())) {
+                                xm2.setType(secondMenu.getMenuType());
+                                xm2.setName(secondMenu.getMenuName());
+                                xm2.setUrl(secondMenu.getUrl());
+                                xm2.setAppid(secondMenu.getAppid());
+                                xm2.setPagepath(secondMenu.getPagepath());
                             } else {
                                 xm2.setName(secondMenu.getMenuName());
                                 xm2.setType("click");
@@ -235,6 +241,12 @@ public Object pushMenu(String wxid, HttpServletRequest req) {
                         xm2.setType(firstMenu.getMenuType());
                         xm2.setKey(firstMenu.getMenuKey());
                         xm2.setName(firstMenu.getMenuName());
+                    } else if ("miniprogram".equals(firstMenu.getMenuType())) {
+                        xm2.setType(firstMenu.getMenuType());
+                        xm2.setName(firstMenu.getMenuName());
+                        xm2.setUrl(firstMenu.getUrl());
+                        xm2.setAppid(firstMenu.getAppid());
+                        xm2.setPagepath(firstMenu.getPagepath());
                     } else {
                         xm2.setName(firstMenu.getMenuName());
                         xm2.setType("click");
diff --git a/src/main/java/cn/wizzer/modules/models/wx/Wx_menu.java b/src/main/java/cn/wizzer/modules/models/wx/Wx_menu.java
index de90d16b4..493f2fb31 100644
--- a/src/main/java/cn/wizzer/modules/models/wx/Wx_menu.java
+++ b/src/main/java/cn/wizzer/modules/models/wx/Wx_menu.java
@@ -49,6 +49,16 @@ public class Wx_menu extends Model implements Serializable {
     @ColDefine(type = ColType.VARCHAR, width = 255)
     private String url;
 
+    @Column
+    @Comment("小程序appid")
+    @ColDefine(type = ColType.VARCHAR, width = 255)
+    private String appid;
+
+    @Column
+    @Comment("小程序入口页")
+    @ColDefine(type = ColType.VARCHAR, width = 255)
+    private String pagepath;
+
     @Column
     @Comment("排序字段")
     @Prev({
@@ -156,4 +166,20 @@ public Wx_config getWxConfig() {
     public void setWxConfig(Wx_config wxConfig) {
         this.wxConfig = wxConfig;
     }
+
+    public String getAppid() {
+        return appid;
+    }
+
+    public void setAppid(String appid) {
+        this.appid = appid;
+    }
+
+    public String getPagepath() {
+        return pagepath;
+    }
+
+    public void setPagepath(String pagepath) {
+        this.pagepath = pagepath;
+    }
 }
diff --git a/src/main/webapp/WEB-INF/views/platform/wx/menu/add.html b/src/main/webapp/WEB-INF/views/platform/wx/menu/add.html
index 4aaacbe4f..59c235209 100644
--- a/src/main/webapp/WEB-INF/views/platform/wx/menu/add.html
+++ b/src/main/webapp/WEB-INF/views/platform/wx/menu/add.html
@@ -14,7 +14,7 @@
                   action="${base}/platform/wx/conf/menu/addDo" method="post">
                 <input id="wxid" name="wxid" type="hidden" value="${wxid!}">
 
-                <div class="row mb10">
+                <div class="row mb10 mt10">
                     <div class="col-lg-12">
                         <div class="form-group">
                             <label for="parentId" class="col-sm-2 control-label">上级菜单</label>
@@ -51,6 +51,7 @@
                                 <div class="radio"><label><input onclick="clickRadio('')" type="radio" name="menuType" value="" checked>无</label></div>
                                 <div class="radio"><label><input onclick="clickRadio('view')" type="radio" name="menuType" value="view">链接</label></div>
                                 <div class="radio"><label><input onclick="clickRadio('click')" type="radio" name="menuType" value="click">事件</label></div>
+                                <div class="radio"><label><input onclick="clickRadio('miniprogram')" type="radio" name="menuType" value="miniprogram">小程序</label></div>
                             </div>
                         </div>
                         <div id="div_url" class="form-group" style="display: none">
@@ -58,8 +59,8 @@
 
                             <div class="col-sm-8">
                                 <div class="input-group">
-                                <input id="url" name="url" type="text" class="form-control">
-                                <span class="input-group-btn">
+                                    <input id="url" name="url" type="text" class="form-control">
+                                    <span class="input-group-btn">
                                     <a class="btn btn-primary current-time" href="${base}/platform/wx/conf/menu/cms/channel"  data-toggle="modal" data-target="#dialogSelect">选择栏目</a>
                                     <a class="btn btn-info current-time" href="${base}/platform/wx/conf/menu/cms/article"  data-toggle="modal" data-target="#dialogSelect">选择文章</a>
 
@@ -69,6 +70,24 @@
                                 <input type="checkbox" id="btnUrl2">应用oauth2.0
                             </div>
                         </div>
+                        <div id="div_appurl" class="form-group" style="display: none">
+                            <label for="appid" class="col-sm-2 control-label">URL</label>
+                            <div class="col-sm-8">
+                                <input id="appurl" name="appurl" type="text" class="form-control">
+                            </div>
+                        </div>
+                        <div id="div_appid" class="form-group" style="display: none">
+                            <label for="appid" class="col-sm-2 control-label">appid</label>
+                            <div class="col-sm-8">
+                                <input id="appid" name="appid" type="text" class="form-control">
+                            </div>
+                        </div>
+                        <div id="div_pagepath" class="form-group" style="display: none">
+                            <label for="pagepath" class="col-sm-2 control-label">pagepath</label>
+                            <div class="col-sm-8">
+                                <input id="pagepath" name="pagepath" type="text" class="form-control">
+                            </div>
+                        </div>
                         <div id="div_key" class="form-group" style="display: none">
                             <label for="menuKey" class="col-sm-2 control-label">事件Key</label>
 
@@ -76,7 +95,7 @@
                                 <div class="input-group">
                                     <input id="menuKey" name="menuKey" type="text" class="form-control"
                                            data-parsley-maxlength="20">
-                  <span class="input-group-btn">
+                                    <span class="input-group-btn">
                   <button class="btn btn-color current-time" type="button" onclick="selKeyword()">选择关键词</button>
                   </span>
                                 </div>
@@ -93,7 +112,7 @@
                         <label></label>
 
                         <div>
-                            <button class="btn btn-primary btn-block btn-lg btn-parsley" data-loading-text="正在提交..." id="submit">提 交
+                            <button type="button" class="btn btn-primary btn-block btn-lg btn-parsley" data-loading-text="正在提交..." id="submit">提 交
                             </button>
                         </div>
                     </div>
@@ -124,16 +143,41 @@
         if (type == 'click') {
             $("#div_url").hide();
             $("#div_key").show();
+            $("#div_appurl").hide();
+            $("#div_appid").hide();
+            $("#div_pagepath").hide();
             $("#url").val("");
+            $("#appurl").val("");
+            $("#appid").val("");
+            $("#pagepath").val("");
         } else if (type == 'view') {
             $("#div_key").hide();
             $("#div_url").show();
+            $("#div_appurl").hide();
+            $("#div_appid").hide();
+            $("#div_pagepath").hide();
+            $("#key").val("");
+            $("#appurl").val("");
+            $("#appid").val("");
+            $("#pagepath").val("");
+        } else if (type == 'miniprogram') {
+            $("#div_key").hide();
+            $("#div_url").hide();
+            $("#div_appurl").show();
+            $("#div_appid").show();
+            $("#div_pagepath").show();
             $("#key").val("");
         } else {
             $("#div_key").hide();
             $("#div_url").hide();
+            $("#div_appurl").hide();
+            $("#div_appid").hide();
+            $("#div_pagepath").hide();
             $("#key").val("");
             $("#url").val("");
+            $("#appurl").val("");
+            $("#appid").val("");
+            $("#pagepath").val("");
         }
     }
     function selKeyword(){
@@ -193,6 +237,12 @@
         $("#dialogSelect").on("hidden.bs.modal", function () {
             $(this).removeData("bs.modal");
         });
+        $("#submit").on("click",function () {
+            if($("input[type='radio']:checked").val()=="miniprogram"){
+                $("#url").val($("#appurl").val());
+            }
+            $('#addForm').submit();
+        });
         $('#addForm').ajaxForm({
             dataType: 'json',
             beforeSubmit: function (arr, form, options) {
@@ -200,6 +250,9 @@
                 {
                     return false;
                 }
+                if($("input[type='radio']:checked").val()=="miniprogram"){
+                    $("#url").val($("#appurl").val());
+                }
             },
             success: function (data, statusText, xhr, form) {
                 if (data.code == 0) {
diff --git a/src/main/webapp/WEB-INF/views/platform/wx/menu/edit.html b/src/main/webapp/WEB-INF/views/platform/wx/menu/edit.html
index e1aa30620..2a4033e6f 100644
--- a/src/main/webapp/WEB-INF/views/platform/wx/menu/edit.html
+++ b/src/main/webapp/WEB-INF/views/platform/wx/menu/edit.html
@@ -16,7 +16,7 @@
                 <input id="wxid" name="wxid" type="hidden" value="${obj.wxid!}">
                 <input type="hidden" id="hasChildren" name="hasChildren" value="${obj.hasChildren!}">
                 <input type="hidden" id="parentId" name="parentId" value="${obj.parentId!}">
-                <div class="row mb10">
+                <div class="row mb10 mt10">
                     <div class="col-lg-12">
                         <div class="form-group">
                             <label for="menuName" class="col-sm-2 control-label">菜单名称</label>
@@ -35,6 +35,7 @@
                                 <div class="radio"><label><input onclick="clickRadio('')" type="radio" name="menuType" value="" <%if(isEmpty(obj.menuType)){%>checked<%}%>>无</label></div>
                                 <div class="radio"><label><input onclick="clickRadio('view')" type="radio" name="menuType" value="view" <%if('view'==obj.menuType){%>checked<%}%>>链接</label></div>
                                 <div class="radio"><label><input onclick="clickRadio('click')" type="radio" name="menuType" value="click" <%if('click'==obj.menuType){%>checked<%}%>>事件</label></div>
+                                <div class="radio"><label><input onclick="clickRadio('miniprogram')" type="radio" name="menuType" value="miniprogram" <%if('miniprogram'==obj.menuType){%>checked<%}%>>小程序</label></div>
                             </div>
                         </div>
                         <div id="div_url" class="form-group" style="display: <%if('view'==obj.menuType){%>block<%}else{%>none<%}%>">
@@ -43,7 +44,7 @@
                             <div class="col-sm-8">
                                 <div class="input-group">
                                     <input id="url" name="url"  value="${obj.url!}" type="text" class="form-control">
-                                <span class="input-group-btn">
+                                    <span class="input-group-btn">
                                     <a class="btn btn-primary current-time" href="${base}/platform/wx/conf/menu/cms/channel"  data-toggle="modal" data-target="#dialogSelect">选择栏目</a>
                                     <a class="btn btn-info current-time" href="${base}/platform/wx/conf/menu/cms/article"  data-toggle="modal" data-target="#dialogSelect">选择文章</a>
 
@@ -54,6 +55,24 @@
 
                             </div>
                         </div>
+                        <div id="div_appurl" class="form-group" style="display: <%if('miniprogram'==obj.menuType){%>block<%}else{%>none<%}%>">
+                            <label for="appid" class="col-sm-2 control-label">URL</label>
+                            <div class="col-sm-8">
+                                <input id="appurl" name="appurl" type="text" class="form-control" value="${obj.url!}" >
+                            </div>
+                        </div>
+                        <div id="div_appid" class="form-group" style="display: <%if('miniprogram'==obj.menuType){%>block<%}else{%>none<%}%>">
+                            <label for="appid" class="col-sm-2 control-label">appid</label>
+                            <div class="col-sm-8">
+                                <input id="appid" name="appid" type="text" class="form-control" value="${obj.appid!}" >
+                            </div>
+                        </div>
+                        <div id="div_pagepath" class="form-group" style="display: <%if('miniprogram'==obj.menuType){%>block<%}else{%>none<%}%>">
+                            <label for="pagepath" class="col-sm-2 control-label">pagepath</label>
+                            <div class="col-sm-8">
+                                <input id="pagepath" name="pagepath" type="text" class="form-control" value="${obj.pagepath!}" >
+                            </div>
+                        </div>
                         <div id="div_key" class="form-group" style="display: <%if('click'==obj.menuType){%>block<%}else{%>none<%}%>">
                             <label for="menuKey" class="col-sm-2 control-label">事件Key</label>
 
@@ -61,7 +80,7 @@
                                 <div class="input-group">
                                     <input id="menuKey" name="menuKey" type="text" class="form-control"
                                            data-parsley-maxlength="20" value="${obj.menuKey!}" >
-                  <span class="input-group-btn">
+                                    <span class="input-group-btn">
                   <button class="btn btn-color current-time" type="button" onclick="selKeyword()">选择关键词</button>
                   </span>
                                 </div>
@@ -78,7 +97,7 @@
                         <label></label>
 
                         <div>
-                            <button class="btn btn-primary btn-block btn-lg btn-parsley" data-loading-text="正在提交..." id="submit">提 交
+                            <button type="button" class="btn btn-primary btn-block btn-lg btn-parsley" data-loading-text="正在提交..." id="submit">提 交
                             </button>
                         </div>
                     </div>
@@ -108,16 +127,41 @@
         if (type == 'click') {
             $("#div_url").hide();
             $("#div_key").show();
+            $("#div_appurl").hide();
+            $("#div_appid").hide();
+            $("#div_pagepath").hide();
             $("#url").val("");
+            $("#appurl").val("");
+            $("#appid").val("");
+            $("#pagepath").val("");
         } else if (type == 'view') {
             $("#div_key").hide();
             $("#div_url").show();
-            $("#menuKey").val("");
+            $("#div_appurl").hide();
+            $("#div_appid").hide();
+            $("#div_pagepath").hide();
+            $("#key").val("");
+            $("#appurl").val("");
+            $("#appid").val("");
+            $("#pagepath").val("");
+        } else if (type == 'miniprogram') {
+            $("#div_key").hide();
+            $("#div_url").hide();
+            $("#div_appurl").show();
+            $("#div_appid").show();
+            $("#div_pagepath").show();
+            $("#key").val("");
         } else {
             $("#div_key").hide();
             $("#div_url").hide();
-            $("#menuKey").val("");
+            $("#div_appurl").hide();
+            $("#div_appid").hide();
+            $("#div_pagepath").hide();
+            $("#key").val("");
             $("#url").val("");
+            $("#appurl").val("");
+            $("#appid").val("");
+            $("#pagepath").val("");
         }
     }
     function selKeyword(){
@@ -177,6 +221,12 @@
         $("#dialogSelect").on("hidden.bs.modal", function () {
             $(this).removeData("bs.modal");
         });
+        $("#submit").on("click",function () {
+            if($("input[type='radio']:checked").val()=="miniprogram"){
+                $("#url").val($("#appurl").val());
+            }
+            $('#addForm').submit();
+        });
         $('#addForm').ajaxForm({
             dataType: 'json',
             beforeSubmit: function (arr, form, options) {