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

修改

master
396316021 1 year ago
parent
1dcf787863
commit
fdd1267acf
7 changed files with 84 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      api/other.js
  2. 26
      components/RightNav/index.vue
  3. 13
      pages/Index/components/ChatPage/index.vue
  4. 14
      pages/Index/components/OrderPage/index.vue
  5. 19
      pages/Index/index.vue
  6. 39
      pages/OrderDetail/index.vue
  7. 14
      pages/UserOrderPage/index.vue

8
api/other.js
Unescape View File

@ -67,6 +67,14 @@ export function allChatCount(data){
}) })
} }
export function allBadgeCount(data){
return request({
url:`/user/all-chat-count`,
method: "get",
data:data
})
}
/** /**
* 待服务订单统计 * 待服务订单统计
* @param data * @param data

26
components/RightNav/index.vue
Unescape View File

@ -26,7 +26,14 @@
import functions from "@/utils/functions"; import functions from "@/utils/functions";
import {getConfig} from "@/api/other"; import {getConfig} from "@/api/other";
import {userChatCount} from "@/api/user"; import {userChatCount} from "@/api/user";
import {number} from "../../uni_modules/uv-ui-tools/libs/function/test";
export default{ export default{
props:{
badge:{
type:Number,
default:0,
}
},
data() { data() {
return { return {
imageShow:false, imageShow:false,
@ -54,13 +61,13 @@
}, },
mounted() { mounted() {
let that = this; let that = this;
if(uni.getStorageSync('token')){ // if(uni.getStorageSync('token')){
that.getMsgNumber(); // that.getMsgNumber();
setInterval(() => { // setInterval(() => {
that.getMsgNumber(); // that.getMsgNumber();
},5000) // },5000)
that.getKFWechat(); // that.getKFWechat();
} // }
}, },
methods: { methods: {
getMsgNumber(){ getMsgNumber(){
@ -126,6 +133,11 @@
created() { created() {
this.getPhone(); this.getPhone();
}, },
watch:{
badge(newValue,oldValue){
this.msgCount = newValue;
}
}
} }
</script> </script>

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

@ -109,7 +109,18 @@
return false; return false;
} }
this.status = 'loading'; this.status = 'loading';
chatList(this.page, this.$store.state.userInfo.is_waitstaff === 1 ? 2:(this.$store.state.userInfo.store_id > 0?1:0)).then(res => { let type = 0;
if(this.$store.state.userInfo.is_waitstaff === 3){
type = 3;
}else if(this.$store.state.userInfo.is_waitstaff === 1){
type = 2;
}else if(this.$store.state.userInfo.store_id > 0){
type = 1;
}else{
type = 0;
}
chatList(this.page, type).then(res => {
this.chatList.push.apply(this.chatList,res.data); this.chatList.push.apply(this.chatList,res.data);
if(res.data.length === 0){ if(res.data.length === 0){
this.status = 'nomore'; this.status = 'nomore';

14
pages/Index/components/OrderPage/index.vue
Unescape View File

@ -76,13 +76,13 @@
button-color="#F7E1C3" button-color="#F7E1C3"
button-width="100%"></MzButton> button-width="100%"></MzButton>
</view> </view>
<view class="card-button" @click="navTo('/pages/FeedLog/index?pet_id=' + item.pet_id)"> <!-- <view class="card-button" @click="navTo('/pages/FeedLog/index?pet_id=' + item.pet_id)">-->
<MzButton <!-- <MzButton-->
title="喂养档案" <!-- title="喂养档案"-->
font-color="#FFFFFF" <!-- font-color="#FFFFFF"-->
button-color="#4DC3B8" <!-- button-color="#4DC3B8"-->
button-width="100%"></MzButton> <!-- button-width="100%"></MzButton>-->
</view> <!-- </view>-->
<view v-if="item.status === 1" class="card-button" @click="navTo('/pages/OrderConfirm/end?id=' + item.id)"> <view v-if="item.status === 1" class="card-button" @click="navTo('/pages/OrderConfirm/end?id=' + item.id)">
<MzButton <MzButton
title="确认完成" title="确认完成"

19
pages/Index/index.vue
Unescape View File

@ -12,7 +12,7 @@
<view :class="{show:(footCheck === 'user')}"> <view :class="{show:(footCheck === 'user')}">
<UserPage v-if="(footCheck === 'user')" @tabNavTo="footSelect"></UserPage> <UserPage v-if="(footCheck === 'user')" @tabNavTo="footSelect"></UserPage>
</view> </view>
<RightNav ref="rightNav" v-if="rightShow"></RightNav> <RightNav ref="rightNav" v-if="rightShow" :badge="kFbadge"></RightNav>
<FooterNav :foot-group="footGroup" @change="footSelect" :footCheck="current"></FooterNav> <FooterNav :foot-group="footGroup" @change="footSelect" :footCheck="current"></FooterNav>
<u-modal :show="show" title="登录" content="当前未登录是否前往登录" @confirm="userLogin" @cancel="this.show = false;" <u-modal :show="show" title="登录" content="当前未登录是否前往登录" @confirm="userLogin" @cancel="this.show = false;"
:closeOnClickOverlay="true" showCancelButton></u-modal> :closeOnClickOverlay="true" showCancelButton></u-modal>
@ -30,7 +30,7 @@
import {UserCache} from "@/config/config.js"; import {UserCache} from "@/config/config.js";
import log from "@/utils/log"; import log from "@/utils/log";
import {userDetail, userExtends} from "@/api/user"; import {userDetail, userExtends} from "@/api/user";
import {allChatCount, waitOrderCount} from "../../api/other"; import {allBadgeCount, allChatCount, waitOrderCount} from "../../api/other";
export default { export default {
components: { components: {
FooterNav, FooterNav,
@ -43,6 +43,7 @@
}, },
data() { data() {
return { return {
kFbadge:0,
inter:{}, inter:{},
current:0, current:0,
footCheck: 'home', footCheck: 'home',
@ -88,13 +89,12 @@
}, },
methods: { methods: {
getCountBadges(type = 1){ getCountBadges(type = 1){
allChatCount({type:type}).then(res => { allBadgeCount({type:type}).then(res => {
console.log(res) console.log(res)
this.footGroup[2].badge = res.data.count; this.footGroup[2].badge = res.data.count_user;
this.footGroup[1].badge = res.data.count_worker;
this.kFbadge = res.data.count_kf;
}); });
waitOrderCount().then(res => {
this.footGroup[1].badge = res.data.count;
})
}, },
footSelect(index){ footSelect(index){
if(index === 1|| index === 2){ if(index === 1|| index === 2){
@ -167,7 +167,10 @@
if(this.inter)clearInterval(this.inter); if(this.inter)clearInterval(this.inter);
this.getCountBadges(type); this.getCountBadges(type);
this.inter = setInterval(() => { this.inter = setInterval(() => {
this.getCountBadges(type); // this.getCountBadges(type);
this.footGroup[2].badge = res.data.count_user;
this.footGroup[1].badge = res.data.count_worker;
this.kFbadge = res.data.count_kf;
},5000) },5000)
} }
}, },

39
pages/OrderDetail/index.vue
Unescape View File

@ -1,7 +1,7 @@
<template> <template>
<HeaderNav title="订单详情" :is-back="true"></HeaderNav> <HeaderNav title="订单详情" :is-back="true"></HeaderNav>
<view class="body-background"> <view class="body-background">
<u-image @click="showBigImage(item.url)" :src="staticImage.orderDetailBackground" width="100%" height="100vh"></u-image> <u-image :src="staticImage.orderDetailBackground" width="100%" height="100vh"></u-image>
</view> </view>
<view class="app-wallpaper"> <view class="app-wallpaper">
@ -24,7 +24,8 @@
<!-- </view>--> <!-- </view>-->
</view> </view>
<view class="order-card-left col-12"> <view class="order-card-left col-12">
<u-image @click="showBigImage(item.url)" class="img" mode="aspectFill" width="100%" height="350" :src="detail.pet_avatar" radius="26" custom-style="border:3rpx solid #262626"></u-image> <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>
<view class="order-card-right col-12"> <view class="order-card-right col-12">
<view class="order-card-title" style=""> <view class="order-card-title" style="">
@ -56,13 +57,7 @@
button-color="#F7E1C3" button-color="#F7E1C3"
button-width="255rpx"></MzButton> button-width="255rpx"></MzButton>
</view> </view>
<view class="card-button" @click="navTo('/pages/FeedLog/index?pet_id=' + detail.pet_id)">
<MzButton
title="喂养档案"
font-color="#FFFFFF"
button-color="#4DC3B8"
button-width="255rpx"></MzButton>
</view>
</view> </view>
</view> </view>
</view> </view>
@ -77,7 +72,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="pet-detail-bottom-container"> <view class="pet-detail-bottom-container" v-for="row in detail.pet_list">
<view class="pet-detail-container"> <view class="pet-detail-container">
<view class="pet-detail-gun col"> <view class="pet-detail-gun col">
<image class="img" mode="heightFix" :src="staticImage.petGun"/> <image class="img" mode="heightFix" :src="staticImage.petGun"/>
@ -106,7 +101,7 @@
{{detail.no}} {{detail.no}}
</view> </view>
</view> </view>
<view class="content-item row" v-if="detail.lock_type_name"> <view class="content-item row" v-if="row.lock_type_name">
<view class="item-icon"> <view class="item-icon">
<image class="img" mode="widthFix" :src="staticImage.petName"/> <image class="img" mode="widthFix" :src="staticImage.petName"/>
</view> </view>
@ -117,7 +112,7 @@
{{detail.lock_type_name}} {{detail.lock_type_name}}
</view> </view>
</view> </view>
<view class="content-item row" v-if="detail.open_info"> <view class="content-item row" v-if="row.open_info">
<view class="item-icon"> <view class="item-icon">
<image class="img" mode="widthFix" :src="staticImage.petName"/> <image class="img" mode="widthFix" :src="staticImage.petName"/>
</view> </view>
@ -148,10 +143,10 @@
</view> </view>
<view class="item-content col-12"> <view class="item-content col-12">
<view class="order-card-tag-container row"> <view class="order-card-tag-container row">
<view class="order-card-tag">{{ detail.pet_name }}</view> <view class="order-card-tag">{{ row.name }}</view>
<view class="order-card-tag">{{ detail.pet_age }}岁</view> <view class="order-card-tag">{{ row.pet_age }}岁</view>
<view class="order-card-tag">{{ detail.pet_weight }}kg</view> <view class="order-card-tag">{{ row.weight }}kg</view>
<view class="order-card-tag">{{ detail.pet_sex }}</view> <view class="order-card-tag">{{ row.pet_sex }}</view>
</view> </view>
</view> </view>
</view> </view>
@ -161,7 +156,7 @@
<view class="video-content"> <view class="video-content">
<view class="video-content-container"> <view class="video-content-container">
<video class="img" mode="aspectFill" :src="detail.pet_video" style="width:220rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video> <video class="img" mode="aspectFill" :src="row.video" style="width:220rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
</view> </view>
<view class="video-content-background"></view> <view class="video-content-background"></view>
</view> </view>
@ -169,7 +164,7 @@
<view class="row col" style="padding:15rpx 30rpx 15rpx 0rpx;"> <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-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;"> <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="detail.pet_remarks" color="#263233" size="28"></u-text> <u-text :text="row.pet_remarks" color="#263233" size="28"></u-text>
</view> </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%;"> <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%;">
@ -178,7 +173,13 @@
</view> </view>
</view> </view>
<view class="card-button" @click="navTo('/pages/FeedLog/index?pet_id=' + row.id)" style="justify-content: center;display:flex;padding:30rpx 0;">
<MzButton
title="喂养档案"
font-color="#FFFFFF"
button-color="#4DC3B8"
button-width="255rpx"></MzButton>
</view>
</view> </view>
<view class="pet-detail-background"></view> <view class="pet-detail-background"></view>

14
pages/UserOrderPage/index.vue
Unescape View File

@ -83,13 +83,13 @@
button-color="#F7E1C3" button-color="#F7E1C3"
button-width="100%"></MzButton> button-width="100%"></MzButton>
</view> </view>
<view class="card-button" @click="navTo('/pages/FeedLog/index?pet_id=' + item.pet_id)"> <!-- <view class="card-button" @click="navTo('/pages/FeedLog/index?pet_id=' + item.pet_id)">-->
<MzButton <!-- <MzButton-->
title="喂养档案" <!-- title="喂养档案"-->
font-color="#FFFFFF" <!-- font-color="#FFFFFF"-->
button-color="#4DC3B8" <!-- button-color="#4DC3B8"-->
button-width="100%"></MzButton> <!-- button-width="100%"></MzButton>-->
</view> <!-- </view>-->
<view class="card-button" @click="navTo('/pages/OrderDetail/index?id='+item.id)"> <view class="card-button" @click="navTo('/pages/OrderDetail/index?id='+item.id)">
<MzButton <MzButton
title="订单详情" title="订单详情"

Write Preview
Loading…
Cancel
Save