diff --git a/src/apps/AppMeetingNotice/AppMeetingNotice.vue b/src/apps/AppMeetingNotice/AppMeetingNotice.vue
index 533084a8..018be0c5 100644
--- a/src/apps/AppMeetingNotice/AppMeetingNotice.vue
+++ b/src/apps/AppMeetingNotice/AppMeetingNotice.vue
@@ -1,47 +1,51 @@
-
-
-
-
- {{item.label}}
-
-
-
-
-
-
-
-
-
-
- {{item.startTime|format}}
- {{item.startTime|formatDate(0)}}年{{item.startTime|formatDate(1)}}月{{item.startTime|formatDate(2)}}日 周{{item.startTime|formatWeek}}
-
-
-
- {{item.endTime|format}}
- {{item.endTime|formatDate(0)}}年{{item.endTime|formatDate(1)}}月{{item.endTime|formatDate(2)}}日 周{{item.endTime|formatWeek}}
-
-
-
- 发起人员:
- {{item.userName}}
-
-
-
- 会议地点:
- {{item.address}}
-
-
-
-
-
-
-
-
-
已经到底啦
-
+
+
+
+
+
+ {{item.label}}
+
+
+
+
+
+
+
+
+
+
+ {{item.startTime|format}}
+ {{item.startTime|formatDate(0)}}年{{item.startTime|formatDate(1)}}月{{item.startTime|formatDate(2)}}日 周{{item.startTime|formatWeek}}
+
+
+
+ {{item.endTime|format}}
+ {{item.endTime|formatDate(0)}}年{{item.endTime|formatDate(1)}}月{{item.endTime|formatDate(2)}}日 周{{item.endTime|formatWeek}}
+
+
+
+ 发起人员:
+ {{item.userName}}
+
+
+
+ 会议地点:
+ {{item.address}}
+
+
+
+
+
+
+
+
+ 已经到底啦
+
+
+
@@ -49,14 +53,18 @@
import AiEmpty from "../../components/AiEmpty/AiEmpty";
import AiTopFixed from "../../components/AiTopFixed";
import AiAdd from "../../components/AiAdd";
+ import {addMeeting, belongToMe, detail, meetingList} from './components'
export default {
name: "AppMeetingNotice",
appName: "会议通知",
- components: {AiEmpty, AiTopFixed, AiAdd},
+ components: {AiEmpty, AiTopFixed, AiAdd, addMeeting, belongToMe, detail, meetingList},
data() {
return {
- meetingList:[]
+ meetingList: [],
+ isList: true,
+ comp: "",
+ params: null,
}
},
computed: {
@@ -78,16 +86,16 @@
}
},
methods: {
- tag(status){
+ tag(status) {
return {
- "0":"common/1wqr.png",
- "1":"common/1yqr.png",
- "2":"common/1yqj.png",
+ "0": "common/1wqr.png",
+ "1": "common/1yqr.png",
+ "2": "common/1yqj.png",
}[status]
},
- detail({id}){
+ detail({id}) {
uni.navigateTo({
- url:"/pages/meetingNotice/components/detail?id=" + id
+ url: "/pages/meetingNotice/components/detail?id=" + id
})
},
getData() {
@@ -97,42 +105,44 @@
meetingStatus: "1|2",
size: 999
}
- }).then(res=>{
- if(res && res.data){
+ }).then(res => {
+ if (res && res.data) {
this.meetingList = res.data.records
}
})
},
- handleClick(index){
+ handleClick(index) {
let url
- if(index==0 || index==2){
- url="/pages/meetingNotice/components/meetingList?index=" + index
- }else if(index==1){
- url="/pages/meetingNotice/components/belongToMe"
+ if (index == 0 || index == 2) {
+ this.comp = "meetingList";
+ this.params = index;
+ this.isList = false;
+ } else if (index == 1) {
+ url = "/pages/meetingNotice/components/belongToMe"
}
uni.navigateTo({url})
},
add() {
uni.navigateTo({
- url:"/pages/meetingNotice/components/addMeeting"
+ url: "/pages/meetingNotice/components/addMeeting"
})
}
},
- filters:{
- format(date){
- return date.split(" ")[1].substr(0,5)
+ filters: {
+ format(date) {
+ return date.split(" ")[1].substr(0, 5)
},
- formatDate(date,index){
+ formatDate(date, index) {
return date.split(" ")[0].split("-")[index]
},
- formatWeek(date){
+ formatWeek(date) {
return "日一二三四五六".charAt((new Date(date.split(" ")[0]).getDay()))
}
},
- onShow(){
- this.getData()
+ onShow() {
+ this.getData()
}
}
@@ -212,6 +222,7 @@
position: absolute;
transform: scaleY(1.3) translate(30%, -40px) rotate(45deg);
}
+
&:before {
top: 59px;
background-color: #CCCCCC;
@@ -236,7 +247,7 @@
}
}
- .tag{
+ .tag {
width: 112px;
height: 112px;
background-repeat: no-repeat !important;
@@ -248,7 +259,7 @@
}
}
- ::v-deep .content{
+ ::v-deep .content {
padding: 0 !important;
}
}
diff --git a/src/apps/AppMeetingNotice/components/index.js b/src/apps/AppMeetingNotice/components/index.js
new file mode 100644
index 00000000..09d54fe4
--- /dev/null
+++ b/src/apps/AppMeetingNotice/components/index.js
@@ -0,0 +1,4 @@
+export {default as addMeeting} from './addMeeting'
+export {default as belongToMe} from './belongToMe'
+export {default as detail} from './detail'
+export {default as meetingList} from './meetingList'
diff --git a/src/apps/AppMeetingNotice/components/meetingList.vue b/src/apps/AppMeetingNotice/components/meetingList.vue
index a21b804c..730fd1b5 100644
--- a/src/apps/AppMeetingNotice/components/meetingList.vue
+++ b/src/apps/AppMeetingNotice/components/meetingList.vue
@@ -27,7 +27,7 @@
会议地点:
{{item.address}}
-
+
@@ -42,9 +42,14 @@
export default {
name: "meetingList",
components: {AiBack, AiEmpty},
+ props: {
+ params: {
+ type: String,
+ default: ""
+ }
+ },
data() {
return {
- index: null,
list: [],
current: 1,
status: "加载更多",
@@ -52,16 +57,15 @@
},
onLoad(opt) {
- this.index = opt.index
uni.setNavigationBarTitle({
- title: opt.index == 0 ? "历史会议" : "草稿箱"
+ title: this.params == 0 ? "历史会议" : "草稿箱"
});
},
methods: {
detail({id}) {
let url
- if (this.index == 2) {
+ if (this.params == 2) {
url = "/pages/meetingNotice/components/addMeeting?id=" + id
} else {
url = "/pages/meetingNotice/components/detail?id=" + id
@@ -79,8 +83,8 @@
getData() {
this.$http.post("/app/appmeetinginfo/list", null, {
params: {
- listType: this.index == 0 ? "2" : '0',
- meetingStatus: this.index == 0 ? "4" : "0",
+ listType: this.params == 0 ? "2" : '0',
+ meetingStatus: this.params == 0 ? "4" : "0",
size: 10,
current: this.current,
}
@@ -107,7 +111,7 @@
}
},
- onShow(){
+ onShow() {
this.getData()
},
@@ -199,6 +203,7 @@
.info {
flex-wrap: nowrap;
+
& > span:first-child {
flex-shrink: 0;
font-size: 30px;