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

修改

master
396316021 1 year ago
parent
af835ef29e
commit
1dcf787863
10 changed files with 55 additions and 112 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. 8
      components/RightNav/index.vue
  2. 88
      pages/FeedLog/index.vue
  3. 8
      pages/Index/components/UserPage/index.vue
  4. 3
      pages/Index/index.vue
  5. 17
      pages/OrderConfirm/end.vue
  6. 13
      pages/OrderConfirm/start.vue
  7. 4
      pages/OrderDetail/components/fomItem.vue
  8. 19
      pages/OrderPage/index.vue
  9. 3
      pages/UserOrderPage/index.vue
  10. 4
      uni_modules/uv-calendar/components/uv-calendar/month.vue

8
components/RightNav/index.vue
Unescape View File

@ -56,6 +56,10 @@
let that = this;
if(uni.getStorageSync('token')){
that.getMsgNumber();
setInterval(() => {
that.getMsgNumber();
},5000)
that.getKFWechat();
}
},
methods: {
@ -63,6 +67,8 @@
userChatCount().then(res => {
this.msgCount = res.data.count
});
},
getKFWechat(){
getConfig('kefu_weixin').then((res) => {
this.imageUrl = res.data.kefu_weixin;
})
@ -75,7 +81,7 @@
handle(type){
switch (type) {
case 'chat':
this.navTo("/pages/ChatDetail/index?id=0",true);
this.navTo("/pages/ChatDetail/index?id=0&type=2",true);
break;
case 'wechat':
// uni.openCustomerServiceChat({

88
pages/FeedLog/index.vue
Unescape View File

@ -63,16 +63,6 @@
<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 :fade="false" 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>
@ -98,16 +88,6 @@
<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 :fade="false" 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>
@ -133,16 +113,6 @@
<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 :fade="false" 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>
@ -168,16 +138,6 @@
<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 :fade="false" 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>
@ -203,16 +163,6 @@
<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 :fade="false" 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,16 +188,6 @@
<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 :fade="false" 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>
@ -273,16 +213,6 @@
<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 :fade="false" 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>
@ -308,16 +238,6 @@
<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 :fade="false" 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>
@ -399,7 +319,9 @@
MzButton
},
onShow(){
this.feedLog();
if(this.type === 'detail'){
this.getFeedLog(this.pet_id);
}
},
onReady() {
uni.$u.sleep(100).then(() => {
@ -536,7 +458,7 @@
this.detail.feedlist = feedlist;
}
this.detail = data.data;
if(this.type !== 'detail'){
// if(this.type !== 'detail'){
let images = [
'meal_imgs',
'food_imgs',
@ -550,7 +472,7 @@
images.forEach((item,index) => {
that.uploadShow(data.data.feedlist[item],item);
});
}
// }
})
},

8
pages/Index/components/UserPage/index.vue
Unescape View File

@ -94,14 +94,14 @@
<!-- </view>-->
</view>
<view class="user-button-group row">
<view class="user-button col-6" @click="navTo('/pages/UserOrderPage/index?type=&0is_buy=2',true)">
<view class="user-button col-6" @click="navTo('/pages/UserOrderPage/index?type=0&is_buy=2',true)">
<view class="img-box">
<u-badge v-if="userExtends.order_pending>0" type="error" max="99" :value="userExtends.order_pending" absolute :offset="[0,0]" custom-style="z-index:1;"></u-badge>
<u-image width="90" height="90" class="img" :src="staticImage.baby.wait" mode="aspectFit"></u-image>
</view>
<view class="user-title">待服务</view>
</view>
<view class="user-button col-6" @click="navTo('/pages/UserOrderPage/index?type=&2is_buy=2',true)">
<view class="user-button col-6" @click="navTo('/pages/UserOrderPage/index?type=2&is_buy=2',true)">
<view>
<view class="img-box">
<u-badge v-if="userExtends.order_in>0" type="error" max="99" :value="userExtends.order_in" absolute :offset="[0,0]" custom-style="z-index:1;"></u-badge>
@ -124,7 +124,7 @@
<u-image height="40" class="img" :src="staticImage.bigTitle" mode="heightFix"></u-image>
</view>
<view class="user-button-group row">
<view class="user-button col-6" @click="navTo('/pages/UserOrderPage/index?type=&0is_buy=1',true)">
<view class="user-button col-6" @click="navTo('/pages/UserOrderPage/index?type=0&is_buy=1',true)">
<view class="img-box">
<u-badge v-if="userExtends.hm_order_pending>0" type="error" max="99" :value="userExtends.hm_order_pending" absolute :offset="[0,0]" custom-style="z-index:1;"></u-badge>
<u-image width="90" height="90" class="img" :src="staticImage.big.wait" mode="aspectFit"></u-image>
@ -132,7 +132,7 @@
<view class="user-title">待服务</view>
</view>
<view class="user-button col-6" @click="navTo('/pages/UserOrderPage/index?type=&2is_buy=1',true)">
<view class="user-button col-6" @click="navTo('/pages/UserOrderPage/index?type=2&is_buy=1',true)">
<view class="img-box">
<u-badge v-if="userExtends.hm_order_in>0" type="error" max="99" :value="userExtends.hm_order_in" absolute :offset="[0,0]" custom-style="z-index:1;"></u-badge>
<u-image width="90" height="90" class="img" :src="staticImage.big.end" mode="aspectFit"></u-image>

3
pages/Index/index.vue
Unescape View File

@ -83,7 +83,7 @@
}
},
onLoad(option) {
this.footSelect(option?.foot_check ?? 0);
this.footSelect(option?.foot_check || 0);
this.showUserInfo();
},
methods: {
@ -165,6 +165,7 @@
type = 1;
}
if(this.inter)clearInterval(this.inter);
this.getCountBadges(type);
this.inter = setInterval(() => {
this.getCountBadges(type);
},5000)

