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

修改问题

master
396316021 1 year ago
parent
917ae930b2
commit
9e5d5c5c8f
10 changed files with 194 additions and 176 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. 14
      components/PetPage/index.vue
  2. 8
      pages/CardDetail/index.vue
  3. 53
      pages/FeedLog/components/FeedLog.vue
  4. 2
      pages/OrderConfirm/end.vue
  5. 19
      pages/OrderConfirm/start.vue
  6. 22
      pages/OrderDetail/components/fomItem.vue
  7. 5
      pages/OrderDetail/components/index.scss
  8. 19
      pages/OrderDetail/index.vue
  9. 8
      pages/OrderPage/index.vue
  10. 2
      uni_modules/uv-upload/components/uv-upload/uv-upload.vue

14
components/PetPage/index.vue
Unescape View File

@ -804,18 +804,22 @@
});
});
for (let i = 0; i < lists.length; i++) {
api.uploadOssFile(lists[i].url).then(res => {
const fileType = api.getFileType(lists[i].url);
console.log(fileType)
let thumb;
const file = await api.uploadOssFile(lists[i].url);
if(fileType === 'video')thumb = await api.uploadOssFile(lists[i].thumb);
let item = this.imagesList[fileListLen];
this.imagesList.splice(fileListLen, 1, {
...item,
status: 'success',
message: '',
url: res.show_path,
thumb: res.show_path,
url: file.show_path,
thumb: thumb?.show_path ? thumb.show_path : file.show_path,
type: fileType
});
fileListLen++;
})
}
},
async afterVideoRead (event){

8
pages/CardDetail/index.vue
Unescape View File

@ -94,8 +94,8 @@
</view>
<view class="foot-menu-title">
<text @click="readInfo = !readInfo">我已阅读并同意</text>
<text class="foot-menu-url" v-if="cardDetail.order_type === 1" @click="showAgreement">《付费权益卡协议》</text>
<text class="foot-menu-url" v-else @click="showAgreement">《上门洗护次卡协议》</text>
<text class="foot-menu-url" v-if="cardDetail.order_type === 1" @click="showAgreement">《上门喂养次卡须知》</text>
<text class="foot-menu-url" v-else @click="showAgreement">《上门洗护次卡须知》</text>
</view>
</view>
<view>
@ -323,12 +323,12 @@ export default {
},
showAgreement() {
let type;
if(this.type == 1){
if(this.cardDetail.order_type === 1){
type = 'PayCardPolicy';
}else{
type = 'bathe_card';
}
getConfig('PayCardPolicy').then(res => {
getConfig(type).then(res => {
this.PayCardPolicy = res.data[type];
})
this.$refs.agreement.open();

53
pages/FeedLog/components/FeedLog.vue
Unescape View File

@ -45,8 +45,10 @@
name="collapse"
title="水碗饭碗"
>
<u-textarea border="none" :disabled="(type !== 'create')" v-model="detail.feedlist.meal" placeholder="请输入内容" ></u-textarea>
<u-textarea border="none" :disabled="(type !== 'create')" v-model="detail.feedlist.meal"
placeholder="请输入内容"></u-textarea>
<uv-upload
custom-style="margin-top:10rpx;"
width="160rpx"
height="160rpx"
accept="media"
@ -70,8 +72,10 @@
name="collapse"
title="主食情况"
>
<u-textarea border="none" :disabled="(type !== 'create')" v-model="detail.feedlist.food" placeholder="请输入内容" ></u-textarea>
<u-textarea border="none" :disabled="(type !== 'create')" v-model="detail.feedlist.food"
placeholder="请输入内容"></u-textarea>
<uv-upload
custom-style="margin-top:10rpx;"
width="160rpx"
height="160rpx"
accept="media"
@ -95,8 +99,10 @@
name="collapse"
title="零食小吃"
>
<u-textarea border="none" :disabled="(type !== 'create')" v-model="detail.feedlist.snack" placeholder="请输入内容" ></u-textarea>
<u-textarea border="none" :disabled="(type !== 'create')" v-model="detail.feedlist.snack"
placeholder="请输入内容"></u-textarea>
<uv-upload
custom-style="margin-top:10rpx;"
width="160rpx"
height="160rpx"
accept="media"
@ -120,8 +126,10 @@
name="collapse"
title="喂药擦药"
>
<u-textarea border="none" :disabled="(type !== 'create')" v-model="detail.feedlist.drug" placeholder="请输入内容" ></u-textarea>
<u-textarea border="none" :disabled="(type !== 'create')" v-model="detail.feedlist.drug"
placeholder="请输入内容"></u-textarea>
<uv-upload
custom-style="margin-top:10rpx;"
width="160rpx"
height="160rpx"
accept="media"
@ -145,8 +153,10 @@
name="collapse"
title="需要注意"
>
<u-textarea border="none" :disabled="(type !== 'create')" v-model="detail.feedlist.note" placeholder="请输入内容" ></u-textarea>
<u-textarea border="none" :disabled="(type !== 'create')" v-model="detail.feedlist.note"
placeholder="请输入内容"></u-textarea>
<uv-upload
custom-style="margin-top:10rpx;"
width="160rpx"
height="160rpx"
accept="media"
@ -170,8 +180,10 @@
name="collapse"
title="用品位置"
>
<u-textarea border="none" :disabled="(type !== 'create')" v-model="detail.feedlist.goods" placeholder="请输入内容" ></u-textarea>
<u-textarea border="none" :disabled="(type !== 'create')" v-model="detail.feedlist.goods"
placeholder="请输入内容"></u-textarea>
<uv-upload
custom-style="margin-top:10rpx;"
width="160rpx"
height="160rpx"
accept="media"
@ -195,8 +207,10 @@
name="collapse"
title="外出路线"
>
<u-textarea border="none" :disabled="(type !== 'create')" v-model="detail.feedlist.line" placeholder="请输入内容" ></u-textarea>
<u-textarea border="none" :disabled="(type !== 'create')" v-model="detail.feedlist.line"
placeholder="请输入内容"></u-textarea>
<uv-upload
custom-style="margin-top:10rpx;"
width="160rpx"
height="160rpx"
accept="media"
@ -220,8 +234,10 @@
name="collapse"
title="其它事项"
>
<u-textarea border="none" :disabled="(type !== 'create')" v-model="detail.feedlist.other" placeholder="请输入内容" ></u-textarea>
<u-textarea border="none" :disabled="(type !== 'create')" v-model="detail.feedlist.other"
placeholder="请输入内容"></u-textarea>
<uv-upload
custom-style="margin-top:10rpx;"
width="160rpx"
height="160rpx"
accept="media"
@ -297,6 +313,7 @@ import {
import MzButton from '@/components/MzButton/Index.vue';
import api from '@/utils/functions.js';
import {editFeed, feedLog} from "@/api/pet";
export default {
components: {
MzButton
@ -382,21 +399,21 @@ export default {
},
uploadSubmit(data, fileName = '') {
this.detail.feedlist[fileName] = data.map(item => {
return {url:item.url,type:item.type};
return {url: item.url, type: item.type, thumb:(item.thumb || item.url)};
})
},
uploadShow(data, fileName = '') {
let result = [];
try {
data.forEach(item => {
result.push({url:item.url,type:item.type})
result.push({url: item.url, type: item.type,thumb:(item.thumb || item.url)})
})
} catch (e) {
this.images[fileName] = [];
}
this.images[fileName] = result;
},
uploadPut(event,fileName = ''){
async uploadPut(event, fileName = '') {
let lists = [].concat(event.file);
let fileListLen = this.images[fileName].length;
lists.map((item) => {
@ -407,19 +424,21 @@ export default {
});
});
for (let i = 0; i < lists.length; i++) {
api.uploadOssFile(lists[i].url).then(res => {
const fileType = api.getFileType(lists[i].url);
let thumb;
const file = await api.uploadOssFile(lists[i].url);
if (fileType === 'video') thumb = await api.uploadOssFile(lists[i].thumb);
let item = this.images[fileName][fileListLen];
this.images[fileName].splice(fileListLen, 1, {
...item,
status: 'success',
message: '',
url: res.show_path,
thumb: res.show_path,
type:api.getFileType(res.show_path)
url: file.show_path,
thumb: thumb?.show_path ? thumb.show_path : file.show_path,
type: fileType
});
fileListLen++;
})
}
},
uploadDel(fileIndex, fileName = '') {

2
pages/OrderConfirm/end.vue
Unescape View File

@ -2449,7 +2449,7 @@ export default {
status: 'success',
message: '',
url: file.show_path,
thumb: thumb.show_path || file.show_path,
thumb: thumb?.show_path ? thumb.show_path : file.show_path,
type: fileType
});
fileListLen++;

19
pages/OrderConfirm/start.vue
Unescape View File

@ -363,22 +363,24 @@ export default {
},
uploadSubmit(data,fileName = ''){
this.model[fileName] = data.map(item => {
return {url:item.url,type:item.type};
return {url:item.url,type:item.type, thumb:(item.thumb || item.url)};
})
},
uploadShow(data, fileName = '') {
let result = [];
try {
data.forEach(item => {
result.push({url:item.url})
result.push({url: item.url, type: item.type,thumb:(item.thumb || item.url)})
})
} catch (e) {
this.images[fileName] = [];
}
this.images[fileName] = result;
},
uploadPut(event,fileName = ''){
async uploadPut(event, fileName = '') {
console.log('event', event)
let lists = [].concat(event.file);
console.log('lists', lists)
let fileListLen = this.images[fileName].length;
lists.map((item) => {
this.images[fileName].push({
@ -387,21 +389,24 @@ export default {
message: '上传中',
});
});
console.log(lists)
for (let i = 0; i < lists.length; i++) {
const fileType = api.getFileType(lists[i].url);
console.log(fileType)
api.uploadOssFile(lists[i].url).then(res => {
let thumb;
const file = await api.uploadOssFile(lists[i].url);
if(fileType === 'video')thumb = await api.uploadOssFile(lists[i].thumb);
let item = this.images[fileName][fileListLen];
this.images[fileName].splice(fileListLen, 1, {
...item,
status: 'success',
message: '',
url: res.show_path,
thumb: res.show_path,
url: file.show_path,
thumb: thumb?.show_path ? thumb.show_path : file.show_path,
type: fileType
});
fileListLen++;
})
}
},
uploadDel(fileIndex,fileName = ''){

22
pages/OrderDetail/components/fomItem.vue
Unescape View File

@ -27,8 +27,12 @@ export default {
imageShow: false,
videoUrl: '',
videoShow: false,
showItem:false,
}
},
mounted() {
this.showItem = this.getShowStatus();
},
methods: {
showBigImage(imgUrl) {
this.imageUrl = imgUrl;
@ -49,7 +53,6 @@ export default {
}
},
getShowStatus(){
// console.log(this.name)
if(!this.isShow){
if(this.type === 'media' || this.type === 'text'){
return (Object.keys(this.data).length>0);
@ -59,14 +62,13 @@ export default {
}else {
return true;
}
},
},
}
</script>
<template>
<view class="content-item service-end" v-if="getShowStatus()">
<view class="content-item service-end" v-if="showItem">
<view class="item-title">
<view class="title row"
style="position:relative;justify-content: flex-start;width:100%;top:0;left:0;margin-bottom:30rpx;">
@ -101,9 +103,7 @@ export default {
<u-image :lazy-load="true" @click="showBigImage(item.url)" :src="item.url" mode="aspectFill" width="100%"></u-image>
</view>
<view class="item-video" v-else>
<u-image :lazy-load="true" @click="showBigVideo(item.url)" :src="item.thumb" mode="aspectFill" width="100%"></u-image>
<!-- <video v-if="item.url.indexOf('wxfile') === -1" mode="aspectFill" :src="item.url"-->
<!-- style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>-->
<u-image :lazy-load="true" @click="showBigVideo(item.url)" :src="item.thumb || ''" mode="aspectFill" width="100%"></u-image>
</view>
</view>
</view>
@ -115,16 +115,6 @@ export default {
</view>
</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>-->
<!-- <u-overlay :show="videoShow" @click="videoShow = false">-->
<!-- <view class="" style="display:flex;align-items: center;justify-content:center;width:100%;height:100vh;">-->
<!-- <video mode="widthFix" :src="videoUrl" height="auto" width="100vw"></video>-->
<!-- </view>-->
<!-- </u-overlay>-->
</template>
<style scoped lang="scss">

5
pages/OrderDetail/components/index.scss
Unescape View File

@ -120,11 +120,6 @@
.order-card-left{
position: relative;
z-index: 2;
.img{
width:200rpx;
height:200rpx;
border-radius: 30rpx;
}
}
.order-card-right{
padding-left:20rpx;

19
pages/OrderDetail/index.vue
Unescape View File

@ -24,7 +24,12 @@
<!-- </view>-->
</view>
<view class="order-card-left col-12">
<u-swiper :list="detail.avatar_array" height="350" radius="26" custom-style="border:3rpx solid #262626" img-mode="aspectFill"></u-swiper>
<!-- <swiper style="height:100%;">-->
<!-- <swiper-item v-for="item in detail.avatar_array">-->
<u-image :fade="false" width="100%" height="auto" :src="detail.avatar_array[0]" radius="26" custom-style="border:3rpx solid #262626" mode="widthFix"></u-image>
<!-- </swiper-item>-->
<!-- </swiper>-->
<!-- <u-swiper :list="detail.avatar_array" height="350" radius="26" custom-style="border:3rpx solid #262626" img-mode="aspectFill"></u-swiper>-->
<!-- <u-image @click="showBigImage(detail.pet_avatar)" class="img" mode="aspectFill" width="100%" height="350" :src="detail.pet_avatar" radius="26" custom-style="border:3rpx solid #262626"></u-image>-->
</view>
<view class="order-card-right col-12">
@ -131,7 +136,7 @@
增值服务：
</view>
<view class="item-content">
{{detail.services.join(',')}}
{{detail.services?.join(',')}}
</view>
</view>
<view class="content-item row">
@ -164,7 +169,7 @@
<view class="row col" style="padding:15rpx 30rpx 15rpx 0rpx;">
<view class="content-container col" style="position: relative;height:100%;width:100%;">
<view class="content" style="box-sizing:border-box;padding:25rpx;position:absolute;height:100%;width:100%;left:0;top:0;z-index: 2;border:2rpx solid #262626;border-radius: 16rpx;background-color:#F6F6F6;">
<u-text :text="row.pet_remarks" color="#263233" size="28"></u-text>
<u-text :text="row.remarks" color="#263233" size="28"></u-text>
</view>
<view class="content-background" style="position:absolute;top:10rpx;left:10rpx;z-index:1;border:2rpx solid #262626;border-radius: 16rpx;width:100%;height:100%;">
@ -195,10 +200,10 @@
<view class="content-item"><view>开始订单</view></view>
<FomItem @showBigImage="showBigImage" @showBigVideo="showBigVideo" :data="service.startservice.arrival_time" name="到达时间" type="text"></FomItem>
<FomItem @showBigImage="showBigImage" @showBigVideo="showBigVideo" :data="service.startservice.worker_confirm" name="宠物师确认" type="media"></FomItem>
<FomItem @showBigImage="showBigImage" @showBigVideo="showBigVideo" :data="service.startservice.hand_disinfect" name="手部消毒" type="default"></FomItem>
<FomItem @showBigImage="showBigImage" @showBigVideo="showBigVideo" :data="service.startservice.body_disinfect" name="全身消毒" type="default"></FomItem>
<FomItem @showBigImage="showBigImage" @showBigVideo="showBigVideo" :data="service.startservice.hand_disinfect" name="手部消毒" type="media"></FomItem>
<FomItem @showBigImage="showBigImage" @showBigVideo="showBigVideo" :data="service.startservice.body_disinfect" name="全身消毒" type="media"></FomItem>
<FomItem @showBigImage="showBigImage" @showBigVideo="showBigVideo" :data="service.startservice.key" name="钥匙开启/收取" type="default"></FomItem>
<FomItem @showBigImage="showBigImage" @showBigVideo="showBigVideo" :data="service.startservice.key" name="钥匙描述" type="default"></FomItem>
<FomItem @showBigImage="showBigImage" @showBigVideo="showBigVideo" :data="service.startservice.key_info" name="钥匙描述" type="text"></FomItem>
<FomItem @showBigImage="showBigImage" @showBigVideo="showBigVideo" :data="service.startservice.service_tools" name="服务工具" type="text"></FomItem>
</view>
@ -281,7 +286,7 @@
</u-overlay>
<u-overlay :show="videoShow" @click="videoShow = false">
<view class="" style="display:flex;align-items: center;justify-content:center;width:100%;height:100vh;">
<video :autoplay="true" mode="widthFix" :src="videoUrl" height="auto" width="100vw"></video>
<video :show-fullscreen-btn="false" :autoplay="true" mode="widthFix" :src="videoUrl" height="auto" width="100vw"></video>
</view>
</u-overlay>
</template>

8
pages/OrderPage/index.vue
Unescape View File

@ -218,7 +218,7 @@
></u-checkbox>
</view>
<view class="foot-menu-title">
<text @click="readInfo = !readInfo">阅读并同意</text><text class="foot-menu-url" @click="showAgreement">《上门{{ type==1?'喂养':'洗护' }}协议》</text>
<text @click="readInfo = !readInfo">阅读并同意</text><text class="foot-menu-url" @click="showAgreement">《上门{{ type==1?'喂养':'洗护' }}须知》</text>
</view>
</view>
</view>
@ -255,7 +255,7 @@
<!-- <u-text text="协议内容" size="38" color="#191919"></u-text>-->
<view class="" style="position: relative;display:inline-block;">
<view style="color:#191919;font-size:38rpx;display:inline-block;position: relative;z-index: 2;">协议内容</view>
<view style="color:#191919;font-size:38rpx;display:inline-block;position: relative;z-index: 2;">购买须知</view>
<view class="background" style="width:100%;height:50%;position: absolute;bottom:0;left:0;background-color:rgba(227, 191, 119, 0.6);display:inline-block;z-index:1;"></view>
</view>
</view>
@ -278,8 +278,8 @@
</view>
</view>
<view style="padding:30rpx;max-height:700rpx;overflow: auto;">
<view v-if="type == 1" style="height:200rpx;display: flex;align-items: center;">是否同意 <text @click="showAgreement" style="color:#4DC3B8;">《上门喂养协议》</text></view>
<view v-else style="height:200rpx;display: flex;align-items: center;">是否同意 <text @click="showAgreement" style="color:#4DC3B8;">《上门洗护协议》</text></view>
<view v-if="type == 1" style="height:200rpx;display: flex;align-items: center;">是否同意 <text @click="showAgreement" style="color:#4DC3B8;">《上门喂养须知》</text></view>
<view v-else style="height:200rpx;display: flex;align-items: center;">是否同意 <text @click="showAgreement" style="color:#4DC3B8;">《上门洗护须知》</text></view>
<MzButton title="确认" @click="agreeHandle" button-color="#4DC3B8" font-color="#fff"></MzButton>
</view>
</uv-popup>

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

@ -21,7 +21,7 @@
height: $uv.addUnit(height)
}]"
>
<image :src="item.thumb" :mode="imageMode"
<image :src="item.thumb || item.url" :mode="imageMode"
@tap="onPreviewVideo(item,index)"
:style="{
width: $uv.addUnit(width),

Write Preview
Loading…
Cancel
Save