Skip to content

微夏更新 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Apr 2, 2020
Merged

微夏更新 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4165df7
调试手机端视频界面
weishakeji Mar 17, 2020
fd29d92
修正教师电话不允许显示时，手机端仍然显示的问题
weishakeji Mar 18, 2020
1c48af6
修正：备案链接地址变更问题（信管局要求）
weishakeji Mar 18, 2020
fe432a9
修正：学员登录失效后，管理界面给出相应提示
weishakeji Mar 18, 2020
f8de73a
删除试题练习中心
weishakeji Mar 19, 2020
bec7c94
修正：当用户在线人数过多时，登录状态验证故障
weishakeji Mar 20, 2020
1b2eda7
修正：新闻样式
weishakeji Mar 20, 2020
661169d
修正：学习记录打印时，未购买课程不记录
weishakeji Mar 23, 2020
a37d8d1
修正：不管是否过期，都要作为学习记录
weishakeji Mar 23, 2020
e728281
新增：ViewData层增加缓存特性，仅限Get方式获取时使用
weishakeji Mar 23, 2020
bedf5e8
优化：章节缓存输出
weishakeji Mar 23, 2020
ce7da06
优化：章节缓存输出
weishakeji Mar 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Song.Extend/Login/Accounts.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ public Song.Entities.Accounts CurrentUser
for (int i = list.Count - 1; i >= 0; i--)
{
Song.Entities.Accounts em = list[i];
if (em == null) continue;
if (em.Ac_ID == acid)
{
//如果不是在微信中，同一账号不能同时登录
Expand Down Expand Up @@ -292,6 +293,7 @@ private void _register(Song.Entities.Accounts acc)
List<Song.Entities.Accounts> list = this.OnlineUser;
for (int i = 0; i < list.Count; i++)
{
if (list[i] == null) continue;
if (list[i].Ac_ID == acc.Ac_ID)
{
list[i] = acc;
Expand All @@ -317,6 +319,7 @@ public void Refresh(Song.Entities.Accounts st)
{
for (int i = 0; i < list.Count; i++)
{
if (list[i] == null) continue;
if (list[i].Ac_ID == st.Ac_ID)
{
//登录时间，该时间不入数据库，仅为临时使用
Expand Down Expand Up @@ -376,6 +379,7 @@ public int CleanOut()
for (int i = list.Count - 1; i >= 0; i--)
{
Song.Entities.Accounts em = list[i];
if (em == null) continue;
if (DateTime.Now > em.Ac_LastTime.AddMinutes(outTimeNumer))
{
list.RemoveAt(i);
Expand All @@ -396,6 +400,7 @@ public void CleanOut(int accid)
{
for (int i = list.Count - 1; i >= 0; i--)
{
if (list[i] == null) continue;
if (list[i].Ac_ID == accid)
{
list.RemoveAt(i);
Expand Down
32 changes: 22 additions & 10 deletions Song.ServiceImpls/AccountsCom.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,17 @@ public int AccountsAdd(Accounts entity)
//如果身份证不为空，则解析生日
if (!string.IsNullOrWhiteSpace(entity.Ac_IDCardNumber))
{
IDCardNumber card = IDCardNumber.Get(entity.Ac_IDCardNumber);
entity.Ac_Age = card.Birthday.Year;
entity.Ac_Sex = card.Sex;
entity.Ac_Birthday = card.Birthday;
entity.Ac_Native = card.Province + "," + card.Area + "," + card.City;
try
{
IDCardNumber card = IDCardNumber.Get(entity.Ac_IDCardNumber);
entity.Ac_Age = card.Birthday.Year;
entity.Ac_Sex = card.Sex;
entity.Ac_Birthday = card.Birthday;
entity.Ac_Native = card.Province + "," + card.Area + "," + card.City;
}
catch
{
}
}
else
{
Expand Down Expand Up @@ -125,11 +131,17 @@ public void AccountsSave(Accounts entity)
//如果身份证不为空，则解析生日
if (!string.IsNullOrWhiteSpace(entity.Ac_IDCardNumber))
{
IDCardNumber card = IDCardNumber.Get(entity.Ac_IDCardNumber);
entity.Ac_Age = card.Birthday.Year;
entity.Ac_Sex = card.Sex;
entity.Ac_Birthday = card.Birthday;
entity.Ac_Native = card.Province + "," + card.Area + "," + card.City;
try
{
IDCardNumber card = IDCardNumber.Get(entity.Ac_IDCardNumber);
entity.Ac_Age = card.Birthday.Year;
entity.Ac_Sex = card.Sex;
entity.Ac_Birthday = card.Birthday;
entity.Ac_Native = card.Province + "," + card.Area + "," + card.City;
}
catch
{
}
}
else
{
Expand Down
2 changes: 2 additions & 0 deletions Song.ServiceImpls/CourseCom.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,7 @@ public List<Course> CoursePager(int orgid, string sbjid, bool? isUse, bool? isLi
wc.And(wcSbjid);
}
if (isUse != null) wc.And(Course._.Cou_IsUse == (bool)isUse);
if (order == "live") isLive = true;
if (isLive != null) wc.And(Course._.Cou_ExistLive == (bool)isLive);
if (!string.IsNullOrWhiteSpace(searTxt)) wc.And(Course._.Cou_Name.Like("%" + searTxt.Trim() + "%"));
countSum = Gateway.Default.Count<Course>(wc);
Expand All @@ -684,6 +685,7 @@ public List<Course> CoursePager(int orgid, string sbjid, bool? isUse, bool? isLi
wc.And(Course._.Cou_IsFree == true);
wcOrder = Course._.Cou_IsFree.Desc & Course._.Cou_Tax.Desc;
}
//if (order == "live") wc.And();
return Gateway.Default.From<Course>().Where(wc).OrderBy(wcOrder).ToList<Course>(size, (index - 1) * size);
}
/// <summary>
Expand Down
21 changes: 21 additions & 0 deletions Song.ServiceImpls/StudentCom.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -952,6 +952,27 @@ FROM [LogForStudentStudy] where {acid} group by ol_id
DataTable dt = ds.Tables[0];
if (dt.Rows.Count > 0)
{
//*****如果没有购买的，则去除
//购买的课程(含概试用的）
List<Song.Entities.Course> cous = Business.Do<ICourse>().CourseForStudent(acid, null, 1, null, -1);
for (int i = 0; i < dt.Rows.Count; i++)
{
bool isExist = false;
for (int j = 0; j < cous.Count; j++)
{
if (dt.Rows[i]["Cou_ID"].ToString() == cous[j].Cou_ID.ToString())
{
isExist = true;
break;
}
}
if (!isExist)
{
dt.Rows.RemoveAt(i);
i--;
}
}
//计算完成度
foreach (DataRow dr in dt.Rows)
{
//课程的累计完成度
Expand Down
7 changes: 6 additions & 1 deletion Song.Site/Manage/Content/News.aspx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,12 @@
</itemtemplate>
<itemstyle cssclass="left" />
</asp:TemplateField>

<asp:TemplateField HeaderText="预览">
<itemtemplate>
<a href='/article.ashx?id=<%# Eval("Art_Id")%>' target="_blank">预览</a>
</itemtemplate>
<itemstyle cssclass="center" width="60px" />
</asp:TemplateField>
<asp:TemplateField HeaderText="显示">
<itemtemplate>
<cc1:StateButton id="sbShow" onclick="sbShow_Click" runat="server" TrueText="显示" FalseText="隐藏" State='<%# Eval("Art_IsShow","{0}")=="True"%>'></cc1:StateButton>
Expand Down
5 changes: 3 additions & 2 deletions Song.Site/Manage/Student/Archives.aspx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@
<asp:TemplateField HeaderText="回顾">
<ItemStyle CssClass="center" Width="60px" />
<ItemTemplate>
<a href="#" onclick="OpenWin('/ExamReview.ashx?id=<%# Eval("Exr_ID")%>&stid=<%# Eval("Ac_Id")%>','<%# Eval("Exam_Title","考试回顾：《{0}》")%>',980,95);return false;">
回顾</a>
<%-- <a href="#" onclick="OpenWin('/ExamReview.ashx?id=<%# Eval("Exr_ID")%>&stid=<%# Eval("Ac_Id")%>','<%# Eval("Exam_Title","考试回顾：《{0}》")%>',980,95);return false;">
回顾</a>--%>
<a href='/ExamReview.ashx?id=<%# Eval("Exr_ID")%>&stid=<%# Eval("Ac_Id")%>' target='_blank'>回顾</a>
</ItemTemplate>
</asp:TemplateField>
<%-- <asp:TemplateField HeaderText="模拟测试">
Expand Down
3 changes: 3 additions & 0 deletions Song.Site/Manage/Student/CouponDetails.aspx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ public partial class CouponDetails : Extend.CustomPage
Song.Entities.Accounts st = null;
protected void Page_Load(object sender, EventArgs e)
{
Song.Entities.Accounts st = this.Master.Account;
if (st == null) return;

this.Form.DefaultButton = this.btnSear.UniqueID;
st = this.Master.Account;
//获取总积分
Expand Down
2 changes: 1 addition & 1 deletion Song.Site/Manage/Student/Course_Study.aspx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ protected void BindData(object sender, EventArgs e)
Song.Entities.Accounts st = this.Master.Account;
if (st == null) return;
//����Ŀγ�(�������õģ�
List<Song.Entities.Course> cous = Business.Do<ICourse>().CourseForStudent(st.Ac_ID, null, 1,null,-1);
List<Song.Entities.Course> cous = Business.Do<ICourse>().CourseForStudent(st.Ac_ID, null, 0,null,-1);
foreach (Song.Entities.Course c in cous)
{
//�γ�ͼƬ
Expand Down
3 changes: 2 additions & 1 deletion Song.Site/Manage/Student/Learningcard.aspx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ public partial class Learningcard : Extend.CustomPage
protected int cardcount, usecount;
protected void Page_Load(object sender, EventArgs e)
{

Song.Entities.Accounts st = Extend.LoginState.Accounts.CurrentUser;
if (st == null) return;

if (Request.ServerVariables["REQUEST_METHOD"] == "GET")
{
Expand Down
2 changes: 2 additions & 0 deletions Song.Site/Manage/Student/Online.aspx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ public partial class Online : Extend.CustomPage
Song.Entities.Organization org;
protected void Page_Load(object sender, EventArgs e)
{
Song.Entities.Accounts st = this.Master.Account;
if (st == null) return;
this.Form.DefaultButton = this.btnSear.UniqueID;
org = Business.Do<IOrganization>().OrganCurrent();
if (!this.IsPostBack)
Expand Down
2 changes: 1 addition & 1 deletion Song.Site/Manage/Student/Share.aspx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public partial class Share : Extend.CustomPage
protected void Page_Load(object sender, EventArgs e)
{
Song.Entities.Accounts acc = this.Master.Account;

if (acc == null) return;
//分享链接
string url = "http://{0}{1}/default.ashx?sharekeyid={2}";
//端口
Expand Down
2 changes: 2 additions & 0 deletions Song.Site/Manage/Student/Subordinates.aspx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ public partial class Subordinates : Extend.CustomPage
Song.Entities.Organization org = null;
protected void Page_Load(object sender, EventArgs e)
{
Song.Entities.Accounts st = this.Master.Account;
if (st == null) return;
this.Form.DefaultButton = this.btnSear.UniqueID;
org = Business.Do<IOrganization>().OrganCurrent();
if (!IsPostBack)
Expand Down
3 changes: 2 additions & 1 deletion Song.Site/Manage/Student/TestArchives.aspx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@
<asp:TemplateField HeaderText="回顾">
<itemstyle cssclass="center" Width="60px" />
<itemtemplate>
<a href="#" onclick="OpenWin('/testview.ashx?trid=<%# Eval("Tr_ID")%>&tpid=<%# Eval("tp_Id")%>','<%# Eval("Tp_Name","测试回顾：《{0}》")%>',980,100);return false;">回顾</a>
<%-- <a href="#" onclick="OpenWin('/testview.ashx?trid=<%# Eval("Tr_ID")%>&tpid=<%# Eval("tp_Id")%>','<%# Eval("Tp_Name","测试回顾：《{0}》")%>',980,100);return false;">回顾</a>--%>
<a href='/testview.ashx?trid=<%# Eval("Tr_ID")%>&tpid=<%# Eval("tp_Id")%>' target='_blank'>回顾</a>
</itemtemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="成绩">
Expand Down
2 changes: 1 addition & 1 deletion Song.Site/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// 有关程序集的常规信息通过下列属性集
// 控制。更改这些属性值可修改
// 与程序集关联的信息。
[assembly: AssemblyTitle("ReleaseDate 2020-3-3")]
[assembly: AssemblyTitle("ReleaseDate 2020-3-23")]
[assembly: AssemblyDescription("集“学、练、考”与一体的在线学习系统")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("微厦科技")]
Expand Down
3 changes: 0 additions & 3 deletions Song.Site/Song.Site.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1292,7 +1292,6 @@
<Content Include="Templates\Web\Gov\Teacher\Styles\Startpage.css" />
<Content Include="Templates\Web\Gov\Test.htm" />
<Content Include="Templates\Web\Gov\TestScene.htm" />
<Content Include="Templates\Web\Gov\Training.htm" />
<Content Include="Templates\Web\Gov\_self.xml" />
<Content Include="Templates\Web\Neimeng\CoreScripts\ajaxfileupload.js" />
<Content Include="Templates\Web\Neimeng\CourseBuy.htm" />
Expand Down Expand Up @@ -1839,7 +1838,6 @@
<Content Include="Templates\Web\Neimeng\Teacher\Styles\Startpage.css" />
<Content Include="Templates\Web\Neimeng\Test.htm" />
<Content Include="Templates\Web\Neimeng\TestScene.htm" />
<Content Include="Templates\Web\Neimeng\Training.htm" />
<Content Include="Templates\Web\School\About.htm" />
<Content Include="Templates\Web\School\Admin\Images\login-banner.jpg" />
<Content Include="Templates\Web\School\Admin\Images\main-banner.jpg" />
Expand Down Expand Up @@ -2046,7 +2044,6 @@
<Content Include="Templates\Web\School\Teacher\Styles\Startpage.css" />
<Content Include="Templates\Web\School\Test.htm" />
<Content Include="Templates\Web\School\TestScene.htm" />
<Content Include="Templates\Web\School\Training.htm" />
<Content Include="Templates\Web\School\_self.xml" />
<Content Include="Utility\Ckplayer\ckplayer\ckplayer.js" />
<Content Include="Utility\Ckplayer\ckplayer\ckplayer.swf" />
Expand Down
2 changes: 1 addition & 1 deletion Song.Site/Templates/Mobi/Default2019/Courses.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ <h1 class="mui-title"><input name="sear" type="search" id="search-top" class="tx
<div class="mui-scroll-wrapper mui-slider-indicator mui-segmented-control mui-segmented-control-inverted btnBar">
<div style="width: 100%">
<a class="mui-control-item mui-active rec" href="#" order="rec">推荐</a> <a class="mui-control-item new"
href="#" order="new">最新</a> <a class="mui-control-item hot" href="#" order="flux">最热</a>
href="#" order="live">直播</a> <a class="mui-control-item hot" href="#" order="flux">最热</a>
<a class="mui-control-item free" href="#" order="free">免费</a>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion Song.Site/Templates/Mobi/Default2019/Inc/CourseStudyFooter.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
}
//显示视频
var video = document.querySelector("video");
video.style.display = "";
if (video.size() > 0) video.style.display = "";
});
}
</script>
24 changes: 16 additions & 8 deletions Song.Site/Templates/Mobi/Default2019/Scripts/CourseStudy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,16 +176,24 @@ var vdata = new Vue({
for (var i = 0; i < setbtn.length; i++) {
//setbtn[i].style.display = "none";
}
window.setInterval(function() {
var video = document.querySelector("video");

video.setAttribute("x5-playsinline", "true");
video.setAttribute("playsinline", "true");
video.setAttribute("webkit-playsinline", "true");
//
//video.setAttribute("x-webkit-airplay",true);
//video.setAttribute("x5-video-player-type","h5");
//
video.removeAttribute("controls");
video.setAttribute("x5-video-player-fullscreen", "true");
video.setAttribute("x5-video-orientation", "portraint");
video.setAttribute("controlsList", "nodownload");
}, 6000);
//给video对象增加属性
var video = document.querySelector("video");
/**/
video.setAttribute("x5-playsinline", "");
video.setAttribute("playsinline", true);
video.setAttribute("webkit-playsinline", "");
//video.setAttribute("x-webkit-airplay",true);
//video.setAttribute("x5-video-player-type","h5");
video.setAttribute("x5-video-player-fullscreen", "true");
video.setAttribute("x5-video-orientation", "portraint");

},
//章节列表的点击事件
outlineClick: function(olid, event) {
Expand Down
11 changes: 7 additions & 4 deletions Song.Site/Templates/Mobi/Default2019/Styles/CourseStudy.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,18 @@ html,body
}

video::-internal-media-controls-download-button {
display: none;
display: none !important;
}

video::-webkit-media-controls-enclosure {
overflow: hidden;
overflow: hidden !important;
}
video::-webkit-media-controls {
overflow: hidden !important;
}

video::-webkit-media-controls-panel {
width: calc(100% + 30px);
width: calc(100% + 30px) !important;
margin-left: auto;
}

/*返回首页*/
Expand Down
2 changes: 1 addition & 1 deletion Song.Site/Templates/Mobi/Default2019/Styles/Courses.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ input {
content: "\e620";
}
.btnBar .new:before {
content: "\e61e";
content: "\e73e";
}
.btnBar .hot:before {
content: "\e6be";
Expand Down
6 changes: 5 additions & 1 deletion Song.Site/Templates/Mobi/Default2019/Teachers.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@
<vt:list type="teacher" item="data" index="i" remark="教师列表">
<div class="mui-card">
<!--页眉，放置标题-->
<div class="mui-card-header">{$:#.data.th_name}<a href="tel:{$:#.data.Th_PhoneMobi}" type="tel" class="th-tel"><b></b>{$:#.data.Th_PhoneMobi}</a></div>
<div class="mui-card-header">{$:#.data.th_name}
<vt:if var="data.Th_IsOpenMobi" value="true" compare="=">
<a href="tel:{$:#.data.Th_PhoneMobi}" type="tel" class="th-tel"><b></b>{$:#.data.Th_PhoneMobi}</a>
</vt:if>
</div>
<!--内容区-->
<div class="mui-card-content">
<div class="teacher" thname="{$:#.data.th_name}" thid="{$:#.data.th_id}">
Expand Down
2 changes: 1 addition & 1 deletion Song.Site/Templates/Web/Gov/Inc/Footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<br />
地址：{$:#.org.Org_Address}&nbsp; &nbsp; 电话：{$:#.org.Org_Phone}<br />
Copyright &copy; 2016-2018 {$:#.org.Org_AbbrEnName} All rights reserved &nbsp;
<vt:if var="org.Org_ICP" value="" compare="!="> <a href="http://beian.miit.gov.cn" target="_blank">{$:#.org.Org_ICP}</a> </vt:if>
<vt:if var="org.Org_ICP" value="" compare="!="> <a href="http://www.beian.miit.gov.cn/" target="_blank">{$:#.org.Org_ICP}</a> </vt:if>
<vt:if var="org.Org_GonganBeian" value="" compare="!=">
<a href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode={$:#.org.Org_GonganBeian}" target="_blank">
<img src="../Images/ghs.png" />&nbsp;{$:#.org.Org_GonganBeian}</a>
Expand Down
Loading