From fec021a9ea83c74039d98a553dcfc68f2781cbc4 Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Sat, 15 Jun 2024 09:08:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       |    4 +-
 my/gird/shoucang - 副本.vue                   |  452 +++++
 my/gird/shoucang.vue                          |  265 ++-
 my/order/complain.vue                         |   56 +-
 my/order/feedback.vue                         |   21 +-
 my/order/payModify.vue                        |   40 +-
 my/order/payYouHui.vue                        | 1550 +++++++++++++++++
 my/setting/index.vue                          |    2 -
 my/vip/index.vue                              |   57 +-
 pages.json                                    |   33 +-
 pages/index/index.vue                         |  319 +++-
 pages/my/cooperation.vue                      |   49 +-
 pages/my/css/myteam.vue                       |  241 +++
 pages/my/hehuo.vue                            |   85 +-
 pages/my/index.vue                            |   10 +-
 pages/my/myteam.vue                           |  103 +-
 pages/my/servicePackage.vue                   |  319 +++-
 pages/order/index.vue                         |  119 +-
 pages/public/loginmsg.vue                     |   15 +
 pages/public/loginphone.vue                   |   18 +-
 pages/therapist/orderDetail.vue               |  275 ++-
 static/orderDetail/img-shang.png              |  Bin 0 -> 1439 bytes
 static/orderDetail/reward1.png                |  Bin 0 -> 19251 bytes
 static/orderDetail/reward2.png                |  Bin 0 -> 15782 bytes
 static/orderDetail/reward3.png                |  Bin 0 -> 12553 bytes
 static/orderDetail/technician1.png            |  Bin 0 -> 2464 bytes
 static/orderDetail/technician2.png            |  Bin 0 -> 2531 bytes
 static/orderDetail/technician3.png            |  Bin 0 -> 2697 bytes
 static/orderDetail/technician4.png            |  Bin 0 -> 2348 bytes
 static/orderDetail/technician5.png            |  Bin 0 -> 2299 bytes
 static/orderDetail/technician6-1.png          |  Bin 0 -> 3456 bytes
 static/orderDetail/technician6.png            |  Bin 0 -> 3482 bytes
 static/xinren.png                             |  Bin 0 -> 2840 bytes
 .../liu-goods-swiper/liu-goods-swiper.vue     |    8 +-
 uni_modules/uni-popup/changelog.md            |   84 +
 .../components/uni-popup-dialog/keypress.js   |   45 +
 .../uni-popup-dialog/uni-popup-dialog.vue     |  316 ++++
 .../uni-popup-message/uni-popup-message.vue   |  143 ++
 .../uni-popup-share/uni-popup-share.vue       |  187 ++
 .../components/uni-popup/i18n/en.json         |    7 +
 .../components/uni-popup/i18n/index.js        |    8 +
 .../components/uni-popup/i18n/zh-Hans.json    |    7 +
 .../components/uni-popup/i18n/zh-Hant.json    |    7 +
 .../components/uni-popup/keypress.js          |   45 +
 .../uni-popup/components/uni-popup/popup.js   |   26 +
 .../components/uni-popup/uni-popup.uvue       |   90 +
 .../components/uni-popup/uni-popup.vue        |  503 ++++++
 uni_modules/uni-popup/package.json            |   88 +
 uni_modules/uni-popup/readme.md               |   17 +
 uni_modules/uni-transition/changelog.md       |   24 +
 .../uni-transition/createAnimation.js         |  131 ++
 .../uni-transition/uni-transition.vue         |  286 +++
 uni_modules/uni-transition/package.json       |   85 +
 uni_modules/uni-transition/readme.md          |   11 +
 54 files changed, 5795 insertions(+), 356 deletions(-)
 create mode 100644 my/gird/shoucang - 副本.vue
 create mode 100644 my/order/payYouHui.vue
 create mode 100644 pages/my/css/myteam.vue
 create mode 100644 static/orderDetail/img-shang.png
 create mode 100644 static/orderDetail/reward1.png
 create mode 100644 static/orderDetail/reward2.png
 create mode 100644 static/orderDetail/reward3.png
 create mode 100644 static/orderDetail/technician1.png
 create mode 100644 static/orderDetail/technician2.png
 create mode 100644 static/orderDetail/technician3.png
 create mode 100644 static/orderDetail/technician4.png
 create mode 100644 static/orderDetail/technician5.png
 create mode 100644 static/orderDetail/technician6-1.png
 create mode 100644 static/orderDetail/technician6.png
 create mode 100644 static/xinren.png
 create mode 100644 uni_modules/uni-popup/changelog.md
 create mode 100644 uni_modules/uni-popup/components/uni-popup-dialog/keypress.js
 create mode 100644 uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
 create mode 100644 uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue
 create mode 100644 uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
 create mode 100644 uni_modules/uni-popup/components/uni-popup/i18n/en.json
 create mode 100644 uni_modules/uni-popup/components/uni-popup/i18n/index.js
 create mode 100644 uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json
 create mode 100644 uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json
 create mode 100644 uni_modules/uni-popup/components/uni-popup/keypress.js
 create mode 100644 uni_modules/uni-popup/components/uni-popup/popup.js
 create mode 100644 uni_modules/uni-popup/components/uni-popup/uni-popup.uvue
 create mode 100644 uni_modules/uni-popup/components/uni-popup/uni-popup.vue
 create mode 100644 uni_modules/uni-popup/package.json
 create mode 100644 uni_modules/uni-popup/readme.md
 create mode 100644 uni_modules/uni-transition/changelog.md
 create mode 100644 uni_modules/uni-transition/components/uni-transition/createAnimation.js
 create mode 100644 uni_modules/uni-transition/components/uni-transition/uni-transition.vue
 create mode 100644 uni_modules/uni-transition/package.json
 create mode 100644 uni_modules/uni-transition/readme.md

diff --git a/App.vue b/App.vue
index b2347f0..401e183 100644
--- a/App.vue
+++ b/App.vue
@@ -486,7 +486,9 @@
 	@import "uview-ui/index.scss";
 	@import 'components/colorui/main.css';
 	@import 'components/colorui/icon.css';
