no message

src/biz/member/order.ts

@@ -150,6 +150,8 @@ export async function nonBillable({unitName, paymentType, isPay, pageNumber, inv
  * 个人页待付款列表
  * @param param0 
  */
-export async function 待付款列表({userId}) {
-
+export async function 待付款列表({userId, type}) {
+    let findParam:any = {};
+    // if (type == )
+    // let dbList = await findToPage(TABLEENUM.订单表, findParam, selectFile, pageNumber);
 }
\ No newline at end of file

src/biz/officialWebsite.ts

@@ -434,6 +434,60 @@ export async function dangJianZiYuan({first, secondary, three, pageNumber}) {
     return {dataList, dataCount};
 }
 
+
+/**
+ * 党建资源列表目录
+ */
+export async function dangJianZiYuanMuLu({}) {
+    let dataList = [
+        {
+            name:"主题教育",
+            value:PARTYBUILDTYPEENUM.主题教育,
+            subList:[]
+        },
+        {
+            name:"学习园地",
+            value:PARTYBUILDTYPEENUM.学习园地,
+            subList:[
+                {
+                    name:"视频资料",
+                    value:PARTYBUILDSUBTYPEENUM.视频资料,
+                    subList:[]
+                },
+                {
+                    name:"文字资料",
+                    value:PARTYBUILDSUBTYPEENUM.文字资料,
+                    subList:[]
+                }
+            ]
+        }
+    ];
+    let dbList = await find(TABLEENUM.党建, {type:PARTYBUILDTYPEENUM.主题教育});
+    for (let i = 0; i < dbList.length; i++) {
+        let info = dbList[i];
+        dataList[0].subList.push({
+            name:info.name,
+            value:info.id,
+            subList:[]
+        });
+    }
+    for (let key in DANGJIANVIDEO) {
+        let anyKey:any = key;
+        if (isNaN(anyKey)) {
+            let keyStr = key;
+            let value = DANGJIANVIDEO[key];
+            dataList[1].subList[0].subList.push({name:keyStr, value});
+        }
+    }
+    let wenZiDBList = await find(TABLEENUM.党建, {type:PARTYBUILDTYPEENUM.学习园地, subType:PARTYBUILDSUBTYPEENUM.文字资料});
+    wenZiDBList.forEach(info => {
+        let {id, name} = info;
+        dataList[1].subList[1].subList.push({name, value:id});
+    });
+
+    return {dataList};
+}
+
 /**
  * 通知公告
  * @param param0 

src/config/enum.ts

@@ -372,6 +372,7 @@ export enum CERTIFICATETYPE {
  */
 export enum ORDERSTATE {
     未支付 = 1,
+    已支付
 }
 
 

src/data/models/model.ts

@@ -209,7 +209,7 @@ const ModelArray = [
             id:{ type:'String', index:true },
             title:'String',//大标题
             videoType:'Number',//分类
-            videoUrl:'[String]',//视频地址
+            videoUrl:'String',//视频地址
             videoTime:'Number',//video时间
             desc:'String',//说明
             display:{type:'Number', default:0},//是否显示 使用是否的枚举
@@ -433,17 +433,17 @@ const ModelArray = [
             orderCycleStart:'Number',//订单周期开始时间
             orderCycleEnd:'Number',//订单周期结束时间
             money:'String',//金额 
-            paymentMethod:'Number',//付款方式 枚举  PAYMENTTYPE
             memberId:'String',//会员id
             loginId:'String',//登陆名
             phone:"String",//登陆手机号
-            memberCategory:'Number',//会员类别 枚举
             paymentNum:'String',//支付单号（与订单号不一样）
             // membershipFeesType:'Number',//会费类别 枚举
             invoiceAdd:'String',//发票图片地址
-            state:'Number',//状态 枚举
+            state:'Number',//状态 枚举 ORDERSTATE
             isFirst:{type:'Boolean', default:true},//首次订单
-            invoiceStatus:{type:'Number', index:true},//发票状态
+            invoiceStatus:{type:'Number', index:true},//发票状态 枚举 INVOICESTATUS
+            paymentMethod:'Number',//付款方式 枚举  PAYMENTTYPE
+            memberCategory:'Number',//会员类别 枚举  MEMBERTYPE
         }
     },
     {

src/routers/officalWebsite/router.ts

@@ -141,6 +141,12 @@ export const Config = {
             bindBiz:officialWebsiteBiz.dangJianZiYuan
         },
         {
+            apiName:"党建资源目录列表",
+            subUrl:'/dangjianziyuanmulu',
+            param:[],
+            bindBiz:officialWebsiteBiz.dangJianZiYuanMuLu
+        },
+        {
             apiName:"学习园地-文字资料类型",
             subUrl:'/xuexiyuandiwenzitype',
             param:[],

src/routers/portal/router.ts

@@ -694,7 +694,7 @@ export const Config = {
                     {
                         title:{type:'String', desc:"大标题"},
                         videoType:{type:'Number', desc:"分类"},
-                        videoUrl:{type:'[String]', desc:"图片地址"},
+                        videoUrl:{type:'String', desc:"视频地址"},
                         videoTime:{type:'Number', desc:"创建"},
                         desc:{type:'String', desc:"说明"},
                         coverUrl:{type:'String', desc:"封面图片地址"}
@@ -712,7 +712,7 @@ export const Config = {
                     {
                         title:{type:'String', desc:"大标题"},
                         videoType:{type:'Number', desc:"分类"},
-                        videoUrl:{type:'[String]', desc:"图片地址"},
+                        videoUrl:{type:'String', desc:"视频地址"},
                         videoTime:{type:'Number', desc:"创建"},
                         coverUrl:{type:'String', desc:"封面图片地址"},
                         desc:{type:'String', desc:"说明"}

src/routers/public/router.ts

@@ -52,7 +52,7 @@ export const Config = {
             apiName:"内容管理文章位置",
             subUrl:'/articleposition', 
             param:[],
-            bindBiz:setEnumInterface(enumConfig.ARTICLEPOSITION)
+            bindBiz:setEnumInterface(enumConfig.ARTICLEPOSITION)//
         },
         {
             apiName:"内容管理视频位置",
@@ -146,3 +146,15 @@ function zhengCeZiXunLeiXing() {
     return {dataList}
 }
 
+async function 文件位置() {
+    let dataList = [];
+    for (let key in enumConfig.ARTICLEPOSITION) {
+        let anyKey:any = key;
+        if (isNaN(anyKey)) {
+            let keyStr = key;
+            let value = enumConfig.ARTICLEPOSITION[key];
+            // dataList.push({key:keyStr, value, keyEng:conf[value]});
+        }
+    }
+
+}
\ No newline at end of file