Skip to content

Commit 3993d34

Browse files
starlyingstarlying
authored
Merge pull request siteserver#56 from braceyx/dev
修复微信基本使用问题
2 parents bfeda5a + 043b0de commit 3993d34

16 files changed

+113
-111
lines changed

‎source/SiteServer.BackgroundPages/WeiXin/ModalContentSelect.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public static string GetRedirectUrlByKeywordAddList(int publishmentSystemId, boo
6363
public static string GetOpenWindowString(int publishmentSystemId, bool isMultiple, string jsMethod)
6464
{
6565
return PageUtils.GetOpenWindowString("选择微官网内容",
66-
PageUtils.GetWeiXinUrl(nameof(ModalCardSnSetting), new NameValueCollection
66+
PageUtils.GetWeiXinUrl(nameof(ModalContentSelect), new NameValueCollection
6767
{
6868
{"publishmentSystemId", publishmentSystemId.ToString()},
6969
{"isMultiple", isMultiple.ToString()},

‎source/SiteServer.BackgroundPages/WeiXin/ModalKeywordSelect.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ void rptContents_ItemDataBound(object sender, RepeaterItemEventArgs e)
8484
var ltlKeyword = e.Item.FindControl("ltlKeyword") as Literal;
8585

8686
ltlKeyword.Text =
87-
$@"<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>";
87+
$@"<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>";
8888
}
8989
}
9090

@@ -101,7 +101,7 @@ private string PageUrl
101101
if (string.IsNullOrEmpty(_pageUrl))
102102
{
103103
_pageUrl =
104-
$"modal_keywordSelect.aspx?PublishmentSystemId={PublishmentSystemId}&keywordType={DdlKeywordType.SelectedValue}&keyword={TbKeyword.Text}&jsMethod={_jsMethod}";
104+
$"modalkeywordSelect.aspx?PublishmentSystemId={PublishmentSystemId}&keywordType={DdlKeywordType.SelectedValue}&keyword={TbKeyword.Text}&jsMethod={_jsMethod}";
105105
}
106106
return _pageUrl;
107107
}

‎source/SiteServer.Web/SiteServer/WeiXin/ajaxUpload.aspx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<%@ Page language="c#" trace="false" enableViewState="false" Inherits="SiteServer.BackgroundPages.WeiXin.PageAjaxUpload" %>
1+
<%@ Page language="c#" trace="false" enableViewState="false" Inherits="SiteServer.BackgroundPages.WeiXin.AjaxUpload" %>

‎source/SiteServer.Web/SiteServer/WeiXin/modalContentSelect.aspx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<tr>
2727
<td>
2828
栏目：
29-
<asp:DropDownList ID="NodeIDDropDownList" AutoPostBack="true" OnSelectedIndexChanged="Search_OnClick" runat="server"></asp:DropDownList>
29+
<asp:DropDownList ID="NodeIdDropDownList" AutoPostBack="true" OnSelectedIndexChanged="Search_OnClick" runat="server"></asp:DropDownList>
3030
内容状态：
3131
<asp:DropDownList ID="State" AutoPostBack="true" OnSelectedIndexChanged="Search_OnClick" class="input-small" runat="server"></asp:DropDownList>
3232
<asp:CheckBox ID="IsDuplicate" class="checkbox inline" Text="包含重复标题" runat="server"></asp:CheckBox>

‎source/SiteServer.Web/SiteServer/WeiXin/modalKeywordAddText.aspx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -602,8 +602,8 @@
602602
<span class="gray">超链接添加形式，如：&lt;a href="http://www.baidu.com"&gt;百度&lt;/a&gt;</span>
603603
<hr>
604604
<div id="titles" class="well well-small" style="display:none"></div>
605-
<asp:Button id="btnContentSelect" class="btn btn-info" text="添加微官网内容链接" runat="server" />
606-
<asp:Button id="btnChannelSelect" class="btn btn-info" text="添加微官网栏目链接" runat="server" />
605+
<asp:Button id="BtnContentSelect" class="btn btn-info" text="添加微官网内容链接" runat="server" />
606+
<asp:Button id="BtnChannelSelect" class="btn btn-info" text="添加微官网栏目链接" runat="server" />
607607

608608
<input id="idsCollection" name="idsCollection" type="hidden" value="" />
609609
<script type="text/javascript">

‎source/SiteServer.Web/SiteServer/WeiXin/pageKeywordConfiguration.aspx‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@
1515

1616
<script type="text/javascript">
1717
var selectWelcomeKeyword = function(keyword){
18-
$('#tbWelcomeKeyword').val(keyword);
18+
$('#TbWelcomeKeyword').val(keyword);
1919
};
2020
var selectDefaultReplyKeyword = function(keyword){
21-
$('#tbDefaultReplyKeyword').val(keyword);
22-
};
21+
$('#TbDefaultReplyKeyword').val(keyword);
22+
};
23+
2324
</script>
2425

2526
<div class="popover popover-static">
@@ -37,7 +38,7 @@
3738
<td>关注时回复关键词：</td>
3839
<td>
3940
<asp:TextBox id="TbWelcomeKeyword" runat="server"/>
40-
&nbsp;<asp:Button id="btnWelcomeKeywordSelect" class="btn btn-info" text="选择" runat="server" />
41+
&nbsp;<asp:Button id="BtnWelcomeKeywordSelect" class="btn btn-info" text="选择" runat="server" />
4142
</td>
4243
</tr>
4344
<tr>
@@ -50,7 +51,7 @@
5051
<td>默认无匹配回复关键词：</td>
5152
<td>
5253
<asp:TextBox id="TbDefaultReplyKeyword" runat="server"/>
53-
&nbsp;<asp:Button id="btnDefaultReplyKeywordSelect" class="btn btn-info" text="选择" runat="server" />
54+
&nbsp;<asp:Button id="BtnDefaultReplyKeywordSelect" class="btn btn-info" text="选择" runat="server" />
5455
</td>
5556
</tr>
5657
</table>

‎source/SiteServer.Web/SiteServer/WeiXin/pageKeywordNews.aspx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@
176176
<!-- end -->
177177

178178
<ul class="breadcrumb breadcrumb-button">
179-
<asp:Button class="btn btn-success" id="btnAddSingle" Text="添加单图文回复" runat="server" />
180-
<asp:Button class="btn btn-success" id="btnAddMultiple" Text="添加多图文回复" runat="server" />
179+
<asp:Button class="btn btn-success" id="BtnAddSingle" Text="添加单图文回复" runat="server" />
180+
<asp:Button class="btn btn-success" id="BtnAddMultiple" Text="添加多图文回复" runat="server" />
181181
</ul>
182182

183183
</form>

‎source/SiteServer.Web/SiteServer/WeiXin/pageKeywordNewsAdd.aspx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138

139139
<div class="tool_area">
140140
<div class="tool_bar">
141-
<input type="button" value="返 回" onclick="javascript:location.href='background_keywordNews.aspx?PublishmentSystemID=<%=base.PublishmentSystemID%> '" class="btn">
141+
<input type="button" value="返 回" onclick="javascript:location.href='background_keywordNews.aspx?PublishmentSystemID=<%=base.PublishmentSystemId%>'" class="btn">
142142
<!-- <span id="js_preview" class="btn btn_input btn_primary">
143143
<asp:Literal id="LtlPreview" runat="server" />
144144
</span> -->

‎source/SiteServer.Web/SiteServer/WeiXin/pageKeywordResourceAdd.aspx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
<asp:Literal ID="LtlSite" runat="server" />
2929

3030
<div class="btn-group">
31-
<asp:Button ID="btnContentSelect" class="btn btn-info" Text="选择内容页" runat="server" />
32-
<asp:Button ID="btnChannelSelect" class="btn btn-info" Text="选择栏目页" runat="server" />
31+
<asp:Button ID="BtnContentSelect" class="btn btn-info" Text="选择内容页" runat="server" />
32+
<asp:Button ID="BtnChannelSelect" class="btn btn-info" Text="选择栏目页" runat="server" />
3333
</div>
3434

3535
<script type="text/javascript">
@@ -123,8 +123,8 @@
123123
</strong>
124124
</label>
125125
<div>
126-
<bairong:BREditor ID="breContent" Width="100%" Height="350" runat="server">
127-
</bairong:BREditor>
126+
<bairong:UEditor ID="BreContent" Width="100%" Height="350" runat="server">
127+
</bairong:UEditor>
128128
</div>
129129
</div>
130130

‎source/SiteServer.Web/SiteServer/WeiXin/pageKeywordText.aspx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<asp:Literal id="LtlBreadCrumb" runat="server" />
1414
<bairong:alerts text="设置关键词自动回复，可以通过添加规则，用户发送的消息内如果有您设置的关键字，即可把您设置在此规则名中回复的内容自动发送给用户。" runat="server" />
1515

16-
<asp:dataGrid id="dgContents" showHeader="true" AutoGenerateColumns="false" HeaderStyle-CssClass="info thead" CssClass="table table-bordered table-hover" gridlines="none" runat="server">
16+
<asp:dataGrid id="DgContents" showHeader="true" AutoGenerateColumns="false" HeaderStyle-CssClass="info thead" CssClass="table table-bordered table-hover" gridlines="none" runat="server">
1717
<Columns>
1818
<asp:BoundColumn HeaderText="关键词" DataField="Keywords" >
1919
<ItemStyle Width="130" cssClass="center" />
@@ -69,7 +69,7 @@
6969
</asp:dataGrid>
7070

7171
<ul class="breadcrumb breadcrumb-button">
72-
<asp:Button class="btn btn-success" id="btnAdd" Text="添加关键词" runat="server" />
72+
<asp:Button class="btn btn-success" id="BtnAdd" Text="添加关键词" runat="server" />
7373
</ul>
7474

7575
</form>

0 commit comments

Comments
 (0)