no message

src/biz/member/examine.ts

@@ -3,7 +3,7 @@
  */
 
 import moment = require("moment");
-import { BANXUELEIXING, CERTIFICATETYPE, DOCUMENTTYPE, EDUCATION, INDIVIDUALMEMBERTYPE, LOGONSTATE, MAILTYPE, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, MEMBERTYPEECCENUM, NATION, OPERATIONREHAVIOR, PAYMENTSTATUS, PROFCATEGORY, REGISTERFLOW, SEX, STATE, UNITMEMBERTYPE, USERREGISTERSTATE } from "../../config/enum";
+import { BANXUELEIXING, CERTIFICATETYPE, DOCUMENTTYPE, EDUCATION, INDIVIDUALMEMBERTYPE, LOGONSTATE, MAILTYPE, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, MEMBERTYPEECCENUM, NATION, OPERATIONREHAVIOR, PAYMENTSTATUS, PROFCATEGORY, REGISTERFLOW, REGISTERFLOWCLIENT, SEX, STATE, UNITMEMBERTYPE, USERREGISTERSTATE } from "../../config/enum";
 import { ERRORENUM } from "../../config/errorEnum";
 import { addManyData } from "../../data/add";
 import { TABLEENUM } from "../../data/models/model";
@@ -206,7 +206,7 @@ export async function submitDocument({name, memberType, documentId, phone, mail,
         /**处理枚举值 */
         // if (!item.userRegisterState) item.userRegisterState = USERREGISTERSTATE.待审核;
         // else item.userRegisterState = changeEnumValue(USERREGISTERSTATE, item.userRegisterState);
-        item.registerFlow = changeEnumValue(REGISTERFLOW, item.registerFlow);
+        item.registerFlow = changeEnumValue(REGISTERFLOWCLIENT, item.registerFlow);
         item.memberLevel = changeEnumValue(MEMBERLEVEL, item.memberLevel);
         item.sheng = getCityNameByCode(item.sheng);
         item.shi = getCityNameByCode(item.shi);

src/biz/officialWebsite.ts

@@ -259,17 +259,29 @@ export async function guiZhangZhiDuXiangQing({id}) {
  * @param param0 
  * @returns 
  */
-export async function dongTaiZiXun({type, pageNumber}) {
+export async function dongTaiZiXun({searchValue, type, pageNumber}) {
     eccEnumValue("官网", "行业动态类型", type, DONGTAIZIXUNSUBTYPE);
-    let findParam = {articleType:{"$in":[type]}, display:STATE.是};
+    let findParam = {
+        articleType:{"$in":[type]}, 
+        display:STATE.是, 
+        "$or":[ 
+            {
+                title:{"$regex":searchValue, "$options": "i"}
+            }, 
+            {
+                desc:{"$regex":searchValue, "$options": "i"}
+            }
+        ]
+    };
     let dataBaseList = await findToSortToPage(TABLEENUM.文章管理, findParam, [], {articleTime:-1}, pageNumber);
     let dataCount = await findCount(TABLEENUM.文章管理, findParam);
 
     let dataList = [];
     dataBaseList.forEach(info => {
         let { id, title, desc, imgUrl, articleTime } = info;
+        let descStr = desc.replace(/<[^>]*>/g, '');
         dataList.push({
-            id, title, desc, imgUrl, articleTime:moment(articleTime).format("YYYY-MM-DD")
+            id, title, desc, descStr, imgUrl, articleTime:moment(articleTime).format("YYYY-MM-DD")
         });
     });
 
@@ -575,7 +587,7 @@ export async function dangJianZiYuanMuLu({}) {
  * @param param0 
  * @returns 
  */
-export async function tongZhiGongGao({type, pageNumber}) {
+export async function tongZhiGongGao({searchValue, type, pageNumber}) {
     eccEnumValue("通知公告", "类型", TONGZHIGONGGAO, type);
     // let tableName;
     // switch (type) {
@@ -593,15 +605,27 @@ export async function tongZhiGongGao({type, pageNumber}) {
     //     item.members = changeEnumValue(CODPARTICIPANT, info.members);
     //     dataList.push(item);
     // });
-    let findParam = {articleType:{"$in":[type]}, display:STATE.是};
+    let findParam = {
+        articleType:{"$in":[type]}, 
+        display:STATE.是, 
+        "$or":[ 
+            {
+                title:{"$regex":searchValue, "$options": "i"}
+            }, 
+            {
+                desc:{"$regex":searchValue, "$options": "i"}
+            }
+        ]
+    };
     let dataBaseList = await findToSortToPage(TABLEENUM.文章管理, findParam, ["id", "title", "desc", "imgUrl", "articleTime" ], {articleTime:-1}, pageNumber);
     let dataCount = await findCount(TABLEENUM.文章管理, findParam);
 
     let dataList = [];
     dataBaseList.forEach(info => {
         let { id, title, desc, imgUrl, articleTime } = info;
+        let descStr = desc.replace(/<[^>]*>/g, '');
         dataList.push({
-            id, title, desc, imgUrl, articleTime:moment(articleTime).format("YYYY-MM-DD")
+            id, title, desc, descStr, imgUrl, articleTime:moment(articleTime).format("YYYY-MM-DD")
         });
     });
 

src/config/enum.ts

@@ -529,6 +529,17 @@ export enum REGISTERFLOW {
 
 
 /**
+ * 会员注册流程
+ */
+export enum REGISTERFLOWCLIENT {
+   未注册 = 0,
+   注册第一步,
+   注册第二步,
+   注册第三步,
+}
+
+
+/**
  * 收款确认
  */
 export enum RECEIPTCONFIRMATION {

src/main.ts

@@ -30,7 +30,7 @@ async function lanuch() {
     // console.log(moment(1498262400000).format("YYYY-MM-DD HH:mm:SS"))
     console.log("服务初始化成功");
     // await sendMail("18711017326@163.com");
-    // await testCallback("cb3d2c437b64cd10f55d892b8d0fe413")
+    // await testCallback("dc1a1414b4368dd4ea657d2d36ba554a")
     // await getUnitData();
     // await changeDB();
     // await getData();

src/routers/member/router.ts

@@ -124,6 +124,7 @@ export const Config = {
                         contactPersonDuties:{type:'String', desc:'日常联系人职务', notMustHave:false},
                         phone:{type:'String', desc:'日常联系人手机', notMustHave:false},
                         uusinessLicenseUrl:{type:'String', desc:'营业执照复印件', notMustHave:false},
+                        applicationForm:{type:'String', desc:'申请表', notMustHave:true}, //页面没有这个参数，兼容报错加上的参数
                         /**单位信息 */
                         unitMemberType:{type:'Number', desc:'单位信息类型，枚举', notMustHave:false},
                         yuanXiaoBanXueLeiXing:{type:'Number', desc:'院校办学类型，枚举', notMustHave:false},

src/routers/officalWebsite/router.ts

@@ -62,6 +62,7 @@ export const Config = {
             apiName:"动态资讯列表",
             subUrl:'/dongtaizixun', 
             param:[
+                {key:"searchValue", type:"string", desc:"搜索内容"},
                 {key:"type", type:"Number", desc:"政策动向学会动态行业风采，参考公用接口"},
                 {key:"pageNumber", type:"Number", desc:"当前页"},
             ],
@@ -176,6 +177,7 @@ export const Config = {
             apiName:"主题教育",
             subUrl:'/tongzhigonggao',
             param:[
+                {key:"searchValue", type:"string", desc:"搜索内容"},
                 {key:"type", type:"Number", desc:"类型 参考公用组件"},
                 {key:"pageNumber", type:"Number", desc:"单前页"}
             ],