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

修复bug及优化

master
396316021 1 year ago
parent
57c7ad999e
commit
9e99372df2
7 changed files with 186 additions and 120 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. 128
      components/PetPage/index.vue
  2. 4
      pages/ChatDetail/index.vue
  3. 28
      pages/FeedLog/index.vue
  4. 10
      pages/Index/components/ChatPage/index.vue
  5. 3
      pages/Index/index.vue
  6. 108
      pages/OrderPage/index.vue
  7. 25
      pages/UserCoupons/index.vue

128
components/PetPage/index.vue
Unescape View File

@ -188,27 +188,27 @@
</view>
</view>
</view>
<view class="order-item row">
<view class="item-title" style="padding-bottom:30rpx;">
宝贝背景图
</view>
<view class="item-content row">
<view class="item-content-text row">
<u-upload
width="160"
height="160"
:fileList="backgroundList"
name="img"
multiple
:maxCount="1"
:previewFullImage="true"
uploadIcon="plus"
@afterRead="afterBackgroundRead"
@delete="deleteBackground"
></u-upload>
</view>
</view>
</view>
<!-- <view class="order-item row">-->
<!-- <view class="item-title" style="padding-bottom:30rpx;">-->
<!-- 宝贝背景图-->
<!-- </view>-->
<!-- <view class="item-content row">-->
<!-- <view class="item-content-text row">-->
<!-- <u-upload-->
<!-- width="160"-->
<!-- height="160"-->
<!-- :fileList="backgroundList"-->
<!-- name="img"-->
<!-- multiple-->
<!-- :maxCount="1"-->
<!-- :previewFullImage="true"-->
<!-- uploadIcon="plus"-->
<!-- @afterRead="afterBackgroundRead"-->
<!-- @delete="deleteBackground"-->
<!-- ></u-upload>-->
<!-- </view>-->
<!-- </view>-->
<!-- </view>-->
<view class="order-item row">
<view class="item-title" style="padding-bottom:30rpx;">
@ -444,50 +444,52 @@
</view>
</view>
</view>
<view class="pop-service-container" style="min-height:500rpx;">
<u-cell-group custom-style="max-height:700rpx;overflow:auto;" v-if="petList.length>0">
<u-cell
size="large"
:title="item.name"
:label="item.type_name"
isLink
right-icon=""
v-for="(item,index) in petList"
@click="selectPet(index)"
>
<template #value>
<view class="">
<view class="" style="display:flex;align-items: center">
<view class="">
<u-text :text="parseFloat(item.weight)+'KG'" size="32" style="white-space: nowrap;" line-height="32"></u-text>
</view>
<view class="">
<u-checkbox-group @change="petCheckChange">
<u-checkbox
:name="index"
:customStyle="{marginBottom: '0',marginTop: '0',marginLeft:'15rpx'}"
size="32"
:checked="item.checked"
activeColor="#4DC3B8"
iconSize="30"
>
</u-checkbox>
</u-checkbox-group>
<view class="pop-service-container" style="min-height:500rpx;position:relative;">
<view class="" style="width:100%;padding-bottom:114rpx;">
<u-cell-group custom-style="max-height:700rpx;overflow:auto;" v-if="petList.length>0">
<u-cell
size="large"
:title="item.name"
:label="item.type_name"
isLink
right-icon=""
v-for="(item,index) in petList"
@click="selectPet(index)"
>
<template #value>
<view class="">
<view class="" style="display:flex;align-items: center">
<view class="">
<u-text :text="parseFloat(item.weight)+'KG'" size="32" style="white-space: nowrap;" line-height="32"></u-text>
</view>
<view class="">
<u-checkbox-group @change="petCheckChange">
<u-checkbox
:name="index"
:customStyle="{marginBottom: '0',marginTop: '0',marginLeft:'15rpx'}"
size="32"
:checked="item.checked"
activeColor="#4DC3B8"
iconSize="30"
>
</u-checkbox>
</u-checkbox-group>
</view>
</view>
</view>
</view>
</template>
</u-cell>
</u-cell-group>
<u-cell-group custom-style="max-height:700rpx;overflow:auto;" v-else>
<u-cell
size="large"
title="暂无宠物"
>
</u-cell>
</u-cell-group>
<view class="row" style="padding-top:30rpx;" v-if="petList.length>0">
<view class="col-6" style="padding:0 30rpx;">
</template>
</u-cell>
</u-cell-group>
<u-cell-group custom-style="max-height:700rpx;overflow:auto;" v-else>
<u-cell
size="large"
title="暂无宠物"
>
</u-cell>
</u-cell-group>
</view>
<view class="row" style="position:absolute;bottom:0;width:100%;padding-top:30rpx;" v-if="petList.length>0">
<view class="col-6" style="padding:0 30rpx;'">
<MzButton title="取消" @click="$refs.petPopup.close()"></MzButton>
</view>
<view class="col-6" style="padding:0 30rpx;">

