Merge pull request siteserver#56 from braceyx/dev

修复微信基本使用问题
ThinkComb · Jun 17, 2017 · 3993d34 · 3993d34
2 parents bfeda5a + 043b0de
commit 3993d34
Show file tree

Hide file tree

Showing 16 changed files with 113 additions and 111 deletions.
diff --git a/source/SiteServer.BackgroundPages/WeiXin/ModalContentSelect.cs b/source/SiteServer.BackgroundPages/WeiXin/ModalContentSelect.cs
@@ -63,7 +63,7 @@ public static string GetRedirectUrlByKeywordAddList(int publishmentSystemId, boo
         public static string GetOpenWindowString(int publishmentSystemId, bool isMultiple, string jsMethod)
         {
             return PageUtils.GetOpenWindowString("选择微官网内容",
-                PageUtils.GetWeiXinUrl(nameof(ModalCardSnSetting), new NameValueCollection
+                PageUtils.GetWeiXinUrl(nameof(ModalContentSelect), new NameValueCollection
                 {
                     {"publishmentSystemId", publishmentSystemId.ToString()},
                     {"isMultiple", isMultiple.ToString()},

diff --git a/source/SiteServer.BackgroundPages/WeiXin/ModalKeywordSelect.cs b/source/SiteServer.BackgroundPages/WeiXin/ModalKeywordSelect.cs
@@ -84,7 +84,7 @@ void rptContents_ItemDataBound(object sender, RepeaterItemEventArgs e)
                 var ltlKeyword = e.Item.FindControl("ltlKeyword") as Literal;
 
                 ltlKeyword.Text =
-                    $@"<div class=""alert alert-success pull-left"" style=""margin:5px;padding-right:14px; cursor:pointer;"" onclick=""window.parent.{_jsMethod}('{keyword}');{PageUtils.HidePopWin}""><strong style=""color: #468847"">{keyword}</strong>&nbsp;({EKeywordTypeUtils.GetText(keywordType)})</div>";
+                    $@"<div class=""alert alert-success pull-left"" style=""margin:5px;padding-right:14px; cursor:pointer;"" onclick=""window.parent.{_jsMethod}('{keyword}');;window.parent.closeWindow();""><strong style=""color: #468847"">{keyword}</strong>&nbsp;({EKeywordTypeUtils.GetText(keywordType)})</div>";
             }
         }
 
@@ -101,7 +101,7 @@ private string PageUrl
                 if (string.IsNullOrEmpty(_pageUrl))
                 {
                     _pageUrl =
-                        $"modal_keywordSelect.aspx?PublishmentSystemId={PublishmentSystemId}&keywordType={DdlKeywordType.SelectedValue}&keyword={TbKeyword.Text}&jsMethod={_jsMethod}";
+                        $"modalkeywordSelect.aspx?PublishmentSystemId={PublishmentSystemId}&keywordType={DdlKeywordType.SelectedValue}&keyword={TbKeyword.Text}&jsMethod={_jsMethod}";
                 }
                 return _pageUrl;
             }

diff --git a/source/SiteServer.Web/SiteServer/WeiXin/ajaxUpload.aspx b/source/SiteServer.Web/SiteServer/WeiXin/ajaxUpload.aspx
@@ -1 +1 @@
-<%@ Page language="c#" trace="false" enableViewState="false" Inherits="SiteServer.BackgroundPages.WeiXin.PageAjaxUpload" %>
+<%@ Page language="c#" trace="false" enableViewState="false" Inherits="SiteServer.BackgroundPages.WeiXin.AjaxUpload" %>
diff --git a/source/SiteServer.Web/SiteServer/WeiXin/modalContentSelect.aspx b/source/SiteServer.Web/SiteServer/WeiXin/modalContentSelect.aspx
@@ -26,7 +26,7 @@
       <tr>
         <td>
           栏目：
-          <asp:DropDownList ID="NodeIDDropDownList" AutoPostBack="true" OnSelectedIndexChanged="Search_OnClick" runat="server"></asp:DropDownList>
+          <asp:DropDownList ID="NodeIdDropDownList" AutoPostBack="true" OnSelectedIndexChanged="Search_OnClick" runat="server"></asp:DropDownList>
           内容状态：
           <asp:DropDownList ID="State" AutoPostBack="true" OnSelectedIndexChanged="Search_OnClick" class="input-small" runat="server"></asp:DropDownList>
           <asp:CheckBox ID="IsDuplicate" class="checkbox inline" Text="包含重复标题" runat="server"></asp:CheckBox>

diff --git a/source/SiteServer.Web/SiteServer/WeiXin/modalKeywordAddText.aspx b/source/SiteServer.Web/SiteServer/WeiXin/modalKeywordAddText.aspx
@@ -602,8 +602,8 @@
         <span class="gray">超链接添加形式，如：&lt;a href="http://www.baidu.com"&gt;百度&lt;/a&gt;</span>
         <hr>
         <div id="titles" class="well well-small" style="display:none"></div>
-        <asp:Button id="btnContentSelect" class="btn btn-info" text="添加微官网内容链接" runat="server" />
-        <asp:Button id="btnChannelSelect" class="btn btn-info" text="添加微官网栏目链接" runat="server" />
+        <asp:Button id="BtnContentSelect" class="btn btn-info" text="添加微官网内容链接" runat="server" />
+        <asp:Button id="BtnChannelSelect" class="btn btn-info" text="添加微官网栏目链接" runat="server" />
 
         <input id="idsCollection" name="idsCollection" type="hidden" value="" />
         <script type="text/javascript">

diff --git a/source/SiteServer.Web/SiteServer/WeiXin/pageKeywordConfiguration.aspx b/source/SiteServer.Web/SiteServer/WeiXin/pageKeywordConfiguration.aspx
@@ -15,11 +15,12 @@
 
   <script type="text/javascript">
     var selectWelcomeKeyword = function(keyword){
-      $('#tbWelcomeKeyword').val(keyword);
+      $('#TbWelcomeKeyword').val(keyword);
     };
     var selectDefaultReplyKeyword = function(keyword){
-      $('#tbDefaultReplyKeyword').val(keyword);
-    };
+      $('#TbDefaultReplyKeyword').val(keyword);
+      };
+     
   </script>
 
   <div class="popover popover-static">
@@ -37,7 +38,7 @@
           <td>关注时回复关键词：</td>
           <td>
             <asp:TextBox id="TbWelcomeKeyword" runat="server"/>
-            &nbsp;<asp:Button id="btnWelcomeKeywordSelect" class="btn btn-info" text="选择" runat="server" />
+            &nbsp;<asp:Button id="BtnWelcomeKeywordSelect" class="btn btn-info" text="选择" runat="server" />
           </td>
         </tr>
         <tr>
@@ -50,7 +51,7 @@
           <td>默认无匹配回复关键词：</td>
           <td>
             <asp:TextBox id="TbDefaultReplyKeyword" runat="server"/>
-            &nbsp;<asp:Button id="btnDefaultReplyKeywordSelect" class="btn btn-info" text="选择" runat="server" />
+            &nbsp;<asp:Button id="BtnDefaultReplyKeywordSelect" class="btn btn-info" text="选择" runat="server" />
           </td>
         </tr>
       </table>

diff --git a/source/SiteServer.Web/SiteServer/WeiXin/pageKeywordNews.aspx b/source/SiteServer.Web/SiteServer/WeiXin/pageKeywordNews.aspx
@@ -176,8 +176,8 @@
   <!-- end -->
 
   <ul class="breadcrumb breadcrumb-button">
-    <asp:Button class="btn btn-success" id="btnAddSingle" Text="添加单图文回复" runat="server" />
-    <asp:Button class="btn btn-success" id="btnAddMultiple" Text="添加多图文回复" runat="server" />
+    <asp:Button class="btn btn-success" id="BtnAddSingle" Text="添加单图文回复" runat="server" />
+    <asp:Button class="btn btn-success" id="BtnAddMultiple" Text="添加多图文回复" runat="server" />
   </ul>
 
 </form>

diff --git a/source/SiteServer.Web/SiteServer/WeiXin/pageKeywordNewsAdd.aspx b/source/SiteServer.Web/SiteServer/WeiXin/pageKeywordNewsAdd.aspx
@@ -138,7 +138,7 @@
 
     <div class="tool_area">
       <div class="tool_bar">
-        <input type="button" value="返 回" onclick="javascript:location.href='background_keywordNews.aspx?PublishmentSystemID=<%=base.PublishmentSystemID%>    '" class="btn">
+        <input type="button" value="返 回" onclick="javascript:location.href='background_keywordNews.aspx?PublishmentSystemID=<%=base.PublishmentSystemId%>'" class="btn">
         <!-- <span id="js_preview" class="btn btn_input btn_primary">
           <asp:Literal id="LtlPreview" runat="server" />
         </span> -->

diff --git a/source/SiteServer.Web/SiteServer/WeiXin/pageKeywordResourceAdd.aspx b/source/SiteServer.Web/SiteServer/WeiXin/pageKeywordResourceAdd.aspx
@@ -28,8 +28,8 @@
                     <asp:Literal ID="LtlSite" runat="server" />
 
                     <div class="btn-group">
-                        <asp:Button ID="btnContentSelect" class="btn btn-info" Text="选择内容页" runat="server" />
-                        <asp:Button ID="btnChannelSelect" class="btn btn-info" Text="选择栏目页" runat="server" />
+                        <asp:Button ID="BtnContentSelect" class="btn btn-info" Text="选择内容页" runat="server" />
+                        <asp:Button ID="BtnChannelSelect" class="btn btn-info" Text="选择栏目页" runat="server" />
                     </div>
 
                     <script type="text/javascript">
@@ -123,8 +123,8 @@
                         </strong>
                     </label>
                     <div>
-                        <bairong:BREditor ID="breContent" Width="100%" Height="350" runat="server">
-                        </bairong:BREditor>
+                        <bairong:UEditor ID="BreContent" Width="100%" Height="350" runat="server">
+                        </bairong:UEditor>
                     </div>
                 </div>
 

diff --git a/source/SiteServer.Web/SiteServer/WeiXin/pageKeywordText.aspx b/source/SiteServer.Web/SiteServer/WeiXin/pageKeywordText.aspx
@@ -13,7 +13,7 @@
   <asp:Literal id="LtlBreadCrumb" runat="server" />
   <bairong:alerts text="设置关键词自动回复，可以通过添加规则，用户发送的消息内如果有您设置的关键字，即可把您设置在此规则名中回复的内容自动发送给用户。" runat="server" />
 
-  <asp:dataGrid id="dgContents" showHeader="true" AutoGenerateColumns="false"  HeaderStyle-CssClass="info thead" CssClass="table table-bordered table-hover" gridlines="none" runat="server">
+  <asp:dataGrid id="DgContents" showHeader="true" AutoGenerateColumns="false"  HeaderStyle-CssClass="info thead" CssClass="table table-bordered table-hover" gridlines="none" runat="server">
     <Columns>
       <asp:BoundColumn HeaderText="关键词" DataField="Keywords" >
         <ItemStyle Width="130" cssClass="center" />
@@ -69,7 +69,7 @@
   </asp:dataGrid>
 
   <ul class="breadcrumb breadcrumb-button">
-    <asp:Button class="btn btn-success" id="btnAdd" Text="添加关键词" runat="server" />
+    <asp:Button class="btn btn-success" id="BtnAdd" Text="添加关键词" runat="server" />
   </ul>
 
 </form>

diff --git a/source/SiteServer.Web/SiteServer/WeiXin/pageMenu.aspx b/source/SiteServer.Web/SiteServer/WeiXin/pageMenu.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" Inherits="SSiteServer.BackgroundPages.WeiXin.Pageenu" %>
+<%@ Page Language="C#" Inherits="SiteServer.BackgroundPages.WeiXin.PageMenu" %>
 <%@ Register TagPrefix="bairong" Namespace="SiteServer.BackgroundPages.Controls" Assembly="SiteServer.BackgroundPages" %>
 <!DOCTYPE html>
 <html>

diff --git a/source/SiteServer.Web/SiteServer/WeiXin/pageMenuAdd.aspx b/source/SiteServer.Web/SiteServer/WeiXin/pageMenuAdd.aspx
@@ -22,7 +22,7 @@
                 $('#idsCollection').val(nodeID + '_0');
             };
             var selectKeyword = function (keyword) {
-                $('#tbKeyword').val(keyword);
+                $('#TbKeyword').val(keyword);
             };
         </script>
 
@@ -45,7 +45,7 @@
                         <tr>
                             <td>点击菜单触发：</td>
                             <td>
-                                <asp:DropDownList ID="DdlMenuType" AutoPostBack="true" OnSelectedIndexChanged="DdlMenuType_OnSelectedIndexChanged" runat="server"></asp:DropDownList></td>
+                                <asp:DropDownList ID="DdlMenuType" AutoPostBack="true" OnSelectedIndexChanged="ddlMenuType_OnSelectedIndexChanged" runat="server"></asp:DropDownList></td>
                         </tr>
                     </asp:PlaceHolder>
                     <asp:PlaceHolder ID="PhKeyword" Visible="false" runat="server">
@@ -55,7 +55,7 @@
                                 <asp:TextBox ID="TbKeyword" runat="server" />
                                 <asp:RequiredFieldValidator ControlToValidate="TbKeyword" ErrorMessage=" *" ForeColor="red" Display="Dynamic" runat="server" />
                                 <asp:RegularExpressionValidator runat="server" ControlToValidate="TbKeyword" ValidationExpression="[^']+" ErrorMessage=" *" ForeColor="red" Display="Dynamic" />
-                                &nbsp;<asp:Button ID="btnKeywordSelect" class="btn btn-info" Text="选择" runat="server" />
+                                &nbsp;<asp:Button ID="BtnKeywordSelect" class="btn btn-info" Text="选择" runat="server" />
                             </td>
                         </tr>
                     </asp:PlaceHolder>
@@ -74,8 +74,8 @@
                             <td>微网站页面：</td>
                             <td>
                                 <div id="titles" class="well well-small" style="display: none"></div>
-                                <asp:Button ID="btnContentSelect" class="btn btn-info" Text="选择内容页" runat="server" />
-                                <asp:Button ID="btnChannelSelect" class="btn btn-info" Text="选择栏目页" runat="server" />
+                                <asp:Button ID="BtnContentSelect" class="btn btn-info" Text="选择内容页" runat="server" />
+                                <asp:Button ID="BtnChannelSelect" class="btn btn-info" Text="选择栏目页" runat="server" />
                                 <input id="idsCollection" name="idsCollection" type="hidden" value="" />
                             </td>
                         </tr>

diff --git a/source/SiteServer.Web/SiteServer/WeiXin/pageWebMenu.aspx b/source/SiteServer.Web/SiteServer/WeiXin/pageWebMenu.aspx
@@ -74,7 +74,7 @@
             <table class="table noborder">
               <tr>
                 <td class="center">
-                  <asp:Button id="btnStatus" onclick="Status_OnClick" runat="server" />
+                  <asp:Button id="BtnStatus" onclick="Status_OnClick" runat="server" />
                   <asp:Button class="btn btn-info" text="复制微信菜单到底部导航菜单" onclick="Sync_OnClick" runat="server" />
 
                 </td>

diff --git a/source/SiteServer.Web/SiteServer/WeiXin/pageWebMenuAdd.aspx b/source/SiteServer.Web/SiteServer/WeiXin/pageWebMenuAdd.aspx
@@ -49,15 +49,15 @@
         <asp:PlaceHolder id="PhNavigationType" runat="server">
         <tr>
           <td>点击菜单触发：</td>
-          <td><asp:DropDownList ID="DdlNavigationType" AutoPostBack="true" OnSelectedIndexChanged="DdlNavigationType_OnSelectedIndexChanged" runat="server"></asp:DropDownList></td>
+          <td><asp:DropDownList ID="DdlNavigationType" AutoPostBack="true" OnSelectedIndexChanged="ddlNavigationType_OnSelectedIndexChanged" runat="server"></asp:DropDownList></td>
         </tr>
         </asp:PlaceHolder>
         <asp:PlaceHolder id="PhFunction" visible="false" runat="server">
         <tr>
           <td>微功能页面：</td>
           <td>
             <div id="functionTitle" class="well well-small" style="display:none"></div>
-            <asp:Button id="btnFunctionSelect" class="btn btn-info" text="选择微功能页面" runat="server" />
+            <asp:Button id="BtnFunctionSelect" class="btn btn-info" text="选择微功能页面" runat="server" />
             <input id="keywordType" name="keywordType" type="hidden" value="" />
             <input id="functionID" name="functionID" type="hidden" value="" />
           </td>
@@ -78,8 +78,8 @@
           <td>微网站页面：</td>
           <td>
             <div id="siteTitle" class="well well-small" style="display:none"></div>
-            <asp:Button id="btnContentSelect" class="btn btn-info" text="选择内容页" runat="server" />
-            <asp:Button id="btnChannelSelect" class="btn btn-info" text="选择栏目页" runat="server" />
+            <asp:Button id="BtnContentSelect" class="btn btn-info" text="选择内容页" runat="server" />
+            <asp:Button id="BtnChannelSelect" class="btn btn-info" text="选择栏目页" runat="server" />
             <input id="idsCollection" name="idsCollection" type="hidden" value="" />
           </td>
         </tr>

diff --git a/source/SiteServer.Web/SiteServer/WeiXin/pageWebMenuType.aspx b/source/SiteServer.Web/SiteServer/WeiXin/pageWebMenuType.aspx
@@ -38,7 +38,7 @@
       </table> -->
 
       <div>
-        <asp:dataList id="dlContents" CssClass="table" repeatDirection="Horizontal" repeatColumns="4" runat="server">
+        <asp:dataList id="DlContents" CssClass="table" repeatDirection="Horizontal" repeatColumns="4" runat="server">
           <ItemTemplate>
             <asp:Literal ID="LtlImageUrl" runat="server"></asp:Literal>
             <asp:Literal ID="LtlDescription" runat="server"></asp:Literal>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<%@ Page language="c#" trace="false" enableViewState="false" Inherits="SiteServer.BackgroundPages.WeiXin.PageAjaxUpload" %>
		<%@ Page language="c#" trace="false" enableViewState="false" Inherits="SiteServer.BackgroundPages.WeiXin.AjaxUpload" %>