xiangshan
/
yxxh5
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新

This commit is contained in:
lnn19986213 2022-08-18 10:26:22 +08:00
parent 5f607b3772
commit e0dda77e45
12 changed files with 81 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/pages/ArtWorks/ArtWorks.vue
View File

@ -133,20 +133,25 @@
if (res.code == 200) { if (res.code == 200) {
_this.workList = res.data.records _this.workList = res.data.records
_this.workList.forEach(function(item) { _this.workList.forEach(function(item) {
if (item.user.images != undefined) { console.log(0)
let img = JSON.parse(item.user.images) if (item.user.images) {
item.user.images = img[0] // 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) { _this.list1.forEach(function(ele) {
if (item.type == ele.value) { if (item.type == ele.value) {
item.type = ele.name item.type = ele.name
} }
}) })
} }
console.log(2)
//判断封面图片 //判断封面图片
if (item.file != undefined) { if (item.file) {
let fileArr = item.file.split(',') let fileArr = item.file.split(',')
let gs = fileArr[0].substr(fileArr[0].lastIndexOf(".") + 1) let gs = fileArr[0].substr(fileArr[0].lastIndexOf(".") + 1)
if (gs == 'jpg' || gs == 'jpeg' || gs == 'png' || gs == 'bmp' || gs == 'gif' || gs == 'tif' || gs == 'tiff') { 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' item.file = '../../static/fileImg/pdfS.png'
} }
} }
console.log(3)
}) })
_this.load = false _this.load = false
} }
@ -350,12 +356,13 @@
margin-bottom: 16px; margin-bottom: 16px;
.tag{ .tag{
width: 80rpx; // width: 80rpx;
text-align: center; text-align: center;
border: 1rpx solid #AFADB0; border: 1rpx solid #AFADB0;
border-radius: 20px; border-radius: 20px;
float: right; float: right;
margin: 0 10rpx; margin: 0 10rpx;
padding: 4rpx 10rpx;
} }
} }

32
src/pages/ArtWorks/artWorkDetail.vue
View File

@ -18,6 +18,12 @@
<view class="work_desc"> <view class="work_desc">
{{detailData.introduce}} {{detailData.introduce}}
</view> </view>
<!-- 作品标签· -->
<view class="sub_title">
<view class="tag" v-for="(a,b) in detailData.workTag" :key="b">
{{a}}
</view>
</view>
<!-- 作品上传时间、浏览量、类型 --> <!-- 作品上传时间、浏览量、类型 -->
<view class="work_det"> <view class="work_det">
<view class="det_box"> <view class="det_box">
@ -55,6 +61,9 @@
{{item.name}} {{item.name}}
</view> </view>
</view> </view>
</view>
<view style="height: 60px; width: 100%; backgroud:#fff;">
</view> </view>
<!-- 底部点赞收藏 --> <!-- 底部点赞收藏 -->
<view class="detailBottom"> <view class="detailBottom">
@ -290,7 +299,7 @@
.work_name { .work_name {
width: 94%; width: 94%;
margin: 10px 3%; margin: 10px 3%;
font-size: 16px; font-size: 36rpx;
font-family: PingFangSC-Semibold, PingFang SC; font-family: PingFangSC-Semibold, PingFang SC;
font-weight: 600; font-weight: 600;
color: #251B1D; color: #251B1D;
@ -299,18 +308,35 @@
.work_desc { .work_desc {
width: 94%; width: 94%;
margin: 10px 3%; margin: 10px 3%;
font-size: 12px; font-size: 30rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #251B1D; color: #251B1D;
white-space: pre-wrap; 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 { .work_det {
width: 94%; width: 94%;
margin: 10px 3%; margin: 10px 3%;
height: 17px; height: 17px;
font-size: 12px; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #AFADB0; color: #AFADB0;

10
src/pages/activity/activity.vue
View File

@ -39,22 +39,22 @@
num:[ num:[
{ {
is: true, is: true,
click: '1522', click: '12',
time: '2022-02-01', time: '2022-02-01',
name: '送万福、进万家文艺惠民暖人心', name: '送万福、进万家文艺惠民暖人心',
url: '../../static/dt2.png' url: '../../static/dt2.png'
}, },
{ {
is: false, is: false,
click: '1522', click: '122',
time: '2022-02-01', time: '2022-01-31',
name: '虎年新春活动再上央视《新闻联播》', name: '虎年新春活动再上央视《新闻联播》',
url: '../../static/dt1.png' url: '../../static/dt1.png'
}, },
{ {
is: false, is: false,
click: '1522', click: '352',
time: '2022-02-01', time: '2022-01-01',
name: '文联送欢乐 安置点享真情', name: '文联送欢乐 安置点享真情',
url: '../../static/dt1.png' url: '../../static/dt1.png'
} }

2
src/pages/famousArts/artistList.vue
View File

@ -108,7 +108,7 @@
.shelves-img { .shelves-img {
border-radius: 8px 8px 8px 8px; border-radius: 8px 8px 8px 8px;
width: 311rpx; width: 311rpx;
height: 342rpx; height: 380rpx;
} }
.name { .name {

7
src/pages/my/My.vue
View File

@ -289,9 +289,10 @@
}, },
// 消息 // 消息
myNews(){ myNews(){
uni.navigateTo({
url: "/pagesA/msgTalk/msgTalk" // uni.navigateTo({
}) // url: "/pagesA/msgTalk/msgTalk"
// })
} }
} }
} }

8
src/pages/my/myCollection.vue
View File

@ -101,8 +101,12 @@
} else if (gs == 'pdf') { } else if (gs == 'pdf') {
item.file = '../../static/fileImg/pdfB.png' item.file = '../../static/fileImg/pdfB.png'
} }
let img = JSON.parse(item.user.images) if (item.user.images) {
item.user.images = img[0] // let img = JSON.parse(item.images)
// item.images = img[0]
}else{
item.user.images = '../../static/txIcon.png'
}
}) })
this.list = res.data.records this.list = res.data.records
this.load = false this.load = false

