diff --git a/api/other.js b/api/other.js
index b2cb2ba..f624eca 100644
--- a/api/other.js
+++ b/api/other.js
@@ -52,4 +52,30 @@ export function seizeChat(data){
         method: "post",
         data:data
     })
+}
+/**
+ * 按钮未读信息统计
+ * 1=用户，2=宠托师，3=客服
+ * @param data
+ * @returns {Promise | Promise<unknown>}
+ */
+export function allChatCount(data){
+    return request({
+        url:`/user/all-chat-count`,
+        method: "get",
+        data:data
+    })
+}
+
+/**
+ * 待服务订单统计
+ * @param data
+ * @returns {Promise | Promise<unknown>}
+ */
+export function waitOrderCount(data){
+    return request({
+        url:`/order/wait-order-count`,
+        method: "get",
+        data:data
+    })
 }
\ No newline at end of file
diff --git a/components/FooterNav/index.vue b/components/FooterNav/index.vue
index 6fd15aa..ad8c483 100644
--- a/components/FooterNav/index.vue
+++ b/components/FooterNav/index.vue
@@ -12,8 +12,10 @@
               backgroundImage:'url('+item.image+ ((index === footCheck)?'-active':'')+'.png)',
               backgroundSize:'auto '+((index === footCheck)?'81':'54')+'rpx',
               display:(item.is_show)?'flex':'none'
-				    }" @click="selectItem(index)">
-
+				    }" style="position: relative;" @click="selectItem(index)">
+        <view v-if="item.badge > 0" style="position: absolute;top:10rpx;left:20rpx;">
+          <u-badge  max="99" :value="item.badge"></u-badge>
+        </view>
 			</view>
 		</view>
 	</view>
diff --git a/components/RightNav/index.vue b/components/RightNav/index.vue
index e92e9b0..fd7cbea 100644
--- a/components/RightNav/index.vue
+++ b/components/RightNav/index.vue
@@ -5,7 +5,7 @@
         v-for="(item,index) in buttonGroup"
         >
       <u-image v-if="item.type !== 'wechat' && item.type !== 'chat'" :src="item.image" width="93" height="93" @click="handle(item.type)"></u-image>
-      <button v-if="item.type === 'wechat'" open-type="contact" :src="item.image" style="padding-left:0;">
+      <button v-if="item.type === 'wechat'" @click="imageShow = true" :src="item.image" style="padding-left:0;">
         <u-image :src="item.image" width="93" height="93"></u-image>
       </button>
       <view v-if="item.type === 'chat'" style="position: relative;">
@@ -14,6 +14,11 @@
       </view>
     </view>
 	</view>
+  <u-overlay :show="imageShow" @click="imageShow = false">
+    <view class="" style="display:flex;align-items: center;justify-content:center;width:100%;height:100vh;">
+      <u-image mode="widthFix" :src="imageUrl" height="auto" width="100vw"></u-image>
+    </view>
+  </u-overlay>
 </template>
 
 <script>
