kubbo/dvcp_v2_wechat_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wechat_app into dev

Browse Source
This commit is contained in:
liuye
2023-04-10 16:40:06 +08:00
parent cc02dcb810 772d1f0a82
commit d51ae093cb
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/project/fengdu/AppMine/myIntegral.vue
View File

@@ -86,6 +86,7 @@ export default {
overflow-x: hidden; overflow-x: hidden;
height: calc(100% - 136px); height: calc(100% - 136px);
background-color: #f3f6f9; background-color: #f3f6f9;
padding-bottom: 30px;
.header-content { .header-content {
width: 690px; width: 690px;
@@ -155,7 +156,7 @@ export default {
background: #FFF; background: #FFF;
border-radius: 16px; border-radius: 16px;
margin: 0 0 0 32px; margin: 0 0 0 32px;
padding: 30px 30px 94px; padding: 16px 30px;
box-sizing: border-box; box-sizing: border-box;
.item { .item {
@@ -195,6 +196,9 @@ export default {
line-height: 50px; line-height: 50px;
} }
} }
.item:last-child {
border-bottom: none;
}
} }
.color-1 { .color-1 {
color: #2C51CE !important; color: #2C51CE !important;

3
src/project/fengdu/AppNewFarmerBank/AppNewFarmerBank.vue
View File

@@ -55,8 +55,7 @@
<image v-for="(img, i) in item.images" :key="i" class="banner" :src="img.url"/> <image v-for="(img, i) in item.images" :key="i" class="banner" :src="img.url"/>
</div> </div>
<div class="imgs" v-if="!item.images.length && item.videos.length"> <div class="imgs" v-if="!item.images.length && item.videos.length">
<!-- <video v-for="(video, ins) in item.videos" :key="ins" class="file-img" :src="video.url"/> --> <image v-for="(video, ins) in item.videos" :key="ins" class="banner" :src="video.facePicture.toString()"/>
<image v-for="(video, ins) in item.videos" :key="ins" class="banner" :src="img.facePicture"/>
</div> </div>
</div> </div>
</div> </div>

7
src/project/fengdu/AppNewFarmerBank/handpick.vue
View File

@@ -16,8 +16,7 @@
<image v-for="(img, i) in item.images" :key="i" class="banner" :src="img.url"/> <image v-for="(img, i) in item.images" :key="i" class="banner" :src="img.url"/>
</div> </div>
<div class="imgs" v-if="!item.images.length && item.videos.length" @click="$linkTo(`./pickDetail?id=${item.id}`)"> <div class="imgs" v-if="!item.images.length && item.videos.length" @click="$linkTo(`./pickDetail?id=${item.id}`)">
<!-- <video v-for="(video, ins) in item.videos" :key="ins" class="file-img" :src="video.url"/> --> <image v-for="(video, i) in item.videos" :key="i" class="banner" :src="video.facePicture.toString()"/>
<image v-for="(video, ins) in item.videos" :key="ins" class="banner" :src="img.facePicture"/>
</div> </div>
</div> </div>
</div> </div>
@@ -61,8 +60,8 @@ export default {
let mapList = newList.map(e => { let mapList = newList.map(e => {
return { return {
...e, ...e,
images: e?.files.filter(i => i.name.split('.')[1] == 'jpeg') || e?.files.filter(i => i.name.split('.')[1] == 'jpg') || e?.files.filter(i => i.name.split('.')[1] == 'png') || [], images: e?.files.filter(i => (i.postfix == '.jpg' || i.postfix == '.jpeg' || i.postfix == '.png')),
videos: e?.files.filter(i => i.name.split('.')[1] == 'mp4') || [], videos: e?.files.filter(i => (i.postfix == '.mp4' || i.postfix == '.MP4')),
} }
}) })
this.list = mapList.map(v => { this.list = mapList.map(v => {

2
src/project/fengdu/AppNewFarmerBank/pickDetail.vue
View File

@@ -32,7 +32,7 @@ export default {
if(res?.data) { if(res?.data) {
this.data = res.data this.data = res.data
this.images = res.data.files.filter(e => (['jpeg', 'jpg', 'png'].includes(e.name.split('.')[1]))) this.images = res.data.files.filter(e => (['jpeg', 'jpg', 'png'].includes(e.name.split('.')[1])))
this.videos = res.data.files.filter(e => (['mp4'].includes(e.name.split('.')[1]))) this.videos = res.data.files.filter(e => (['mp4','MP4'].includes(e.name.split('.')[1])))
} }
}) })
}, },