diff --git a/components/PetPage/index.vue b/components/PetPage/index.vue
index 01281c2..65e1257 100644
--- a/components/PetPage/index.vue
+++ b/components/PetPage/index.vue
@@ -228,7 +228,7 @@
-
+ >
@@ -296,7 +296,7 @@
@@ -760,8 +760,8 @@
getDetail(id).then(res => {
this.data = res.data;
this.data.birthday = uni.$u.timeFormat(this.data.birthday,'yyyy-mm-dd');
- this.data.last_vaccine_time = uni.$u.timeFormat(this.data.last_vaccine_time,'yyyy-mm');
- this.data.last_insect_repellent_time = uni.$u.timeFormat(this.data.last_insect_repellent_time,'yyyy-mm');
+ this.data.last_vaccine_time = this.data.last_vaccine_time ? uni.$u.timeFormat(this.data.last_vaccine_time,'yyyy-mm'):'';
+ this.data.last_insect_repellent_time = this.data.last_insect_repellent_time?uni.$u.timeFormat(this.data.last_insect_repellent_time,'yyyy-mm'):'';
this.sexList.forEach(res=>{
if(res.value===this.data.sex){
this.data.sex_name = res.name;
@@ -771,17 +771,24 @@
if(res.value===this.data.is_home){
this.data.is_home_name = res.name;
}
+ if(res.value===this.data.is_health){
+ this.data.is_health_name = res.name;
+ }
});
- this.avatarList = res.data.avatar.split(',').map(item => {
- return {url:item};
- });
- this.imagesList = res.data.images.map(item => {
+ this.avatarList = res.data.avatar && res.data.avatar.split(',').map(item => {
return {url:item};
});
- this.videoList = res.data.video.split(',').map(item => {
+
+ if((res.data.images && res.data.images.length > 0)){
+ this.imagesList = res.data.images.map(item => {
+ return {url:item};
+ });
+ }
+
+ this.videoList = res.data.video && res.data.video.split(',').map(item => {
return {url:item};
});
- this.backgroundList = res.data.background_image.split(',').map(item => {
+ this.backgroundList = res.data.background_image && res.data.background_image.split(',').map(item => {
return {url:item};
});
})
diff --git a/pages/Coupons/components/index.scss b/pages/Coupons/components/index.scss
index 3d067b3..7dd7c7c 100644
--- a/pages/Coupons/components/index.scss
+++ b/pages/Coupons/components/index.scss
@@ -64,12 +64,7 @@
align-items: flex-end;
justify-content: center;
.coupons-big-title{
- text-align: center;
- font-size: 90rpx;
- font-family: Source Han Sans CN;
- font-weight: 800;
- color: #FFFFFF;
- line-height: 1;
+
text-shadow: 0rpx 0rpx 14rpx rgba(209,145,70,0.21);
}
.coupons-big-desc{
diff --git a/pages/Coupons/index.vue b/pages/Coupons/index.vue
index 8ca5bd6..42c890c 100644
--- a/pages/Coupons/index.vue
+++ b/pages/Coupons/index.vue
@@ -16,7 +16,10 @@
- {{item.price}}
+
+
+
+
元
diff --git a/pages/FeedLog/index.vue b/pages/FeedLog/index.vue
index 18549c4..5057bfd 100644
--- a/pages/FeedLog/index.vue
+++ b/pages/FeedLog/index.vue
@@ -382,7 +382,7 @@
},
uploadSubmit(data,fileName = ''){
this.detail.feedlist[fileName] = data.map(item => {
- return item.url;
+ return {url:item.url,type:item.type};
})
},
uploadShow(data,fileName = ''){
@@ -416,6 +416,7 @@
message: '',
url: res.show_path,
thumb: res.show_path,
+ type:api.getFileType(res.show_path)
});
fileListLen++;
})
diff --git a/pages/Index/components/OrderPage/index.vue b/pages/Index/components/OrderPage/index.vue
index 8b9aeef..bff2093 100644
--- a/pages/Index/components/OrderPage/index.vue
+++ b/pages/Index/components/OrderPage/index.vue
@@ -3,7 +3,7 @@
top:topStyle
}">
-
@@ -152,6 +153,9 @@
},{
name:'待服务',
value:'0',
+ },{
+ name:'服务中',
+ value:'1',
},{
name:'已完成',
value:'2',
diff --git a/pages/OrderConfirm/end.vue b/pages/OrderConfirm/end.vue
index 1600908..05f6b9f 100644
--- a/pages/OrderConfirm/end.vue
+++ b/pages/OrderConfirm/end.vue
@@ -20,1354 +20,1743 @@
ref="feedForm"
border-bottom
>
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ 门窗、灯、空调、水电等情况
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ 入户前萌宠家居情况
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ 萌宠生活区情况
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+ >
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+ 萌宠食物剩余情况
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ 是否有萌宠呕吐物
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ 萌宠排泄物情况
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+ >
+
+
+
+
+
+
+
-
-
-
-
- -->
+
+ 其他情况反馈
+
+
+
+
+
+
+
+
-
+ >
+
+
+
-
+
+
+
+
+
-
-
+
+
+ 食盆清洗并擦干水渍
+
+
-
-
-
-
- -->
+
+
+
+
+
+
+ >
+
+
+
+
+
-
-
-
-
-
+
+
+ 水盆清理
+
+
-
- -->
+
+
+
+
+
+
+ >
+
-
-
+
+
+
+
+
+
+
+ 萌宠主食
+
+
-
-
-
-
-
-
- -->
+
+
+
+
+
+
+
+
+ >
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
+
+
+ 萌宠饮用水
+
+
-
-
-
-
-
-
-
- -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ >
+
-
-
+
+
+
+
+
+
+
+ 零食、药品及其他
+
+
-
-
-
-
-
-
-
-
-
-
-
-
- -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ >
+
-
-
+
+
+
+
+
+
+
+ 窝窝整理
+
+
-
-
-
-
-
-
- -->
+
+
+
+
+
+
+
+
+ >
+
-
-
+
+
+
+
+
+
+
+ 笼笼清理
+
+
-
-
-
-
-
-
- -->
+
+
+
+
+
+
+
+
+ >
+
-
-
+
+
+
+
+
+
+
+ 周边毛发
+
+
-
-
-
-
-
-
- -->
+
+
+
+
+
+
+
+
+ >
+
-
-
+
+
+
+
+
+
+
+ 屋内排泄物清理
+
+
-
-
-
-
-
-
- -->
+
+
+
+
+
+
+
+
+ >
+
-
-
+
+
+
+
+
+
+
+ 屋内呕吐物清理
+
+
-
-
-
-
-
-
- -->
+
+
+
+
+
+
+
+
+ >
+
-
-
+
+
+
+
+
+
+
+ 猫砂盆整理及猫砂更换
+
+
-
-
-
-
-
-
-
-
-
- -->
+
+
+
+
+
+
+
+
+
+
+
+ >
+
-
-
+
+
+
+
+
+
+
+ 其他需求反馈
+
+
-
- -->
+
+
+
+ >
+
-
+
-
-
+
+
+
+
+
+
+
+ 基础检查
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ >
+
-
-
+
+
+
+
+
+
+
+ 健康情况
+
+
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+ 其他
+
+
-
- -->
+
+
+
+ >
+
-
+
-
-
+
+
+
+
+
+
+
+ 萌宠清洁
+
+
-
-
-
-
-
-
-
-
- -->
+
+
+
+
+
+
+
+
+
+
+ >
+
-
-
-
-
-
+
+
+
+
+
+
+
+ 萌宠美容
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ >
-
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ >
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ >
+
-
+
-
-
+
+
+
+
+
+
+
+ 在家互动
+
+
+
+
+
-
-
+
+ >
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+ 外出遛弯
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ >
+
-
+
-
-
+
+
+
+
+
+
+
+ 垃圾携带
+
+
-
- -->
+
+
+
+ >
+
-
-
+
+
+
+
+
+
+
+ 门窗、灯、空调、水电等状态
+
+
-
-
-
-
-
- -->
+
+
+
+
+
+
+
+ >
+
-
-
+
+
+
+
+
+
+
+ 离开时萌宠安全确认
+
+
-
- -->
+
+
+
+ >
+
-
-
-
-
-
+
+
+
+
+
+
+
+ 关闭房门安全离开
+
+
-
-
-
-
-
- -->
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ >
+
-
-
+
+
+
+
+
+
+
+ 房门钥匙
+
+
-
-
-
-
-
- -->
+
+
+
+
+
+
+
+ >
+
-
-
+
+
+
+
+
+
+
+ 离开时间
+
+
-
+
+
+
+
-
-
-
+
+
+
+
@@ -1407,42 +1796,42 @@ export default {
isTop: false,
fileList: [],
model: {
- order_service_id:'',
- appliance:{option:'全部关闭',remark:'',upload:[]},
- before_status:{option:'未破坏',remark:'',upload:[]},
- pet_status:{option:'',remark:'',upload:[]},
- food_status:{food_option:'充足',water_option:'充足',remark:'',upload:[]},
- sick:{option:'',remark:'',upload:[]},
- excrement:{option:'',remark:'',upload:[]},
- other :{option:'',remark:'',upload:[]},
- food_bowl :{value:0,remark:'',upload:[]},
- basin :{value:0,remark:'',upload:[]},
- staple_food :{option:'',type_option:'',remark:'',upload:[]},
- water :{option:'',remark:'',upload:[]},
- snacks :{option:'',remark:'',upload:[]},
- wowo :{option:'',remark:'',upload:[]},
- cage :{option:'',remark:'',upload:[]},
- hair :{option:'',remark:'',upload:[]},
- pet_sick :{option:'',remark:'',upload:[]},
- pet_excrement :{option:'',remark:'',upload:[]},
- cat_litter :{option:'',remark:'',upload:[]},
- other_info :{option:'',remark:'',upload:[]},
- foundation :{option:'',remark:'',upload:[]},
- health :{option:'健康活泼',remark:'',upload:[]},
- health_other :{option:'',remark:'',upload:[]},
- pet_clean :{option:'',remark:'',upload:[]},
- before_facial :{option:'',remark:'',upload:[]},
- pet_facial :{option:'',remark:'',upload:[]},
- end_facial :{option:'',remark:'',upload:[]},
- home_play :{option:'',remark:'',upload:[]},
- out_play :{option:'',number_option:'',feces_option:'',in_home_option:'',remark:'',upload:[]},
- trash :{option:'',remark:'',upload:[]},
- appliance_info :{option:'保持原始状态',remark:'',upload:[]},
- pet_secure :{option:'',remark:'',upload:[]},
- close :{option:'已反锁',remark:'',upload:[]},
- close_mima :{option:'已反锁',remark:'',upload:[]},
- key :{option:'',remark:'',upload:[]},
- leave :'',
+ order_service_id: '',
+ appliance: {option: '全部关闭', remark: '', upload: []},
+ before_status: {option: '未破坏', remark: '', upload: []},
+ pet_status: {option: '', remark: '', upload: []},
+ food_status: {food_option: '充足', water_option: '充足', remark: '', upload: []},
+ sick: {option: '', remark: '', upload: []},
+ excrement: {option: '', remark: '', upload: []},
+ other: {option: '', remark: '', upload: []},
+ food_bowl: {value: 0, remark: '', upload: []},
+ basin: {value: 0, remark: '', upload: []},
+ staple_food: {option: '', type_option: '', remark: '', upload: []},
+ water: {option: '', remark: '', upload: []},
+ snacks: {option: '', remark: '', upload: []},
+ wowo: {option: '', remark: '', upload: []},
+ cage: {option: '', remark: '', upload: []},
+ hair: {option: '', remark: '', upload: []},
+ pet_sick: {option: '', remark: '', upload: []},
+ pet_excrement: {option: '', remark: '', upload: []},
+ cat_litter: {option: '', remark: '', upload: []},
+ other_info: {option: '', remark: '', upload: []},
+ foundation: {option: '', remark: '', upload: []},
+ health: {option: '健康活泼', remark: '', upload: []},
+ health_other: {option: '', remark: '', upload: []},
+ pet_clean: {option: '', remark: '', upload: []},
+ before_facial: {option: '', remark: '', upload: []},
+ pet_facial: {option: '', remark: '', upload: []},
+ end_facial: {option: '', remark: '', upload: []},
+ home_play: {option: '', remark: '', upload: []},
+ out_play: {option: '', number_option: '', feces_option: '', in_home_option: '', remark: '', upload: []},
+ trash: {option: '', remark: '', upload: []},
+ appliance_info: {option: '保持原始状态', remark: '', upload: []},
+ pet_secure: {option: '', remark: '', upload: []},
+ close: {option: '已反锁', remark: '', upload: []},
+ close_mima: {option: '已反锁', remark: '', upload: []},
+ key: {option: '钥匙已密封带走保管', remark: '', upload: []},
+ leave: '',
goOutTime: ''
},
images: {
@@ -1495,11 +1884,12 @@ export default {
trigger: ['blur', 'change']
},
},
+ collapseChecked:'0',
}
},
onLoad(option) {
this.model.order_service_id = option.id;
- this.model.leave = uni.$u.timeFormat(null,'yyyy-mm-dd hh:MM');
+ this.model.leave = uni.$u.timeFormat(null, 'yyyy-mm-dd hh:MM');
},
computed: {
api() {
@@ -1507,26 +1897,26 @@ export default {
},
},
methods: {
- timeConfirm(e){
- this.model.leave = uni.$u.timeFormat(e.value,'yyyy-mm-dd hh:MM');
+ timeConfirm(e) {
+ this.model.leave = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM');
},
- uploadSubmit(data,fileName = ''){
+ uploadSubmit(data, fileName = '') {
this.model[fileName].upload = data.map(item => {
- return {url:item.url,type:item.type};
+ return {url: item.url, type: item.type};
})
},
- uploadShow(data,fileName = ''){
+ uploadShow(data, fileName = '') {
let result = [];
- try{
+ try {
data.forEach(item => {
- result.push({url:item.url})
+ result.push({url: item.url})
})
- }catch (e){
+ } catch (e) {
this.images[fileName] = [];
}
this.images[fileName] = result;
},
- uploadPut(event,fileName = ''){
+ uploadPut(event, fileName = '') {
let lists = [].concat(event.file);
let fileListLen = this.images[fileName].length;
lists.map((item) => {
@@ -1547,18 +1937,18 @@ export default {
message: '',
url: res.show_path,
thumb: res.show_path,
- type:fileType
+ type: fileType
});
fileListLen++;
})
}
},
- uploadDel(fileIndex,fileName = ''){
- this.images[fileName].splice(fileIndex.index,1);
+ uploadDel(fileIndex, fileName = '') {
+ this.images[fileName].splice(fileIndex.index, 1);
},
submit() {
let that = this;
- let data = [
+ let data = [
'appliance',
'before_status',
'pet_status',
@@ -1594,10 +1984,10 @@ export default {
'close_mima',
'key',
];
- new Promise((resolve,reject)=>{
- data.forEach((item,index) => {
- that.uploadSubmit(this.images[item],item);
- if(index === data.length-1){
+ new Promise((resolve, reject) => {
+ data.forEach((item, index) => {
+ that.uploadSubmit(this.images[item], item);
+ if (index === data.length - 1) {
resolve()
}
});
@@ -1674,4 +2064,7 @@ export default {
\ No newline at end of file
diff --git a/pages/OrderConfirm/start.vue b/pages/OrderConfirm/start.vue
index 05cbfad..d2a7fcd 100644
--- a/pages/OrderConfirm/start.vue
+++ b/pages/OrderConfirm/start.vue
@@ -22,61 +22,108 @@
prop="needTime"
:custom-style="{padding:'0',paddingBottom:'30rpx;'}"
>
-
-
-
-
+
+
+
+
-
+
+
+ 需要到达时间
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+ 实际到达时间
+
+
+
+
+
+
+
-
+
+
-
+
-
-
-
-
+
+
+
+
+
+
+
+ 宠托师身份确认
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+ 手部消毒
+
+
+
+
+
+
+
-
+
+
+
+
+
+ 全身消毒
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+ 全身消毒
+
+
+
+
+
+
+
-
+
+
+
+
+
+ 服务工具
+
+
+
+
+
+
@@ -212,6 +295,9 @@ export default {
key_info :'',
service_tools:'',
},
+ shows:{
+ arrivalTime :'',
+ },
images:{
worker_confirm:[],
hand_disinfect:[],
@@ -224,7 +310,8 @@ export default {
onLoad(option) {
this.model.order_service_id = option.id;
this.getDetail(option.id);
- // this.model.arrival_time = uni.$u.timeFormat(null,'yyyy年mm月dd日 hh时MM分');
+ this.shows.arrivalTime = new Date().getTime();
+ // this.model.arrival_time = uni.$u.timeFormat(null,'yyyy-mm-dd hh:MM');
},
computed: {
api() {
@@ -238,10 +325,16 @@ export default {
})
},
timeConfirm(e){
+ this.shows.arrivalTime = e.value;
+ // this.shows.arrivalTime = uni.$u.timeFormat(e.value,'yyyy年mm月dd日 hh时MM分');
this.model.arrival_time = uni.$u.timeFormat(e.value,'yyyy-mm-dd hh:MM');
},
submit(){
let that = this;
+ if(this.model.arrival_time === ''){
+ api.error('请选择到达时间');
+ return;
+ }
let data = [
'worker_confirm',
'hand_disinfect',
diff --git a/pages/OrderDetail/components/fomItem.vue b/pages/OrderDetail/components/fomItem.vue
new file mode 100644
index 0000000..6645352
--- /dev/null
+++ b/pages/OrderDetail/components/fomItem.vue
@@ -0,0 +1,117 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{ name }}：
+
+
+
+
+
+
+
+
+
+ {{ getString(optionName !== 'value' ? data.option:(data.value?data.value +'次':'')) }}
+
+
+
+
+ {{ data.remark }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{data}}
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/OrderDetail/index.vue b/pages/OrderDetail/index.vue
index 52f390e..9f16ed6 100644
--- a/pages/OrderDetail/index.vue
+++ b/pages/OrderDetail/index.vue
@@ -194,104 +194,13 @@
开始订单
-
-
- 到达时间：
-
-
-
- {{service.start.arrival_time}}
-
-
-
-
-
- 宠物师确认：
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 手部消毒：
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 全身消毒：
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 钥匙开启/收取：
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 钥匙文字描述：
-
-
-
- {{service.start.key_info}}
-
-
-
-
-
- 服务工具：
-
-
-
- {{getString(service.start.service_tools)}}
-
-
-
+
+
+
+
+
+
+
@@ -306,801 +215,62 @@
完成订单
-
-
- 门窗、灯、空调、水电等情况：
-
-
-
- {{getString(service.end.appliance.option)}}
-
-
- {{service.end.appliance.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 入户前萌宠家居情况：
-
-
-
- {{getString(service.end.before_status.option)}}
-
-
- {{service.end.before_status.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 萌宠生活区情况：
-
-
-
- {{getString(service.end.pet_status.option)}}
-
-
- {{service.end.pet_status.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 萌宠粮剩余情况：
-
-
-
- {{getString(service.end.food_status.food_option)}}
-
-
- {{getString(service.end.food_status.water_option)}}
-
-
- {{service.end.food_status.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 是否有萌宠呕吐物：
-
-
-
- {{getString(service.end.sick.option)}}
-
-
- {{service.end.sick.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 萌宠排泄物情况：
-
-
-
- {{getString(service.end.excrement.option)}}
-
-
- {{service.end.excrement.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 其他情况反馈：
-
-
-
- {{getString(service.end.other.option)}}
-
-
- {{service.end.other.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 食盆清洗并擦干水渍：
-
-
-
- {{getString(service.end.food_bowl.food_bowl)}}
-
-
- {{service.end.food_bowl.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 水盆清理：
-
-
-
- {{getString(service.end.basin.value)}}
-
-
- {{service.end.basin.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 萌宠主食：
-
-
-
- {{getString(service.end.staple_food.option)}}
-
-
- {{service.end.staple_food.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 萌宠饮用水：
-
-
-
- {{getString(service.end.water.option)}}
-
-
- {{service.end.water.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 零食、药品及其他：
-
-
-
- {{getString(service.end.snacks.option)}}
-
-
- {{service.end.snacks.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 窝窝整理：
-
-
-
- {{getString(service.end.wowo.option)}}
-
-
- {{service.end.wowo.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 笼笼清理：
-
-
-
- {{getString(service.end.cage.option)}}
-
-
- {{service.end.cage.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 周边毛发：
-
-
-
- {{getString(service.end.hair.option)}}
-
-
- {{service.end.hair.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 屋内排泄物清理：
-
-
-
- {{getString(service.end.pet_sick.option)}}
-
-
- {{service.end.pet_sick.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 屋内呕吐物清理：
-
-
-
- {{getString(service.end.pet_excrement.option)}}
-
-
- {{service.end.pet_excrement.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 猫砂盆整理及猫砂更换：
-
-
-
- {{getString(service.end.cat_litter.option)}}
-
-
- {{service.end.cat_litter.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 其他需求反馈：
-
-
-
- {{getString(service.end.other_info.option)}}
-
-
- {{service.end.other_info.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 基础检查：
-
-
-
- {{getString(service.end.foundation.option)}}
-
-
- {{service.end.foundation.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 健康情况：
-
-
-
- {{getString(service.end.health.option)}}
-
-
- {{service.end.health.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 其他：
-
-
-
- {{getString(service.end.health_other.option)}}
-
-
- {{service.end.health_other.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 萌宠清洁：
-
-
-
- {{getString(service.end.pet_clean.option)}}
-
-
- {{service.end.pet_clean.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 洗护前原始状态：
-
-
-
- {{getString(service.end.before_facial.option)}}
-
-
- {{service.end.before_facial.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 使用产品：
-
-
-
- {{getString(service.end.pet_facial.option)}}
-
-
- {{service.end.pet_facial.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 洗护后状态：
-
-
-
- {{getString(service.end.end_facial.option)}}
-
-
- {{service.end.end_facial.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 在家互动：
-
-
-
- {{getString(service.end.home_play.option)}}
-
-
- {{service.end.home_play.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 外出遛弯：
-
-
- 排便次数
-
- {{getString(service.end.out_play.number_option)}}
-
- 便便情况
-
- {{getString(service.end.out_play.feces_option)}}
-
- 进门清洁
-
- {{getString(service.end.out_play.in_home_option)}}
-
-
-
- {{service.end.out_play.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 垃圾携带：
-
-
-
- {{getString(service.end.trash.option)}}
-
-
- {{service.end.trash.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 门窗、灯、空调、水电等状态：
-
-
-
- {{getString(service.end.appliance_info.option)}}
-
-
- {{service.end.appliance_info.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 离开时萌宠安全确认：
-
-
-
- {{getString(service.end.pet_secure.option)}}
-
-
- {{service.end.pet_secure.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 普通锁：
-
-
-
- {{getString(service.end.close.option)}}
-
-
- {{service.end.close.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 密码锁：
-
-
-
- {{getString(service.end.close_mima.option)}}
-
-
- {{service.end.close_mima.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 房门钥匙：
-
-
-
- {{getString(service.end.key.option)}}
-
-
- {{service.end.key.remark}}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{getString(service.end.out_play.number_option)}}
+
+
+
+
+
+ {{getString(service.end.out_play.feces_option)}}
+
+
+
+
+
+ {{getString(service.end.out_play.in_home_option)}}
+
+
+
+
+
+
+
+
+
+
@@ -1122,17 +292,21 @@
import FooterNav from '@/components/FooterNav/Index.vue';
import RightNav from '@/components/RightNav/Index.vue';
import MzButton from '@/components/MzButton/Index.vue';
+ import FromItem from './components/fomItem.vue';
import api from '@/utils/functions.js';
import {delPet, getDetail} from "@/api/pet";
import log from "@/utils/log";
import functions from "@/utils/functions.js";
import {orderDetail, orderServiceInfo} from "@/api/order";
+ import FomItem from "./components/fomItem.vue";
export default {
components: {
+ FomItem,
HeaderNav,
FooterNav,
RightNav,
- MzButton
+ MzButton,
+ FromItem
},
data() {
return {
@@ -1209,17 +383,12 @@
this.imageUrl = imgUrl;
this.imageShow = true;
},
- getString(value){
+ getString(value) {
let typeStr = typeof value;
- if(typeStr === 'string'){
+ if (typeStr === 'string') {
return value;
- }else{
- console.log(typeStr)
- // if(value.length > 0){
- // return value.join(',');
- // }else{
- // return '';
- // }
+ } else if (typeStr === 'object' || typeStr === 'array') {
+ return value.join(',');
}
},
delPet(){
diff --git a/pages/OrderPage/index.vue b/pages/OrderPage/index.vue
index 52700e8..6cbb209 100644
--- a/pages/OrderPage/index.vue
+++ b/pages/OrderPage/index.vue
@@ -414,7 +414,7 @@
list: ['未付款', '待评价', '已付款'],
addTimeLists: [
[
- {label:'标准时长',value:0},
+ {label:'不加时',value:0},
{label:'1小时',value:1},
{label:'2小时',value:2},
{label:'3小时',value:3},
@@ -491,6 +491,7 @@
is_worker:false,
sign:'',
timeLineList:[],
+ store_id:'',
}
},
onLoad(options) {
@@ -520,7 +521,7 @@
},
methods: {
getTimeLine(){
- getConfig({sign:'work_time'}).then(res => {
+ getConfig('work_time').then(res => {
this.timeLineList = res.data.map(item => {
item.checked = false;
return item;
@@ -577,14 +578,15 @@
if(this.isPay){
return;
}
- uni.showLoading('加载中');
+ uni.showLoading({title:'加载中'});
if(
this.address
&&this.timeList.length>0
&&this.petChecked.length>0
&&this.basicServiceChecked!==''
){
- if(this.addServiceList[0].store_id){
+ if(!this.store_id){
+ uni.hideLoading();
api.error('所选位置没有店铺');
return;
}
@@ -606,7 +608,7 @@
}),
basic_service:this.basicServiceChecked,
pet_ids: this.petChecked.map(res => res.id).join(','),
- store_id:this.addServiceList[0].store_id,
+ store_id:this.store_id,
user_coupon_id: coupons || 0,
add_time:this.add_time || 0,
}).then(res => {
@@ -670,7 +672,7 @@
}),
basic_service:this.basicServiceChecked,
pet_ids: this.petChecked.map(res => res.id).join(','),
- store_id:this.addServiceList[0].store_id,
+ store_id:this.store_id,
user_coupon_id:coupons || 0,
add_time:this.add_time || 0,
}).then(res => {
@@ -751,7 +753,8 @@
this.checkOrderData();
},
getStoreServiceList(){
- getStoreService({address_id: this.address.id,order_type:1}).then(res => {
+ getStoreService({address_id: this.address.id,order_type:this.type}).then(res => {
+ this.store_id = res.data.store_id;
this.addServiceList = res.data.add_service.map(item => {
item.number = 0;
return item;
diff --git a/pages/PetDetail/index.vue b/pages/PetDetail/index.vue
index c80a29c..b161a56 100644
--- a/pages/PetDetail/index.vue
+++ b/pages/PetDetail/index.vue
@@ -159,7 +159,7 @@
-
+
diff --git a/pages/UserCoupons/components/index.scss b/pages/UserCoupons/components/index.scss
index 79f9120..3782aba 100644
--- a/pages/UserCoupons/components/index.scss
+++ b/pages/UserCoupons/components/index.scss
@@ -64,12 +64,12 @@
align-items: flex-end;
justify-content: center;
.coupons-big-title{
- text-align: center;
- font-size: 90rpx;
- font-family: Source Han Sans CN;
- font-weight: 800;
- color: #FFFFFF;
- line-height: 1;
+ //text-align: center;
+ //font-size: 90rpx;
+ //font-family: Source Han Sans CN;
+ //font-weight: 800;
+ //color: #FFFFFF;
+ //line-height: 1;
text-shadow: 0rpx 0rpx 14rpx rgba(209,145,70,0.21);
}
.coupons-big-desc{
diff --git a/pages/UserCoupons/index.vue b/pages/UserCoupons/index.vue
index fdd9e90..8b77bdd 100644
--- a/pages/UserCoupons/index.vue
+++ b/pages/UserCoupons/index.vue
@@ -17,7 +17,9 @@
- {{item.price}}
+
+
+
元
diff --git a/pages/UserOrderPage/index.vue b/pages/UserOrderPage/index.vue
index 2491afc..1d59c81 100644
--- a/pages/UserOrderPage/index.vue
+++ b/pages/UserOrderPage/index.vue
@@ -8,7 +8,7 @@
top:topStyle
}">
-
+ :lines="1" line-height="32">
{{ server }}
@@ -154,6 +154,9 @@
},{
name:'待服务',
value:'0',
+ },{
+ name:'服务中',
+ value:'1',
},{
name:'已完成',
value:'2',
diff --git a/uni_modules/mz-card/changelog.md b/uni_modules/mz-card/changelog.md
new file mode 100644
index 0000000..b31341b
--- /dev/null
+++ b/uni_modules/mz-card/changelog.md
@@ -0,0 +1,2 @@
+## 1.0.0
+mz-sticky 吸顶
diff --git a/uni_modules/mz-card/components/mz-card/mz-card.vue b/uni_modules/mz-card/components/mz-card/mz-card.vue
new file mode 100644
index 0000000..0bab6ff
--- /dev/null
+++ b/uni_modules/mz-card/components/mz-card/mz-card.vue
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
diff --git a/uni_modules/mz-card/package.json b/uni_modules/mz-card/package.json
new file mode 100644
index 0000000..635a606
--- /dev/null
+++ b/uni_modules/mz-card/package.json
@@ -0,0 +1,83 @@
+{
+ "id": "mz-card",
+ "displayName": "mz-card 卡片",
+ "version": "1.0.1",
+ "description": "mz-card",
+ "keywords": [
+ "卡片"
+ ],
+ "repository": "",
+ "engines": {
+ "HBuilderX": "^3.1.0"
+ },
+ "dcloudext": {
+ "type": "component-vue",
+ "sale": {
+ "regular": {
+ "price": "0.00"
+ },
+ "sourcecode": {
+ "price": "0.00"
+ }
+ },
+ "contact": {
+ "qq": ""
+ },
+ "declaration": {
+ "ads": "无",
+ "data": "插件不采集任何数据",
+ "permissions": "无"
+ },
+ "npmurl": ""
+ },
+ "uni_modules": {
+ "dependencies": [
+
+ ],
+ "encrypt": [],
+ "platforms": {
+ "cloud": {
+ "tcb": "y",
+ "aliyun": "y"
+ },
+ "client": {
+ "Vue": {
+ "vue2": "y",
+ "vue3": "y"
+ },
+ "App": {
+ "app-vue": "y",
+ "app-nvue": "y"
+ },
+ "H5-mobile": {
+ "Safari": "y",
+ "Android Browser": "y",
+ "微信浏览器(Android)": "y",
+ "QQ浏览器(Android)": "y"
+ },
+ "H5-pc": {
+ "Chrome": "y",
+ "IE": "y",
+ "Edge": "y",
+ "Firefox": "y",
+ "Safari": "y"
+ },
+ "小程序": {
+ "微信": "y",
+ "阿里": "y",
+ "百度": "y",
+ "字节跳动": "y",
+ "QQ": "y",
+ "钉钉": "u",
+ "快手": "u",
+ "飞书": "u",
+ "京东": "u"
+ },
+ "快应用": {
+ "华为": "u",
+ "联盟": "u"
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/uni_modules/mz-card/readme.md b/uni_modules/mz-card/readme.md
new file mode 100644
index 0000000..e963207
--- /dev/null
+++ b/uni_modules/mz-card/readme.md
@@ -0,0 +1,3 @@
+## Sticky 吸顶
+
+> **组件名：mz-sticky**
\ No newline at end of file