@@ -24,6 +29,8 @@
 	export default{
 		data() {
 			return {
+        imageShow:false,
+        imageUrl:imghost +'/qrcode-wechat.png',
 				title: 'Hello',
 				loading: true,
 				buttonGroup:[
@@ -55,6 +62,9 @@
       getMsgNumber(){
         userChatCount().then(res => {
           this.msgCount = res.data.count
+        });
+        getConfig('kefu_weixin').then((res) => {
+          this.imageUrl = res.data.kefu_weixin;
         })
       },
       callPhone(phone){
diff --git a/pages/FeedLog/index.vue b/pages/FeedLog/index.vue
index 0379063..f715724 100644
--- a/pages/FeedLog/index.vue
+++ b/pages/FeedLog/index.vue
@@ -41,7 +41,7 @@
           <image class="img" mode="heightFix" :src="staticImage.feedGun" />
         </view>
         <view class="feed-content">
-          <u-collapse :value="['collapse']">
+          <u-collapse :value="collapseValue">
             <u-collapse-item
                 name="collapse"
                 title="水碗饭碗"
@@ -66,7 +66,7 @@
               <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 mode="aspectFill" width="100%" height="200rpx" :src="item.url" @click="showImage(item.url)"></u-image>
+                    <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>
@@ -76,7 +76,7 @@
             </u-collapse-item>
 
           </u-collapse>
-          <u-collapse :value="['collapse']">
+          <u-collapse :value="collapseValue">
             <u-collapse-item
                 name="collapse"
                 title="主食情况"
@@ -101,7 +101,7 @@
               <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 mode="aspectFill" width="100%" height="200rpx" :src="item.url" @click="showImage(item.url)"></u-image>
+                    <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>
@@ -111,7 +111,7 @@
             </u-collapse-item>
 
           </u-collapse>
-          <u-collapse :value="['collapse']">
+          <u-collapse :value="collapseValue">
             <u-collapse-item
                 name="collapse"
                 title="零食小吃"
@@ -136,7 +136,7 @@
               <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 mode="aspectFill" width="100%" height="200rpx" :src="item.url" @click="showImage(item.url)"></u-image>
+                    <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>
@@ -146,7 +146,7 @@
             </u-collapse-item>
 
           </u-collapse>
-          <u-collapse :value="['collapse']">
+          <u-collapse :value="collapseValue">
             <u-collapse-item
                 name="collapse"
                 title="喂药擦药"
@@ -171,7 +171,7 @@
               <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 mode="aspectFill" width="100%" height="200rpx" :src="item.url" @click="showImage(item.url)"></u-image>
+                    <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>
@@ -181,7 +181,7 @@
             </u-collapse-item>
 
           </u-collapse>
-          <u-collapse :value="['collapse']">
+          <u-collapse :value="collapseValue">
             <u-collapse-item
                 name="collapse"
                 title="需要注意"
@@ -206,7 +206,7 @@
               <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 mode="aspectFill" width="100%" height="200rpx" :src="item.url" @click="showImage(item.url)"></u-image>
+                    <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>
@@ -216,7 +216,7 @@
             </u-collapse-item>
 
           </u-collapse>
-          <u-collapse :value="['collapse']">
+          <u-collapse :value="collapseValue">
             <u-collapse-item
                 name="collapse"
                 title="用品位置"
@@ -241,7 +241,7 @@
               <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 mode="aspectFill" width="100%" height="200rpx" :src="item.url" @click="showImage(item.url)"></u-image>
+                    <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>
@@ -251,7 +251,7 @@
             </u-collapse-item>
 
           </u-collapse>
-          <u-collapse :value="['collapse']">
+          <u-collapse :value="collapseValue">
             <u-collapse-item
                 name="collapse"
                 title="外出路线"
@@ -276,7 +276,7 @@
               <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 mode="aspectFill" width="100%" height="200rpx" :src="item.url" @click="showImage(item.url)"></u-image>
+                    <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>
@@ -286,7 +286,7 @@
             </u-collapse-item>
 
           </u-collapse>
-          <u-collapse :value="['collapse']">
+          <u-collapse :value="collapseValue">
             <u-collapse-item
                 name="collapse"
                 title="其它事项"
@@ -311,7 +311,7 @@
               <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 mode="aspectFill" width="100%" height="200rpx" :src="item.url" @click="showImage(item.url)"></u-image>
+                    <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>
@@ -400,9 +400,15 @@
 		},
     onShow(){
       this.feedLog();
+    },
+    onReady() {
+      uni.$u.sleep(50).then(() => {
+        this.collapseValue = ['collapse'];
+      });
     },
 		data() {
 			return {
+        collapseValue:[],
         imageShow:false,
         imageUrl:'',
 				title: 'Hello',
diff --git a/pages/Index/components/OrderPage/index.vue b/pages/Index/components/OrderPage/index.vue
index 09d0332..c00b1fb 100644
--- a/pages/Index/components/OrderPage/index.vue
+++ b/pages/Index/components/OrderPage/index.vue
@@ -97,7 +97,7 @@
                       button-color="#D6FFF6"
                       button-width="100%"></MzButton>
                 </view>
-                <view v-if="item.status === 0" class="card-button" @click="navTo('/pages/OrderConfirm/start?id=' + item.id)">
+                <view v-if="item.status === 0 && item.is_start" class="card-button" @click="navTo('/pages/OrderConfirm/start?id=' + item.id)">
 									<MzButton
 											title="开始服务"
 											font-color="#4DC3B8"
diff --git a/pages/Index/index.vue b/pages/Index/index.vue
index 6a6b626..6cc6649 100644
--- a/pages/Index/index.vue
+++ b/pages/Index/index.vue
@@ -30,6 +30,7 @@
   import {UserCache} from "@/config/config.js";
   import log from "@/utils/log";
   import {userDetail, userExtends} from "@/api/user";
+  import {allChatCount, waitOrderCount} from "../../api/other";
 	export default {
 		components: {
 			FooterNav,
@@ -42,6 +43,7 @@
 		},
 		data() {
 			return {
+        inter:{},
         current:0,
 				footCheck: 'home',
 				show: false,
@@ -52,25 +54,29 @@
             image: imghost + "/foot-nav-button-one",
             name: 'home',
             title: '汪汪行天下',
-            is_show: true
+            is_show: true,
+            badge:0,
           },
           {
             image: imghost + "/foot-nav-button-two",
             name: 'order',
             title: '订单',
-            is_show: false
+            is_show: false,
+            badge:0,
           },
           {
             image: imghost + "/foot-nav-button-three",
             name: 'chat',
             title: '在线沟通',
-            is_show: true
+            is_show: true,
+            badge:0,
           },
           {
             image: imghost + "/foot-nav-button-four",
             name: 'user',
             title: '',
-            is_show: true
+            is_show: true,
+            badge:0,
           },
         ],
         rightShow:false,
@@ -81,6 +87,15 @@
       this.showUserInfo();
 		},
 		methods: {
+      getCountBadges(type = 1){
+        allChatCount({type:type}).then(res => {
+          console.log(res)
+          this.footGroup[2].badge = res.data.count;
+        });
+        waitOrderCount().then(res => {
+          this.footGroup[1].badge = res.data.count;
+        })
+      },
       footSelect(index){
         if(index === 1|| index === 2){
           if (!uni.getStorageSync('token')) {
@@ -145,7 +160,24 @@
 			// api.navHeight().navHeight + (api.navHeight().headerPadding *2))
       // this.footGroup = this.footGroup.filter(v => v.is_show );
 		},
+    destroyed() {
+      clearInterval(this.inter);
+    },
 		mounted() {
+      let user = uni.getStorageSync('user');
+      if(user){
+        let type = 1;
+        if(user.is_waitstaff===1){
+          type = 3;
+        } else if (user.store_id > 0) {
+          type = 2;
+        } else {
+          type = 1;
+        }
+        this.inter = setInterval(() => {
+          this.getCountBadges(type);
+        },5000)
+      }
       // uni.getClipboardData({
       //   success: function (res) {
       //     console.log('res',res)
diff --git a/pages/OrderConfirm/end.vue b/pages/OrderConfirm/end.vue
index 59159e8..db59a61 100644
--- a/pages/OrderConfirm/end.vue
+++ b/pages/OrderConfirm/end.vue
@@ -1989,10 +1989,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: []},
@@ -2018,11 +2018,11 @@ 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: []},
-        key: {option: '钥匙已密封带走保管', remark: '', upload: []},
+        close: {option: '', remark: '', upload: []},
+        close_mima: {option: '', remark: '', upload: []},
+        key: {option: '', remark: '', upload: []},
         leave: '',
         goOutTime: ''
       },
diff --git a/pages/OrderConfirm/start.vue b/pages/OrderConfirm/start.vue
index 527724b..f8b2bfc 100644
--- a/pages/OrderConfirm/start.vue
+++ b/pages/OrderConfirm/start.vue
@@ -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="datetime" @confirm="timeConfirm"></uv-datetime-picker>
+          <uv-datetime-picker ref="arriveTime" :value="shows.arrivalTime" mode="time" @confirm="timeConfirm"></uv-datetime-picker>
         </u-form-item>
         <u-form-item
             prop="userInfo.sex"
@@ -325,9 +325,12 @@ export default {
       })
     },
     timeConfirm(e){
-      this.shows.arrivalTime = e.value;
+      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(e.value,'yyyy-mm-dd hh:MM');
+      //默认年月日,选择小时和分
+      this.model.arrival_time = uni.$u.timeFormat(null,'yyyy-mm-dd') + ' ' +e.value;
     },
     submit(){
       let that = this;
diff --git a/pages/OrderDetail/components/fomItem.vue b/pages/OrderDetail/components/fomItem.vue
index 431b5ac..31f6989 100644
--- a/pages/OrderDetail/components/fomItem.vue
+++ b/pages/OrderDetail/components/fomItem.vue
@@ -90,7 +90,7 @@ export default {
         <view class="row">
           <view class="col-4" 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="widthFix" width="100%"></u-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"
diff --git a/pages/OrderPage/components/index.scss b/pages/OrderPage/components/index.scss
index 940891d..8dccbac 100644
--- a/pages/OrderPage/components/index.scss
+++ b/pages/OrderPage/components/index.scss
@@ -210,6 +210,7 @@
 	align-items: center;
 	padding:30rpx;
 	padding-top:25rpx;
+	padding-bottom:50rpx;
 	position: fixed;
 	bottom:0;
 	left:0;
diff --git a/pages/OrderPage/index.vue b/pages/OrderPage/index.vue
index ca36659..b63b5df 100644
--- a/pages/OrderPage/index.vue
+++ b/pages/OrderPage/index.vue
@@ -526,6 +526,7 @@
             item.checked = false;
             return item;
           })
+          console.log('this.timeListTemp',this.timeListTemp)
         })
       },
       setCacheOrder(){
@@ -795,6 +796,7 @@
             time:this.timeLineList
           }
         });
