From f739e898fa62838485ce71ffa1f60c9f7d1e1821 Mon Sep 17 00:00:00 2001
From: lnn19986213 <1667908750@qq.com>
Date: Fri, 2 Feb 2024 14:51:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/pageHome/pageHome.vue | 31 +++++-
src/pagesA/activeManage/activeManage.vue | 23 +++-
src/pagesA/activeManage/signIn.vue | 6 +-
src/pagesA/addArtActivity/addArtActivity.vue | 2 +-
src/pagesA/my/My.vue | 2 +-
src/pagesA/my/editWorkNext.vue | 22 ++--
src/pagesA/my/myWorkDetail.vue | 20 ++--
src/pagesB/ArtRace/ArtRaceDetail.vue | 2 +-
src/pagesB/ArtRace/raceWork.vue | 2 +-
src/pagesB/ArtWorks/artWorkDetail.vue | 31 ++----
.../PersonalCenter/ReEditSingleInfo.vue | 2 +-
src/pagesB/PublishWorks/PublishWorksNext.vue | 25 +++--
src/pagesB/improveData/improveData.vue | 2 +-
src/pagesB/literFamily/actJianList.vue | 2 +-
src/pagesB/literFamily/literFamily.vue | 2 +-
src/pagesB/orderHall/orderHallDetails.vue | 2 +-
.../ActivitiesDetail/ActivitiesDetail.vue | 2 +-
.../AwardWinningWork/AwardWinningWork.vue | 2 +-
src/pagesC/Login/Login.vue | 18 +--
src/pagesC/OrderDetail/OrderDetail.vue | 6 +-
src/pagesC/SelectId/SelectId.vue | 23 +++-
src/pagesC/shop/Shop.vue | 4 +-
src/pagesD/wyxx/artProgram.vue | 2 +-
src/pagesD/wyxx/artTeam.vue | 2 +-
src/pagesD/xskz/details.vue | 103 +++++++++++++++++-
src/pagesD/xskz/index.vue | 52 ++++++++-
src/request/interface.js | 4 +-
27 files changed, 300 insertions(+), 94 deletions(-)
diff --git a/src/pages/pageHome/pageHome.vue b/src/pages/pageHome/pageHome.vue
index 2235277..215686a 100644
--- a/src/pages/pageHome/pageHome.vue
+++ b/src/pages/pageHome/pageHome.vue
@@ -10,7 +10,7 @@
-
+
-
+
@@ -137,7 +137,8 @@
-->
-
+
+
本服务由象山县文学艺术界联合会提供
@@ -161,6 +162,7 @@
return {
load: true,
isUnread: false,
+ isUnsh: false,
artValue: '',
statusHeight: 0,
titleHeight: 50,
@@ -365,6 +367,7 @@
if (res.code == 200) {
this.background = res.data[0].imagePath
this.getTalkList()
+ this.getUnshList()
this.load = false
}
}).catch(e => {
@@ -395,6 +398,23 @@
});
});
},
+ //未审核
+ getUnshList() {
+ let _this = this;
+ this.http
+ .request("/activity/cancelCount", {}, "GET")
+ .then((res) => {
+ if (res.code == 200) {
+ if (res.data > 0) this.isUnsh = true;
+ }
+ })
+ .catch((e) => {
+ uni.showToast({
+ title: e.data.message,
+ icon: "none",
+ });
+ });
+ },
navigateToFun(url) {
uni.navigateTo({
url
@@ -454,6 +474,11 @@
url: "/pagesA/msg/msg",
})
},
+ toActiveManage(){
+ uni.navigateTo({
+ url: "/pagesA/activeManage/activeManage",
+ })
+ },
famouserDetaol(val) {
uni.navigateTo({
url: "/pagesC/famousArts/famousArts?id=" + val
diff --git a/src/pagesA/activeManage/activeManage.vue b/src/pagesA/activeManage/activeManage.vue
index 46cc087..9b31f15 100644
--- a/src/pagesA/activeManage/activeManage.vue
+++ b/src/pagesA/activeManage/activeManage.vue
@@ -5,7 +5,7 @@
-
+
我发布的
@@ -50,7 +50,11 @@
签到管理
+
+
+
+
审核管理
@@ -275,7 +279,7 @@
}
},
onShow() {
-
+
},
// 下拉刷新
onPullDownRefresh() {
@@ -285,7 +289,7 @@
this.getFB()
} else if (this.tab == 1) {
this.getData()
- }else if (this.tab == 2) {
+ } else if (this.tab == 2) {
this.getZZ()
}
setTimeout(function() {
@@ -299,7 +303,7 @@
this.getFB()
} else if (this.tab == 1) {
this.getData()
- }else if (this.tab == 2) {
+ } else if (this.tab == 2) {
this.getZZ()
}
},
@@ -625,6 +629,17 @@
font-weight: 500;
float: right;
margin-left: 20rpx;
+ position: relative;
+
+ .box {
+ width: auto;
+ height: 15px;
+ background-color: #909193;
+ border-radius: 15px;
+ position: absolute;
+ top: 0;
+ right: 0;
+ }
}
.btn_w {
diff --git a/src/pagesA/activeManage/signIn.vue b/src/pagesA/activeManage/signIn.vue
index 6e2b707..2db90a0 100644
--- a/src/pagesA/activeManage/signIn.vue
+++ b/src/pagesA/activeManage/signIn.vue
@@ -5,7 +5,7 @@
-
+
标题
@@ -73,9 +73,7 @@
},
methods: {
getData() {
- this.http.request('/activity/details', {
- id: this.id
- }, "GET").then(res => {
+ this.http.request('/activity/details/' + this.id, {}, "GET").then(res => {
this.serveList = res.data
this.img = res.data.images.split(',')
}).catch(e => {
diff --git a/src/pagesA/addArtActivity/addArtActivity.vue b/src/pagesA/addArtActivity/addArtActivity.vue
index 046bf1c..703d627 100644
--- a/src/pagesA/addArtActivity/addArtActivity.vue
+++ b/src/pagesA/addArtActivity/addArtActivity.vue
@@ -1,5 +1,5 @@
-
+
活动名称
diff --git a/src/pagesA/my/My.vue b/src/pagesA/my/My.vue
index 98b599c..53e9b6f 100644
--- a/src/pagesA/my/My.vue
+++ b/src/pagesA/my/My.vue
@@ -195,7 +195,7 @@
this.userId = res.data.id;
this.yhsf = res.data.yhsf;
this.point = res.data.point;
- if(this.yhsf == '文艺工作者' && res.data.association.name){
+ if(this.yhsf == '文艺工作者' && res.data.association){
this.association = res.data.association.name
}
this.getCol();
diff --git a/src/pagesA/my/editWorkNext.vue b/src/pagesA/my/editWorkNext.vue
index 53d1819..b3cf184 100644
--- a/src/pagesA/my/editWorkNext.vue
+++ b/src/pagesA/my/editWorkNext.vue
@@ -125,13 +125,18 @@
2、处罚规则:第一次删文并警告、第二次封号7天、第三次封号15天、第四次封号30天、第五次永久封号。
3、艺象心平台支持并鼓励有价值的原创作品,坚决打击和反对抄袭等侵权行为。如果发现有抄袭等侵权情况,可以通过以下“侵权投诉”流程进行举报(联系管理电话:65712324)。
-
-
-
- {{ codeData.second }}秒后可确认
-
-
-
+
+
+
+
+
+
+ {{ codeData.second }}秒后可确认
+
+
+
+
+
@@ -543,6 +548,9 @@
margin-top: 32rpx;
display: flex;
justify-content: space-between;
+ .popB {
+ width: 48%;
+ }
}
}
diff --git a/src/pagesA/my/myWorkDetail.vue b/src/pagesA/my/myWorkDetail.vue
index 288e425..f756866 100644
--- a/src/pagesA/my/myWorkDetail.vue
+++ b/src/pagesA/my/myWorkDetail.vue
@@ -5,15 +5,15 @@
-
+
-
+
{{detailData.name}}
@@ -69,7 +69,7 @@
-
+
@@ -152,10 +152,10 @@
}
})
}
- if(this.list.length > 0){
- this.cover = this.list[0]
- this.list.splice(0,1)
- }
+ // if(this.list.length > 0){
+ // this.cover = this.list[0]
+ // this.list.splice(0,1)
+ // }
this.detailData = res.data
_this.load = false
}
diff --git a/src/pagesB/ArtRace/ArtRaceDetail.vue b/src/pagesB/ArtRace/ArtRaceDetail.vue
index 7e6705e..27f1661 100644
--- a/src/pagesB/ArtRace/ArtRaceDetail.vue
+++ b/src/pagesB/ArtRace/ArtRaceDetail.vue
@@ -9,7 +9,7 @@
currentNum = e.current"
- indicatorStyle="right: 20px" height='440rpx'>
+ indicatorStyle="right: 20px" height='440rpx' imgMode="aspectFit">
{{ currentNum + 1 }}/{{ list.length }}
diff --git a/src/pagesB/ArtRace/raceWork.vue b/src/pagesB/ArtRace/raceWork.vue
index ef0142b..4af884a 100644
--- a/src/pagesB/ArtRace/raceWork.vue
+++ b/src/pagesB/ArtRace/raceWork.vue
@@ -9,7 +9,7 @@
currentNum = e.current"
- indicatorStyle="right: 20px" height='440rpx'>
+ indicatorStyle="right: 20px" height='440rpx' imgMode="aspectFit">
{{ currentNum + 1 }}/{{ list.length }}
diff --git a/src/pagesB/ArtWorks/artWorkDetail.vue b/src/pagesB/ArtWorks/artWorkDetail.vue
index c48de05..7155fc6 100644
--- a/src/pagesB/ArtWorks/artWorkDetail.vue
+++ b/src/pagesB/ArtWorks/artWorkDetail.vue
@@ -5,22 +5,22 @@
-
+
-
+
{{detailData.name}}
-
+
@@ -31,15 +31,8 @@
发布于{{detailData.releaseDate}}
-
-
-
-
-
- {{ detailData.userNames }}
-
- 发布于{{detailData.releaseDate}}
+ 作者:{{detailData.userNames}}
@@ -97,7 +90,7 @@
3、艺象心平台支持并鼓励有价值的原创作品,坚决打击和反对抄袭等侵权行为。如果发现有抄袭等侵权情况,可以通过以下“侵权投诉”流程进行举报(联系管理电话:65712324)。
-
+
@@ -200,10 +193,10 @@
}
})
}
- if(this.list.length > 0){
- _this.cover = this.list[0]
- this.list.splice(0,1)
- }
+ // if(this.list.length > 0){
+ // _this.cover = this.list[0]
+ // this.list.splice(0,1)
+ // }
this.detailData = res.data
this.isFollow = this.detailData.isFollow
if(this.detailData.user){
diff --git a/src/pagesB/PersonalCenter/ReEditSingleInfo.vue b/src/pagesB/PersonalCenter/ReEditSingleInfo.vue
index 75986f0..148b1ea 100644
--- a/src/pagesB/PersonalCenter/ReEditSingleInfo.vue
+++ b/src/pagesB/PersonalCenter/ReEditSingleInfo.vue
@@ -243,7 +243,7 @@
}
// 请求 协会 内容
if (this.Edkey == '所属协会') {
- this.http.request('/association/list', {isShow:true}, "GET").then((res) => {
+ this.http.request('/association/list', {isShow:'1'}, "GET").then((res) => {
res.data.map((v, i) => {
return this.xiehuiObj[v.name] = v.id
diff --git a/src/pagesB/PublishWorks/PublishWorksNext.vue b/src/pagesB/PublishWorks/PublishWorksNext.vue
index adaff3b..7ce5b4d 100644
--- a/src/pagesB/PublishWorks/PublishWorksNext.vue
+++ b/src/pagesB/PublishWorks/PublishWorksNext.vue
@@ -99,7 +99,7 @@
+ customStyle="padding: 16px;" :safeAreaInsetBottom="false">
象山县“艺象心”平台文艺作品管理规定
@@ -128,14 +128,18 @@
3、艺象心平台支持并鼓励有价值的原创作品,坚决打击和反对抄袭等侵权行为。如果发现有抄袭等侵权情况,可以通过以下“侵权投诉”流程进行举报(联系管理电话:65712324)。
-
-
-
- {{ codeData.second }}秒后可确认
-
-
-
+
+
+
+
+
+
+ {{ codeData.second }}秒后可确认
+
+
+
+
@@ -523,6 +527,9 @@
margin-top: 32rpx;
display: flex;
justify-content: space-between;
+ .popB {
+ width: 48%;
+ }
}
}
diff --git a/src/pagesB/improveData/improveData.vue b/src/pagesB/improveData/improveData.vue
index d38724d..a602fd1 100644
--- a/src/pagesB/improveData/improveData.vue
+++ b/src/pagesB/improveData/improveData.vue
@@ -479,7 +479,7 @@
onReady() {
this.$refs.form1.setRules(this.rules);
- this.http.request('/association/list', {isShow:true}, "GET").then((res) => {
+ this.http.request('/association/list', {isShow:'1'}, "GET").then((res) => {
res.data.map((v, i) => {
return this.xiehuiObj[v.name] = v.id
})
diff --git a/src/pagesB/literFamily/actJianList.vue b/src/pagesB/literFamily/actJianList.vue
index 4fb16c6..49803be 100644
--- a/src/pagesB/literFamily/actJianList.vue
+++ b/src/pagesB/literFamily/actJianList.vue
@@ -66,7 +66,7 @@
},
methods: {
getXh() {
- this.http.request('/association/list', {}, "GET").then(res => {
+ this.http.request('/association/list', {isShow:'0,1'}, "GET").then(res => {
if (res.code == 200) {
this.list1 = res.data
this.list1.unshift({id:'',name: '全部'})
diff --git a/src/pagesB/literFamily/literFamily.vue b/src/pagesB/literFamily/literFamily.vue
index 009f1ab..fb06266 100644
--- a/src/pagesB/literFamily/literFamily.vue
+++ b/src/pagesB/literFamily/literFamily.vue
@@ -13,7 +13,7 @@
-
+
diff --git a/src/pagesB/orderHall/orderHallDetails.vue b/src/pagesB/orderHall/orderHallDetails.vue
index 8c1b643..34af8e1 100644
--- a/src/pagesB/orderHall/orderHallDetails.vue
+++ b/src/pagesB/orderHall/orderHallDetails.vue
@@ -9,7 +9,7 @@
currentNum = e.current"
- indicatorStyle="right: 20px" height='440rpx'>
+ indicatorStyle="right: 20px" height='440rpx' imgMode="aspectFit">
{{ currentNum + 1 }}/{{ list.length }}
diff --git a/src/pagesC/ActivitiesDetail/ActivitiesDetail.vue b/src/pagesC/ActivitiesDetail/ActivitiesDetail.vue
index a849493..33e90b0 100644
--- a/src/pagesC/ActivitiesDetail/ActivitiesDetail.vue
+++ b/src/pagesC/ActivitiesDetail/ActivitiesDetail.vue
@@ -2,7 +2,7 @@
-
+
-
- 密码登录
-
-
验证码登录
+
+
+ 密码登录
+
+
@@ -62,10 +66,10 @@
-
-
+
忘记密码?
@@ -121,7 +125,7 @@
trigger: ['blur']
}],
},
- tab: 0,
+ tab: 1,
load: false,
show: false,
wxDate: {
diff --git a/src/pagesC/OrderDetail/OrderDetail.vue b/src/pagesC/OrderDetail/OrderDetail.vue
index 74e35e0..8929b7a 100644
--- a/src/pagesC/OrderDetail/OrderDetail.vue
+++ b/src/pagesC/OrderDetail/OrderDetail.vue
@@ -10,7 +10,7 @@
:duration="duration">
-
+
@@ -514,13 +514,13 @@
}
swiper {
- height: 500rpx;
+ height: 600rpx;
.swiper_box {
position: relative;
overflow: hidden;
width: 100%;
- height: 500rpx;
+ height: 600rpx;
.swiper_img {
width: 100%;
diff --git a/src/pagesC/SelectId/SelectId.vue b/src/pagesC/SelectId/SelectId.vue
index 6b8f133..231f7b6 100644
--- a/src/pagesC/SelectId/SelectId.vue
+++ b/src/pagesC/SelectId/SelectId.vue
@@ -75,8 +75,27 @@
next() {
console.log("下一步");
if (this.id || this.id == 0) {
- uni.navigateTo({
- url: `/pagesB/improveData/improveData?id=` + this.id
+ // uni.navigateTo({
+ // url: `/pagesB/improveData/improveData?id=` + this.id
+ // })
+ let data = {
+ userType: this.id
+ }
+ this.http.request('/auth/init', data, "POST").then(res => {
+ if (res.code == 200) {
+ uni.navigateTo({
+ url: '/pages/pageHome/pageHome'
+ })
+ uni.showToast({
+ title: "提交成功",
+ icon: "none",
+ });
+ }
+ }).catch(e => {
+ uni.showToast({
+ title: e.data.message,
+ icon: "none",
+ });
})
} else {
uni.showToast({
diff --git a/src/pagesC/shop/Shop.vue b/src/pagesC/shop/Shop.vue
index 8ca18b9..3a75a8f 100644
--- a/src/pagesC/shop/Shop.vue
+++ b/src/pagesC/shop/Shop.vue
@@ -85,8 +85,8 @@
-
-
+
+
diff --git a/src/pagesD/wyxx/artProgram.vue b/src/pagesD/wyxx/artProgram.vue
index 33941d5..d08ab48 100644
--- a/src/pagesD/wyxx/artProgram.vue
+++ b/src/pagesD/wyxx/artProgram.vue
@@ -6,7 +6,7 @@
(currentNum = e.current)"
- indicatorStyle="right: 20px" height="440rpx">
+ indicatorStyle="right: 20px" height="440rpx" imgMode="aspectFit">
{{ currentNum + 1 }}/{{ list.length }}
diff --git a/src/pagesD/wyxx/artTeam.vue b/src/pagesD/wyxx/artTeam.vue
index 222d9d3..b9628f4 100644
--- a/src/pagesD/wyxx/artTeam.vue
+++ b/src/pagesD/wyxx/artTeam.vue
@@ -6,7 +6,7 @@
(currentNum = e.current)"
- indicatorStyle="right: 20px" height="440rpx">
+ indicatorStyle="right: 20px" height="440rpx" imgMode="aspectFit">
{{ currentNum + 1 }}/{{ list.length }}
diff --git a/src/pagesD/xskz/details.vue b/src/pagesD/xskz/details.vue
index da6692c..853bcd5 100644
--- a/src/pagesD/xskz/details.vue
+++ b/src/pagesD/xskz/details.vue
@@ -17,6 +17,32 @@
+
+
+ {{ name }}
+
+
+
+
+ {{ views }}
+
+
+
+
+
+
+
+ {{ likes }}
+
+
+
+
+
+
+
+
@@ -31,7 +57,12 @@
file: '',
linkPath: '',
isWx: false,
- cover: ''
+ cover: '',
+ name: '',
+ views: '',
+ isGreat: '',
+ likes: '',
+ introduce: ''
};
},
onReady() {
@@ -67,6 +98,11 @@
if (res.code == 200) {
this.type = res.data.type
this.cover = res.data.cover
+ this.name = res.data.name
+ this.views = res.data.views
+ this.isGreat = res.data.isGreat
+ this.likes = res.data.likes
+ this.introduce = res.data.introduce
if (this.type == 'locality') {
this.file = res.data.file
// this.getvideo(res.data.id)
@@ -108,10 +144,71 @@
},
toDetail() {
window.open(this.linkPath)
- }
+ },
+ //点赞、取消点赞
+ clickHeart(val0, val1) {
+ if (val0) {
+ this.isGreat = false
+ this.http.request('/worksGreat/delGreat?type=3&workId=' + val1, "POST").then(res => {
+ if (res.code == 200) {
+ this.likes--
+ }
+ }).catch(e => {
+ uni.showToast({
+ title: e.data.message,
+ icon: "none",
+ });
+ })
+ } else {
+ this.isGreat = true
+ this.http.request('/worksGreat/addGreat?type=3&workId=' + val1, "POST").then(res => {
+ if (res.code == 200) {
+ this.likes++
+ }
+ }).catch(e => {
+ uni.showToast({
+ title: e.data.message,
+ icon: "none",
+ });
+ })
+ }
+ },
},
};
-
\ No newline at end of file
diff --git a/src/pagesD/xskz/index.vue b/src/pagesD/xskz/index.vue
index e64f250..24f757e 100644
--- a/src/pagesD/xskz/index.vue
+++ b/src/pagesD/xskz/index.vue
@@ -1,5 +1,9 @@
+
+
+
+
@@ -36,6 +40,8 @@
-->
+
+
@@ -51,14 +57,18 @@
size: 10,
loadings: true,
// 请求状态识别变量
- requestStatus: false
+ requestStatus: false,
+ list1: [],
+ associationId: '',
+ keyword: '',
};
},
onLoad() {
// this.getData();
// this.list = []
// this.pages = 1
- this.get();
+ this.get()
+ this.getXh()
},
onPullDownRefresh() {
this.pages = 1
@@ -73,11 +83,35 @@
this.pages++
this.get();
},
- mounted() {
- const store = requirePlugin('player')
- console.log(store);
- },
+ // mounted() {
+ // const store = requirePlugin('player')
+ // console.log(store);
+ // },
methods: {
+ getXh() {
+ this.http.request('/association/list', {}, "GET").then(res => {
+ if (res.code == 200) {
+ this.list1 = res.data
+ this.list1.unshift({id:'',name: '全部'})
+ }
+ }).catch(e => {
+ uni.showToast({
+ title: e.data.message,
+ icon: "none",
+ });
+ })
+ },
+ click(item) {
+ this.associationId = item.id
+ this.pages = 1
+ this.list = []
+ this.get()
+ },
+ onSearch() {
+ this.pages = 1
+ this.list = []
+ this.get()
+ },
toTab(val) {
this.tabC = val;
// this.getData()
@@ -154,6 +188,8 @@
.request("/exhibition/list", {
page: this.pages,
size: this.size,
+ associationId: this.associationId,
+ name: this.keyword
}, "GET")
.then((res) => {
if (res.code == 200) {
@@ -214,6 +250,10 @@