From e752ab8c8071fc3a158325603ffb74c2e0b0e2fe Mon Sep 17 00:00:00 2001
From: lnn19986213 <1667908750@qq.com>
Date: Tue, 21 Mar 2023 15:39:51 +0800
Subject: [PATCH] gx
---
src/manifest.json | 5 +-
src/pages/ArtWorks/ArtWorks.vue | 4 +-
src/pages/ArtWorks/artWorkDetail.vue | 118 ++++-
src/pages/PolicyExpress/PolicyExpress.vue | 25 +-
src/pages/PublishWorks/PublishWorks.vue | 1 -
src/pages/PublishWorks/PublishWorksNext.vue | 19 +-
src/pages/enjoy/enjoy.vue | 158 ++++++-
src/pages/my/editWorkNext.vue | 16 +-
src/pages/pageHome/pageHome.vue | 481 +++++++++++++-------
src/request/interface.js | 4 +-
src/static/home/home-bg.png | Bin 0 -> 338358 bytes
11 files changed, 629 insertions(+), 202 deletions(-)
create mode 100644 src/static/home/home-bg.png
diff --git a/src/manifest.json b/src/manifest.json
index b2e9c36..df3474f 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -85,8 +85,9 @@
// 与vue中的proxyTable配置大致上一致,此处我同时代理了两个
"/pre" : {
// 预发布
- "target" : "http://10.0.0.5:8080/h5/api", // 目标接口域名
- // "target" : "https://yxx.ydool.net/h5/api", // 目标接口域名
+ "target" : "http://10.0.0.59:8080/h5/api", // 目标接口域名
+
+ // "target" : "https://yxx.ydool.net/h5/api", // 目标接口域名
"changeOrigin" : true, // 是否跨域
"secure" : false, // 设置支持https协议的代理
"pathRewrite" : {
diff --git a/src/pages/ArtWorks/ArtWorks.vue b/src/pages/ArtWorks/ArtWorks.vue
index 4ebaaa1..884bdf6 100644
--- a/src/pages/ArtWorks/ArtWorks.vue
+++ b/src/pages/ArtWorks/ArtWorks.vue
@@ -181,7 +181,7 @@
this.http.request('/works/list', {
page: this.pages,
size: this.size,
- nickName: this.artValue,
+ userName: this.artValue,
workType: this.type,
workTypes: this.types,
}, "GET").then(res => {
@@ -220,7 +220,7 @@
this.http.request('/works/list', {
page: this.pages,
size: this.size,
- nickName: this.artValue,
+ userName: this.artValue,
workType: this.type,
workTypes: this.types,
}, "GET").then(res => {
diff --git a/src/pages/ArtWorks/artWorkDetail.vue b/src/pages/ArtWorks/artWorkDetail.vue
index 82b5b39..d57397e 100644
--- a/src/pages/ArtWorks/artWorkDetail.vue
+++ b/src/pages/ArtWorks/artWorkDetail.vue
@@ -4,12 +4,14 @@
+
+
-
+
{{detailData.name}}
@@ -20,13 +22,20 @@
- {{ detailData.user.userName }}
+
+ {{ detailData.user.userName }}
+
+
+ 发布于{{detailData.createdAt}}
+
-
-
-
- {{detailData.introduce}}
+
+ 关注
+
+
+ 已关注
+
@@ -34,16 +43,21 @@
{{a}}
+
+
+ {{detailData.introduce}}
+
+
-
+
@@ -61,6 +75,8 @@
+
+
@@ -72,9 +88,7 @@
-
-
-
+
@@ -116,13 +130,14 @@
iswx: 0,
detailData: {},
contractUrl: '',
+ isFollow: '',
+ userId: ''
}
},
onLoad(op) {
this.id = op.id
},
onShow() {
- this.list2 = []
this.getData()
},
onReady() {
@@ -161,7 +176,13 @@
}
})
}
+ if(this.list.length > 0){
+ this.cover = this.list[0]
+ this.list.splice(0,1)
+ }
this.detailData = res.data
+ this.isFollow = this.detailData.isFollow
+ this.userId = this.detailData.user.id
_this.load = false
}
}).catch(e => {
@@ -257,8 +278,31 @@
this.androidOpenPdf(this.contractUrl);
break;
}
- }
-
+ },
+ goFollow(){
+ this.http.request('/userFollow/addFollow?writerId=' + this.userId, "GET").then(res => {
+ if (res.code == 200) {
+ this.getData()
+ }
+ }).catch(e => {
+ uni.showToast({
+ title: e.data.message,
+ icon: "none",
+ });
+ })
+ },
+ goUnFollow(){
+ this.http.request('/userFollow/delFollow?writerId=' + this.userId, "GET").then(res => {
+ if (res.code == 200) {
+ this.getData()
+ }
+ }).catch(e => {
+ uni.showToast({
+ title: e.data.message,
+ icon: "none",
+ });
+ })
+ },
}
}
@@ -282,6 +326,14 @@
font-size: 12px;
}
}
+
+ .coverImg{
+ width: 100%;
+ }
+ .decTmgs{
+ width: 94%;
+ margin: 10px 3%;
+ }
.work_name {
width: 94%;
@@ -295,20 +347,46 @@
display: flex;
justify-content: space-between;
align-items: center;
+ padding: 0 3%;
.puber {
display: flex;
align-items: center;
.avtor {
- border-radius: 12px;
+ border-radius: 50px;
overflow: hidden;
- width: 24px;
- height: 24px;
+ width: 40px;
+ height: 40px;
margin-right: 4px;
}
.autor {
- color: #251B1D;
+ color: #AFADB0;
font-size: 12px;
}
+ }
+ .talk {
+ border: 1px solid #99241B;
+ font-size: 24rpx;
+ font-weight: 600;
+ border-radius: 60rpx;
+ color: #99241B;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ padding: 12rpx 24rpx;
+ box-sizing: border-box;
+ }
+
+ .talked {
+ border: 1px solid #afadb0;
+ font-size: 24rpx;
+ font-weight: 600;
+ border-radius: 60rpx;
+ color: #afadb0;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ padding: 12rpx 24rpx;
+ box-sizing: border-box;
}
}
@@ -333,7 +411,7 @@
text-align: center;
color: #99241B;
border: 1rpx solid #E7CAC8;
- border-radius: 20px;
+ border-radius: 6px;
margin: 0 10rpx;
padding: 4rpx 16rpx;
}
diff --git a/src/pages/PolicyExpress/PolicyExpress.vue b/src/pages/PolicyExpress/PolicyExpress.vue
index 9c1a870..2c39f5b 100644
--- a/src/pages/PolicyExpress/PolicyExpress.vue
+++ b/src/pages/PolicyExpress/PolicyExpress.vue
@@ -4,7 +4,7 @@
-
+
{{v.title}}
@@ -12,6 +12,7 @@
{{v.username}} {{v.fbsj}}
+
@@ -44,16 +45,19 @@
this.pages++
this.getData();
},
- methods:{
- getData(){
+ methods: {
+ getData() {
let _this = this
- this.http.request('/policy/list', {page:this.pages,size:this.size}, "GET").then(res => {
+ this.http.request('/policy/list', {
+ page: this.pages,
+ size: this.size
+ }, "GET").then(res => {
if (res.code == 200) {
- if(res.data.records.length > 0){
+ if (res.data.records.length > 0) {
res.data.records.forEach(function(item) {
_this.list2.push(item)
})
- }else{
+ } else {
this.pages--
}
this.load = false
@@ -65,7 +69,7 @@
});
})
},
- toDetail(val){
+ toDetail(val) {
uni.navigateTo({
url: "/pages/PolicyExpress/PolicyExpressDetail?id=" + val
})
@@ -76,11 +80,14 @@