From 2c700c0d07b9390bfc8dfffbf91b7c53df02d2fb Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Wed, 23 Apr 2025 10:08:29 +0800
Subject: [PATCH] url

---
 common/util.js                                |    7 +
 component/floatPhone/index.vue                |   40 +
 component/serviceArchive/service-archive.vue  |    2 +-
 main.js                                       |    4 +
 package_sub/pages/AddOrder/AddOrder.vue       |   76 +-
 package_sub/pages/AddOrder/editOrder.vue      | 1211 +++++++++++++++++
 package_sub/pages/OrderList/OrderList.vue     |  132 +-
 package_sub/pages/ServeForm/ServeForm.vue     |  187 ++-
 .../pages/ServiceDetail/ServiceDetail.vue     |   26 +-
 package_sub/pages/ServiceList/ServiceList.vue |    2 +-
 package_sub/pages/UserArchive/UserArchive.vue |    2 +-
 pages.json                                    |   20 +-
 pages/index/index.vue                         |   22 +-
 pages/me/me.vue                               |   53 +-
 pages/order/order.vue                         |   97 +-
 15 files changed, 1721 insertions(+), 160 deletions(-)
 create mode 100644 component/floatPhone/index.vue
 create mode 100644 package_sub/pages/AddOrder/editOrder.vue

diff --git a/common/util.js b/common/util.js
index ed40f61..94d20a8 100644
--- a/common/util.js
+++ b/common/util.js
@@ -44,3 +44,10 @@ export function getSexByIdcard (idCard) {
     }
     return sexStr;
 }
