From d6aab6ba754bd4d19e0c421b58cbc9c25d46d761 Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Wed, 22 Dec 2021 22:16:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E7=A0=81=E7=99=BB=E5=BD=95=20?=
 =?UTF-8?q?=E6=8A=A5=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/StuVolunteerController.cs     |  42 ----
 .../StuVolunteerPhoneController.cs            | 189 ++++++++++++++++++
 .../Views/StuVolunteer/IndexAccount.js        |   3 +-
 .../FormApply.cshtml                          |   6 +-
 .../Link.cshtml                               |   4 +-
 .../Views/StuVolunteerPhone/QRCode.cshtml     |  61 ++++++
 .../Search.cshtml                             |   8 +-
 .../SearchResult.cshtml                       |  81 ++------
 .../server.js                                 |   2 +-
 .../Learun.Application.Web.csproj             |  20 +-
 10 files changed, 287 insertions(+), 129 deletions(-)
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuVolunteerPhoneController.cs
 rename Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/{StuVolunteer => StuVolunteerPhone}/FormApply.cshtml (99%)
 rename Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/{StuVolunteer => StuVolunteerPhone}/Link.cshtml (91%)
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteerPhone/QRCode.cshtml
 rename Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/{StuVolunteer => StuVolunteerPhone}/Search.cshtml (95%)
 rename Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/{StuVolunteer => StuVolunteerPhone}/SearchResult.cshtml (62%)
 rename Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/{StuVolunteer => StuVolunteerPhone}/server.js (88%)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuVolunteerController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuVolunteerController.cs
index ce3701096..a8e3f48ba 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuVolunteerController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuVolunteerController.cs	
@@ -114,48 +114,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             return View();
         }
