diff --git a/src/pages.json b/src/pages.json
index e547a1c..73ba3aa 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -219,6 +219,13 @@
"enablePullDownRefresh": false
}
},
+ {
+ "path": "ArtRace/raceWork",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
+ },
{
"path": "ConfirmOrder/ConfirmOrder",
"style": {
diff --git a/src/pages/pageHome/pageHome.vue b/src/pages/pageHome/pageHome.vue
index a355300..773c973 100644
--- a/src/pages/pageHome/pageHome.vue
+++ b/src/pages/pageHome/pageHome.vue
@@ -237,8 +237,13 @@
if (res.code == 200) {
uni.removeStorageSync('isAdmin');
uni.removeStorageSync('userType');
+ uni.removeStorageSync('isExpert');
+ uni.removeStorageSync('isVillageAdmin');
+ uni.removeStorageSync('isExpert');
uni.setStorageSync('isAdmin', res.data.isAdmin)
uni.setStorageSync('userType', res.data.userType)
+ uni.setStorageSync('isExpert', res.data.isExpert)
+ uni.setStorageSync('isVillageAdmin', res.data.isVillageAdmin)
this.getSwpper()
}
}).catch(e => {
diff --git a/src/pagesB/ArtRace/ArtRaceDetail.vue b/src/pagesB/ArtRace/ArtRaceDetail.vue
index c2748aa..f70ee0d 100644
--- a/src/pagesB/ArtRace/ArtRaceDetail.vue
+++ b/src/pagesB/ArtRace/ArtRaceDetail.vue
@@ -44,7 +44,7 @@
- 可接单人数:
+ 可参赛人数:
{{data.enrollment}}/{{data.maxNum}}
@@ -88,19 +88,23 @@
参赛作品展示
-
-
+
+
+
+ NO.{{ i+1 }}
+
-
+
{{v.name}}
-
-
-
-
+
+
+
+
+
@@ -122,7 +126,35 @@
workList: []
};
},
+ onReady() {
+ const systemMsg = uni.getSystemInfoSync();
+ this.statusHeight = systemMsg.statusBarHeight
+
+ // #ifdef MP-WEIXIN
+ const menuButtonInfo = uni.getMenuButtonBoundingClientRect() //胶囊
+ this.titleHeight = menuButtonInfo.height + (menuButtonInfo.top - systemMsg.statusBarHeight) * 2
+ this.topHeight = this.statusHeight + this.titleHeight
+ // #endif
+
+ // #ifndef MP-WEIXIN
+ //除了小程序
+ this.topHeight = this.statusHeight + this.titleHeight
+ // #endif
+ },
+ onLoad(opt) {
+ this.id = opt.id
+ },
+ onShow() {
+ this.workList = []
+ this.load = true
+ this.getDate()
+ },
methods: {
+ goWorkDetail(id) {
+ uni.navigateTo({
+ url: "/pagesB/ArtRace/raceWork?id=" + String(id),
+ })
+ },
back() {
uni.navigateBack()
},
@@ -132,19 +164,25 @@
})
},
getDate() {
+ let that = this
let par = {
id: this.id,
}
this.http.request('/competition/details', par, "GET").then(res => {
if (res.code == 200) {
- if(res.data.file){
+ if (res.data.file) {
this.list = res.data.file.split(',')
}
- // if(res.data.list || res.data.list.lenght > 0){
-
- // }
+ if(res.data.list && res.data.list.length > 0){
+ res.data.list.forEach(function(item) {
+ if (item.file) {
+ let fileArr = item.file.split(',')
+ item.file = fileArr[0]
+ }
+ that.workList.push(item)
+ })
+ }
this.data = res.data
- this.workList = res.data.list
this.load = false
}
}).catch(e => {
@@ -155,41 +193,20 @@
})
}
},
- onReady() {
- const systemMsg = uni.getSystemInfoSync();
- this.statusHeight = systemMsg.statusBarHeight
-
- // #ifdef MP-WEIXIN
- const menuButtonInfo = uni.getMenuButtonBoundingClientRect() //胶囊
- this.titleHeight = menuButtonInfo.height + (menuButtonInfo.top - systemMsg.statusBarHeight) * 2
- this.topHeight = this.statusHeight + this.titleHeight
- // #endif
-
- // #ifndef MP-WEIXIN
- //除了小程序
- this.topHeight = this.statusHeight + this.titleHeight
- // #endif
- },
- onLoad(opt) {
- this.id = opt.id
- },
- onShow() {
- this.load = true
- this.getDate()
- },
+
}
\ No newline at end of file
diff --git a/src/pagesB/ArtRace/ThrowWork.vue b/src/pagesB/ArtRace/ThrowWork.vue
index 6a8ee0f..e9b80a3 100644
--- a/src/pagesB/ArtRace/ThrowWork.vue
+++ b/src/pagesB/ArtRace/ThrowWork.vue
@@ -12,11 +12,11 @@
- 具体内容
+ 作品简介
-
+
附件上传
diff --git a/src/pagesB/ArtRace/raceWork.vue b/src/pagesB/ArtRace/raceWork.vue
new file mode 100644
index 0000000..bdff2da
--- /dev/null
+++ b/src/pagesB/ArtRace/raceWork.vue
@@ -0,0 +1,398 @@
+
+
+
+
+
+
+
+
+
+
+ currentNum = e.current"
+ indicatorStyle="right: 20px" height='440rpx'>
+
+ {{ currentNum + 1 }}/{{ list.length }}
+
+
+
+
+ {{data.name}}
+
+
+
+ 作品简介
+
+
+ {{data.introduce}}
+
+
+
+
+
+ 您的评分:{{ data.score }}
+
+
+
+
+
+
+
+
+ 已评分
+
+
+ 评分
+
+
+
+
+ 您无法评分
+
+
+
+
+
+
+
+
+
+ 请打分
+
+
+
+
+
+
+
+ 取消
+
+
+ 确定
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pagesB/ArtRace/raceWorkList.vue b/src/pagesB/ArtRace/raceWorkList.vue
deleted file mode 100644
index e9c2bd9..0000000
--- a/src/pagesB/ArtRace/raceWorkList.vue
+++ /dev/null
@@ -1,110 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- {{item.userName}}
-
-
-
-
-
-
-
-
-