+
+export function isNull (p) {
+    
+    return p == '' || p == undefined || p == null || p == 'undefined' || p == 'null';
+}
+
+
diff --git a/component/floatPhone/index.vue b/component/floatPhone/index.vue
new file mode 100644
index 0000000..13a8e0c
--- /dev/null
+++ b/component/floatPhone/index.vue
@@ -0,0 +1,40 @@
+<template>
+  <view class="float-phone-icon" @click="makeCall">
+	<u-icon size="60" color="#c10d12" class="row__icon" name="kefu-ermai"></u-icon>
+  </view>
+</template>
+
+<script>
+export default {
+  methods: {
+    makeCall() {
+      uni.makePhoneCall({
+        phoneNumber: '0519-81191800', // 这里替换为你要拨打的电话号码
+        success: function () {
+          console.log('拨打电话成功！')
+        },
+        fail: function () {
+          console.log('拨打电话失败！')
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.float-phone-icon {
+    position: fixed;
+    right: 40rpx;
+    bottom: 240rpx;
+    width: 100rpx;
+    height: 100rpx;
+    z-index: 99999;
+    border-radius: 100rpx;
+    line-height: 100rpx;
+	background-color: #fff;
+	box-shadow: 1rpx 1rpx 10rpx rgba(0,0,0,0.3);
+	    display: flex;
+	    justify-content: center;
+}
+</style>
\ No newline at end of file
diff --git a/component/serviceArchive/service-archive.vue b/component/serviceArchive/service-archive.vue
index 96dc5ea..f9136a8 100644
--- a/component/serviceArchive/service-archive.vue
+++ b/component/serviceArchive/service-archive.vue
@@ -127,7 +127,7 @@
 							...that.form
 						}).then(res=>{
 							uni.showToast({
-								title:"创建成功",
+								title:"更新成功",
 								icon:'none',
 								success() {
 									that.isShow = false
diff --git a/main.js b/main.js
index cbc105a..82d29cd 100644
--- a/main.js
+++ b/main.js
@@ -32,6 +32,10 @@ Vue.prototype.$qqmapsdk = new QQMapWX({
     key: 'D5EBZ-C3BWP-HZIDG-VO6BE-P2MN5-ESFZO'
 });
 
+import floatPhone from "@/component/floatPhone/index.vue"
+Vue.component('floatPhone',floatPhone)
+
+
 let mpShare = require('uview-ui/libs/mixin/mpShare.js');
 Vue.mixin(mpShare)
 
diff --git a/package_sub/pages/AddOrder/AddOrder.vue b/package_sub/pages/AddOrder/AddOrder.vue
index 7324330..7fa9605 100644
--- a/package_sub/pages/AddOrder/AddOrder.vue
+++ b/package_sub/pages/AddOrder/AddOrder.vue
@@ -101,6 +101,7 @@
               <u-input
                 :type="!!orderId ? 'input' : 'select'"
                 placeholder="请选择就诊医院"
+				:disabled="!!orderId"
                 :value="hospital.name"
                 :select-open="isShowHospital"
                 @click="orderId ? false : (isShowHospital = true)"
@@ -110,15 +111,17 @@
               <u-input
                 :type="!!orderId ? 'input' : 'select'"
                 placeholder="请选择时间"
+				:disabled="!!orderId"
                 v-model="form.time"
                 :select-open="isShowTime"
                 @click="orderId ? false : (isShowTime = true)"
               />
             </u-form-item>
-            <u-form-item :label="(form.type == 1 ? '就诊' : '服务') +'人'" prop="user_archive_id" required>
+            <u-form-item :label="(form.type == 1 ? '被服务' : '被服务') +'人'" prop="user_archive_id" required>
               <u-input
                 :type="!!orderId ? 'input' : 'select'"
                 placeholder="请选择人员"
+				:disabled="!!orderId"
                 :value="archive.name"
                 :select-open="isShowArchive"
                 @click="orderId ? false : (isShowArchive = true)"
@@ -189,7 +192,7 @@
             <view class="title">
               <view class="title__left">
                 <text>上传资料</text>
-                <text>（就诊卡、病例等）</text>
+                <text>（挂号单）</text>
               </view>
               <!-- <view class="title__right">
 								点击查看示例
@@ -289,7 +292,7 @@
         </view>
 
         <view class="desc-card">
-          <view class="desc-card__title"> 就诊人信息 </view>
+          <view class="desc-card__title"> 被服务人信息 </view>
 
           <view class="desc-card__content">
             <view class="desc-card__content--title"> 姓名 </view>
@@ -359,7 +362,7 @@
         :custom-style="payBtnStyle"
         :throttle-time="2000"
         @click="pay"
-        >立即{{ form.pay_status === 0 ? '下单' : '支付' }}</u-button
+        >立即{{ form.pay_status === 0 && !orderId ? '下单' : '支付' }}</u-button
       >
       <view v-if="orderId && form.pay_status === 1 && form.status !== 4" class="more" @click="isShowMoreAction = true">更多</view>
     </view>
@@ -420,7 +423,12 @@
             </view>
           </view>
           <view class="service-list-item__address">
-            {{ item.address }}
+            <text>{{ item.address }}</text>
+			<view class="icon">
+				<u-icon name="edit-pen" :size="40" color="#999999" @tap="editUser(item),$event.stopPropagation()"></u-icon>
+				<!-- <u-icon name="trash" style="margin-left: 40rpx;" :size="40" color="red"
+					@tap="delUser(item),$event.stopPropagation()"></u-icon> -->
+			</view>
           </view>
         </view>
       </view>
@@ -430,7 +438,7 @@
           ripple
           :custom-style="payBtnStyle"
           @click="addArchive"
-          >新增就诊人</u-button
+          >新增被服务人</u-button
         >
       </view>
     </u-popup>
@@ -608,6 +616,7 @@
 <script>
 import serviceArchive from "@/component/serviceArchive/service-archive.vue";
 import { ROOTPATH as baseUrl } from "@/common/config.js";
+import {isNull} from "@/common/util.js"
 export default {
   components: {
     serviceArchive,
@@ -669,14 +678,14 @@ export default {
           {
             type: "number",
             required: true,
-            message: "请选择就诊人",
+            message: "请选择人员",
             trigger: ["blur", "change"],
           },
         ],
         time: [
           {
             required: true,
-            message: "请选择就诊时间",
+            message: "请选择时间",
             trigger: ["blur", "change"],
           },
         ],
@@ -772,6 +781,9 @@ export default {
           this.fileList = res.files.map(i => ({
             url: i.url
           }))
+		  uni.setNavigationBarTitle({
+		    title: res.accompany_product?res.accompany_product.name:'订单详情'
+		  })
         });
     },
     async getHospital(site_id) {
@@ -810,11 +822,35 @@ export default {
     addArchive() {
       this.$refs.serviceArchive.isShow = true;
     },
+	editUser(item){
+		this.$refs.serviceArchive.form = item
+		this.$refs.serviceArchive.isShow = true;
+	},
+	delUser(item){
+		uni.showModal({
+			title:'确认删除该人员？',
+			success:async (res)=>{
+				if(res.confirm){
+					try {
+						if (!item?.id) return
+						const res = await this.$u.api.userArchiveDestroy({
+							id: item?.id
+						})
+						this.getUserArchive()
+					} catch (err) {
+						console.error(err)
+					}
+				}
+			}
+		})
+		
+	},
     addSuccess(e) {
       if (e) {
         this.getUserArchive();
       }
     },
+	
 
     pay() {
       if (!this.orderId) {
@@ -827,6 +863,26 @@ export default {
                   return val.progress === 100;
                 })
                 ?.map((i) => i.response?.id) || [];
+				// 陪诊 文件和 需求 必填之一
+			if(this.form.type===1){
+				if(this.form.file_ids.length<1 && isNull(this.form.content)){
+					uni.showToast({
+						title:'请填写服务需求或上传资料',
+						icon:'none'
+					})
+					return
+				}
+			}
+			if(this.form.type===2){
+				if(isNull(this.form.content)){
+					uni.showToast({
+						title:'请填写服务需求',
+						icon:'none'
+					})
+					return
+				}
+			}
+			// return
             const res = await this.$u.api.accompanyProductOrder(this.form);
             if (res) {
               this.orderId = res.id;
@@ -1516,8 +1572,12 @@ export default {
     }
 
     &__address {
+	  margin-top:10rpx;
       width: 100%;
       padding-left: 14rpx;
+	  display: flex;
+	  justify-content: space-between;
+	  align-items: center;
     }
 
     &__icon {
diff --git a/package_sub/pages/AddOrder/editOrder.vue b/package_sub/pages/AddOrder/editOrder.vue
new file mode 100644
index 0000000..69496f0
--- /dev/null
+++ b/package_sub/pages/AddOrder/editOrder.vue
@@ -0,0 +1,1211 @@
+<template>
+	<page-meta :page-style="`overflow:${
+      isShowService || isShowHospital || isShowTime || isShowArchive
+        ? 'hidden'
+        : 'visible'
+    };`"></page-meta>
+	<view class="page">
+		<image class="bkg" mode="aspectFill" src="~@/package_sub/static/AddOrder/bkg.png"></image>
+
+		<view class="container">
+			<view class="step" v-if="form.pay_status !== 2">
+				<view class="step-item" v-for="(i, index) in stepList" :class="{ 'is-active': index <= currentStep }"
+					:key="index">
+					<view class="step-item__dot">
+						<u-icon v-show="index <= currentStep"
+							:name="index === currentStep ? 'more-dot-fill' : 'checkbox-mark'" color="#fff"
+							size="16"></u-icon>
+					</view>
+					<view class="step-item__text">{{ i.name }}</view>
+				</view>
+			</view>
+			<view>
+				<view class="switch-service">
+					<view class="switch-service__icon">
+						<u-icon :name="
+                accompanyProduct.cover
+                  ? accompanyProduct.cover.url
+                  : vuex_default_icon
+              " size="30"></u-icon>
+					</view>
+
+					<view class="switch-service__name">
+						{{ accompanyProduct.name || "未选择" }}
+					</view>
+
+					<view v-if="!orderId" class="switch-service__btn" @click="isShowService = true">
+						<image src="~@/static/switch.png" mode="aspectFit"></image>
+						<text>更换服务</text>
+					</view>
+				</view>
+
+				<u-form :model="form" :rules="rules" ref="uForm" :label-width="178" :error-type="['toast']">
+					<view class="form-card form-card-1">
+						<u-form-item label="就诊医院" prop="hospital" required v-if="form.type == 1">
+							<u-input :type="'select'" placeholder="请选择就诊医院" :value="hospital.name"
+								:select-open="isShowHospital" @click="isShowHospital = true" />
+						</u-form-item>
+						<u-form-item :label="(form.type == 1 ? '就诊' : '服务') + '时间'" prop="time" required>
+							<u-input :type="'select'" placeholder="请选择时间" v-model="form.time" :select-open="isShowTime"
+								@click="isShowTime = true" />
+						</u-form-item>
+						<u-form-item :label="(form.type == 1 ? '被服务' : '被服务') +'人'" prop="user_archive_id" required>
+							<u-input :type="'select'" placeholder="请选择人员" :value="archive.name"
+								:select-open="isShowArchive" @click="isShowArchive = true" />
+						</u-form-item>
+						<u-form-item label="是否可以自理">
+							<view slot="right">
+								<u-radio-group v-model="form.my_provide" active-color="#c20d12">
+									<u-radio :name="1">是</u-radio>
+									<u-radio :name="0">否</u-radio>
+								</u-radio-group>
+							</view>
+						</u-form-item>
+						<u-form-item label="详细地址" prop="city" v-if="form.type == 2">
+							<u-input v-model="form.city" placeholder="请填写详细地址" />
+						</u-form-item>
+						<u-form-item label="预约人" prop="appoint_name" required>
+							<u-input v-model="form.appoint_name" placeholder="请填写预约人" />
+						</u-form-item>
+						<u-form-item label="预约人电话" prop="appoint_mobile" required>
+							<u-input v-model="form.appoint_mobile" placeholder="请填写预约人电话" type="number" />
+						</u-form-item>
+						<u-form-item :label="'选择'+ (form.type == 1 ? '陪诊师' : '照护师') +'性别'" :border-bottom="false">
+							<view slot="right">
+								<u-radio-group v-model="form.accompany_sex" active-color="#c20d12">
+									<u-radio :name="1">男</u-radio>
+									<u-radio :name="2">女</u-radio>
+									<u-radio :name="0">任意</u-radio>
+								</u-radio-group>
+							</view>
+						</u-form-item>
+					</view>
+
+					<view class="form-card form-card-2" v-if="form.type == 1">
+						<view class="title">
+							<view class="title__left">
+								<text>上传资料</text>
+								<text>（挂号单）</text>
+							</view>
+							<!-- <view class="title__right">
+								点击查看示例
+							</view> -->
+						</view>
+						<view>
+							<u-upload :action="action" ref="uUpload" :file-list="fileList" :header="{
+                ['Authorization']: `Bearer ${token}`,
+              }"></u-upload>
+						</view>
+					</view>
+
+					<view class="form-card form-card-3">
+						<view class="title"> 其他服务需求 </view>
+						<u-form-item :label-width="0" :border-bottom="false">
+							<u-input border :custom-style="{ 'letter-spacing': '2rpx' }" border-color="#dad9d9"
+								placeholder="请简单描述您要就诊的科室及就诊内容(内容加密保护)" v-model="form.content"
+								type="textarea"></u-input>
+						</u-form-item>
+					</view>
+				</u-form>
+			</view>
+		</view>
+
+		<view class="bottom-bar">
+			<view class="price">
+				<text>实付：</text>
+				<text>¥ {{ accompanyProduct.price }}</text>
+			</view>
+			<u-button v-if="form.pay_status === 0" style="margin-left: auto;" shape="circle" ripple
+				:custom-style="payBtnStyle" :throttle-time="2000" @click="pay">确认修改</u-button>
+		</view>
+		<!-- 服务列表 -->
+		<u-popup v-model="isShowService" mode="bottom" safe-area-inset-bottom closeable :border-radius="10"
+			:height="800">
+			<view class="service-list">
+				<view class="service-list-item" v-for="(item, i) in list_service" :key="i" @click="changeService(item)">
+					<view class="service-list-item__icon">
+						<!-- <u-icon name="integral" size="30"></u-icon> -->
+						<image style="width: 70rpx; height: 70rpx" :src="item.cover.url"></image>
+					</view>
+
+					<view class="service-list-item__name">
+						{{ item.name }}
+					</view>
+
+					<view class="service-list-item__price"> ¥{{ item.price }} </view>
+				</view>
+			</view>
+		</u-popup>
+		<!-- 选择就诊人，可以新增 -->
+		<u-popup v-model="isShowArchive" mode="bottom" safe-area-inset-bottom closeable :border-radius="10"
+			:height="800">
+			<view class="service-list" style="padding-bottom: 120rpx">
+				<view class="service-list-item" v-for="(item, i) in list_archive" :key="i"
+					@click="confirmArchive(item)">
+					<view class="service-list-item__namewrap">
+						<view class="service-list-item__name">
+							{{ item.name }}
+						</view>
+						<view class="service-list-item__price">
+							{{ item.mobile }}
+						</view>
+					</view>
+					<view class="service-list-item__address">
+						<text>{{ item.address }}</text>
+						<view class="icon">
+							<u-icon name="edit-pen" :size="40" color="#999999"
+								@tap="editUser(item),$event.stopPropagation()"></u-icon>
+							<!-- <u-icon name="trash" style="margin-left: 40rpx;" :size="40" color="red"
+					@tap="delUser(item),$event.stopPropagation()"></u-icon> -->
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="service-list-btn">
+				<u-button shape="circle" ripple :custom-style="payBtnStyle" @click="addArchive">新增被服务人</u-button>
+			</view>
+		</u-popup>
+		<!-- 新增就诊人 -->
+		<service-archive ref="serviceArchive" @addSuccess="addSuccess"></service-archive>
+		<!-- 选择 站点下的医院 -->
+		<u-select v-model="isShowHospital" value-name="id" @confirm="confirmHospital" label-name="name"
+			:list="list_hospital"></u-select>
+		<!-- 服务时间 -->
+		<u-picker v-model="isShowTime" :params="{
+        year: true,
+        month: true,
+        day: true,
+        hour: true,
+        minute: true,
+        second: false,
+      }" mode="time" @confirm="confirmTime"></u-picker>
+		<!--    更多操作-->
+		<u-action-sheet safe-area-inset-bottom :list="moreActionList" v-model="isShowMoreAction"
+			@click="moreActionClick" />
+
+		<!-- 优惠，不显示先 -->
+		<u-popup v-model="isShowPayPopup" class="pay-popup" mode="bottom" closeable :z-index="10073"
+			:close-icon-size="40" close-icon="close-circle" :border-radius="20" :height="800">
+			<view class="pay-popup-container">
+				<view class="service">
+					<view class="service__icon">
+						<u-icon name="integral" size="40"></u-icon>
+					</view>
+
+					<view class="service__text">
+						<view class="service__text--price">¥600.00</view>
+						<view class="service__text--name">专享半天陪诊</view>
+					</view>
+				</view>
+
+				<view class="row">
+					<view class="row__title"> 平台保障 </view>
+
+					<view class="row__content d-flex ai-center cards">
+						<view class="cards__icon d-flex jc-center ai-center">
+							<u-icon name="integral" size="30"></u-icon>
+						</view>
+
+						<view style="padding-left: 18rpx" class="flex-1">
+							<view class="d-flex ai-center">
+								<view style="font-size: 28rpx">半天陪诊·3次卡</view>
+
+								<view class="d-flex ai-center" style="margin-left: auto">
+									<text style="
+                      font-size: 24rpx;
+                      padding-right: 22rpx;
+                      font-weight: bold;
+                    ">¥ 600</text>
+									<u-checkbox :value="false" shape="circle" active-color="#c20d12" />
+								</view>
+							</view>
+							<view class="d-flex ai-center">
+								<view style="color: #999; font-size: 24rpx">本次预约可直接抵扣1次</view>
+
+								<view style="
+                    font-size: 16rpx;
+                    color: #999;
+                    font-weight: 500;
+                    margin-left: auto;
+                  ">低至¥246/次
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<view class="row">
+					<view class="row__title"> 平台保障 </view>
+
+					<view class="row__content d-flex jc-center">
+						<view class="row__content--first">险</view>
+						<view class="row__content--name">陪诊服务险</view>
+						<view class="d-flex ai-center" style="margin-left: auto">
+							<text style="
+                  font-size: 24rpx;
+                  padding-right: 22rpx;
+                  font-weight: bold;
+                ">¥ 600</text>
+							<u-checkbox :value="false" shape="circle" active-color="#c20d12" />
+						</view>
+					</view>
+				</view>
+
+				<view class="row">
+					<view class="row__title"> 本单优惠 </view>
+
+					<view class="row__content d-flex jc-center">
+						<view class="row__content--first" style="background: #c31014">券</view>
+						<view class="row__content--name" style="color: #999">请选择优惠券</view>
+						<view style="margin-left: auto">
+							<u-icon name="arrow-down" :size="24"></u-icon>
+						</view>
+					</view>
+				</view>
+
+				<view class="row use-card"> 新人优惠券 20元 服务满1元可用 </view>
+
+				<view class="row">
+					<view class="row__content d-flex jc-center">
+						<view class="row__content--first" style="background: #c31014">减</view>
+						<view class="row__content--name">无忧赠险保障</view>
+						<view style="margin-left: auto; color: #c31014"> -￥25 </view>
+					</view>
+				</view>
+
+				<view class="is-auth">
+					<u-checkbox v-model="isAuth" shape="circle" active-color="#c20d12">
+						<text style="padding-left: 10rpx">我已认真阅读预约相关</text>
+						<text style="color: #c20d12" @click.stop.prevent>《服务条款同意书》</text>
+					</u-checkbox>
+				</view>
+			</view>
+		</u-popup>
+		<u-top-tips :z-index="10080" ref="uTips"></u-top-tips>
+	</view>
+</template>
+
+<script>
+	import serviceArchive from "@/component/serviceArchive/service-archive.vue";
+	import {
+		ROOTPATH as baseUrl
+	} from "@/common/config.js";
+	import {
+		isNull
+	} from "@/common/util.js"
+	export default {
+		components: {
+			serviceArchive,
+		},
+		data() {
+			return {
+				workStatus: new Map([
+					[0, '待处理'],
+					[1, '已到客户家'],
+					[2, '已接到客户'],
+					[3, '已到医院'],
+					[4, '完成服务']
+				]),
+				payBtnStyle: {
+					"background-image": "linear-gradient(-90deg, #e26165 0%, #c10d12 94%, #c10d12 100%)",
+					"font-weight": "500",
+					"font-size": "28rpx",
+					color: "#fff",
+					width: "288rpx",
+					"margin-right": "25rpx"
+				},
+
+				//more action
+				isShowMoreAction: false,
+
+				// service
+				isShowService: false,
+
+				// form
+				fileList: [],
+				isShowHospital: false,
+				isShowTime: false,
+				isShowArchive: false,
+				list_service: [],
+				list_hospital: [],
+				list_archive: [],
+				orderId: "",
+				nurse: {},
+				form: {
+					type: 1,
+					is_show: false,
+					accompany_product_id: "",
+					user_archive_id: "",
+					city: "",
+					hospital: "",
+					time: "",
+					my_provide: 1,
+					appoint_name: "",
+					appoint_mobile: "",
+					accompany_sex: "",
+					file_ids: "",
+					content: "",
+					pay_status: 0,
+					no: "",
+				},
+				rules: {
+					user_archive_id: [{
+						type: "number",
+						required: true,
+						message: "请选择人员",
+						trigger: ["blur", "change"],
+					}, ],
+					time: [{
+						required: true,
+						message: "请选择时间",
+						trigger: ["blur", "change"],
+					}, ],
+					hospital: [{
+						validator: (rule, value, callback) => {
+							if (this.form.type == 2) {
+								return true
+							} else {
+								return !!value
+							}
+						},
+						message: "请选择就诊医院",
+						trigger: ["blur", "change"],
+					}, ],
+					appoint_name: [{
+						required: true,
+						message: "请输入预约人",
+						trigger: ["blur", "change"],
+					}, ],
+					appoint_mobile: [{
+							required: true,
+							message: "请输入预约人电话",
+							trigger: ["blur", "change"],
+						},
+						{
+							// 自定义验证函数，见上说明
+							validator: (rule, value, callback) => {
+								return this.$u.test.mobile(value);
+							},
+							message: "预约人电话不正确",
+							// 触发器可以同时用blur和change
+							trigger: ["change", "blur"],
+						},
+					],
+				},
+				action: `${baseUrl}/api/mobile/upload-file`,
+				isAuth: false,
+				//
+
+				// pay popup
+				isShowPayPopup: false,
+			};
+		},
+		onReady() {
+			this.$refs.uForm.setRules(this.rules);
+		},
+		onLoad(option) {
+			this.form.accompany_product_id = option.id ? Number(option.id) : "";
+			this.form.type = Number(option.type);
+			uni.setNavigationBarTitle({
+				title: option.type == 1 ? '预约陪诊' : '预约居家照护'
+			})
+			this.getList(option.type);
+			this.getHospital(option.site_id);
+			this.getUserArchive();
+			if (!this.orderId && option.order_id) {
+				this.orderId = option.order_id;
+				this.getDetail();
+			}
+		},
+
+		methods: {
+			// 获取产品列表
+			async getList(type) {
+				const res = await this.$u.api.accompanyProduct({
+					type: type,
+					page: 1,
+					page_size: 999,
+				});
+				this.list_service = res.data;
+			},
+			async getDetail(id) {
+				console.log(id, this.orderId);
+				await this.$u.api
+					.accompanyOrdersDetail({
+						id: id || this.orderId,
+					})
+					.then((res) => {
+						for (const key in this.form) {
+							if (res.hasOwnProperty(key)) {
+								this.form[key] = res[key];
+							}
+						}
+						this.form['created_at'] = res['created_at']
+						this.form['status'] = res['status']
+						this.form['nurse_id'] = res['nurse_id']
+						this.nurse = res['nurse']
+						this.fileList = res.files.map(i => ({
+							url: i.url
+						}))
+						uni.setNavigationBarTitle({
+							title: res.accompany_product ? res.accompany_product.name : '订单详情'
+						})
+					});
+			},
+			async getHospital(site_id) {
+				const res = await this.$u.api.listHospital({
+					site_id: site_id,
+					page: 1,
+					page_size: 999,
+				});
+				this.list_hospital = res.data;
+			},
+			async getUserArchive() {
+				const res = await this.$u.api.userArchive({
+					page: 1,
+					page_size: 999,
+				});
+				this.list_archive = res.data;
+			},
+			changeService(item) {
+				this.info = item;
+				this.form.accompany_product_id = item.id;
+				this.getHospital(item.site_id);
+				this.isShowService = false;
+				this.form.hospital = "";
+			},
+			confirmHospital(e) {
+				this.form.hospital = e[0].value;
+			},
+			confirmTime(e) {
+				this.form.time = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}:00`;
+			},
+			// 服务对象
+			confirmArchive(e) {
+				this.form.user_archive_id = e.id;
+				this.isShowArchive = false;
+			},
+			addArchive() {
+				this.$refs.serviceArchive.isShow = true;
+			},
+			editUser(item) {
+				this.$refs.serviceArchive.form = item
+				this.$refs.serviceArchive.isShow = true;
+			},
+			delUser(item) {
+				uni.showModal({
+					title: '确认删除该人员？',
+					success: async (res) => {
+						if (res.confirm) {
+							try {
+								if (!item?.id) return
+								const res = await this.$u.api.userArchiveDestroy({
+									id: item?.id
+								})
+								this.getUserArchive()
+							} catch (err) {
+								console.error(err)
+							}
+						}
+					}
+				})
+
+			},
+			addSuccess(e) {
+				if (e) {
+					this.getUserArchive();
+				}
+			},
+
+
+			pay() {
+				this.$refs.uForm.validate(async (valid) => {
+					if (valid) {
+						console.log("验证通过");
+						this.form.file_ids =
+							this.$refs.uUpload?.lists
+							?.filter((val) => {
+								return val.progress === 100;
+							})
+							?.map((i) => i.response?.id) || [];
+						// 陪诊 文件和 需求 必填之一
+						if (this.form.type === 1) {
+							if (this.form.file_ids.length < 1 && isNull(this.form.content)) {
+								uni.showToast({
+									title: '请填写服务需求或上传资料',
+									icon: 'none'
+								})
+								return
+							}
+						}
+						if (this.form.type === 2) {
+							if (isNull(this.form.content)) {
+								uni.showToast({
+									title: '请填写服务需求',
+									icon: 'none'
+								})
+								return
+							}
+						}
+						// return
+						let that = this
+						console.log("id",this.form,this.orderId)
+						// return
+						const res = await this.$u.api.accompanyProductOrder({
+							id:parseInt(this.orderId),
+							...this.form
+						});
+						uni.showToast({
+							title: '修改成功',
+							icon: 'none',
+							success(res) {
+								that.$u.route({
+									url: "/pages/order/order",
+									type: "tab",
+								});
+							}
+						})
+					} else {
+						console.log("验证失败");
+					}
+				});
+			},
+
+			// 更多菜单点击
+			moreActionClick(index) {
+				let name = this.moreActionList[index].text
+				let fn = () => {}
+				switch (this.moreActionList[index].tag) {
+					case 'cancel':
+						fn = () => this.$u.api.accompanyProductOrder({
+							id: this.orderId,
+							pay_status: -1
+						}).then(_ => {
+							this.getDetail()
+						})
+						break;
+					case 'chargeback':
+						fn = () => this.$u.api.orderRefund({
+							id: this.orderId
+						}).then(_ => {
+							this.getDetail().then(_ => {
+								if (this.form.status) {
+									uni.showModal({
+										title: "已成功提交退款申请",
+										content: "当前订单已分配护工，需等待客服处理",
+										showCancel: false
+									})
+								}
+							})
+						})
+						break;
+				}
+				uni.showModal({
+					title: "操作",
+					content: `是否确认${name}？`,
+					success: (status) => {
+						if (status.confirm) {
+							fn()
+						} else {}
+					},
+					fail: () => {},
+				})
+			}
+		},
+		computed: {
+			// step
+			stepList() {
+				return [{
+						name: "填写预约",
+					},
+					{
+						name: "在线支付",
+					},
+					{
+						name: "专人" + (this.form.type == 1 ? "陪诊" : "陪护"),
+					},
+					{
+						name: "服务完成",
+					},
+				]
+			},
+			//
+			currentStep() {
+				return 0
+				if (!this.orderId) {
+					return 0;
+				}
+				if (this.form.pay_status === 0) {
+					return 1;
+				}
+				if (this.form.pay_status === 1) {
+					return 2;
+				}
+				if (this.form.pay_status === 1 && this.form.status) {
+					return 3;
+				}
+				if (this.form.pay_status === 3 && this.form.status === 4) {
+					return 4;
+				}
+				return 0;
+			},
+			sex() {
+				return function(val) {
+					if (val == 1) {
+						return "男";
+					} else if (val == 2) {
+						return "女";
+					} else {
+						return "都可以";
+					}
+				};
+			},
+			token() {
+				return this.vuex_token ?
+					this.vuex_token :
+					uni.getStorageSync("lifeData")?.vuex_token;
+			},
+			accompanyProduct() {
+				return (
+					this.list_service.find(
+						(i) => i.id === this.form.accompany_product_id
+					) || {}
+				);
+			},
+			hospital() {
+				return this.list_hospital.find((i) => i.id == this.form.hospital) || {};
+			},
+			archive() {
+				return (
+					this.list_archive.find((i) => i.id === this.form.user_archive_id) || {}
+				);
+			},
+			moreActionList() {
+				if (this.form.pay_status === 0) {
+					return [{
+						text: '取消订单',
+						fontSize: 28,
+						tag: 'cancel'
+					}]
+				} else if (this.form.pay_status === 1) {
+					return [{
+						text: '退单',
+						fontSize: 28,
+						tag: 'chargeback'
+					}]
+				}
+			}
+		},
+	};
+</script>
+
+<style lang="scss">
+	.d-flex {
+		display: flex;
+	}
+
+	.jc-center {
+		justify-content: center;
+	}
+
+	.ai-center {
+		align-items: center;
+	}
+
+	.flex-1 {
+		flex: 1;
+	}
+
+	.pay-popup>.u-drawer {
+		bottom: calc(constant(safe-area-inset-bottom) + 80rpx + 28rpx + 27rpx) !important;
+		bottom: calc(env(safe-area-inset-bottom) + 80rpx + 28rpx + 27rpx) !important;
+	}
+
+	.pay-popup>.u-drawer .u-drawer-bottom {
+		overflow: initial !important;
+		background: #f4efee;
+
+		&::before {
+			font: normal normal normal 14px / 1 uicon-iconfont;
+			content: "\e65f  陪诊有保障，就医更安心";
+			font-size: 24rpx;
+			line-height: 70rpx;
+			color: #ffffff;
+			font-weight: 500;
+			box-sizing: border-box;
+			background: linear-gradient(90deg,
+					#c10d12 0%,
+					#c10d12 4%,
+					#e16265 99%,
+					#e16265 100%);
+			position: absolute;
+			width: 100%;
+			height: 100rpx;
+			padding-left: 70rpx;
+			border-radius: 20rpx 20rpx 0 0;
+			top: -70rpx;
+			left: 0;
+		}
+	}
+
+	.pay-popup>.u-drawer .u-mask {
+		bottom: calc(constant(safe-area-inset-bottom) + 80rpx + 28rpx) !important;
+		bottom: calc(env(safe-area-inset-bottom) + 80rpx + 28rpx) !important;
+	}
+
+	.pay-popup>.u-drawer .u-drawer__scroll-view {
+		position: relative;
+		background: #f4efee;
+	}
+
+	.pay-popup {
+		&-container {
+			padding-bottom: 20rpx;
+
+			.service {
+				border-radius: 10rpx;
+				padding: 28rpx 39rpx;
+				margin: 32rpx 25rpx 0;
+				display: flex;
+				align-items: center;
+
+				&__icon {
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					background: #f1e7d9;
+					padding: 20rpx;
+					width: 124rpx;
+					height: 122rpx;
+				}
+
+				&__text {
+					padding-left: 12rpx;
+					font-weight: 500;
+
+					&--price {
+						font-size: 40rpx;
+						color: #c20d12;
+						font-weight: 500;
+					}
+
+					&--name {
+						font-size: 24rpx;
+						color: #333333;
+						font-weight: 500;
+					}
+				}
+			}
+
+			.row {
+				margin: 30rpx 46rpx 0;
+
+				&__title {
+					padding-left: 22rpx;
+					font-size: 28rpx;
+					line-height: 40rpx;
+					color: #000000;
+					font-weight: 500;
+				}
+
+				&__content {
+					margin-top: 26rpx;
+					padding: 22rpx;
+					background: #fff;
+					border-radius: 5rpx;
+
+					&--first {
+						width: 51rpx;
+						height: 47rpx;
+						border-radius: 15rpx;
+						line-height: 47rpx;
+						text-align: center;
+						font-size: 30rpx;
+						color: #fff;
+						background-color: #e1a664;
+					}
+
+					&--name {
+						font-size: 28rpx;
+						line-height: 47rpx;
+						color: #000000;
+						font-weight: 500;
+						padding-left: 16rpx;
+					}
+				}
+
+				.u-checkbox__label {
+					margin: 0;
+				}
+			}
+
+			.cards {
+				&__icon {
+					width: 90rpx;
+					height: 83rpx;
+					background: #f3e7d8;
+					border-radius: 10rpx;
+				}
+			}
+
+			.use-card {
+				text-align: center;
+				white-space: nowrap;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				width: 570rpx;
+				margin: 30rpx auto 0;
+				height: 66rpx;
+				line-height: 66rpx;
+				font-size: 28rpx;
+				color: #e1a664;
+				font-weight: 500;
+				background: #f1e7d9;
+			}
+
+			.is-auth {
+				padding-left: 56rpx;
+				margin-top: 22rpx;
+			}
+		}
+	}
+</style>
+<style lang="scss" scoped>
+	.page {
+		position: relative;
+
+		.card {
+			background: #fff;
+			margin: 60rpx 25rpx 0;
+			padding: 36rpx 38rpx;
+			border-radius: 10rpx;
+		}
+
+		.bkg {
+			width: 100vw;
+			z-index: 0;
+			height: 550rpx;
+			position: absolute;
+			top: 0;
+			left: 0;
+		}
+
+		.container {
+			z-index: 1;
+			position: relative;
+			padding-bottom: calc(27rpx * 2 + 80rpx + 20rpx);
+			padding-bottom: calc(constant(safe-area-inset-bottom) + 27rpx * 2 + 80rpx + 20rpx);
+			padding-bottom: calc(env(safe-area-inset-bottom) + 27rpx * 2 + 80rpx + 20rpx);
+
+			.refund-text {
+				font-size: 44rpx;
+				font-weight: 600;
+				color: #c20d12;
+				letter-spacing: 4rpx;
+				padding: 64rpx 37rpx 0;
+			}
+
+			.step {
+				display: flex;
+				justify-content: space-evenly;
+				padding: 64rpx 37rpx 0;
+				position: relative;
+
+				&::before {
+					content: "";
+					height: 12rpx;
+					background: #fff;
+					border-radius: 6rpx;
+					position: absolute;
+					left: 37rpx;
+					right: 37rpx;
+					top: calc(26rpx / 2 + 64rpx - 6rpx);
+				}
+
+				&-item {
+					&__dot {
+						width: 30rpx;
+						height: 30rpx;
+						border-radius: 100%;
+						filter: drop-shadow(0 0 10rpx rgba(211, 32, 2, 0.3));
+						background-color: #9b9c9c;
+						border: 2rpx solid #ffffff;
+						margin: auto;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+					}
+
+					&__text {
+						font-size: 24rpx;
+						color: #333333;
+						font-weight: 500;
+						margin-top: 30rpx;
+					}
+				}
+
+				.is-active {
+					.step-item__dot {
+						filter: drop-shadow(4.384px 8.988px 10px rgba(211, 32, 2, 0.57));
+						background-image: linear-gradient(-90deg,
+								#e26165 0%,
+								#c10d12 94%,
+								#c10d12 100%);
+						transform: scale(2, 2);
+					}
+
+					.step-item__text {
+						color: #c20d12;
+					}
+				}
+			}
+
+			.switch-service {
+				border-radius: 10rpx;
+				background-color: #ffffff;
+				margin: 60rpx 25rpx 0;
+				padding: 28rpx 39rpx;
+				display: flex;
+				align-items: center;
+
+				&__icon {
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					background: #f9f5e9;
+					padding: 20rpx;
+				}
+
+				&__name {
+					padding-left: 14rpx;
+					font-size: 28rpx;
+					color: #333333;
+					font-weight: 500;
+				}
+
+				&__btn {
+					display: flex;
+					align-items: center;
+					margin-left: auto;
+
+					&>image {
+						width: 31rpx;
+						height: 27rpx;
+					}
+
+					&>text {
+						font-size: 24rpx;
+						color: #999999;
+						padding-left: 20rpx;
+					}
+				}
+			}
+
+			.form-card {
+				border-radius: 10rpx;
+				background-color: #ffffff;
+				padding: 36rpx 38rpx;
+				margin: 0 25rpx;
+
+				&-1 {
+					margin-top: 44rpx;
+				}
+
+				&-2 {
+					margin-top: 24rpx;
+
+					.title {
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+						font-size: 24rpx;
+						margin-bottom: 26rpx;
+
+						&__left text:nth-child(1) {
+							color: #333;
+						}
+
+						&__left text:nth-child(2) {
+							color: #999;
+						}
+
+						&__right {
+							color: #c20d12;
+						}
+					}
+
+					::v-deep .u-add-wrap {
+						background: #fff;
+						border: 2rpx dashed #999999;
+					}
+				}
+
+				&-3 {
+					margin-top: 20rpx;
+
+					.title {
+						font-size: 24rpx;
+						color: #333333;
+						margin-bottom: 22rpx;
+					}
+				}
+			}
+
+			.is-auth {
+				padding-left: 56rpx;
+				margin-top: 22rpx;
+			}
+
+			::v-deep .form-card-1 .u-input__input {
+				text-align: right;
+			}
+
+			.desc-card {
+				border-bottom: 2rpx solid #efefef;
+				padding: 48rpx 70rpx 46rpx;
+
+				&__title {
+					font-size: 28rpx;
+					color: #000000;
+					font-weight: bold;
+					position: relative;
+					padding-left: 24rpx;
+
+					&::before {
+						content: "";
+						background: linear-gradient(0deg,
+								#c10d12 0%,
+								#c10d12 6%,
+								#e26165 100%);
+						border-radius: 4rpx;
+						width: 6rpx;
+						position: absolute;
+						top: 0;
+						left: 0;
+						bottom: 0;
+					}
+				}
+
+				&__content {
+					line-height: 65rpx;
+					margin-top: 34rpx;
+
+					&--title {
+						display: inline-block;
+						width: 240rpx;
+						padding-right: 64rpx;
+						font-size: 24rpx;
+						color: #999999;
+						font-weight: 500;
+					}
+
+					&--value {
+						display: inline-block;
+						font-size: 24rpx;
+						color: #333333;
+						font-weight: 500;
+					}
+				}
+			}
+		}
+	}
+
+	.bottom-bar {
+		background: #fff;
+		position: fixed;
+		padding-top: 27rpx;
+		padding-bottom: 27rpx;
+		padding-bottom: calc(constant(safe-area-inset-bottom) + 27rpx);
+		padding-bottom: calc(env(safe-area-inset-bottom) + 27rpx);
+		width: 100vw;
+		left: 0;
+		bottom: 0;
+		z-index: 10074;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		filter: drop-shadow(0 2rpx 6rpx #00000020);
+
+		.price {
+			margin-left: 50rpx;
+			color: #c20d12;
+
+			&>text:nth-child(1) {
+				font-size: 24rpx;
+			}
+
+			&>text:nth-child(2) {
+				color: #c20d12;
+				font-weight: 500;
+				font-size: 40rpx;
+			}
+		}
+
+		.more {
+			font-size: 26rpx;
+			color: #666;
+			padding-right: 20rpx;
+		}
+	}
+
+	.service-list {
+		padding-top: 80rpx;
+
+		&-item {
+			border: 2rpx solid #e6e6eb;
+			border-radius: 10rpx;
+			background-color: #ffffff;
+			margin: 0 25rpx;
+			padding: 28rpx 39rpx;
+			display: flex;
+			align-items: center;
+			flex-wrap: wrap;
+
+			&__namewrap {
+				display: flex;
+				align-items: center;
+				width: 100%;
+			}
+
+			&__address {
+				margin-top: 10rpx;
+				width: 100%;
+				padding-left: 14rpx;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+			}
+
+			&__icon {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				// background: #f9f5e9;
+				// padding: 20rpx;
+			}
+
+			&__name {
+				padding-left: 14rpx;
+				font-size: 28rpx;
+				color: #333333;
+				font-weight: 500;
+			}
+
+			&__price {
+				color: #c20d12;
+				font-weight: 500;
+				margin-left: auto;
+			}
+		}
+
+		&-btn {
+			position: fixed;
+			bottom: 40rpx;
+			left: calc(50% - 144rpx);
+		}
+
+		&-item+&-item {
+			margin-top: 20rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/package_sub/pages/OrderList/OrderList.vue b/package_sub/pages/OrderList/OrderList.vue
index 9b8000d..14b8750 100644
--- a/package_sub/pages/OrderList/OrderList.vue
+++ b/package_sub/pages/OrderList/OrderList.vue
@@ -3,68 +3,72 @@
 		<scroll-view scroll-y style="height: 100%; width: 100%" @scrolltolower="reachBottom">
 			<view>
 				<view class="order" v-for="i in list" :key="i.id">
-					<view class="title">
-						<view class="title__name">
-							<u-tag size="mini" type="primary" mode="dark" shape="circleLeft"
-								:text="i.type === 1 ? '陪诊' : '陪护'"></u-tag>
-							<text style="padding-left: 10rpx;">专享半天陪诊</text>
+					<view class="title">
+							<view class="title__name">
+								<u-tag size="mini" type="primary" mode="dark" shape="circleLeft"
+									:text="i.type === 1 ? '陪诊' : '陪护'"></u-tag>
+								<text style="padding-left: 10rpx;">{{i.accompany_product?i.accompany_product.name:''}}</text>
+							</view>
+							<view class="title__status">{{ statusFormat(i.pay_status) }}</view>
+						</view>
+					
+						<view class="price">
+							<view class="price-icon">
+								<image style="width:90rpx" mode="widthFix" :src="i.accompany_product?(i.accompany_product.cover?i.accompany_product.cover.url:vuex_default_icon):vuex_default_icon"></image>
+								<!-- <u-icon :name="" size="30"></u-icon> -->
+							</view>
+					
+							<view class="price-text">
+								<view class="price-text__num">
+									￥{{ i.accompany_product ? i.accompany_product.price : 0 }}</view>
+								<view class="price-text__no">订单号 {{ i.no }}</view>
+							</view>
+						</view>
+					
+						<view class="info" @click.stop.native="$u.route({
+					  url: '/package_sub/pages/AddOrder/AddOrder',
+					  params: {
+					    order_id: i.id,
+					    type: i.type,
+					    site_id: i.hospital?i.hospital.site_id:''
+					  }
+					})">
+							<view class="info__item">
+								<text>{{i.type == 1 ? '被服务人' : '被服务人'}}</text>
+								<text>{{ i.user_archive ? i.user_archive.name : i.user_archive_id }}</text>
+							</view>
+							<view class="info__item flex100">
+								<text>{{(i.type == 1 ? '就诊' : '服务') + '时间'}}</text>
+								<text>{{ i.time ? $moment(i.time).format('YYYY年MM月DD日 HH:mm') : '' }}</text>
+							</view>
+							<view class="info__item"  v-if="i.type==2">
+								<text>详细地址</text>
+								<text>{{ i.city || " " }}</text>
+							</view>
+							<view class="info__item flex100" v-if="i.type==1">
+								<text>就诊医院</text>
+								<text>{{ i.hospital ? i.hospital.name : '' }}</text>
+							</view>
+						</view>
+					
+						<view class="bottom">
+							<view class="row1">
+								<view class="time">
+									<text>下单时间： </text>
+									<text>{{ i.created_at ? $moment(i.created_at).format('YYYY年MM月DD日 HH:mm') : '' }}</text>
+								</view>
+					
+								<u-button ripple shape="circle" :custom-style="payBtnStyle"
+									:throttle-time="2000" @click="$u.route({
+					  url: '/package_sub/pages/AddOrder/AddOrder',
+					  params: {
+					    order_id: i.id,
+					    type: i.type,
+					    site_id: i.hospital ? i.hospital.site_id : ''
+					  }
+					})">{{ i.pay_status === 0 ? '立即支付' : '查看订单' }}</u-button>
+							</view>
 						</view>
-						<view class="title__status">{{ statusFormat(i.pay_status) }}</view>
-					</view>
-
-					<view class="price">
-						<view class="price-icon">
-							<u-icon :name="i.cover ? i.cover.url : vuex_default_icon" size="30"></u-icon>
-						</view>
-
-						<view class="price-text">
-							<view class="price-text__num">￥{{ i.accompany_product ? i.accompany_product.price : 0 }}
-							</view>
-							<view class="price-text__no">订单号 {{ i.no }}</view>
-						</view>
-					</view>
-
-					<view class="info" @click.stop.native="$u.route({
-                              url: '/package_sub/pages/AddOrder/AddOrder',
-                              params: {
-                                order_id: i.id,
-                                type: i.type,
-                                site_id: i.hospital.site_id
-                              }
-                            })">
-						<view class="info__item">
-							<text>就诊城市</text>
-							<text>{{ i.city || ((i.hospital && i.hospital.site) ? i.hospital.site.name : "") || " " }}</text>
-						</view>
-						<view class="info__item">
-							<text>就诊医院</text>
-							<text>{{ i.hospital ? i.hospital.name : '' }}</text>
-						</view>
-						<view class="info__item">
-							<text>就诊人</text>
-							<text>{{ i.user_archive ? i.user_archive.name : i.user_archive_id }}</text>
-						</view>
-						<view class="info__item">
-							<text>就诊时间</text>
-							<text>{{ i.time ? $moment(i.time).format('YYYY年MM月DD日 HH:mm') : '' }}</text>
-						</view>
-					</view>
-
-					<view class="bottom">
-						<view class="time">
-							<text>下单时间： </text>
-							<text>{{ i.created_at ? $moment(i.created_at).format('YYYY年MM月DD日 HH:mm') : '' }}</text>
-						</view>
-
-						<u-button ripple shape="circle" :custom-style="payBtnStyle" :throttle-time="2000" @click="$u.route({
-                              url: '/package_sub/pages/AddOrder/AddOrder',
-                              params: {
-                                order_id: i.id,
-                                type: i.type,
-                                site_id: i.hospital.site_id
-                              }
-                            })">{{ i.pay_status === 0 ? '立即支付' : '查看订单' }}</u-button>
-					</view>
 				</view>
 
 				<u-loadmore :status="loadStatus" bgColor="#f2f2f2"></u-loadmore>
@@ -122,12 +126,12 @@
 					this.loadStatus = 'loading'
 					const res = await this.$u.api.accompanyOrders(this.select);
 					console.log(res);
-					this.total = res.total;
+					this.total = res.order.total;
 					if (isRefresh) {
 						this.list.length = 0;
 					}
-					this.list.push(...res.data)
-					if (this.list.length >= res.total) {
+					this.list.push(...res.order.data)
+					if (this.list.length >= res.order.total) {
 						this.loadStatus = 'nomore'
 					} else {
 						this.loadStatus = 'loadmore'
diff --git a/package_sub/pages/ServeForm/ServeForm.vue b/package_sub/pages/ServeForm/ServeForm.vue
index 20da8e1..75430c7 100644
--- a/package_sub/pages/ServeForm/ServeForm.vue
+++ b/package_sub/pages/ServeForm/ServeForm.vue
@@ -9,7 +9,14 @@
 					<view class="form-card form-card-1">
 						<u-form :model="form" :rules="rules" ref="uForm" :label-width="178" :error-type="['toast']">
 							<u-form-item label="姓名" prop="name" required>
-								<u-input v-model="form.name" placeholder="请填写姓名" />
+								<!-- <u-input v-model="form.name" placeholder="请填写姓名" /> -->
+								<u-input
+								  :type="'select'"
+								  placeholder="请选择人员"
+								  :value="form.name"
+								  :select-open="isShowArchive"
+								  @click="isShowArchive = true"
+								/>
 							</u-form-item>
 							<u-form-item label="性别" prop="sex" required>
 								<view slot="right">
@@ -63,12 +70,65 @@
 			:list="list_relationship"></u-select>
 		<!-- 咨询类别 -->
 		<u-select v-model="isShowType" value-name="value" @confirm="confirmType" label-name="label"
-			:list="list_type"></u-select>
+			:list="list_type"></u-select>
+		
+		
+		<!-- 选择就诊人，可以新增 -->
+		<u-popup
+		  v-model="isShowArchive"
+		  mode="bottom"
+		  safe-area-inset-bottom
+		  closeable
+		  :border-radius="10"
+		  :height="800"
+		>
+		  <view class="service-list" style="padding-bottom: 120rpx">
+		    <view
+		      class="service-list-item"
+		      v-for="(item, i) in list_archive"
+		      :key="i"
+		      @click="confirmArchive(item)"
+		    >
+		      <view class="service-list-item__namewrap">
+		        <view class="service-list-item__name">
+		          {{ item.name }}
+		        </view>
+		        <view class="service-list-item__price">
+		          {{ item.mobile }}
+		        </view>
+		      </view>
+		      <view class="service-list-item__address">
+		        <text>{{ item.address }}</text>
+				<view class="icon">
+					<u-icon name="edit-pen" :size="40" color="#999999" @tap="editUser(item),$event.stopPropagation()"></u-icon>
+				</view>
+		      </view>
+		    </view>
+		  </view>
+		  <view class="service-list-btn">
+		    <u-button
+		      shape="circle"
+		      ripple
+		      :custom-style="orderBtnStyle"
+		      @click="addArchive"
+		      >新增被服务人</u-button
+		    >
+		  </view>
+		</u-popup>
+		<!-- 新增就诊人 -->
+		<service-archive
+		  ref="serviceArchive"
+		  @addSuccess="addSuccess"
+		></service-archive>
 	</view>
 </template>
 
-<script>
-	export default {
+<script>
+	import serviceArchive from "@/component/serviceArchive/service-archive.vue";
+	export default {
+		components: {
+		  serviceArchive,
+		},
 		data() {
 			return {
 				orderBtnStyle: {
@@ -83,7 +143,9 @@
 				serve_hospital_id: '',
 				serve_hospital_department_id: '',
 				info: {},
-				department_name: '',
+				department_name: '',
+				isShowArchive: false,
+				list_archive: [],
 				form: {
 					name: '',
 					sex: '男',
@@ -179,8 +241,10 @@
 		},
 		onLoad(options) {
 			this.serve_hospital_id = options.id ? options.id : ''
-			this.serve_hospital_department_id = options.department_id ? options.department_id : ''
-			this.getDetail()
+			this.serve_hospital_department_id = options.department_id ? options.department_id : ''
+			this.getUserArchive();
+			this.getDetail()
+			
 		},
 		methods: {
 			async getDetail() {
@@ -193,7 +257,52 @@
 						this.department_name = item.name
 					}
 				})
-			},
+			},
+			async getUserArchive() {
+			  const res = await this.$u.api.userArchive({
+			    page: 1,
+			    page_size: 999,
+			  });
+			  this.list_archive = res.data;
+			},
+			// 服务对象
+			confirmArchive(e) {
+			  this.form.name = e.name
+			  this.form.mobile = e.mobile
+			  
+			  this.isShowArchive = false;
+			},
+			addArchive() {
+			  this.$refs.serviceArchive.isShow = true;
+			},
+			editUser(item){
+				this.$refs.serviceArchive.form = item
+				this.$refs.serviceArchive.isShow = true;
+			},
+			delUser(item){
+				uni.showModal({
+					title:'确认删除该人员？',
+					success:async (res)=>{
+						if(res.confirm){
+							try {
+								if (!item?.id) return
+								const res = await this.$u.api.userArchiveDestroy({
+									id: item?.id
+								})
+								this.getUserArchive()
+							} catch (err) {
+								console.error(err)
+							}
+						}
+					}
+				})
+			},
+			addSuccess(e) {
+			  if (e) {
+			    this.getUserArchive();
+			  }
+			},
+			
 			confirmSex(e) {
 				this.form.sex = e
 			},
@@ -322,7 +431,65 @@
 		::v-deep .form-card-2 .u-input__input {
 			text-align: left;
 		}
-
-
+	}
+	.service-list {
+	  padding-top: 80rpx;
+	
+	  &-item {
+	    border: 2rpx solid #e6e6eb;
+	    border-radius: 10rpx;
+	    background-color: #ffffff;
+	    margin: 0 25rpx;
+	    padding: 28rpx 39rpx;
+	    display: flex;
+	    align-items: center;
+	    flex-wrap: wrap;
+	
+	    &__namewrap {
+	      display: flex;
+	      align-items: center;
+	      width: 100%;
+	    }
+	
+	    &__address {
+		  margin-top:10rpx;
+	      width: 100%;
+	      padding-left: 14rpx;
+		  display: flex;
+		  justify-content: space-between;
+		  align-items: center;
+	    }
+	
+	    &__icon {
+	      display: flex;
+	      justify-content: center;
+	      align-items: center;
+	      // background: #f9f5e9;
+	      // padding: 20rpx;
+	    }
+	
+	    &__name {
+	      padding-left: 14rpx;
+	      font-size: 28rpx;
+	      color: #333333;
+	      font-weight: 500;
+	    }
+	
+	    &__price {
+	      color: #c20d12;
+	      font-weight: 500;
+	      margin-left: auto;
+	    }
+	  }
+	
+	  &-btn {
+	    position: fixed;
+	    bottom: 40rpx;
+	    left: calc(50% - 144rpx);
+	  }
+	
+	  &-item + &-item {
+	    margin-top: 20rpx;
+	  }
 	}
 </style>
\ No newline at end of file
diff --git a/package_sub/pages/ServiceDetail/ServiceDetail.vue b/package_sub/pages/ServiceDetail/ServiceDetail.vue
index 956c874..a2257ff 100644
--- a/package_sub/pages/ServiceDetail/ServiceDetail.vue
+++ b/package_sub/pages/ServiceDetail/ServiceDetail.vue
@@ -120,6 +120,11 @@
 		},
 		mounted() {
 
+		},
+		computed: {
+			token() {
+				return this.vuex_token || uni.getStorageSync('lifeData')?.vuex_token
+			}
 		},
 		methods: {
 			async getDetail(id) {
@@ -131,7 +136,26 @@
 				})
 
 			},
-			toOrder(info) {
+			toOrder(info) {
+			  if (!this.token) {
+			  	uni.showModal({
+			  		title: "提示",
+			  		content: "请先登录再下单",
+			  		confirmText: "登录",
+			  		success: (status) => {
+			  			if (status.confirm) {
+			  				this.$u.route({
+			  					url: '/pages/login/login',
+			  					type: 'redirect'
+			  				})
+			  			} else {
+			  
+			  			}
+			  		},
+			  		fail: () => {},
+			  	});
+			  	return
+			  }
 			  this.$u.route({
 			    url: '/package_sub/pages/AddOrder/AddOrder?id='+info.id+'&site_id='+info.site_id+'&type='+info.type
 			  })
diff --git a/package_sub/pages/ServiceList/ServiceList.vue b/package_sub/pages/ServiceList/ServiceList.vue
index c5f463f..34841a5 100644
--- a/package_sub/pages/ServiceList/ServiceList.vue
+++ b/package_sub/pages/ServiceList/ServiceList.vue
@@ -36,7 +36,7 @@
 							</view>
 							<view class="right">
 								<u-button shape="circle" ripple :custom-style="orderBtnStyle"
-									@click.stop="toOrder(item)">预约</u-button>
+									@click.stop="toDetail(item)">预约</u-button>
 							</view>
 						</view>
 						<u-loadmore :margin-top="20" :status="loadStatus" bgColor="#f2f2f2"></u-loadmore>
diff --git a/package_sub/pages/UserArchive/UserArchive.vue b/package_sub/pages/UserArchive/UserArchive.vue
index 6c2f88a..b739e00 100644
--- a/package_sub/pages/UserArchive/UserArchive.vue
+++ b/package_sub/pages/UserArchive/UserArchive.vue
@@ -17,7 +17,7 @@
 		</view>
 		<view class="addSite" @tap="addArchive">
 			<view class="add">
-				<u-icon name="plus" color="#ffffff" class="icon" :size="30"></u-icon>新增就诊人
+				<u-icon name="plus" color="#ffffff" class="icon" :size="30"></u-icon>新增被服务人
 			</view>
 		</view>
 		<u-modal v-model="show" content="确认操作？" show-cancel-button @confirm="destroy"></u-modal>
diff --git a/pages.json b/pages.json
index eab6429..0d83496 100644
--- a/pages.json
+++ b/pages.json
@@ -44,6 +44,12 @@
             "navigationBarTitleText": "预约陪诊"
           }
         },
+		{
+		  "path": "pages/AddOrder/editOrder",
+		  "style": {
+		    "navigationBarTitleText": "预约陪诊"
+		  }
+		},
         {
           "path": "pages/ServiceList/ServiceList",
           "style": {
@@ -67,7 +73,7 @@
         {
           "path": "pages/UserArchive/UserArchive",
           "style": {
-            "navigationBarTitleText": "我的服务人员",
+            "navigationBarTitleText": "被服务人",
             "enablePullDownRefresh": true
           }
         },
@@ -138,11 +144,11 @@
             "navigationStyle": "custom"
           }
         },
-		// 就医服务
+		// 就医咨询
 		{
 		  "path": "pages/ServeHospital/ServeHospital",
 		  "style": {
-		    "navigationBarTitleText": "就医服务",
+		    "navigationBarTitleText": "就医咨询",
 		    "enablePullDownRefresh": true
 		  }
 		},
@@ -161,14 +167,14 @@
 		{
 		  "path": "pages/ServeOrder/ServeOrder",
 		  "style": {
-		    "navigationBarTitleText": "就医服务",
+		    "navigationBarTitleText": "就医咨询",
 		    "enablePullDownRefresh": true
 		  }
 		},
 		{
 		  "path": "pages/ServeOrderDetail/ServeOrderDetail",
 		  "style": {
-		    "navigationBarTitleText": "就医服务",
+		    "navigationBarTitleText": "就医咨询",
 		    "enablePullDownRefresh": true
 		  }
 		},
@@ -182,7 +188,7 @@
 		{
 		  "path": "pages/type/service",
 		  "style": {
-		    "navigationBarTitleText": "就医服务",
+		    "navigationBarTitleText": "就医咨询",
 		    "enablePullDownRefresh": true
 		  }
 		},
@@ -206,7 +212,7 @@
   "preloadRule": {},
   "globalStyle": {
     "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "uni-app",
+    "navigationBarTitleText": "四世同堂整合照护平台",
     "navigationBarBackgroundColor": "#F8F8F8",
     "backgroundColor": "#F8F8F8"
   },
diff --git a/pages/index/index.vue b/pages/index/index.vue
index cb886be..fcae3d5 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -15,7 +15,7 @@
 				</view>
 			</view>
 
-			<view class="search">
+			<!-- <view class="search">
 				<view class="search__icon">
 					<u-icon name="search" size="50" color="#999"></u-icon>
 				</view>
@@ -23,16 +23,15 @@
 					<u-input :clearable="false" :value="select.keyword" placeholder="请输入要搜索的内容" height="56"
 						:custom-style="inputStyle" @input="searchInput"></u-input>
 				</view>
-			</view>
+			</view> -->
 
-			<view v-if="isShowSticky" class="search-sticky" :style="{
+			<!-- <view v-if="isShowSticky" class="search-sticky" :style="{
           'padding-top': statusBarHeight + 'px',
           'padding-right': menuButtonRight + 'px',
         }">
 				<view class="search-sticky__position" @click="isShowSite = true">
 					<u-icon name="map-fill"></u-icon>
 					<view>{{ vuex_site.name }}</view>
-					<!--          <view>{{ vuex_location.city.replace(/(市|区|县)/, "") }}</view>-->
 					<u-icon name="arrow-down" size="22"></u-icon>
 				</view>
 
@@ -42,9 +41,9 @@
 							@input="searchInput"></u-input>
 					</view>
 				</view>
-			</view>
+			</view> -->
 
-			<view class="swiper">
+			<view class="swiper" style="padding-top:30rpx">
 				<u-swiper :height="366" :list="banners" name="url"></u-swiper>
 			</view>
 			<view class="links-title">
@@ -151,7 +150,8 @@
 		<u-top-tips :navbar-height="navbarHeight" ref="uTips"></u-top-tips>
 
 		<tabbar />
-		<PrivacyPopup />
+		<PrivacyPopup />
+		<floatPhone></floatPhone>
 	</view>
 </template>
 
@@ -271,8 +271,8 @@
 			confirmSite(e) {
 				this.$u.vuex('vuex_site', e[0])
 				this.getHospital()
-				this.getBanner()
-				this.getPhotos()
+				// this.getBanner()
+				// this.getPhotos()
 			},
 			goLinks(item) {
 				if (item.to) {
@@ -305,7 +305,7 @@
 				try {
 					const res = await this.$u.api.banner({
 						position: 1,
-						site_id: this.vuex_site.id ? this.vuex_site.id : '',
+						// site_id: this.vuex_site.id ? this.vuex_site.id : '',
 					});
 					this.banners = res.map((i) => ({
 						...i,
@@ -317,7 +317,7 @@
 				try {
 					const res = await this.$u.api.banner({
 						position: 2,
-						site_id: this.vuex_site.id ? this.vuex_site.id : '',
+						// site_id: this.vuex_site.id ? this.vuex_site.id : '',
 					});
 					this.photos = res
 				} catch (err) {}
diff --git a/pages/me/me.vue b/pages/me/me.vue
index b6f7d53..3751342 100644
--- a/pages/me/me.vue
+++ b/pages/me/me.vue
@@ -37,11 +37,18 @@
 				<image class="tab__icon" mode="aspectFit" src="~@/static/me/peizheng.png"></image>
 				<view>陪诊订单</view>
 			</view>
-			<view class="tab" @click="$u.route({
-              url: '/package_sub/pages/Shop/Order'
-            })">
-				<image class="tab__icon" mode="aspectFit" src="~@/static/me/shangcheng.png"></image>
-				<view>商城订单</view>
+			<view class="tab" @click="$u.route({
+			  url: '/package_sub/pages/OrderList/OrderList',
+			  params: {
+			    pay_status: 4
+			  }
+			})">
+				<image class="tab__icon" mode="aspectFit" src="~@/static/me/shouhou.png"></image>
+				<view>陪诊售后</view>
+			</view>
+			<view class="tab" @click="$u.throttle($u.route({ url: '/package_sub/pages/UserArchive/UserArchive' }))">
+				<image class="tab__icon" mode="aspectFit" src="~@/static/me/lianxiren.png"></image>
+				<view>被服务人</view>
 			</view>
 			<!-- <view class="tab"
             @click="$u.route({
@@ -60,7 +67,15 @@
 	          }
 	        })">
 				<image class="tab__icon" mode="aspectFit" src="~@/static/me/jujia.png"></image>
-				<view>就医服务订单</view>
+				<view>就医咨询</view>
+			</view>
+			
+
+			<view class="tab" @click="$u.route({
+			  url: '/package_sub/pages/Shop/Order'
+			})">
+				<image class="tab__icon" mode="aspectFit" src="~@/static/me/shangcheng.png"></image>
+				<view>商城订单</view>
 			</view>
 			<view class="tab" @click="$u.route({
               url: '/package_sub/pages/UserAddress/UserAddress'
@@ -68,19 +83,6 @@
 				<image class="tab__icon" mode="aspectFit" src="~@/static/me/dizhi.png"></image>
 				<view>收货地址</view>
 			</view>
-			<view class="tab" @click="$u.throttle($u.route({ url: '/package_sub/pages/UserArchive/UserArchive' }))">
-				<image class="tab__icon" mode="aspectFit" src="~@/static/me/lianxiren.png"></image>
-				<view>常用联系人</view>
-			</view>
-			<view class="tab" @click="$u.route({
-              url: '/package_sub/pages/OrderList/OrderList',
-              params: {
-                pay_status: 4
-              }
-            })">
-				<image class="tab__icon" mode="aspectFit" src="~@/static/me/shouhou.png"></image>
-				<view>售后订单</view>
-			</view>
 		</view>
 		<view class="panel panel2">
 			<button class="row" open-type="share">
@@ -91,7 +93,7 @@
         <u-icon class="row__icon" name="man-add"></u-icon>
         <view>加入我们</view>
       </view> -->
-			<view class="row" @click="isShowModal = true">
+			<view class="row" @click="makeCall">
 				<u-icon class="row__icon" name="kefu-ermai"></u-icon>
 				<view>联系我们</view>
 			</view>
@@ -171,6 +173,17 @@
 				uni.switchTab({
 					url: '/pages/order/order'
 				})
+			},
+			makeCall() {
+			  uni.makePhoneCall({
+			    phoneNumber: '0519-81191800', // 这里替换为你要拨打的电话号码
+			    success: function () {
+			      console.log('拨打电话成功！')
+			    },
+			    fail: function () {
+			      console.log('拨打电话失败！')
+			    }
+			  })
 			},
 			nicknameChange(e) {
 				this.form.nickname = e.target.value
diff --git a/pages/order/order.vue b/pages/order/order.vue
index 885aa6c..85a4fd5 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -5,9 +5,10 @@
 				<u-tabs-swiper :height="76" :font-size="24" active-color="#c20d12" bg-color="transparent"
 					inactive-color="#999" ref="tabs" :list="tabs" :current="swiperCurrent" @change="change"
 					:is-scroll="false" :offset="[5, 5]" swiperWidth="750"></u-tabs-swiper>
-			</view>
-			<swiper class="swiper-box" :current="swiperCurrent" @transition="transition"
-				@animationfinish="animationfinish">
+			</view>
+			<!-- @transition="transition"
+				@animationfinish="animationfinish" -->
+			<swiper class="swiper-box" :current="swiperCurrent" @animationfinish="animationfinish" >
 				<swiper-item class="swiper-item" v-for="(swiper, swiperIndex) in tabs" :key="swiperIndex">
 					<scroll-view scroll-y style="height: 100%; width: 100%" @scrolltolower="reachBottom">
 						<view>
@@ -16,14 +17,15 @@
 									<view class="title__name">
 										<u-tag size="mini" type="primary" mode="dark" shape="circleLeft"
 											:text="i.type === 1 ? '陪诊' : '陪护'"></u-tag>
-										<text style="padding-left: 10rpx;">专享半天陪诊</text>
+										<text style="padding-left: 10rpx;">{{i.accompany_product?i.accompany_product.name:''}}</text>
 									</view>
 									<view class="title__status">{{ statusFormat(i.pay_status) }}</view>
 								</view>
 
 								<view class="price">
-									<view class="price-icon">
-										<u-icon :name="i.cover ? i.cover.url : vuex_default_icon" size="30"></u-icon>
+									<view class="price-icon">
+										<image style="width:90rpx" mode="widthFix" :src="i.accompany_product?(i.accompany_product.cover?i.accompany_product.cover.url:vuex_default_icon):vuex_default_icon"></image>
+										<!-- <u-icon :name="" size="30"></u-icon> -->
 									</view>
 
 									<view class="price-text">
@@ -34,40 +36,48 @@
 								</view>
 
 								<view class="info" @click.stop.native="$u.route({
-                              url: '/package_sub/pages/AddOrder/AddOrder',
-                              params: {
-                                order_id: i.id,
-                                type: i.type,
-                                site_id: i.hospital.site_id
-                              }
-                            })">
+									  url: '/package_sub/pages/AddOrder/AddOrder',
+									  params: {
+										order_id: i.id,
+										type: i.type,
+										site_id: i.hospital?i.hospital.site_id:''
+									  }
+									})">
 									<view class="info__item">
