From db3c7421bee3beea9f3b3cd4210aa141ae207195 Mon Sep 17 00:00:00 2001
From: 396316021 <396316021@qq.com>
Date: Wed, 11 Oct 2023 19:12:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/pet.js                 |  2 +-
 pages/OrderConfirm/end.vue |  8 ++++----
 pages/OrderPage/index.vue  | 13 +++++++++----
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/api/pet.js b/api/pet.js
index 376837c..544da0f 100644
--- a/api/pet.js
+++ b/api/pet.js
@@ -12,7 +12,7 @@ export function getMyPets(page) {
         method: 'post',
         data: {
             page: page,
-            limit: 10
+            limit: 100
         }
     })
 }
diff --git a/pages/OrderConfirm/end.vue b/pages/OrderConfirm/end.vue
index 3c0ded3..1e1637c 100644
--- a/pages/OrderConfirm/end.vue
+++ b/pages/OrderConfirm/end.vue
@@ -308,7 +308,7 @@
                 <u-text size="30" text="食盆清洗并擦干水渍"></u-text>
               </view>
               <view style="margin-bottom: 30rpx;">
-                <uv-number-box v-model="model.food_bowl.value"></uv-number-box>
+                <uv-number-box min="0" v-model="model.food_bowl.value"></uv-number-box>
               </view>
               <uv-upload
                   accept="media"
@@ -342,7 +342,7 @@
                 <u-text size="30" text="水盆清理"></u-text>
               </view>
               <view style="margin-bottom: 30rpx;">
-                <uv-number-box v-model="model.basin.value"></uv-number-box>
+                <uv-number-box min="0" v-model="model.basin.value"></uv-number-box>
               </view>
               <uv-upload
                   accept="media"
@@ -1414,8 +1414,8 @@ export default {
         sick:{option:'',remark:'',upload:[]},
         excrement:{option:'',remark:'',upload:[]},
         other :{option:'',remark:'',upload:[]},
-        food_bowl :{value:'',remark:'',upload:[]},
-        basin :{value:'',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:[]},
diff --git a/pages/OrderPage/index.vue b/pages/OrderPage/index.vue
index f0ecca0..1691661 100644
--- a/pages/OrderPage/index.vue
+++ b/pages/OrderPage/index.vue
@@ -138,7 +138,7 @@
               <image mode="heightFix" class="img" :src="staticImage.selectPet"/>
             </view>
             <view class="order-item pet-page-item row">
-              <PetPage ref="petPage" class="pet-page" :showCancel="true" type="lists" @change="selectPet" @del="delPet"></PetPage>
+              <PetPage ref="petPage" class="pet-page" :showCancel="true" type="lists" :auto-back="false" @change="selectPet" @del="delPet"></PetPage>
             </view>
 
 
@@ -531,7 +531,7 @@
           this.sign = res.data.sign;
         });
         log('orderData',data);
-        api.success('保存成功')
+        api.success('保存成功,请分享页面给帮填用户')
       },
       getCacheOrder(){
         let data = {};
@@ -556,6 +556,7 @@
       },
       addTimeConfirm(e){
         this.add_time = e.value[0].value;
+        this.checkOrderData();
       },
       addServiceChange(e){
         this.addServiceList[e].checked = !this.addServiceList[e].checked;
@@ -590,7 +591,8 @@
             basic_service:this.basicServiceChecked,
             pet_ids: this.petChecked.map(res => res.id).join(','),
             store_id:this.addServiceList[0].store_id,
-            user_coupon_id: coupons || 0
+            user_coupon_id: coupons || 0,
+            add_time:this.add_time || 0,
           }).then(res => {
             console.log(res)
             if(this.price.price>0){
@@ -607,6 +609,8 @@
               uni.redirectTo({url:'/pages/Order/done?type=order'});
               uni.hideLoading();
             }
+          }).catch(err => {
+            this.isPay = false;
           });
         }else{
           uni.hideLoading();
@@ -651,7 +655,8 @@
             basic_service:this.basicServiceChecked,
             pet_ids: this.petChecked.map(res => res.id).join(','),
             store_id:this.addServiceList[0].store_id,
-            user_coupon_id:coupons || 0
+            user_coupon_id:coupons || 0,
+            add_time:this.add_time || 0,
           }).then(res => {
             console.log('res',res)
             this.price = res.data;