4
pages/ChatDetail/index.vue
Unescape View File

@ -190,7 +190,9 @@ export default {
uni.hideLoading();
this.message = '';
}
this.scrollToBottom();
uni.$u.sleep(200).then(()=>{
this.scrollToBottom();
})
}
},
onPageScroll(res) {

28
pages/FeedLog/index.vue
Unescape View File

@ -41,8 +41,9 @@
<image class="img" mode="heightFix" :src="staticImage.feedGun" />
</view>
<view class="feed-content">
<u-collapse>
<u-collapse :value="['collapse']">
<u-collapse-item
name="collapse"
title="水碗饭碗"
>
<u-textarea :disabled="(type !== 'create')" v-model="detail.feedlist.meal" placeholder="请输入内容" ></u-textarea>
@ -62,8 +63,9 @@
</u-collapse-item>
</u-collapse>
<u-collapse>
<u-collapse :value="['collapse']">
<u-collapse-item
name="collapse"
title="主食情况"
>
<u-textarea :disabled="(type !== 'create')" v-model="detail.feedlist.food" placeholder="请输入内容" ></u-textarea>
@ -83,8 +85,9 @@
</u-collapse-item>
</u-collapse>
<u-collapse>
<u-collapse :value="['collapse']">
<u-collapse-item
name="collapse"
title="零食小吃"
>
<u-textarea :disabled="(type !== 'create')" v-model="detail.feedlist.snack" placeholder="请输入内容" ></u-textarea>
@ -104,8 +107,9 @@
</u-collapse-item>
</u-collapse>
<u-collapse>
<u-collapse :value="['collapse']">
<u-collapse-item
name="collapse"
title="喂药擦药"
>
<u-textarea :disabled="(type !== 'create')" v-model="detail.feedlist.drug" placeholder="请输入内容" ></u-textarea>
@ -125,8 +129,9 @@
</u-collapse-item>
</u-collapse>
<u-collapse>
<u-collapse :value="['collapse']">
<u-collapse-item
name="collapse"
title="需要注意"
>
<u-textarea :disabled="(type !== 'create')" v-model="detail.feedlist.note" placeholder="请输入内容" ></u-textarea>
@ -146,8 +151,9 @@
</u-collapse-item>
</u-collapse>
<u-collapse>
<u-collapse :value="['collapse']">
<u-collapse-item
name="collapse"
title="用品位置"
>
<u-textarea :disabled="(type !== 'create')" v-model="detail.feedlist.goods" placeholder="请输入内容" ></u-textarea>
@ -167,8 +173,9 @@
</u-collapse-item>
</u-collapse>
<u-collapse>
<u-collapse :value="['collapse']">
<u-collapse-item
name="collapse"
title="外出路线"
>
<u-textarea :disabled="(type !== 'create')" v-model="detail.feedlist.line" placeholder="请输入内容" ></u-textarea>
@ -188,8 +195,9 @@
</u-collapse-item>
</u-collapse>
<u-collapse>
<u-collapse :value="['collapse']">
<u-collapse-item
name="collapse"
title="其它事项"
>
<u-textarea :disabled="(type !== 'create')" v-model="detail.feedlist.other" placeholder="请输入内容" ></u-textarea>
@ -446,7 +454,9 @@
this.detail.feedlist.pet_id = this.pet_id
editFeed(this.detail.feedlist).then(res => {
console.log(res)
uni.navigateBack();
api.success('保存成功').then(() => {
uni.navigateBack();
})
})
});
},