-										<text>就诊人</text>
+										<text>{{i.type == 1 ? '被服务人' : '被服务人'}}</text>
 										<text>{{ i.user_archive ? i.user_archive.name : i.user_archive_id }}</text>
 									</view>
-									<view class="info__item">
-										<text>就诊城市</text>
-										<text>{{ i.city || ((i.hospital && i.hospital.site) ? i.hospital.site.name : "") || " " }}</text>
-									</view>
 									<view class="info__item flex100">
+										<text>{{(i.type == 1 ? '就诊' : '服务') + '时间'}}</text>
+										<text>{{ i.time ? $moment(i.time).format('YYYY年MM月DD日 HH:mm') : '' }}</text>
+									</view>
+									<view class="info__item"  v-if="i.type==2">
+										<text>详细地址</text>
+										<text>{{ i.city || " " }}</text>
+									</view>
+									<view class="info__item flex100" v-if="i.type==1">
 										<text>就诊医院</text>
 										<text>{{ i.hospital ? i.hospital.name : '' }}</text>
-									</view>
-
-									<view class="info__item flex100">
-										<text>就诊时间</text>
-										<text>{{ i.time ? $moment(i.time).format('YYYY年MM月DD日 HH:mm') : '' }}</text>
+									</view>
+									<view class="info__item flex100">
+										<text>下单时间： </text>
+										<text>{{ i.created_at ? $moment(i.created_at).format('YYYY年MM月DD日 HH:mm') : '' }}</text>
 									</view>
 								</view>
 
 								<view class="bottom">
