diff --git a/src/pages/ArtWorks/ArtWorks.vue b/src/pages/ArtWorks/ArtWorks.vue index b0abe38..7d5007c 100644 --- a/src/pages/ArtWorks/ArtWorks.vue +++ b/src/pages/ArtWorks/ArtWorks.vue @@ -133,20 +133,25 @@ if (res.code == 200) { _this.workList = res.data.records _this.workList.forEach(function(item) { - if (item.user.images != undefined) { - let img = JSON.parse(item.user.images) - item.user.images = img[0] + console.log(0) + if (item.user.images) { + // let img = JSON.parse(item.user.images) + // item.user.images = img[0] + }else{ + item.images = '../../static/txIcon.png' } + console.log(1) //判断作品类型 - if (item.type != undefined) { + if (item.type) { _this.list1.forEach(function(ele) { if (item.type == ele.value) { item.type = ele.name } }) } + console.log(2) //判断封面图片 - if (item.file != undefined) { + if (item.file) { let fileArr = item.file.split(',') let gs = fileArr[0].substr(fileArr[0].lastIndexOf(".") + 1) if (gs == 'jpg' || gs == 'jpeg' || gs == 'png' || gs == 'bmp' || gs == 'gif' || gs == 'tif' || gs == 'tiff') { @@ -155,6 +160,7 @@ item.file = '../../static/fileImg/pdfS.png' } } + console.log(3) }) _this.load = false } @@ -350,12 +356,13 @@ margin-bottom: 16px; .tag{ - width: 80rpx; + // width: 80rpx; text-align: center; border: 1rpx solid #AFADB0; border-radius: 20px; float: right; margin: 0 10rpx; + padding: 4rpx 10rpx; } } diff --git a/src/pages/ArtWorks/artWorkDetail.vue b/src/pages/ArtWorks/artWorkDetail.vue index e754243..23a3d36 100644 --- a/src/pages/ArtWorks/artWorkDetail.vue +++ b/src/pages/ArtWorks/artWorkDetail.vue @@ -18,6 +18,12 @@ {{detailData.introduce}} + + + + {{a}} + + @@ -55,6 +61,9 @@ {{item.name}} + + + @@ -290,7 +299,7 @@ .work_name { width: 94%; margin: 10px 3%; - font-size: 16px; + font-size: 36rpx; font-family: PingFangSC-Semibold, PingFang SC; font-weight: 600; color: #251B1D; @@ -299,18 +308,35 @@ .work_desc { width: 94%; margin: 10px 3%; - font-size: 12px; + font-size: 30rpx; font-family: PingFangSC-Regular, PingFang SC; font-weight: 400; color: #251B1D; white-space: pre-wrap; + line-height: 48rpx; + } + + .sub_title{ + width: 94%; + margin: 10px 3%; + display: flex; + flex-wrap: wrap; + .tag{ + // width: 80rpx; + text-align: center; + color: #99241B; + border: 1rpx solid #E7CAC8; + border-radius: 20px; + margin: 0 10rpx; + padding: 4rpx 16rpx; + } } .work_det { width: 94%; margin: 10px 3%; height: 17px; - font-size: 12px; + font-size: 28rpx; font-family: PingFangSC-Regular, PingFang SC; font-weight: 400; color: #AFADB0; diff --git a/src/pages/activity/activity.vue b/src/pages/activity/activity.vue index d51635d..3d99a02 100644 --- a/src/pages/activity/activity.vue +++ b/src/pages/activity/activity.vue @@ -39,22 +39,22 @@ num:[ { is: true, - click: '1522', + click: '12', time: '2022-02-01', name: '送万福、进万家文艺惠民暖人心', url: '../../static/dt2.png' }, { is: false, - click: '1522', - time: '2022-02-01', + click: '122', + time: '2022-01-31', name: '虎年新春活动再上央视《新闻联播》', url: '../../static/dt1.png' }, { is: false, - click: '1522', - time: '2022-02-01', + click: '352', + time: '2022-01-01', name: '文联送欢乐 安置点享真情', url: '../../static/dt1.png' } diff --git a/src/pages/famousArts/artistList.vue b/src/pages/famousArts/artistList.vue index 022d1bf..fa56d02 100644 --- a/src/pages/famousArts/artistList.vue +++ b/src/pages/famousArts/artistList.vue @@ -108,7 +108,7 @@ .shelves-img { border-radius: 8px 8px 8px 8px; width: 311rpx; - height: 342rpx; + height: 380rpx; } .name { diff --git a/src/pages/my/My.vue b/src/pages/my/My.vue index b1891dd..0cf99c1 100644 --- a/src/pages/my/My.vue +++ b/src/pages/my/My.vue @@ -289,9 +289,10 @@ }, // 消息 myNews(){ - uni.navigateTo({ - url: "/pagesA/msgTalk/msgTalk" - }) + + // uni.navigateTo({ + // url: "/pagesA/msgTalk/msgTalk" + // }) } } } diff --git a/src/pages/my/myCollection.vue b/src/pages/my/myCollection.vue index 29cdef7..1f8ae74 100644 --- a/src/pages/my/myCollection.vue +++ b/src/pages/my/myCollection.vue @@ -101,8 +101,12 @@ } else if (gs == 'pdf') { item.file = '../../static/fileImg/pdfB.png' } - let img = JSON.parse(item.user.images) - item.user.images = img[0] + if (item.user.images) { + // let img = JSON.parse(item.images) + // item.images = img[0] + }else{ + item.user.images = '../../static/txIcon.png' + } }) this.list = res.data.records this.load = false diff --git a/src/pages/my/myFollow.vue b/src/pages/my/myFollow.vue index af9356f..e8b8c67 100644 --- a/src/pages/my/myFollow.vue +++ b/src/pages/my/myFollow.vue @@ -142,9 +142,11 @@ this.dataList = [] }else { res.data.records.forEach(function(item){ - if(item.images != null && item.images != undefined && item.images != ''){ - let img = JSON.parse(item.images) - item.images = img[0] + if (item.images) { + // let img = JSON.parse(item.images) + // item.images = img[0] + }else{ + item.images = '../../static/txIcon.png' } }) this.dataList = res.data.records @@ -165,9 +167,11 @@ this.dataList = [] }else { res.data.records.forEach(function(item){ - if(item.images != null && item.images != undefined && item.images != ''){ - let img = JSON.parse(item.images) - item.images = img[0] + if (item.images) { + // let img = JSON.parse(item.images) + // item.images = img[0] + }else{ + item.images = '../../static/txIcon.png' } }) this.dataList = res.data.records diff --git a/src/pages/my/myWorks.vue b/src/pages/my/myWorks.vue index e0249e5..67df2f0 100644 --- a/src/pages/my/myWorks.vue +++ b/src/pages/my/myWorks.vue @@ -141,12 +141,14 @@ if (res.code == 200) { _this.workList = res.data.records _this.workList.forEach(function(item) { - if (item.user.images != undefined) { - let img = JSON.parse(item.user.images) - item.user.images = img[0] + if (item.user.images) { + // let img = JSON.parse(item.images) + // item.images = img[0] + }else{ + item.user.images = '../../static/txIcon.png' } //判断作品类型 - if (item.type != undefined) { + if (item.type) { _this.list1.forEach(function(ele) { if (item.type == ele.value) { item.type = ele.name @@ -154,7 +156,7 @@ }) } //判断封面图片 - if (item.file != undefined) { + if (item.file) { let fileArr = item.file.split(',') let gs = fileArr[0].substr(fileArr[0].lastIndexOf(".") + 1) if (gs == 'jpg' || gs == 'jpeg' || gs == 'png' || gs == 'bmp' || gs == @@ -457,16 +459,16 @@ font-size: 12px; color: #AFADB0; height: 18px; - margin-top: 2px; + margin-top: 6px; margin-bottom: 6px; .tag{ - width: 80rpx; text-align: center; border: 1rpx solid #AFADB0; border-radius: 20px; float: left; - margin: 0 10rpx; + margin: 10rpx; + padding: 4rpx 10rpx; } } diff --git a/src/pages/pageHome/pageHome.vue b/src/pages/pageHome/pageHome.vue index 3e5ad19..75fcd7e 100644 --- a/src/pages/pageHome/pageHome.vue +++ b/src/pages/pageHome/pageHome.vue @@ -69,7 +69,7 @@ - + {{ item.userName }} diff --git a/src/request/interface.js b/src/request/interface.js index dadb222..d1b2974 100644 --- a/src/request/interface.js +++ b/src/request/interface.js @@ -7,8 +7,8 @@ export default { config: { // baseUrl: "http://192.168.0.57:8080/h5/api", //王锡 // baseUrl: "http://192.168.124.110:8088/api", //周源 - baseUrl: "http://10.0.0.48:8080/h5/api", //俞燕红 - // baseUrl: "https://yxx.ydool.net/h5/api", //线上 + // baseUrl: "http://10.0.0.48:8080/h5/api", //俞燕红 + baseUrl: "https://yxx.ydool.net/h5/api", //线上 header: { 'Content-Type': 'application/json;charset=UTF-8', // 'Content-Type':'application/x-www-form-urlencoded' diff --git a/src/static/txIcon.png b/src/static/txIcon.png index 9ad10e8..beb2ba4 100644 Binary files a/src/static/txIcon.png and b/src/static/txIcon.png differ diff --git a/src/static/txIcon1.png b/src/static/txIcon1.png new file mode 100644 index 0000000..9ad10e8 Binary files /dev/null and b/src/static/txIcon1.png differ