10
pages/Index/components/ChatPage/index.vue
Unescape View File

@ -82,7 +82,7 @@
chatShow(){
this.page = 1;
this.status = 'loadmore';
this.getChatList();
this.getChatList(true);
},
timeFormat(time){
let now = uni.$u.timeFormat(new Date().getTime(),'yyyy/mm/dd');
@ -98,8 +98,12 @@
url:'/pages/ChatDetail/index?id='+item.order_service_id
});
},
getChatList(){
getChatList(clear = false){
if(clear){
this.status = 'loadmore';
this.chatList = [];
this.page = 1;
}
if(this.status === 'nomre'){
return false;
}

3
pages/Index/index.vue
Unescape View File

@ -63,7 +63,7 @@
image: imghost + "/foot-nav-button-three",
name: 'chat',
title: '在线沟通',
is_show: true
is_show: false
},
{
image: imghost + "/foot-nav-button-four",
@ -117,6 +117,7 @@
onShow(){
console.log(this.footGroup)
this.footGroup[1].is_show = (UserCache.get('store_id', 0) > 0)
this.footGroup[2].is_show = (UserCache.get('store_id', 0) === 0)
if(this.footCheck === 'chat'){
this.$refs.chat.chatShow();
}

108
pages/OrderPage/index.vue
Unescape View File

@ -242,49 +242,51 @@
</view>
</view>
</view>
<view class="pop-service-container" style="min-height:500rpx;">
<u-cell-group custom-style="max-height:700rpx;overflow:auto;" v-if="addServiceList.length > 0">
<u-cell
size="large"
:title="item.name"
:label="item.info"
isLink
right-icon=""
v-for="(item,index) in addServiceList"
@click="selectAddService(index)"
>
<template #value>
<view class="">
<view class="" style="display:flex;align-items: center">
<view class="">
<u-text :text="parseFloat(item.price)+'元'" size="32" style="white-space: nowrap;" line-height="32"></u-text>
</view>
<view class="">
<u-checkbox-group @change="addServiceChange">
<u-checkbox
:name="index"
:customStyle="{marginBottom: '0',marginTop: '0',marginLeft:'15rpx'}"
size="32"
:checked="item.checked"
activeColor="#4DC3B8"
iconSize="30"
>
</u-checkbox>
</u-checkbox-group>
<view class="pop-service-container" style="min-height:500rpx;position: relative;">
<view class="" style="width:100%;padding-bottom:114rpx;">
<u-cell-group custom-style="max-height:700rpx;overflow:auto;" v-if="addServiceList.length > 0">
<u-cell
size="large"
:title="item.name"
:label="item.info"
isLink
right-icon=""
v-for="(item,index) in addServiceList"
@click="selectAddService(index)"
>
<template #value>
<view class="">
<view class="" style="display:flex;align-items: center">
<view class="">
<u-text :text="parseFloat(item.price)+'元'" size="32" style="white-space: nowrap;" line-height="32"></u-text>
</view>
<view class="">
<u-checkbox-group @change="addServiceChange">
<u-checkbox
:name="index"
:customStyle="{marginBottom: '0',marginTop: '0',marginLeft:'15rpx'}"
size="32"
:checked="item.checked"
activeColor="#4DC3B8"
iconSize="30"
>
</u-checkbox>
</u-checkbox-group>
</view>
</view>
</view>
</view>
</template>
</u-cell>
</u-cell-group>
<u-cell-group custom-style="max-height:700rpx;overflow:auto;" v-else>
<u-cell
size="large"
title="暂无增值服务"
>
</u-cell>
</u-cell-group>
<view class="row" style="padding-top:30rpx;" v-if="addServiceList.length > 0">
</template>
</u-cell>
</u-cell-group>
<u-cell-group custom-style="max-height:700rpx;overflow:auto;" v-else>
<u-cell
size="large"
title="暂无增值服务"
>
</u-cell>
</u-cell-group>
</view>
<view class="row" style="position:absolute;bottom:0;padding-top:30rpx;" v-if="addServiceList.length > 0">
<view class="col-6" style="padding:0 30rpx;">
<MzButton title="取消" @click="$refs.addServicePopup.close()"></MzButton>
</view>
@ -455,7 +457,7 @@
this.addServiceList[e].checked = !this.addServiceList[e].checked;
},
orderPay(){
uni.showLoading('加载中');
if(
this.address
&&this.timeList.length>0
@ -475,10 +477,30 @@
console.log(res)
api.payment(res.data).then(res => {
uni.redirectTo({url:'/pages/Order/done?type=order'});
uni.hideLoading();
}).catch(err => {
api.error('支付失败');
uni.hideLoading();
});
});
}else{
uni.hideLoading();
if(!this.address){
api.error('请选择地址')
return;
}
if(this.timeList.length === 0){
api.error('请选择服务日期')
return;
}
if(this.petChecked.length === 0){
api.error('请选择宠物')
return;
}
if(this.basicServiceChecked.length === 0){
api.error('请选择基础服务')
}
}
},
checkOrderData(){
@ -544,6 +566,8 @@
console.log(cacheCoupons)
this.coupons = cacheCoupons;
uni.removeStorage({key:'userCoupons'});
}else{
this.coupons = {};
}
this.checkOrderData();
},

