From 113949d22986e3ac970a9e9eb158eea0e0eabb36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=9D=A4=20=E6=A2=81?= Date: Mon, 29 Aug 2022 18:40:10 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=94=B6=E8=B4=B9=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=96=B0=E7=94=9F?= =?UTF-8?q?=E6=94=B6=E8=B4=B9=E5=AE=9E=E7=BC=B4=E5=8A=A8=E6=80=81=E5=90=88?= =?UTF-8?q?=E8=AE=A1=E5=A2=9E=E5=8A=A0=E5=88=9D=E5=A7=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuInfoBasic_PayFee/PayFeeIndex.js | 2 +- .../EducationalAdministration/Views/StuInfoFresh/PayFeeForm.js | 2 +- .../EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/PayFeeIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/PayFeeIndex.js index a9d23e2bc..75a68044f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/PayFeeIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/PayFeeIndex.js @@ -52,7 +52,7 @@ var bootstrap = function ($, learun) { title: '二维码缴费', url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic_PayFee/PayFeeForm?keyValue=' + keyValue, width: 800, - height: 650, + height: 690, btn: null }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeForm.js index b2e933427..54adbca20 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeForm.js @@ -102,7 +102,7 @@ var bootstrap = function ($, learun) { $.each(data['FinaChargesStandardList'], function (i, item) { html += '' + item.ChargeItemName + '' + item.Standard + '元'; }); - html += '应缴合计' + data['PayFeeTotal'] + '元'; + html += '应缴合计' + data['PayFeeTotal'] + '元' + PayFeeTotal+''; html += '  '; html += '已缴金额' + YJAmount + ''; $('#PayFeeDetail').html(html); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js index 3ce4239e8..9a4323864 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js @@ -53,7 +53,7 @@ var bootstrap = function ($, learun) { title: '二维码缴费', url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/PayFeeForm?keyValue=' + keyValue, width: 800, - height: 650, + height: 690, btn: null }); } From 65889cb00f796788c7fcc8dd4c8feb22da6369cd Mon Sep 17 00:00:00 2001 From: liangkun Date: Tue, 30 Aug 2022 09:25:31 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=96=B0=E7=94=9F=E7=BC=B4=E8=B4=B9?= =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/StuInfoFreshController.cs | 5 +---- .../Views/StuInfoBasic_PayFee/PayFeeForm.js | 2 -- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs index 2b16551e5..7a7ed688d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs @@ -665,7 +665,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers FinaChargesStandardList = FinaChargesStandardList, StuInfoFreshFamilyList = stuInfoFreshFamily, PayFeeTotal = PayFeeTotal, - YJAmount = FeeOrderList.Sum(x => x.SJAmount) + YJAmount = FinaChargesStandardList.Sum(x => x.PayedMoney) }; return Success(jsonData); } @@ -1321,9 +1321,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers if (!string.IsNullOrEmpty(imgUrl)) { - // model.PayFeeDetail = entity.PayFeeDetail; - // model.PayMoney = entity.PayMoney; - model.LoanMoney = entity.LoanMoney; model.orderid = orderid; stuInfoFreshIBLL.SaveFeeData(keyValue, model, list); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/PayFeeForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/PayFeeForm.js index 5b3bcea2d..c60577684 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/PayFeeForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/PayFeeForm.js @@ -142,8 +142,6 @@ var bootstrap = function ($, learun) { param.PayMoney = $('#PayMoney').html(); learun.loading(true, '正在生成付款信息请稍等...'); $("#confirmPayFee").hide(); - console.log(JSON.stringify(param)); - console.log(JSON.stringify(list)); learun.httpAsyncPost(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic_PayFee/PayFeeQRCode?keyValue=' + keyValue, { strEntity: JSON.stringify(param), detailList: JSON.stringify(list) }, function (res) { learun.loading(false); $('#qrcodeImg').attr('src', res.info); From f7ecd730399226552344acbd96fa8c7bd9c8608b Mon Sep 17 00:00:00 2001 From: liangkun Date: Tue, 30 Aug 2022 09:47:06 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=96=B0=E7=94=9F=E7=BC=B4=E8=B4=B9?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=BC=B4=E8=B4=B9=E7=8A=B6=E6=80=81=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuInfoFresh/PayFeeIndex.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js index 9a4323864..9bafc9e8d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js @@ -302,8 +302,14 @@ var bootstrap = function ($, learun) { { label: '学号', name: 'StuNo', width: 100, align: "left" }, { label: '姓名', name: 'StuName', width: 100, align: "left" }, { - label: '线上缴费状态', name: 'PayFeeStatus', width: 100, align: "left", formatter: function (value) { - return value == 1 ? "已缴费" : "未缴费"; + label: '线上缴费状态', name: 'PayFeeStatus', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'PayStatus', + callback: function (_data) { + callback(_data.text); + } + }); } }, { label: '线上缴费时间', name: 'PayFeeDate', width: 130, align: "left" }, From ef4433d290fd60387409f729395d5af3ea8848c2 Mon Sep 17 00:00:00 2001 From: liangkun Date: Tue, 30 Aug 2022 10:00:06 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E7=BC=B4=E8=B4=B9=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E6=A1=86=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuInfoBasic_PayFee/PayFeeForm.js | 1 + .../EducationalAdministration/Views/StuInfoFresh/PayFeeForm.js | 1 + 2 files changed, 2 insertions(+) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/PayFeeForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/PayFeeForm.js index c60577684..b60c0fd5b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/PayFeeForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/PayFeeForm.js @@ -115,6 +115,7 @@ var bootstrap = function ($, learun) { var detail = ""; var ifisnull = false; $('.paydetail').each(function (i, item) { + $(this).attr('disabled', 'disabled'); var value = 0; if (!!$(this).val()) { value = parseFloat($(this).val()); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeForm.js index 54adbca20..94fcac8ec 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeForm.js @@ -114,6 +114,7 @@ var bootstrap = function ($, learun) { var detail = ""; var ifisnull = false; $('.paydetail').each(function (i, item) { + $(this).attr('disabled', 'disabled'); var value = 0; if (!!$(this).val()) { value = parseFloat($(this).val()); From 17592315357a0101508c2f6edbb1b3687187e005 Mon Sep 17 00:00:00 2001 From: liangkun Date: Tue, 30 Aug 2022 11:56:23 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=AD=A6=E7=94=9F=E9=80=89=E4=BF=AE=E8=AF=BE?= =?UTF-8?q?=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/UserCenter/Index.cshtml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml index e072cc0d8..067e4e9a1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml @@ -15,14 +15,14 @@
    -
  • 基本信息
    • +
  • 基本信息
    • @*
  • 联系方式
    • *@
  • 我的头像
  • 修改密码
  • 我的日志
    • @if (ViewBag.UserType == "学生") { -
  • 选修流程
    • + @*
  • 选修流程
    • *@ }
  • 语言设置
@@ -687,7 +687,7 @@
@if (ViewBag.UserType == "学生") { -
+ @*

西昌民族幼儿师范高等专科学校

@@ -711,7 +711,7 @@ 3、选择课只开放三天，三天后自动关闭选课功能，每门选修课记2个选修学分，如果修不够选修学分将会无法毕业。

-
+
*@ } @if (ViewBag.UserType == "学生" || ViewBag.UserType == "教师") @@ -743,8 +743,8 @@ $("#headUrl").attr("src", "/LR_OrganizationModule/User/GetImg?userId=" + loginInfo.userId); if ('@ViewBag.UserType' == '学生') { - $("#lr_left_list").children('li').eq(4).addClass("active"); - $('.lr-layout-wrap-item').eq(5).addClass("active"); + $("#lr_left_list").children('li').eq(0).addClass("active"); + $('.lr-layout-wrap-item').eq(0).addClass("active"); } else { $("#lr_left_list").children('li').eq(0).addClass("active"); From cfe82c588ee3f08054fad5eaadf949d83772f73f Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Tue, 30 Aug 2022 16:59:35 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E7=BC=B4=E8=B4=B9=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E5=8F=91=E7=A5=A8=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuInfoBasic_PayFee/InvoiceForm.js | 7 ++++--- .../Views/StuInfoBasic_PayFee/PayFeeIndex.js | 2 +- .../Views/StuInfoFresh/PayFeeIndex.js | 2 +- .../PublishProfiles/FolderProfile6.pubxml | 18 ++++++++++++++++++ 4 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Properties/PublishProfiles/FolderProfile6.pubxml diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/InvoiceForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/InvoiceForm.js index 100439d5d..60badd6ba 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/InvoiceForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/InvoiceForm.js @@ -5,7 +5,7 @@ * 描 述：新生缴费管理 */ var acceptClick; -var keyValue = '0003FFA0-23B8-4345-A020-E0DCBD2535EB';// request('keyValue'); +var keyValue = request('keyValue'); var bootstrap = function ($, learun) { "use strict"; var page = { @@ -16,7 +16,7 @@ var bootstrap = function ($, learun) { }, bind: function () { $('#lr_form_tabs').lrFormTab(); - $('#lr_form_tabs ul li').eq(0).trigger('click'); + //$('#lr_form_tabs ul li').eq(0).trigger('click'); //取消缴费 $('#cancelPayFee').click(function () { @@ -33,11 +33,12 @@ var bootstrap = function ($, learun) { for (var i = 0; i < res.data.length; i++) { ulHtml += '
  • 票据' + (i + 1) + '
    • '; contentHtml += '
    '; - contentHtml += ''; + contentHtml += ''; contentHtml += '
    '; } $('#tabul').html(ulHtml); $('#lr_tab_content').html(contentHtml); + $('#lr_form_tabs ul li').eq(0).trigger('click'); } else { learun.alert.warning("当前新生尚未开具发票，请缴费成功后耐心等待！"); return; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/PayFeeIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/PayFeeIndex.js index 66a16e64b..3e35a3640 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/PayFeeIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/PayFeeIndex.js @@ -74,7 +74,7 @@ var bootstrap = function ($, learun) { title: '查看发票', url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic_PayFee/InvoiceForm?keyValue=' + keyValue, width: 1000, - height: 600, + height: 800, btn: null }); //learun.layerForm({ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js index 3ce4239e8..5378db388 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js @@ -73,7 +73,7 @@ var bootstrap = function ($, learun) { title: '查看发票', url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/InvoiceForm?keyValue=' + keyValue, width: 1000, - height: 600, + height: 800, btn: null }); //learun.layerForm({ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Properties/PublishProfiles/FolderProfile6.pubxml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Properties/PublishProfiles/FolderProfile6.pubxml new file mode 100644 index 000000000..0b058ccca --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Properties/PublishProfiles/FolderProfile6.pubxml @@ -0,0 +1,18 @@ + + + + + FileSystem + FileSystem + Release + Any CPU + + True + False + bin\Release\Publish + True + + \ No newline at end of file From 06a7240cf3f7c6b5ddc198f1a18a2c8a0467f1e6 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Tue, 30 Aug 2022 18:11:15 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9E=82=E7=9B=B4=E6=BB=9A=E5=8A=A8=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EducationalAdministration/Views/StuInfoFresh/InvoiceForm.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/InvoiceForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/InvoiceForm.js index d6bc2708f..10950587f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/InvoiceForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/InvoiceForm.js @@ -32,7 +32,7 @@ var bootstrap = function ($, learun) { for (var i = 0; i < res.data.length; i++) { ulHtml += '
  • 票据' + (i + 1) + '
    • '; contentHtml += '
    '; - contentHtml += ''; + contentHtml += ''; contentHtml += '
    '; } $('#tabul').html(ulHtml);