396316021
/
pet_uni
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改问题 

1.宠物修改头像和视频不能上传
2.去掉上传组件视频的背景白条
3.宠物详情页面相册可点击放大查看
master
396316021 1 year ago
parent
f1901a30e1
commit
4a062a98d0
4 changed files with 113 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      components/PetPage/index.vue
  2. 93
      pages/FeedLog/index.vue
  3. 15
      pages/PetDetail/index.vue
  4. 2
      uni_modules/uv-upload/components/uv-preview-video/uv-preview-video.vue

11
components/PetPage/index.vue
Unescape View File

@ -775,9 +775,9 @@
this.data.is_health_name = res.name;
}
});
this.avatarList = res.data.avatar && res.data.avatar.split(',').map(item => {
this.avatarList = res.data.avatar ? res.data.avatar.split(',').map(item => {
return {url:item};
});
}) : [];
if((res.data.images && res.data.images.length > 0)){
this.imagesList = res.data.images.map(item => {
@ -785,9 +785,9 @@
});
}
this.videoList = res.data.video && res.data.video.split(',').map(item => {
this.videoList = res.data.video ? res.data.video.split(',').map(item => {
return {url:item};
});
}):[];
this.backgroundList = res.data.background_image && res.data.background_image.split(',').map(item => {
return {url:item};
});
@ -846,6 +846,7 @@
}
},
async afterAvatarRead (event){
let that = this;
let lists = [].concat(event.file);
let fileListLen = this.avatarList.length;
@ -860,7 +861,7 @@
api.uploadOssFile(lists[i].url).then(res => {
let item = this.avatarList[fileListLen];
this.avatarList.splice(fileListLen, 1, {
that.avatarList.splice(fileListLen, 1, {
...item,
status: 'success',
message: '',

93
pages/FeedLog/index.vue
Unescape View File

@ -63,6 +63,16 @@
<u-image :src="staticImage.feedUpload"
mode="widthFix" width="130rpx" height="130rpx"></u-image>
</uv-upload>
<view class="row">
<view class="col-3" v-for="item in detail.feedlist.meal_imgs">
<view class="" v-if="item.type === 'image'" style="margin-right:10rpx;">
<u-image mode="aspectFill" width="100%" height="200rpx" :src="item.url" @click="showImage(item.url)"></u-image>
</view>
<view class="" v-else>
<video :src="item.url" style="height:200rpx;width:100%;"></video>
</view>
</view>
</view>
</u-collapse-item>
</u-collapse>
@ -88,6 +98,16 @@
<u-image :src="staticImage.feedUpload"
mode="widthFix" width="130rpx" height="130rpx"></u-image>
</uv-upload>
<view class="row">
<view class="col-3" v-for="item in detail.feedlist.food_imgs">
<view class="" v-if="item.type === 'image'" style="margin-right:10rpx;">
<u-image mode="aspectFill" width="100%" height="200rpx" :src="item.url" @click="showImage(item.url)"></u-image>
</view>
<view class="" v-else>
<video :src="item.url" style="height:200rpx;width:100%;"></video>
</view>
</view>
</view>
</u-collapse-item>
</u-collapse>
@ -113,6 +133,16 @@
<u-image :src="staticImage.feedUpload"
mode="widthFix" width="130rpx" height="130rpx"></u-image>
</uv-upload>
<view class="row">
<view class="col-3" v-for="item in detail.feedlist.snack_imgs">
<view class="" v-if="item.type === 'image'" style="margin-right:10rpx;">
<u-image mode="aspectFill" width="100%" height="200rpx" :src="item.url" @click="showImage(item.url)"></u-image>
</view>
<view class="" v-else>
<video :src="item.url" style="height:200rpx;width:100%;"></video>
</view>
</view>
</view>
</u-collapse-item>
</u-collapse>
@ -138,6 +168,16 @@
<u-image :src="staticImage.feedUpload"
mode="widthFix" width="130rpx" height="130rpx"></u-image>
</uv-upload>
<view class="row">
<view class="col-3" v-for="item in detail.feedlist.drug_imgs">
<view class="" v-if="item.type === 'image'" style="margin-right:10rpx;">
<u-image mode="aspectFill" width="100%" height="200rpx" :src="item.url" @click="showImage(item.url)"></u-image>
</view>
<view class="" v-else>
<video :src="item.url" style="height:200rpx;width:100%;"></video>
</view>
</view>
</view>
</u-collapse-item>
</u-collapse>
@ -163,6 +203,16 @@
<u-image :src="staticImage.feedUpload"
mode="widthFix" width="130rpx" height="130rpx"></u-image>
</uv-upload>
<view class="row">
<view class="col-3" v-for="item in detail.feedlist.note_imgs">
<view class="" v-if="item.type === 'image'" style="margin-right:10rpx;">
<u-image mode="aspectFill" width="100%" height="200rpx" :src="item.url" @click="showImage(item.url)"></u-image>
</view>
<view class="" v-else>
<video :src="item.url" style="height:200rpx;width:100%;"></video>
</view>
</view>
</view>
</u-collapse-item>
</u-collapse>
@ -188,6 +238,16 @@
<u-image :src="staticImage.feedUpload"
mode="widthFix" width="130rpx" height="130rpx"></u-image>
</uv-upload>
<view class="row">
<view class="col-3" v-for="item in detail.feedlist.goods_imgs">
<view class="" v-if="item.type === 'image'" style="margin-right:10rpx;">
<u-image mode="aspectFill" width="100%" height="200rpx" :src="item.url" @click="showImage(item.url)"></u-image>
</view>
<view class="" v-else>
<video :src="item.url" style="height:200rpx;width:100%;"></video>
</view>
</view>
</view>
</u-collapse-item>
</u-collapse>
@ -213,6 +273,16 @@
<u-image :src="staticImage.feedUpload"
mode="widthFix" width="130rpx" height="130rpx"></u-image>
</uv-upload>
<view class="row">
<view class="col-3" v-for="item in detail.feedlist.line_imgs">
<view class="" v-if="item.type === 'image'" style="margin-right:10rpx;">
<u-image mode="aspectFill" width="100%" height="200rpx" :src="item.url" @click="showImage(item.url)"></u-image>
</view>
<view class="" v-else>
<video :src="item.url" style="height:200rpx;width:100%;"></video>
</view>
</view>
</view>
</u-collapse-item>
</u-collapse>
@ -238,6 +308,16 @@
<u-image :src="staticImage.feedUpload"
mode="widthFix" width="130rpx" height="130rpx"></u-image>
</uv-upload>
<view class="row">
<view class="col-3" v-for="item in detail.feedlist.other_imgs">
<view class="" v-if="item.type === 'image'" style="margin-right:10rpx;">
<u-image mode="aspectFill" width="100%" height="200rpx" :src="item.url" @click="showImage(item.url)"></u-image>
</view>
<view class="" v-else>
<video :src="item.url" style="height:200rpx;width:100%;"></video>
</view>
</view>
</view>
</u-collapse-item>
</u-collapse>
@ -293,6 +373,11 @@
</MzButton>
</view>
</view>
<u-overlay :show="imageShow" @click="imageShow = false">
<view class="" style="display:flex;align-items: center;justify-content:center;width:100%;height:100vh;">
<u-image mode="widthFix" :src="imageUrl" height="auto" width="100vw"></u-image>
</view>
</u-overlay>
</template>
<script>
@ -318,6 +403,8 @@
},
data() {
return {
imageShow:false,
imageUrl:'',
title: 'Hello',
loading: true,
type:'detail',
@ -375,6 +462,10 @@
this.getFeedLog(options.pet_id);
},
methods: {
showImage(url){
this.imageUrl = url;
this.imageShow = true;
},
redirtTo(url){
uni.redirectTo({
url:url
@ -439,6 +530,7 @@
this.detail.feedlist = feedlist;
}
this.detail = data.data;
if(this.type !== 'detail'){
let images = [
'meal_imgs',
'food_imgs',
@ -452,6 +544,7 @@
images.forEach((item,index) => {
that.uploadShow(data.data.feedlist[item],item);
});
}
})
},

15
pages/PetDetail/index.vue
Unescape View File

@ -160,8 +160,8 @@
<view class="video-content row" >
<view class="photo-item col-4" v-for="(item, index) in pet.images" >
<view class="photo-item-container" v-if="item !== ''">
<view class="photo-content">
<image class="img" mode="widthFix" :src="item ? item : staticImage.wallpaperBgImage"/>
<view class="photo-content" @click="showImage(item ? item : staticImage.wallpaperBgImage)">
<u-image height="auto" width="100%" mode="widthFix" :src="item ? item : staticImage.wallpaperBgImage"></u-image>
</view>
<view class="photo-background"></view>
</view>
@ -197,6 +197,11 @@
</view>
</view>
<!-- <RightNav></RightNav> -->
<u-overlay :show="imageShow" @click="imageShow = false">
<view class="" style="display:flex;align-items: center;justify-content:center;width:100%;height:100vh;">
<u-image mode="widthFix" :src="imageUrl" height="auto" width="100vw"></u-image>
</view>
</u-overlay>
</template>
<script>
@ -220,6 +225,8 @@
},
data() {
return {
imageShow:false,
imageUrl:'',
title: 'Hello',
loading: true,
staticImage: {
@ -275,6 +282,10 @@
this.getDetail(option.id);
},
methods: {
showImage(url){
this.imageUrl = url;
this.imageShow = true;
},
delPet(){
functions.confirm("确认删除该宠物吗？").then(() => {
delPet(this.id).then((res) => {

2
uni_modules/uv-upload/components/uv-preview-video/uv-preview-video.vue
Unescape View File

@ -1,5 +1,5 @@
<template>
<uv-popup ref="popup" @change="change">
<uv-popup ref="popup" @change="change" customStyle="background-color:transparent;">
<view class="video-view" v-if="show">
<video class="video" :src="getSec" :autoplay="autoplay"></video>
</view>

Write Preview
Loading…
Cancel
Save