Merge branch 'master' of http://123.207.147.179:8888/node_server/wenHuaBu_adminServer

src/biz/member/memberFees.ts

@@ -363,6 +363,7 @@ export async function unpaidList({name, memberType, documentId, phone, mail, joi
  */
 export async function getRenewalPeriod({name, memberType, documentId, phone, mail, joinStartTime, joinEndTime, memberLevel, pageNumber}) {
     const NowMs = new Date().valueOf();
+    //lifespanEndTime:{"$lt":NowMs + (90 * 24 * 3600 * 1000), "$gt":NowMs},
     let selectParam:any = {
         "$or":[
             { 

src/data/models/model.ts

@@ -93,6 +93,7 @@ enum TABLEENUM {
     消息通知表 = "massageNotice",
     消息已读状态表 = "massageReads",
     活动通知表 = "activityNotice",
+    活动通知已读状态表 = "activityReads",
     活动报名表 = "activityEnroll",
     理事变更审批历史表 = "applyHistoryList",
     系统表 = "systemConfig",
@@ -597,6 +598,17 @@ const ModelArray = [
         }
     },
     {
+        tableName:TABLEENUM.活动通知已读状态表,
+        source:TABLESOURCEENUM.mongo,
+        schema:{
+            arId:{type:'String', index:true},//消息已读id
+            activityId:'String',//消息id
+            userId:'String',//用户id
+            readTime:'Number',//阅读时间
+            isRead:{type:'Number', default:STATE.否}//是否已读
+        }
+    },
+    {
         tableName:TABLEENUM.活动报名表,
         source:TABLESOURCEENUM.mongo,
         schema:{

src/util/verificationEnum.ts

@@ -60,6 +60,7 @@ export function changeEnumValue(enumConf, value:any) {
         if(/_ju/.test(str)) str = str.replace(/_ju/, "。");
         if(/_hgh/.test(str)) str = str.replace(/_hgh/, "-");
         if(/_kbh/.test(str)) str = str.replace(/_kbh/, "");
+        if(/_xg/.test(str)) str = str.replace(/_xg/, "/");
         str += subStr;
         if (index == value.length-1) str+="";
         else str += ","