16
src/pages/my/myFollow.vue
View File

@ -142,9 +142,11 @@
this.dataList = [] this.dataList = []
}else { }else {
res.data.records.forEach(function(item){ res.data.records.forEach(function(item){
if(item.images != null && item.images != undefined && item.images != ''){ if (item.images) {
let img = JSON.parse(item.images) // let img = JSON.parse(item.images)
item.images = img[0] // item.images = img[0]
}else{
item.images = '../../static/txIcon.png'
} }
}) })
this.dataList = res.data.records this.dataList = res.data.records
@ -165,9 +167,11 @@
this.dataList = [] this.dataList = []
}else { }else {
res.data.records.forEach(function(item){ res.data.records.forEach(function(item){
if(item.images != null && item.images != undefined && item.images != ''){ if (item.images) {
let img = JSON.parse(item.images) // let img = JSON.parse(item.images)
item.images = img[0] // item.images = img[0]
}else{
item.images = '../../static/txIcon.png'
} }
}) })
this.dataList = res.data.records this.dataList = res.data.records

18
src/pages/my/myWorks.vue
View File

@ -141,12 +141,14 @@
if (res.code == 200) { if (res.code == 200) {
_this.workList = res.data.records _this.workList = res.data.records
_this.workList.forEach(function(item) { _this.workList.forEach(function(item) {
if (item.user.images != undefined) { if (item.user.images) {
let img = JSON.parse(item.user.images) // let img = JSON.parse(item.images)
item.user.images = img[0] // item.images = img[0]
}else{
item.user.images = '../../static/txIcon.png'
} }
//判断作品类型 //判断作品类型
if (item.type != undefined) { if (item.type) {
_this.list1.forEach(function(ele) { _this.list1.forEach(function(ele) {
if (item.type == ele.value) { if (item.type == ele.value) {
item.type = ele.name item.type = ele.name
@ -154,7 +156,7 @@
}) })
} }
//判断封面图片 //判断封面图片
if (item.file != undefined) { if (item.file) {
let fileArr = item.file.split(',') let fileArr = item.file.split(',')
let gs = fileArr[0].substr(fileArr[0].lastIndexOf(".") + 1) let gs = fileArr[0].substr(fileArr[0].lastIndexOf(".") + 1)
if (gs == 'jpg' || gs == 'jpeg' || gs == 'png' || gs == 'bmp' || gs == if (gs == 'jpg' || gs == 'jpeg' || gs == 'png' || gs == 'bmp' || gs ==
@ -457,16 +459,16 @@
font-size: 12px; font-size: 12px;
color: #AFADB0; color: #AFADB0;
height: 18px; height: 18px;
margin-top: 2px; margin-top: 6px;
margin-bottom: 6px; margin-bottom: 6px;
.tag{ .tag{
width: 80rpx;
text-align: center; text-align: center;
border: 1rpx solid #AFADB0; border: 1rpx solid #AFADB0;
border-radius: 20px; border-radius: 20px;
float: left; float: left;
margin: 0 10rpx; margin: 10rpx;
padding: 4rpx 10rpx;
} }
} }

2
src/pages/pageHome/pageHome.vue
View File

@ -69,7 +69,7 @@
<view class="scroll-list"> <view class="scroll-list">
<view class="scroll-list__goods-item" v-for="(item, index) in writerList" :key="index" <view class="scroll-list__goods-item" v-for="(item, index) in writerList" :key="index"
:class="[(index === 9) && 'scroll-list__goods-item--no-margin-right']" @click="famouserDetaol(item.id)" > :class="[(index === 9) && 'scroll-list__goods-item--no-margin-right']" @click="famouserDetaol(item.id)" >
<image class="scroll-list__goods-item__image" :src="item.images" style="height: 342rpx;"></image> <image class="scroll-list__goods-item__image" :src="item.images" style="height: 170px;"></image>
<text class="scroll-list__goods-item__text">{{ item.userName }}</text> <text class="scroll-list__goods-item__text">{{ item.userName }}</text>
</view> </view>
</view> </view>

4
src/request/interface.js
View File

@ -7,8 +7,8 @@ export default {
config: { config: {
// baseUrl: "http://192.168.0.57:8080/h5/api", //王锡 // baseUrl: "http://192.168.0.57:8080/h5/api", //王锡
// baseUrl: "http://192.168.124.110:8088/api", //周源 // baseUrl: "http://192.168.124.110:8088/api", //周源
baseUrl: "http://10.0.0.48:8080/h5/api", //俞燕红 // baseUrl: "http://10.0.0.48:8080/h5/api", //俞燕红
// baseUrl: "https://yxx.ydool.net/h5/api", //线上 baseUrl: "https://yxx.ydool.net/h5/api", //线上
header: { header: {
'Content-Type': 'application/json;charset=UTF-8', 'Content-Type': 'application/json;charset=UTF-8',
// 'Content-Type':'application/x-www-form-urlencoded' // 'Content-Type':'application/x-www-form-urlencoded'

BIN
src/static/txIcon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 20 KiB

BIN
src/static/txIcon1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB