diff --git a/app.json b/app.json
index b608c3c..a4425f0 100644
--- a/app.json
+++ b/app.json
@@ -36,7 +36,9 @@
"pages/council/council",
"pages/councilDetail/councilDetail",
"pages/guestEditSignUpinfo/guestEditSignUpInfo",
- "pages/invoice/invoice"
+ "pages/invoice/invoice",
+ "pages/contacts/contacts"
+
],
"window":{
"backgroundTextStyle": "dark",
diff --git a/assets/js/http/userApi.js b/assets/js/http/userApi.js
index 93fd6b9..8161583 100644
--- a/assets/js/http/userApi.js
+++ b/assets/js/http/userApi.js
@@ -65,6 +65,8 @@ const UserApi = {
noticeList: (params) => http.get(`${URL_CONFIG}sysNotice/page`, params),
// 工作组分页
workList: (params) => http.get(`${URL_CONFIG}project/payWorkingGroupSubitem/queryCompanyPageList`, params),
+ // 起草组分页 todo 需要修改接口
+ draftList: (params) => http.get(`${URL_CONFIG}project/payWorkingGroupSubitem/queryCompanyPageList`, params),
// 分标委列表
committeeList: (params) => http.get(`${URL_CONFIG}payCaseCommitteeSubitem/payCaseCommitteeSubitem/findTwo`, params),
// 分标委详情
diff --git a/pages/home/home.js b/pages/home/home.js
index 94a8e10..e1d620e 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -208,6 +208,8 @@ Page({
url = '../mineContract/mineContract'
} else if (this.data.selectArr[index].val === '7') { // 发票
url = '../invoice/invoice'
+ } else if (this.data.selectArr[index].val === '8') { // 起草组
+ url = '../project/project?type=draft'
}
isLogin( () => {
wx.navigateTo({
@@ -400,6 +402,11 @@ Page({
path: '../../assets/images/invoice.png',
text: '发票',
val: '7',
+ },
+ {
+ path: '../../assets/images/gongzuozu-new.png',
+ text: '起草组',
+ val: '8',
}
]
@@ -438,6 +445,11 @@ Page({
path: '../../assets/images/invoice.png',
text: '发票',
val: '7',
+ },
+ {
+ path: '../../assets/images/gongzuozu-new.png',
+ text: '起草组',
+ val: '8',
}
]
let searchParams = {
diff --git a/pages/login/login.wxml b/pages/login/login.wxml
index 150a9c9..24c0bb2 100644
--- a/pages/login/login.wxml
+++ b/pages/login/login.wxml
@@ -32,7 +32,7 @@
- 手机密码登录
+ 账户登录
注册
忘记密码？
diff --git a/pages/meeting/meeting.js b/pages/meeting/meeting.js
index 41b33f3..196190b 100644
--- a/pages/meeting/meeting.js
+++ b/pages/meeting/meeting.js
@@ -75,6 +75,8 @@ Page({
return '分标委会议'
case '6':
return '理事会会议'
+ case '7':
+ return '起草组会议'
}
} else {
return ''
diff --git a/pages/meetingDetailSigned/meetingDetailSigned.js b/pages/meetingDetailSigned/meetingDetailSigned.js
index d6dae73..5673c0a 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.js
+++ b/pages/meetingDetailSigned/meetingDetailSigned.js
@@ -118,6 +118,8 @@ Page({
return '分标委会议'
case '6':
return '理事会会议'
+ case '7':
+ return '起草组会议'
}
} else {
return ''
diff --git a/pages/project/project.js b/pages/project/project.js
index 71c9594..955ea6c 100644
--- a/pages/project/project.js
+++ b/pages/project/project.js
@@ -7,7 +7,7 @@ Page({
data: {
statusBarHeight: wx.getSystemInfoSync()['statusBarHeight'],
index: 0,
- type: '', // project 是来款项目 work 是工作组 ziliao是资料网员
+ type: '', // project 是来款项目 work 是工作组 ziliao是资料网员 draft 是起草组
list: [], // 项目列表
searchParams: {
pageNo: 1,
@@ -22,6 +22,14 @@ Page({
pageTitle:'项目'
}
},
+ // 编辑联系人信息
+ editContactsInfo(e) {
+ // 跳转到联系人页面
+ wx.navigateTo({
+ url: `../contacts/contacts?id=${e.currentTarget.dataset.project.id}&type=${this.data.type}&workingGroupId=${e.currentTarget.dataset.project.workingGroupId}`,
+ })
+
+ },
goBack(){
wx.navigateBack()
},
@@ -156,6 +164,28 @@ Page({
duration: 2000
})
})
+ } else if(this.data.type == 'draft'){
+ UserApi.draftList(this.data.searchParams).then(res=>{
+ if(res.success){
+ // 搜索时，把原数据清空，重新筛选
+ if(that.data.searchParams.pageNo === 1) {
+ that.setData({
+ list: []
+ })
+ }
+ if(res.result.records && res.result.records.length){
+ that.setData({
+ list: [...that.data.list, ...res.result.records]
+ })
+ }
+ }
+ }).catch(err=>{
+ wx.showToast({
+ title: '加载失败',
+ icon: 'none',
+ duration: 2000
+ })
+ })
}
},
/**
@@ -180,20 +210,26 @@ Page({
*/
onLoad: function (options) {
this.data.type = options.type
+ let pageTitle = ''
switch(options.type){
- case 'ziliao': this.setData({
- pageTitle:'资料网员'
- })
+ case 'ziliao':
+ pageTitle = '资料网员'
break
- case 'work': this.setData({
- pageTitle:'工作组'
- })
+ case 'work':
+ pageTitle = '工作组'
break
- default : this.setData({
- pageTitle:'项目'
- })
+ case 'draft':
+ pageTitle = '起草组'
+ break
+ default :
+ pageTitle = '项目'
break
}
+ this.setData({
+ pageTitle: pageTitle,
+ type: this.data.type
+ })
+
this.loadData()
},
/**
diff --git a/pages/project/project.wxml b/pages/project/project.wxml
index 9f58b83..7726b4c 100644
--- a/pages/project/project.wxml
+++ b/pages/project/project.wxml
@@ -46,6 +46,13 @@
运行周期：{{item.operationCycle || ''}}
缴费凭证:{{item.paymentStatus_dictText || '无'}}
+
+
+
+
+ 联系人
+
+