17
pages/OrderConfirm/end.vue
Unescape View File

@ -1938,7 +1938,7 @@
<!-- <u-text size="30" text="离开时间"></u-text>-->
</view>
<u-cell
:title="model.leave || '请选择离开时间 '"
:title="(model.leave && $u.timeFormat(model.leave,'yyyy年mm月dd日 hh时MM分')) || '请选择离开时间 '"
is-link
@click="$refs.goOutTime.open();"
custom-style="padding:0"
@ -1946,7 +1946,7 @@
</u-cell>
<!-- <u-text size="30" :text="model.arriveTime" @click="$refs.arriveTime.open();"></u-text>-->
<uv-datetime-picker ref="goOutTime" :value="model.leave" mode="datetime"
<uv-datetime-picker ref="goOutTime" :value="model.leave" mode="time"
@confirm="timeConfirm"></uv-datetime-picker>
</mz-card>
</u-form-item>
@ -1978,6 +1978,9 @@ export default {
},
data() {
return {
shows:{
leave:'',
},
value: 1,
title: '结束服务',
loading: true,
@ -2211,10 +2214,18 @@ export default {
})
},
timeConfirm(e) {
this.model.leave = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM');
console.log(e)
this.model.leave = uni.$u.timeFormat(null,'yyyy-mm-dd') + ' ' +e.value;
},
uploadSubmit(data, fileName = '') {
this.model[fileName].upload = data.map(item => {
if(item.url.indexOf('wxfile') !== -1){
item.url = '';
}
if(item.status === 'uploading'){
uni.showToast({title:'上传中,请稍后'})
return ;
}
return {url: item.url, type: item.type};
})
},

13
pages/OrderConfirm/start.vue
Unescape View File