-									<view class="row1">
-										<view class="time">
-											<text>下单时间： </text>
-											<text>{{ i.created_at ? $moment(i.created_at).format('YYYY年MM月DD日 HH:mm') : '' }}</text>
-										</view>
-
-										<u-button ripple shape="circle" :custom-style="payBtnStyle"
+									<view class="row1" style="justify-content: flex-end;">
+										<u-button v-if="i.pay_status === 0" ripple shape="circle" :custom-style="editBtnStyle"
+														:throttle-time="2000" @click="$u.route({
+										  url: '/package_sub/pages/AddOrder/editOrder',
+										  params: {
+										    order_id: i.id,
+										    type: i.type,
+										    site_id: i.hospital ? i.hospital.site_id : ''
+										  }
+										})">修改信息</u-button>
+										
+										<u-button style="margin-left:20rpx" ripple shape="circle" :custom-style="payBtnStyle"
 											:throttle-time="2000" @click="$u.route({
                               url: '/package_sub/pages/AddOrder/AddOrder',
                               params: {
@@ -95,6 +105,7 @@
 
 		</view>
 		<Tabbar />
+		<floatPhone></floatPhone>
 	</view>
 </template>
 
@@ -105,7 +116,16 @@
 			Tabbar,
 		},
 		data() {
-			return {
+			return {
+				editBtnStyle:{
+					"background-image": "linear-gradient(-90deg, #ddd 0%, #ccc 94%, #ccc 100%)",
+					"font-weight": "500",
+					"font-size": "28rpx",
+					color: "#fff",
+					width: "185rpx",
+					height: "60rpx",
+					"line-height": "60rpx",
+				},
 				payBtnStyle: {
 					"background-image": "linear-gradient(-90deg, #e26165 0%, #c10d12 94%, #c10d12 100%)",
 					"font-weight": "500",
@@ -187,7 +207,8 @@
 				this.getOrder()
 			},
 			// tab栏切换
-			change(index) {
+			change(index) {
+				console.log("index",index)
 				this.swiperCurrent = index;
 			},
 			transition({
@@ -217,12 +238,16 @@
 					this.loadStatus[this.swiperCurrent] = 'loading'
 					const res = await this.$u.api.accompanyOrders(this.select);
 					console.log(res);
-					this.tabs[this.swiperCurrent].count = res.total;
+					this.tabs[0].count = res.pay_status_count_0+res.pay_status_count_1+res.pay_status_count_2+res.pay_status_count_3;
+					this.tabs[1].count = res.pay_status_count_0;
+					this.tabs[2].count = res.pay_status_count_1;
+					this.tabs[3].count = res.pay_status_count_2;
+					this.tabs[4].count = res.pay_status_count_3;
 					if (isRefresh) {
 						this.list[this.swiperCurrent].length = 0;
 					}
-					this.list[this.swiperCurrent].push(...res.data)
-					if (this.list[this.swiperCurrent].length >= res.total) {
+					this.list[this.swiperCurrent].push(...res.order.data)
+					if (this.list[this.swiperCurrent].length >= res.order.total) {
 						this.loadStatus[this.swiperCurrent] = 'nomore'
 					} else {
 						this.select.page++;
@@ -339,7 +364,7 @@
 				width: 90rpx;
 				height: 84rpx;
 				border-radius: 10rpx;
-				background-color: #f3e7d8;
+				// background-color: #f3e7d8;
 			}
 
 			&-text {