diff --git a/common/config.js b/common/config.js
index 4e7f758..89b2d43 100644
--- a/common/config.js
+++ b/common/config.js
@@ -1,14 +1,14 @@
 const mode = 'devOnline'; //devLocal：本地测试、devOnline：线上测试、production：生产环境
-let ROOTPATH = '';  //域名
+let ROOTPATH = 'http://yikangyang.ali251.langye.net';  //域名
 switch (mode) {
 	case 'devLocal':
-		ROOTPATH = "http://yikangyang.ali251.langye.net"
+		ROOTPATH = ROOTPATH
 		break;
 	case 'devOnline':
-		ROOTPATH = "http://yikangyang.ali251.langye.net"
+		ROOTPATH = ROOTPATH
 		break;
 	case 'production':
-		ROOTPATH = "https://xxxxx.cn"
+		ROOTPATH = ROOTPATH
 		break;
 	default:
 		throw new Error('未配置环境');
diff --git a/common/http.api.js b/common/http.api.js
index 80da9c8..7e0d229 100644
--- a/common/http.api.js
+++ b/common/http.api.js
@@ -1,26 +1,121 @@
-//api集合
-let apiApp = {
-	login: '/api/mobile/user/applet-login',
-	userInfo: '/api/mobile/user/get-user-info',
-
-
-}
-
-// 此处第二个参数vm，就是我们在页面使用的this，你可以通过vm获取vuex等操作
-const install = (Vue, vm) => {
-
-	//api方法
-	//
-	const login = (params = {}) => vm.$u.get(apiApp.login, params)
-	const getUserInfo = () => vm.$u.get(apiApp.userInfo)
-	// end
-
+//api集合
+let apiApp = {
+	// 用户
+	login: '/api/mobile/user/applet-login',
+	userInfo: '/api/mobile/user/get-user-info',
+	updateUser: '/api/mobile/user/update-user',
+	getMobile: '/api/mobile/user/mobile',
+	// 用户订单
+	accompanyOrders: '/api/mobile/user/accompany-orders',
+	accompanyOrdersDetail: '/api​/mobile​/user​/accompany-orders-detail',
+	// 医院 陪护下单
+	listHospital: '/api/mobile/hospital/hospital',
+	detailHospital: '/api/mobile/hospital/hospital-detail',
+	accompanyProduct: '/api/mobile/hospital/accompany-product',
+	accompanyProductDetail: '/api/mobile/hospital/accompany-product-detail',
+	accompanyProductOrder: '/api/mobile/hospital/accompany-order',
+	accompanyPay: '/api/mobile/hospital/accompany-pay',
+	// 服务对象
+	userArchive: '/api/mobile/user-archive/index',
+	userArchiveShow: '/api/mobile/user-archive/show',
+	userArchiveSave: '/api/mobile/user-archive/save',
+	userArchiveDestroy: '/api/mobile/user-archive/destroy',
+	// 其他
+	otherBanner: '/api/mobile/other/banner',
+	otherSite: '/api/mobile/other/site',
+	otherArticleType: '/api/mobile/other/article-type',
+	otherArticle: '/api/mobile/other/article',
+	otherArticleDetail: '/api/mobile/other/article-detail',
+	otherUpload: '/api/mobile/upload-file',
+	//商城
+	productCategory: '/api/mobile/product/product-category',
+	productList: '/api/mobile/product/product',
+	productDetail: '/api/mobile/product/product-detail',
+	productOrder: '/api/mobile/product/order',
+	productPay: '/api/mobile/product/pay',
+	// 收货地址
+	userAddress: '/api/mobile/user-address/index',
+	userAddressShow: '/api/mobile/user-address/show',
+	userAddressSave: '/api/mobile/user-address/save',
+	userAddressDestroy: '/api/mobile/user-address/destroy',
+	// 用户商城订单
+	userOrders: '/api/mobile/user/orders',
+	userOrdersDetail: '/api/mobile/user/orders-detail',
+
+
+
+}
+
+// 此处第二个参数vm，就是我们在页面使用的this，你可以通过vm获取vuex等操作
+const install = (Vue, vm) => {
+
+	//api方法
+	//
+	const login = (params = {}) => vm.$u.get(apiApp.login, params)
+	const getUserInfo = () => vm.$u.get(apiApp.userInfo)
+	const updateUser = (params = {}) => vm.$u.post(apiApp.updateUser, params)
+	const getMobile = (params = {}) => vm.$u.get(apiApp.getMobile, params)
+	// 用户订单
+	const accompanyOrders = (params = {}) => vm.$u.get(apiApp.accompanyOrders, params)
+	const accompanyOrdersDetail = (params = {}) => vm.$u.get(apiApp.accompanyOrdersDetail, params)
+	// 医院 陪护下单
+	const listHospital = (params = {}) => vm.$u.get(apiApp.listHospital, params)
+	const detailHospital = (params = {}) => vm.$u.get(apiApp.detailHospital, params)
+	const accompanyProduct = (params = {}) => vm.$u.get(apiApp.accompanyProduct, params)
+	const accompanyProductDetail = (params = {}) => vm.$u.get(apiApp.accompanyProductDetail, params)
+	const accompanyProductOrder = (params = {}) => vm.$u.post(apiApp.accompanyProductOrder, params)
+	const accompanyPay = (params = {}) => vm.$u.post(apiApp.accompanyPay, params)
+	// 服务对象
+	const userArchive = (params = {}) => vm.$u.get(apiApp.userArchive, params)
+	const userArchiveShow = (params = {}) => vm.$u.get(apiApp.userArchiveShow, params)
+	const userArchiveSave = (params = {}) => vm.$u.post(apiApp.userArchiveSave, params)
+	const userArchiveDestroy = (params = {}) => vm.$u.get(apiApp.userArchiveDestroy, params)
+	// 其他
+	const otherBanner = (params = {}) => vm.$u.get(apiApp.otherBanner, params)
+	const otherSite = (params = {}) => vm.$u.get(apiApp.otherSite, params)
+	const otherArticleType = (params = {}) => vm.$u.get(apiApp.otherArticleType, params)
+	const otherArticle = (params = {}) => vm.$u.get(apiApp.otherArticle, params)
+	const otherArticleDetail = (params = {}) => vm.$u.get(apiApp.otherArticleDetail, params)
+	const otherUpload = (params = {}) => vm.$u.post(apiApp.accompanyPay, params)
+	// 商城
+	const productCategory = (params = {}) => vm.$u.get(apiApp.productCategory, params)
+	const productList = (params = {}) => vm.$u.get(apiApp.productList, params)
+	const productDetail = (params = {}) => vm.$u.get(apiApp.productDetail, params)
+	const productOrder = (params = {}) => vm.$u.get(apiApp.productOrder, params)
+	const productPay = (params = {}) => vm.$u.get(apiApp.productPay, params)
+	// 收货地址
+	const userAddress = (params = {}) => vm.$u.get(apiApp.userAddress, params)
+	const userAddressShow = (params = {}) => vm.$u.get(apiApp.userAddressShow, params)
+	const userAddressSave = (params = {}) => vm.$u.post(apiApp.userAddressSave, params)
+	const userAddressDestroy = (params = {}) => vm.$u.get(apiApp.userAddressDestroy, params)
+	// 用户商城订单
+	const userOrders = (params = {}) => vm.$u.get(apiApp.userOrders, params)
+	const userOrdersDetail = (params = {}) => vm.$u.get(apiApp.userOrdersDetail, params)
+
+	// end
+
 	vm.$u.api = {
-		login,
-		getUserInfo
-	};
-}
-
-export default {
-	install
-}
+		// 用户
+		login,getUserInfo,updateUser,getMobile,
+		//用户订单
+		accompanyOrders,accompanyOrdersDetail,
+		// 医院 陪护下单
+		listHospital,detailHospital,accompanyProduct,accompanyProductDetail,accompanyProductOrder,accompanyPay,
+		// 服务对象
+		userArchive,userArchiveShow,userArchiveSave,userArchiveDestroy,
+		// other
+		otherBanner,otherSite,otherArticleType,otherArticle,otherArticleDetail,otherUpload,
+		// 商城
+		productCategory,productList,productDetail,productOrder,productPay,
+		// 收货地址
+		userAddress,userAddressShow,userAddressSave,userAddressDestroy,
+		// 用户商城订单
+		userOrders,userOrdersDetail,
+		
+
+	};
+}
+
+export default {
+	install
+}
\ No newline at end of file
diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index 2f1fcce..f509438 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -50,7 +50,7 @@ const install = (Vue, vm) => {
 				} else {
 					uni.showToast({
 						icon: "none",
-						title: "系统错误"
+						title: res.errmsg||"系统错误"
 					})
 					return false
 				}