@ -64,7 +64,7 @@
<!-- <u-text size="30" text="实际到达时间"></u-text>-->
</view>
<u-cell
:title="(shows.arrivalTime && $u.timeFormat(shows.arrivalTime,'yyyy年mm月dd日 hh时MM分')) || '请选择到达时间'"
:title="(model.arrival_time && $u.timeFormat(model.arrival_time,'yyyy年mm月dd日 hh时MM分')) || '请选择到达时间'"
is-link
@click="$refs.arriveTime.open();"
custom-style="padding:0"
@ -73,7 +73,7 @@
</u-cell>
</mz-card>
<!-- <u-text size="30" :text="model.arriveTime" @click="$refs.arriveTime.open();"></u-text>-->
<uv-datetime-picker ref="arriveTime" :value="shows.arrivalTime" mode="time" @confirm="timeConfirm"></uv-datetime-picker>
<uv-datetime-picker ref="arriveTime" :value="model.arrivalTime" mode="time" @confirm="timeConfirm"></uv-datetime-picker>
</u-form-item>
<u-form-item
prop="userInfo.sex"
@ -310,8 +310,8 @@ export default {
onLoad(option) {
this.model.order_service_id = option.id;
this.getDetail(option.id);
this.shows.arrivalTime = new Date().getTime();
// this.model.arrival_time = uni.$u.timeFormat(null,'yyyy-mm-dd hh:MM');
// this.model.arrival_time = new Date().getTime();
this.model.arrival_time = uni.$u.timeFormat(null,'yyyy-mm-dd hh:MM');
},
computed: {
api() {
@ -325,11 +325,6 @@ export default {
})
},
timeConfirm(e){
this.shows.arrivalTime = uni.$u.timeFormat(null,'yyyy-mm-dd') + ' ' +e.value;
console.log(this.shows.arrivalTime)
console.log(e)
// this.shows.arrivalTime = uni.$u.timeFormat(e.value,'yyyy年mm月dd日 hh时MM分');
//默认年月日,选择小时和分
this.model.arrival_time = uni.$u.timeFormat(null,'yyyy-mm-dd') + ' ' +e.value;
},
submit(){

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

@ -88,12 +88,12 @@ export default {
</slot>
<slot name="media">
<view class="row">
<view class="col-4" v-for="(item,index) in (this.type === 'media')?data:data.upload">
<view class="col-4" style="padding:10rpx;" v-for="(item,index) in (this.type === 'media')?data:data.upload">
<view class="item-image" v-if="item.type === 'image'">
<u-image @click="showBigImage(item.url)" :src="item.url" mode="aspectFill" width="100%"></u-image>
</view>
<view class="item-video" v-else>
<video mode="aspectFill" :src="item.url"
<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>
</view>
</view>

19
pages/OrderPage/index.vue
Unescape View File

@ -243,7 +243,7 @@
</MzButton>
</view>
</view>
<uv-calendar ref="calendar" mode="multiple" title="选择服务日期" color="#4DC3B8" round="40rpx">
<uv-calendar :defaultDate="[]" ref="calendar" mode="multiple" title="选择服务日期" color="#4DC3B8" round="40rpx">
<template #footer>
<MzButton button-color="#4DC3B8" button-width="90%" font-color="#fff" class="row" style="justify-content: center" @click="timeSelect">确定</MzButton>
</template>
@ -266,12 +266,12 @@
</uv-popup>
<uv-popup z-index="10000" ref="agreementPop" mode="center" round="20rpx" closeable safeAreaInsetTop safeAreaInsetBottom custom-style="width:80%;position:relative;">
<view class="title row" style="position:absolute;justify-content: center;width:100%;top:20rpx;left:0;">
<view class="title row" style="position:absolute;justify-content: flex-start;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 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>
@ -620,7 +620,7 @@
){
if(!this.store_id){
uni.hideLoading();
api.error('所选位置没有店铺');
api.error('所选位置超出服务范围');
return;
}
this.isPay = true;
@ -742,6 +742,7 @@
console.log(this.timeList)
// this.timeList = this.timeListTemp;
this.$refs.doDatePopup.close()
this.getStoreServiceList();
this.checkOrderData();
},
doTimeSelect(item,index){
@ -791,7 +792,15 @@
this.checkOrderData();
},
getStoreServiceList(){
getStoreService({address_id: this.address.id,order_type:this.type}).then(res => {
if(this.timeList.length === 0){
api.error('请选择服务日期');
return ;
}
getStoreService({
address_id: this.address.id,
do_date:this.timeList,
order_type:this.type
}).then(res => {
this.store_id = res.data.store_id;
this.addServiceList = res.data.add_service.map(item => {
item.number = 0;

3
pages/UserOrderPage/index.vue
Unescape View File

@ -200,8 +200,7 @@
onLoad(options) {
this.screenCheck = options.type || "";
this.is_buy = options.is_buy;
this.navToUrl = option.url || "";
log(options)
this.navToUrl = options.url || "";
},
methods: {
formatDate(date) {

4
uni_modules/uv-calendar/components/uv-calendar/month.vue
Unescape View File

@ -451,8 +451,8 @@
setDefaultDate() {
if (!this.defaultDate) {
// 如果没有设置默认日期，则将当天日期设置为默认选中的日期
const selected = [dayjs().format("YYYY-MM-DD")]
return this.setSelected(selected, false)
// const selected = [dayjs().format("YYYY-MM-DD")]
// return this.setSelected(selected, false)
}
let defaultDate = []
const minDate = this.minDate || dayjs().format("YYYY-MM-DD")

Write Preview
Loading…
Cancel
Save