-
+	// /deep/uni-page-body{
+	// 	background-color: #f7f7f7 !important;
+	// }
 	page {
 		background-color: #FFFFFF;
 		color: #343546;
diff --git a/my/gird/shoucang - 副本.vue b/my/gird/shoucang - 副本.vue
new file mode 100644
index 0000000..062e5d5
--- /dev/null
+++ b/my/gird/shoucang - 副本.vue	
@@ -0,0 +1,452 @@
+<template>
+	<view class="content">
+		<view style="padding-top: 1rpx;" v-if="orderList.length">
+			<view class="flex align-center margin-bottom-sm bg padding-sm radius margin-sm"
+				v-for="(item,index) in orderList" :key='index' @click="goOrderDetail(item)"
+				style="box-shadow: 6rpx 10rpx 4px #F5F5F5;position: relative;">
+				<view style="position: absolute;z-index: 99;top: 0rpx;left: 0;" v-if="item.isGoods == 1">
+					<image
+						src="https://admin.sjajk.com/file/uploadPath/2023/02/16/c551f3f0721aec54208011e6948a57cd.png"
+						style="width: 42rpx;height: 36rpx;"></image>
+				</view>
+				<view style="width: 170upx;height: 170upx;border-radius: 10rpx;position: relative;">
+					<image :src="item.artificerImg?item.artificerImg: '../../static/logo.png'"
+						@click.stop="saveImgs(item.artificerImg)"
+						style="width: 170upx;height: 170upx;border-radius: 50%;" mode="aspectFill"></image>
+					<image v-if="item.isHot == 1"
+						src="https://admin.sjajk.com/file/uploadPath/2023/02/16/9ae1b7e9fa931b5fc24cd8edecc10d9f.png"
+						style="width: 30rpx;height: 36rpx;position: absolute;z-index: 99;top: 40rpx;left: 110rpx;">
+					</image>
+					<view class="zpmore_view" v-if="item.lifePhoto" @click.stop="saveImgss(item.lifePhoto,0)">更多照片</view>
+				</view>
+				<view class="margin-left flex flex-direction" style="width: 85%;">
+					<view class="flex align-center" style="justify-content: start;">
+						<view class="flex align-center" style="width: 120rpx;">
+							<view class="text-bold text-30 margin-right-xs" style="width: 100rpx;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{item.artificerName}}</view>
+							<!-- <image
+								src="https://admin.sjajk.com/file/uploadPath/2023/02/16/d45855dcf1e01210a4224a408225e8e0.png"
+								style="width: 40rpx;height:40rpx;">
+							</image> -->
+						</view>
+						<view class="" style="width: 150rpx;">
+							<view class="flex align-center" v-if="item.tripWay != 3" style="width: 150rpx;">
+								<image src="../../static/images/address.png" style="width: 24rpx;height: 24rpx;"></image>
+								<view style="color: #333333;margin-left: 8rpx;">{{item.distance}}</view>
+							</view>
+						</view>
+						
+						<view class="kyy_view" v-if="item.state == 1">可服务</view>
+						<view class="kfw_view" v-else-if="item.state == 2">可预约</view>
+						<view class="byy_view" v-else>休息中</view>
+					</view>
+					<view class="flex" style="margin: 16rpx 0 6px 0;justify-content: start;">
+						<view class="flex align-center" style="width: 120rpx;">
+							<view v-if="item.ordersScore" class="margin-right-sm">
+								<image src="../../static/images/start.png" style="width: 24upx;height: 22upx;">
+								</image>
+								<text class="margin-left-xs" style="color: #FF1200;">{{item.ordersScore}}.0</text>
+							</view>
+							<!-- <view style="color: #999999;">已服务:{{item.ordersCount}}单</view> -->
+						</view>
+						
+						<view class="flex align-center"  style="width: 150rpx;">
+							<image src="../../static/images/pinglun.png" style="width: 24rpx;height: 24rpx;"></image>
+							<view style="margin-left: 10rpx;color: #999;font-size: 26rpx;">
+								{{item.commentCount ? item.commentCount : 0}}
+							</view>
+						</view>
+						<view class="flex align-center">
+							<image src="../../static/images/aixin2.png" style="width: 24rpx;height: 24rpx;margin-left: 40rpx;"></image>
+							<view style="margin-left: 10rpx;color: #999;font-size: 26rpx;">
+								{{item.collectCount ? item.collectCount : 0}}
+							</view>
+						</view>
+					</view>
+					<view style="width: 100%;display: flex;justify-content: start;align-items: center;">
+						<view class="flex flex-wrap align-center" style="width: 120rpx;">
+							<image src="../../static/images/shangjia.png" style="width: 24rpx;height: 24rpx;"></image>
+							<view style="margin-left: 10rpx;color: #999;font-size: 26rpx;">商家</view>
+						</view>
+						<view class="flex align-center" style="width: 260rpx;">
+							<image src="../../static/images/time.png" style="width: 26rpx;height: 26rpx;"></image>
+							<view class="zz_view" v-if="item.status == 1 && item.time">最早可约{{item.time}}</view>
+						</view>
+						<view class="flex" style="font-size: 24rpx;color: #f49650;font-weight: bold;" v-if="item.tripWay == 3">
+							免出行费
+						</view>
+					</view>
+					<view class="text-center text-sm" v-if="item.status == 1"
+						style="background: linear-gradient(to right, #223845, #00a85b);color: #ffffff;width: 100%;border-radius: 30upx;height: 60upx;line-height: 60upx;margin-top: 20rpx;"
+						@click.stop="goOrderDetail(item)">
+						立即预约
+					</view>
+					<view class="text-center text-sm" v-else
+						style="background: #d9d9d9;color: #ffffff;width: 100%;border-radius: 30upx;height: 60upx;line-height: 60upx;margin-top: 20rpx;">
+						立即预约
+					</view>
+				</view>
+			</view>
+		</view>
+		<empty v-if="orderList.length == 0"></empty>
+
+		<!-- <u-skeleton :loading="loading" :animation="true" elColor='#FFFFFF' bgColor='#FFFFFF'></u-skeleton> -->
+	</view>
+</template>
+
+<script>
+	import empty from '@/components/empty.vue'
+	export default {
+		components: {
+			empty,
+		},
+		data() {
+			return {
+				loading: true, // 是否显示骨架屏组件
+				game: [],
+				orderList: [],
+				isVip: false,
+				myId: uni.getStorageSync('userId') ? uni.getStorageSync('userId') : '',
+				showModal: true,
+				arr: [],
+				tab: '',
+				massageTypeId: '',
+				page: 1,
+				limit: 10,
+				latitude: '',
+				XCXIsSelect:'否',
+				longitude: ''
+			}
+		},
+		onLoad(e) {
+			let that = this
+			that.XCXIsSelect = this.$queue.getData("XCXIsSelect");
+			console.log("shouchang",that.XCXIsSelect)
+			uni.getLocation({
+				type: 'gcj02',
+				geocode: true, //设置该参数为true可直接获取经纬度及城市信息
+				success: function(res) {
+					console.log(res, '地理位置')
+					that.latitude = res.latitude
+					that.longitude = res.longitude
+					// uni.setStorageSync('latitude', res.latitude)
+					// uni.setStorageSync('longitude', res.longitude)
+
+					that.getData(that.latitude, that.longitude)
+				},
+				fail: function() {
+					console.log('获取地址失败')
+				}
+			})
+
+			that.getData(139.2222,46.3333)
+		},
+		onShow() {
+			if(this.latitude && this.longitude){
+				this.getData(this.latitude, this.longitude)
+			}
+		},
+		methods: {
+			saveImgss(imgs, index) {
+				console.log(imgs, index)
+				// let that = this
+				let imgArr = imgs
+				// this.imgArr.push(imgs);
+				// console.log(this.imgArr)
+				// //预览图片
+				uni.previewImage({
+					urls: imgArr,
+					current: imgArr[index]
+				});
+			},
+			saveImgs(imgs) {
+				let imgArr = [];
+				imgArr.push(imgs);
+				// //预览图片
+				uni.previewImage({
+					urls: imgArr,
+					current: 0
+				});
+			},
+			getData(latitude, longitude) {
+				let data = {
+					page: this.page,
+					limit: this.limit,
+					latitude: latitude,
+					longitude: longitude,
+				}
+				this.$Request.get("/app/artificer/selectCollectList", data).then(res => {
+					this.loading = false;
+					if (res.code == 0) {
+						for (var i = 0; i < res.data.list.length; i++) {
+							if (res.data.list[i].distance > 1000) {
+								res.data.list[i].distance = (res.data.list[i].distance / 1000).toFixed(1) +
+									'km'
+							} else {
+								res.data.list[i].distance = (res.data.list[i].distance).toFixed(1) + 'm'
+							}
+							if (res.data.list[i].lifePhoto) {
+								res.data.list[i].lifePhoto = res.data.list[i].lifePhoto.split(',')
+							}
+						}
+						if (this.page == 1) {
+							this.orderList = res.data.list
+						} else {
+							this.orderList = [...this.orderList, ...res.data.list]
+						}
+
+					}
+
+				}).catch(() => {
+					//联网失败, 结束加载
+					// this.mescroll.endErr();
+				});
+
+			},
+
+			// 跳转订单
+			goOrder(e) {
+				let token = this.$queue.getData('token');
+				if (token) {
+					uni.navigateTo({
+						url: "/pages/index/order/orderDet?artificerId=" + e.artificerId + '&massageTypeId=' + this
+							.massageTypeId
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pages/public/login'
+					});
+				}
+			},
+			goOrderDetail(e) {
+				uni.navigateTo({
+					url: "/pages/therapist/orderDetail?artificerId=" + e.artificerId + '&massageTypeId=' + this
+						.massageTypeId
+				})
+			}
+		},
+		onReachBottom: function() {
+			this.page = this.page + 1;
+			this.getData(this.latitude, this.longitude)
+		},
+		onPullDownRefresh: function() {
+			this.page = 1;
+			this.getData(this.latitude, this.longitude)
+			setTimeout(d => {
+				uni.stopPullDownRefresh();
+			}, 3000);
+		},
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		width: 100%;
+		height: 100vh;
+		background-color: #F7F7F7;
+	}
+
+	.zz_view {
+		color: #333333;
+		font-size: 24rpx;
+		padding: 6rpx 10rpx;
+		border-radius: 10rpx;
+	}
+
+	.zpmore_view {
+		position: absolute;
+		bottom: -20rpx;
+		left: 14rpx;
+		color: #f9f3d3;
+		background: linear-gradient(to right, #0a0c16, #4d4d53);
+		width: 130upx;
+		text-align: center;
+		border-radius: 30rpx;
+		height: 42rpx;
+		line-height: 42rpx;
+		font-size: 24rpx;
+		margin-left: 10rpx;
+	}
+	
+	.byy_view {
+		background: #ebebeb;
+		width: 100upx;
+		text-align: center;
+		border-radius: 50rpx;
+		height: 40rpx;
+		line-height: 40rpx;
+		font-size: 24rpx;
+		color: #000000;
+		// border: 3upx solid #999999;
+		margin-top: 6rpx;
+		margin-left: 40rpx;
+	}
+	
+	.kfw_view {
+		background: #ffaa00;
+		width: 100upx;
+		text-align: center;
+		border-radius: 50rpx;
+		height: 40rpx;
+		line-height: 40rpx;
+		font-size: 24rpx;
+		color: #FFFFFF;
+		margin-top: 6rpx;
+		margin-left: 40rpx;
+	}
+	
+	.kyy_view {
+		background: #096f4b;
+		width: 100upx;
+		text-align: center;
+		border-radius: 50rpx;
+		height: 40rpx;
+		line-height: 40rpx;
+		font-size: 24rpx;
+		color: #FFFFFF;
+		margin-top: 6rpx;
+		margin-left: 40rpx;
+	}
+
+	.bg {
+		background: #FFFFFF;
+	}
+
+	.ytp_view {
+		background: #e3e3e3;
+		width: 400rpx;
+		border-radius: 10rpx;
+		font-size: 28rpx;
+		text-align: center;
+		height: 80rpx;
+		line-height: 80rpx;
+		color: #848484;
+		margin-top: 40rpx;
+	}
+
+	.tp_view {
+		background: #ee6c54;
+		width: 400rpx;
+		border-radius: 10rpx;
+		font-size: 28rpx;
+		text-align: center;
+		height: 80rpx;
+		line-height: 80rpx;
+		color: #FFFFFF;
+		margin-top: 40rpx;
+	}
+
+	.sticky-tabs {
+		z-index: 990;
+		position: sticky;
+		top: var(--window-top);
+		// background-color: #fff;
+	}
+
+	/* // 使用mescroll-uni,则top为0 */
+	.mescroll-uni,
+	/deep/.mescroll-uni {
+		.sticky-tabs {
+			top: 0;
+		}
+	}
+
+	.demo-tip {
+		padding: 18upx;
+		font-size: 24upx;
+		text-align: center;
+	}
+
+	.line_s {
+		display: inline-flex;
+		width: 10rpx;
+		height: 10rpx;
+		background: #1AD566;
+		border-radius: 50%;
+		margin-right: 10rpx;
+	}
+
+	.line_x {
+		display: inline-flex;
+		width: 10rpx;
+		height: 10rpx;
+		background: #000000;
+		border-radius: 50%;
+		margin-right: 10rpx;
+	}
+
+	.box {
+		// border: 3rpx solid #005dff;
+		background: #E8FAE1;
+		color: #096f4b;
+		padding: 5rpx 15rpx;
+		font-size: 26rpx;
+		letter-spacing: 2rpx;
+		border-radius: 8rpx;
+		// margin-top: 10rpx;
+		margin-right: 8upx;
+	}
+
+	.actve {
+		font-size: 30rpx;
+		font-family: PingFang SC;
+		font-weight: 800;
+		color: #20C675;
+	}
+
+	.tabview1 {
+		padding: 20rpx 20rpx;
+		// width: 686upx;
+		// height: 100upx;
+		background: #FFFFFF;
+		// margin-top: -50upx;
+		// z-index: 99;
+		// display: flex;
+		// line-height: 100upx;
+
+		.tabview {
+			// width: 686upx;
+			// // height: 100upx;
+			background: #F2FFF9;
+			border-radius: 24rpx 24rpx 0 0;
+			// margin-top: -50upx;
+			// z-index: 99;
+			display: flex;
+			line-height: 100upx;
+
+			.tabItem_sel {
+				font-size: 30upx;
+				font-family: PingFang SC;
+				font-weight: 800;
+				color: #20C675;
+				flex: 1;
+				text-align: center;
+			}
+
+			.tabItem {
+				font-size: 26upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #333333;
+				flex: 1;
+				text-align: center;
+			}
+		}
+
+		.tabsx {
+			width: 686upx;
+			border-radius: 24rpx;
+			padding-bottom: 10rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			padding: 20rpx 30rpx;
+			font-size: 26rpx;
+
+			.active {
+				color: #20C675;
+				font-size: 30rpx;
+				font-weight: bold;
+			}
+		}
+	}
+</style>
diff --git a/my/gird/shoucang.vue b/my/gird/shoucang.vue
index 2bd5eb1..d593a57 100644
--- a/my/gird/shoucang.vue
+++ b/my/gird/shoucang.vue
@@ -1,18 +1,17 @@
 <template>
-	<view class="">
+	<view class="content">
 		<view style="padding-top: 1rpx;" v-if="orderList.length">
-			<view class="flex align-center margin-bottom-sm bg padding-sm radius margin-sm"
+			<view class="flex align-center margin-bottom-sm bg margin-sm content-list"
 				v-for="(item,index) in orderList" :key='index' @click="goOrderDetail(item)"
 				style="box-shadow: 6rpx 10rpx 4px #F5F5F5;position: relative;">
 				<view style="position: absolute;z-index: 99;top: 0rpx;left: 0;" v-if="item.isGoods == 1">
-					<image
-						src="https://admin.sjajk.com/file/uploadPath/2023/02/16/c551f3f0721aec54208011e6948a57cd.png"
+					<image src="https://admin.sjajk.com/file/uploadPath/2023/02/16/c551f3f0721aec54208011e6948a57cd.png"
 						style="width: 42rpx;height: 36rpx;"></image>
 				</view>
-				<view style="width: 170upx;height: 170upx;border-radius: 10rpx;position: relative;">
+				<view class="content-img">
 					<image :src="item.artificerImg?item.artificerImg: '../../static/logo.png'"
 						@click.stop="saveImgs(item.artificerImg)"
-						style="width: 170upx;height: 170upx;border-radius: 50%;" mode="aspectFill"></image>
+						 mode="aspectFill"></image>
 					<image v-if="item.isHot == 1"
 						src="https://admin.sjajk.com/file/uploadPath/2023/02/16/9ae1b7e9fa931b5fc24cd8edecc10d9f.png"
 						style="width: 30rpx;height: 36rpx;position: absolute;z-index: 99;top: 40rpx;left: 110rpx;">
@@ -20,63 +19,83 @@
 					<view class="zpmore_view" v-if="item.lifePhoto" @click.stop="saveImgss(item.lifePhoto,0)">更多照片</view>
 				</view>
 				<view class="margin-left flex flex-direction" style="width: 85%;">
-					<view class="flex align-center" style="justify-content: start;">
-						<view class="flex align-center" style="width: 120rpx;">
-							<view class="text-bold text-30 margin-right-xs" style="width: 100rpx;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{item.artificerName}}</view>
-							<!-- <image
-								src="https://admin.sjajk.com/file/uploadPath/2023/02/16/d45855dcf1e01210a4224a408225e8e0.png"
-								style="width: 40rpx;height:40rpx;">
-							</image> -->
+					<view class="flex align-center" style="justify-content: space-between;">
+						<view class="flex align-center">
+							<view class="text-bold text-30 margin-right-xs" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
+								{{item.artificerName}}
+							</view>
+							<image class="dituzhaoren" src="../../static/dituzhaoren2.png" mode=""></image>
 						</view>
-						<view class="" style="width: 150rpx;">
-							<view class="flex align-center" v-if="item.tripWay != 3" style="width: 150rpx;">
-								<image src="../../static/images/address.png" style="width: 24rpx;height: 24rpx;"></image>
-								<view style="color: #333333;margin-left: 8rpx;">{{item.distance}}</view>
+						<view class="shou-top">
+							<view class="shou-top-btn" :class="[item.state == 1 || item.state == 2?'kfw_view':'byy_view']">
+								{{item.state == 1?'可服务':item.state == 2?'可预约':'休息中'}}
+							</view>
+							<view class="zz_view" v-if="item.status == 1 && item.time">
+								{{item.time}}
 							</view>
 						</view>
-						
-						<view class="kyy_view" v-if="item.state == 1">可服务</view>
-						<view class="kfw_view" v-else-if="item.state == 2">可预约</view>
-						<view class="byy_view" v-else>休息中</view>
+					</view>
+					<view class="list-right-top-bottom">
+						正规绿色服务!擅长精油SPA、中式推拿，有按摩师证，手法专业，期待正规绿色服务!擅长精油SPA、中式推拿正规绿色服务!擅长精油SPA、中式推拿
 					</view>
 					<view class="flex" style="margin: 16rpx 0 6px 0;justify-content: start;">
-						<view class="flex align-center" style="width: 120rpx;">
-							<view v-if="item.ordersScore" class="margin-right-sm">
-								<image src="../../static/images/start.png" style="width: 24upx;height: 22upx;">
-								</image>
-								<text class="margin-left-xs" style="color: #FF1200;">{{item.ordersScore}}.0</text>
+						<view class="flex align-center">
+							<view class="flex align-center margin-right-sm">
+								<view>
+									<image class="pinglun" src="../../static/dituzhaoren3.png" mode="">
+									</image>
+									<span class="icon-text">评论</span>
+								</view>
+								
+								<!-- <image src="../../static/images/pinglun.png" style="width: 24rpx;height: 24rpx;"></image> -->
+								<view style="margin-left: 10rpx;color: #222;font-size: 26rpx;">
+									22222{{item.commentCount ? item.commentCount : 0}}
+								</view>
+							</view>
+							<view v-if="item.ordersScore" class="flex align-center">
+								<view>
+									<image class="shouc-img" src="../../static/dituzhaoren4.png" mode="">
+									</image>
+									<span class="icon-text">收藏</span>
+								</view>
+								
+								<text class="margin-left-xs" style="color: #222;">11111{{item.ordersScore}}.0</text>
 							</view>
 							<!-- <view style="color: #999999;">已服务:{{item.ordersCount}}单</view> -->
 						</view>
-						
-						<view class="flex align-center"  style="width: 150rpx;">
-							<image src="../../static/images/pinglun.png" style="width: 24rpx;height: 24rpx;"></image>
-							<view style="margin-left: 10rpx;color: #999;font-size: 26rpx;">
-								{{item.commentCount ? item.commentCount : 0}}
-							</view>
-						</view>
-						<view class="flex align-center">
+						<!-- <view class="flex align-center">
 							<image src="../../static/images/aixin2.png" style="width: 24rpx;height: 24rpx;margin-left: 40rpx;"></image>
 							<view style="margin-left: 10rpx;color: #999;font-size: 26rpx;">
 								{{item.collectCount ? item.collectCount : 0}}
 							</view>
-						</view>
+						</view> -->
 					</view>
-					<view style="width: 100%;display: flex;justify-content: start;align-items: center;">
+					<!-- <view style="width: 100%;display: flex;justify-content: start;align-items: center;">
 						<view class="flex flex-wrap align-center" style="width: 120rpx;">
 							<image src="../../static/images/shangjia.png" style="width: 24rpx;height: 24rpx;"></image>
 							<view style="margin-left: 10rpx;color: #999;font-size: 26rpx;">商家</view>
 						</view>
-						<view class="flex align-center" style="width: 260rpx;">
-							<image src="../../static/images/time.png" style="width: 26rpx;height: 26rpx;"></image>
-							<view class="zz_view" v-if="item.status == 1 && item.time">最早可约{{item.time}}</view>
-						</view>
+						
 						<view class="flex" style="font-size: 24rpx;color: #f49650;font-weight: bold;" v-if="item.tripWay == 3">
 							免出行费
 						</view>
+					</view> -->
+					<view class="therapist-mian-bottom">
+						<view class="flex flex-wrap align-center">
+							<image class="therapist-bottom-img" src="../../static/dituzhaoren5.png">
+							</image>
+							<view class="therapist-mian-bottom-text">春城有约</view>
+						</view>
+						<view class="flex align-center" v-if="item.tripWay != 3" >
+							<image class="therapist-bottom-dingwei" src="../../static/dituzhaoren6.png"></image>
+							<view class="therapist-bottom-dingwei-text">
+								{{ item.distance }}
+							</view>
+						</view>
+						
 					</view>
 					<view class="text-center text-sm" v-if="item.status == 1"
-						style="background: linear-gradient(to right, #223845, #00a85b);color: #ffffff;width: 100%;border-radius: 30upx;height: 60upx;line-height: 60upx;margin-top: 20rpx;"
+						style="background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);color: #ffffff;width: 100%;border-radius: 30upx;height: 60upx;line-height: 60upx;margin-top: 10rpx;"
 						@click.stop="goOrderDetail(item)">
 						立即预约
 					</view>
@@ -120,6 +139,7 @@
 		onLoad(e) {
 			let that = this
 			that.XCXIsSelect = this.$queue.getData("XCXIsSelect");
+			console.log("shouchang",that.XCXIsSelect)
 			uni.getLocation({
 				type: 'gcj02',
 				geocode: true, //设置该参数为true可直接获取经纬度及城市信息
@@ -137,7 +157,7 @@
 				}
 			})
 
-
+			that.getData(139.2222,46.3333)
 		},
 		onShow() {
 			if(this.latitude && this.longitude){
@@ -238,20 +258,127 @@
 </script>
 
 <style lang="scss">
-	page {
+	.icon-text{
+		margin-left: 2px;
+		font-weight: 400;
+		font-size: 23rpx;
+		color: #7C8187;
+	}
+	.pinglun{
+		width: 25.69rpx;
+		height: 22.92rpx;
+	}
+	.shouc-img{
+		width: 25.69rpx;
+		height: 22.92rpx;
+	}
+	.list-right-top-bottom{
+		width: 100%;
+		text-align: left;
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #333333;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+	.therapist-bottom-dingwei-text{
+		font-weight: bold;
+		font-size: 23rpx;
+		color: #848485;
+	}
+	.therapist-bottom-dingwei{
+		width: 17.36rpx;
+		height: 20.14rpx;
+		margin-right:3px;
+	}
+	.therapist-bottom-img{
+		width: 22.22rpx;
+		height: 22.22rpx;
+		margin-right:3px;
+	}
+	.therapist-mian-bottom-text{
+		font-weight: bold;
+		font-size: 23rpx;
+		color: #222222;
+	}
+	.therapist-mian-bottom{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+		margin: 5px 0px 3px 0px;
+	}
+	
+	
+	.zz_view {
+		color: #039E89;
+		font-size: 24rpx;
+		padding: 0px 3px;
+		background: #EBEBEB;
+		height: 38rpx;
+		line-height: 38rpx;
+		text-align: center;
+		border-top-right-radius: 7rpx;
+		border-bottom-right-radius: 7rpx;
+	}
+	.shou-top-btn{
+		height: 38rpx;
+		line-height: 38rpx;
+		text-align: center;
+		font-size: 24rpx;
+		padding: 0px 3px;
+		border-top-left-radius: 7rpx;
+		border-bottom-left-radius: 7rpx;
+	}
+	.byy_view {
+		color: #000000;
+		background-color: #ebebeb;
+	}
+	
+	.kfw_view {
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+		color: #FFFFFF;
+	}
+	
+	.shou-top{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		margin-right: 5px;
+	}
+	.dituzhaoren{
+		width: 168.75rpx;
+		height: 40.97rpx;
+	}
+	.content-list{
+		height: 307rpx;
+		border-radius: 14rpx;
+	}
+	.content-img image{
+		width: 100%;
+		height: 100%;
+	}
+	.content-img{
+		width: 202.08rpx;
+		height: 100%;
+		position: relative;
+	}
+	.content {
+		width: 100%;
+		height: 100vh;
 		background-color: #F7F7F7;
 	}
 
-	.zz_view {
-		color: #333333;
-		font-size: 24rpx;
-		padding: 6rpx 10rpx;
-		border-radius: 10rpx;
-	}
+	
 
 	.zpmore_view {
 		position: absolute;
-		bottom: -20rpx;
+		bottom: 0px;
+		margin-bottom: 2px;
 		left: 14rpx;
 		color: #f9f3d3;
 		background: linear-gradient(to right, #0a0c16, #4d4d53);
@@ -264,45 +391,7 @@
 		margin-left: 10rpx;
 	}
 	
-	.byy_view {
-		background: #ebebeb;
-		width: 100upx;
-		text-align: center;
-		border-radius: 50rpx;
-		height: 40rpx;
-		line-height: 40rpx;
-		font-size: 24rpx;
-		color: #000000;
-		// border: 3upx solid #999999;
-		margin-top: 6rpx;
-		margin-left: 40rpx;
-	}
 	
-	.kfw_view {
-		background: #ffaa00;
-		width: 100upx;
-		text-align: center;
-		border-radius: 50rpx;
-		height: 40rpx;
-		line-height: 40rpx;
-		font-size: 24rpx;
-		color: #FFFFFF;
-		margin-top: 6rpx;
-		margin-left: 40rpx;
-	}
-	
-	.kyy_view {
-		background: #096f4b;
-		width: 100upx;
-		text-align: center;
-		border-radius: 50rpx;
-		height: 40rpx;
-		line-height: 40rpx;
-		font-size: 24rpx;
-		color: #FFFFFF;
-		margin-top: 6rpx;
-		margin-left: 40rpx;
-	}
 
 	.bg {
 		background: #FFFFFF;
diff --git a/my/order/complain.vue b/my/order/complain.vue
index 69f8b61..f7f75e4 100644
--- a/my/order/complain.vue
+++ b/my/order/complain.vue
@@ -13,11 +13,11 @@
 			<view class="" style="color: #999999;">
 				<u-input v-model="sendDate.content" type="textarea" placeholder="请详细描述你的问题... " style="height: 300rpx;padding: 10rpx;background-color: #f5f5f5;border-radius: 10rpx;margin: 10rpx 0 20rpx 0;color: #999999;"/>
 			</view>
-			<view class="feedback-title">投诉图</view>
+			<!-- <view class="feedback-title">投诉图</view> -->
 			<view class="margin-tb-sm">
 				<view class="flex" style="flex-direction: initial;flex-wrap: wrap;">
-					<view v-if="Imgo.length">
-						<view class=" flex margin-right-sm flex-wrap">
+					<view v-if="Imgo.length" style="width: 100%;">
+						<view class=" flex flex-wrap" style="justify-content: space-between;">
 							<view class="flex"
 								style="margin-right: 5rpx;position: relative;width: 200rpx;height: 200rpx;"
 								v-for="(image,index) in Imgo" :key="index">
@@ -29,23 +29,24 @@
 							</view>
 						</view>
 					</view>
-					<view class="" @click="addImages(2)" v-if="Imgo.length<=5">
+					<view class="" @click="addImages(2)" v-if="Imgo.length<=2">
 						<view style="width: 200rpx;height: 200rpx;background: #f4f5f6;border-radius: 10rpx;"
 							class="flex justify-center align-center">
 							<view>
 								<view class="text-center">
-									<u-icon name="plus" color="#666666" size="28"></u-icon>
+									<image style="width: 43.06rpx;height: 38.19rpx;" src="../../static/orderDetail/img-shang.png" mode=""></image>
+									<!-- <u-icon name="plus" color="#666666" size="28"></u-icon> -->
 								</view>
 								<view class="text-center">选择图片</view>
 							</view>
 						</view>
 					</view>
 				</view>
-				<view class="" style="font-size: 26rpx;color: #999999;margin-top: 40rpx;">温馨提示：最多上传3张图片</view>
+				<view class="" style="font-size: 20.83rpx;color: #ED782E;margin-top: 40rpx;">温馨提示：最多上传3张图片</view>
 			</view>
 		</view>
 		
-		<view style="position: fixed;bottom: 0rpx;left: 0;right: 0;background: #FFFFFF;height: 110rpx;line-height: 110rpx;z-index: 999;">
+		<view class="sbu-btn">
 			<button type="primary" style="" class="feedback-submit" @tap="send">提交</button>
 		</view>
 		
@@ -236,6 +237,25 @@
 </script>
 
 <style>
+	.feedback-submit {
+		width: 652rpx;
+		height: 92rpx;
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+		border-radius: 46rpx;
+		color: #FFFFFF;
+		margin: 16rpx 30upx;
+		position: fixed;
+		bottom: 0upx;
+		line-height: 92rpx;
+		font-size: 32rpx;
+		text-align: center;
+	}
+	.sbu-btn{
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		 background: #f7f7f7;
+	}
 	@font-face {
 		font-family: uniicons;
 		font-weight: normal;
@@ -243,12 +263,18 @@
 		src: url('https://img-cdn-qiniu.dcloud.net.cn/fonts/uni.ttf') format('truetype');
 	}
 
-	page {
+	.page {
+		width: 100%;
+		height: 100vh;
 		background-color: #f7f7f7 !important;
+		padding-top: 20px;
 	}
 	.bg{
 		background-color: #ffffff;
 		padding: 30rpx;
+		width: 95%;
+		margin: 0px auto;
+		border-radius: 24rpx;
 	}
 	/*问题反馈*/
 	.feedback-title {
@@ -291,17 +317,5 @@
 	}
 	
 
-	.feedback-submit {
-		background: linear-gradient(to right, #223845, #00a85b);
-		color: #FFFFFF;
-		margin: 16rpx 30upx;
-		position: fixed;
-		bottom: 0upx;
-		width: 90%;
-		border-radius: 50rpx;
-		height: 78rpx;
-		line-height: 78rpx;
-		font-size: 32rpx;
-		text-align: center;
-	}
+	
 </style>
diff --git a/my/order/feedback.vue b/my/order/feedback.vue
index 896485a..e38de14 100644
--- a/my/order/feedback.vue
+++ b/my/order/feedback.vue
@@ -1,5 +1,8 @@
 <template>
 	<view class="content">
+		<view class="header-view">
+			-提交好评或建议，帮助盛安做得更好——
+		</view>
 		<view class="box">
 			<view class="feedback-title">
 				<text>您对服务还满意吗？</text>
@@ -14,7 +17,7 @@
 				<view class="feedback-star-view">
 					<!-- <text class="feedback-star" v-for="(value, key) in stars" :key="key" :class="key < sendDate.score ? 'active' : ''" @tap="chooseStar(value)"></text> -->
 				</view>
-				<u-rate :count="count" v-model="value" active-color="#FFAA01"></u-rate>
+				<u-rate :count="count" v-model="value" active-color="#019C88"></u-rate>
 			</view>
 		</view>
 		<button type="primary" class="feedback-submit" @tap="send">提交</button>
@@ -138,6 +141,17 @@
 </script>
 
 <style>
+	/deep/.u-icon__icon{
+		font-size: 35rpx;
+	}
+	.header-view{
+		width: 100%;
+		margin-top: 15px;
+		text-align: center;
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #ED782E;
+	}
 	@font-face {
 		font-family: uniicons;
 		font-weight: normal;
@@ -153,14 +167,17 @@
 		background-color: #f7f7f7;
 		position: relative;
 		display: flex;
-		justify-content: center;
+		align-items: center;
+		flex-direction: column;
 	}
 	.box{
 		width: 95%;
+		height: 600rpx;
 		border-radius: 24rpx;
 		margin: 0 auto;
 		background-color: #FFFFFF;
 		padding: 30rpx;
+		margin-top: 15px;
 	}
 
 	.input-view {
diff --git a/my/order/payModify.vue b/my/order/payModify.vue
index e63c880..6ef72ab 100644
--- a/my/order/payModify.vue
+++ b/my/order/payModify.vue
@@ -125,9 +125,10 @@
 
 			
 
-			<view class="flex tabber padding-top-sm padding-bottom-sm align-center">
-				<u-button @click="openpay()" shape="circle" :custom-style="customStyle2" :hair-line="false"
-					style="background: linear-gradient(to right, #223845, #00a85b);border: 0;">立即支付
+			<view class="tabber padding-top-sm padding-bottom-sm pay-zhifu">
+				<span class="daizhifu">待支付:￥268</span>
+				<u-button class="u-button-pay" @click="openpay()" shape="circle" :custom-style="customStyle2" :hair-line="false">
+					立即支付
 				</u-button>
 			</view>
 		</view>
@@ -160,8 +161,7 @@
 			<view class="popup_pay">
 				<view style="background-color: #fff;">
 					<view style="padding: 0 20upx;margin-top: 60rpx;margin-bottom: 20rpx;">
-						<view
-							style="display: flex;height: 100upx;align-items: center;padding: 20upx 0;justify-content: center;"
+						<view style="display: flex;height: 100upx;align-items: center;padding: 20upx 0;justify-content: center;"
 							v-for="(item,index) in openLists" :key='index'>
 							<image :src="item.image" style="width: 55upx;height: 55upx;border-radius: 50upx;">
 							</image>
@@ -176,7 +176,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="pay_btn" @click="pay()">确认支付</view>
+			<view class="pay_btn" @click="pay()">确认支付</view>
 			</view>
 		</u-popup>
 
@@ -1048,6 +1048,28 @@
 </script>
 
 <style lang="scss" scoped>
+	/deep/.u-button-pay{
+		width: 381rpx;
+		height: 68rpx;
+		line-height: 68px;
+		text-align: center;
+		color: #fff;
+		font-size: 31rpx;
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+		border-radius: 34rpx;
+	}
+	.daizhifu{
+		font-size: 38rpx;
+		color: #333333;
+	}
+	.pay-zhifu{
+		width: 100%;
+		background-color: #f7f7f7 !important;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between !important;
+	}
 	.liliao{
 		margin-top: 10px;
 	}
@@ -1508,11 +1530,11 @@
 		width: 90%;
 		margin: 0 auto;
 		text-align: center;
-		background: linear-gradient(to right, #223845, #00a85b);
-		height: 80rpx;
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+		height:68rpx;
 		border-radius: 60rpx;
 		color: #ffffff;
-		line-height: 80rpx;
+		line-height: 68rpx;
 	}
 
 	.serverAddress {
diff --git a/my/order/payYouHui.vue b/my/order/payYouHui.vue
new file mode 100644
index 0000000..036955a
--- /dev/null
+++ b/my/order/payYouHui.vue
@@ -0,0 +1,1550 @@
+<template>
+	<view class="content">
+		<view class="padding-bottom u-skeleton">
+			<view class="bgImg u-skeleton-fillet" v-if="order.ordersMassageList && order.ordersMassageList.length > 0"
+				style="padding: 0 29rpx;">
+				<view class="padding margin-top-sm header-view">
+					<view class="margin-right-xs">
+						<view class="flex justify-between margin-top-lg">
+							<view class="header-view-text">联系人</view>
+							<view class="header-view-data">
+								<text>{{order.serveTime}}</text>
+							</view>
+						</view>
+						<view class="flex justify-between margin-top-lg">
+							<view class="header-view-text">手机号码</view>
+							<view class="header-view-data" @click="bindphone(order.phone)">
+								{{order.phone}}
+							</view>
+						</view>
+						<view class="flex justify-between margin-top-lg">
+							<view class="header-view-text">详细地址</view>
+							<view class="flex adders-view" @tap="bindGps(order.latitude,order.longitude,order.address)">
+									<span>
+										{{order.address}}
+									</span>
+									<image src="../../static/shezhi-jiantou.png" mode=""></image>
+							</view>
+						</view>
+						<view class="flex justify-between margin-top-lg" v-if="order.remark">
+							<view style="width: 170rpx;">备注内容</view>
+							<view class="flex">
+								<view class="">
+									{{order.remark}}
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="padding margin-top-sm header-view">
+					<view class="fuwu-time">
+						<view class="fuwu-title">
+							服务时间
+						</view>
+						<view class="fuwu-time-view" @change="changeLog">
+							<uni-datetime-picker v-model="single">{{single==''?order.serveTime:single}}</uni-datetime-picker>
+							<!-- <span>{{order.serveTime}}</span> -->
+							<image style="margin-left: 5px;" class="fuwu-img" src="../../static/images/my/jiantou.png" mode=""></image>
+						</view>
+					</view>
+					<view class="liliao">
+						<view class="liliao-top">
+							<span>理疗师</span>
+							<span>资深</span>
+						</view>
+						<view class="liliao-bottom">
+							<span>王丽娜</span>
+							<image class="fuwu-img" src="../../static/images/my/jiantou.png" mode=""></image>
+						</view>
+					</view>
+				</view>
+				<view class="youhui">
+					<view class="youhui-top">
+						<span>我的优惠券</span>
+						<span>取消使用</span>
+					</view>
+					<view class="youhui-mian">
+						<view class="youhui-mian-list">
+							<view class="youhui-mian-list-top">
+								<view class="youhui-title">优惠券</view>
+								<view class="youhui-money">
+									<span>￥</span>
+									<span>5</span>
+								</view>
+							</view>
+							<view class="youhui-mian-list-top">
+								<view class="youhui-title-bottom">满8元可用</view>
+								<view class="youhui-btn">
+									立即使用
+								</view>
+							</view>
+						</view>
+						<view class="youhui-mian-list">
+							<view class="youhui-mian-list-top">
+								<view class="youhui-title">优惠券</view>
+								<view class="youhui-money">
+									<span>￥</span>
+									<span>5</span>
+								</view>
+							</view>
+							<view class="youhui-mian-list-top">
+								<view class="youhui-title-bottom">满8元可用</view>
+								<view class="youhui-btn">
+									立即使用
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				
+				
+			</view>
+		</view>
+		<u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton>
+	</view>
+
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				single: '',
+				radio1:'',
+				sex: [{
+					text: '我已同意《盛安健康服务协议》',
+					value: 0
+				}],
+				tordersId: '',
+				tpayMoney: '',
+				paySel: 0,
+				showorder: false,
+				orderList: [],
+				loading: true,
+				customStyle: {
+					// backgroundColor: '#e5e5e5',
+					// color: '#FFFFFF',
+
+					// #ifdef MP-WEIXIN
+					width: "310upx",
+					// #endif
+					// #ifndef MP-WEIXIN
+					width: '310upx',
+
+					// #endif	
+					margin: '0 10upx',
+				},
+				customStyle2: {
+					backgroundColor: '',
+					color: '#FFFFFF',
+					// #ifdef MP-WEIXIN
+					width: "310upx",
+					// #endif
+					// #ifndef MP-WEIXIN
+					width: '310upx',
+
+					// #endif	
+					margin: '0 10upx',
+				},
+				id: '',
+				order: {
+					user: {},
+					game: {}
+				},
+				isTrue: 0,
+
+				phone: '',
+				isVip: false,
+				birthDate: '',
+				age: '',
+				showpay: false,
+				openLists: [],
+				openWay: 1,
+				closeable: true,
+				yhqxSel: '否'
+			}
+		},
+		onLoad(e) {
+			uni.showLoading({
+				title: '加载中......',
+
+			})
+			// setTimeout(() => {
+			// 	// this.loading = false;
+			// }, 2000)
+			this.isTrue = e.isTrue
+			if (this.isTrue) {
+				uni.setNavigationBarTitle({
+					title: '订单详情'
+				})
+			}
+			this.ordersId = e.ordersId
+			// this.getOrder()
+		},
+		onShow() {
+			this.yhqxSel = this.$queue.getData("yhqxSel");
+			this.getOrder()
+			if (uni.getStorageSync('token')) {
+				this.getIsVip()
+			}
+
+			// #ifndef MP-WEIXIN
+			this.openLists = [{
+					image: '../../static/images/icon_weixin.png',
+					text: '微信支付',
+					id: 2
+				}, {
+					image: '../../static/images/zhifubao.png',
+					text: '支付宝支付',
+					id: 3
+				}, {
+					image: '../../static/images/lingqian.png',
+					text: '零钱支付',
+					id: 1
+				}],
+				this.openWay = 2;
+			// #endif
+
+			// #ifdef MP-WEIXIN
+			this.openLists = [{
+					image: '../../static/images/icon_weixin.png',
+					text: '微信支付',
+					id: 2
+				}, {
+					image: '../../static/images/lingqian.png',
+					text: '零钱支付',
+					id: 1
+				}],
+				this.openWay = 2;
+			// #endif
+		},
+		methods: {
+			changeLog(e){//服务时间
+				this.single=e;
+			},
+			goChat() {
+				let kefu = this.$queue.getData('kefu'); // 用户端联系方式 1 手机号 2企业微信 
+				let kefuPhone = this.$queue.getData('kefuPhone');
+				if (uni.getStorageSync('token')) {
+					if (kefu == 1) {
+						uni.makePhoneCall({
+							phoneNumber: kefuPhone //仅为示例
+						});
+					} else if (kefu == 3) {
+						uni.navigateTo({
+							url: '/my/setting/customer'
+						});
+					} else {
+						// #ifdef MP-WEIXIN
+						let that = this
+						try {
+							wx.openCustomerServiceChat({
+								extInfo: {
+									url: that.$queue.getData('kefuUrl')
+								},
+								corpId: that.$queue.getData('kefuAppId'),
+								success(res) {},
+								fail(res) {
+									console.error(res)
+								}
+							})
+						} catch (error) {
+							console.error("catchcatch" + error)
+							uni.showToast({
+								title: '请更新至微信最新版本'
+							});
+						}
+						// #endif
+						// #ifndef MP-WEIXIN
+						let url = this.$queue.getData('kefuUrl');
+						if (url.indexOf('/pages/') !== -1 || url.indexOf('/my/') !== -1) {
+							uni.navigateTo({
+								url
+							});
+						} else {
+							//#ifndef H5
+							uni.navigateTo({
+								url: '/pages/index/webView?url=' + url
+							});
+							//#endif
+							//#ifdef H5
+							window.location.href = url;
+							//#endif
+						}
+						// #endif
+					}
+				} else {
+					uni.showModal({
+						title: '提示',
+						content: '您还未登录,请先登录',
+						success: function(res) {
+							if (res.confirm) {
+								console.log('用户点击确定');
+								uni.navigateTo({
+									url: '/pages/public/login'
+								})
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					})
+				}
+			},
+			copy(num) {
+				uni.setClipboardData({
+					data: num,
+					success: r => {
+						this.$queue.showToast('复制成功');
+					}
+				});
+			},
+			goOrder(item) {
+				let that = this
+				let payMoney = that.isVip ? item.memberPrice : item.price;
+				let data = {
+					parentId: that.order.ordersId,
+					artificerId: that.order.artificerId,
+					ordersMassageList: [{
+						massageId: item.massageTypeId,
+						num: 1,
+					}],
+					price: payMoney,
+					couponId: '',
+					payMoney: payMoney,
+					userId: uni.getStorageSync('userId'),
+				}
+				that.$Request.postJson("/app/artificer/insertOrders", data).then(res => {
+					that.showorder = false
+					if (res.code == 0) {
+						that.tordersId = res.data.ordersId;
+						that.tpayMoney = payMoney;
+						that.showpay = true;
+						that.paySel = 1;
+					} else {
+						that.$queue.showToast(res.msg)
+					}
+
+				});
+			},
+			payJZ() {
+				let that = this;
+				if (that.openWay == 1) { //零钱支付
+					uni.showModal({
+						title: '付款提示',
+						content: '确认支付' + that.tpayMoney + '元吗?',
+						success: function(re) {
+							if (re.confirm) {
+								that.$queue.showLoading('支付中...')
+								// console.log('用户点击确定');
+								that.$Request.post("/app/artificer/payOrders", {
+									ordersId: that.tordersId,
+								}).then(ret => {
+									uni.hideLoading();
+									if (ret.code == 0) {
+										uni.showToast({
+											title: '支付成功',
+											icon: 'none'
+										})
+										that.getOrder()
+
+									} else {
+										uni.showToast({
+											title: ret.msg,
+											icon: 'none'
+										})
+									}
+								});
+							} else if (re.cancel) {
+								that.getOrder()
+							}
+						}
+					})
+				} else if (that.openWay == 2) { //微信支付
+					// #ifdef MP-WEIXIN
+					let data = {
+						ordersId: that.tordersId,
+						type: 3
+					}
+					that.$Request.post('/app/wxPay/payOrder', data).then(ret => {
+						console.log(ret)
+						if (ret.code == 0) {
+							uni.hideLoading();
+							uni.requestPayment({
+								provider: 'wxpay',
+								timeStamp: ret.data.timestamp,
+								nonceStr: ret.data.noncestr,
+								package: ret.data.package,
+								signType: ret.data.signType,
+								paySign: ret.data.sign,
+								success: function(ret) {
+									console.log(ret)
+									uni.showToast({
+										title: '支付成功',
+										icon: 'none'
+									})
+									that.getOrder()
+									// this.$queue.showToast('支付成功');
+
+									// uni.switchTab({
+									// 	url: '/pages/my/index'
+									// })
+								},
+								fail: function(err) {
+									// this.$queue.showToast('支付失败');
+									uni.showToast({
+										title: '支付失败',
+										icon: 'nones'
+									});
+									that.getOrder()
+								}
+							});
+						}
+					});
+					// #endif
+
+					// #ifdef H5
+					let ua = navigator.userAgent.toLowerCase();
+					if (ua.indexOf('micromessenger') != -1) {
+						let data = {
+							ordersId: that.tordersId,
+							type: 2
+						}
+						that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
+							that.showpay = false
+							if (rea.code == 0) {
+								that.callPay(rea.data);
+							} else {
+								uni.showToast({
+									title: rea.msg,
+									icon: 'none'
+								})
+							}
+						});
+					} else {
+						let data = {
+							ordersId: that.tordersId,
+							type: 4
+						}
+						that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
+							that.showpay = false
+							if (rea.code == 0) {
+								const urlArr = window.location.href;
+								const hostUrl = urlArr.split("/");
+								const callBack = hostUrl[0] + "//" + hostUrl[2] + "/";
+								const url = '&redirect_url=' + callBack + 'my/order/pay';
+								window.location = rea.data.mweb_url + url
+							} else {
+								uni.showToast({
+									title: rea.msg,
+									icon: 'none'
+								})
+							}
+						});
+					}
+
+					// #endif
+
+					// #ifdef APP
+					let data = {
+						ordersId: that.order.ordersId,
+						type: 1
+					}
+					that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
+						console.log(rea)
+						that.showpay = false
+						if (rea.code == 0) {
+							that.isCheckPay(rea.code, 'wxpay', JSON.stringify(rea.data));
+						}
+					});
+					// #endif
+				} else if (that.openWay == 3) { //支付宝支付
+					// #ifdef H5
+					let data = {
+						ordersId: that.tordersId,
+						type: 2
+					}
+					that.$Request.post('/app/aliPay/payOrder', data).then(
+						rea => {
+							that.showpay = false
+							const div = document.createElement('div')
+							div.innerHTML = rea.data //此处form就是后台返回接收到的数据
+							document.body.appendChild(div)
+							document.forms[0].submit()
+						});
+					// #endif
+
+					// #ifdef APP-PLUS
+					let data = {
+						ordersId: that.tordersId,
+						type: 1
+					}
+					that.$Request.post('/app/aliPay/payOrder', data).then(
+						rea => {
+							that.showpay = false
+							that.setPayment('alipay', rea.data);
+						});
+					// #endif
+				}
+
+			},
+			saveJZ(classifyId) {
+				let data = {
+					parentId: classifyId,
+					page: 1,
+					limit: 50,
+					status: 1
+				}
+				let that = this;
+				this.$queue.showLoading('查询中...')
+				that.$Request.get("/app/artificer/selectMassageTypePage", data).then(res => {
+					if (res.code == 0) {
+						if (res.data.list && res.data.list.length > 0) {
+							that.orderList = res.data.list
+							for (let i = 0; i < that.orderList.length; i++) {
+								if (that.orderList[i].labels) {
+									that.orderList[i].labels = that.orderList[i].labels.split(",");
+								}
+							}
+							uni.hideLoading();
+							that.showorder = true;
+						} else {
+							uni.hideLoading();
+							that.$queue.showToast('暂无可加钟项目');
+						}
+					} else {
+						uni.hideLoading();
+						that.$queue.showToast(res.msg);
+					}
+
+				})
+			},
+			//支付选择
+			selectWay: function(item) {
+				this.openWay = item.id;
+			},
+			//换算年龄
+			getAge(e) {
+				console.log('出生日期：' + e)
+				this.birthDate = e
+				//创建系统日期
+				var today = new Date();
+				//把出生日期转换成日期
+				this.birthDate = new Date(this.birthDate);
+				//分别获取到年份后相减
+				this.age = today.getFullYear() - this.birthDate.getFullYear();
+				// console.log(this.age+'当前年龄')
+			},
+			// 修改订单地址
+			undateAdd(order) {
+				if (order.state == 0) {
+					uni.navigateTo({
+						url: '../address/address?order=' + order.ordersId + '&id=' + 3
+					})
+				}
+			},
+			// 一键导航
+			bindGps(latitude, longitude, name, detailsadd) {
+				console.log(latitude, longitude, name, detailsadd)
+				uni.openLocation({
+					latitude: latitude - 0, //要去的纬度-地址       
+					longitude: longitude - 0, //要去的经度-地址
+					name: name, //地址名称
+					address: detailsadd, //详细地址名称
+					success: function() {
+						console.log('导航成功');
+					},
+					fail: function(error) {
+						console.log(error)
+					}
+				});
+			},
+			ysPhone(phoneA, phoneB) {
+				this.$Request.getT('/app/user/insertVirtualPhone?phoneA=' + phoneA + '&phoneB=' + phoneB).then(res => {
+					if (res.code == 0) {
+						this.order.artificer.phone = res.data;
+					}
+				});
+			},
+			// 拨打电话
+			bindphone(phone) {
+				let that = this
+				uni.showModal({
+					title: '提示',
+					content: '是否拨打电话',
+					success: function(res) {
+						if (res.confirm) {
+							console.log('用户点击确定', phone);
+							uni.makePhoneCall({
+								phoneNumber: phone //仅为示例
+							});
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			goNav(e) {
+				uni.navigateTo({
+					url: e
+				})
+			},
+			getOrder() {
+				let data = {
+					ordersId: this.ordersId
+				}
+				this.$Request.get('/app/artificer/selectOrdersDetails', data).then(res => {
+					if (res.code == 0) {
+						this.loading = false
+						uni.hideLoading()
+						this.order = res.data
+						let aliphone = this.$queue.getData('aliphone');
+						if (aliphone === '是' && this.order.artificer) {
+							this.ysPhone(this.order.phone, this.order.artificer.phone);
+						}
+					}
+				})
+			},
+			delOrder(e) {
+				let that = this
+				uni.showModal({
+					title: '提示',
+					content: '确定删除订单吗?',
+					success: function(res) {
+						if (res.confirm) {
+							let data = {
+								ordersId: e.ordersId,
+							}
+							that.$queue.showLoading('删除中...')
+							that.$Request.post('/app/artificer/removeOrders', data).then(res => {
+								uni.hideLoading();
+								if (res.code == 0) {
+									uni.showToast({
+										name: "删除成功"
+									})
+									uni.navigateBack()
+								} else {
+									that.$queue.showToast(res.msg);
+								}
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			getIsVip() {
+				this.$Request.get("/app/UserVip/isUserVip").then(res => {
+					if (res.code == 0) {
+						this.isVip = res.data
+						uni.setStorageSync('isVIP', res.data)
+					}
+				});
+			},
+			openpay() {
+				this.showpay = true
+			},
+			// 支付订单
+			pay() {
+				let that = this
+				this.showpay = false
+				if (this.paySel != 0) {
+					this.payJZ();
+					return;
+				}
+				if (that.openWay == 1) { //零钱支付
+					uni.showModal({
+						title: '付款提示',
+						content: '确认支付' + that.order.payMoney + '元吗?',
+						success: function(re) {
+							if (re.confirm) {
+								that.$queue.showLoading('支付中...')
+								console.log('用户点击确定');
+								that.$Request.post("/app/artificer/payOrders", {
+									ordersId: that.order.ordersId,
+								}).then(res => {
+									uni.hideLoading();
+									if (res.code == 0) {
+										uni.showToast({
+											title: '支付成功'
+										})
+										that.getOrder()
+									} else {
+										uni.showToast({
+											title: res.msg,
+											icon: 'none'
+										})
+									}
+								});
+							} else if (re.cancel) {
+								uni.hideLoading();
+								console.log('用户点击取消');
+							}
+						}
+
+					})
+				} else if (that.openWay == 2) { //微信支付
+					that.$queue.showLoading('支付中...')
+					// #ifdef MP-WEIXIN
+					let data = {
+						ordersId: that.order.ordersId,
+						type: 3
+					}
+					that.$Request.post('/app/wxPay/payOrder', data).then(ret => {
+						console.log(ret)
+						if (ret.code == 0) {
+							uni.hideLoading();
+							uni.requestPayment({
+								provider: 'wxpay',
+								timeStamp: ret.data.timestamp,
+								nonceStr: ret.data.noncestr,
+								package: ret.data.package,
+								signType: ret.data.signType,
+								paySign: ret.data.sign,
+								success: function(ret) {
+									console.log(ret)
+									uni.showToast({
+										title: '支付成功',
+										icon: 'none'
+									})
+									that.getOrder()
+									// this.$queue.showToast('支付成功');
+
+									// uni.switchTab({
+									// 	url: '/pages/my/index'
+									// })
+								},
+								fail: function(err) {
+									// this.$queue.showToast('支付失败');
+									uni.showToast({
+										title: '支付失败',
+										icon: 'nones'
+									});
+									that.getOrder()
+								}
+							});
+						}
+					});
+					// #endif
+
+					// #ifdef H5
+					let ua = navigator.userAgent.toLowerCase();
+					if (ua.indexOf('micromessenger') != -1) {
+						let data = {
+							ordersId: that.order.ordersId,
+							type: 2
+						}
+						that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
+							that.showpay = false
+							if (rea.code == 0) {
+								that.callPay(rea.data);
+							} else {
+								uni.showToast({
+									title: rea.msg,
+									icon: 'none'
+								})
+							}
+						});
+					} else {
+						let data = {
+							ordersId: that.order.ordersId,
+							type: 4
+						}
+						// debugger;
+						that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
+							// const urlArr = window.location.href;
+							// const hostUrl = urlArr.split("/");
+							// const callBack = hostUrl[0] + "//" + hostUrl[2] + "/";
+							// const url = '&redirect_url=' + callBack + 'my/order/pay';
+							// window.location = rea.mweb_url + url
+							that.showpay = false
+							if (rea.code == 0) {
+								const urlArr = window.location.href;
+								const hostUrl = urlArr.split("/");
+								const callBack = hostUrl[0] + "//" + hostUrl[2] + "/";
+								const url = '&redirect_url=' + callBack + 'my/order/pay';
+								window.location = rea.data.mweb_url + url
+							} else {
+								uni.showToast({
+									title: rea.msg,
+									icon: 'none'
+								})
+							}
+						});
+					}
+
+					// #endif
+
+					// #ifdef APP
+					let data = {
+						ordersId: that.order.ordersId,
+						type: 1
+					}
+					that.$Request.post('/app/wxPay/payOrder', data).then(rea => {
+						console.log(rea)
+						that.showpay = false
+						if (rea.code == 0) {
+							that.isCheckPay(rea.code, 'wxpay', JSON.stringify(rea.data));
+						}
+					});
+					// #endif
+				} else if (that.openWay == 3) { //支付宝支付
+					that.$queue.showLoading('支付中...')
+					// #ifdef H5
+					let data = {
+						ordersId: that.order.ordersId,
+						type: 2
+					}
+					that.$Request.post('/app/aliPay/payOrder', data).then(
+						rea => {
+							const div = document.createElement('div')
+							div.innerHTML = rea.data //此处form就是后台返回接收到的数据
+							document.body.appendChild(div)
+							document.forms[0].submit()
+						});
+					// #endif
+
+					// #ifdef APP-PLUS
+					let data = {
+						ordersId: that.order.ordersId,
+						type: 1
+					}
+					that.$Request.post('/app/aliPay/payOrder', data).then(
+						rea => {
+							that.setPayment('alipay', rea.data);
+						});
+					// #endif
+				}
+			},
+			callPay: function(response) {
+				if (typeof WeixinJSBridge === "undefined") {
+					if (document.addEventListener) {
+						document.addEventListener('WeixinJSBridgeReady', this.onBridgeReady(response), false);
+					} else if (document.attachEvent) {
+						document.attachEvent('WeixinJSBridgeReady', this.onBridgeReady(response));
+						document.attachEvent('onWeixinJSBridgeReady', this.onBridgeReady(response));
+					}
+				} else {
+					this.onBridgeReady(response);
+				}
+			},
+			onBridgeReady: function(response) {
+				let that = this;
+				if (!response.package) {
+					return;
+				}
+				WeixinJSBridge.invoke(
+					'getBrandWCPayRequest', {
+						"appId": response.appid, //公众号名称，由商户传入
+						"timeStamp": response.timestamp, //时间戳，自1970年以来的秒数
+						"nonceStr": response.noncestr, //随机串
+						"package": response.package,
+						"signType": response.signType, //微信签名方式：
+						"paySign": response.sign //微信签名
+					},
+					function(res) {
+						if (res.err_msg === "get_brand_wcpay_request:ok") {
+							// 使用以上方式判断前端返回,微信团队郑重提示：
+							//res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠。
+							uni.hideLoading();
+
+							uni.showToast({
+								title: '支付成功',
+								icon: 'none'
+							})
+							that.getOrder()
+						} else {
+							uni.hideLoading();
+						}
+						WeixinJSBridge.log(response.err_msg);
+					}
+				);
+			},
+			isCheckPay(code, name, order) {
+				if (code == 0) {
+					this.setPayment(name, order);
+				} else {
+					uni.hideLoading();
+					uni.showToast({
+						title: '支付信息有误'
+					});
+				}
+			},
+			setPayment(name, order) {
+				let that = this
+				uni.requestPayment({
+					provider: name,
+					orderInfo: order, //微信、支付宝订单数据
+					success: function(res) {
+						uni.hideLoading();
+						uni.showToast({
+							title: '支付成功',
+							icon: 'none'
+						})
+						that.getOrder()
+					},
+					fail: function(err) {
+						uni.hideLoading();
+					},
+					complete() {
+						uni.hideLoading();
+					}
+				});
+			},
+			// 取消订单
+			cancelOrder(e) {
+				let contentName = '';
+				let closeKC = this.$queue.getData('closeKC');
+				if (e.status == 7 || e.status == 8 && closeKC) {
+					let money = parseFloat(parseFloat(e.price) * parseFloat(closeKC)).toFixed(2);
+					contentName = '取消订单将扣除' + money + '元的手续费，并且车费将全部扣除！';
+				}
+				let that = this
+				uni.showModal({
+					title: '温馨提示',
+					content: '是否确认取消订单？' + contentName,
+					success: function(res) {
+						if (res.confirm) {
+							let data = {
+								ordersId: e.ordersId
+							}
+							that.$queue.showLoading('提交中...')
+							that.$Request.post('/app/artificer/deleteOrders', data).then(res => {
+								uni.hideLoading();
+								if (res.code == 0) {
+									that.getOrder()
+								} else {
+									that.$queue.showToast(res.msg);
+								}
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			// 完成订单
+			cancel(e) {
+				let that = this
+				uni.showModal({
+					title: '提示',
+					content: '确认完成订单吗?',
+					success: function(res) {
+						if (res.confirm) {
+							let data = {
+								ordersId: e.ordersId,
+							}
+							that.$queue.showLoading('提交中...')
+							that.$Request.post('/app/artificer/accomplishOrders', data).then(res => {
+								uni.hideLoading();
+								if (res.code == 0) {
+									uni.navigateBack()
+								} else {
+									that.$queue.showToast(res.msg);
+								}
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			goMsg() {
+				let data = {
+					userId: uni.getStorageSync('userId'),
+					focusedUserId: this.order.user.userId
+				}
+				this.$Request.postJson('/app/chat/insertChatConversation ', data).then(res => {
+					if (res.code == 0) {
+						let id = this.order.user.userId == res.data.userId ? res.data.focusedUserId : this.order
+							.user.userId
+						uni.navigateTo({
+							url: '/pages/msg/im?chatConversationId=' + res.data.chatConversationId +
+								'&byUserId=' + id
+						})
+					}
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.youhui-mian-list{
+		margin-top: 10px;
+		height: 140rpx;
+		background: #DDFCF2;
+		border-radius: 14rpx;
+		justify-content: center;
+		padding: 0px 10px;
+	}
+	.youhui-btn{
+		width: 149rpx;
+		height: 48rpx;
+		line-height: 48rpx;
+		text-align: center;
+		font-weight: bold;
+		font-size: 24rpx;
+		color: #FFFFFF;
+		background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
+		border-radius: 24rpx;
+	}
+	.youhui-title-bottom{
+		font-weight: bold;
+		font-size: 22rpx;
+		color: #999999;
+	}
+	.youhui-money span:nth-child(1){
+		font-size:28.47rpx;
+	}
+	.youhui-money span:nth-child(2){
+		font-size:42.36rpx;
+	}
+	.youhui-money{
+		font-weight: bold;
+		color: #F95900;
+	}
+	.youhui-title{
+		font-weight: bold;
+		font-size: 29rpx;
+		color: #333333;
+	}
+	.youhui-mian-list-top{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	
+	.youhui-mian,.youhui-mian-list{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+	}
+	.youhui-top span:nth-child(1){
+		font-weight: bold;
+		font-size: 29rpx;
+		color: #222222;
+	}
+	.youhui-top span:nth-child(2){
+		font-weight: bold;
+		font-size: 21rpx;
+		color: #666;
+		width: 124rpx;
+		height: 46rpx;
+		line-height: 46rpx;
+		text-align: center;
+		border-radius: 23rpx;
+		border: 1px solid #7D7D7D;
+	}
+	.youhui-top{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.youhui{
+		display: flex;
+		flex-direction: column;
+		width: 95%;
+		background: #FFFFFF;
+		border-radius: 24rpx;
+		padding: 15px;
+	}
+	/deep/.u-button-pay{
+		width: 381rpx;
+		height: 68rpx;
+		line-height: 68px;
+		text-align: center;
+		color: #fff;
+		font-size: 31rpx;
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+		border-radius: 34rpx;
+	}
+	.daizhifu{
+		font-size: 38rpx;
+		color: #333333;
+	}
+	.pay-zhifu{
+		width: 100%;
+		background-color: #f7f7f7 !important;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between !important;
+	}
+	.liliao{
+		margin-top: 10px;
+	}
+	.fuwu-time-view{
+		text-align: right;
+	}
+	.liliao-top span:nth-child(2){
+		width: 78rpx;
+		height: 35rpx;
+		line-height: 35rpx;
+		background: linear-gradient(90deg, #FE912E, #FF9970);
+		border-radius: 17rpx;
+		text-align: center;
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #FFFFFF;
+		margin-left: 5px;
+	}
+	.fuwu-time-view span:nth-child(1),.liliao-bottom span:nth-child(1){
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #666666;
+		margin-right: 5px;
+	}
+	.fuwu-time-view,.liliao-top{
+		width: 70%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.fuwu-title,.liliao-top span:nth-child(1){
+		font-weight: bold;
+		font-size: 29rpx;
+		color: #222222;
+	}
+	.fuwu-time,.liliao{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.adders-view image{
+		margin-top: 5px;
+	}
+	.adders-view span,.header-view-data{
+		font-weight: 400;
+		font-size: 29rpx;
+		color: #666666;
+		text-align: right;
+	}
+	.adders-view{
+		display: flex;
+		flex-direction: row;
+		position: relative;
+	}
+	.header-view-text{
+		width: 170rpx;
+		font-weight: bold;
+		font-size: 29rpx;
+		color: #222222;
+	}
+	.header-view{
+		background-color: #fff;
+		margin-bottom: 10px;
+		border-radius: 11px;
+	}
+	.head-foot span:nth-child(1){
+		margin-right: 5px;
+	}
+	.head-foot span{
+		font-weight: bold;
+		font-size: 28rpx;
+		color: #222222;
+	}
+	.head-foot{
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-end;
+		margin-top: 10px;
+	}
+	.head-mian{
+		margin-top: 3px;
+	}
+	.qian-right span:nth-child(1){
+		font-size: 16.67rpx;
+	}
+	.qian-right span:nth-child(2){
+		font-size:25rpx;
+	}
+	.qian-right span{
+		color: #727272;
+	}
+	.qian-left span:nth-child(1){
+		font-size: 25rpx;
+	}
+	.qian-left span:nth-child(2){
+		font-size:29.17rpx;
+	}
+	.qian-left span{
+		color: #F95900;
+	}
+	.head-top-view-right-img,.adders-view image,.fuwu-img{
+		width: 9.38rpx;
+		height: 15.83rpx;
+	}
+	.head-top-title-bottom{
+		margin-top: 10px;
+	}
+	.head-top-title,.head-top-title-bottom,.head-mian{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.head-top-view-right{
+		width: 83%;
+		display: flex;
+		flex-direction: column;
+	}
+	.head-top-view-img{
+		width: 98.61rpx;
+		height: 98.61rpx;
+	}
+	.head-top-view{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.head-top{
+		width: 100%;
+		background-color: #ffffff;
+		border-radius: 24rpx;
+		padding: 29rpx;
+	}
+	.d-title{
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #333333;
+		padding: 10px 15px 0px 15px;
+		width: 100%;
+	}
+	.checkbox-data{
+		padding: 0px 11px;
+		margin: 15px 0px;
+	}
+	.list-pay-text span:nth-child(2){
+		padding-left: 5px;
+	}
+	.list-pay-text{
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #999999;
+		line-height: 38rpx;
+	}
+	.list-pay{
+		width: 100%;
+		padding: 0px 29rpx;
+	}
+	.pay-ding-top{
+		width: 100%;
+		height: 80rpx;
+		padding: 0px 29rpx;
+	}
+	.fei-view-list span,.fei-view-list-z span{
+		font-weight: bold;
+		font-size: 25rpx;
+	}
+	.fei-view-list-z{
+		height: 65rpx;
+		background-color: rgba(247, 247, 247, 0.8);
+		border-radius: 33rpx;
+		padding: 0px 5px;
+	}
+	.fei-view-list span:nth-child(1),.fei-view-list-z span:nth-child(1){
+		color: #666666;
+	}
+	.fei-view-list span:nth-child(2){
+		color: #333333;
+	}
+	.fei-view-list,.fei-view-list-z{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		margin-top: 5px;
+	}
+	.fei-view{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+	}
+	.fei-title{
+		width: 100%;
+		text-align: center;
+		font-weight: bold;
+		font-size: 29rpx;
+		color: #333333;
+		padding-bottom: 10px;
+		margin-bottom: 10px;
+		border-bottom: 1px solid #E5E5E5;
+	}
+	.feiuong{
+		padding: 29rpx;
+	}
+	/deep/.uni-textarea-textarea{
+		font-weight: 400;
+		font-size: 25rpx;
+	}
+	/deep/.uni-textarea-placeholder{
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #C5C5C5;
+	}
+	.textarea-pay-list{
+		width: 100%;
+		height: 126rpx;
+		margin-top: 10px;
+	}
+	.textarea-pay{
+		background-color: #f3f3f3;
+		width: 100%;
+		height: 100%;
+		background: #F3F3F3;
+		border-radius: 14rpx;
+		padding: 7px;
+	}
+	
+	.pay-ding{
+		padding-bottom: 15px;
+	}
+	.pay-ding,.feiuong{
+		background-color: #ffffff;
+		border-radius: 24rpx;
+		margin-top: 24rpx;
+		// padding: 29rpx;
+	}
+	.phone-pay{
+		width: 49rpx;
+		height: 44rpx;
+	}
+	
+	.d-touxiang{
+		width: 46rpx;
+		height: 46rpx;
+		border-radius: 50%;
+	}
+	.money-pay-jia{
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #666666;
+		text-decoration-line: line-through;
+		margin-left: 5px;
+	}
+	.money-pay-zhen span{
+		color: #FF6000;
+	}
+	.money-pay-zhen span:nth-child(1){
+		font-size: 25rpx;
+	}
+	.money-pay-zhen span:nth-child(2){
+		font-size: 31.25rpx;
+		font-weight: bold;
+	}
+	.money-pay-zhen{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.money-pay{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	
+	.content{
+		 padding-bottom: 140rpx;
+		 padding-top: 20px;
+		 width: 100%;
+		 height: 100vh;
+		 background-color: #f7f7f7;
+	}
+	.pay-title{
+		font-weight: bold;
+		font-size: 28rpx;
+		color: #333333;
+		margin-bottom: 5px;
+	}
+	page {
+		background: #f7f7f7;
+	}
+
+	.bgImg {
+		background-image: url('https://admin.sjajk.com/file/uploadPath/2023/01/03/02952e7260e553d0f3bb26a1cd154921.png');
+		background-size: 100% 1161rpx;
+	}
+
+	.bg {
+		background: linear-gradient(to right, #223845, #00a85b);
+	}
+
+	.list_item {
+		// width: 650upx;
+		// height: 160upx;
+		width: 92%;
+		// margin: 30rpx 0;
+		background: #FFFFFF;
+		border-radius: 24upx;
+		padding: 20upx;
+		display: flex;
+		margin-top: 26upx;
+
+		.listitem_rightview {
+			margin-left: 20upx;
+			width: 80%;
+			padding-top: 10rpx;
+
+			.btnview {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				margin-top: 12upx;
+				width: 100%;
+			}
+
+			.titleview {
+				display: flex;
+				align-items: flex-end;
+				justify-content: space-between
+			}
+
+			.moneyview {
+				display: flex;
+				align-items: flex-end;
+
+				image {
+					width: 30upx;
+					height: 30upx;
+					margin-left: 20upx;
+					margin-bottom: 2upx;
+				}
+			}
+
+			.item_time {
+				font-size: 24upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+				margin-left: 10upx;
+			}
+
+			.item_money {
+				font-size: 32upx;
+				font-family: PingFang SC;
+				font-weight: 800;
+				color: #FF1200;
+			}
+
+			.item_oldmoney {
+				font-size: 24upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				text-decoration: line-through;
+				color: #999999;
+				margin-left: 10upx;
+			}
+
+			.item_btn {
+				width: 140upx;
+				height: 56upx;
+				background: linear-gradient(to right, #223845, #00a85b);
+				border-radius: 16upx;
+				text-align: center;
+				line-height: 56upx;
+				font-size: 24upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #FFFFFF;
+			}
+
+			.item_yishou {
+				font-size: 22upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+			}
+
+			.item_title {
+				font-size: 28upx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #1E1F31;
+			}
+		}
+
+		image {
+			width: 220upx;
+			height: 160upx;
+			border-radius: 24upx;
+		}
+	}
+
+	.jz_btn {
+		width: 170rpx;
+		height: 56upx;
+		background: #096f4b;
+		margin-left: 40rpx;
+		border-radius: 35rpx;
+		line-height: 56upx;
+		text-align: center;
+		font-size: 28rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #FFFFFF;
+	}
+
+	.tabber {
+		width: 100%;
+		background: #ffffff;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		justify-content: center;
+		height: 127rpx;
+		padding: 0 30rpx;
+	}
+
+	.box {
+		/* border: 1px solid #005dff; */
+		background: #E8FAE1;
+		border-radius: 4rpx;
+		color: #096f4b;
+		padding: 5upx 10upx;
+		font-size: 22rpx;
+		margin-top: 10rpx;
+	}
+
+	.popup_pay {
+		width: 100%;
+		position: relative;
+		padding-bottom: 45rpx;
+		/* height: 160px; */
+		/* #ifndef MP-WEIXIN */
+		/* height: 130px; */
+		/* #endif */
+
+	}
+
+	.pay_btn {
+		width: 90%;
+		margin: 0 auto;
+		text-align: center;
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+		height:68rpx;
+		border-radius: 60rpx;
+		color: #ffffff;
+		line-height: 68rpx;
+	}
+
+	.serverAddress {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+</style>
\ No newline at end of file
diff --git a/my/setting/index.vue b/my/setting/index.vue
index 1d35255..342e858 100644
--- a/my/setting/index.vue
+++ b/my/setting/index.vue
@@ -104,8 +104,6 @@
 						}
 					})
 				}
-			
-			
 			},
 			goNav(item) {
 				uni.navigateTo({
diff --git a/my/vip/index.vue b/my/vip/index.vue
index a9dfd69..c5ea1dc 100644
--- a/my/vip/index.vue
+++ b/my/vip/index.vue
@@ -2,7 +2,7 @@
 	<view class="content">
 		<!-- <image class="bgimg" src="../static/workbg.png" mode="widthFix"></image> -->
 		<!-- <image class="bgimg" src="https://admin.sjajk.com/file/uploadPath/2023/01/16/0bd832e6cd894903f6ad2ece7f07824a.png" style="height: 100vh;"></image> -->
-		<view class="bgbox" style="" v-if="showpay==true">
+		<view class="bgbox" style="" v-if="vipShow==false">
 			<!-- <view class="" style="padding: 80rpx 0;text-align: center;">
 				<image src="../../static/ktvip.png" style="width: 513rpx;height: 79rpx;"></image>
 			</view>
@@ -19,7 +19,7 @@
 			</view>
 			<view class="quanyi_view">
 				<view class="quanyi_titview">
-					<view class="quanyi_titview-list" v-if="!isVip">
+					<view class="quanyi_titview-list" v-if="vipData.isVip!=1">
 						<view v-for="(item,index) in vipList" :key='index' @click="select(item)" class="vip-list">
 							<view class="biaoqian">新用户特惠</view>
 							<view class="text-center flex flex-direction justify-between padding-tb radius"
@@ -29,12 +29,16 @@
 							</view>
 						</view>
 					</view>
-					<view class="save_vipbtn" v-if="!isVip" @tap="showpay = true">立即开通</view>
+					<view class="save_vipbtn" v-if="vipData.isVip!=1" @tap="showpay = true">立即开通</view>
 					<view class="quanyi_titname">~VIP超值权益~</view>
 					<view class="quanyi_itemview" style="margin-bottom: 60rpx;">
-						<view class="quanyi_listitem" v-for="(item,index) in gridData" :key="index">
-							<image :src="item.image"></image>
-							<view class="listitem_name">{{item.title}}</view>
+						<view class="quanyi_listitem">
+							<image src="../../static/vip/zuanshi.png"></image>
+							<view class="listitem_name">专享{{vipData.rateStr}}折</view>
+						</view>
+						<view class="quanyi_listitem">
+							<image src="../../static/vip/wangguan.png"></image>
+							<view class="listitem_name">身份标识</view>
 						</view>
 					</view>
 				</view>
@@ -43,16 +47,20 @@
 		<view class="bgbox" style="" v-else>
 			<view class="bgbox-top-show">
 				<image src="../../static/vip/membership.png" mode=""></image>
-				<view class="bgbox-top-show-youxiao">到期时间2024-01-31 10:00:00{{endTime}}</view>
+				<view class="bgbox-top-show-youxiao">到期时间{{vipData.endTime}}</view>
 			</view>
 			<view class="bgbox-mian">VIP超值权益</view>
 			<view class="quanyi_view">
 				<view class="quanyi_titview">
 					<view class="quanyi_titname">~VIP超值权益~</view>
 					<view class="quanyi_itemview" style="margin-bottom: 60rpx;">
-						<view class="quanyi_listitem" v-for="(item,index) in gridData" :key="index">
-							<image :src="item.image"></image>
-							<view class="listitem_name">{{item.title}}</view>
+						<view class="quanyi_listitem">
+							<image src="../../static/vip/zuanshi.png"></image>
+							<view class="listitem_name">专享{{vipData.rateStr}}折</view>
+						</view>
+						<view class="quanyi_listitem">
+							<image src="../../static/vip/wangguan.png"></image>
+							<view class="listitem_name">身份标识</view>
 						</view>
 					</view>
 				</view>
@@ -99,15 +107,6 @@
 					border: 0,
 					fontWeight: '700'
 				},
-				gridData: [{
-						title: '专享九折',
-						image: '../../static/vip/zuanshi.png'
-					},
-					{
-						title: '身份标识',
-						image: '../../static/vip/wangguan.png'
-					}
-				],
 				avatar: '',
 				userName: '匿名',
 				vipList: [],
@@ -120,6 +119,8 @@
 				openLists: [],
 				openWay: 2,
 				showpay: false,
+				vipData:[],
+				vipShow:false
 			}
 		},
 		onLoad() {
@@ -157,7 +158,15 @@
 			this.getVipList()
 			this.getMemberList()
 			this.getMoney()
-			this.getIsVip()
+			// this.getIsVip()
+			this.vipData=this.$queue.getData('VipDetails')
+			console.log("vipDatavipDatavipDatavipData",this.vipData)
+			if(this.vipData.isVip=='1'){
+				this.vipShow=true;
+			}else{
+				this.vipData=[]
+				this.vipShow=false
+			}
 		},
 		methods: {
 			selectWay: function(id) {
@@ -174,7 +183,8 @@
 			getVipList() {
 				this.$Request.get('/app/VipDetails/selectVipDetails').then(res => {
 					if (res.code == 0) {
-						this.vipList = res.data
+						this.vipList = res.data;
+						this.vipData.rateStr=this.vipList[0].rateStr;
 						this.selNum = this.vipList[0].id
 						this.price = this.vipList[0].money
 					}
@@ -208,8 +218,9 @@
 				});
 			},
 			select(e) {
-				this.selNum = e.id
-				this.price = e.money
+				this.selNum = e.id;
+				this.price = e.money;
+				this.vipData.rateStr=e.rateStr
 			},
 			pay() {
 				this.getMoney()
diff --git a/pages.json b/pages.json
index f2f0113..7966475 100644
--- a/pages.json
+++ b/pages.json
@@ -225,7 +225,7 @@
 				"app-plus": {
 					"bounce": "none",
 					"scrollIndicator": "none",
-					"titleNView": true
+					"titleNView": false
 				}
 			}
 		},
@@ -253,7 +253,7 @@
 				"app-plus": {
 					"bounce": "none",
 					"scrollIndicator": "none",
-					"titleNView": true
+					"titleNView": false
 				}
 			}
 		},
@@ -265,7 +265,7 @@
 				"app-plus": {
 					"bounce": "none",
 					"scrollIndicator": "none",
-					"titleNView": true
+					"titleNView": false
 				}
 			}
 		},
@@ -478,13 +478,19 @@
 				"path": "gird/browse",
 				"style": {
 					"navigationBarTitleText": "浏览足迹",
-					"enablePullDownRefresh": true
+					"enablePullDownRefresh": true,
+					"app-plus": {
+						"titleNView": false
+					}
 				}
 			}, {
 				"path": "gird/shoucang",
 				"style": {
 					"navigationBarTitleText": "我的收藏",
-					"enablePullDownRefresh": true
+					"enablePullDownRefresh": true,
+					"app-plus": {
+						"titleNView": false
+					}
 				}
 			},
 			{
@@ -601,10 +607,24 @@
 					}
 				}
 			},
+			{
+				"path": "order/payYouHui",
+				"style": {
+					"navigationBarTitleText": "修改优惠卷",
+					"navigationStyle": "custom",
+					"app-plus": {
+						"titleNView": false
+					}
+				}
+			},
 			{
 				"path": "order/complain",
 				"style": {
-					"navigationBarTitleText": "投诉"
+					"navigationBarTitleText": "投诉",
+					"navigationStyle": "custom",
+					"app-plus": {
+						"titleNView": false
+					}
 				}
 			},
 			{
@@ -736,6 +756,7 @@
 					"navigationBarTitleText": "修改手机号"
 				}
 			},
+			
 			{
 				"path": "order/feedback",
 				"style": {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 9964ae3..d2e3f00 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -22,33 +22,19 @@
 					<image  src="../../static/index-nav-5.png" mode="widthFix"></image>
 				</view>
 			</view>
-			<view class="index-mian width">
-				<view class="index-mian-select">
-					 <uni-data-select
-						v-model="value"
-						:localdata="range"
-						@change="change"
-					  ></uni-data-select>
-					  <image src="../../static/xiala.png" mode="widthFix"></image>
-				</view>
-				<view>
-					<uni-search-bar @confirm="search" :cancelext="'取消'" v-model="searchValue" @blur="blur" @input="input"
-					 @clear="clear">
-					</uni-search-bar>
+			<view class="padding-top-sm flex align-center index-mian">
+				<view v-if="XCXIsSelect != '否'" class="flex align-center justify-between margin-right-sm"
+					@tap="showCityList" style="line-height: 68rpx;">
+					<image src="../../static/liliao-1.png" class="dingwei-img"></image>
+					<view class="localName">{{ city }}</view>
 				</view>
+				<u-search class="" placeholder="请输入理疗师名字" :focus="false" shape="square" v-model="artificerName"
+					:show-action="true" :animation="true" bg-color="#fff" color="#1A1A1A" @search="onSearch()"
+					></u-search>
 			</view>
 			<view class="index-fenl width">
 				<view class="index-gun">
-					<view class="fenl">中医推拿</view>
-					<view class="fenl">小儿推拿</view>
-					<view class="fenl">产后康复</view>
-					<view class="fenl">SPA精油</view>
-					<view class="fenl">小儿推拿</view>
-					<view class="fenl">产后康复</view>
-					<view class="fenl">SPA精油</view>
-					<view class="fenl">小儿推拿</view>
-					<view class="fenl">产后康复</view>
-					<view class="fenl">SPA精油</view>
+					<view class="fenl" v-for="(item,index) in typeList" :key="index">{{item.value}}</view>
 				</view>
 			</view>
 			<view class="index-nav-bottom width">
@@ -69,7 +55,7 @@
 		</view>
 		<view class="star-technician width">
 			<view class="star-technician-mian">
-				<liu-goods-swiper :goodsList="goodsList" :imgWidth="160" :imgHeight="225" @clickItem="chooseItem" @cancellable='false'></liu-goods-swiper>
+				<liu-goods-swiper :goodsList="starTechnician" :imgWidth="160" :imgHeight="225" @clickItem="chooseItem" @cancellable='false'></liu-goods-swiper>
 			</view>
 		</view>
 		<view class="index-project width">
@@ -133,42 +119,24 @@
 				</view>
 			</view>
 			<view class="index-fujin-img width">
-				<view class="index-fujin-view">
-					<image class="index-fujin-view-img" src="../../static/pintuan.png" mode="widthFix"></image>
-					<view class="index-fujin-view-text">
-						<image src="../../static/fujin-dingwei.png" mode="widthFix"></image>
-						<span>1.2km</span>
-					</view>
-				</view>
-				<view class="index-fujin-view">
-					<image class="index-fujin-view-img" src="../../static/pintuan.png" mode="widthFix"></image>
-					<view class="index-fujin-view-text">
-						<image src="../../static/fujin-dingwei.png" mode="widthFix"></image>
-						<span>1.2km</span>
-					</view>
-				</view>
-				<view class="index-fujin-view">
-					<image class="index-fujin-view-img" src="../../static/pintuan.png" mode="widthFix"></image>
-					<view class="index-fujin-view-text">
-						<image src="../../static/fujin-dingwei.png" mode="widthFix"></image>
-						<span>1.2km</span>
+				<view class="fujin-view" v-for="(item,index) in nearbyTechnician" :key="index">
+					<view class="index-fujin-view">
+						<image class="index-fujin-view-img" :src="item.artificerImg" mode=""></image>
+						<view class="index-fujin-view-text">
+							<image src="../../static/orderDetail/dingwei.png" mode=""></image>
+							<span>1.2km</span>
+						</view>
+					</view>
+					<view class="index-fujin-jie">
+						<view class="index-fujin-jie-view">
+							<span class="index-fujin-jie-name">{{item.artificerName}}</span>
+							<span class="index-fujin-jie-id">{{item.classifyName}}</span>
+						</view>
 					</view>
 				</view>
+				
 			</view>
-			<view class="index-fujin-jie">
-				<view class="index-fujin-jie-view">
-					<span class="index-fujin-jie-name">李安茹</span>
-					<span class="index-fujin-jie-id">中医推拿</span>
-				</view>
-				<view class="index-fujin-jie-view">
-					<span class="index-fujin-jie-name">李安茹</span>
-					<span class="index-fujin-jie-id">中医推拿</span>
-				</view>
-				<view class="index-fujin-jie-view">
-					<span class="index-fujin-jie-name">李安茹</span>
-					<span class="index-fujin-jie-id">中医推拿</span>
-				</view>
-			</view>
+			
 			<view class="index-taocan width">
 				<view class="index-taocan-view">
 					<view class="index-taocan-view-nav" v-for="item in felNav" :key="item.id" @click="chengFel(item)">
@@ -287,13 +255,34 @@
 				</swiper>
 			</view>
 		</view>
+		<!-- 经验筛选 -->
+		<u-select v-model="Cityshow" :list="cityList" @confirm="getCity"></u-select>
 	</view>
 </template>
 
 <script>
+	import commonConfig from 'common/config.js';
+	
+	import * as webMap from 'utils/webMap.js';
+	
+	// 调用手机系统权限
+	// #ifdef APP-PLUS
+	import permision from "@/components/permission.js";
+	// #endif
 	export default {
 		data() {
 			return {
+				cityList: [],
+				Cityshow: false,
+				artificerName: '',
+				//地图相关
+				token: '',
+				infoWindow: null,
+				amap: null,
+				latitude: '43.86487',
+				longitude: '',
+				city: '请选择城市',
+				XCXIsSelect: '否',
 				currentTabFl: 1,
 				felNav:[{
 						id:1,
@@ -350,8 +339,11 @@
 					},
 				
 				],
-				
+				typeList:[],
 				searchValue: '123123',
+				starTechnician:[],//明星技师
+				nearbyTechnician:[],//附近技师
+				classifyId: '',
 				value: 0,
 				range: [
 				  { value: 0, text: "篮球" },
@@ -390,9 +382,151 @@
 			}
 		},
 		onLoad() {
-
+			let that = this
+			uni.getLocation({
+				type: 'gcj02',
+				geocode: true, //设置该参数为true可直接获取经纬度及城市信息
+				highAccuracyExpireTime: 500,
+				success: function(res) {
+					console.log(res, '地理位置-----------------------》')
+					that.latitude = res.latitude
+					that.longitude = res.longitude
+			
+					uni.setStorageSync('latitude', res.latitude)
+					uni.setStorageSync('longitude', res.longitude)
+					if (that.amap) {
+						that.amap.setCenter(new AMap.LngLat(res.latitude, res.longitude));
+					}
+					if (that.infoWindow) {
+						that.infoWindow.setPosition(new TMap.LatLng(res.latitude, res.longitude));
+					}
+					// that.getTypeList();
+				},
+				fail: function(e) {
+					console.log('获取地址失败1', e)
+					// #ifdef APP-PLUS
+					that.checkPermission();
+					// #endif
+				}
+			})
+			that.getBannerList()
+			that.getHomeArtificerList()
+		},
+		onShow() {
+			let that = this
+			that.XCXIsSelect = this.$queue.getData("XCXIsSelect");
+			that.city = uni.getStorageSync('city') ? uni.getStorageSync('city') : '请选择城市'
+			that.token = uni.getStorageSync('token')
+			// if (uni.getStorageSync('token')) {
+			if (that.latitude && that.longitude) {
+				// that.getlist()
+			} else {
+				uni.getLocation({
+					type: 'gcj02',
+					highAccuracyExpireTime: 500,
+					geocode: true, //设置该参数为true可直接获取经纬度及城市信息
+					success: function(res) {
+						console.log(res, '地理位置')
+						that.latitude = res.latitude
+						that.longitude = res.longitude
+						// that.getTypeList();
+						// that.getlist()
+					},
+					fail: function() {
+						console.log('获取地址失败2')
+					}
+				})
+			}
+			// }
+			// that.myId = uni.getStorageSync('userId')
 		},
 		methods: {
+			getCity(e) {
+				console.log("得到的城市-------------》",e[0].label);
+				this.city = e[0].label;
+				uni.setStorageSync('city', this.city)
+				// this.getKTCityList();
+				// this.page = 1
+				// this.getlist()
+			},
+			showCityList() {
+				// #ifdef APP-PLUS
+				if (this.latitude === '' || this.longitude === '') {
+					this.checkPermission();
+					return;
+				}
+				// #endif
+				this.Cityshow = true;
+			},
+			onSearch(e) {
+				// this.artificerName = e;
+				this.getlist()
+			},
+			async checkPermission() {
+				let status = permision.isIOS ? await permision.requestIOS('location') : await permision.requestAndroid(
+					'android.permission.ACCESS_FINE_LOCATION');
+				if (status === null || status === 1) {
+					status = 1;
+				} else if (status === 2) {
+					uni.showModal({
+						content: "系统定位已关闭",
+						confirmText: "确定",
+						showCancel: false,
+						success: function(res) {}
+					})
+				} else if (status.code) {
+					uni.showModal({
+						content: status.message
+					})
+				} else {
+					uni.showModal({
+						title: '定位服务已关闭',
+						content: "您需要打开定位权限，否则我们将无法获得到您附近的项目服务，导致我们无法为您提供服务，请到>设置>隐私>定位服务>中开启【盛安到家】定位权限",
+						confirmText: "设置",
+						success: function(res) {
+							if (res.confirm) {
+								permision.gotoAppSetting();
+							}
+						}
+					})
+				}
+				return status;
+			},
+			getHomeArtificerList(){
+				var data={
+						  isStart: 1,
+						  status: 1,
+						  city: "长春市",
+						  longitude:'125.281198',
+						  latitude:'43.883036',
+						  page: 1,
+						  limit: 3
+						}
+				this.$Request.get("/app/artificer/getHomeArtificerList",data).then(res => {
+					if (res.code == 0) {
+							this.starTechnician = res.startData.list;
+							this.nearbyTechnician=res.nearData.list
+							console.log("starTechnician",res.startData.list)
+							// this.classifyId = res.data[0].id;
+							// this.getorderlist('')
+					}
+				});
+			},
+			//获取轮播图
+			getBannerList() {
+			
+				this.$Request.get("/app/dict/list", {
+					type: '服务类型'
+				}).then(res => {
+					if (res.code == 0) {
+						if (res.data) {
+							this.typeList = res.data
+							// this.classifyId = res.data[0].id;
+							// this.getorderlist('')
+						}
+					}
+				});
+			},
 			chengFel(item){//大家常买。。。 导航切换
 				this.currentTabFl=item.id
 			},
@@ -419,35 +553,42 @@
 				console.log("推荐明星",item)
 				// 点击拿到整个当前点击的item 执行业务逻辑 
 			},
-			 change(e) {
-					console.log("e:", e);
-				  },
-			search(res) {
-					// uni.showToast({
-					// 	title: '搜索：' + res.value,
-					// 	icon: 'none'
-					// })
-				},
-				input(res) {
-					console.log('----input:', res)
-				},
-				clear(res) {
-					uni.showToast({
-						title: 'clear事件，清除值为：' + res.value,
-						icon: 'none'
-					})
-				},
-				blur(res) {
-					uni.showToast({
-						title: 'blur事件，输入值为：' + res.value,
-						icon: 'none'
-					})
-				},
 		}
 	}
 </script>
 
 <style scoped>
+	/deep/.u-select{
+		width: 100%;
+		height: 100%;
+	}
+	/deep/.u-select__header{
+	    display: flex;
+	    flex-direction: row;
+	    align-items: center;
+	    justify-content: space-between;
+	    height: 38px;
+	    padding: 0 19px;
+	}
+	/deep/.u-content,/deep/.u-search{
+		flex: none;
+		width: 557.08rpx;
+		border-radius: 32rpx !important;
+		height: 64rpx !important;
+	}
+	/deep/.u-action{
+		display: none;
+	}
+	.dingwei-img{
+		width:33.33rpx;
+		height:37.5rpx;
+	}
+	.localName{
+		margin-left: 4rpx;
+		font-weight: bold;
+		font-size: 33rpx;
+		color: #333333;
+	}
 	.menu-topic-act .menu-topic-bottom-color {
 		background: linear-gradient(90deg,rgba(234, 248, 245,0.7),rgba(132, 211, 196,0.7));
 	}
@@ -775,12 +916,18 @@
 		align-items: center;
 		justify-content: space-between;
 	}
+	.fujin-view{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
 	.index-fujin-view{
 		width: 222.22rpx;
-		height: 100%;
 		position: relative;
 		display: flex;
 		align-items: center;
+		height: 313rpx;
 	}
 	.index-fujin-view-img{
 		width: 100%;
@@ -992,11 +1139,13 @@
 		align-items: center;
 	}
 	.index-mian{
+		width: 100%;
 		display: flex;
 		flex-direction: row;
 		justify-content: space-between;
 		align-items: center;
-		margin: 10px auto;
+		margin: 10px 0px;
+		padding: 0px 10px;
 	}
 	
 	/deep/.uni-select__input-box .uni-icons {
diff --git a/pages/my/cooperation.vue b/pages/my/cooperation.vue
index ee46e59..2b9441d 100644
--- a/pages/my/cooperation.vue
+++ b/pages/my/cooperation.vue
@@ -1,9 +1,5 @@
 <template>
-	<view>
-		<!-- <image class="bgimg"
-			src="https://admin.sjajk.com/file/uploadPath/2023/01/16/034493ff8f12eff0f6768facc8124716.png"
-			mode="widthFix"></image> -->
-
+	<view class="content">
 		<view class="info">
 			<view class="info-box">
 				<view class="info-box-item">
@@ -181,8 +177,12 @@
 </script>
 
 <style lang="less">
-	page {
-		background-color: #ffffff;
+	.content {
+		background-color: #f7f7f7;
+		width: 100%;
+		height: 100vh;
+		padding-top: 20px;
+		position: relative;
 	}
 
 	.bgimg {
@@ -191,13 +191,14 @@
 	}
 
 	.info {
-		width: 100%;
+		width: 95%;
 		height: auto;
 		display: flex;
 		justify-content: center;
-		margin: 0;
+		margin: 0px auto;
 		padding: 40rpx;
-
+		background-color: #fff;
+		border-radius: 10px;
 		.info-box {
 			width: 100%;
 			
@@ -231,8 +232,9 @@
 		height: 88rpx;
 		display: flex;
 		justify-content: center;
-		position: absolute;
-
+		position: fixed;
+		bottom: 0px;
+		margin-bottom: 20px;
 		.sub-box {
 			width: 613rpx;
 			height: 100%;
@@ -241,9 +243,10 @@
 
 			.sub-box-l {
 				width: 290rpx;
-				height: 88rpx;
-				background: linear-gradient(to right, #223845, #00a85b);
-				border-radius: 44rpx;
+				height: 92rpx;
+				line-height: 92rpx;
+				background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+				border-radius: 46rpx;
 				color: #ffffff;
 				font-size: 30rpx;
 				display: flex;
@@ -252,10 +255,11 @@
 			}
 
 			.sub-box-rs {
-				width: 600rpx;
-				height: 88rpx;
-				background: linear-gradient(to right, #223845, #00a85b);
-				border-radius: 44rpx;
+				width: 290rpx;
+				height: 92rpx;
+				line-height: 92rpx;
+				background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+				border-radius: 46rpx;
 				color: #ffffff;
 				font-size: 30rpx;
 				display: flex;
@@ -265,9 +269,10 @@
 
 			.sub-box-r {
 				width: 290rpx;
-				height: 88rpx;
-				background: linear-gradient(to right, #223845, #00a85b);
-				border-radius: 44rpx;
+				height: 92rpx;
+				line-height: 92rpx;
+				background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+				border-radius: 46rpx;
 				color: #ffffff;
 				font-size: 30rpx;
 				display: flex;
diff --git a/pages/my/css/myteam.vue b/pages/my/css/myteam.vue
new file mode 100644
index 0000000..c6cc222
--- /dev/null
+++ b/pages/my/css/myteam.vue
@@ -0,0 +1,241 @@
+<template>
+	<view class="content">
+		<view class="flex text-center  text-lg bg">
+			<view class="title_btn flex-sub bg" @click="cut(1)" :class="tabFromIndex==1?'bgCol2': ''">团队用户
+			</view>
+			<view class="title_btn flex-sub bg" @click="cut(2)" :class="tabFromIndex==2?'bgCol2': ''">团队理疗师
+			</view>
+		</view>
+		<view class="view1">
+			<view class="flex">
+				<view class="view1_item">
+					<view class="view1_itemmoney">{{ teamCount }} <text>人</text> </view>
+					<view class="view1_itemname">已邀请</view>
+				</view>
+				<view class="view1_item" @tap="goDetail">
+					<view class="view1_itemmoney"><text>￥</text>{{ teamMoney }}</view>
+					<view class="view1_itemname">我的收益</view>
+				</view>
+			</view>
+			<image src="../../static/teamYao.png" @tap="goYao"></image>
+		</view>
+		<view class="view2" style="border-radius: 20upx;">
+			<view style="display: flex;flex-direction: row;padding: 20upx;">
+				<view style="width: 20%;">排名</view>
+				<view style="width: 50%;">用户</view>
+				<view style="width: 30%;text-align: center;">收益</view>
+			</view>
+			<view style="display: flex;flex-direction: row;padding: 20upx;" v-for="(item, index) in rankingList"
+				:key="index">
+				<view style="width: 20%;">
+					<image v-if="index == 0"
+						src="https://admin.sjajk.com/file/uploadPath/2023/01/16/f5305e9ce03a6d0269f58ce55e6c3d0d.png"
+						style="width: 50upx; height: 50upx;"></image>
+					<image v-if="index == 1"
+						src="https://admin.sjajk.com/file/uploadPath/2023/01/16/20b80ec8d3f4db15754426697d0054b8.png"
+						style="width: 50upx; height: 50upx;"></image>
+					<image v-if="index == 2"
+						src="https://admin.sjajk.com/file/uploadPath/2023/01/16/6f61f5e7ec61a1d815bee3c9f0af3c58.png"
+						style="width: 50upx; height: 50upx;"></image>
+					<view v-if="item.rankNum > 2" style="font-size: 19px; color: #999999; margin-left: 15upx;">
+						{{ index + 1 }}
+					</view>
+				</view>
+				<view style="width: 50%;display: flex;flex-direction: row;align-items: center;">
+					<image :src="item.avatar ? item.avatar : '/static/logo.png'"
+						style="border-radius: 100upx;width: 50upx; height: 50upx;"></image>
+					<view style="font-size: 14px; color: #333333;margin-left: 20upx; width: 65%;">{{ item.userName }}
+					</view>
+				</view>
+				<view style="width: 30%;text-align: center;">
+					<view style="font-size: 16px;color: #096f4b;">¥{{ item.money }}</view>
+				</view>
+			</view>
+			<!-- 加载更多提示 -->
+			<view class="s-col is-col-24" v-if="rankingList.length > 0">
+				<load-more :loadingType="loadingType" :contentText="contentText"></load-more>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				tabFromIndex: 1,
+				teamCount: 0,
+				teamMoney: 0,
+				rankingList: [],
+				imageUrl: '/static/logo2.jpg',
+				money: 0,
+				nickName: '游客',
+				rankNum: 0,
+				page: 1,
+				size: 20,
+				loadingType: 0,
+				scrollTop: false,
+				contentText: {
+					contentdown: '上拉显示更多',
+					contentrefresh: '正在加载...',
+					contentnomore: '没有更多数据了'
+				}
+			};
+		},
+		onLoad() {
+			let userId = this.$queue.getData('userId');
+			if (userId) {
+				this.getRankingList(userId);
+				this.getUserInfo();
+			}
+		},
+		onPageScroll: function(e) {
+			this.scrollTop = e.scrollTop > 200;
+		},
+		methods: {
+			goDetail(){
+				if(this.tabFromIndex == 1){
+					uni.navigateTo({
+						url: '/my/wallet/usermoneydetail?classIndex=5'
+					});
+				}else{
+					uni.navigateTo({
+						url: '/my/wallet/usermoneydetail?classIndex=6'
+					});
+				}
+			},
+			cut(index) {
+				this.tabFromIndex = index;
+				this.page = 1;
+				let userId = this.$queue.getData('userId');
+				this.getRankingList(userId);
+				this.getUserInfo();
+			},
+			goYao() {
+				uni.navigateTo({
+					url: '/pages/my/invitationUser'
+				});
+			},
+			getUserInfo() {
+				let userId = this.$queue.getData('userId');
+				this.$Request.getT('/app/artificer/selectTeamStatistics?userId=' + userId + '&type=' + this.tabFromIndex)
+					.then(res => {
+						if (res.code == 0) {
+							this.teamCount = res.data.teamCount ? res.data.teamCount : 0;
+							this.teamMoney = res.data.teamMoney ? res.data.teamMoney : 0;
+						}
+					});
+			},
+			getRankingList() {
+				this.loadingType = 1;
+				uni.showLoading({
+					title: '加载中...'
+				});
+				let userId = this.$queue.getData('userId');
+				this.$Request.getT('/app/artificer/selectTeamUserList?type=' + this.tabFromIndex + '&page=' + this.page +
+					'&limit=' + this
+					.size +
+					'&userId=' + userId).then(res => {
+					if (res.code === 0) {
+						if (this.page === 1) {
+							this.rankingList = [];
+						}
+						res.data.list.forEach(d => {
+							this.rankingList.push(d);
+						});
+						if (res.data.list.length === this.size) {
+							this.loadingType = 0;
+						} else {
+							this.loadingType = 3;
+						}
+					} else {
+						this.loadingType = 2;
+					}
+					uni.hideLoading();
+				});
+			}
+		},
+		onReachBottom: function() {
+			this.page = this.page + 1;
+			this.getRankingList();
+		},
+		onPullDownRefresh: function() {
+			this.page = 1;
+			this.getRankingList();
+		}
+	};
+</script>
+
+<style lang="scss">
+	page {
+		background: #F5F5F5;
+	}
+
+	.bg {
+		background: #FFFFFF;
+	}
+
+	.view1 {
+		background-color: #ffffff;
+		width: 93%;
+		height: 360upx;
+		margin-left: 26upx;
+		border-radius: 20upx;
+		margin-top: 20upx;
+		border-radius: 20upx;
+
+		image {
+			width: 586rpx;
+			height: 88rpx;
+			margin: 80rpx 50rpx 0rpx;
+		}
+
+		.view1_item {
+			margin: 60upx 0 0 0;
+			height: 100upx;
+			flex: 1;
+			text-align: center;
+
+			.view1_itemmoney {
+				font-size: 56rpx;
+				font-family: PingFang SC;
+				font-weight: 800;
+				color: #333333;
+
+				text {
+					font-size: 28rpx;
+				}
+			}
+
+			.view1_itemname {
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+				margin-top: 30rpx;
+			}
+		}
+	}
+
+	.title_btn {
+		height: 78upx;
+		line-height: 78upx;
+		color: #333333;
+		/* background: #f7f7f7; */
+	}
+
+	.bgCol2 {
+		color: #333;
+		font-weight: bold;
+	}
+
+	.view2 {
+		background-color: #ffffff;
+		width: 93%;
+		height: 100%;
+		margin-left: 26upx;
+		border-radius: 20upx;
+		margin-bottom: 20upx;
+		margin-top: 20rpx;
+	}
+</style>
diff --git a/pages/my/hehuo.vue b/pages/my/hehuo.vue
index 580e290..6a76145 100644
--- a/pages/my/hehuo.vue
+++ b/pages/my/hehuo.vue
@@ -22,14 +22,14 @@
 				<view class="xian"></view>
 			</view>
 			<view class="item_view">
-				<view class="item_title">头像上传</view>
+				<view class="item_title" style="margin-bottom: 10px;">头像上传</view>
 				<view class="flex" style="overflow: hidden;flex-direction: initial;">
 					<view v-if="headImg.length">
 						<view class="margin-top flex margin-right-sm">
 							<view class="flex"
 								style="width: 150upx;height: 150upx;margin-right: 10rpx;position: relative;">
 								<image :src="headImg" style="width: 100%;height: 100%;"></image>
-								<view style="z-index: 9;position: absolute;top: -15rpx;right: -15rpx;"
+								<view style="z-index: 9;position: absolute;margin-top: -1px;right: 0px;"
 									@click="headImgremove(index)">
 									<u-icon name="close-circle-fill" color="#2979ff" size="50rpx"></u-icon>
 								</view>
@@ -37,13 +37,10 @@
 						</view>
 					</view>
 					<view class="margin-top" @click="addImage()" v-if="headImg.length<=0">
-						<view style="width: 150upx;height: 150upx;background: #F5F5F5;"
-							class="flex justify-center align-center">
+						<view class="flex justify-center align-center margin-top-view">
 							<view>
 								<view class="text-center">
-									<image src="../../static/images/my/add.png"
-										style="width: 54upx;height: 47upx;position: relative;">
-									</image>
+									<image style="width: 43.06rpx;height: 38.19rpx;" src="../../static/orderDetail/img-shang.png" mode=""></image>
 								</view>
 								<view class="text-center text-xs margin-top-xs">上传图片</view>
 							</view>
@@ -53,9 +50,9 @@
 			</view>
 
 			<!-- <view class="audit_message" v-if="auditContent != '' && bb == 3">拒绝原因：{{auditContent}}</view> -->
-			<view class="save_btn" @tap="save" v-if="bb !=0">提交申请</view>
 			<!-- <view class="save_btn" v-if="status == 0">审核中</view> -->
 		</view>
+		<view class="save_btn" @tap="save" v-if="bb !=0">提交申请</view>
 	</view>
 </template>
 
@@ -230,13 +227,51 @@
 <style lang="less">
 	@import '../../static/less/index.less';
 	@import '../../static/css/index.css';
-
+	.save_btn {
+		width: 600upx;
+		height: 92rpx;
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+		border-radius: 46rpx;
+		line-height: 92upx;
+		margin: 0 auto;
+		color: #fff;
+		font-size: 30upx;
+		position: absolute;
+		bottom: 0px;
+		margin-bottom: 10px;
+		text-align: center;
+		/* #ifdef MP-WEIXIN */
+		margin-top: 150rpx;
+		/* #endif */
+		/* #ifdef H5 */
+		margin-top: 100rpx;
+		/* #endif */
+		/* #ifdef APP-PLUS */
+		margin-top: 180rpx;
+		/* #endif */
+	}
+	
+	.margin-top-view{
+		width: 150upx;
+		height: 150upx;
+		background: #f7f7f7;
+	}
 	.hehuo_view {
 		width: 100%;
-		padding: 0 40rpx;
-
+		padding-top: 10px;
+		height: 100vh;
+		background-color: #f7f7f7;
+		position: relative;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		
 		.text_view {
-
+			width: 95%;
+			margin: 0 auto;
+			background-color: #fff;
+			border-radius: 10px;
+			padding: 20px;
 			.audit_message {
 				color: red;
 				width: 650rpx;
@@ -244,28 +279,7 @@
 				margin-top: 50rpx;
 			}
 
-			.save_btn {
-				width: 600upx;
-				height: 80upx;
-				line-height: 80upx;
-				border-radius: 60upx;
-				margin: 0 auto;
-				background: linear-gradient(to right, #223845, #00a85b);
-				color: #fff;
-				font-size: 30upx;
-
-				text-align: center;
-				line-height: 88rpx;
-				/* #ifdef MP-WEIXIN */
-				margin-top: 150rpx;
-				/* #endif */
-				/* #ifdef H5 */
-				margin-top: 100rpx;
-				/* #endif */
-				/* #ifdef APP-PLUS */
-				margin-top: 180rpx;
-				/* #endif */
-			}
+			
 
 			.save_btn1 {
 				width: 650rpx;
@@ -281,9 +295,10 @@
 				margin-top: 30rpx;
 
 				.item_title {
+					font-weight: 500;
 					font-size: 28rpx;
 					font-family: PingFang SC Heavy, PingFang SC Heavy-Heavy;
-					font-weight: 800;
+					font-weight: bold;
 					color: #333333;
 				}
 
diff --git a/pages/my/index.vue b/pages/my/index.vue
index 48985a0..dc14f57 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -73,15 +73,15 @@
 		data(){
 			return {
 				useList:[
-					{urlImg:'../../static/my-gong-1.png',text:'我的收藏',link:''},
-					{urlImg:'../../static/my-gong-2.png',text:'成为理疗师',link:''},
+					{urlImg:'../../static/my-gong-1.png',text:'我的收藏',link:'/my/gird/shoucang'},
+					{urlImg:'../../static/my-gong-2.png',text:'成为理疗师',link:'/pages/my/hehuo'},
 					{urlImg:'../../static/my-gong-3.png',text:'分享好友',link:'/pages/my/invitationUser'},
-					{urlImg:'../../static/my-gong-4.png',text:'成为代理商',link:''},
+					{urlImg:'../../static/my-gong-4.png',text:'成为代理商',link:'/pages/my/cooperation'},
 					{urlImg:'../../static/my-gong-5.png',text:'地址管理',link:'/my/address/address'},
 					{urlImg:'../../static/my-gong-6.png',text:'帮助中心',link:'/my/help/feedbackIndex'},
 					{urlImg:'../../static/my-gong-7.png',text:'设置中心',link:'/my/setting/index'},
-					{urlImg:'../../static/my-gong-8.png',text:'浏览历史',link:''},
-					{urlImg:'../../static/my-gong-9.png',text:'我的团队',link:''},
+					{urlImg:'../../static/my-gong-8.png',text:'浏览历史',link:'/my/gird/browse'},
+					{urlImg:'../../static/my-gong-9.png',text:'我的团队',link:'/pages/my/myteam'},
 				]
 			}
 		},
diff --git a/pages/my/myteam.vue b/pages/my/myteam.vue
index c6cc222..c5e990b 100644
--- a/pages/my/myteam.vue
+++ b/pages/my/myteam.vue
@@ -1,9 +1,13 @@
 <template>
 	<view class="content">
 		<view class="flex text-center  text-lg bg">
-			<view class="title_btn flex-sub bg" @click="cut(1)" :class="tabFromIndex==1?'bgCol2': ''">团队用户
+			<view class="title_btn flex-sub bg" @click="cut(1)" :class="tabFromIndex==1?'bgCol2': 'bgCol2H'">
+				<span>团队用户</span>
+				<span class="border-bottom border-bottom-y" v-if="tabFromIndex==1"></span>
 			</view>
-			<view class="title_btn flex-sub bg" @click="cut(2)" :class="tabFromIndex==2?'bgCol2': ''">团队理疗师
+			<view class="title_btn flex-sub bg" @click="cut(2)" :class="tabFromIndex==2?'bgCol2': 'bgCol2H'">
+				<span>团队理疗师</span>
+				<span class="border-bottom border-bottom-l" v-if="tabFromIndex==2"></span>
 			</view>
 		</view>
 		<view class="view1">
@@ -13,14 +17,16 @@
 					<view class="view1_itemname">已邀请</view>
 				</view>
 				<view class="view1_item" @tap="goDetail">
-					<view class="view1_itemmoney"><text>￥</text>{{ teamMoney }}</view>
+					<view class="view1_itemmoney" style="color: #FF6000;"><text>￥</text>{{ teamMoney }}</view>
 					<view class="view1_itemname">我的收益</view>
 				</view>
 			</view>
-			<image src="../../static/teamYao.png" @tap="goYao"></image>
+			<view @tap="goYao" class="yao-btn">
+				邀请好友
+			</view>
 		</view>
 		<view class="view2" style="border-radius: 20upx;">
-			<view style="display: flex;flex-direction: row;padding: 20upx;">
+			<view class="view2-top">
 				<view style="width: 20%;">排名</view>
 				<view style="width: 50%;">用户</view>
 				<view style="width: 30%;text-align: center;">收益</view>
@@ -47,8 +53,8 @@
 					<view style="font-size: 14px; color: #333333;margin-left: 20upx; width: 65%;">{{ item.userName }}
 					</view>
 				</view>
-				<view style="width: 30%;text-align: center;">
-					<view style="font-size: 16px;color: #096f4b;">¥{{ item.money }}</view>
+				<view class="view2-right">
+					<view class="view2-right-text">¥{{ item.money }}</view>
 				</view>
 			</view>
 			<!-- 加载更多提示 -->
@@ -167,8 +173,50 @@
 </script>
 
 <style lang="scss">
-	page {
-		background: #F5F5F5;
+	.view2-right-text{
+		font-size: 16px;
+		color: #FF6000;
+		font-weight: bold;
+	}
+	.view2-right{
+		width: 30%;
+		text-align: center;
+		display: flex;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+	}
+	.view2-top{
+		display: flex;
+		width: 100%;
+		height: 80rpx;
+		background-image: linear-gradient(to bottom, rgba(8, 162, 138, 0.3), #f7f7f7);
+		background-position: center center;
+		background-repeat: no-repeat;
+		background-size: cover;
+		border-top-left-radius: 9px;
+		border-top-right-radius: 9px;
+		align-items: center;
+		justify-content: center;
+		padding: 0px 10px;
+	}
+	.yao-btn{
+		width: 586rpx;
+		margin: 80rpx 50rpx 0rpx;
+		height: 92rpx;
+		line-height: 92rpx;
+		text-align: center;
+		font-weight: 400;
+		font-size: 42rpx;
+		color: #FFFFFF;
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+		border-radius: 46rpx;
+	}
+	.content {
+		background: #f7f7f7;
+		width: 100%;
+		height: 100vh;
+		padding-bottom: 20px;
 	}
 
 	.bg {
@@ -184,11 +232,7 @@
 		margin-top: 20upx;
 		border-radius: 20upx;
 
-		image {
-			width: 586rpx;
-			height: 88rpx;
-			margin: 80rpx 50rpx 0rpx;
-		}
+		
 
 		.view1_item {
 			margin: 60upx 0 0 0;
@@ -220,19 +264,40 @@
 	.title_btn {
 		height: 78upx;
 		line-height: 78upx;
-		color: #333333;
-		/* background: #f7f7f7; */
+		position: relative;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.bgCol2H{
+		color: #666;
+		font-weight: bold;
+	}
+	.border-bottom-y{
+		width: 58px;
+	}
+	.border-bottom-l{
+		width: 75px;
+	}
+	.border-bottom{
+		display: block;
+		
+		height: 6px;
+		background: linear-gradient(-48deg, rgba(1, 156, 136, 0.35), rgba(45, 196, 142, 0.35));
+		border-radius: 3px;
+		position: absolute;
+		bottom: 0px;
+		margin-bottom: 9px;
 	}
-
 	.bgCol2 {
-		color: #333;
+		color: #019C88;
 		font-weight: bold;
 	}
 
 	.view2 {
 		background-color: #ffffff;
 		width: 93%;
-		height: 100%;
+		height: auto;
 		margin-left: 26upx;
 		border-radius: 20upx;
 		margin-bottom: 20upx;
diff --git a/pages/my/servicePackage.vue b/pages/my/servicePackage.vue
index 04ca83a..72c32fc 100644
--- a/pages/my/servicePackage.vue
+++ b/pages/my/servicePackage.vue
@@ -49,6 +49,7 @@
 				<!-- <view class="item-line"></view> -->
 				<view class="item-img">
 					<image src="../../static/pintuan.png" mode=""></image>
+					<span class="img-span">次卡</span>
 				</view>
 				<view class="item-view">
 					<view class="item-view-title">
@@ -71,13 +72,116 @@
 							<span>/元套</span>
 							<span>560</span>
 						</view>
-						<view class="item-view-bottom-btn">
-							立即购买
+						<view class="item-view-bottom-btn" @click.stop="toggle('center')">
+							服务升级
 						</view>
 					</view>
 				</view>	
 			</view>
 		</z-paging>
+		<view>
+			<!-- 普通弹窗 -->
+			<uni-popup ref="popup" background-color="#fff" @change="change">
+				<view class="popup-content">
+					<view class="popup-head">
+						<span>改价单</span>
+						<span @click="closePopup(type)">x</span>
+					</view>
+					<view class="popup-mian">
+						<!-- <view class="popup-mian-textarea">
+							<view class="popup-mian-view">
+								<span>原服务项目价格:</span>
+								<span>￥198元</span>
+							</view>
+							<view class="popup-mian-view">
+								<span>现服务项目价格:</span>
+								<span>￥298元</span>
+							</view>
+							<view class="popup-mian-view">
+								<span>改价需支付差价:</span>
+								<span>￥100元</span>
+							</view>
+						</view> -->
+						<view class="chong">
+							<view class="chong-list">
+								<view class="chong-list-left">
+									<radio value=""  class="chong-list-radio"/>
+									<image src="../../static/jinggao.png" mode=""></image>
+								</view>
+								<view class="chong-list-right">
+									<view class="chong-title">
+										<span>王丽楠</span>
+										<image src="../../static/xinren.png" mode=""></image>
+									</view>
+									<view class="chong-bottom">
+										<view class="chong-bottom-ding">
+											<image src="../../static/orderDetail/dingwei.png" mode=""></image>
+											<span>0.8km</span>
+										</view>
+										<view class="chong-bottom-cheng">
+											<image class="therapist-bottom-img" src="../../static/dituzhaoren5.png">
+											<span>春城有约</span>
+										</view>
+									</view>
+								</view>
+							</view>
+							<view class="chong-list">
+								<view class="chong-list-left">
+									<radio value=""  class="chong-list-radio"/>
+									<image src="../../static/jinggao.png" mode=""></image>
+								</view>
+								<view class="chong-list-right">
+									<view class="chong-title">
+										<span>王丽楠</span>
+										<image src="../../static/xinren.png" mode=""></image>
+									</view>
+									<view class="chong-bottom">
+										<view class="chong-bottom-ding">
+											<image src="../../static/orderDetail/dingwei.png" mode=""></image>
+											<span>0.8km</span>
+										</view>
+										<view class="chong-bottom-cheng">
+											<image class="therapist-bottom-img" src="../../static/dituzhaoren5.png">
+											<span>春城有约</span>
+										</view>
+									</view>
+								</view>
+							</view>
+							<view class="chong-list">
+								<view class="chong-list-left">
+									<radio value=""  class="chong-list-radio"/>
+									<image src="../../static/jinggao.png" mode=""></image>
+								</view>
+								<view class="chong-list-right">
+									<view class="chong-title">
+										<span>王丽楠</span>
+										<image src="../../static/xinren.png" mode=""></image>
+									</view>
+									<view class="chong-bottom">
+										<view class="chong-bottom-ding">
+											<image src="../../static/orderDetail/dingwei.png" mode=""></image>
+											<span>0.8km</span>
+										</view>
+										<view class="chong-bottom-cheng">
+											<image class="therapist-bottom-img" src="../../static/dituzhaoren5.png">
+											<span>春城有约</span>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="popup-mian-btn">
+							<span @click="closePopup(type)">
+								取消
+							</span>
+							<span>
+								确定
+							</span>
+						</view>
+					</view>
+				</view>
+			</uni-popup>
+		</view>
 	</view>
 </template>
 
@@ -85,6 +189,7 @@
 	export default {
 		data() {
 			return {
+				type:'center',
 				// v-model绑定的这个变量不要在分页请求结束中自己赋值！！！
 				dataList: [],
 				tabList: ['中医推拿','中医推拿','中医推拿','中医推拿','中医推拿','中医推拿','中医推拿'],
@@ -94,6 +199,18 @@
 			}
 		},
 		methods: {
+			change(e) {
+				console.log('当前模式：' + e.type + ',状态：' + e.show);
+			},
+			closePopup(type){//改价    关闭弹出框
+				this.type = type
+				this.$refs.popup.close(type);
+			},
+			toggle(type) {//改价 弹出框
+				this.type = type
+				// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
+				this.$refs.popup.open(type)
+			},
 			backImg(){//返回上一页
 				uni.reLaunch({
 					url:'/pages/my/index'
@@ -155,7 +272,204 @@
 </script>
 
 <style scoped>
+	.chong-list:last-child{
+		border: 0px !important;
+	}
+	.chong-bottom-cheng image{
+		width: 22.22rpx;
+		height: 22.22rpx;
+		margin-right: 5px;
+	}
+	.chong-bottom-cheng span{
+		font-weight: 500;
+		font-size: 23rpx;
+		color: #222222;
+	}
+	.chong-bottom-ding image{
+		width: 18.75rpx;
+		height: 21.53rpx;
+		margin-right: 5px;
+	}
+	.chong-bottom-ding span{
+		font-weight: bold;
+		font-size: 25rpx;
+		color: #848485;
+	}
+	.chong-bottom-ding,.chong-bottom-cheng{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.chong-bottom{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		margin-top: 10px;
+	}
+	.chong-title image{
+		width: 50rpx;
+		height: 22.22rpx;
+	}
+	.chong-title span{
+		font-weight: 400;
+		font-size: 29rpx;
+		color: #333333;
+		margin-right: 5px;
+	}
+	.chong-title{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.chong-list-right{
+		width: 75%;
+		display: flex;
+		flex-direction: column;
+	}
+	.chong-list-left image{
+		width: 76rpx;
+		height: 76rpx;
+	}
+	/deep/uni-radio .uni-radio-input{
+		width: 29.86rpx;
+		height: 29.86rpx;
+		margin: -3px 0px 0px -5px;
+		background-color: rgba(4, 159, 137, 1) !important;
+		border-color: rgba(4, 159, 137, 1) !important;
+	}
+	.chong-list-radio{
+		margin-right: 5px;
+		width: 29.86rpx;
+		height: 29.86rpx;
+	}
+	.chong-list-left{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.chong-list{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		padding: 10px 0px;
+		border-bottom: 1px solid #DCDCDC;
+	}
+	.chong{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+	}
+	.img-span{
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		width: 40px;
+		height: 16px;
+		line-height: 16px;
+		background: linear-gradient(-90deg, #FF6F48, #FF9E69);
+		border-top-left-radius: 15rpx;
+		border-bottom-right-radius: 15rpx;
+		font-weight: bold;
+		font-size: 18rpx;
+		color: #FFFFFF;
+		position: absolute;
+		bottom: 0;
+		right: 0;
+		margin: 0 6px 6px 0px;
+	}
 	
+	.popup-mian-view span:nth-child(1){
+		color: #666666;
+	}
+	.popup-mian-view span:nth-child(2){
+		color: #333;
+		font-weight: bold;
+	}
+	.popup-mian-view span{
+		font-size: 29rpx;
+	}
+	.popup-mian-view{
+		width: 100%;
+		height: 35px;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		border-bottom: 1px solid #DCDCDC;
+	}
+	.popup-mian-textarea{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+	}
+	.popup-mian-btn span:nth-child(1){
+		background: linear-gradient(90deg, #FE912E, #FF9970);
+	}
+	.popup-mian-btn span:nth-child(2){
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+	}
+	.popup-mian-btn span{
+		width: 247rpx;
+		height: 77rpx;
+		line-height: 77rpx;
+		text-align: center;
+		font-weight: 400;
+		font-size: 32rpx;
+		color: #FFFEFE;
+		border-radius: 39rpx;
+	}
+	.popup-mian-btn{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+		margin-top: 10px;
+	}
+	
+	.popup-mian{
+		width: 88%;
+		display: flex;
+		flex-direction: column;
+		margin: 5px auto 0px auto;
+	}
+	.popup-head span:nth-child(2){
+		width: 50rpx;
+		height: 50rpx;
+		line-height: 19px;
+		text-align: center;
+		font-size: 24px;
+		color: #15AB8D;
+		border-radius: 50%;
+		border: 3px solid #15AB8D;
+	}
+	.popup-head span:nth-child(1){
+		font-weight: bold;
+		font-size: 32rpx;
+		color: #333333;
+	}
+	.popup-head{
+		width: 100%;
+		height: 99.38rpx;
+		background-color: rgba(21, 171, 141, 0.09);
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		padding: 0 15px;
+	}
+	.popup-content{
+		width: 613rpx;
+		padding-bottom: 10px;
+		background: #FFFFFF;
+		border-radius: 56rpx;
+		display: flex;
+		flex-direction: column;
+	}
 	.item-view-bottom-btn{
 		text-align: center;
 		width: 131rpx;
@@ -256,6 +570,7 @@
 		width: 285rpx;
 		height: 120px;
 		border-radius: 14rpx;
+		position: relative;
 	}
 	.item-img image{
 		width: 100%;
diff --git a/pages/order/index.vue b/pages/order/index.vue
index b5dad64..9f7cb32 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -75,7 +75,10 @@
 					<u-button v-if="item.status == 5" :custom-style="customStyle" shape="circle"  class="btns" :plain="true" @click="goNav('/my/order/complain?id='+item.ordersId)" >
 						去投诉
 					</u-button>
-					
+					<u-button v-if="item.status == 3" :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
+						@click="toggle('center')">
+						提前结束
+					</u-button>
 					<u-button v-if="item.status == 3" :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
 						@click="goNav('/my/order/feedback?artificerId='+item.artificerId+ '&ordersId='+item.ordersId)">
 						去评价
@@ -85,6 +88,28 @@
 				</view>
 			</view>
 		</view>
+		<view>
+			<!-- 普通弹窗 -->
+			<uni-popup ref="popup" background-color="#fff" @change="change">
+				<view class="popup-content">
+					<view class="popup-head">
+						<span>请输入提前结束的原因</span>
+						<span @click="closePopup(type)">x</span>
+					</view>
+					<view class="popup-mian">
+						<textarea placeholder="请输入提前结束服务原因" class="popup-mian-textarea" name="" id="" cols="30" rows="10"></textarea>
+						<view class="popup-mian-btn">
+							<span @click="closePopup(type)">
+								取消
+							</span>
+							<span>
+								确定
+							</span>
+						</view>
+					</view>
+				</view>
+			</uni-popup>
+		</view>
 		<empty v-if="goods.length == 0"></empty>
 	</view>
 </template>
@@ -104,6 +129,7 @@
 		},
 		data() {
 			return {
+				type:'center',
 				goods: [], // 数据列表
 				game: [],
 				tabs: [{
@@ -218,6 +244,18 @@
 			}
 		},
 		methods: {
+			change(e) {
+				console.log('当前模式：' + e.type + ',状态：' + e.show);
+			},
+			closePopup(type){//提前结束    关闭弹出框
+				this.type = type
+				this.$refs.popup.close(type);
+			},
+			toggle(type) {//提前结束 弹出框
+				this.type = type
+				// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
+				this.$refs.popup.open(type)
+			},
 			//获取列表数据
 			getOrderList() {
 				let curTab = this.tabs[this.tabIndex].status
@@ -396,15 +434,90 @@
 </script>
 
 <style lang="scss" scoped>
+	.popup-mian-btn span:nth-child(1){
+		background: linear-gradient(90deg, #FE912E, #FF9970);
+	}
+	.popup-mian-btn span:nth-child(2){
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+	}
+	.popup-mian-btn span{
+		width: 247rpx;
+		height: 77rpx;
+		line-height: 77rpx;
+		text-align: center;
+		font-weight: 400;
+		font-size: 32rpx;
+		color: #FFFEFE;
+		border-radius: 39rpx;
+	}
+	.popup-mian-btn{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+		margin-top: 10px;
+	}
+	.popup-mian-textarea{
+		width: 525.69rpx;
+		height: 211.81rpx;
+	}
+	.popup-mian{
+		width: 88%;
+		display: flex;
+		flex-direction: column;
+		margin: 5px auto 0px auto;
+	}
+	.popup-head span:nth-child(2){
+		width: 50rpx;
+		height: 50rpx;
+		line-height: 19px;
+		text-align: center;
+		font-size: 24px;
+		color: #15AB8D;
+		border-radius: 50%;
+		border: 3px solid #15AB8D;
+	}
+	.popup-head span:nth-child(1){
+		font-weight: bold;
+		font-size: 32rpx;
+		color: #333333;
+	}
+	.popup-head{
+		width: 100%;
+		height: 99.38rpx;
+		background-color: rgba(21, 171, 141, 0.09);
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		padding: 0 15px;
+	}
+	.popup-content{
+		width: 613rpx;
+		height: 479rpx;
+		background: #FFFFFF;
+		border-radius: 56rpx;
+		display: flex;
+		flex-direction: column;
+	}
 	/deep/.btnsH{
 		background: #fff !important;
-		border: 1px solid #d7d7d7 !important;
+		// border: 1px solid #d7d7d7 !important;
 		color: #d7d7d7 !important;
+		width: 131rpx !important;
+		height: 47rpx !important;
+		line-height: 47px !important;
+		border-radius: 23rpx !important;
 	}
 	/deep/.btns{
 		background: #fff !important;
-		border: 1px solid #019C88 !important;
+		// border: 1px solid #019C88 !important;
 		color: #019C88 !important;
+		width: 131rpx !important;
+		height: 47rpx !important;
+		line-height: 47px !important;
+		border-radius: 23rpx !important;
 	}
 	.text-green span:nth-child(1){
 		font-weight: 400;
diff --git a/pages/public/loginmsg.vue b/pages/public/loginmsg.vue
index f81da50..9cfdb4f 100644
--- a/pages/public/loginmsg.vue
+++ b/pages/public/loginmsg.vue
@@ -128,6 +128,7 @@
 							this.$queue.setData('phone', res.user.phone);
 							this.$queue.setData('avatar', res.user.avatar?res.user.avatar: '../../static/logo.png');
 							this.$queue.showToast('登录成功');
+							this.getIsVip('624')
 							setTimeout(function() {
 								uni.switchTab({
 									url:'/pages/index/index'
@@ -144,6 +145,20 @@
 					});
 				}
 			},
+			getIsVip(id) {
+				var data={
+					userId:id
+				}
+				this.$Request.get("/app/VipDetails/getVipDetailByUser",data).then(res => {
+					if (res.code == 0) {
+						// this.isVip = res.data
+						// this.$queue.setData("isVip", res.data);
+						this.$queue.setData("vipName", res.data.vipName);
+						this.$queue.setData("rate", res.data.rate);
+						this.$queue.setData("rate", res.data.endTime);
+					}
+				});
+			}
 		},
 
 	}
diff --git a/pages/public/loginphone.vue b/pages/public/loginphone.vue
index 841ad7c..578bb4d 100644
--- a/pages/public/loginphone.vue
+++ b/pages/public/loginphone.vue
@@ -66,7 +66,6 @@
 			navBack() {
 				uni.navigateBack();
 			},
-
 			toLogin() {
 				this.$queue.loginClear();
 				let openid = this.$queue.getData("openid");
@@ -96,7 +95,7 @@
 							this.$queue.setData("invitationCode", res.user.invitationCode);
 							this.$queue.setData("inviterCode", res.user.inviterCode);
 
-							this.getIsVip()
+							this.getIsVip('624')
 							uni.hideLoading();
 							uni.switchTab({
 								url: '/pages/my/index'
@@ -108,12 +107,15 @@
 					});
 				}
 			},
-			getIsVip() {
-				this.$Request.get("/app/UserVip/isUserVip").then(res => {
+			getIsVip(id) {
+				var data={
+					userId:id
+				}
+				this.$Request.get("/app/VipDetails/getVipDetailByUser",data).then(res => {
 					if (res.code == 0) {
-						// this.isVip = res.data
-						console.log(res.data)
-						this.$queue.setData("isVip", res.data);
+						this.isVipData = res.data
+						this.$queue.setData("VipDetails", this.isVipData);
+						console.log("VipDetails",this.$queue.getData('VipDetails'))
 					}
 				});
 			}
@@ -181,7 +183,7 @@
 		line-height: 80upx;
 		border-radius: 60upx;
 		margin-top: 32upx;
-		background: linear-gradient(to right, #223845, #00a85b);
+		background: linear-gradient(to right, #00a85b, #00a85b);
 		color: #fff;
 		font-size: 30upx;
 
diff --git a/pages/therapist/orderDetail.vue b/pages/therapist/orderDetail.vue
index 88bcda8..1fb923d 100644
--- a/pages/therapist/orderDetail.vue
+++ b/pages/therapist/orderDetail.vue
@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="content">
 		<view class="bg" style="padding-bottom: 10px;">
 			<view class="swiperBac">
 				<swiper style="height: 745.83rpx;" autoplay="1500" :indicator-dots="false" :circular='true'
@@ -19,17 +19,12 @@
 						<image class="jian-view-left-img" src="../../static/orderDetail/jiankang.png" mode=""></image>
 					</view>
 					<view class="jian-view-right">
-						<view class="" v-if="myId != order.userId" style="margin-bottom: 3px;">
-							<view class="text-center shouchang" @click="follow">
-								<view class="shouchang-view">
-									<image class="shouchang-img" src="../../static/servicePackage/collection.png" v-if="!isFollow">
-									</image>
-									<image src="../../static/servicePackage/collection2.png"
-										style="width: 28rpx;height: 28rpx;position: relative;top: 4upx;" v-else></image>
-								</view>
-								<!-- <text style="color: #999999;margin-left: 10upx;" v-if="!isFollow">收藏</text>
-								<text style="margin-left: 10upx;color: #096f4b;" v-else>已收藏</text> -->
+						
+						<view class="oder-mian-right">
+							<view class="oder-mian-view oder-mian-jin">
+								今日可约
 							</view>
+							<view class="oder-mian-view oder-mian-time">15:33</view>
 						</view>
 						<view class="jian-view-right-weizhi">
 							<image class="jian-view-right-img" src="../../static/orderDetail/dingwei.png"></image>
@@ -46,11 +41,37 @@
 						<span>ID:178256</span>
 						<span>125人 关注</span>
 					</view>
-					<view class="oder-mian-right">
-						<view class="oder-mian-view oder-mian-jin">
-							今日可约
+					<!-- <view class="" v-if="myId != order.userId" style="margin-bottom: 3px;">
+						<view class="text-center shouchang" @click="follow">
+							<view class="shouchang-view">
+								<image class="shouchang-img" src="../../static/servicePackage/collection.png" v-if="!isFollow">
+								</image>
+								<image src="../../static/servicePackage/collection2.png"
+									style="width: 28rpx;height: 28rpx;position: relative;top: 4upx;" v-else></image>
+							</view>
 						</view>
-						<view class="oder-mian-view oder-mian-time">15:33</view>
+					</view> -->
+					<view class="oder-mian-tjia">
+						<view class="" v-if="myId != order.userId" style="margin-bottom: 3px;">
+							<view class="text-center shouchang" @click="follow">
+								<view class="shouchang-view">
+									<image class="shouchang-img" src="../../static/orderDetail/technician6.png" v-if="!isFollow">
+									</image>
+									<image src="../../static/orderDetail/technician6-1.png"
+										style="width: 45rpx;height: 45rpx;position: relative;top: 4upx;" v-else></image>
+								</view>
+								<!-- <text style="color: #999999;margin-left: 10upx;" v-if="!isFollow">收藏</text>
+								<text style="margin-left: 10upx;color: #096f4b;" v-else>已收藏</text> -->
+							</view>
+						</view>
+						<view class="oder-mian-qing" @click="toggle('center')">请TA上线</view>
+						<view class="oder-mian-guan">
+							+ 关注
+						</view>
+					</view>
+					
+					<view class="oder-mian-btn">
+						<!-- <image src="../../static/orderDetail/technician6.png" mode=""></image> -->
 					</view>
 				</view>
 				<!-- <view class="padding-bottom flex justify-between">
@@ -197,6 +218,45 @@
 			</view>
 		</view>
 		<u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton>
+		<view>
+			<!-- 普通弹窗 -->
+			<uni-popup ref="popup" background-color="#fff" @change="change">
+				<view class="popup-content">
+					<view class="popup-head">
+						<span>打赏技师</span>
+						<span @click="closePopup(type)">x</span>
+					</view>
+					<view class="popup-mian">
+						<view class="popup-mian-textarea">
+							<view class="popup-mian-view popup-mian-list3">
+								<image src="../../static/orderDetail/reward3.png" mode=""></image>
+								<span>￥2</span>
+							</view>
+							<view class="popup-mian-view popup-mian-list2">
+								<image src="../../static/orderDetail/reward2.png" mode=""></image>
+								<span>￥3</span>
+							</view>
+							<view class="popup-mian-view popup-mian-list1">
+								<image src="../../static/orderDetail/reward1.png" mode=""></image>
+								<span>￥5</span>
+							</view>
+						</view>
+						<view class="ziding">
+							<span>自定义打赏金额</span>
+							<input placeholder="请输入打赏金额" class="ziding-inp" type="text" />
+						</view>
+						<view class="popup-mian-btn">
+							<span @click="closePopup(type)">
+								取消
+							</span>
+							<span>
+								确定
+							</span>
+						</view>
+					</view>
+				</view>
+			</uni-popup>
+		</view>
 	</view>
 </template>
 
@@ -204,6 +264,7 @@
 	export default {
 		data() {
 			return {
+				type:'center',
 				videoList:[
 					{url:'https://media.w3.org/2010/05/sintel/trailer.mp4'},
 					{url:'https://media.w3.org/2010/05/sintel/trailer.mp4'},
@@ -300,6 +361,18 @@
 			});
 		},
 		methods: {
+			change(e) {
+				console.log('当前模式：' + e.type + ',状态：' + e.show);
+			},
+			closePopup(type){//打赏    关闭弹出框
+				this.type = type
+				this.$refs.popup.close(type);
+			},
+			toggle(type) {//打赏  弹出框
+				this.type = type
+				// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
+				this.$refs.popup.open(type)
+			},
 			// 切换菜单
 			tabChange(index) {
 				this.tabIndex = index
@@ -485,6 +558,159 @@
 </script>
 
 <style scoped>
+	/deep/.uni-input-placeholder{
+		font-size: 23rpx;
+		color: #C8C8C8;
+	}
+	.ziding-inp{
+		height: 40px;
+		border-bottom: 1px solid #f7f7f7;
+	}
+	.ziding span{
+		font-weight: bold;
+		font-size: 25rpx;
+		color: #333333;
+		margin-top:10px;
+	}
+	.ziding{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+	}
+	.popup-mian-view image{
+		width: 85rpx;
+		height: 83rpx;
+	}
+	.popup-mian-view span{
+		font-size: 25rpx;
+		color: #FF5E6E;
+		font-weight: bold;
+	}
+	.popup-mian-list3{
+		background: #FFF9E5;
+	}
+	.popup-mian-list2{
+		background: #FFF3F8;
+	}
+	.popup-mian-list1{
+		background: #FAF6FF;
+	}
+	.popup-mian-view{
+		border-radius: 14rpx;
+		width: 30%;
+		height: 136rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+	.popup-mian-textarea{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.popup-mian-btn span:nth-child(1){
+		background: linear-gradient(90deg, #FE912E, #FF9970);
+	}
+	.popup-mian-btn span:nth-child(2){
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+	}
+	.popup-mian-btn span{
+		width: 247rpx;
+		height: 77rpx;
+		line-height: 77rpx;
+		text-align: center;
+		font-weight: 400;
+		font-size: 32rpx;
+		color: #FFFEFE;
+		border-radius: 39rpx;
+	}
+	.popup-mian-btn{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+		margin-top: 10px;
+	}
+	
+	.popup-mian{
+		width: 88%;
+		display: flex;
+		flex-direction: column;
+		margin: 5px auto 0px auto;
+	}
+	.popup-head span:nth-child(2){
+		width: 50rpx;
+		height: 50rpx;
+		line-height: 19px;
+		text-align: center;
+		font-size: 24px;
+		color: #15AB8D;
+		border-radius: 50%;
+		border: 3px solid #15AB8D;
+	}
+	.popup-head span:nth-child(1){
+		font-weight: bold;
+		font-size: 32rpx;
+		color: #333333;
+	}
+	.popup-head{
+		width: 100%;
+		height: 99.38rpx;
+		background-color: rgba(21, 171, 141, 0.09);
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		padding: 0 15px;
+	}
+	.popup-content{
+		width: 613rpx;
+		height: 260px;
+		background: #FFFFFF;
+		border-radius: 56rpx;
+		display: flex;
+		flex-direction: column;
+	}
+	
+	.content{
+		width: 100%;
+		background-color: #f7f7f7;
+	}
+	.oder-mian-tjia{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		width: 55%;
+		justify-content: flex-end;
+	}
+	.oder-mian-guan{
+		width: 113rpx;
+		height: 45rpx;
+		line-height: 45rpx;
+		text-align: center;
+		color: #fff;
+		font-weight: 400;
+		font-size: 23rpx;
+		background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
+		border-radius: 23rpx;
+	}
+	.oder-mian-qing{
+		width: 65px;
+		height: 45rpx;
+		line-height: 18px;
+		text-align: center;
+		font-weight: 400;
+		font-size: 23rpx;
+		color: #029D88;
+		background: #fff;
+		border-radius: 23rpx;
+		margin: 0px 5px;
+		border: 2px solid #029D88;
+	}
 	.video-item{
 		width: 100%;
 		height: 200px;
@@ -505,8 +731,8 @@
 		margin-top: 10px;
 	}
 	.video-list-geng image{
-		width: 8px;
-		height: 14px;
+		width: 6px;
+		height: 9px;
 		margin-left: 5px;
 	}
 	.video-list-geng{
@@ -514,11 +740,16 @@
 		flex-direction: row;
 		align-items: center;
 	}
-	.video-list-title,.video-list-geng span{
-		font-size: 15px;
+	.video-list-title{
+		font-size: 28rpx;
 		color: #000000;
 		font-weight: bold;
 	}
+	.video-list-geng span{
+		font-size: 21rpx;
+		color: #878787;
+	}
+	
 	.video-list-top{
 		width: 100%;
 		display: flex;
@@ -528,7 +759,7 @@
 	.video-list{
 		width: 95%;
 		margin: 15px auto;
-		padding: 5px;
+		padding: 10px;
 		display: flex;
 		flex-direction: column;
 		background-color: #fff;
@@ -550,8 +781,8 @@
 		justify-content: center;
 	}
 	.shouchang-img{
-		width: 34.03rpx;
-		height: 32.64rpx;
+		width: 45rpx;
+		height: 45rpx;
 	}
 	.xiangmu-cont-top-left{
 		font-weight: normal;
diff --git a/static/orderDetail/img-shang.png b/static/orderDetail/img-shang.png
new file mode 100644
index 0000000000000000000000000000000000000000..9cd5aeb0a143b06f3c3b927ccbb0e737e48a1b83
GIT binary patch
literal 1439
zcmV;Q1z`G#P)<h;3K|Lk000e1NJLTq002G!001`#1^@s6RL=Q~000GMNkl<ZXhZFq
zZHQD=9LAsL-gR8uZFikn3Zg7ae1!sADZ^-I@2tC7fg}i#2?ZKa7!_jHhc>JaLG&dk
z#a_@%ZN3C<=?-&WtU%I;42uw<*Zq`CWvS`xp8Jm@?lNxc&V3nmX4?C0_dNe|p5OVO
zx%a#g06fp@@O}S%0CV-<_4trHPI6;sXXm>lh53Abo?#dV0JPO3@EE3H0IMy_+C|54
z`T^WGMj!x&YPlms1SF>b;24gdTU%S_Yw+IzOfM-s0$_uP93`o09DW9XbtG4mbbuI!
z(WSw4`b`ZeBBxE$T#!zuf2w8RQt#PpHjzrD4gt7z<o_fe(%^bnpL;~)>r5uIuwI}?
zI2^}$9l+BioDW|B4&abwS-004xNY07kbJ&k;I?gFW18k7rPK{1eUd*Ei^VT{dwcbJ
zqiUXtf!nq{o8*fCmIIhpLa2W>r$uCkQtH*7o}M48fxaT(uIt__BHIBZ%Rm)G<jG7X
zv-?WJ#|C#@_cjr60JH{#IVB>?GntGXP=85evB0z0teHxsJ_oQkj5`rIW}4<L>2&%`
zn7B%6V}aYYohGTXJ$5Ek&ZCfA)z#Itvz+i!mB#{i9Oq>KFGMu=o@H5&MvRRe78iUE
zfcvAkxY84&xZrx2cSQt0mdRvhM~SUOOk8liUSAc(h=_QZOeRvNMQLwrOe}EQwjU$8
zIiit1%d%dI7#lk*7I;3NpJ5orw*amR>Ew*>`wP3fyT1<^S21}kaP7izoYw$68`9BM
z%d*ynjH#$RHh6!3|Fov2radBJ1#u=Khef2bySw{D5Pc9$E|;6z(9p0}L}mgwMN+r%
zX<J*{;f{`uad(YkgKJ~iY_>U-O1%l-K>!WonH7;D$?b+=tWT%Ye+B_6r|~?mK`FKI
z{PMDKj9xE}jwq$x8Xg|rxop|8ze>w10)D<ix~_Yt@B6C(=o#H~5usri$3?_eO1-mm
z>C(gHV1kx=p4X_9+DuZnH{r}tM1IjL$JW-?4@O2nCBa8M>p6ULb8}NNnZ&@rz{$S8
zK0hc>5Z#t7Tc*sKHEY}X5f&swYxD>>Ff=suL~n2JH<tuFsFNr<5iuOcd4uHR<uZMd
z`cEmPHkqcWH&Zu^XhfvCx1Ma<eukv}l7w9tmG*<qzW&XRE~Tp)JfF|6FbqSl=n_#z
z%S17e!1eIkzkh$r*|TSjmX;O_4i27NxpHN(lIHUH{2e57BwH$3Z=|8FUt;a;?JIoW
zUr+KTy%(?F<Rt$9FeoBl0r<FBEFK*DISFIlb=^54;sUrfOk5ak;Ed;TxvNdn)Q4^N
z05Hll@|%bZklbA;6r3=lL7(H9rkN9w>%)MA)dm9JyLa!+Q>RY-1i+k-4d|E3QN1y#
zl-kkL)AQ>@@wRO*CYc3rUC4Gq%gciA+qZ8{B9RyXaAWA&FAVqxz(*uMOe7NCk|j(2
z9x3)buT3enPJeDlmTpzYZ1Upa6N2Y*xtXSEIwbX+xKfWE1t;|US}ApmWRm3F0NN|n
zK#+Pa3hsGcyYKs-0hkx0qFU383tlJ`?n)+;dr0=w8c<Nb<AEO(kuOL-6||CC)cprs
zpN|7*Bw6m0Rg1i%p2y30O#=lrKM5YRr|LyFnelqbWKfRDj0f$hdeKd0yk0UHlw&gE
zL3^rRbpQK|>ywW-`_?r#5YA=Xwrzdlcv-f5s-=f~-(RjT@qPzjezlmo3_i|?$N~-i
z2!O34ch)aM!&kbAw=K(BLwzXVy6z?sd5+|{3;T8Yh`x^6*x2}h-sK&AsX30LZzZh(
tuqeVkmul{-qP|v2a#x{H*fw&&@h^TmZwdg&wIu)m002ovPDHLkV1k-2wDSM}

literal 0
HcmV?d00001

diff --git a/static/orderDetail/reward1.png b/static/orderDetail/reward1.png
new file mode 100644
index 0000000000000000000000000000000000000000..720c03283f90a4b8f25ed4ad2d99c3656c59d67b
GIT binary patch
literal 19251
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

literal 0
HcmV?d00001

diff --git a/static/orderDetail/reward2.png b/static/orderDetail/reward2.png
new file mode 100644
index 0000000000000000000000000000000000000000..ebc9d1b7a864ee28725232c68eecd796e1e420e0
GIT binary patch
literal 15782
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

literal 0
HcmV?d00001

diff --git a/static/orderDetail/reward3.png b/static/orderDetail/reward3.png
new file mode 100644
index 0000000000000000000000000000000000000000..b04c1d4ee8b653960b5023087361eb8f9511e12d
GIT binary patch
literal 12553
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

literal 0
HcmV?d00001

diff --git a/static/orderDetail/technician1.png b/static/orderDetail/technician1.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2ac82530a60d3c787f5359f0bd7db13fa3c7864
GIT binary patch
literal 2464
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
P{m<lN??Sz3yM5Q+w}mkM

literal 0
HcmV?d00001

diff --git a/static/orderDetail/technician2.png b/static/orderDetail/technician2.png
new file mode 100644
index 0000000000000000000000000000000000000000..07dbe69549bc32796b0feaaff57e4385cb513e79
GIT binary patch
literal 2531
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

literal 0
HcmV?d00001

diff --git a/static/orderDetail/technician3.png b/static/orderDetail/technician3.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b7561e4fc18f3cd793690bbf76f11be958de1e7
GIT binary patch
literal 2697
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

literal 0
HcmV?d00001

diff --git a/static/orderDetail/technician4.png b/static/orderDetail/technician4.png
new file mode 100644
index 0000000000000000000000000000000000000000..a90e7c176a86e1621ee0e1c25d0d27ae0a2ed3b4
GIT binary patch
literal 2348
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
EKLGsUYybcN

literal 0
HcmV?d00001

diff --git a/static/orderDetail/technician5.png b/static/orderDetail/technician5.png
new file mode 100644
index 0000000000000000000000000000000000000000..db8cad20ac84263d7d908a257b169e2304189fc8
GIT binary patch
literal 2299
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
HVs`%*#WlvP

literal 0
HcmV?d00001

diff --git a/static/orderDetail/technician6-1.png b/static/orderDetail/technician6-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..8fa1ded7073e80ba13bd480136f37e090dea42b1
GIT binary patch
literal 3456
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
CNaP~`

literal 0
HcmV?d00001

diff --git a/static/orderDetail/technician6.png b/static/orderDetail/technician6.png
new file mode 100644
index 0000000000000000000000000000000000000000..44e34ef273ec2475836d892a0937e732bf8ce710
GIT binary patch
literal 3482
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

literal 0
HcmV?d00001

diff --git a/static/xinren.png b/static/xinren.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d12b0ef63c0ff3d8351a3b3d7ace3fee37cdfcd
GIT binary patch
literal 2840
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

literal 0
HcmV?d00001

diff --git a/uni_modules/liu-goods-swiper/components/liu-goods-swiper/liu-goods-swiper.vue b/uni_modules/liu-goods-swiper/components/liu-goods-swiper/liu-goods-swiper.vue
index 13256a0..e8a2f4e 100644
--- a/uni_modules/liu-goods-swiper/components/liu-goods-swiper/liu-goods-swiper.vue
+++ b/uni_modules/liu-goods-swiper/components/liu-goods-swiper/liu-goods-swiper.vue
@@ -3,9 +3,9 @@
 		<scroll-view scroll-x="true" class="scroll-box" style="height: 100%;">
 			<view :class="'item-box'+' bg'+((index+'').slice(-1))" v-for="(item,index) in goodsList" :key="index"
 				@click="chooseItem(item)">
-				<image :src="item.icon" :style="'width:'+imgWidth+'px;'+'height:'+225+'px;'" mode=""></image>
-				<view class="item-name">{{item.name}}</view>
-				<view class="item-descr">{{item.descr}}</view>
+				<image :src="item.artificerImg" :style="'width:'+imgWidth+'px;'+'height:'+225+'px;'" mode=""></image>
+				<view class="item-name">{{item.artificerName}}</view>
+				<view class="item-descr">{{item.classifyName}}</view>
 			</view>
 		</scroll-view>
 	</view>
@@ -90,9 +90,11 @@
 		-webkit-box-orient: vertical;
 		-webkit-line-clamp: 1;
 		overflow: hidden;
+		text-align: center;
 	}
 
 	.item-descr {
+		text-align: center;
 		display: table;
 		width: 100%;
 		font-size: 24rpx;
diff --git a/uni_modules/uni-popup/changelog.md b/uni_modules/uni-popup/changelog.md
new file mode 100644
index 0000000..decd775
--- /dev/null
+++ b/uni_modules/uni-popup/changelog.md
@@ -0,0 +1,84 @@
+## 1.9.1（2024-04-02）
+- 修复 uni-popup-dialog vue3下使用value无法进行绑定的bug(双向绑定兼容旧写法)
+## 1.9.0（2024-03-28）
+- 修复 uni-popup-dialog 双向绑定时初始化逻辑修正
+## 1.8.9（2024-03-20）
+- 修复 uni-popup-dialog 数据输入时修正为双向绑定
+## 1.8.8（2024-02-20）
+- 修复 uni-popup 在微信小程序下出现文字向上闪动的bug
+## 1.8.7（2024-02-02）
+- 新增 uni-popup-dialog 新增属性focus：input模式下，是否自动自动聚焦
+## 1.8.6（2024-01-30）
+- 新增 uni-popup-dialog 新增属性maxLength:限制输入框字数
+## 1.8.5（2024-01-26）
+- 新增 uni-popup-dialog 新增属性showClose:控制关闭按钮的显示
+## 1.8.4（2023-11-15）
+- 新增 uni-popup 支持uni-app-x 注意暂时仅支持 `maskClick` `@open` `@close`
+## 1.8.3（2023-04-17）
+- 修复 uni-popup 重复打开时的 bug
+## 1.8.2（2023-02-02）
+- uni-popup-dialog 组件新增 inputType 属性
+## 1.8.1（2022-12-01）
+- 修复 nvue 下 v-show 报错
+## 1.8.0（2022-11-29）
+- 优化 主题样式
+## 1.7.9（2022-04-02）
+- 修复 弹出层内部无法滚动的bug
+## 1.7.8（2022-03-28）
+- 修复 小程序中高度错误的bug
+## 1.7.7（2022-03-17）
+- 修复 快速调用open出现问题的Bug
+## 1.7.6（2022-02-14）
+- 修复 safeArea 属性不能设置为false的bug
+## 1.7.5（2022-01-19）
+- 修复 isMaskClick 失效的bug
+## 1.7.4（2022-01-19）
+- 新增 cancelText \ confirmText 属性 ，可自定义文本
+- 新增 maskBackgroundColor 属性 ，可以修改蒙版颜色
+- 优化 maskClick属性 更新为 isMaskClick ，解决微信小程序警告的问题
+## 1.7.3（2022-01-13）
+- 修复 设置 safeArea 属性不生效的bug
+## 1.7.2（2021-11-26）
+- 优化 组件示例
+## 1.7.1（2021-11-26）
+- 修复 vuedoc 文字错误
+## 1.7.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-popup](https://uniapp.dcloud.io/component/uniui/uni-popup)
+## 1.6.2（2021-08-24）
+- 新增 支持国际化
+## 1.6.1（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.6.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.5.0（2021-06-23）
+- 新增 mask-click 遮罩层点击事件
+## 1.4.5（2021-06-22）
+- 修复 nvue 平台中间弹出后，点击内容，再点击遮罩无法关闭的Bug
+## 1.4.4（2021-06-18）
+- 修复 H5平台中间弹出后，点击内容，再点击遮罩无法关闭的Bug
+## 1.4.3（2021-06-08）
+- 修复 错误的 watch 字段
+- 修复 safeArea 属性不生效的问题
+- 修复 点击内容，再点击遮罩无法关闭的Bug
+## 1.4.2（2021-05-12）
+- 新增 组件示例地址
+## 1.4.1（2021-04-29）
+- 修复 组件内放置 input 、textarea 组件，无法聚焦的问题
+## 1.4.0 （2021-04-29）
+- 新增 type 属性的 left\right 值，支持左右弹出
+- 新增 open(String:type) 方法参数 ，可以省略 type 属性 ，直接传入类型打开指定弹窗
+- 新增 backgroundColor 属性，可定义主窗口背景色,默认不显示背景色
+- 新增 safeArea 属性，是否适配底部安全区
+- 修复 App\h5\微信小程序底部安全区占位不对的Bug
+- 修复 App 端弹出等待的Bug
+- 优化 提升低配设备性能，优化动画卡顿问题
+- 优化 更简单的组件自定义方式
+## 1.2.9（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+## 1.2.8（2021-02-05）
+- 调整为uni_modules目录规范
+## 1.2.7（2021-02-05）
+- 调整为uni_modules目录规范
+- 新增 支持 PC 端
+- 新增 uni-popup-message 、uni-popup-dialog扩展组件支持 PC 端
diff --git a/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js b/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js
new file mode 100644
index 0000000..6ef26a2
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js
@@ -0,0 +1,45 @@
+// #ifdef H5
+export default {
+  name: 'Keypress',
+  props: {
+    disable: {
+      type: Boolean,
+      default: false
+    }
+  },
+  mounted () {
+    const keyNames = {
+      esc: ['Esc', 'Escape'],
+      tab: 'Tab',
+      enter: 'Enter',
+      space: [' ', 'Spacebar'],
+      up: ['Up', 'ArrowUp'],
+      left: ['Left', 'ArrowLeft'],
+      right: ['Right', 'ArrowRight'],
+      down: ['Down', 'ArrowDown'],
+      delete: ['Backspace', 'Delete', 'Del']
+    }
+    const listener = ($event) => {
+      if (this.disable) {
+        return
+      }
+      const keyName = Object.keys(keyNames).find(key => {
+        const keyName = $event.key
+        const value = keyNames[key]
+        return value === keyName || (Array.isArray(value) && value.includes(keyName))
+      })
+      if (keyName) {
+        // 避免和其他按键事件冲突
+        setTimeout(() => {
+          this.$emit(keyName, {})
+        }, 0)
+      }
+    }
+    document.addEventListener('keyup', listener)
+    this.$once('hook:beforeDestroy', () => {
+      document.removeEventListener('keyup', listener)
+    })
+  },
+	render: () => {}
+}
+// #endif
diff --git a/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
new file mode 100644
index 0000000..08707d4
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
@@ -0,0 +1,316 @@
+<template>
+	<view class="uni-popup-dialog">
+		<view class="uni-dialog-title">
+			<text class="uni-dialog-title-text" :class="['uni-popup__'+dialogType]">{{titleText}}</text>
+		</view>
+		<view v-if="mode === 'base'" class="uni-dialog-content">
+			<slot>
+				<text class="uni-dialog-content-text">{{content}}</text>
+			</slot>
+		</view>
+		<view v-else class="uni-dialog-content">
+			<slot>
+				<input class="uni-dialog-input" :maxlength="maxlength" v-model="val" :type="inputType"
+					:placeholder="placeholderText" :focus="focus">
+			</slot>
+		</view>
+		<view class="uni-dialog-button-group">
+			<view class="uni-dialog-button" v-if="showClose" @click="closeDialog">
+				<text class="uni-dialog-button-text">{{closeText}}</text>
+			</view>
+			<view class="uni-dialog-button" :class="showClose?'uni-border-left':''" @click="onOk">
+				<text class="uni-dialog-button-text uni-button-color">{{okText}}</text>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import popup from '../uni-popup/popup.js'
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from '../uni-popup/i18n/index.js'
+	const {
+		t
+	} = initVueI18n(messages)
+	/**
+	 * PopUp 弹出层-对话框样式
+	 * @description 弹出层-对话框样式
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} value input 模式下的默认值
+	 * @property {String} placeholder input 模式下输入提示
+	 * @property {Boolean} focus input模式下是否自动聚焦，默认为true
+	 * @property {String} type = [success|warning|info|error] 主题样式
+	 *  @value success 成功
+	 * 	@value warning 提示
+	 * 	@value info 消息
+	 * 	@value error 错误
+	 * @property {String} mode = [base|input] 模式、
+	 * 	@value base 基础对话框
+	 * 	@value input 可输入对话框
+	 * @showClose {Boolean} 是否显示关闭按钮
+	 * @property {String} content 对话框内容
+	 * @property {Boolean} beforeClose 是否拦截取消事件
+	 * @property {Number} maxlength 输入
+	 * @event {Function} confirm 点击确认按钮触发
+	 * @event {Function} close 点击取消按钮触发
+	 */
+
+	export default {
+		name: "uniPopupDialog",
+		mixins: [popup],
+		emits: ['confirm', 'close', 'update:modelValue', 'input'],
+		props: {
+			inputType: {
+				type: String,
+				default: 'text'
+			},
+			showClose: {
+				type: Boolean,
+				default: true
+			},
+			// #ifdef VUE2
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+				type: [Number, String],
+				default: ''
+			},
+			// #endif
+
+
+			placeholder: {
+				type: [String, Number],
+				default: ''
+			},
+			type: {
+				type: String,
+				default: 'error'
+			},
+			mode: {
+				type: String,
+				default: 'base'
+			},
+			title: {
+				type: String,
+				default: ''
+			},
+			content: {
+				type: String,
+				default: ''
+			},
+			beforeClose: {
+				type: Boolean,
+				default: false
+			},
+			cancelText: {
+				type: String,
+				default: ''
+			},
+			confirmText: {
+				type: String,
+				default: ''
+			},
+			maxlength: {
+				type: Number,
+				default: -1,
+			},
+			focus: {
+				type: Boolean,
+				default: true,
+			}
+		},
+		data() {
+			return {
+				dialogType: 'error',
+				val: ""
+			}
+		},
+		computed: {
+			okText() {
+				return this.confirmText || t("uni-popup.ok")
+			},
+			closeText() {
+				return this.cancelText || t("uni-popup.cancel")
+			},
+			placeholderText() {
+				return this.placeholder || t("uni-popup.placeholder")
+			},
+			titleText() {
+				return this.title || t("uni-popup.title")
+			}
+		},
+		watch: {
+			type(val) {
+				this.dialogType = val
+			},
+			mode(val) {
+				if (val === 'input') {
+					this.dialogType = 'info'
+				}
+			},
+			value(val) {
+				if (this.maxlength != -1 && this.mode === 'input') {
+					this.val = val.slice(0, this.maxlength);
+				} else {
+					this.val = val
+				}
+			},
+			val(val) {
+				// #ifdef VUE2
+				// TODO 兼容 vue2
+				this.$emit('input', val);
+				// #endif
+				// #ifdef VUE3
+				// TODO　兼容　vue3
+				this.$emit('update:modelValue', val);
+				// #endif
+			}
+		},
+		created() {
+			// 对话框遮罩不可点击
+			this.popup.disableMask()
+			// this.popup.closeMask()
+			if (this.mode === 'input') {
+				this.dialogType = 'info'
+				this.val = this.value;
+				// #ifdef VUE3
+				this.val = this.modelValue;
+				// #endif
+			} else {
+				this.dialogType = this.type
+			}
+		},
+		methods: {
+			/**
+			 * 点击确认按钮
+			 */
+			onOk() {
+				if (this.mode === 'input') {
+					this.$emit('confirm', this.val)
+				} else {
+					this.$emit('confirm')
+				}
+				if (this.beforeClose) return
+				this.popup.close()
+			},
+			/**
+			 * 点击取消按钮
+			 */
+			closeDialog() {
+				this.$emit('close')
+				if (this.beforeClose) return
+				this.popup.close()
+			},
+			close() {
+				this.popup.close()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.uni-popup-dialog {
+		width: 300px;
+		border-radius: 11px;
+		background-color: #fff;
+	}
+
+	.uni-dialog-title {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		padding-top: 25px;
+	}
+
+	.uni-dialog-title-text {
+		font-size: 16px;
+		font-weight: 500;
+	}
+
+	.uni-dialog-content {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		padding: 20px;
+	}
+
+	.uni-dialog-content-text {
+		font-size: 14px;
+		color: #6C6C6C;
+	}
+
+	.uni-dialog-button-group {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		border-top-color: #f5f5f5;
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-dialog-button {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+
+		flex: 1;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 45px;
+	}
+
+	.uni-border-left {
+		border-left-color: #f0f0f0;
+		border-left-style: solid;
+		border-left-width: 1px;
+	}
+
+	.uni-dialog-button-text {
+		font-size: 16px;
+		color: #333;
+	}
+
+	.uni-button-color {
+		color: #007aff;
+	}
+
+	.uni-dialog-input {
+		flex: 1;
+		font-size: 14px;
+		border: 1px #eee solid;
+		height: 40px;
+		padding: 0 10px;
+		border-radius: 5px;
+		color: #555;
+	}
+
+	.uni-popup__success {
+		color: #4cd964;
+	}
+
+	.uni-popup__warn {
+		color: #f0ad4e;
+	}
+
+	.uni-popup__error {
+		color: #dd524d;
+	}
+
+	.uni-popup__info {
+		color: #909399;
+	}
+</style>
diff --git a/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue b/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue
new file mode 100644
index 0000000..91370a8
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue
@@ -0,0 +1,143 @@
+<template>
+	<view class="uni-popup-message">
+		<view class="uni-popup-message__box fixforpc-width" :class="'uni-popup__'+type">
+			<slot>
+				<text class="uni-popup-message-text" :class="'uni-popup__'+type+'-text'">{{message}}</text>
+			</slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	import popup from '../uni-popup/popup.js'
+	/**
+	 * PopUp 弹出层-消息提示
+	 * @description 弹出层-消息提示
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} type = [success|warning|info|error] 主题样式
+	 *  @value success 成功
+	 * 	@value warning 提示
+	 * 	@value info 消息
+	 * 	@value error 错误
+	 * @property {String} message 消息提示文字
+	 * @property {String} duration 显示时间，设置为 0 则不会自动关闭
+	 */
+
+	export default {
+		name: 'uniPopupMessage',
+		mixins:[popup],
+		props: {
+			/**
+			 * 主题 success/warning/info/error	  默认 success
+			 */
+			type: {
+				type: String,
+				default: 'success'
+			},
+			/**
+			 * 消息文字
+			 */
+			message: {
+				type: String,
+				default: ''
+			},
+			/**
+			 * 显示时间，设置为 0 则不会自动关闭
+			 */
+			duration: {
+				type: Number,
+				default: 3000
+			},
+			maskShow:{
+				type:Boolean,
+				default:false
+			}
+		},
+		data() {
+			return {}
+		},
+		created() {
+			this.popup.maskShow = this.maskShow
+			this.popup.messageChild = this
+		},
+		methods: {
+			timerClose(){
+				if(this.duration === 0) return
+				clearTimeout(this.timer) 
+				this.timer = setTimeout(()=>{
+					this.popup.close()
+				},this.duration)
+			}
+		}
+	}
+</script>
+<style lang="scss" >
+	.uni-popup-message {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+	}
+
+	.uni-popup-message__box {
+		background-color: #e1f3d8;
+		padding: 10px 15px;
+		border-color: #eee;
+		border-style: solid;
+		border-width: 1px;
+		flex: 1;
+	}
+
+	@media screen and (min-width: 500px) {
+		.fixforpc-width {
+			margin-top: 20px;
+			border-radius: 4px;
+			flex: none;
+			min-width: 380px;
+			/* #ifndef APP-NVUE */
+			max-width: 50%;
+			/* #endif */
+			/* #ifdef APP-NVUE */
+			max-width: 500px;
+			/* #endif */
+		}
+	}
+
+	.uni-popup-message-text {
+		font-size: 14px;
+		padding: 0;
+	}
+
+	.uni-popup__success {
+		background-color: #e1f3d8;
+	}
+
+	.uni-popup__success-text {
+		color: #67C23A;
+	}
+
+	.uni-popup__warn {
+		background-color: #faecd8;
+	}
+
+	.uni-popup__warn-text {
+		color: #E6A23C;
+	}
+
+	.uni-popup__error {
+		background-color: #fde2e2;
+	}
+
+	.uni-popup__error-text {
+		color: #F56C6C;
+	}
+
+	.uni-popup__info {
+		background-color: #F2F6FC;
+	}
+
+	.uni-popup__info-text {
+		color: #909399;
+	}
+</style>
diff --git a/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
new file mode 100644
index 0000000..f7e667c
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
@@ -0,0 +1,187 @@
+<template>
+	<view class="uni-popup-share">
+		<view class="uni-share-title"><text class="uni-share-title-text">{{shareTitleText}}</text></view>
+		<view class="uni-share-content">
+			<view class="uni-share-content-box">
+				<view class="uni-share-content-item" v-for="(item,index) in bottomData" :key="index" @click.stop="select(item,index)">
+					<image class="uni-share-image" :src="item.icon" mode="aspectFill"></image>
+					<text class="uni-share-text">{{item.text}}</text>
+				</view>
+
+			</view>
+		</view>
+		<view class="uni-share-button-box">
+			<button class="uni-share-button" @click="close">{{cancelText}}</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import popup from '../uni-popup/popup.js'
+	import {
+	initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from '../uni-popup/i18n/index.js'
+	const {	t	} = initVueI18n(messages)
+	export default {
+		name: 'UniPopupShare',
+		mixins:[popup],
+		emits:['select'],
+		props: {
+			title: {
+				type: String,
+				default: ''
+			},
+			beforeClose: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				bottomData: [{
+						text: '微信',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/c2b17470-50be-11eb-b680-7980c8a877b8.png',
+						name: 'wx'
+					},
+					{
+						text: '支付宝',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/d684ae40-50be-11eb-8ff1-d5dcf8779628.png',
+						name: 'ali'
+					},
+					{
+						text: 'QQ',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/e7a79520-50be-11eb-b997-9918a5dda011.png',
+						name: 'qq'
+					},
+					{
+						text: '新浪',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/0dacdbe0-50bf-11eb-8ff1-d5dcf8779628.png',
+						name: 'sina'
+					},
+					// {
+					// 	text: '百度',
+					// 	icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/1ec6e920-50bf-11eb-8a36-ebb87efcf8c0.png',
+					// 	name: 'copy'
+					// },
+					// {
+					// 	text: '其他',
+					// 	icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/2e0fdfe0-50bf-11eb-b997-9918a5dda011.png',
+					// 	name: 'more'
+					// }
+				]
+			}
+		},
+		created() {},
+		computed: {
+			cancelText() {
+				return t("uni-popup.cancel")
+			},
+		shareTitleText() {
+				return this.title || t("uni-popup.shareTitle")
+			}
+		},
+		methods: {
+			/**
+			 * 选择内容
+			 */
+			select(item, index) {
+				this.$emit('select', {
+					item,
+					index
+				})
+				this.close()
+
+			},
+			/**
+			 * 关闭窗口
+			 */
+			close() {
+				if(this.beforeClose) return
+				this.popup.close()
+			}
+		}
+	}
+</script>
+<style lang="scss" >
+	.uni-popup-share {
+		background-color: #fff;
+		border-top-left-radius: 11px;
+		border-top-right-radius: 11px;
+	}
+	.uni-share-title {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		height: 40px;
+	}
+	.uni-share-title-text {
+		font-size: 14px;
+		color: #666;
+	}
+	.uni-share-content {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		padding-top: 10px;
+	}
+
+	.uni-share-content-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		flex-wrap: wrap;
+		width: 360px;
+	}
+
+	.uni-share-content-item {
+		width: 90px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		padding: 10px 0;
+		align-items: center;
+	}
+
+	.uni-share-content-item:active {
+		background-color: #f5f5f5;
+	}
+
+	.uni-share-image {
+		width: 30px;
+		height: 30px;
+	}
+
+	.uni-share-text {
+		margin-top: 10px;
+		font-size: 14px;
+		color: #3B4144;
+	}
+
+	.uni-share-button-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		padding: 10px 15px;
+	}
+
+	.uni-share-button {
+		flex: 1;
+		border-radius: 50px;
+		color: #666;
+		font-size: 16px;
+	}
+
+	.uni-share-button::after {
+		border-radius: 50px;
+	}
+</style>
diff --git a/uni_modules/uni-popup/components/uni-popup/i18n/en.json b/uni_modules/uni-popup/components/uni-popup/i18n/en.json
new file mode 100644
index 0000000..7f1bd06
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/i18n/en.json
@@ -0,0 +1,7 @@
+{
+	"uni-popup.cancel": "cancel",
+	"uni-popup.ok": "ok",
+	"uni-popup.placeholder": "pleace enter",
+	"uni-popup.title": "Hint",
+	"uni-popup.shareTitle": "Share to"
+}
diff --git a/uni_modules/uni-popup/components/uni-popup/i18n/index.js b/uni_modules/uni-popup/components/uni-popup/i18n/index.js
new file mode 100644
index 0000000..de7509c
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/i18n/index.js
@@ -0,0 +1,8 @@
+import en from './en.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}
diff --git a/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json
new file mode 100644
index 0000000..5e3003c
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json
@@ -0,0 +1,7 @@
+{
+	"uni-popup.cancel": "取消",
+	"uni-popup.ok": "确定",
+	"uni-popup.placeholder": "请输入",
+		"uni-popup.title": "提示",
+		"uni-popup.shareTitle": "分享到"
+}
diff --git a/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json
new file mode 100644
index 0000000..13e39eb
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json
@@ -0,0 +1,7 @@
+{
+	"uni-popup.cancel": "取消",
+	"uni-popup.ok": "確定",
+	"uni-popup.placeholder": "請輸入",
+	"uni-popup.title": "提示",
+	"uni-popup.shareTitle": "分享到"
+}
diff --git a/uni_modules/uni-popup/components/uni-popup/keypress.js b/uni_modules/uni-popup/components/uni-popup/keypress.js
new file mode 100644
index 0000000..62dda46
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/keypress.js
@@ -0,0 +1,45 @@
+// #ifdef H5
+export default {
+  name: 'Keypress',
+  props: {
+    disable: {
+      type: Boolean,
+      default: false
+    }
+  },
+  mounted () {
+    const keyNames = {
+      esc: ['Esc', 'Escape'],
+      tab: 'Tab',
+      enter: 'Enter',
+      space: [' ', 'Spacebar'],
+      up: ['Up', 'ArrowUp'],
+      left: ['Left', 'ArrowLeft'],
+      right: ['Right', 'ArrowRight'],
+      down: ['Down', 'ArrowDown'],
+      delete: ['Backspace', 'Delete', 'Del']
+    }
+    const listener = ($event) => {
+      if (this.disable) {
+        return
+      }
+      const keyName = Object.keys(keyNames).find(key => {
+        const keyName = $event.key
+        const value = keyNames[key]
+        return value === keyName || (Array.isArray(value) && value.includes(keyName))
+      })
+      if (keyName) {
+        // 避免和其他按键事件冲突
+        setTimeout(() => {
+          this.$emit(keyName, {})
+        }, 0)
+      }
+    }
+    document.addEventListener('keyup', listener)
+    // this.$once('hook:beforeDestroy', () => {
+    //   document.removeEventListener('keyup', listener)
+    // })
+  },
+	render: () => {}
+}
+// #endif
diff --git a/uni_modules/uni-popup/components/uni-popup/popup.js b/uni_modules/uni-popup/components/uni-popup/popup.js
new file mode 100644
index 0000000..c4e5781
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/popup.js
@@ -0,0 +1,26 @@
+
+export default {
+	data() {
+		return {
+			
+		}
+	},
+	created(){
+		this.popup = this.getParent()
+	},
+	methods:{
+		/**
+		 * 获取父元素实例
+		 */
+		getParent(name = 'uniPopup') {
+			let parent = this.$parent;
+			let parentName = parent.$options.name;
+			while (parentName !== name) {
+				parent = parent.$parent;
+				if (!parent) return false
+				parentName = parent.$options.name;
+			}
+			return parent;
+		},
+	}
+}
diff --git a/uni_modules/uni-popup/components/uni-popup/uni-popup.uvue b/uni_modules/uni-popup/components/uni-popup/uni-popup.uvue
new file mode 100644
index 0000000..5eb8d5b
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/uni-popup.uvue
@@ -0,0 +1,90 @@
+<template>
+  <view class="popup-root" v-if="isOpen" v-show="isShow" @click="clickMask">
+    <view @click.stop>
+      <slot></slot>
+    </view>
+  </view>
+</template>
+
+<script>
+  type CloseCallBack = ()=> void;
+  let closeCallBack:CloseCallBack = () :void => {};
+  export default {
+    emits:["close","clickMask"],
+    data() {
+      return {
+        isShow:false,
+        isOpen:false
+      }
+    },
+    props: {
+      maskClick: {
+        type: Boolean,
+        default: true
+      },
+    },
+    watch: {
+      // 设置show = true 时，如果没有 open 需要设置为 open
+      isShow:{
+        handler(isShow) {
+          // console.log("isShow",isShow)
+          if(isShow && this.isOpen == false){
+            this.isOpen = true
+          }
+        },
+        immediate:true
+      },
+      // 设置isOpen = true 时，如果没有 isShow 需要设置为 isShow
+      isOpen:{
+        handler(isOpen) {
+          // console.log("isOpen",isOpen)
+          if(isOpen && this.isShow == false){
+            this.isShow = true
+          }
+        },
+        immediate:true
+      }
+    },
+    methods:{
+      open(){
+        // ...funs : CloseCallBack[]
+        // if(funs.length > 0){
+        //   closeCallBack = funs[0]
+        // }
+        this.isOpen = true;
+      },
+      clickMask(){
+        if(this.maskClick == true){
+          this.$emit('clickMask')
+          this.close()
+        }
+      },
+      close(): void{
+        this.isOpen = false;
+        this.$emit('close')
+        closeCallBack()
+      },
+      hiden(){
+        this.isShow = false
+      },
+      show(){
+        this.isShow = true
+      }
+    }
+  }
+</script>
+
+<style>
+.popup-root {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 750rpx;
+  height: 100%;
+  flex: 1;
+  background-color: rgba(0, 0, 0, 0.3);
+  justify-content: center;
+  align-items: center;
+  z-index: 99;
+}
+</style>
\ No newline at end of file
diff --git a/uni_modules/uni-popup/components/uni-popup/uni-popup.vue b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
new file mode 100644
index 0000000..8349e99
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
@@ -0,0 +1,503 @@
+<template>
+	<view v-if="showPopup" class="uni-popup" :class="[popupstyle, isDesktop ? 'fixforpc-z-index' : '']">
+		<view @touchstart="touchstart">
+			<uni-transition key="1" v-if="maskShow" name="mask" mode-class="fade" :styles="maskClass"
+				:duration="duration" :show="showTrans" @click="onTap" />
+			<uni-transition key="2" :mode-class="ani" name="content" :styles="transClass" :duration="duration"
+				:show="showTrans" @click="onTap">
+				<view class="uni-popup__wrapper" :style="getStyles" :class="[popupstyle]" @click="clear">
+					<slot />
+				</view>
+			</uni-transition>
+		</view>
+		<!-- #ifdef H5 -->
+		<keypress v-if="maskShow" @esc="onTap" />
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	// #ifdef H5
+	import keypress from './keypress.js'
+	// #endif
+
+	/**
+	 * PopUp 弹出层
+	 * @description 弹出层组件，为了解决遮罩弹层的问题
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} type = [top|center|bottom|left|right|message|dialog|share] 弹出方式
+	 * 	@value top 顶部弹出
+	 * 	@value center 中间弹出
+	 * 	@value bottom 底部弹出
+	 * 	@value left		左侧弹出
+	 * 	@value right  右侧弹出
+	 * 	@value message 消息提示
+	 * 	@value dialog 对话框
+	 * 	@value share 底部分享示例
+	 * @property {Boolean} animation = [true|false] 是否开启动画
+	 * @property {Boolean} maskClick = [true|false] 蒙版点击是否关闭弹窗(废弃)
+	 * @property {Boolean} isMaskClick = [true|false] 蒙版点击是否关闭弹窗
+	 * @property {String}  backgroundColor 主窗口背景色
+	 * @property {String}  maskBackgroundColor 蒙版颜色
+	 * @property {String}  borderRadius 设置圆角(左上、右上、右下和左下) 示例:"10px 10px 10px 10px"
+	 * @property {Boolean} safeArea		   是否适配底部安全区
+	 * @event {Function} change 打开关闭弹窗触发，e={show: false}
+	 * @event {Function} maskClick 点击遮罩触发
+	 */
+
+	export default {
+		name: 'uniPopup',
+		components: {
+			// #ifdef H5
+			keypress
+			// #endif
+		},
+		emits: ['change', 'maskClick'],
+		props: {
+			// 开启动画
+			animation: {
+				type: Boolean,
+				default: true
+			},
+			// 弹出层类型，可选值，top: 顶部弹出层；bottom：底部弹出层；center：全屏弹出层
+			// message: 消息提示 ; dialog : 对话框
+			type: {
+				type: String,
+				default: 'center'
+			},
+			// maskClick
+			isMaskClick: {
+				type: Boolean,
+				default: null
+			},
+			// TODO 2 个版本后废弃属性 ，使用 isMaskClick
+			maskClick: {
+				type: Boolean,
+				default: null
+			},
+			backgroundColor: {
+				type: String,
+				default: 'none'
+			},
+			safeArea: {
+				type: Boolean,
+				default: true
+			},
+			maskBackgroundColor: {
+				type: String,
+				default: 'rgba(0, 0, 0, 0.4)'
+			},
+			borderRadius:{
+				type: String,
+			}
+		},
+
+		watch: {
+			/**
+			 * 监听type类型
+			 */
+			type: {
+				handler: function(type) {
+					if (!this.config[type]) return
+					this[this.config[type]](true)
+				},
+				immediate: true
+			},
+			isDesktop: {
+				handler: function(newVal) {
+					if (!this.config[newVal]) return
+					this[this.config[this.type]](true)
+				},
+				immediate: true
+			},
+			/**
+			 * 监听遮罩是否可点击
+			 * @param {Object} val
+			 */
+			maskClick: {
+				handler: function(val) {
+					this.mkclick = val
+				},
+				immediate: true
+			},
+			isMaskClick: {
+				handler: function(val) {
+					this.mkclick = val
+				},
+				immediate: true
+			},
+			// H5 下禁止底部滚动
+			showPopup(show) {
+				// #ifdef H5
+				// fix by mehaotian 处理 h5 滚动穿透的问题
+				document.getElementsByTagName('body')[0].style.overflow = show ? 'hidden' : 'visible'
+				// #endif
+			}
+		},
+		data() {
+			return {
+				duration: 300,
+				ani: [],
+				showPopup: false,
+				showTrans: false,
+				popupWidth: 0,
+				popupHeight: 0,
+				config: {
+					top: 'top',
+					bottom: 'bottom',
+					center: 'center',
+					left: 'left',
+					right: 'right',
+					message: 'top',
+					dialog: 'center',
+					share: 'bottom'
+				},
+				maskClass: {
+					position: 'fixed',
+					bottom: 0,
+					top: 0,
+					left: 0,
+					right: 0,
+					backgroundColor: 'rgba(0, 0, 0, 0.4)'
+				},
+				transClass: {
+					backgroundColor: 'transparent',
+					borderRadius: this.borderRadius || "0",
+					position: 'fixed',
+					left: 0,
+					right: 0
+				},
+				maskShow: true,
+				mkclick: true,
+				popupstyle: 'top'
+			}
+		},
+		computed: {
+			getStyles() {
+				let res = { backgroundColor: this.bg };
+				if (this.borderRadius || "0") {
+					res = Object.assign(res, { borderRadius: this.borderRadius })
+				}
+				return res;
+			},
+			isDesktop() {
+				return this.popupWidth >= 500 && this.popupHeight >= 500
+			},
+			bg() {
+				if (this.backgroundColor === '' || this.backgroundColor === 'none') {
+					return 'transparent'
+				}
+				return this.backgroundColor
+			}
+		},
+		mounted() {
+			const fixSize = () => {
+				const {
+					windowWidth,
+					windowHeight,
+					windowTop,
+					safeArea,
+					screenHeight,
+					safeAreaInsets
+				} = uni.getSystemInfoSync()
+				this.popupWidth = windowWidth
+				this.popupHeight = windowHeight + (windowTop || 0)
+				// TODO fix by mehaotian 是否适配底部安全区 ,目前微信ios 、和 app ios 计算有差异，需要框架修复
+				if (safeArea && this.safeArea) {
+					// #ifdef MP-WEIXIN
+					this.safeAreaInsets = screenHeight - safeArea.bottom
+					// #endif
+					// #ifndef MP-WEIXIN
+					this.safeAreaInsets = safeAreaInsets.bottom
+					// #endif
+				} else {
+					this.safeAreaInsets = 0
+				}
+			}
+			fixSize()
+			// #ifdef H5
+			// window.addEventListener('resize', fixSize)
+			// this.$once('hook:beforeDestroy', () => {
+			// 	window.removeEventListener('resize', fixSize)
+			// })
+			// #endif
+		},
+		// #ifndef VUE3
+		// TODO vue2
+		destroyed() {
+			this.setH5Visible()
+		},
+		// #endif
+		// #ifdef VUE3
+		// TODO vue3
+		unmounted() {
+			this.setH5Visible()
+		},
+		// #endif
+		activated() {
+   	  this.setH5Visible(!this.showPopup);
+    },
+    deactivated() {
+      this.setH5Visible(true);
+    },
+		created() {
+			// this.mkclick =  this.isMaskClick || this.maskClick
+			if (this.isMaskClick === null && this.maskClick === null) {
+				this.mkclick = true
+			} else {
+				this.mkclick = this.isMaskClick !== null ? this.isMaskClick : this.maskClick
+			}
+			if (this.animation) {
+				this.duration = 300
+			} else {
+				this.duration = 0
+			}
+			// TODO 处理 message 组件生命周期异常的问题
+			this.messageChild = null
+			// TODO 解决头条冒泡的问题
+			this.clearPropagation = false
+			this.maskClass.backgroundColor = this.maskBackgroundColor
+		},
+		methods: {
+			setH5Visible(visible = true) {
+				// #ifdef H5
+				// fix by mehaotian 处理 h5 滚动穿透的问题
+				document.getElementsByTagName('body')[0].style.overflow =  visible ? "visible" : "hidden";
+				// #endif
+			},
+			/**
+			 * 公用方法，不显示遮罩层
+			 */
+			closeMask() {
+				this.maskShow = false
+			},
+			/**
+			 * 公用方法，遮罩层禁止点击
+			 */
+			disableMask() {
+				this.mkclick = false
+			},
+			// TODO nvue 取消冒泡
+			clear(e) {
+				// #ifndef APP-NVUE
+				e.stopPropagation()
+				// #endif
+				this.clearPropagation = true
+			},
+
+			open(direction) {
+				// fix by mehaotian 处理快速打开关闭的情况
+				if (this.showPopup) {
+					return
+				}
+				let innerType = ['top', 'center', 'bottom', 'left', 'right', 'message', 'dialog', 'share']
+				if (!(direction && innerType.indexOf(direction) !== -1)) {
+					direction = this.type
+				}
+				if (!this.config[direction]) {
+					console.error('缺少类型：', direction)
+					return
+				}
+				this[this.config[direction]]()
+				this.$emit('change', {
+					show: true,
+					type: direction
+				})
+			},
+			close(type) {
+				this.showTrans = false
+				this.$emit('change', {
+					show: false,
+					type: this.type
+				})
+				clearTimeout(this.timer)
+				// // 自定义关闭事件
+				// this.customOpen && this.customClose()
+				this.timer = setTimeout(() => {
+					this.showPopup = false
+				}, 300)
+			},
+			// TODO 处理冒泡事件，头条的冒泡事件有问题 ，先这样兼容
+			touchstart() {
+				this.clearPropagation = false
+			},
+
+			onTap() {
+				if (this.clearPropagation) {
+					// fix by mehaotian 兼容 nvue
+					this.clearPropagation = false
+					return
+				}
+				this.$emit('maskClick')
+				if (!this.mkclick) return
+				this.close()
+			},
+			/**
+			 * 顶部弹出样式处理
+			 */
+			top(type) {
+				this.popupstyle = this.isDesktop ? 'fixforpc-top' : 'top'
+				this.ani = ['slide-top']
+				this.transClass = {
+					position: 'fixed',
+					left: 0,
+					right: 0,
+					backgroundColor: this.bg,
+					borderRadius:this.borderRadius || "0"
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+				this.$nextTick(() => {
+					if (this.messageChild && this.type === 'message') {
+						this.messageChild.timerClose()
+					}
+				})
+			},
+			/**
+			 * 底部弹出样式处理
+			 */
+			bottom(type) {
+				this.popupstyle = 'bottom'
+				this.ani = ['slide-bottom']
+				this.transClass = {
+					position: 'fixed',
+					left: 0,
+					right: 0,
+					bottom: 0,
+					paddingBottom: this.safeAreaInsets + 'px',
+					backgroundColor: this.bg,
+					borderRadius:this.borderRadius || "0",
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+			},
+			/**
+			 * 中间弹出样式处理
+			 */
+			center(type) {
+				this.popupstyle = 'center'
+				//微信小程序下，组合动画会出现文字向上闪动问题，再此做特殊处理
+				// #ifdef MP-WEIXIN
+					this.ani = ['fade']
+				// #endif
+				// #ifndef MP-WEIXIN
+					this.ani = ['zoom-out', 'fade']
+				// #endif
+				this.transClass = {
+					position: 'fixed',
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column',
+					/* #endif */
+					bottom: 0,
+					left: 0,
+					right: 0,
+					top: 0,
+					justifyContent: 'center',
+					alignItems: 'center',
+					borderRadius:this.borderRadius || "0"
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+			},
+			left(type) {
+				this.popupstyle = 'left'
+				this.ani = ['slide-left']
+				this.transClass = {
+					position: 'fixed',
+					left: 0,
+					bottom: 0,
+					top: 0,
+					backgroundColor: this.bg,
+					borderRadius:this.borderRadius || "0",
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column'
+					/* #endif */
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+			},
+			right(type) {
+				this.popupstyle = 'right'
+				this.ani = ['slide-right']
+				this.transClass = {
+					position: 'fixed',
+					bottom: 0,
+					right: 0,
+					top: 0,
+					backgroundColor: this.bg,
+					borderRadius:this.borderRadius || "0",
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column'
+					/* #endif */
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+			}
+		}
+	}
+</script>
+<style lang="scss">
+	.uni-popup {
+		position: fixed;
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+
+		/* #endif */
+		&.top,
+		&.left,
+		&.right {
+			/* #ifdef H5 */
+			top: var(--window-top);
+			/* #endif */
+			/* #ifndef H5 */
+			top: 0;
+			/* #endif */
+		}
+
+		.uni-popup__wrapper {
+			/* #ifndef APP-NVUE */
+			display: block;
+			/* #endif */
+			position: relative;
+
+			/* iphonex 等安全区设置，底部安全区适配 */
+			/* #ifndef APP-NVUE */
+			// padding-bottom: constant(safe-area-inset-bottom);
+			// padding-bottom: env(safe-area-inset-bottom);
+			/* #endif */
+			&.left,
+			&.right {
+				/* #ifdef H5 */
+				padding-top: var(--window-top);
+				/* #endif */
+				/* #ifndef H5 */
+				padding-top: 0;
+				/* #endif */
+				flex: 1;
+			}
+		}
+	}
+
+	.fixforpc-z-index {
+		/* #ifndef APP-NVUE */
+		z-index: 999;
+		/* #endif */
+	}
+
+	.fixforpc-top {
+		top: 0;
+	}
+</style>
diff --git a/uni_modules/uni-popup/package.json b/uni_modules/uni-popup/package.json
new file mode 100644
index 0000000..3cfa384
--- /dev/null
+++ b/uni_modules/uni-popup/package.json
@@ -0,0 +1,88 @@
+{
+	"id": "uni-popup",
+	"displayName": "uni-popup 弹出层",
+	"version": "1.9.1",
+	"description": " Popup 组件，提供常用的弹层",
+	"keywords": [
+        "uni-ui",
+        "弹出层",
+        "弹窗",
+        "popup",
+        "弹框"
+    ],
+	"repository": "https://github.com/dcloudio/uni-ui",
+	"engines": {
+		"HBuilderX": ""
+	},
+	"directories": {
+		"example": "../../temps/example_temps"
+	},
+    "dcloudext": {
+        "sale": {
+			"regular": {
+				"price": "0.00"
+			},
+			"sourcecode": {
+				"price": "0.00"
+			}
+		},
+		"contact": {
+			"qq": ""
+		},
+		"declaration": {
+			"ads": "无",
+			"data": "无",
+			"permissions": "无"
+		},
+        "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+        "type": "component-vue"
+	},
+	"uni_modules": {
+		"dependencies": [
+			"uni-scss",
+			"uni-transition"
+		],
+		"encrypt": [],
+		"platforms": {
+			"cloud": {
+				"tcb": "y",
+                "aliyun": "y",
+                "alipay": "n"
+			},
+			"client": {
+				"App": {
+					"app-vue": "y",
+					"app-nvue": "y"
+				},
+				"H5-mobile": {
+					"Safari": "y",
+					"Android Browser": "y",
+					"微信浏览器(Android)": "y",
+					"QQ浏览器(Android)": "y"
+				},
+				"H5-pc": {
+					"Chrome": "y",
+					"IE": "y",
+					"Edge": "y",
+					"Firefox": "y",
+					"Safari": "y"
+				},
+				"小程序": {
+					"微信": "y",
+					"阿里": "y",
+					"百度": "y",
+					"字节跳动": "y",
+					"QQ": "y"
+				},
+				"快应用": {
+					"华为": "u",
+					"联盟": "u"
+                },
+                "Vue": {
+                    "vue2": "y",
+                    "vue3": "y"
+                }
+			}
+		}
+	}
+}
diff --git a/uni_modules/uni-popup/readme.md b/uni_modules/uni-popup/readme.md
new file mode 100644
index 0000000..fdad4b3
--- /dev/null
+++ b/uni_modules/uni-popup/readme.md
@@ -0,0 +1,17 @@
+
+
+## Popup 弹出层
+> **组件名：uni-popup**
+> 代码块： `uPopup`
+> 关联组件：`uni-transition`
+
+
+弹出层组件，在应用中弹出一个消息提示窗口、提示框等
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-popup)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
+
+
+
diff --git a/uni_modules/uni-transition/changelog.md b/uni_modules/uni-transition/changelog.md
new file mode 100644
index 0000000..faaf336
--- /dev/null
+++ b/uni_modules/uni-transition/changelog.md
@@ -0,0 +1,24 @@
+## 1.3.3（2024-04-23）
+- 修复 当元素会受变量影响自动隐藏的bug
+## 1.3.2（2023-05-04）
+- 修复 NVUE 平台报错的问题
+## 1.3.1（2021-11-23）
+- 修复 init 方法初始化问题
+## 1.3.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-transition](https://uniapp.dcloud.io/component/uniui/uni-transition)
+## 1.2.1（2021-09-27）
+- 修复 init 方法不生效的 Bug
+## 1.2.0（2021-07-30）
+- 组件兼容 vue3，如何创建 vue3 项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.1（2021-05-12）
+- 新增 示例地址
+- 修复 示例项目缺少组件的 Bug
+## 1.1.0（2021-04-22）
+- 新增 通过方法自定义动画
+- 新增 custom-class 非 NVUE 平台支持自定义 class 定制样式
+- 优化 动画触发逻辑，使动画更流畅
+- 优化 支持单独的动画类型
+- 优化 文档示例
+## 1.0.2（2021-02-05）
+- 调整为 uni_modules 目录规范
diff --git a/uni_modules/uni-transition/components/uni-transition/createAnimation.js b/uni_modules/uni-transition/components/uni-transition/createAnimation.js
new file mode 100644
index 0000000..8f89b18
--- /dev/null
+++ b/uni_modules/uni-transition/components/uni-transition/createAnimation.js
@@ -0,0 +1,131 @@
+// const defaultOption = {
+// 	duration: 300,
+// 	timingFunction: 'linear',
+// 	delay: 0,
+// 	transformOrigin: '50% 50% 0'
+// }
+// #ifdef APP-NVUE
+const nvueAnimation = uni.requireNativePlugin('animation')
+// #endif
+class MPAnimation {
+	constructor(options, _this) {
+		this.options = options
+		// 在iOS10+QQ小程序平台下，传给原生的对象一定是个普通对象而不是Proxy对象，否则会报parameter should be Object instead of ProxyObject的错误
+		this.animation = uni.createAnimation({
+			...options
+		})
+		this.currentStepAnimates = {}
+		this.next = 0
+		this.$ = _this
+
+	}
+
+	_nvuePushAnimates(type, args) {
+		let aniObj = this.currentStepAnimates[this.next]
+		let styles = {}
+		if (!aniObj) {
+			styles = {
+				styles: {},
+				config: {}
+			}
+		} else {
+			styles = aniObj
+		}
+		if (animateTypes1.includes(type)) {
+			if (!styles.styles.transform) {
+				styles.styles.transform = ''
+			}
+			let unit = ''
+			if(type === 'rotate'){
+				unit = 'deg'
+			}
+			styles.styles.transform += `${type}(${args+unit}) `
+		} else {
+			styles.styles[type] = `${args}`
+		}
+		this.currentStepAnimates[this.next] = styles
+	}
+	_animateRun(styles = {}, config = {}) {
+		let ref = this.$.$refs['ani'].ref
+		if (!ref) return
+		return new Promise((resolve, reject) => {
+			nvueAnimation.transition(ref, {
+				styles,
+				...config
+			}, res => {
+				resolve()
+			})
+		})
+	}
+
+	_nvueNextAnimate(animates, step = 0, fn) {
+		let obj = animates[step]
+		if (obj) {
+			let {
+				styles,
+				config
+			} = obj
+			this._animateRun(styles, config).then(() => {
+				step += 1
+				this._nvueNextAnimate(animates, step, fn)
+			})
+		} else {
+			this.currentStepAnimates = {}
+			typeof fn === 'function' && fn()
+			this.isEnd = true
+		}
+	}
+
+	step(config = {}) {
+		// #ifndef APP-NVUE
+		this.animation.step(config)
+		// #endif
+		// #ifdef APP-NVUE
+		this.currentStepAnimates[this.next].config = Object.assign({}, this.options, config)
+		this.currentStepAnimates[this.next].styles.transformOrigin = this.currentStepAnimates[this.next].config.transformOrigin
+		this.next++
+		// #endif
+		return this
+	}
+
+	run(fn) {
+		// #ifndef APP-NVUE
+		this.$.animationData = this.animation.export()
+		this.$.timer = setTimeout(() => {
+			typeof fn === 'function' && fn()
+		}, this.$.durationTime)
+		// #endif
+		// #ifdef APP-NVUE
+		this.isEnd = false
+		let ref = this.$.$refs['ani'] && this.$.$refs['ani'].ref
+		if(!ref) return
+		this._nvueNextAnimate(this.currentStepAnimates, 0, fn)
+		this.next = 0
+		// #endif
+	}
+}
+
+
+const animateTypes1 = ['matrix', 'matrix3d', 'rotate', 'rotate3d', 'rotateX', 'rotateY', 'rotateZ', 'scale', 'scale3d',
+	'scaleX', 'scaleY', 'scaleZ', 'skew', 'skewX', 'skewY', 'translate', 'translate3d', 'translateX', 'translateY',
+	'translateZ'
+]
+const animateTypes2 = ['opacity', 'backgroundColor']
+const animateTypes3 = ['width', 'height', 'left', 'right', 'top', 'bottom']
+animateTypes1.concat(animateTypes2, animateTypes3).forEach(type => {
+	MPAnimation.prototype[type] = function(...args) {
+		// #ifndef APP-NVUE
+		this.animation[type](...args)
+		// #endif
+		// #ifdef APP-NVUE
+		this._nvuePushAnimates(type, args)
+		// #endif
+		return this
+	}
+})
+
+export function createAnimation(option, _this) {
+	if(!_this) return
+	clearTimeout(_this.timer)
+	return new MPAnimation(option, _this)
+}
diff --git a/uni_modules/uni-transition/components/uni-transition/uni-transition.vue b/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
new file mode 100644
index 0000000..f3ddd1f
--- /dev/null
+++ b/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
@@ -0,0 +1,286 @@
+<template>
+  <!-- #ifndef APP-NVUE -->
+  <view v-show="isShow" ref="ani" :animation="animationData" :class="customClass" :style="transformStyles" @click="onClick"><slot></slot></view>
+  <!-- #endif -->
+  <!-- #ifdef APP-NVUE -->
+  <view v-if="isShow" ref="ani" :animation="animationData" :class="customClass" :style="transformStyles" @click="onClick"><slot></slot></view>
+  <!-- #endif -->
+</template>
+
+<script>
+import { createAnimation } from './createAnimation'
+
+/**
+ * Transition 过渡动画
+ * @description 简单过渡动画组件
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=985
+ * @property {Boolean} show = [false|true] 控制组件显示或隐藏
+ * @property {Array|String} modeClass = [fade|slide-top|slide-right|slide-bottom|slide-left|zoom-in|zoom-out] 过渡动画类型
+ *  @value fade 渐隐渐出过渡
+ *  @value slide-top 由上至下过渡
+ *  @value slide-right 由右至左过渡
+ *  @value slide-bottom 由下至上过渡
+ *  @value slide-left 由左至右过渡
+ *  @value zoom-in 由小到大过渡
+ *  @value zoom-out 由大到小过渡
+ * @property {Number} duration 过渡动画持续时间
+ * @property {Object} styles 组件样式，同 css 样式，注意带’-‘连接符的属性需要使用小驼峰写法如：`backgroundColor:red`
+ */
+export default {
+	name: 'uniTransition',
+	emits:['click','change'],
+	props: {
+		show: {
+			type: Boolean,
+			default: false
+		},
+		modeClass: {
+			type: [Array, String],
+			default() {
+				return 'fade'
+			}
+		},
+		duration: {
+			type: Number,
+			default: 300
+		},
+		styles: {
+			type: Object,
+			default() {
+				return {}
+			}
+		},
+		customClass:{
+			type: String,
+			default: ''
+		},
+		onceRender:{
+			type:Boolean,
+			default:false
+		},
+	},
+	data() {
+		return {
+			isShow: false,
+			transform: '',
+			opacity: 1,
+			animationData: {},
+			durationTime: 300,
+			config: {}
+		}
+	},
+	watch: {
+		show: {
+			handler(newVal) {
+				if (newVal) {
+					this.open()
+				} else {
+					// 避免上来就执行 close,导致动画错乱
+					if (this.isShow) {
+						this.close()
+					}
+				}
+			},
+			immediate: true
+		}
+	},
+	computed: {
+		// 生成样式数据
+		stylesObject() {
+			let styles = {
+				...this.styles,
+				'transition-duration': this.duration / 1000 + 's'
+			}
+			let transform = ''
+			for (let i in styles) {
+				let line = this.toLine(i)
+				transform += line + ':' + styles[i] + ';'
+			}
+			return transform
+		},
+		// 初始化动画条件
+		transformStyles() {
+			return 'transform:' + this.transform + ';' + 'opacity:' + this.opacity + ';' + this.stylesObject
+		}
+	},
+	created() {
+		// 动画默认配置
+		this.config = {
+			duration: this.duration,
+			timingFunction: 'ease',
+			transformOrigin: '50% 50%',
+			delay: 0
+		}
+		this.durationTime = this.duration
+	},
+	methods: {
+		/**
+		 *  ref 触发 初始化动画
+		 */
+		init(obj = {}) {
+			if (obj.duration) {
+				this.durationTime = obj.duration
+			}
+			this.animation = createAnimation(Object.assign(this.config, obj),this)
+		},
+		/**
+		 * 点击组件触发回调
+		 */
+		onClick() {
+			this.$emit('click', {
+				detail: this.isShow
+			})
+		},
+		/**
+		 * ref 触发 动画分组
+		 * @param {Object} obj
+		 */
+		step(obj, config = {}) {
+			if (!this.animation) return
+			for (let i in obj) {
+				try {
+					if(typeof obj[i] === 'object'){
+						this.animation[i](...obj[i])
+					}else{
+						this.animation[i](obj[i])
+					}
+				} catch (e) {
+					console.error(`方法 ${i} 不存在`)
+				}
+			}
+			this.animation.step(config)
+			return this
+		},
+		/**
+		 *  ref 触发 执行动画
+		 */
+		run(fn) {
+			if (!this.animation) return
+			this.animation.run(fn)
+		},
+		// 开始过度动画
+		open() {
+			clearTimeout(this.timer)
+			this.transform = ''
+			this.isShow = true
+			let { opacity, transform } = this.styleInit(false)
+			if (typeof opacity !== 'undefined') {
+				this.opacity = opacity
+			}
+			this.transform = transform
+			// 确保动态样式已经生效后，执行动画，如果不加 nextTick ，会导致 wx 动画执行异常
+			this.$nextTick(() => {
+				// TODO 定时器保证动画完全执行，目前有些问题，后面会取消定时器
+				this.timer = setTimeout(() => {
+					this.animation = createAnimation(this.config, this)
+					this.tranfromInit(false).step()
+					this.animation.run()
+					this.$emit('change', {
+						detail: this.isShow
+					})
+				}, 20)
+			})
+		},
+		// 关闭过度动画
+		close(type) {
+			if (!this.animation) return
+			this.tranfromInit(true)
+				.step()
+				.run(() => {
+					this.isShow = false
+					this.animationData = null
+					this.animation = null
+					let { opacity, transform } = this.styleInit(false)
+					this.opacity = opacity || 1
+					this.transform = transform
+					this.$emit('change', {
+						detail: this.isShow
+					})
+				})
+		},
+		// 处理动画开始前的默认样式
+		styleInit(type) {
+			let styles = {
+				transform: ''
+			}
+			let buildStyle = (type, mode) => {
+				if (mode === 'fade') {
+					styles.opacity = this.animationType(type)[mode]
+				} else {
+					styles.transform += this.animationType(type)[mode] + ' '
+				}
+			}
+			if (typeof this.modeClass === 'string') {
+				buildStyle(type, this.modeClass)
+			} else {
+				this.modeClass.forEach(mode => {
+					buildStyle(type, mode)
+				})
+			}
+			return styles
+		},
+		// 处理内置组合动画
+		tranfromInit(type) {
+			let buildTranfrom = (type, mode) => {
+				let aniNum = null
+				if (mode === 'fade') {
+					aniNum = type ? 0 : 1
+				} else {
+					aniNum = type ? '-100%' : '0'
+					if (mode === 'zoom-in') {
+						aniNum = type ? 0.8 : 1
+					}
+					if (mode === 'zoom-out') {
+						aniNum = type ? 1.2 : 1
+					}
+					if (mode === 'slide-right') {
+						aniNum = type ? '100%' : '0'
+					}
+					if (mode === 'slide-bottom') {
+						aniNum = type ? '100%' : '0'
+					}
+				}
+				this.animation[this.animationMode()[mode]](aniNum)
+			}
+			if (typeof this.modeClass === 'string') {
+				buildTranfrom(type, this.modeClass)
+			} else {
+				this.modeClass.forEach(mode => {
+					buildTranfrom(type, mode)
+				})
+			}
+
+			return this.animation
+		},
+		animationType(type) {
+			return {
+				fade: type ? 0 : 1,
+				'slide-top': `translateY(${type ? '0' : '-100%'})`,
+				'slide-right': `translateX(${type ? '0' : '100%'})`,
+				'slide-bottom': `translateY(${type ? '0' : '100%'})`,
+				'slide-left': `translateX(${type ? '0' : '-100%'})`,
+				'zoom-in': `scaleX(${type ? 1 : 0.8}) scaleY(${type ? 1 : 0.8})`,
+				'zoom-out': `scaleX(${type ? 1 : 1.2}) scaleY(${type ? 1 : 1.2})`
+			}
+		},
+		// 内置动画类型与实际动画对应字典
+		animationMode() {
+			return {
+				fade: 'opacity',
+				'slide-top': 'translateY',
+				'slide-right': 'translateX',
+				'slide-bottom': 'translateY',
+				'slide-left': 'translateX',
+				'zoom-in': 'scale',
+				'zoom-out': 'scale'
+			}
+		},
+		// 驼峰转中横线
+		toLine(name) {
+			return name.replace(/([A-Z])/g, '-$1').toLowerCase()
+		}
+	}
+}
+</script>
+
+<style></style>
diff --git a/uni_modules/uni-transition/package.json b/uni_modules/uni-transition/package.json
new file mode 100644
index 0000000..d5c20e1
--- /dev/null
+++ b/uni_modules/uni-transition/package.json
@@ -0,0 +1,85 @@
+{
+  "id": "uni-transition",
+  "displayName": "uni-transition 过渡动画",
+  "version": "1.3.3",
+  "description": "元素的简单过渡动画",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "动画",
+    "过渡",
+    "过渡动画"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y",
+        "alipay": "n"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-transition/readme.md b/uni_modules/uni-transition/readme.md
new file mode 100644
index 0000000..2f8a77e
--- /dev/null
+++ b/uni_modules/uni-transition/readme.md
@@ -0,0 +1,11 @@
+
+
+## Transition 过渡动画
+> **组件名：uni-transition**
+> 代码块： `uTransition`
+
+
+元素过渡动画
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-transition)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file