+        console.log('timeListTemp',this.timeListTemp)
         // this.timeListTemp = this.timeList;
 
         this.$refs.calendar.confirm();
diff --git a/pages/PetDetail/index.vue b/pages/PetDetail/index.vue
index f9eb0f0..4c6378c 100644
--- a/pages/PetDetail/index.vue
+++ b/pages/PetDetail/index.vue
@@ -53,6 +53,17 @@
                 {{ pet.name }}
             </view>
           </view>
+          <view class="content-item row">
+            <view class="item-icon">
+              <image class="img" mode="widthFix" :src="staticImage.petName"/>
+            </view>
+            <view class="item-title">
+              宝贝类型：
+            </view>
+            <view class="item-content">
+                {{ getTypeName(pet.type) }}
+            </view>
+          </view>
 
           <view class="content-item row">
             <view class="item-icon">
@@ -282,6 +293,18 @@
         this.getDetail(option.id);
 		},
 		methods: {
+      getTypeName(type){
+        switch (type){
+          case 1:
+            return '喵喵';
+          case 2:
+            return '汪汪';
+          case 3:
+            return '其他萌宠';
+          default:
+            return '其他萌宠';
+        }
+      },
       showImage(url){
         this.imageUrl = url;
         this.imageShow = true;
diff --git a/pages/UserOrderPage/index.vue b/pages/UserOrderPage/index.vue
index 1d59c81..f2f0adb 100644
--- a/pages/UserOrderPage/index.vue
+++ b/pages/UserOrderPage/index.vue
@@ -54,7 +54,7 @@
 							</view>
 							<view class="order-card-right" style="max-width: 65%;" @click="navTo('/pages/OrderDetail/index?id='+item.id)">
 								<view class="order-card-title" style="">
-                  <u-text :text="item.addr"
+                  <u-text :text="item.name"
                           color="#131313" size="32"
                           :lines="1" line-height="32"></u-text>
                 </view>
diff --git a/utils/requestOther.js b/utils/requestOther.js
index f0a4062..ddc0ee4 100644
--- a/utils/requestOther.js
+++ b/utils/requestOther.js
@@ -4,8 +4,12 @@ const service = (params) => {
 	return new Promise((relove, reject) => {
 		let token=uni.getStorageSync('token')
 		let user=uni.getStorageSync('user')
-		if (!/^http/.test(params.url)){
-			params.url = `${host}/${params.url}`.replace(/(?<!:)\/{2,}/, '/')
+		try{
+			if (!/^http/.test(params.url)) {
+				params.url = `${host}/${params.url}`.replace(/(?<!:)\/{2,}/, '/')
+			}
+		}catch (e){
+			console.log(e)
 		}
 
 		uni.request({