From f9581f9c4314c99729b9c8a0b761dfc36c9d87a0 Mon Sep 17 00:00:00 2001
From: 396316021 <396316021@qq.com>
Date: Mon, 23 Oct 2023 18:14:52 +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

---
 components/PetPage/index.vue              | 59 +++++++++++------
 pages/ChatDetail/index.vue                |  2 +-
 pages/FeedLog/index.vue                   | 56 +++++++++++-----
 pages/OrderConfirm/end.vue                | 20 +++---
 pages/OrderConfirm/start.vue              |  8 ++-
 pages/OrderDetail/index.vue               | 80 +++++++++++------------
 pages/OrderPage/index.vue                 | 31 +++++----
 pages/PetDetail/index.vue                 |  6 +-
 pages/UserOrderPage/components/index.scss |  9 ++-
 pages/UserOrderPage/index.vue             | 11 +++-
 10 files changed, 174 insertions(+), 108 deletions(-)

diff --git a/components/PetPage/index.vue b/components/PetPage/index.vue
index 77aa7d9..01281c2 100644
--- a/components/PetPage/index.vue
+++ b/components/PetPage/index.vue
@@ -207,9 +207,9 @@
       </view>
       <view class="item-content row">
         <view class="item-content-text row">
-          <u-upload
-              width="160"
-              height="160"
+          <uv-upload
+              width="160rpx"
+              height="160rpx"
               :fileList="avatarList"
               name="img"
               multiple
@@ -218,7 +218,7 @@
               uploadIcon="plus"
               @afterRead="afterAvatarRead"
               @delete="deleteAvatar"
-          ></u-upload>
+          ></uv-upload>
         </view>
       </view>
     </view>
@@ -228,9 +228,9 @@
       </view>
       <view class="item-content row">
         <view class="item-content-text row">
-          <u-upload
-              width="160"
-              height="160"
+          <vu-upload
+              width="160rpx"
+              height="160rpx"
               :fileList="imagesList"
               name="img"
               multiple
@@ -239,7 +239,7 @@
               uploadIcon="plus"
               @afterRead="afterImgRead"
               @delete="deleteImg"
-          ></u-upload>
+          ></vu-upload>
         </view>
       </view>
     </view>
@@ -250,8 +250,8 @@
 <!--      <view class="item-content row">-->
 <!--        <view class="item-content-text row">-->
 <!--          <u-upload-->
-<!--              width="160"-->
-<!--              height="160"-->
+<!--              width="160rpx"-->
+<!--              height="160rpx"-->
 <!--              :fileList="backgroundList"-->
 <!--              name="img"-->
 <!--              multiple-->
@@ -271,9 +271,10 @@
       </view>
       <view class="item-content row">
         <view class="item-content-text row">
-          <u-upload
-              width="160"
-              height="160"
+          <uv-upload
+              accept="video"
+              width="160rpx"
+              height="160rpx"
               :fileList="videoList"
               name="img"
               multiple
@@ -282,7 +283,7 @@
               uploadIcon="plus"
               @afterRead="afterVideoRead"
               @delete="deleteVideo"
-          ></u-upload>
+          ></uv-upload>
         </view>
       </view>
     </view>
@@ -391,14 +392,14 @@
       :value="data.last_vaccine_time"
       ref="vaccinePicker"
       mode="year-month"
-      minDate="1970-01-01"
+      minDate="2000-01-01"
       @confirm="vaccineConfirm"
   ></uv-datetime-picker>
   <uv-datetime-picker
       :value="data.last_insect_repellent_time"
       ref="insectRepellentPicker"
       mode="year-month"
-      minDate="1970-01-01"
+      minDate="2000-01-01"
       @confirm="insectRepellentConfirm"
   ></uv-datetime-picker>
   <uv-picker :columns="[homeList]" ref="pickerHome" key-name="name" title="是否有户口" round="20rpx" @confirm="homeSelect"></uv-picker>
@@ -506,14 +507,12 @@
           <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="" @click="selectPet(index)">
                 <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>
@@ -534,6 +533,15 @@
                 </view>
               </view>
             </template>
