整理代码

DigitalPlatform · Jan 28, 2022 · e299179 · e299179
1 parent f1e64ca
commit e299179
Show file tree

Hide file tree

Showing 11 changed files with 76 additions and 83 deletions.
diff --git a/dp2mini b/dp2mini
diff --git a/dp2weixin.service/dp2WeiXinService.cs b/dp2weixin.service/dp2WeiXinService.cs
diff --git a/dp2weixin.service/mongodb/WxUserDatabase.cs b/dp2weixin.service/mongodb/WxUserDatabase.cs
@@ -796,6 +796,7 @@ public bool IsdpAdmin
         // 读者姓名
         public string readerName { get; set; }
 
+        // todo这里应该后来没有再用到
         // 20210729由于要求显示已绑定清单脱敏，所以增加了两个用读者身份获取的字段
         public string readerBarcodeByReaderGet { get; set; }
         public string readerNameByReaderGet { get; set; }

diff --git a/dp2weixinP2P/ApiControllers/BiblioApiController.cs b/dp2weixinP2P/ApiControllers/BiblioApiController.cs
@@ -94,7 +94,7 @@ public SearchBiblioResult Search(string loginUserName,
                         WeiXinConst.C_OnePage_Count);
                     goto END1;
                 }
-                else if (from == "_ReView")
+                else if (from == "_ReView")  //刷新的情况，显示从0至当前最大数字
                 {
                     if (resultSet.Substring(0, 1) == "#")
                         resultSet = resultSet.Substring(1);

diff --git a/dp2weixinP2P/ApiControllers/PatronApiController.cs b/dp2weixinP2P/ApiControllers/PatronApiController.cs
@@ -214,8 +214,8 @@ public SetReaderInfoResult SetPatron(string libId,
         /// <summary>
         /// 发送验证码
         /// </summary>
-        /// <param name="libId"></param>
-        /// <param name="tel"></param>
+        /// <param name="libId">图书馆id</param>
+        /// <param name="tel">手机号</param>
         /// <returns></returns>
         public GetVerifyCodeResult GetVerifyCode(string libId, 
             string phone)
@@ -252,8 +252,6 @@ public ApiResult IncrementPatronBarcode(string libId,
             string libraryCode)
         {
             ApiResult result = new ApiResult();
-
-
             LibModel libCfg = dp2WeiXinService.Instance._areaMgr.GetLibCfg(
                 libId,
                 libraryCode);
@@ -284,7 +282,6 @@ public ApiResult IncrementPatronBarcode(string libId,
                 result.errorInfo = "未找到lib=["+libId+"] libraryCode=["+libraryCode+"]对应的配置。";
             }
 
-
             return result;
         }
 

diff --git a/dp2weixinP2P/Controllers/PatronController.cs b/dp2weixinP2P/Controllers/PatronController.cs
@@ -276,6 +276,7 @@ public bool CheckIsBind(List<WxUserItem> list, LibModel lib, out WxUserItem outU
 
         #endregion
 
+        #region 修改手机号
 
         /// <summary>
         /// 修改手机号界面
@@ -326,6 +327,12 @@ public ActionResult ChangePhone(string code, string state)
 
         }
 
+        #endregion
+
+
+
+
+        #region 馆员审核读者
 
         /// <summary>
         /// 检查读者界面
@@ -708,6 +715,11 @@ public string GetReaderTypeHtml(string readerTypes, string currentPatronType)
         }
 
 
+        #endregion
+
+        #region 读者注册
+
+
         /// <summary>
         /// 读者自助注册功能
         /// </summary>
@@ -829,6 +841,10 @@ public ActionResult PatronRegister(string code, string state, string userId)
             return View(userItem);
         }
 
+        #endregion
+
+        #region 馆员登记读者
+
         /// <summary>
         /// 工作人员登记读者 或者 编辑读者信息
         /// </summary>
@@ -921,6 +937,9 @@ public ActionResult PatronEdit(string code, string state)
             return View();
         }
 
+        #endregion
+
+        #region 我的信息
 
         /// <summary>
         /// 我的信息主界面
@@ -1187,12 +1206,14 @@ public ActionResult BorrowInfo(string code, string state)
 
         }
 