25
pages/UserCoupons/index.vue
Unescape View File

@ -35,7 +35,7 @@
<image class="img" :src="staticImage.couponsUse" mode="aspectFill" />
</view>
<view class="coupons-bottom col-12 row">
<view class="coupons-rule row col">查看使用规则 <u-icon class="arrow-right" size="24rpx" color="#999999" name="arrow-right"></u-icon></view>
<view class="coupons-rule row col" @click="showCoupons(item)">查看使用规则 <u-icon class="arrow-right" size="24rpx" color="#999999" name="arrow-right"></u-icon></view>
<view class="coupons-button">
<MzButton
title="立即使用"
@ -61,7 +61,21 @@
line-color="#ACB4B6"
marginBottom="30" marginTop="30" @loadmore="getCouponsList(++this.page)"/>
</view>
<uv-popup ref="agreement" mode="bottom" round="20rpx" closeable safeAreaInsetTop safeAreaInsetBottom custom-style="position:relative;">
<view class="title row" style="position:absolute;justify-content: center;width:100%;top:20rpx;left:0;">
<view class="value col" style="position: relative;text-align: center;">
<!-- <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 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>
</view>
<view style="padding:30rpx;max-height:700rpx;overflow: auto;" v-if="couponsContent!==''">
<u-parse :content="couponsContent"></u-parse>
</view>
</uv-popup>
<!-- <RightNav></RightNav> -->
</template>
@ -74,6 +88,7 @@
import RightNav from '@/components/RightNav/Index.vue';
import MzButton from '@/components/MzButton/Index.vue';
import {userCoupons} from "../../api/user";
import {getConfig} from "@/api/other";
export default {
components: {
HeaderNav,
@ -117,6 +132,7 @@
page:1,
status:'loadmore',
navToUrl:'',
couponsContent:'',
}
},
onLoad(option) {
@ -125,6 +141,12 @@
this.navToUrl = option.url || ''
},
methods: {
showCoupons(item){
console.log(item)
console.log(item.use_info)
this.couponsContent = item.use_info;
this.$refs.agreement.open();
},
clickCoupons(item){
if(item.status === 0){
console.log('coupons', item)
@ -157,6 +179,7 @@
time: '有效期至 '+row.end_time,
cause:'满'+parseFloat(row.min_price)+'使用',
status: row.status,
use_info: row.use_info,
}
});
this.status = couponsList.length < 10 ? 'nomore' : 'loadmore';

Write Preview
Loading…
Cancel
Save