+            <template #title>
+              <u-text size="32" :text="item.name" @click="selectPet(index)"></u-text>
+            </template>
+            <template #label>
+              <u-text :text="item.type_name" size="28" @click="selectPet(index)"></u-text>
+              <view style="display: inline-block;">
+                <u-text text="编辑资料" size="28" color="#4DC3B8" suffix-icon="arrow-right" icon-style="font-size:28rpx;color:#4DC3B8;" @click="api.navTo('/pages/Pet/create?id='+item.id)"></u-text>
+              </view>
+            </template>
           </u-cell>
         </u-cell-group>
         <u-cell-group custom-style="max-height:700rpx;overflow:auto;" v-else>
@@ -565,6 +573,11 @@
 
   export default{
 		name:'PetPage',
+    computed: {
+      api() {
+        return api
+      },
+    },
 		props:{
 			title:{
 				type:String,
@@ -680,7 +693,7 @@
 		},
     mounted() {
       this.data.birthday = uni.$u.timeFormat(null,'yyyy-mm-dd');
-      this.data.last_insect_repellent_time = this.data.last_vaccine_time = uni.$u.timeFormat(null,'yyyy-mm');
+      // this.data.last_insect_repellent_time = this.data.last_vaccine_time = uni.$u.timeFormat(null,'yyyy-mm');
       if(this.petId!==0){
         this.getDetail(this.petId)
       }
@@ -689,6 +702,12 @@
       }
     },
 		methods: {
+      api() {
+        return api
+      },
+      closePop(){
+        this.$refs.petPopup.close();
+      },
       openPet(){
         this.status = 'loadmore';
         this.getMyPets();
diff --git a/pages/ChatDetail/index.vue b/pages/ChatDetail/index.vue
index 81bf77c..e78af03 100644
--- a/pages/ChatDetail/index.vue
+++ b/pages/ChatDetail/index.vue
@@ -30,7 +30,7 @@
           <view class="detail-input-group row">
 
             <view class="col">
-              <input class="detail-input" v-model="message" type="text"/>
+              <input maxlength="-1" class="detail-input" v-model="message" type="text"/>
             </view>
             <MzButton
                 title="发送"
diff --git a/pages/FeedLog/index.vue b/pages/FeedLog/index.vue
index 5e7df3f..18549c4 100644
--- a/pages/FeedLog/index.vue
+++ b/pages/FeedLog/index.vue
@@ -47,7 +47,10 @@
                 title="水碗饭碗"
             >
               <u-textarea border="none" :disabled="(type !== 'create')" v-model="detail.feedlist.meal" placeholder="请输入内容" ></u-textarea>
-              <u-upload
+              <uv-upload
+                  width="160rpx"
+                  height="160rpx"
+                  accept="media"
                   :fileList="images.meal_imgs"
                   name="1"
                   multiple
@@ -59,7 +62,7 @@
               >
                 <u-image :src="staticImage.feedUpload"
                        mode="widthFix" width="130rpx" height="130rpx"></u-image>
-              </u-upload>
+              </uv-upload>
             </u-collapse-item>
 
           </u-collapse>
@@ -69,7 +72,10 @@
                 title="主食情况"
             >
               <u-textarea border="none" :disabled="(type !== 'create')" v-model="detail.feedlist.food" placeholder="请输入内容" ></u-textarea>
-              <u-upload
+              <uv-upload
+                  width="160rpx"
+                  height="160rpx"
+                  accept="media"
                   :fileList="images.food_imgs"
                   name="1"
                   multiple
@@ -81,7 +87,7 @@
               >
                 <u-image :src="staticImage.feedUpload"
                        mode="widthFix" width="130rpx" height="130rpx"></u-image>
-              </u-upload>
+              </uv-upload>
             </u-collapse-item>
 
           </u-collapse>
@@ -91,7 +97,10 @@
                 title="零食小吃"
             >
               <u-textarea border="none" :disabled="(type !== 'create')" v-model="detail.feedlist.snack" placeholder="请输入内容" ></u-textarea>
-              <u-upload
+              <uv-upload
+                  width="160rpx"
+                  height="160rpx"
+                  accept="media"
                   :fileList="images.snack_imgs"
                   name="1"
                   multiple
@@ -103,7 +112,7 @@
               >
                 <u-image :src="staticImage.feedUpload"
                        mode="widthFix" width="130rpx" height="130rpx"></u-image>
-              </u-upload>
+              </uv-upload>
             </u-collapse-item>
 
           </u-collapse>
@@ -113,7 +122,10 @@
                 title="喂药擦药"
             >
               <u-textarea border="none" :disabled="(type !== 'create')" v-model="detail.feedlist.drug" placeholder="请输入内容" ></u-textarea>
-              <u-upload
+              <uv-upload
+                  width="160rpx"
+                  height="160rpx"
+                  accept="media"
                   :fileList="images.drug_imgs"
                   name="1"
                   multiple
@@ -125,7 +137,7 @@
               >
                 <u-image :src="staticImage.feedUpload"
                        mode="widthFix" width="130rpx" height="130rpx"></u-image>
-              </u-upload>
+              </uv-upload>
             </u-collapse-item>
 
           </u-collapse>
@@ -135,7 +147,10 @@
                 title="需要注意"
             >
               <u-textarea border="none" :disabled="(type !== 'create')" v-model="detail.feedlist.note" placeholder="请输入内容" ></u-textarea>
-              <u-upload
+              <uv-upload
+                  width="160rpx"
+                  height="160rpx"
+                  accept="media"
                   :fileList="images.note_imgs"
                   name="1"
                   multiple
@@ -147,7 +162,7 @@
               >
                 <u-image :src="staticImage.feedUpload"
                        mode="widthFix" width="130rpx" height="130rpx"></u-image>
-              </u-upload>
+              </uv-upload>
             </u-collapse-item>
 
           </u-collapse>
@@ -157,7 +172,10 @@
                 title="用品位置"
             >
               <u-textarea border="none" :disabled="(type !== 'create')" v-model="detail.feedlist.goods" placeholder="请输入内容" ></u-textarea>
-              <u-upload
+              <uv-upload
+                  width="160rpx"
+                  height="160rpx"
+                  accept="media"
                   :fileList="images.goods_imgs"
                   name="1"
                   multiple
@@ -169,7 +187,7 @@
               >
                 <u-image :src="staticImage.feedUpload"
                        mode="widthFix" width="130rpx" height="130rpx"></u-image>
-              </u-upload>
+              </uv-upload>
             </u-collapse-item>
 
           </u-collapse>
@@ -179,7 +197,10 @@
                 title="外出路线"
             >
               <u-textarea border="none" :disabled="(type !== 'create')" v-model="detail.feedlist.line" placeholder="请输入内容" ></u-textarea>
-              <u-upload
+              <uv-upload
+                  width="160rpx"
+                  height="160rpx"
+                  accept="media"
                   :fileList="images.line_imgs"
                   name="1"
                   multiple
@@ -191,7 +212,7 @@
               >
                 <u-image :src="staticImage.feedUpload"
                        mode="widthFix" width="130rpx" height="130rpx"></u-image>
-              </u-upload>
+              </uv-upload>
             </u-collapse-item>
 
           </u-collapse>
@@ -201,7 +222,10 @@
                 title="其它事项"
             >
               <u-textarea border="none" :disabled="(type !== 'create')" v-model="detail.feedlist.other" placeholder="请输入内容" ></u-textarea>
-              <u-upload
+              <uv-upload
+                  width="160rpx"
+                  height="160rpx"
+                  accept="media"
                   :fileList="images.other_imgs"
                   name="1"
                   multiple
@@ -213,7 +237,7 @@
               >
                 <u-image :src="staticImage.feedUpload"
                        mode="widthFix" width="130rpx" height="130rpx"></u-image>
-              </u-upload>
+              </uv-upload>
             </u-collapse-item>
 
           </u-collapse>
diff --git a/pages/OrderConfirm/end.vue b/pages/OrderConfirm/end.vue
index 1e1637c..5a6623e 100644
--- a/pages/OrderConfirm/end.vue
+++ b/pages/OrderConfirm/end.vue
@@ -1061,7 +1061,7 @@
                   :fileList="images.home_play"
                   name="1"
                   multiple
-                  :maxCount="10"
+                  :maxCount="20"
                   uploadIcon="plus"
                   @delete="(res) => {uploadDel(res,'home_play')}"
                   @afterRead="(res) => {uploadPut(res,'home_play')}"
@@ -1254,7 +1254,7 @@
               <view class="form-label">
                 <u-text size="24" color="#999" text="普通锁"></u-text>
               </view>
-              <u-radio-group v-model="model.close.option" size="40">
+              <u-radio-group v-model="model.close.option" size="40" >
                 <u-radio name="已反锁" label="已反锁" labelSize="28" icon-size="28" active-color="#4EC2B7"
                             custom-style="margin-right:30rpx;margin-bottom:30rpx;"></u-radio>
                 <u-radio name="已关门未反锁" label="已关门未反锁" labelSize="28" icon-size="28" active-color="#4EC2B7"
@@ -1407,10 +1407,10 @@ export default {
       fileList: [],
       model: {
         order_service_id:'',
-        appliance:{option:'',remark:'',upload:[]},
-        before_status:{option:'',remark:'',upload:[]},
+        appliance:{option:'全部关闭',remark:'',upload:[]},
+        before_status:{option:'未破坏',remark:'',upload:[]},
         pet_status:{option:'',remark:'',upload:[]},
-        food_status:{food_option:'',water_option:'',remark:'',upload:[]},
+        food_status:{food_option:'充足',water_option:'充足',remark:'',upload:[]},
         sick:{option:'',remark:'',upload:[]},
         excrement:{option:'',remark:'',upload:[]},
         other :{option:'',remark:'',upload:[]},
@@ -1427,7 +1427,7 @@ export default {
         cat_litter :{option:'',remark:'',upload:[]},
         other_info :{option:'',remark:'',upload:[]},
         foundation :{option:'',remark:'',upload:[]},
-        health :{option:'',remark:'',upload:[]},
+        health :{option:'健康活泼',remark:'',upload:[]},
         health_other :{option:'',remark:'',upload:[]},
         pet_clean :{option:'',remark:'',upload:[]},
         before_facial :{option:'',remark:'',upload:[]},
@@ -1436,10 +1436,10 @@ export default {
         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:[]},
+        appliance_info :{option:'保持原始状态',remark:'',upload:[]},
         pet_secure :{option:'',remark:'',upload:[]},
-        close :{option:'',remark:'',upload:[]},
-        close_mima :{option:'',remark:'',upload:[]},
+        close :{option:'已反锁',remark:'',upload:[]},
+        close_mima :{option:'已反锁',remark:'',upload:[]},
         key :{option:'',remark:'',upload:[]},
         leave :'',
         goOutTime: ''
@@ -1498,7 +1498,7 @@ export default {
   },
   onLoad(option) {
     this.model.order_service_id = option.id;
-    // this.model.goOutTime = uni.$u.timeFormat(null,'yyyy年mm月dd日 hh时MM分');
+    this.model.leave = uni.$u.timeFormat(null,'yyyy-mm-dd hh:MM');
   },
   computed: {
     api() {
diff --git a/pages/OrderConfirm/start.vue b/pages/OrderConfirm/start.vue
index 24f6525..05cbfad 100644
--- a/pages/OrderConfirm/start.vue
+++ b/pages/OrderConfirm/start.vue
@@ -184,6 +184,7 @@ import HeaderNav from "@/components/HeaderNav/Index.vue";
 import MzButton from "@/components/MzButton/Index.vue";
 import {orderDone, orderStart} from "@/api/order";
 import {editFeed} from "@/api/pet";
+import {orderDetail} from "../../api/order";
 
 export default {
   components: {
@@ -222,7 +223,7 @@ export default {
   },
   onLoad(option) {
     this.model.order_service_id = option.id;
-    this.model.needTime = uni.$u.timeFormat(null,'yyyy-mm-dd hh:MM');
+    this.getDetail(option.id);
     // this.model.arrival_time = uni.$u.timeFormat(null,'yyyy年mm月dd日 hh时MM分');
   },
   computed: {
@@ -231,6 +232,11 @@ export default {
     },
   },
   methods: {
+    getDetail(id){
+      orderDetail(id).then(data => {
+        this.model.needTime = uni.$u.timeFormat(data.data.do_date,'yyyy年mm月dd日') + data.data.do_time;
+      })
+    },
     timeConfirm(e){
       this.model.arrival_time = uni.$u.timeFormat(e.value,'yyyy-mm-dd hh:MM');
     },
diff --git a/pages/OrderDetail/index.vue b/pages/OrderDetail/index.vue
index ee3098e..52f390e 100644
--- a/pages/OrderDetail/index.vue
+++ b/pages/OrderDetail/index.vue
@@ -212,10 +212,10 @@
               <view class="row">
                 <view class="col-4" v-for="(item,index) in service.start.worker_confirm">
                   <view class="item-image" v-if="item.type === 'image'">
-                    <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
+                    <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFill" width="100%" height="200rpx"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
@@ -232,7 +232,7 @@
                     <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
@@ -246,10 +246,10 @@
               <view class="row">
                 <view class="col-4" v-for="(item,index) in service.start.body_disinfect">
                   <view class="item-image" v-if="item.type === 'image'">
-                    <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
+                    <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFill" width="100%" height="200rpx"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
@@ -266,7 +266,7 @@
                     <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
@@ -323,7 +323,7 @@
                     <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
@@ -346,7 +346,7 @@
                     <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
@@ -369,7 +369,7 @@
                     <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
@@ -395,7 +395,7 @@
                     <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
@@ -418,7 +418,7 @@
                     <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
@@ -441,7 +441,7 @@
                     <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
@@ -464,7 +464,7 @@
                     <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
@@ -487,7 +487,7 @@
                     <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
@@ -510,7 +510,7 @@
                     <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
@@ -533,7 +533,7 @@
                     <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
@@ -556,7 +556,7 @@
                     <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
@@ -579,7 +579,7 @@
                     <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
@@ -602,7 +602,7 @@
                     <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
@@ -625,7 +625,7 @@
                     <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
@@ -648,7 +648,7 @@
                     <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
@@ -671,7 +671,7 @@
                     <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
@@ -694,7 +694,7 @@
                     <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
@@ -717,7 +717,7 @@
                     <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
@@ -740,7 +740,7 @@
                     <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
@@ -763,7 +763,7 @@
                     <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
@@ -786,7 +786,7 @@
                     <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
@@ -809,7 +809,7 @@
                     <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
@@ -832,7 +832,7 @@
                     <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
@@ -855,7 +855,7 @@
                     <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
@@ -878,7 +878,7 @@
                     <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
@@ -901,7 +901,7 @@
                     <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
@@ -924,7 +924,7 @@
                     <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
@@ -957,7 +957,7 @@
                     <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
@@ -980,7 +980,7 @@
                     <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
@@ -1003,7 +1003,7 @@
                     <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
@@ -1026,7 +1026,7 @@
                     <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
@@ -1049,7 +1049,7 @@
                     <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
@@ -1072,7 +1072,7 @@
                     <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
@@ -1095,7 +1095,7 @@
                     <u-image @click="showBigImage(item.url)" :src="item.url" mode="widthFix" width="100%"></u-image>
                   </view>
                   <view class="item-video" v-else>
-                    <video mode="aspectFill" :src="item.url" style="width:100%;height:100rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
+                    <video mode="aspectFill" :src="item.url" style="width:100%;height:200rpx;border-radius: 16rpx;border:2rpx solid #262626;"></video>
                   </view>
                 </view>
               </view>
diff --git a/pages/OrderPage/index.vue b/pages/OrderPage/index.vue
index 1691661..4043314 100644
--- a/pages/OrderPage/index.vue
+++ b/pages/OrderPage/index.vue
@@ -471,7 +471,7 @@
         doTimeList:[
           {
             label:'上午',
-            value:'09:00-12:00'
+            value:'09:00-12:01'
           },{
             label:'下午',
             value:'13:30-17:00'
@@ -489,6 +489,7 @@
         add_time:0,
         is_worker:false,
         sign:'',
+        timeLineList:[],
 			}
 		},
 		onLoad(options) {
@@ -498,6 +499,7 @@
       if(this.sign!=='')this.getCacheOrder();
       let workerToken = uni.getStorageSync('workerToken');
       if(workerToken)this.is_worker = true;
+      this.getTimeLine();
 		},
     updated() {
 
@@ -506,6 +508,7 @@
       if(!this.isPay && this.sign === ''){
         this.getDefaultAddress();
         this.getUserCoupons();
+        this.$refs.petPage.closePop()
       }
     },
     onShareAppMessage() {
@@ -515,6 +518,14 @@
       }
     },
 		methods: {
+      getTimeLine(){
+        getConfig({sign:'work_time'}).then(res => {
+          this.timeLineList = res.data.map(item => {
+            item.checked = false;
+            return item;
+          })
+        })
+      },
       setCacheOrder(){
         let data = {};
         data.type = this.type;
@@ -572,6 +583,10 @@
             &&this.petChecked.length>0
             &&this.basicServiceChecked!==''
         ){
+          if(this.addServiceList[0].store_id){
+            api.error('所选位置没有店铺');
+            return;
+          }
           this.isPay = true;
 
           let coupons = this.coupons.map(item => {
@@ -773,19 +788,7 @@
         this.timeListTemp = selected.map(item => {
           return {
             date:item,
-            time:[{
-              label:'上午',
-              value:'09:00-12:00',
-              checked:false,
-            },{
-              label:'下午',
-              value:'13:30-17:00',
-              checked:false,
-            },{
-              label:'晚上',
-              value:'07:00-19:30',
-              checked:false,
-            },]
+            time:this.timeLineList
           }
         });
         // this.timeListTemp = this.timeList;
diff --git a/pages/PetDetail/index.vue b/pages/PetDetail/index.vue
index 27e5cac..c80a29c 100644
--- a/pages/PetDetail/index.vue
+++ b/pages/PetDetail/index.vue
@@ -100,7 +100,7 @@
               最近狂犬疫苗时间：
             </view>
             <view class="item-content">
-                {{ $u.timeFormat(pet.last_vaccine_time, 'yyyy-mm') }}
+                {{ pet.last_vaccine_time !== null ? $u.timeFormat(pet.last_vaccine_time, 'yyyy-mm'):'无' }}
             </view>
           </view>
 
@@ -109,10 +109,10 @@
               <image class="img" mode="widthFix" :src="staticImage.petQc"/>
             </view>
             <view class="item-title">
-              最近驱虫时间
+              最近驱虫时间：
             </view>
             <view class="item-content">
-              {{ $u.timeFormat(pet.last_insect_repellent_time, 'yyyy-mm') }}
+              {{ pet.last_vaccine_time !== null ? $u.timeFormat(pet.last_insect_repellent_time, 'yyyy-mm'):'无' }}
             </view>
           </view>
 
diff --git a/pages/UserOrderPage/components/index.scss b/pages/UserOrderPage/components/index.scss
index 2ac9374..ae07e63 100644
--- a/pages/UserOrderPage/components/index.scss
+++ b/pages/UserOrderPage/components/index.scss
@@ -211,13 +211,20 @@
 					padding-top:30rpx;
 					justify-content: center;
 				}
-				.card-button{
+
+				.card-button {
 					&:nth-child(1){
 						padding-right:23rpx;
 					}
 					&:nth-child(2){
+						padding-left:0rpx;
+						padding-right:0rpx;
+					}
+					&:nth-child(3){
 						padding-left:23rpx;
 					}
+
+					flex: 0 0 30%;
 				}
 			}
 		}
diff --git a/pages/UserOrderPage/index.vue b/pages/UserOrderPage/index.vue
index 6b99761..2491afc 100644
--- a/pages/UserOrderPage/index.vue
+++ b/pages/UserOrderPage/index.vue
@@ -81,14 +81,21 @@
 											title="立即沟通"
 											font-color="#3E3221"
 											button-color="#F7E1C3"
-											button-width="255rpx"></MzButton>
+											button-width="100%"></MzButton>
 								</view>
 								<view class="card-button" @click="navTo('/pages/FeedLog/index?pet_id=' + item.pet_id)">
 									<MzButton
 											title="喂养档案"
 											font-color="#FFFFFF"
 											button-color="#4DC3B8"
-											button-width="255rpx"></MzButton>
+											button-width="100%"></MzButton>
+								</view>
+								<view class="card-button" @click="navTo('/pages/OrderDetail/index?id='+item.id)">
+									<MzButton
+											title="订单详情"
+											font-color="#3E3221"
+											button-color="#fff"
+											button-width="100%"></MzButton>
 								</view>
 							</view>
 						</view>