-
-        /// <summary>
-        /// 生成二维码
-        /// <summary>
-        /// <returns></returns>
-        [HttpGet]
-        public ActionResult Link()
-        {
-            return View();
-        }
-
-        /// <summary>
-        /// 报名
-        /// <summary>
-        /// <returns></returns>
-        [HttpGet]
-        public ActionResult FormApply()
-        {
-            return View();
-        }
-
-        /// <summary>
-        /// 查询报名
-        /// <summary>
-        /// <returns></returns>
-        [HttpGet]
-        public ActionResult Search()
-        {
-            return View();
-        }
-
-
-        /// <summary>
-        /// 查询报名
-        /// <summary>
-        /// <returns></returns>
-        [HttpGet]
-        public ActionResult SearchResult()
-        {
-            return View();
-        }
-
         #endregion
 
         #region 获取数据
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuVolunteerPhoneController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuVolunteerPhoneController.cs
new file mode 100644
index 000000000..f08e5b0a1
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuVolunteerPhoneController.cs	
@@ -0,0 +1,189 @@
+using System;
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using System.Linq;
+using Learun.Application.Organization;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-12-16 10:14
+    /// 描 述：长阳迎新
+    /// </summary>
+    public class StuVolunteerPhoneController : MvcControllerBaseNoLogin
+    {
+        private StuVolunteerIBLL stuVolunteerIBLL = new StuVolunteerBLL();
+
+        #region 视图功能
+        /// <summary>
+        /// 生成二维码
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult QRCode()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 生成二维码
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Link()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 报名
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormApply()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 查询报名
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Search()
+        {
+            return View();
+        }
+
+
+        /// <summary>
+        /// 查询报名
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult SearchResult()
+        {
+            return View();
+        }
+
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = stuVolunteerIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var StuVolunteerData = stuVolunteerIBLL.GetStuVolunteerEntity(keyValue);
+            var jsonData = new
+            {
+                StuVolunteer = StuVolunteerData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        #endregion
+
+
+        #region 扩展数据
+
+        /// <summary>
+        /// 报名草稿
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="strEntity"></param>
+        /// <returns></returns>
+        public ActionResult DraftForm(string keyValue, string strEntity)
+        {
+            StuVolunteerEntity entity = strEntity.ToObject<StuVolunteerEntity>();
+            entity.IsSubmit = false;
+            stuVolunteerIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+
+        /// <summary>
+        /// 提交选择专业
+        /// </summary>
+        /// <param name="keyValue"></param>
+        /// <param name="strEntity"></param>
+        /// <returns></returns>
+        public ActionResult SubmitForm(string keyValue, string strEntity)
+        {
+            StuVolunteerEntity entity = strEntity.ToObject<StuVolunteerEntity>();
+            entity.IsSubmit = true;
+            stuVolunteerIBLL.SaveEntity(keyValue, entity);
+            return Success("提交成功！");
+        }
+
+
+        public ActionResult Search(string CardNo, string txtPass)
+        {
+            var StuVolunteerData = stuVolunteerIBLL.IsEnrollByCard(CardNo);
+            if (StuVolunteerData != null)
+            {
+                var jsonData = new
+                {
+                    StuVolunteer = StuVolunteerData,
+                };
+                return Success(jsonData);
+            }
+            else
+            {
+                return Success(null);
+            }
+        }
+
+        public ActionResult SearchForm(string CardNo, string txtPass)
+        {
+            var StuVolunteerData = stuVolunteerIBLL.IsEnrollByCard(CardNo);
+            if (StuVolunteerData != null)
+            {
+                var jsonData = new
+                {
+                    StuVolunteer = StuVolunteerData,
+                };
+                return Success(jsonData);
+            }
+            else
+            {
+                return Success(null);
+            }
+        }
+        #endregion
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexAccount.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexAccount.js
index 6bae44391..77fab9c77 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexAccount.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexAccount.js	
@@ -24,11 +24,10 @@ var bootstrap = function ($, learun) {
 
             //生成二维码
             $("#lr_qrcode").on('click', function () {
-                var kayValue = $('#gridtable').jfGridValue('IsEnroll');
                 learun.layerForm({
                     id: 'formcard',
                     title: '扫描二维码',
-                    url: top.$.rootUrl + '/EducationalAdministration/StuVolunteer/QRCode?EmpNo' + kayValue,
+                    url: top.$.rootUrl + '/EducationalAdministration/StuVolunteerPhone/QRCode',
                     width: 700,
                     height: 300,
                     btn: null,
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/FormApply.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteerPhone/FormApply.cshtml
similarity index 99%
rename from Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/FormApply.cshtml
rename to Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteerPhone/FormApply.cshtml
index ad4b0851d..d55c75b08 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/FormApply.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteerPhone/FormApply.cshtml	
@@ -299,9 +299,9 @@
                 //}
 
                 var strEntity = JSON.stringify(data.field);
-                strEntity.CardId = CardId;
+                //strEntity.CardNo = CardNo;
                 $.ajax({
-                    url: '/EducationalAdministration/StuVolunteer/DraftForm?keyValue=&IDCARD=' + CardId,
+                    url: '/EducationalAdministration/StuVolunteerPhone/DraftForm',
                     data: { strEntity: strEntity },
                     type: "POST",
                     dataType: "json",
@@ -310,7 +310,7 @@
                     success: function (data) {
                         if (data.code == 200) {
                             alert('报名成功，请等待考试通知');
-                            location.href = '/EducationalAdministration/StuVolunteer/Link?CardId=' + CardId;
+                            location.href = '/EducationalAdministration/StuVolunteer/Link?CardNo=' + CardNo;
                         } else {
                             return alert(data.data);
                         }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Link.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteerPhone/Link.cshtml
similarity index 91%
rename from Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Link.cshtml
rename to Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteerPhone/Link.cshtml
index 3860ab2c0..c0f3de2fb 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Link.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteerPhone/Link.cshtml	
@@ -25,9 +25,9 @@
         $(function () {
             var CardNo = request('CardNo');
             //报名
-            $('#stuenroll').attr('href', '/EducationalAdministration/StuVolunteer/FormApply?EmpNo=' + CardNo);
+            $('#stuenroll').attr('href', '/EducationalAdministration/StuVolunteerPhone/FormApply?EmpNo=' + CardNo);
             //查询录取结果
-            $('#res').attr('href', '/EducationalAdministration/StuVolunteer/Search');
+            $('#res').attr('href', '/EducationalAdministration/StuVolunteerPhone/Search');
         })
 
     </script>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteerPhone/QRCode.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteerPhone/QRCode.cshtml
new file mode 100644
index 000000000..b971a77f2
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteerPhone/QRCode.cshtml	
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+
+
+<html>
+
+<head>
+    <meta name="viewport" content="width=device-width" />
+    <title>CardPrint</title>
+    @Html.AppendJsFile("/Content/jquery/jquery-1.10.2.min.js", "/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js")
+    @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuVolunteerPhone/server.js")
+    <script src="/Content/js/qrcode.min.js"></script>
+    <link href="~/Content/cardprint/CardPrint.css" rel="stylesheet" />
+    <script>
+        function request(d) {
+            for (var c = location.search.slice(1).split("&"), a = 0; a < c.length; a++) {
+                var b = c[a].split("=");
+                if (b[0] == d)
+                    if ("undefined" == unescape(b[1])) break;
+                    else return unescape(b[1])
+            }
+            return ""
+        };
+    </script>
+</head>
+
+<body style="">
+    <div id="qrcodeBox" style="text-align:center;margin-top:20px;">
+        <div class="qrcodeBox" style="display:inline-block">
+            <div id="qrcode" style="margin:0 auto 5px;"></div>
+            <div class="qrcodeTxt" style="font-size:12px;"></div>
+        </div>
+
+    </div>
+    <!--<div id="btnprint" type="button" class="btns" value="打印">打印</div>-->
+    <script>
+        //标签打印
+        var qrcode = new QRCode(document.getElementById("qrcode"), {
+            width: 80,
+            height: 80
+        });
+        //var EmpName = request('EmpName');
+        //$('.qrcodeTxt').html(unescape(EmpName));
+        $(function () {
+            var url = currentUrl + '/EducationalAdministration/StuVolunteerPhone/Search';
+            qrcode.makeCode(url);
+            //$("#btnprint").on("click", function () {
+            //    AddPrintContent3()
+            //});
+
+
+        });
+        // 打印表单
+        function AddPrintContent3() {
+            $('#btnprint').css('display', 'none')
+            window.print();
+            $('#btnprint').css('display', 'block')
+        }
+    </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Search.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteerPhone/Search.cshtml
similarity index 95%
rename from Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Search.cshtml
rename to Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteerPhone/Search.cshtml
index fa6fb09a7..b6408eb49 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/Search.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteerPhone/Search.cshtml	
@@ -35,11 +35,11 @@
                         </div>
                         <div class="chickInput">
                             <span class="chickInputLable"><span>*</span> 密码</span>
-                            <input type="password" id="txtPass" name="txtPass" lay-verify="required" placeholder="身份证后八位" class="layui-input">
+                            <input type="password" id="txtPass" name="txtPass" lay-verify="required" placeholder="身份证后六位" class="layui-input">
                         </div>
                     </div>
                     <!--  / chickForm_sec1  -->
-                    <div class="chickBtn" lay-submit lay-filter="*">提交</div>
+                    <div class="chickBtn" lay-submit lay-filter="*">登录</div>
                 </form>
             </div>
         </div>
@@ -50,7 +50,7 @@
     <script src="~/Content/layui/layui.all.js"></script>
     <script src="~/Content/vue/vue.js"></script>
     @*<script src="~/Areas/EducationalAdministration/Views/StuVolunteer/server.js"></script>*@
-    <script src="~/StuVolunteer/server.js"></script>
+    @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuVolunteerPhone/server.js")
     <script>
         //var today = formatDateTimesM();
         layui.use(['form', 'laydate', 'upload'], function () {
@@ -58,7 +58,7 @@
             //按钮点击
             form.on('submit(*)', function (data) {
                 //var strEntity = JSON.stringify(data.field);
-                location.href = '/EducationalAdministration/StuVolunteer/Search?&CardNo=' + $('#txtAccount').val() + '&txtPass=' + $('#txtPass').val();
+                location.href = '/EducationalAdministration/StuVolunteerPhone/SearchResult?&CardNo=' + $('#txtAccount').val() + '&txtPass=' + $('#txtPass').val();
                 //$.ajax({
                 //    url: '/EducationalAdministration/StuEnrollPhone/SearchForm?type=' + type,
                 //    data: { strEntity: strEntity },
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/SearchResult.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteerPhone/SearchResult.cshtml
similarity index 62%
rename from Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/SearchResult.cshtml
rename to Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteerPhone/SearchResult.cshtml
index 22991e4c4..96d8ffcf2 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/SearchResult.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteerPhone/SearchResult.cshtml	
@@ -35,27 +35,9 @@
                         </div>
                         <div class="chickInput">
                             <span class="chickInputLable"><span>*</span> 身份证号</span>
-                            <input type="text" id="IDCard" name="IDCard" class="layui-input" readonly="readonly">
+                            <input type="text" id="CardNo" name="CardNo" class="layui-input" readonly="readonly">
                         </div>
-                        <div class="chickInput">
-                            <span class="chickInputLable"><span>*</span> 手机号</span>
-                            <input type="text" id="StuMobile" name="StuMobile" class="layui-input" readonly="readonly">
-                        </div>
-                        <div class="chickInput" id="locdiv">
-                            <span class="chickInputLable"><span>*</span> 考试信息</span>
-                            <div id="examDiv" readonly="readonly" style="font-size: 12px;">
-
-
-
-
-
-
-
-
-
-                            </div>
-                        </div>
-                        <div class="chickInput" id="admdiv">
+                        <div class="chickInput" >
                             <span class="chickInputLable"><span>*</span> 是否录取</span>
                             <input type="text" id="IsAdmission" name="IsAdmission" readonly="readonly">
                         </div>
@@ -74,11 +56,12 @@
     <script src="~/Content/js/jquery.min.js"></script>
     <script src="~/Content/layui/layui.all.js"></script>
     <script src="~/Content/vue/vue.js"></script>
-    @*<script src="~/Areas/EducationalAdministration/Views/StuVolunteer/server.js"></script>*@
-    <script src="~/StuVolunteer/server.js"></script>
+    @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuVolunteerPhone/server.js")
     <script>
         var StuName = request('StuName');
-        var IDCard = request('IDCard');
+        var CardNo = request('CardNo');
+        var txtPass = request('txtPass');
+        var IsEnroll = request('IsEnroll');
         layui.use(['form', 'laydate', 'upload'], function () {
             var form = layui.form;
             //按钮点击
@@ -120,20 +103,11 @@
 
         });
         $(window).load(function () {
-            if (type == '1') {
-                //查询考试地点及时间
-                $('#locdiv').show();
-                //$('#timediv').show();
-                $('#admdiv').hide();;
-            } else {
-                $('#admdiv').show();
-                $('#locdiv').hide();
-                //$('#timediv').hide();
-            }
+            $('#locdiv').show();
             //查询
             $.ajax({
-                url: '/EducationalAdministration/StuVolunteer/SearchForm?type=' + type,
-                data: { StuName: decodeURI(StuName), IDCard: IDCard, StuMobile: StuMobile },
+                url: '/EducationalAdministration/StuVolunteerPhone/SearchForm',
+                data: { CardNo: CardNo, txtPass: txtPass },
                 type: "GET",
                 dataType: "json",
                 async: true,
@@ -142,42 +116,17 @@
                     if (data.code == 200) {
                         var data = data.data;
                         if (data.StuEnroll) {
-                            $('#StuName').val(decodeURI(StuName));
-                            $('#IDCard').val(IDCard);
-                            $('#StuMobile').val(StuMobile);
-                            //$('#ExamLocation').val(data.StuEnroll.ExamLocation);
-                            //if (data.StuEnroll.ExamStartTime) {
-                            //    $('#ExamStartTime').val(data.StuEnroll.ExamStartTime + '~' + data.StuEnroll.ExamEndTime);
-                            //}
-                            if (data.StuEnroll.IsAdmission && data.StuEnroll.IsAdmission == 1) {
-                                $('#IsAdmission').val('是');
+                            $('#StuName').val(data.StuName);
+                            $('#CardNo').val(data.CardNo);
+                            $('#IsEnroll').val(data.IsEnroll);
+                            if (data.IsEnroll && data.IsEnroll == true) {
+                                $('#IsEnroll').val('是');
                             } else {
-                                $('#IsAdmission').val('否');
+                                $('#IsEnroll').val('否');
                             }
-
                         } else {
                             $('#app').html('<img src="/Content/images/jfgrid/nodata.jpg" style="width: 100%;height: 40%;" />');
                         }
-                        if (data.examData) {
-                            var examData = data.examData;
-                            var html = '';
-                            if (data) {
-                                for (var i = 0; i < examData.length; i++) {
-                                    var etime = examData[i].BeginTime + '~' + examData[i].EndTime;
-                                    html += '<div class="chickInput">';
-                                    html += '<span class="chickInputLable" style="font-size: 12px;"> 科目</span>';
-                                    html += '<input type="text" class="layui-input" readonly="readonly" value="' + examData[i].SubjectName + '" style="margin: -39px 0 0 40px; width: 85%;font-size: 12px;">';
-                                    html += '</div>';
-                                    html += '<div class="chickInput">';
-                                    html += '<span class="chickInputLable" style="font-size: 12px;"> 时间</span>';
-                                    html += '<input type="text" class="layui-input" readonly="readonly" value="' + etime + '" style="margin: -39px 0 0 40px; width: 85%;font-size: 12px;">';
-                                    html += '</div>';
-                                    html += '<br/>';
-
-                                }
-                            }
-                            $('#examDiv').html(html);
-                        }
                     } else {
                         alert(data.info);
                     }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/server.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteerPhone/server.js
similarity index 88%
rename from Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/server.js
rename to Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteerPhone/server.js
index 5b87bb2ba..6ffea3dc0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/server.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteerPhone/server.js	
@@ -1,7 +1,7 @@
 //api地址
 var serverurl = "http://localhost:31173";
 //当前项目地址
-var currentUrl = "http://192.168.50.127:12345";
+var currentUrl = "http://192.168.50.127:8009";
 //地址栏传参
 function request(d) {
     for (var c = location.search.slice(1).split("&"), a = 0; a < c.length; a++) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
index bb0dcecd0..c52f76814 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj	
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -23,7 +23,7 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
     <UseGlobalApplicationHostFile />
-    <Use64BitIISExpress>false</Use64BitIISExpress>
+    <Use64BitIISExpress />
     <SccProjectName>
     </SccProjectName>
     <SccLocalPath>
@@ -340,6 +340,7 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\StuInfoBasicChangeController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuInfoSemsterController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuScoreNotPassController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\StuVolunteerPhoneController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuVolunteerController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\Sys_ReceiveDocumentController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\TeachingPlanController.cs" />
@@ -1089,6 +1090,7 @@
     <Content Include="Areas\EducationalAdministration\Views\StuScore\GraduateScoreQueryAllIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScore\ScoreQueryAllIndexTeacher.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScore\ScoreQueryAllIndex.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuVolunteerPhone\server.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\FormSchool.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\Index.js" />
@@ -1097,7 +1099,6 @@
     <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\IndexEnroll.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\IndexLabel.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\IndexStatus.js" />
-    <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\server.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveDocument\FormView.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveDocument\Form.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveDocument\Form.js" />
@@ -7490,8 +7491,6 @@
     <Content Include="Areas\EducationalAdministration\Views\StuCancelLeaveManagement\CheckIndex.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuCancelLeaveManagement\Form.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuCancelLeaveManagement\Index.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\Search.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\SearchResult.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\Form.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\FormSchool.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\Index.cshtml" />
@@ -7500,9 +7499,12 @@
     <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\IndexEnroll.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\IndexLabel.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\IndexStatus.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\Link.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuVolunteerPhone\FormApply.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuVolunteerPhone\Link.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuVolunteerPhone\QRCode.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuVolunteerPhone\Search.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuVolunteerPhone\SearchResult.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\QRCode.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\StuVolunteer\FormApply.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />
@@ -7617,11 +7619,11 @@
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
         <WebProjectProperties>
-          <UseIIS>True</UseIIS>
+          <UseIIS>False</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>20472</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:12345/</IISUrl>
+          <IISUrl>http://localhost:20873/</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>