diff --git a/src/pages.json b/src/pages.json
index e1b3694..b0b18dd 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -209,7 +209,8 @@
"path": "ArtRace/ArtRace",
"style": {
"navigationBarTitleText": "文艺比赛",
- "enablePullDownRefresh": false
+ "enablePullDownRefresh": true,
+ "onReachBottomDistance": 20
}
}, {
diff --git a/src/pagesB/ArtRace/ArtRace.vue b/src/pagesB/ArtRace/ArtRace.vue
index ee7dde0..77b3ccf 100644
--- a/src/pagesB/ArtRace/ArtRace.vue
+++ b/src/pagesB/ArtRace/ArtRace.vue
@@ -8,12 +8,12 @@
-
+
- {{v.title}}
+ {{v.name}}
{{v.content}}
- 截止时间：{{v.time}}
+ 截止时间：{{v.endTime}}
@@ -25,86 +25,87 @@
export default {
data() {
return {
- load: false,
+ load: true,
list1: [{
- name: '关注',
- },
- {
- name: '推荐',
- },
- {
- name: '电影'
- },
- {
- name: '科技'
- },
- {
- name: '音乐'
- },
- {
- name: '美食'
- },
- {
- name: '文化'
- },
- {
- name: '财经'
- },
- {
- name: '手工'
- }
- ],
- dataList: [{
- id: '111',
- title: '艺起战疫',
- content: '寒冬虽冷，美术工作者们以画传心，心是热的；疫情虽紧，艺术家们以笔墨为歌，信心是充足的。在市委宣传部和市递正能量，吹响新时代的',
- time: '2023-09-30 20:00'
- },
- {
- id: '111',
- title: '艺起战疫',
- content: '寒冬虽冷，美术工作者们以画传心，心是热的；疫情虽紧，艺术家们以笔墨为歌，信心是充足的。在市委宣传部和市递正能量，吹响新时代的',
- time: '2023-09-30 20:00'
- },
- {
- id: '111',
- title: '艺起战疫',
- content: '寒冬虽冷，美术工作者们以画传心，心是热的；疫情虽紧，艺术家们以笔墨为歌，信心是充足的。在市委宣传部和市递正能量，吹响新时代的',
- time: '2023-09-30 20:00'
- },
- {
- id: '111',
- title: '艺起战疫',
- content: '寒冬虽冷，美术工作者们以画传心，心是热的；疫情虽紧，艺术家们以笔墨为歌，信心是充足的。在市委宣传部和市递正能量，吹响新时代的',
- time: '2023-09-30 20:00'
- }
- ],
+ name: '全部',
+ value: '',
+ }],
+ dataList: [],
pages: 1,
size: 20,
type: ''
};
},
onLoad() {
+ this.getType()
+ },
+ // 下拉刷新
+ onPullDownRefresh() {
+ this.pages = 1
+ this.dataList = []
this.getData()
+ setTimeout(function() {
+ uni.stopPullDownRefresh();
+ }, 1000);
+ },
+ //上拉
+ onReachBottom() {
+ this.pages++
+ this.load = true
+ this.getData();
},
methods: {
goRaceDetail(id) {
- console.log(id);
uni.navigateTo({
url: "/pagesB/ArtRace/ArtRaceDetail?id=" + String(id),
})
},
click(item) {
console.log('item', item);
+ this.type = item.value
+ this.pages = 1
+ this.getData()
+ },
+ getType() {
+ let that = this
+ this.http.request('/competition/types', {}, "GET").then(res => {
+ if (res.code == 200) {
+ res.data.forEach(item => {
+ that.list1.push({
+ name: item.label,
+ value: item.value
+ })
+ })
+ this.getData()
+ }
+ }).catch(e => {
+ uni.showToast({
+ title: e.data.message,
+ icon: "none",
+ });
+ })
},
getData() {
+ let that = this
let par = {
- pages: this.pages,
+ page: this.pages,
size: this.size,
type: this.type
}
- this.http.request('/match/list', {}, "GET").then(res => {
+ this.http.request('/competition/list', par, "GET").then(res => {
if (res.code == 200) {
+ if (res.data.records.length > 0) {
+ res.data.records.forEach(function(item) {
+ if (item.file) {
+ let fileArr = item.file.split(',')
+ item.file = fileArr[0]
+ }
+ that.dataList.push(item)
+ })
+ } else {
+ this.pages--
+ }
+
this.load = false
}
}).catch(e => {
diff --git a/src/pagesB/ArtRace/ArtRaceDetail.vue b/src/pagesB/ArtRace/ArtRaceDetail.vue
index 1ee8211..c2748aa 100644
--- a/src/pagesB/ArtRace/ArtRaceDetail.vue
+++ b/src/pagesB/ArtRace/ArtRaceDetail.vue
@@ -16,14 +16,7 @@
- {{data.title}}
-
-
- 
- 比赛简介
-
- {{data.demand}}
-
+ {{data.name}}
@@ -53,30 +46,30 @@
可接单人数:
- {{data.jdrs}}/{{data.quantity}}
+ {{data.enrollment}}/{{data.maxNum}}
- 截止时间:
+ 报名截止时间:
- {{data.deadline}}
+ {{data.startTime}}
- 活动时间:
+ 活动结束时间:
- {{data.activityTime}}
+ {{data.endTime}}
-
-
- 取消报名
+
+
+ 您已报名
报名
@@ -96,7 +89,7 @@
参赛作品展示
-
+
@@ -104,6 +97,10 @@
{{v.name}}
+
+
+
+
@@ -115,47 +112,14 @@
export default {
data() {
return {
- load: false,
+ id: '',
+ load: true,
statusHeight: 0,
titleHeight: 50,
currentNum: 0,
- list: [
- '../../static/blackArrow.png'
- ],
- data: {
- title: '标题',
- demand: '简介',
- content: 'FDA施工队发生噶v通过热巴v我提个阿萨出发',
- deadline: '2023-02-02',
- activityTime: '2023-02-02',
- jdrs: '10',
- quantity: '10',
- typeName: '类型',
- hallState: '1',
- isBaoming: false
- },
- workList: [
- {
- name: '111',
- img: '../../static/detailIcon/icon0.png'
- },
- {
- name: '222',
- img: '../../static/detailIcon/icon0.png'
- },
- {
- name: '333',
- img: '../../static/detailIcon/icon0.png'
- },
- {
- name: '444',
- img: '../../static/detailIcon/icon0.png'
- },
- {
- name: '555',
- img: '../../static/detailIcon/icon0.png'
- }
- ]
+ list: [],
+ data: {},
+ workList: []
};
},
methods: {
@@ -164,7 +128,30 @@
},
throwWork() {
uni.navigateTo({
- url: "/pagesB/ArtRace/ThrowWork"
+ url: "/pagesB/ArtRace/ThrowWork?id=" + this.id
+ })
+ },
+ getDate() {
+ let par = {
+ id: this.id,
+ }
+ this.http.request('/competition/details', par, "GET").then(res => {
+ if (res.code == 200) {
+ if(res.data.file){
+ this.list = res.data.file.split(',')
+ }
+ // if(res.data.list || res.data.list.lenght > 0){
+
+ // }
+ this.data = res.data
+ this.workList = res.data.list
+ this.load = false
+ }
+ }).catch(e => {
+ uni.showToast({
+ title: e.data.message,
+ icon: "none",
+ });
})
}
},
@@ -184,9 +171,12 @@
// #endif
},
onLoad(opt) {
- console.log(opt.id);
-
- }
+ this.id = opt.id
+ },
+ onShow() {
+ this.load = true
+ this.getDate()
+ },
}
diff --git a/src/pagesB/ArtRace/ThrowWork.vue b/src/pagesB/ArtRace/ThrowWork.vue
index ad821e6..6a8ee0f 100644
--- a/src/pagesB/ArtRace/ThrowWork.vue
+++ b/src/pagesB/ArtRace/ThrowWork.vue
@@ -1,54 +1,56 @@
-
-
-
-
-
-
-
-
-
- 作品内容可上传图片/视频/音频等
+
+
+
+ 名称
+
+
+
+
+
-
-
+
+
+ 具体内容
+
+
+
+
+
+
+ 附件上传
+
+
+ 可上传图片(png/jpg/jpeg/bmp/gif/tif/tiff)
+
+
-
-
-
-
-
+
+ 发布
-
+
+
diff --git a/src/pagesB/ArtRace/raceWorkList.vue b/src/pagesB/ArtRace/raceWorkList.vue
new file mode 100644
index 0000000..e9c2bd9
--- /dev/null
+++ b/src/pagesB/ArtRace/raceWorkList.vue
@@ -0,0 +1,110 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{item.userName}}
+
+
+
+
+
+
+
+
+