diff --git a/component/serviceArchive/service-archive.vue b/component/serviceArchive/service-archive.vue
new file mode 100644
index 0000000..96c7a15
--- /dev/null
+++ b/component/serviceArchive/service-archive.vue
@@ -0,0 +1,195 @@
+<template>
+	<view class="container" v-show="isShow">
+		<u-popup v-model="isShow" mode="bottom" safe-area-inset-bottom :border-radius="0" height="100%">
+			<view style="padding:34rpx 44rpx">
+				<u-form :model="form" :rules="rules" ref="uForm1" label-width="140"
+				:error-type="['toast']">
+					<u-form-item label="姓名" prop="name" required>
+						<u-input v-model="form.name" placeholder="请输入姓名"/>
+					</u-form-item>
+					<u-form-item label="身份证号" prop="idcard" required>
+						<u-input v-model="form.idcard" placeholder="请输入身份证号" type="idcard" />
+					</u-form-item>
+					<u-form-item label="手机号" prop="mobile" required>
+						<u-input v-model="form.mobile" placeholder="请输入手机号" type="number" />
+					</u-form-item>
+					<u-form-item label="有无行动能力" prop="is_move">
+						<u-radio-group v-model="form.is_move" slot="right" active-color="#c20d12">
+							<u-radio :name="1">有</u-radio>
+							<u-radio :name="0">无</u-radio>
+						</u-radio-group>
+					</u-form-item>
+					<u-form-item label="地址" prop="address" required>
+						<u-input v-model="form.address" placeholder="请输入地址" />
+					</u-form-item>
+					<u-form-item label="备注" prop="remark">
+						<u-input v-model="form.remark" placeholder="请输入备注" />
+					</u-form-item>
+				</u-form>
+			</view>
+			<view class="archive-btn">
+				<u-button shape="circle" ripple :custom-style="btnStyle1" @click="cancel">取消</u-button>
+				
+				<u-button shape="circle" ripple :custom-style="btnStyle" @click="save">确认</u-button>
+				
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				btnStyle: {
+					'background-image': 'linear-gradient(-90deg, #e26165 0%, #c10d12 94%, #c10d12 100%)',
+					'font-weight': '500',
+					'font-size': '28rpx',
+					'color': '#fff',
+					'width': '436rpx',
+					'margin': '0 auto',
+					'letter-spacing': '2rpx',
+					'width':'80%'
+				},
+				btnStyle1: {
+					'background-image': 'linear-gradient(-90deg, #ddd 0%, #ccc 94%, #eee 100%)',
+					'font-weight': '500',
+					'font-size': '28rpx',
+					'color': '#fff',
+					'width': '436rpx',
+					'margin': '0 auto',
+					'letter-spacing': '2rpx',
+					'width':'80%'
+				},
+				isShow: false,
+				form: {
+					name: '',
+					idcard:'',
+					mobile:'',
+					is_move:1,
+					address:'',
+					remark:''
+				},
+				rules: {
+					name: [{
+						required: true,
+						message: '请输入姓名',
+						trigger: ['blur', 'change']
+					}],
+					idcard: [{
+						required: true,
+						message: '请输入身份证号',
+						trigger: ['blur', 'change']
+					}, {
+						// 自定义验证函数，见上说明
+						validator: (rule, value, callback) => {
+							return this.$u.test.idCard(value);
+						},
+						message: '身份证号不正确',
+						// 触发器可以同时用blur和change
+						trigger: ['change', 'blur'],
+					}],
+					mobile: [{
+						required: true,
+						message: '请输入手机号',
+						trigger: ['blur', 'change']
+					}, {
+						// 自定义验证函数，见上说明
+						validator: (rule, value, callback) => {
+							return this.$u.test.mobile(value);
+						},
+						message: '手机号码不正确',
+						// 触发器可以同时用blur和change
+						trigger: ['change', 'blur'],
+					}],
+					address: [{
+						required: true,
+						message: '请输入地址',
+						trigger: ['blur', 'change']
+					}]
+				}
+			};
+		},
+		onReady() {
+			this.$refs.uForm1.setRules(this.rules);
+		},
+		methods: {
+			save() {
+				
+				this.$refs.uForm1.validate(valid => {
+					let that = this
+					if (valid) {
+						console.log('验证通过');
+						console.log("form",this.form)
+						console.log("that.$u.api.userArchiveSave",that.$u.api.userArchiveSave)
+						console.log("this.$u.api.userArchiveSave",this.$u.api.userArchiveSave)
+						this.$u.api.userArchiveSave({
+							...that.form
+						}).then(res=>{
+							uni.showToast({
+								title:"创建成功",
+								icon:'none',
+								success() {
+									that.isShow = false
+									that.$emit("addSuccess",true)
+								}
+							})
+						}).then(err=>{
+							console.log("err",err)
+						})
+						
+					} else {
+						console.log('验证失败');
+					}
+				});
+				
+			},
+			cancel(){
+				this.$refs.uForm1.resetFields()
+				this.form = {
+					name: '',
+					idcard:'',
+					mobile:'',
+					is_move:1,
+					address:'',
+					remark:''
+				}
+				this.isShow = false
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background: #fff;
+	}
+</style>
+
+<style lang="scss" scoped>
+	.container {
+		// padding: 34rpx 44rpx;
+		// margin: 34rpx 25rpx 95rpx;
+		// border-radius: 10rpx;
+		filter: drop-shadow(0 0 10rpx rgba(211, 211, 214, 0.3));
+		background-color: #ffffff;
+		height: 100vh;
+		width: 100vw;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 99999;
+
+		::v-deep .u-input__input {
+			text-align: right;
+		}
+		.archive-btn{
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			u-button{
+				width:50%;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/package_sub/pages/AddOrder/AddOrder.vue b/package_sub/pages/AddOrder/AddOrder.vue
index d335673..e64d394 100644
--- a/package_sub/pages/AddOrder/AddOrder.vue
+++ b/package_sub/pages/AddOrder/AddOrder.vue
@@ -1,924 +1,1157 @@
-<template>
-  <view class="page">
-    <image class="bkg" mode="aspectFill" src="~@/package_sub/static/AddOrder/bkg.png"></image>
-
-    <view class="container">
-      <view class="step">
-        <view class="step-item"
-              v-for="(i, index) in stepList"
-              :class="{ 'is-active': currentStep === index }"
-              :key="index">
-          <view class="step-item__dot">
-            <u-icon v-show="currentStep === index" name="checkbox-mark" color="#fff" size="16"></u-icon>
-          </view>
-          <view class="step-item__text">{{ i.name }}</view>
-        </view>
-      </view>
-
-      <view v-if="currentStep === 0">
-        <view class="switch-service">
-          <view class="switch-service__icon">
-            <u-icon name="integral" size="30"></u-icon>
-          </view>
-
-          <view class="switch-service__name">
-            专享半天陪诊
-          </view>
-
-          <view class="switch-service__btn" @click="isShowService = true">
-            <image src="~@/static/switch.png" mode="aspectFit"></image>
-            <text>更换服务</text>
-          </view>
-        </view>
-
-        <u-form :model="form" ref="uForm" :label-width="178" :label-style="{ 'font-weight': '500','font-size': '24rpx' }">
-          <view class="form-card form-card-1">
-            <u-form-item label="就诊城市">
-              <u-input type="select" placeholder="请选择就诊城市" v-model="form.name" :select-open="isShowCity" @click="isShowCity = true"/>
-            </u-form-item>
-            <u-form-item label="就诊医院">
-              <u-input v-model="form.name" placeholder="请输入就诊医院" />
-            </u-form-item>
-            <u-form-item label="就诊时间">
-              <u-input type="select" v-model="form.name" :select-open="isShowTime" @click="isShowTime = true"/>
-            </u-form-item>
-            <u-form-item label="就诊人">
-              <u-input v-model="form.name" />
-            </u-form-item>
-            <u-form-item label="是否可以自理">
-              <u-radio-group v-model="form.name" slot="right" active-color="#c20d12">
-                <u-radio :name="1">是</u-radio>
-                <u-radio :name="0">否</u-radio>
-              </u-radio-group>
-            </u-form-item>
-            <u-form-item label="预约人">
-              <u-input v-model="form.name" placeholder="请填写预约人" />
-            </u-form-item>
-            <u-form-item label="预约人电话">
-              <u-input v-model="form.name" placeholder="请填写预约人电话" />
-            </u-form-item>
-            <u-form-item label="选择陪诊师性别" :border-bottom="false">
-              <u-radio-group v-model="form.name" slot="right" active-color="#c20d12">
-                <u-radio name="男">男</u-radio>
-                <u-radio name="女">女</u-radio>
-                <u-radio name="任意">任意</u-radio>
-              </u-radio-group>
-            </u-form-item>
-          </view>
-
-          <view class="form-card form-card-2">
-            <view class="title">
-              <view class="title__left">
-                <text>上传资料</text>
-                <text>（就诊卡、病例等）</text>
-              </view>
-              <view class="title__right">
-                点击查看示例
-              </view>
-            </view>
-            <u-upload :action="action" :file-list="fileList" ></u-upload>
-          </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.name"
-                       type="textarea"></u-input>
-            </u-form-item>
-          </view>
-        </u-form>
-      </view>
-
-
-      <view v-if="currentStep === 3">
-        <view class="switch-service">
-          <view class="switch-service__icon">
-            <u-icon name="integral" size="30"></u-icon>
-          </view>
-
-          <view class="switch-service__name">
-            <view>医康养 就医省心</view>
-            <view style="font-size: 24rpx;color: #999999;">期待下次为您服务</view>
-          </view>
-
-          <view class="switch-service__btn" style="font-size: 24rpx;color: #999999;">
-            订单已完成
-          </view>
-        </view>
-
-        <view class="desc-card">
-          <view class="desc-card__title">
-            预约信息
-          </view>
-
-          <view class="desc-card__content">
-            <view class="desc-card__content--title">
-              就诊城市
-            </view>
-            <view class="desc-card__content--value">
-              苏州
-            </view>
-            <br>
-
-            <view class="desc-card__content--title">
-              就诊医院
-            </view>
-            <view class="desc-card__content--value">
-              苏打附属
-            </view>
-            <br>
-
-            <view class="desc-card__content--title">
-              就诊时间
-            </view>
-            <view class="desc-card__content--value">
-              2024-11-22
-            </view>
-            <br>
-
-            <view class="desc-card__content--title">
-              预约人
-            </view>
-            <view class="desc-card__content--value">
-              xxx
-            </view>
-            <br>
-
-            <view class="desc-card__content--title">
-              预约人电话
-            </view>
-            <view class="desc-card__content--value">
-              18888888888
-            </view>
-            <br>
-
-            <view class="desc-card__content--title">
-              陪诊师性别
-            </view>
-            <view class="desc-card__content--value">
-              都可以
-            </view>
-            <br>
-
-            <view class="desc-card__content--title">
-              服务需求
-            </view>
-            <view class="desc-card__content--value">
-              无
-            </view>
-          </view>
-        </view>
-
-        <view class="desc-card">
-          <view class="desc-card__title">
-            就诊人信息
-          </view>
-
-          <view class="desc-card__content">
-            <view class="desc-card__content--title">
-              姓名
-            </view>
-            <view class="desc-card__content--value">
-              aa
-            </view>
-            <br>
-
-            <view class="desc-card__content--title">
-              性别
-            </view>
-            <view class="desc-card__content--value">
-              女
-            </view>
-            <br>
-
-            <view class="desc-card__content--title">
-              年龄
-            </view>
-            <view class="desc-card__content--value">
-              55岁
-            </view>
-            <br>
-
-            <view class="desc-card__content--title">
-              手机号
-            </view>
-            <view class="desc-card__content--value">
-              15555555555
-            </view>
-            <br>
-
-            <view class="desc-card__content--title">
-              行动能力
-            </view>
-            <view class="desc-card__content--value">
-              无障碍
-            </view>
-          </view>
-        </view>
-
-        <view class="desc-card">
-          <view class="desc-card__title">
-            订单信息
-          </view>
-
-          <view class="desc-card__content">
-            <view class="desc-card__content--title">
-              服务内容
-            </view>
-            <view class="desc-card__content--value">
-              专享半天陪诊
-            </view>
-            <br>
-
-            <view class="desc-card__content--title">
-              服务标价
-            </view>
-            <view class="desc-card__content--value">
-              ¥ 288
-            </view>
-            <br>
-
-            <view class="desc-card__content--title">
-              订单金额
-            </view>
-            <view class="desc-card__content--value">
-              ¥ 288
-            </view>
-            <br>
-
-            <view class="desc-card__content--title">
-              订单编号
-            </view>
-            <view class="desc-card__content--value">
-              PZ2024111855448048
-            </view>
-            <br>
-
-            <view class="desc-card__content--title">
-              下单日期
-            </view>
-            <view class="desc-card__content--value">
-              2024-11-18 17:48:47
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <view class="bottom-bar">
-      <view class="price">
-        <text>实付：</text>
-        <text>¥ 600.00</text>
-      </view>
-
-      <u-button shape="circle" ripple :custom-style="payBtnStyle" @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="i in 10" :key="i">
-          <view class="service-list-item__icon">
-            <u-icon name="integral" size="30"></u-icon>
-          </view>
-
-          <view class="service-list-item__name">
-            专享半天陪诊
-          </view>
-
-          <view class="service-list-item__price">
-            ¥600
-          </view>
-        </view>
-      </view>
-    </u-popup>
-    <u-select v-model="isShowCity" :list="cities"></u-select>
-    <u-picker v-model="isShowTime" mode="time"></u-picker>
-    <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>
-export default {
-  data() {
-    return {
-      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'
-      },
-
-      // service
-      isShowService: false,
-      services: [
-        {
-          value: '1',
-          label: '江'
-        },
-        {
-          value: '2',
-          label: '湖'
-        }
-      ],
-      //
-
-      // step
-      currentStep: 0,
-      stepList: [
-        {
-          name: '填写预约'
-        },
-        {
-          name: '在线支付'
-        },
-        {
-          name: '专人陪诊'
-        },
-        {
-          name: '服务完成'
-        }
-      ],
-      //
-
-      // form
-      isShowCity: false,
-      cities: [
-        {
-          value: '1',
-          label: '江'
-        },
-        {
-          value: '2',
-          label: '湖'
-        }
-      ],
-      isShowTime: false,
-      form: {
-        name: ''
-      },
-      rules: {},
-      fileList: [],
-      action: '',
-      isAuth: false,
-      //
-
-      // pay popup
-      isShowPayPopup: false,
-    };
-  },
-  methods: {
-    pay () {
-      if (!this.isShowPayPopup) {
-        this.isShowPayPopup = true
-        return
-      }
-      if (!this.isAuth && this.currentStep === 0) {
-        this.$refs.uTips.show({
-          title: '请认真阅读《服务条款同意书》',
-          type: 'warning',
-          duration: '2000'
-        })
-        return
-      }
-      this.isShowPayPopup = false
-      this.currentStep = 3
-    }
-  },
-  onReady() {
-    this.$refs.uForm.setRules(this.rules);
-  }
-}
-</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;
-
-  .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);
-
-    .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;
-    }
-  }
-}
-
-.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;
-
-    &__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;
-    }
-  }
-
-  &-item + &-item {
-    margin-top: 20rpx;
-  }
-}
-</style>
+<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">
+				<view class="step-item" v-for="(i, index) in stepList" :class="{ 'is-active': currentStep === index }"
+					:key="index">
+					<view class="step-item__dot">
+						<u-icon v-show="currentStep === index" name="checkbox-mark" color="#fff" size="16"></u-icon>
+					</view>
+					<view class="step-item__text">{{ i.name }}</view>
+				</view>
+			</view>
+			<view v-if="currentStep === 0">
+				<view class="switch-service">
+					<view class="switch-service__icon">
+						<u-icon name="integral" size="30"></u-icon>
+					</view>
+
+					<view class="switch-service__name">
+						{{info.name}}
+					</view>
+
+					<view 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="就诊站点">
+							<u-input v-model="info.site.name" disabled />
+						</u-form-item> -->
+						<u-form-item label="就诊医院" prop="hospitalName" required>
+							<u-input type="select" placeholder="请选择就诊医院" v-model="form.hospitalName"
+								:select-open="isShowHospital" @click="isShowHospital = true" />
+						</u-form-item>
+						<u-form-item label="就诊时间" 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="就诊人" prop="archiveName" required>
+							<u-input type="select" placeholder="请选择就诊人" v-model="form.archiveName"
+								:select-open="isShowArchive" @click="isShowArchive = true" />
+						</u-form-item>
+						<u-form-item label="是否可以自理">
+							<u-radio-group v-model="form.my_provide" slot="right" active-color="#c20d12">
+								<u-radio :name="1">是</u-radio>
+								<u-radio :name="0">否</u-radio>
+							</u-radio-group>
+						</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="选择陪诊师性别" :border-bottom="false">
+							<u-radio-group v-model="form.accompany_sex" slot="right" active-color="#c20d12">
+								<u-radio :name="1">男</u-radio>
+								<u-radio :name="2">女</u-radio>
+								<u-radio :name="0">任意</u-radio>
+							</u-radio-group>
+						</u-form-item>
+					</view>
+
+					<view class="form-card form-card-2">
+						<view class="title">
+							<view class="title__left">
+								<text>上传资料</text>
+								<text>（就诊卡、病例等）</text>
+							</view>
+							<!-- <view class="title__right">
+								点击查看示例
+							</view> -->
+						</view>
+						<u-upload :action="action" :file-list="fileList"></u-upload>
+					</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 v-if="currentStep === 3">
+				<view class="switch-service">
+					<view class="switch-service__icon">
+						<u-icon name="integral" size="30"></u-icon>
+					</view>
+
+					<view class="switch-service__name">
+						<view>医康养 就医省心</view>
+						<view style="font-size: 24rpx;color: #999999;">期待下次为您服务</view>
+					</view>
+
+					<view class="switch-service__btn" style="font-size: 24rpx;color: #999999;">
+						订单已完成
+					</view>
+				</view>
+
+				<view class="desc-card">
+					<view class="desc-card__title">
+						预约信息
+					</view>
+
+					<view class="desc-card__content">
+						<view class="desc-card__content--title">
+							就诊城市
+						</view>
+						<view class="desc-card__content--value">
+							苏州
+						</view>
+						<br>
+
+						<view class="desc-card__content--title">
+							就诊医院
+						</view>
+						<view class="desc-card__content--value">
+							苏打附属
+						</view>
+						<br>
+
+						<view class="desc-card__content--title">
+							就诊时间
+						</view>
+						<view class="desc-card__content--value">
+							2024-11-22
+						</view>
+						<br>
+
+						<view class="desc-card__content--title">
+							预约人
+						</view>
+						<view class="desc-card__content--value">
+							xxx
+						</view>
+						<br>
+
+						<view class="desc-card__content--title">
+							预约人电话
+						</view>
+						<view class="desc-card__content--value">
+							18888888888
+						</view>
+						<br>
+
+						<view class="desc-card__content--title">
+							陪诊师性别
+						</view>
+						<view class="desc-card__content--value">
+							都可以
+						</view>
+						<br>
+
+						<view class="desc-card__content--title">
+							服务需求
+						</view>
+						<view class="desc-card__content--value">
+							无
+						</view>
+					</view>
+				</view>
+
+				<view class="desc-card">
+					<view class="desc-card__title">
+						就诊人信息
+					</view>
+
+					<view class="desc-card__content">
+						<view class="desc-card__content--title">
+							姓名
+						</view>
+						<view class="desc-card__content--value">
+							aa
+						</view>
+						<br>
+
+						<view class="desc-card__content--title">
+							性别
+						</view>
+						<view class="desc-card__content--value">
+							女
+						</view>
+						<br>
+
+						<view class="desc-card__content--title">
+							年龄
+						</view>
+						<view class="desc-card__content--value">
+							55岁
+						</view>
+						<br>
+
+						<view class="desc-card__content--title">
+							手机号
+						</view>
+						<view class="desc-card__content--value">
+							15555555555
+						</view>
+						<br>
+
+						<view class="desc-card__content--title">
+							行动能力
+						</view>
+						<view class="desc-card__content--value">
+							无障碍
+						</view>
+					</view>
+				</view>
+
+				<view class="desc-card">
+					<view class="desc-card__title">
+						订单信息
+					</view>
+
+					<view class="desc-card__content">
+						<view class="desc-card__content--title">
+							服务内容
+						</view>
+						<view class="desc-card__content--value">
+							专享半天陪诊
+						</view>
+						<br>
+
+						<view class="desc-card__content--title">
+							服务标价
+						</view>
+						<view class="desc-card__content--value">
+							¥ 288
+						</view>
+						<br>
+
+						<view class="desc-card__content--title">
+							订单金额
+						</view>
+						<view class="desc-card__content--value">
+							¥ 288
+						</view>
+						<br>
+
+						<view class="desc-card__content--title">
+							订单编号
+						</view>
+						<view class="desc-card__content--value">
+							PZ2024111855448048
+						</view>
+						<br>
+
+						<view class="desc-card__content--title">
+							下单日期
+						</view>
+						<view class="desc-card__content--value">
+							2024-11-18 17:48:47
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="bottom-bar">
+			<view class="price">
+				<text>实付：</text>
+				<text>¥ {{info.price}}</text>
+			</view>
+			<u-button shape="circle" ripple :custom-style="payBtnStyle" @click="$u.throttle(pay(), 500)">立即下单</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">
+						{{item.address}}
+					</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" mode="time" @confirm="confirmTime"></u-picker>
+
+
+
+		<!-- 优惠，不显示先 -->
+		<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';
+	export default {
+		components: {
+			serviceArchive
+		},
+		data() {
+			return {
+				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'
+				},
+
+				// service
+				isShowService: false,
+
+				// step
+				currentStep: 0,
+				stepList: [{
+						name: '填写预约'
+					},
+					{
+						name: '在线支付'
+					},
+					{
+						name: '专人陪诊'
+					},
+					{
+						name: '服务完成'
+					}
+				],
+				//
+
+				// form
+				isShowHospital: false,
+				isShowTime: false,
+				isShowArchive: false,
+				list_service: [],
+				info: {},
+				list_hospital: [],
+				list_archive: [],
+				form: {
+					accompany_product_id: '',
+					user_archive_id: '',
+					archiveName: '',
+					hospitalName: '',
+					city: '',
+					hospital: '',
+					time: '',
+					my_provide: 1,
+					appoint_name: '',
+					appoint_mobile: '',
+					accompany_sex: '',
+					file_ids: '',
+					content: ''
+				},
+				rules: {
+					archiveName: [{
+						required: true,
+						message: '请选择就诊人',
+						trigger: ['blur', 'change']
+					}],
+					hospitalName: [{
+						required: true,
+						message: '请选择就诊医院',
+						trigger: ['blur', 'change']
+					}],
+					appoint_name: [{
+						required: true,
+						message: '请输入预约人',
+						trigger: ['blur', 'change']
+					}],
+					mobile: [{
+						required: true,
+						message: '请输入预约人电话',
+						trigger: ['blur', 'change']
+					}, {
+						// 自定义验证函数，见上说明
+						validator: (rule, value, callback) => {
+							return this.$u.test.mobile(value);
+						},
+						message: '预约人电话不正确',
+						// 触发器可以同时用blur和change
+						trigger: ['change', 'blur'],
+					}],
+				},
+				fileList: [],
+				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
+			this.getList(option.type)
+			this.getDetail(option.id)
+			this.getHospital(option.site_id)
+			this.getUserArchive()
+		},
+
+		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) {
+				await this.$u.api.accompanyProductDetail({
+					id: id
+				}).then(res => {
+					console.log("res", res)
+					this.info = res
+				})
+			},
+			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.hospitalName = ''
+				this.form.hospital = ''
+			},
+			confirmHospital(e) {
+				console.log(e)
+				this.form.hospitalName = e[0].label
+				this.form.hospital = e[0].value
+			},
+			confirmTime(e){
+				console.log("e",e)
+				this.form.time = e.year+'-'+e.month+'-'+e.day
+			},
+			// 服务对象
+			confirmArchive(e) {
+				console.log(e)
+				this.form.user_archive_id = e.id
+				this.form.archiveName = e.name
+				this.isShowArchive = false
+			},
+			addArchive() {
+				this.$refs.serviceArchive.isShow = true
+			},
+			addSuccess(e) {
+				if (e) {
+					this.getUserArchive()
+				}
+			},
+
+			pay() {
+				this.$refs.uForm.validate(async (valid) => {
+					let that = this
+					if (valid) {
+						console.log('验证通过');
+						const res = await this.$u.api.accompanyProductOrder({
+							...that.form
+						})
+						if(res){
+							uni.showModal({
+								title:'下单成功',
+								content:'下单成功，是否立即支付？',
+								success(){
+									that.payOrder(res)
+								},
+								fail(){
+									uni.switchTab({
+										url:'/pages/order/order'
+									})
+								}
+							})
+						}
+						
+
+					} else {
+						console.log('验证失败');
+					}
+				});
+				// if (!this.isShowPayPopup) {
+				// 	this.isShowPayPopup = true
+				// 	return
+				// }
+				// if (!this.isAuth && this.currentStep === 0) {
+				// 	this.$refs.uTips.show({
+				// 		title: '请认真阅读《服务条款同意书》',
+				// 		type: 'warning',
+				// 		duration: '2000'
+				// 	})
+				// 	return
+				// }
+				// this.isShowPayPopup = false
+				// this.currentStep = 3
+			},
+			async payOrder(re) {
+				const payObj = await this.$u.api.accompanyPay({
+					no: re.no
+				})
+				uni.requestPayment({
+					"provider": "wxpay",
+					// "orderInfo": {
+					//     "appid": payObj,  // 微信开放平台 - 应用 - AppId，注意和微信小程序、公众号 AppId 可能不一致
+					//     "noncestr": "c5sEwbaNPiXAF3iv", // 随机字符串
+					//     "package": "Sign=WXPay",        // 固定值
+					//     "partnerid": "148*****52",      // 微信支付商户号
+					//     "prepayid": "wx202254********************fbe90000", // 统一下单订单号
+					//     "timestamp": 1597935292,        // 时间戳（单位：秒）
+					//     "sign": "A842B45937F6EFF60DEC7A2EAA52D5A0" // 签名，这里用的 MD5/RSA 签名
+					// },
+					success(res) {
+
+					},
+					fail(e) {}
+				})
+
+			}
+
+
+		},
+	}
+</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;
+
+		.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);
+
+			.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;
+			}
+		}
+	}
+
+	.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 {
+				width: 100%;
+				padding-left: 14rpx;
+			}
+
+			&__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 f627d10..ee8d4bf 100644
--- a/package_sub/pages/ServiceDetail/ServiceDetail.vue
+++ b/package_sub/pages/ServiceDetail/ServiceDetail.vue
@@ -1,412 +1,472 @@
-<template>
-  <view class="page safe-area-inset-bottom">
-    <image class="bkg" src="~@/package_sub/static/ServiceDetail/bkg.png" mode="aspectFill"></image>
-
-    <view class="container">
-      <view class="card detail">
-        <view class="detail__text">
-          全程1对1陪同就医，代取号、代排队、代跑腿、打印报告等服务。患者可以更加灵活安排时间，不但解决无人陪同难题，以及排队费时、环境
-        </view>
-        <view class="detail__price">
-          <text class="detail__price--number">600</text>
-          <text class="detail__price--text">元/次</text>
-        </view>
-      </view>
-
-      <view class="tab">
-        <view v-for="(item, index) in ['服务内容','预约须知']"
-              :key="index"
-              class="tab-item"
-              :class="{ 'is-active': index === currentTab }"
-              @click="$u.throttle(() => currentTab = index)">
-          {{ item }}
-        </view>
-      </view>
-
-      <view v-show="currentTab === 0">
-        <view class="card for-people">
-          <view class="card__title">
-            适用人群
-          </view>
-
-          <view class="for-people__content block">
-            <view class="block-item" v-for="i in 10" :key="i">
-              <image class="block-item__img" src="~@/static/index/honor-title.png" mode="aspectFit"></image>
-
-              <view class="block-item__text">老年人对医院环境设设备不熟悉。</view>
-            </view>
-          </view>
-        </view>
-
-        <view class="service-flow card">
-          <view class="card__title">
-            服务流程
-          </view>
-
-          <view class="service-flow__content" v-for="i in 5" :key="i">
-            <view class="dot-line" />
-            <view class="content-panel">
-              <image class="db-arrow-down" src="~@/package_sub/static/ServiceDetail/db-arrow-down.png" mode="aspectFit"></image>
-              <view class="content-panel__section">
-                请至少提前2小时预约，以便平台安排合适的陪诊师;
-              </view>
-              <view class="content-panel__section">
-                提交预约申请后，请添加客服专员，以便及时与您沟通服务进展;
-              </view>
-            </view>
-          </view>
-        </view>
-
-        <view class="cost-description card">
-          <view class="card__title">
-            费用说明
-          </view>
-
-          <ul class="cost-description__content">
-            <li v-for="i in 7" :key="i">
-              本服务含医院内半天(不超过4小时)陪诊服务，仅限单个医院不含治疗检查、饮食、交通等费用;
-            </li>
-          </ul>
-        </view>
-      </view>
-
-      <u-button class="btn" shape="circle" ripple :custom-style="orderBtnStyle">立即预约</u-button>
-    </view>
-  </view>
-</template>
-
-<script>
-
-export default {
-  data() {
-    return {
-      currentTab: 0,
-      orderBtnStyle: {
-        'background-image': 'linear-gradient(-90deg, #e26165 0%, #c10d12 94%, #c10d12 100%)',
-        'font-weight': '500',
-        'font-size': '28rpx',
-        'color': '#fff',
-        'width': '436rpx',
-        'margin-top': '32rpx'
-      }
-    };
-  },
-  onLoad(option) {
-    uni.setNavigationBarTitle({
-      title: option.title ?? "服务项目"
-    });
-  },
-  mounted() {
-
-  },
-}
-</script>
-
-<style>
-page {
-  background: #f4efee;
-}
-</style>
-<style lang="scss" scoped>
-.page {
-
-  .bkg {
-    height: 316rpx;
-    width: 100vw;
-    z-index: 0;
-    position: absolute;
-    top: 0;
-    left: 0;
-  }
-
-  .container {
-    z-index: 1;
-    position: relative;
-    padding-top: 250rpx;
-
-    .card {
-      border-radius: 10rpx;
-      filter: drop-shadow(2.192px 4.494px 5px rgba(33,32,32,0.15));
-      background-color: #ffffff;
-
-      &__title {
-        display: inline-block;
-        font-size: 28rpx;
-        color: #ca2328;
-        font-weight: bold;
-        position: relative;
-        left: 50%;
-        transform: translateX(-50%);
-
-        &::before {
-          content: '';
-          position: absolute;
-          width: 139rpx;
-          height: 5rpx;
-          border-radius: 3px;
-          left: -28rpx;
-          top: 50%;
-          transform: translate(-100%, -50%);
-          background: linear-gradient(to left,#ca2328,#ffffff00);
-        }
-        &::after {
-          content: '';
-          position: absolute;
-          width: 139rpx;
-          height: 5rpx;
-          border-radius: 3px;
-          right: -28rpx;
-          top: 50%;
-          transform: translate(100%, -50%);
-          background: linear-gradient(to right,#ca2328,#ffffff00);
-        }
-      }
-    }
-    .detail {
-      margin: 0 24rpx;
-      padding: 26rpx 22rpx;
-
-      &__text {
-        text-indent: 48rpx;
-        font-size: 24rpx;
-        line-height: 1.5;
-        color: #929196;
-        font-weight: 500;
-      }
-      &__price {
-        margin-top: 24rpx;
-        color: #c20d12;
-        padding-left: 16rpx;
-
-        &--number {
-          font-weight: 500;
-          font-size: 40rpx;
-        }
-        &--text {
-          font-size: 24rpx;
-        }
-      }
-    }
-
-    .tab {
-      display: flex;
-      align-items: center;
-      padding: 0 60rpx;
-      margin-top: 38rpx;
-
-      &-item {
-        font-size: 28rpx;
-        color: #666;
-        transition: all .1s;
-      }
-      .tab-item + .tab-item {
-        margin-left: 60rpx;
-      }
-      .is-active {
-        color: #000;
-        font-weight: 600;
-        font-size: 32rpx;
-        position: relative;
-
-        &::after {
-          content: '';
-          position: absolute;
-          bottom: -20rpx;
-          left: 50%;
-          transform: translateX(-50%);
-          width: 58rpx;
-          height: 4rpx;
-          border-radius: 2rpx;
-          background-color: #ca2328;
-        }
-      }
-    }
-
-    .for-people {
-      margin: 54rpx 24rpx 0;
-      padding: 46rpx 30rpx;
-
-
-      &__content {
-        margin-top: 46rpx;
-      }
-      .block {
-        display: flex;
-        flex-wrap: wrap;
-
-        &-item {
-          display: flex;
-          align-items: center;
-          margin-bottom: 60rpx;
-          flex-basis: calc((100% - 64rpx) / 2);
-
-          &__img {
-            width: 62rpx;
-            height: 70rpx;
-          }
-          &__text {
-            font-size: 24rpx;
-            color: #666666;
-            font-weight: 500;
-            margin-left: 16rpx;
-            text-align: left;
-          }
-        }
-        .block-item:nth-child(2n) {
-          margin-left: 64rpx;
-        }
-        .block-item:nth-last-child(1) {
-          margin-bottom: 0;
-        }
-        .block-item:nth-last-child(2) {
-          margin-bottom: 0;
-        }
-      }
-    }
-
-    .service-flow {
-      margin: 34rpx 24rpx 0;
-      padding: 45rpx 20rpx 34rpx 28rpx;
-
-      &__content {
-        margin-top: 18rpx;
-
-        $dot-bkgs:
-            linear-gradient(0deg, #ebb6b6 0%, #f7d8ba 99%, #f7d8ba 100%),
-            linear-gradient(0deg, #edbd97 0%, #e4de9f 100%, #e4de9f 100%),
-            linear-gradient(0deg, #8fa9e3 0%, #a3d9fb 100%),
-            linear-gradient(0deg, #e3c2f7 0%, #e3c2f7 1%, #c7ccfb 100%),
-            linear-gradient(0deg, #f99ea2 0%, #f4d4fa 100%);
-        $dot-border: #f7d8ba,#e4de9f,#a3d9fb,#c7ccfb,#f4d4fa;
-        $panel-bkgs:
-            linear-gradient(0deg, #fde5e5b3 0%, #fdf7f1b3 100%),
-            linear-gradient(0deg, #fdede1b3 0%, #fbfbefb3 100%),
-            linear-gradient(0deg, #e5e7f7b3 0%, #f3fbfdb3 100%),
-            linear-gradient(0deg, #f5e7fdb3 0%, #f0f1fcb3 100%),
-            linear-gradient(0deg, #fde5e5b3 0%, #f9f4fcb3 100%);
-        .dot-line {
-          float: left;
-          width: 16rpx;
-          height: 16rpx;
-          border-radius: 100%;
-          z-index: 2;
-          position: relative;
-          top: 8rpx;
-          left: 8rpx;
-
-          &::after {
-            content: '';
-            width: 22rpx;
-            height: 22rpx;
-            box-sizing: border-box;
-            border-radius: 100%;
-            border: 2rpx solid;
-            z-index: 2;
-            position: absolute;
-            top: 50%;
-            left: 50%;
-            transform: translate(-50%, -50%);
-          }
-        }
-        @for $index from 1 through length($dot-bkgs) {
-          &:nth-child(#{$index+1}n) .dot-line {
-            background: nth($dot-bkgs, $index);
-
-            &::after {
-              border-color: nth($dot-border, $index);
-            }
-          }
-          &:nth-child(#{$index+1}n) .content-panel {
-            background: nth($panel-bkgs, $index);
-          }
-        }
-        &:nth-child(2) .content-panel:before {
-          top: 10rpx !important;
-        }
-        .content-panel {
-          border-radius: 5px;
-          margin-left: 40rpx;
-          padding: 24rpx 8rpx 24rpx 32rpx;
-          color: #666666;
-          font-weight: 500;
-          position: relative;
-
-          &::before {
-            content: '';
-            width: 2rpx;
-            opacity: .2;
-            background-color: #666666;
-
-            z-index: 1;
-            position: absolute;
-            top: -18rpx;
-            left: calc(-40rpx + 15rpx);
-            bottom: 0;
-          }
-          .db-arrow-down {
-            width: 98rpx;
-            height: 103rpx;
-            position: absolute;
-            right: 20rpx;
-            bottom: 24rpx;
-          }
-
-          &__section {
-            font-size: 24rpx;
-            line-height: 40rpx;
-            position: relative;
-
-            &::before {
-              content: '';
-              position: absolute;
-              width: 8rpx;
-              height: 8rpx;
-              border-radius: 100%;
-              background-color: #7a7a7a;
-              top: 16rpx;
-              left: -16rpx;
-            }
-          }
-        }
-      }
-    }
-
-    .cost-description {
-      margin: 22rpx 24rpx 0;
-      padding: 45rpx 20rpx 34rpx 28rpx;
-
-      &__content {
-        margin-top: 50rpx;
-        font-size: 24rpx;
-        line-height: 40rpx;
-        color: #666666;
-        font-weight: 500;
-        position: relative;
-
-        & > li {
-          margin-left: 36rpx;
-          position: relative;
-
-          &::before {
-            content: '';
-            width: 8rpx;
-            height: 8rpx;
-            border-radius: 100%;
-            background-color: #7a7a7a;
-            position: absolute;
-            left: -26rpx;
-            top: calc(20rpx - 4rpx);
-          }
-        }
-        & > li + li {
-          margin-top: 10rpx;
-        }
-      }
-    }
-
-    .btn {
-      margin: 32rpx auto 0;
-    }
-  }
-}
-</style>
+<template>
+	<view class="page safe-area-inset-bottom">
+		<!-- <image class="bkg" src="~@/package_sub/static/ServiceDetail/bkg.png" mode="aspectFill"></image> -->
+		<view class="bkg">
+			<u-swiper :height="316" img-mode="scaleToFill" mode="none" border-radius="0" :list="info.images" name="url"></u-swiper>
+			
+		</view>
+		<view class="container">
+			<view class="card detail">
+				<view class="detail__text">
+					{{info.introduce}}
+				</view>
+				<view class="detail__price">
+					<text class="detail__price--number">{{info.price}}</text>
+					<text class="detail__price--text">元/次</text>
+				</view>
+			</view>
+
+			<view class="tab">
+				<view v-for="(item, index) in ['服务内容','预约须知']" :key="index" class="tab-item"
+					:class="{ 'is-active': index === currentTab }" @click="$u.throttle(() => currentTab = index)">
+					{{ item }}
+				</view>
+			</view>
+
+			<view v-show="currentTab === 0">
+				<view class="card for-people">
+					<view class="card__title">
+						适用人群
+					</view>
+
+					<view class="for-people__content block">
+						<view class="block-item">
+							<!-- <image class="block-item__img" src="~@/static/index/honor-title.png" mode="aspectFit">
+							</image> -->
+
+							<view class="block-item__text">
+								<u-parse :html="info.content"></u-parse>
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<view class="service-flow card">
+					<view class="card__title">
+						服务流程
+					</view>
+
+					<view class="service-flow__content">
+						<u-parse :html="info.flow_content"></u-parse>
+						<!-- <view class="dot-line" />
+            <view class="content-panel">
+              <image class="db-arrow-down" src="~@/package_sub/static/ServiceDetail/db-arrow-down.png" mode="aspectFit"></image>
+              <view class="content-panel__section">
+                请至少提前2小时预约，以便平台安排合适的陪诊师;
+              </view>
+              <view class="content-panel__section">
+                提交预约申请后，请添加客服专员，以便及时与您沟通服务进展;
+              </view>
+            </view> -->
+					</view>
+				</view>
+
+				<view class="cost-description card">
+					<view class="card__title">
+						费用说明
+					</view>
+
+					<ul class="cost-description__content">
+						<u-parse :html="info.price_content"></u-parse>
+						<!-- <li v-for="i in 7" :key="i">
+              本服务含医院内半天(不超过4小时)陪诊服务，仅限单个医院不含治疗检查、饮食、交通等费用;
+            </li> -->
+					</ul>
+				</view>
+			</view>
+
+			<view v-show="currentTab === 1">
+				<view class="card for-people">
+					<view class="for-people__content block">
+						<view class="block-item">
+							<!-- <image class="block-item__img" src="~@/static/index/honor-title.png" mode="aspectFit">
+							</image> -->
+
+							<view class="block-item__text">
+								<u-parse :html="info.appoint_content"></u-parse>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+
+
+			<u-button class="btn" shape="circle" ripple  @click="toOrder(info)" :custom-style="orderBtnStyle">立即预约</u-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				id: '',
+				currentTab: 0,
+				info: {},
+				orderBtnStyle: {
+					'background-image': 'linear-gradient(-90deg, #e26165 0%, #c10d12 94%, #c10d12 100%)',
+					'font-weight': '500',
+					'font-size': '28rpx',
+					'color': '#fff',
+					'width': '436rpx',
+					'margin-top': '32rpx'
+				}
+			};
+		},
+		onLoad(option) {
+			uni.setNavigationBarTitle({
+				title: option.title ?? "服务项目"
+			});
+			this.id = option.id ? option.id : ''
+			this.getDetail(this.id)
+		},
+		mounted() {
+
+		},
+		methods: {
+			async getDetail(id) {
+				await this.$u.api.accompanyProductDetail({
+					id: id
+				}).then(res=>{
+					console.log("res", res)
+					this.info = res
+				})
+				
+			},
+			toOrder(info) {
+			  this.$u.route({
+			    url: '/package_sub/pages/AddOrder/AddOrder?id='+info.id+'&site_id='+info.site_id+'&type='+info.type
+			  })
+			},
+		}
+	}
+</script>
+
+<style>
+	page {
+		background: #f4efee;
+	}
+</style>
+<style lang="scss" scoped>
+	.page {
+
+		.bkg {
+			height: 316rpx;
+			width: 100vw;
+			z-index: 0;
+			position: absolute;
+			top: 0;
+			left: 0;
+		}
+
+		.container {
+			z-index: 1;
+			position: relative;
+			padding-top: 250rpx;
+
+			.card {
+				border-radius: 10rpx;
+				filter: drop-shadow(2.192px 4.494px 5px rgba(33, 32, 32, 0.15));
+				background-color: #ffffff;
+
+				&__title {
+					display: inline-block;
+					font-size: 28rpx;
+					color: #ca2328;
+					font-weight: bold;
+					position: relative;
+					left: 50%;
+					transform: translateX(-50%);
+
+					&::before {
+						content: '';
+						position: absolute;
+						width: 139rpx;
+						height: 5rpx;
+						border-radius: 3px;
+						left: -28rpx;
+						top: 50%;
+						transform: translate(-100%, -50%);
+						background: linear-gradient(to left, #ca2328, #ffffff00);
+					}
+
+					&::after {
+						content: '';
+						position: absolute;
+						width: 139rpx;
+						height: 5rpx;
+						border-radius: 3px;
+						right: -28rpx;
+						top: 50%;
+						transform: translate(100%, -50%);
+						background: linear-gradient(to right, #ca2328, #ffffff00);
+					}
+				}
+			}
+
+			.detail {
+				margin: 0 24rpx;
+				padding: 26rpx 22rpx;
+
+				&__text {
+					text-indent: 48rpx;
+					font-size: 24rpx;
+					line-height: 1.5;
+					color: #929196;
+					font-weight: 500;
+				}
+
+				&__price {
+					margin-top: 24rpx;
+					color: #c20d12;
+					padding-left: 16rpx;
+
+					&--number {
+						font-weight: 500;
+						font-size: 40rpx;
+					}
+
+					&--text {
+						font-size: 24rpx;
+					}
+				}
+			}
+
+			.tab {
+				display: flex;
+				align-items: center;
+				padding: 0 60rpx;
+				margin-top: 38rpx;
+
+				&-item {
+					font-size: 28rpx;
+					color: #666;
+					transition: all .1s;
+				}
+
+				.tab-item+.tab-item {
+					margin-left: 60rpx;
+				}
+
+				.is-active {
+					color: #000;
+					font-weight: 600;
+					font-size: 32rpx;
+					position: relative;
+
+					&::after {
+						content: '';
+						position: absolute;
+						bottom: -20rpx;
+						left: 50%;
+						transform: translateX(-50%);
+						width: 58rpx;
+						height: 4rpx;
+						border-radius: 2rpx;
+						background-color: #ca2328;
+					}
+				}
+			}
+
+			.for-people {
+				margin: 54rpx 24rpx 0;
+				padding: 46rpx 30rpx;
+
+
+				&__content {
+					margin-top: 46rpx;
+				}
+
+				.block {
+					display: flex;
+					flex-wrap: wrap;
+
+					&-item {
+						display: flex;
+						align-items: center;
+						margin-bottom: 60rpx;
+						flex-basis: calc((100% - 64rpx) / 2);
+
+						&__img {
+							width: 62rpx;
+							height: 70rpx;
+						}
+
+						&__text {
+							font-size: 24rpx;
+							color: #666666;
+							font-weight: 500;
+							margin-left: 16rpx;
+							text-align: left;
+						}
+					}
+
+					.block-item:nth-child(2n) {
+						margin-left: 64rpx;
+					}
+
+					.block-item:nth-last-child(1) {
+						margin-bottom: 0;
+					}
+
+					.block-item:nth-last-child(2) {
+						margin-bottom: 0;
+					}
+				}
+			}
+
+			.service-flow {
+				margin: 34rpx 24rpx 0;
+				padding: 45rpx 20rpx 34rpx 28rpx;
+
+				&__content {
+					margin-top: 18rpx;
+
+					$dot-bkgs: linear-gradient(0deg, #ebb6b6 0%, #f7d8ba 99%, #f7d8ba 100%),
+					linear-gradient(0deg, #edbd97 0%, #e4de9f 100%, #e4de9f 100%),
+					linear-gradient(0deg, #8fa9e3 0%, #a3d9fb 100%),
+					linear-gradient(0deg, #e3c2f7 0%, #e3c2f7 1%, #c7ccfb 100%),
+					linear-gradient(0deg, #f99ea2 0%, #f4d4fa 100%);
+					$dot-border: #f7d8ba,
+					#e4de9f,
+					#a3d9fb,
+					#c7ccfb,
+					#f4d4fa;
+					$panel-bkgs: linear-gradient(0deg, #fde5e5b3 0%, #fdf7f1b3 100%),
+					linear-gradient(0deg, #fdede1b3 0%, #fbfbefb3 100%),
+					linear-gradient(0deg, #e5e7f7b3 0%, #f3fbfdb3 100%),
+					linear-gradient(0deg, #f5e7fdb3 0%, #f0f1fcb3 100%),
+					linear-gradient(0deg, #fde5e5b3 0%, #f9f4fcb3 100%);
+
+					.dot-line {
+						float: left;
+						width: 16rpx;
+						height: 16rpx;
+						border-radius: 100%;
+						z-index: 2;
+						position: relative;
+						top: 8rpx;
+						left: 8rpx;
+
+						&::after {
+							content: '';
+							width: 22rpx;
+							height: 22rpx;
+							box-sizing: border-box;
+							border-radius: 100%;
+							border: 2rpx solid;
+							z-index: 2;
+							position: absolute;
+							top: 50%;
+							left: 50%;
+							transform: translate(-50%, -50%);
+						}
+					}
+
+					@for $index from 1 through length($dot-bkgs) {
+						&:nth-child(#{$index+1}n) .dot-line {
+							background: nth($dot-bkgs, $index);
+
+							&::after {
+								border-color: nth($dot-border, $index);
+							}
+						}
+
+						&:nth-child(#{$index+1}n) .content-panel {
+							background: nth($panel-bkgs, $index);
+						}
+					}
+
+					&:nth-child(2) .content-panel:before {
+						top: 10rpx !important;
+					}
+
+					.content-panel {
+						border-radius: 5px;
+						margin-left: 40rpx;
+						padding: 24rpx 8rpx 24rpx 32rpx;
+						color: #666666;
+						font-weight: 500;
+						position: relative;
+
+						&::before {
+							content: '';
+							width: 2rpx;
+							opacity: .2;
+							background-color: #666666;
+
+							z-index: 1;
+							position: absolute;
+							top: -18rpx;
+							left: calc(-40rpx + 15rpx);
+							bottom: 0;
+						}
+
+						.db-arrow-down {
+							width: 98rpx;
+							height: 103rpx;
+							position: absolute;
+							right: 20rpx;
+							bottom: 24rpx;
+						}
+
+						&__section {
+							font-size: 24rpx;
+							line-height: 40rpx;
+							position: relative;
+
+							&::before {
+								content: '';
+								position: absolute;
+								width: 8rpx;
+								height: 8rpx;
+								border-radius: 100%;
+								background-color: #7a7a7a;
+								top: 16rpx;
+								left: -16rpx;
+							}
+						}
+					}
+				}
+			}
+
+			.cost-description {
+				margin: 22rpx 24rpx 0;
+				padding: 45rpx 20rpx 34rpx 28rpx;
+
+				&__content {
+					margin-top: 50rpx;
+					font-size: 24rpx;
+					line-height: 40rpx;
+					color: #666666;
+					font-weight: 500;
+					position: relative;
+
+					&>li {
+						margin-left: 36rpx;
+						position: relative;
+
+						&::before {
+							content: '';
+							width: 8rpx;
+							height: 8rpx;
+							border-radius: 100%;
+							background-color: #7a7a7a;
+							position: absolute;
+							left: -26rpx;
+							top: calc(20rpx - 4rpx);
+						}
+					}
+
+					&>li+li {
+						margin-top: 10rpx;
+					}
+				}
+			}
+
+			.btn {
+				margin: 32rpx auto 0;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/package_sub/pages/ServiceList/ServiceList.vue b/package_sub/pages/ServiceList/ServiceList.vue
index b51cc20..8d8d41f 100644
--- a/package_sub/pages/ServiceList/ServiceList.vue
+++ b/package_sub/pages/ServiceList/ServiceList.vue
@@ -1,175 +1,256 @@
-<template>
-  <view class="page">
-    <view class="top">
-      <view class="position" @click="$u.route({ url: '/pages/CitySelect/CitySelect' })">
-        <u-icon name="map-fill"></u-icon>
-        <text>{{ vuex_location.city.replace(/(市|区|县)/,'') }}</text>
-        <u-icon name="arrow-down" size="22"></u-icon>
-      </view>
-    </view>
-
-    <view class="container">
-      <image class="bkg" src="~@/package_sub/static/ServiceList/bkg.png" mode="aspectFill"></image>
-
-      <view class="list">
-        <view class="list-item" v-for="(i) in 20" :key="i">
-          <view class="left">
-            <view class="list-item__icon">
-              <u-icon name="integral" size="60"></u-icon>
-            </view>
-          </view>
-          <view class="center">
-            <view class="list-item__title">
-              尊享VIP陪诊
-            </view>
-            <view class="list-item__sub-title">尊享VIP体验，车接车送</view>
-
-            <view class="list-item__price">
-              <text class="list-item__price--unit">¥</text>
-              <text class="list-item__price--number">600</text>
-              <text class="list-item__price--text">元/次</text>
-            </view>
-          </view>
-          <view class="right">
-            <u-button shape="circle" ripple :custom-style="orderBtnStyle" @click="toOrder(i)">预约</u-button>
-          </view>
-        </view>
-      </view>
-    </view>
-
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      orderBtnStyle: {
-        'background-image': 'linear-gradient(-90deg, #e26165 0%, #c10d12 94%, #c10d12 100%)',
-        'font-weight': '500',
-        'font-size': '27rpx',
-        'color': '#fff',
-        'width': '130rpx',
-        'height': '60rpx',
-        'line-height': '60rpx'
-      },
-    };
-  },
-  mounted() {
-    if (this.$store.state.vuex_location !== 2) {
-      this.$store.dispatch('getLocation')
-    }
-  },
-  methods: {
-    toOrder(item) {
-      this.$u.route({
-        url: '/package_sub/pages/AddOrder/AddOrder'
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-.page {
-  position: relative;
-}
-.top {
-  width: 100vw;
-  background: #fff;
-  padding: 26rpx 28rpx;
-  z-index: 4;
-  position: sticky;
-  top: 0;
-
-  .position {
-    color: #000;
-    font-size: 30rpx;
-    letter-spacing: 3rpx;
-    font-weight: 500;
-
-    & > text {
-      padding: 0 13rpx;
-    }
-  }
-}
-.container {
-  padding-bottom: 20rpx;
-  padding-bottom: calc(constant(safe-area-inset-bottom) + 20rpx);
-  padding-bottom: calc(env(safe-area-inset-bottom) + 20rpx);
-  position: relative;
-  z-index: 1;
-
-  .bkg {
-    height: 316rpx;
-    width: 100vw;
-    position: absolute;
-  }
-
-  .list {
-    padding: 252rpx 25rpx 20rpx;
-    position: relative;
-    z-index: 3;
-
-    &-item {
-      border-radius: 10rpx;
-      filter: drop-shadow(2.192rpx 4.494rpx 5rpx rgba(33,32,32,0.15));
-      background-color: #ffffff;
-      display: flex;
-      align-items: center;
-      padding: 34rpx 45rpx 34rpx 26rpx;
-
-      &__icon {
-        background-color: #f9f5e9;
-        height: 128rpx;
-        width: 152rpx;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-      }
-      .center {
-        flex: 1;
-        margin-left: 18rpx;
-      }
-      .right {
-        margin-left: 12rpx;
-      }
-      &__title {
-        max-width: 300rpx;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        overflow: hidden;
-        font-size: 28rpx;
-        color: #000;
-        font-weight: bold;
-      }
-      &__sub-title {
-        padding-top: 20rpx;
-        font-size: 22rpx;
-        color: #929196;
-        font-weight: 500;
-        max-width: 304rpx;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        overflow: hidden;
-      }
-      &__price {
-        padding-top: 16rpx;
-        color: #c20d12;
-        font-size: 22rpx;
-
-        &--unit {
-
-        }
-        &--number {
-          font-size: 36rpx;
-          font-weight: 500;
-        }
-      }
-    }
-    .list-item + .list-item {
-      margin-top: 28rpx;
-    }
-  }
-}
-</style>
+<template>
+	<view class="page">
+		<view class="top">
+			<!-- <view class="position" @click="$u.route({ url: '/pages/CitySelect/CitySelect' })"> -->
+			<view class="position" @click="isShowSite = true">
+				<u-icon name="map-fill"></u-icon>
+				<!-- <text>{{ vuex_location.city.replace(/(市|区|县)/,'') }}</text> -->
+				<text>{{select.site_name}}</text>
+				<u-icon name="arrow-down" size="22"></u-icon>
+			</view>
+		</view>
+
+		<view class="container">
+			<scroll-view scroll-y style="height: 100%;width: 100%;" @scrolltolower="reachBottom">
+				<image class="bkg" src="~@/package_sub/static/ServiceList/bkg.png" mode="aspectFill"></image>
+
+				<view v-if="list.length>0">
+					<view class="list">
+						<view class="list-item" v-for="(item,i) in list" :key="i" @click="toDetail(item)">
+							<view class="left">
+								<view class="list-item__icon">
+									<image style="width:152rpx;height:128rpx" :src="item.cover.url"></image>
+								</view>
+							</view>
+							<view class="center">
+								<view class="list-item__title">
+									{{item.name}}
+								</view>
+								<view class="list-item__sub-title">{{item.introduce?item.introduce:''}}</view>
+
+								<view class="list-item__price">
+									<text class="list-item__price--unit">¥</text>
+									<text class="list-item__price--number">{{item.price}}</text>
+									<text class="list-item__price--text">元/次</text>
+								</view>
+							</view>
+							<view class="right">
+								<u-button shape="circle" ripple :custom-style="orderBtnStyle"
+									@click.stop="toOrder(item)">预约</u-button>
+							</view>
+						</view>
+						<u-loadmore :margin-top="20" :status="loadStatus" bgColor="#f2f2f2"></u-loadmore>
+					</view>
+				</view>
+				<view v-else style="height: 100%;" class="d-flex ai-center jc-center">
+					<u-empty mode="list"></u-empty>
+				</view>
+			</scroll-view>
+
+		</view>
+		<!-- 选择站点 -->
+		<u-select v-model="isShowSite" value-name="id" @confirm="confirmSite" label-name="name"
+			:list="list_site"></u-select>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				orderBtnStyle: {
+					'background-image': 'linear-gradient(-90deg, #e26165 0%, #c10d12 94%, #c10d12 100%)',
+					'font-weight': '500',
+					'font-size': '27rpx',
+					'color': '#fff',
+					'width': '130rpx',
+					'height': '60rpx',
+					'line-height': '60rpx'
+				},
+				last_page:1,
+				select: {
+					page: 1,
+					page_size: 5,
+					type: '',
+					site_id: '',
+					site_name: '全部站点'
+				},
+				list: [],
+				loadStatus: 'loadmore',
+				isShowSite: false,
+				list_site: [{
+					id: '',
+					name: '全部站点'
+				}],
+
+
+			};
+		},
+		mounted() {
+			if (this.$store.state.vuex_location !== 2) {
+				this.$store.dispatch('getLocation')
+			}
+		},
+		onLoad(options) {
+			this.select.type = options.type ? options.type : ''
+			this.getSiteList()
+			this.getList()
+		},
+		methods: {
+			async getSiteList() {
+				const res = await this.$u.api.otherSite()
+				this.list_site.push(...res)
+			},
+			async getList() {
+				const res = await this.$u.api.accompanyProduct({
+					...this.select
+				})
+				this.last_page = res.last_page
+				this.loadStatus = this.select.page >= this.last_page ?'nomore':'loadmore'
+				this.list.push(...res.data)
+				console.log(this.select.page,this.last_page)
+			},
+			reachBottom() {
+			  if (this.select.page > this.last_page) {
+			  	this.loadStatus = 'nomore'
+			  	return
+			  }
+			  this.loadStatus = 'loading'
+			  this.select.page++
+			  this.getList()
+			},
+			confirmSite(e) {
+				this.select.site_name = e[0].label
+				this.select.site_id = e[0].value
+				this.list = []
+				this.select.page = 1
+				this.getList()
+			},
+			toOrder(item) {
+				this.$u.route({
+					url: '/package_sub/pages/AddOrder/AddOrder?id=' + item.id + '&title=' + item.name +
+						'&site_id=' + item.site_id + '&type=' + item.type
+				})
+			},
+			toDetail(item) {
+				this.$u.route({
+					url: '/package_sub/pages/ServiceDetail/ServiceDetail?id=' + item.id
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.page {
+		position: relative;
+	}
+
+	.top {
+		width: 100vw;
+		background: #fff;
+		padding: 26rpx 28rpx;
+		z-index: 4;
+		position: sticky;
+		top: 0;
+		height: 94rpx;
+
+		.position {
+			color: #000;
+			font-size: 30rpx;
+			letter-spacing: 3rpx;
+			font-weight: 500;
+
+			&>text {
+				padding: 0 13rpx;
+			}
+		}
+	}
+
+	.container {
+		padding-bottom: 40rpx;
+		// padding-bottom: calc(constant(safe-area-inset-bottom) + 20rpx);
+		// padding-bottom: calc(env(safe-area-inset-bottom) + 20rpx);
+		position: relative;
+		z-index: 1;
+		height: calc(100vh - 94rpx);
+
+		.bkg {
+			height: 316rpx;
+			width: 100vw;
+			position: absolute;
+		}
+
+		.list {
+			padding: 252rpx 25rpx 20rpx;
+			position: relative;
+			z-index: 3;
+
+			&-item {
+				border-radius: 10rpx;
+				filter: drop-shadow(2.192rpx 4.494rpx 5rpx rgba(33, 32, 32, 0.15));
+				background-color: #ffffff;
+				display: flex;
+				align-items: center;
+				padding: 34rpx 45rpx 34rpx 26rpx;
+
+				&__icon {
+					// background-color: #f9f5e9;
+					height: 128rpx;
+					width: 152rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+				}
+
+				.center {
+					flex: 1;
+					margin-left: 18rpx;
+				}
+
+				.right {
+					margin-left: 12rpx;
+				}
+
+				&__title {
+					max-width: 300rpx;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+					overflow: hidden;
+					font-size: 28rpx;
+					color: #000;
+					font-weight: bold;
+				}
+
+				&__sub-title {
+					padding-top: 20rpx;
+					font-size: 22rpx;
+					color: #929196;
+					font-weight: 500;
+					max-width: 304rpx;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+					overflow: hidden;
+				}
+
+				&__price {
+					padding-top: 16rpx;
+					color: #c20d12;
+					font-size: 22rpx;
+
+					&--unit {}
+
+					&--number {
+						font-size: 36rpx;
+						font-weight: 500;
+					}
+				}
+			}
+
+			.list-item+.list-item {
+				margin-top: 28rpx;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index ad3609a..3350d20 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -55,7 +55,7 @@
       </view>
 
       <view class="swiper">
-        <u-swiper :list="list"></u-swiper>
+        <u-swiper :list="list" name="url"></u-swiper>
       </view>
 
       <view class="links">
@@ -82,28 +82,28 @@
         <view class="hospitals__title">热门医院</view>
 
         <view class="hospitals__content">
-          <view class="hospitals__content__item" v-for="item in 3" :key="item">
+          <view class="hospitals__content__item" v-for="(item,index) in list_hospital" :key="index">
             <view class="left">
               <image
-                src="https://sstt.115.langye.net/storage/files/172760356266f9236a22e58.png"
+                :src="item.cover?item.cover.url:''"
                 alt=""
-                mode="aspectFit"
+                mode="scaleToFill"
               ></image>
             </view>
             <view class="right">
-              <view class="title">苏州大学附属第一医院</view>
+              <view class="title">{{item.name}}</view>
               <view class="tag">
                 <view class="tag__item">三甲</view>
                 <view class="tag__item">综合医院</view>
               </view>
-              <view class="description"> 内科、外科、五官科、其他 </view>
+              <view class="description"> {{item.good_at}} </view>
             </view>
           </view>
         </view>
       </view>
 
       <view class="statistics">
-        <view class="block1" @click="toPage('/package_sub/pages/AddOrder/AddOrder')">
+        <view class="block1" @click="toPage('/package_sub/pages/ServiceList/ServiceList?type=1')">
           <view class="text1">陪诊团队介绍</view>
           <view class="text2">让就医体验更美好</view>
           <view class="order">预约陪诊</view>
@@ -178,25 +178,13 @@ export default {
       select: {
         keyword: "",
       },
-      list: [
-        {
-          image: "https://cdn.uviewui.com/uview/swiper/1.jpg",
-          title: "昨夜星辰昨夜风，画楼西畔桂堂东",
-        },
-        {
-          image: "https://cdn.uviewui.com/uview/swiper/2.jpg",
-          title: "身无彩凤双飞翼，心有灵犀一点通",
-        },
-        {
-          image: "https://cdn.uviewui.com/uview/swiper/3.jpg",
-          title: "谁念西风独自凉，萧萧黄叶闭疏窗，沉思往事立残阳",
-        },
-      ],
+      list: [],
+	  list_hospital:[],
       links: [
         {
           text: "陪诊服务",
           icon: "/static/index/peizhenfuwu.png",
-          to: "/package_sub/pages/ServiceList/ServiceList"
+          to: "/package_sub/pages/ServiceList/ServiceList?type=1"
         },
         {
           text: "就医服务",
@@ -205,6 +193,7 @@ export default {
         {
           text: "居家照护",
           icon: "/static/index/jujiazhaohu.png",
+		  to: "/package_sub/pages/ServiceList/ServiceList?type=2"
         },
         {
           text: "医院陪护",
@@ -235,6 +224,8 @@ export default {
     this.isShowSticky = e.scrollTop > this.scrollTop
   },
   onLoad() {
+	  this.getBanners()
+	  this.getHospital()
   },
   computed: {
     navbarHeight() {
@@ -250,6 +241,23 @@ export default {
         }
       }).exec()
     },
+	async getBanners(){
+		const res = await this.$u.api.otherBanner({
+			position:1
+		})
+		res.map(item=>{
+			item.url = item.image.url
+		})
+		
+		this.list = res
+	},
+	async getHospital(){
+		const res = await this.$u.api.listHospital({
+			page:1,
+			page_size:3
+		})
+		this.list_hospital = res.data
+	},
     searchInput(e) {},
 
     toPage (url, type='page') {
diff --git a/pages/order/order.vue b/pages/order/order.vue
index 5436737..e3418d1 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -130,24 +130,30 @@ export default {
       },
       tabs: [
         {
-          name: '全部'
+          name: '全部',
+		  id:''
         },
         {
-          name: '待支付'
+          name: '待支付',
+		  id:0
         },
         {
-          name: '待评价'
+          // name: '待评价',
+		  name: '已支付',
+		  id:1
         },
         {
           name: '服务中',
+		  id:2,
           count: 12
         },
         {
-          name: '已完成'
+          name: '已完成',
+		  id:3
         },
-        {
-          name: '已取消'
-        }
+        // {
+        //   name: '已取消'
+        // }
       ],
       current: 0,
       swiperCurrent: 0,
@@ -188,7 +194,12 @@ export default {
       this.$refs.tabs.setFinishCurrent(current);
       this.swiperCurrent = current;
       this.current = current;
-    }
+    },
+	async getOrder(){
+		const res = await this.$u.api.accompanyOrders({
+			pay_status:1
+		})
+	},
   }
 };
 </script>