Merge branch '西昌分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 西昌分支

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);
             }

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 += '<li><a data-value="tab' + (i + 1) + '">票据' + (i + 1) + '</a></li>';
                                 contentHtml += '<div class="lr-form-wrap tab-pane tabClass" id="tab' + (i + 1) + '" >';
-                                contentHtml += '<iframe width="100%" scrolling="no" height="100%" frameborder="0" src="' + res.data[i].billUrl + '"></iframe>';
+                                contentHtml += '<iframe width="100%" scrolling="auto" height="100%" frameborder="0" src="' + res.data[i].billUrl + '"></iframe>';
                                 contentHtml += '</div>';
                             }
                             $('#tabul').html(ulHtml);
                             $('#lr_tab_content').html(contentHtml);
+                            $('#lr_form_tabs ul li').eq(0).trigger('click');
                         } else {
                             learun.alert.warning("当前新生尚未开具发票，请缴费成功后耐心等待！");
                             return;

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());
@@ -142,8 +143,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);

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
                     });
                 }
@@ -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({

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 += '<li><a data-value="tab' + (i + 1) + '">票据' + (i + 1) + '</a></li>';
                                 contentHtml += '<div class="lr-form-wrap tab-pane tabClass" id="tab' + (i + 1) + '" >';
-                                contentHtml += '<iframe width="100%" scrolling="no" height="100%" frameborder="0" src="' + res.data[i].billUrl + '"></iframe>';
+                                contentHtml += '<iframe width="100%" scrolling="auto" height="100%" frameborder="0" src="' + res.data[i].billUrl + '"></iframe>';
                                 contentHtml += '</div>';
                             }
                             $('#tabul').html(ulHtml);

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 += '<tr><td class=\"tableLeft\">' + item.ChargeItemName + '</td><td>' + item.Standard + '元</td><td><input id="' + item.ChargeItemCode + '"  data-amount="' + item.Standard + '" data-name="' + item.ChargeItemName + '" type="number" class="form-control paydetail" value="' + item.SJAmount + '" /></td></tr>';
                     });
-                    html += '<tr><td class=\"tableLeft\">应缴合计</td><td>' + data['PayFeeTotal'] + '元</td><td><span id="PayMoney"></span></td></tr>';
+                    html += '<tr><td class=\"tableLeft\">应缴合计</td><td>' + data['PayFeeTotal'] + '元</td><td><span id="PayMoney">' + PayFeeTotal+'</span></td></tr>';
                     html += '<tr><td class=\"tableLeft\">&nbsp;</td><td colspan="2">&nbsp;</td></tr>';
                     html += '<tr><td class=\"tableLeft\">已缴金额</td><td colspan="2">' + YJAmount + '</td></tr>';
                     $('#PayFeeDetail').html(html);
@@ -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());

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
                     });
                 }
@@ -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({
@@ -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 ? "<span class=\"label label-success\">已缴费</span>" : "<span class=\"label label-warning\">未缴费</span>";
+                        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" },

Learun.Framework.Ultimate V7/Learun.Application.Web/Properties/PublishProfiles/FolderProfile6.pubxml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+此文件由 Web 项目的发布/打包过程使用。可以通过编辑此 MSBuild 文件
+自定义此过程的行为。为了解与此相关的更多内容，请访问 https://go.microsoft.com/fwlink/?LinkID=208121。 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <WebPublishMethod>FileSystem</WebPublishMethod>
+    <PublishProvider>FileSystem</PublishProvider>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <SiteUrlToLaunchAfterPublish />
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <publishUrl>bin\Release\Publish</publishUrl>
+    <DeleteExistingFiles>True</DeleteExistingFiles>
+  </PropertyGroup>
+</Project>

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml

@@ -15,14 +15,14 @@
         <div class="lr-layout-wrap lr-layout-wrap-notitle" style="padding-top:10px;">
             <div class="lr-layout-body">
                 <ul class="lr-left-list" id="lr_left_list">
-                    <li data-value="1">基本信息</li>
+                    <li data-value="1" class="active">基本信息</li>
                     @*<li data-value="2">联系方式</li>*@
                     <li data-value="3">我的头像</li>
                     <li data-value="4">修改密码</li>
                     <li data-value="5">我的日志</li>
                     @if (ViewBag.UserType == "学生")
                     {
-                        <li data-value="6">选修流程</li>
+                        @*<li data-value="6">选修流程</li>*@
                     }
                     <li data-value="7">语言设置</li>
                 </ul>
@@ -687,7 +687,7 @@
             </div>
             @if (ViewBag.UserType == "学生")
             {
-                <div class="lr-layout-wrap-item " id="lr_layout_item6" style="padding: 10;">
+                @*<div class="lr-layout-wrap-item " id="lr_layout_item6" style="padding: 10;">
                     <center><h3> 西昌民族幼儿师范高等专科学校</h3></center>
                     <center>
                         <h3>
@@ -711,7 +711,7 @@
                             3、选择课只开放三天，三天后自动关闭选课功能，每门选修课记2个选修学分，如果修不够选修学分将会无法毕业。<br />
                         </p>
                     </div>
-                </div>
+                </div>*@
             }
 
             @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");