+ #endregion
+
         #region 内部函数
 
 
 
         /// <summary>
-        /// 
+        /// 获取读者信息
         /// </summary>
         /// <param name="code"></param>
         /// <param name="state"></param>
@@ -1230,8 +1251,7 @@ private int GetReaderXml(WxUserItem activeUser,
             string libId = activeUser.libId;
             string patronBarcode = activeUser.readerBarcode;
 
-            // 20210730 因为涉及到读者信息脱敏，所以还是改为读者自己的帐户登录
-            // 登录人是读者自己
+            // 2021/07/30 因为涉及到读者信息脱敏，所以还是采用读者自己的帐户登录
             LoginInfo loginInfo = new LoginInfo(patronBarcode, true);
 
             // 20210730 因为涉及到读者信息脱敏，所以还是改为读者自己的帐户登录

diff --git a/dp2weixinP2P/Properties/PublishProfiles/FolderProfile.pubxml b/dp2weixinP2P/Properties/PublishProfiles/FolderProfile.pubxml
@@ -12,7 +12,7 @@
     <SiteUrlToLaunchAfterPublish />
     <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
     <ExcludeApp_Data>False</ExcludeApp_Data>
-    <publishUrl>C:\publish</publishUrl>
-    <DeleteExistingFiles>False</DeleteExistingFiles>
+    <publishUrl>d:\publish\i</publishUrl>
+    <DeleteExistingFiles>True</DeleteExistingFiles>
   </PropertyGroup>
 </Project>
diff --git a/dp2weixinP2P/Scripts/weixin.js b/dp2weixinP2P/Scripts/weixin.js
@@ -170,6 +170,7 @@ function deleteItem(worker,libId,biblioPath,itemPath,barcode) {
 //======书目详细信息==========
 
 // 获取详细书目记录
+// from表示是从哪个界面过来的？
 function getDetail(libId, recPath, obj, from,biblioName) {
 
     //alert(biblioName);

diff --git a/dp2weixinP2P/Views/Account/ChangePassword.cshtml b/dp2weixinP2P/Views/Account/ChangePassword.cshtml
@@ -72,7 +72,7 @@
             //var index = loadLayer();
             showMaskLayer();
 
-            // 调web api获取临时密码
+            // 调web api修改密码
             var url = "/api/wxuserApi?libId=" + libId
                 + "&patron=" + encodeURIComponent(patron)
                 + "&oldPassword=" + encodeURIComponent(oldPassword)

diff --git a/dp2weixinP2P/Views/Biblio/Index.cshtml b/dp2weixinP2P/Views/Biblio/Index.cshtml
@@ -318,8 +318,6 @@ function loadJs(sid, jsurl, callback) {
                 $("#more").addClass("nextdisabled");
                 $("#more").css("display", "block");
             }
-
-
             else if (bNext == '_ReView') {
                 from = "_ReView";
                 word = $("#maxNo").val();
@@ -539,7 +537,8 @@ function loadJs(sid, jsurl, callback) {
         }
 
 
-        // 2016-6-17 jane 为了返回时记住展开项，expand函数由原来传一个对象，改为传一个id
+        // expId 需要展开的节点的id
+        // 2016-6-17 为了返回时记住展开项，expand函数由原来传一个对象，改为传一个id
         function expand(expId) {
             //根据id找到<li>元素
             var id = "#" + expId;
@@ -574,7 +573,8 @@ function loadJs(sid, jsurl, callback) {
                 if (o.length == 0) {
                     return;
                 }
-                else {
+                else  // 未装载详细信息的情况，调接口获取详细信息
+                {
                     //alert("走进1");
 
                     var recPath = o.children("label").text();

diff --git a/dp2weixinP2P/Views/Patron/PatronReview.cshtml b/dp2weixinP2P/Views/Patron/PatronReview.cshtml
@@ -66,7 +66,7 @@
             //显示等待图层
             showLoading();
 
-            // 调patron发送验证码接口
+            // 自动生成一个增量的证条码号 IncrementPatronBarcode
             var url = "/api/patronapi?libId=" + encodeURIComponent(libId)
                 + "&libraryCode=" + encodeURIComponent(libraryCode)